diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 8320c9c..2a520a0 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,15 +1,17 @@
 {
     "recommendations": [
-        "shopify.ruby-lsp",
         "aki77.rails-db-schema",
-        "yzhang.markdown-all-in-one",
-        "jgclark.vscode-todo-highlight",
-        "bradlc.vscode-tailwindcss",
         "aliariff.vscode-erb-beautify",
-        "waderyan.gitblame",
+        "bierner.markdown-mermaid",
+        "bpruitt-goddard.mermaid-markdown-syntax-highlighting",
+        "bradlc.vscode-tailwindcss",
         "formulahendry.auto-close-tag",
         "formulahendry.auto-rename-tag",
+        "jgclark.vscode-todo-highlight",
         "moalamri.inline-fold",
-        "bpruitt-goddard.mermaid-markdown-syntax-highlighting"
+        "redhat.vscode-yaml",
+        "shopify.ruby-lsp",
+        "waderyan.gitblame",
+        "yzhang.markdown-all-in-one",
     ]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index e7c7c9a..fbd3c86 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,4 @@
 {
-  // All of these settings are scoped only to the Ruby language
   "[ruby]": {
     "editor.defaultFormatter": "Shopify.ruby-lsp", // Use the Ruby LSP as the default formatter
     "editor.semanticHighlighting.enabled": true, // Enable semantic highlighting
@@ -8,29 +7,39 @@
   "[erb]": {
     "editor.defaultFormatter": "aliariff.vscode-erb-beautify",
   },
+  "database-client.telemetry.usesOnlineServices": false,
+  "debug.internalConsoleOptions": "neverOpen",
+  "editor.formatOnSave": true,
+  "editor.tabSize": 2, // Use 2 spaces for indentation
+  "editor.insertSpaces": true,
   "emmet.includeLanguages": {
     "erb": "html"
   },
+  "inlineFold.regex": "(class=|className=|class:\\s*)(({(`|))|(['\"`]))(.*?)(\\2|(\\4)})", // inline AlpineJs `class: `
   "files.associations": {
     "*.html.erb": "erb",
     "*.tailwind.css": "tailwindcss"
   },
+  "tailwindCSS.emmetCompletions": true,
+  "todohighlight.enableDiagnostics": true,
+  "todohighlight.include": [
+    "**/*.js",
+    "**/*.html",
+    "**/*.css",
+    "**/*.rb",
+    "**/*.txt",
+    "**/*.md",
+    "**/*.erb",
+    "**/*.rake"
+  ],
   "vscode-erb-beautify.keepBlankLines": 1,
-  "inlineFold.regex": "(class=|className=|class:\\s*)(({(`|))|(['\"`]))(.*?)(\\2|(\\4)})", // inline AlpineJs `class: `
-  "debug.internalConsoleOptions": "neverOpen",
-  "testExplorer.addToEditorContextMenu": true,
   // -----------------256-color ANSI SUPPORT ----------------
-  "workbench.colorTheme": "Default Dark Modern",
+  "terminal.integrated.shellIntegration.enabled": false,
   "terminal.integrated.minimumContrastRatio": 1,
   "terminal.integrated.drawBoldTextInBrightColors": false,
   "workbench.colorCustomizations": {
     "terminal.background": "#1f1f1f"
-    // "terminal.foreground" : "#EEEEEE",
   },
+  "workbench.colorTheme": "Default Dark Modern",
   // ---------------------------------------------------------
-  "terminal.integrated.shellIntegration.enabled": false,
-  "editor.formatOnSave": true,
-  "editor.tabSize": 2, // Use 2 spaces for indentation
-  "editor.insertSpaces": true,
-  "todohighlight.enableDiagnostics": true, // Use spaces and not tabs for indentantion
 }
\ No newline at end of file