diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 387ccaa32..dc325f05f 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -8,6 +8,8 @@
 		"stylelint.vscode-stylelint",
 		"esbenp.prettier-vscode",
 		"eamodio.gitlens",
+		"Orta.vscode-jest",
+		"macabeus.vscode-fluent",
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": []
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 59fe5c31f..97573fadf 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,36 +7,24 @@
     "eslint.validate": [
         "javascript"
     ],
-    "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.codeActionsOnSave": {
-            "source.fixAll.eslint": true
-        }
-    },
-    "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.codeActionsOnSave": {
-            "source.fixAll.eslint": true
-        }
-    },
-    "[typescriptreact]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.codeActionsOnSave": {
-            "source.fixAll.eslint": true
-        }
-    },
-    "[css]": {
-        "editor.codeActionsOnSave": {
-            "source.fixAll.stylelint": "explicit"
-        }
-    },
     "gitlens.advanced.blame.customArguments": [
         "--ignore-revs-file",
         ".git-blame-ignore-revs"
     ],
+    "[css][scss]": {
+        "editor.codeActionsOnSave": {
+            "source.fixAll.stylelint": "explicit"
+        }
+    },
     "[javascript][typescript][typescriptreact]": {
         "editor.codeActionsOnSave": {
             "source.fixAll.eslint": "explicit"
         }
     },
+    "[javascript][typescript][typescriptreact][markdown][html][css][scss]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+    },
+  "[fluent]": {
+    "files.trimTrailingWhitespace": true
+  },
 }
\ No newline at end of file