diff --git a/.editorconfig b/.editorconfig
index f79a823d7..5886a1c76 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ indent_style                = space
 insert_final_newline        = true
 max_line_length             = 120
 tab_width                   = 2
-; trim_trailing_whitespace    = true ; disabled until files are cleaned up
+trim_trailing_whitespace    = true
 
 [*.md]
 trim_trailing_whitespace    = false
diff --git a/.vscode/.shellcheckrc b/.vscode/.shellcheckrc
deleted file mode 100644
index 4631bd3af..000000000
--- a/.vscode/.shellcheckrc
+++ /dev/null
@@ -1 +0,0 @@
-disable=SC2034,SC1091,SC2155,SC2086,SC2317,SC2181,SC2164
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 1949e6fc5..5749d3b1d 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,8 +1,7 @@
 {
   "recommendations": [
-    "bmalehorn.shell-syntax",
     "timonwong.shellcheck",
-    "foxundermoon.shell-format"
+    "mkhl.shfmt"
   ],
   "unwantedRecommendations": []
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8f17c7ff9..779bbdd17 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,33 +1,12 @@
 {
-    "files.associations": {
-        "*.func": "shellscript"
-    },
-    "files.eol": "\n",
-    "files.encoding": "utf8",
-    "files.trimTrailingWhitespace": true,
-    "files.insertFinalNewline": true,
-    "files.autoSave": "afterDelay",
-    "files.autoGuessEncoding": false,
-    "editor.detectIndentation": false,
-    "editor.tabSize": 4,
-    "editor.insertSpaces": true,
-    "editor.wordWrap": "off",
-    "editor.renderWhitespace": "boundary",
-    "editor.formatOnSave": true,
-    "editor.formatOnPaste": true,
-    "editor.minimap.enabled": false,
-    "terminal.integrated.scrollback": 10000,
-    "[shellscript]": {
-        "editor.defaultFormatter": "foxundermoon.shell-format",
-        "editor.tabSize": 4,
-        "editor.insertSpaces": true,
-    },
-    "shellcheck.customArgs": [
-        "--rcfile",
-        ".vscode/.shellcheckrc"
-    ],
-    "git.autofetch": true,
-    "git.confirmSync": false,
-    "git.enableSmartCommit": true,
-    "extensions.ignoreRecommendations": false
+  "files.associations": {
+    "*.func": "shellscript"
+  },
+  "[shellscript]": {
+    "editor.defaultFormatter": "mkhl.shfmt",
+  },
+  "editor.codeActionsOnSave": {
+    "source.fixAll": "never",
+  },
+  "shellcheck.useWorkspaceRootAsCwd": true,
 }