diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000000..739a4f8b82
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["JuanBlanco.solidity"]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7c7c9933d4..5a44ed867e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,16 +1,3 @@
 {
-  // Workaround for https://github.com/juanfranblanco/vscode-solidity/issues/335#issuecomment-1505564408
-  // This only works because we:
-  //   - use pnpm for dependencies rather than forge lib (submodules)
-  //   - have aligned all dependency versions across all packages
-  "solidity.remappings": [
-    "memmove/=node_modules/.pnpm/github.com+dk1a+memmove@ffd71cd77b1708574ef46a667b23ca3a5cc9fa27/node_modules/memmove/src/",
-    "ds-test/=node_modules/.pnpm/github.com+dapphub+ds-test@c9ce3f25bde29fc5eb9901842bf02850dfd2d084/node_modules/ds-test/src/",
-    "forge-std/=node_modules/.pnpm/github.com+foundry-rs+forge-std@b4f121555729b3afb3c5ffccb62ff4b6e2818fd3/node_modules/forge-std/src/",
-    "solmate/=node_modules/.pnpm/github.com+transmissions11+solmate@9cf1428245074e39090dceacb0c28b1f684f584c/node_modules/solmate/src",
-    "ds-test/=node_modules/.pnpm/github.com+dapphub+ds-test@c9ce3f25bde29fc5eb9901842bf02850dfd2d084/node_modules/ds-test/src/",
-    "@latticexyz/=packages/",
-    "std-contracts/=packages/std-contracts/src/",
-    "solecs/=packages/solecs/src/"
-  ]
+  "solidity.monoRepoSupport": true
 }
diff --git a/templates/minimal/.vscode/extensions.json b/templates/minimal/.vscode/extensions.json
new file mode 100644
index 0000000000..739a4f8b82
--- /dev/null
+++ b/templates/minimal/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["JuanBlanco.solidity"]
+}
diff --git a/templates/minimal/.vscode/settings.json b/templates/minimal/.vscode/settings.json
index 69c51b25a8..5a44ed867e 100644
--- a/templates/minimal/.vscode/settings.json
+++ b/templates/minimal/.vscode/settings.json
@@ -1,12 +1,3 @@
 {
-  "solidity.remappings": [
-    "components/=./packages/contracts/src/components",
-    "systems/=./packages/contracts/src/systems",
-    "libraries/=./packages/contracts/src/libraries",
-    "std-contracts/=./node_modules/@latticexyz/std-contracts/src/",
-    "solecs/=./node_modules/@latticexyz/solecs/src/",
-    "memmove/=./node_modules/memmove/src/",
-    "ds-test/=./node_modules/ds-test/src/",
-    "forge-std/=./node_modules/forge-std/src/"
-  ]
+  "solidity.monoRepoSupport": true
 }
diff --git a/templates/react/.vscode/extensions.json b/templates/react/.vscode/extensions.json
new file mode 100644
index 0000000000..739a4f8b82
--- /dev/null
+++ b/templates/react/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["JuanBlanco.solidity"]
+}
diff --git a/templates/react/.vscode/settings.json b/templates/react/.vscode/settings.json
index 69c51b25a8..5a44ed867e 100644
--- a/templates/react/.vscode/settings.json
+++ b/templates/react/.vscode/settings.json
@@ -1,12 +1,3 @@
 {
-  "solidity.remappings": [
-    "components/=./packages/contracts/src/components",
-    "systems/=./packages/contracts/src/systems",
-    "libraries/=./packages/contracts/src/libraries",
-    "std-contracts/=./node_modules/@latticexyz/std-contracts/src/",
-    "solecs/=./node_modules/@latticexyz/solecs/src/",
-    "memmove/=./node_modules/memmove/src/",
-    "ds-test/=./node_modules/ds-test/src/",
-    "forge-std/=./node_modules/forge-std/src/"
-  ]
+  "solidity.monoRepoSupport": true
 }