diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 67ff064..a490b20 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -21,24 +21,12 @@
     "timonwong.shellcheck",
     "dtsvet.vscode-wasm",
     "13xforever.language-x86-64-assembly",
-    "ms-vscode.cpptools-extension-pack"
+    "ms-vscode.cpptools",
+    "ms-vscode.cpptools-themes",
+    "jeff-hykin.better-cpp-syntax"
   ],
-
   "workspaceMount": "source=${localWorkspaceFolder},target=/sledge,type=bind,consistency=cached",
   "workspaceFolder": "/sledge",
-
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // "forwardPorts": [],
-
-  // Uncomment the next line to run commands after the container is created - for example installing curl.
   "postCreateCommand": "make -C /sledge install && make -B -C /sledge/runtime/tests clean all",
-
-  // Uncomment when using a ptrace-based debugger like C++, Go, and Rust
-  // "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
-
-  // Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
-  // "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
-
-  // Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
-  "remoteUser": "root",
+  "containerUser": "dev",
 }
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index a78a207..dd5cc50 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -5,6 +5,8 @@
     "timonwong.shellcheck",
     "dtsvet.vscode-wasm",
     "13xforever.language-x86-64-assembly",
-    "ms-vscode.cpptools-extension-pack"
+    "ms-vscode.cpptools",
+    "ms-vscode.cpptools-themes",
+    "jeff-hykin.better-cpp-syntax"
   ]
 }