diff --git a/home/desktop/vscode.nix b/home/desktop/vscode.nix
index 7657cb5..7cc5ee0 100644
--- a/home/desktop/vscode.nix
+++ b/home/desktop/vscode.nix
@@ -12,25 +12,58 @@
     package = pkgs.vscodium;
     extensions = with inputs.nix-vscode-extensions.extensions.${system};
       [
-        # Cosmetics
+        # General extensions
+
+        ## Code Completion
+        vscode-marketplace.github.copilot
+        vscode-marketplace.github.copilot-chat
+        vscode-marketplace.visualstudioexptteam.vscodeintellicode
+
+        ## Cosmetics
         vscode-marketplace.vscode-icons-team.vscode-icons
 
-        # Copilot
-        vscode-marketplace.github.copilot
-        vscode-marketplace.github.copilot-labs
-        vscode-marketplace.github.copilot-chat
+        ## Export and Visualisation
+        vscode-marketplace.pnp.polacode
+        vscode-marketplace.nobuhito.printcode
+        vscode-marketplace.ibm.output-colorizer
 
-        # Git
+        ## Git
         vscode-marketplace.mhutchie.git-graph
+        vscode-marketplace.lamartire.git-indicators
 
-        # Just files
-        vscode-marketplace.skellock.just
+        ## Miscelaneous
+        vscode-marketplace.qcz.text-power-tools
+        vscode-marketplace.britesnow.vscode-toggle-quotes
 
-        # Nix language extensions
+
+        # Language extensions
+
+        ## CSV
+        vscode-marketplace.mechatroner.rainbow-csv
+
+        ## JavaScript/TypeScript language extensions
+        vscode-marketplace.yatki.vscode-surround
+        vscode-marketplace.wallabyjs.quokka-vscode
+        vscode-marketplace.mgmcdermott.vscode-language-babel
+        vscode-marketplace.liamhammett.inline-parameters
+        vscode-marketplace.johnpapa.vscode-peacock
+        vscode-marketplace.esbenp.prettier-vscode
+        vscode-marketplace.christian-kohler.npm-intellisense
+
+        ## Nix language extensions
         vscode-marketplace.bbenoist.nix
 
-        # Rust language extensions
+        ## Rust language extensions
+        vscode-marketplace.vadimcn.vscode-lldb
+        vscode-marketplace.tamasfe.even-better-toml
+        vscode-marketplace.serayuzgur.crates
         vscode-marketplace.rust-lang.rust-analyzer
+
+        ## SVG
+        vscode-marketplace.dheovani.svg-viewer
       ];
+    userSettings = {
+      "editor.linkedEditing" = true;
+    };
   };
 }
diff --git a/justfile b/justfile
deleted file mode 100644
index de1b286..0000000
--- a/justfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# Check the nix flake
-check:
-    nix flake check
-
-# Upgrade the nix flake
-upgrade:
-    nix flake update
\ No newline at end of file
diff --git a/themes/sandstone-forest/default.nix b/themes/sandstone-forest/default.nix
index e131eea..96f4d9e 100644
--- a/themes/sandstone-forest/default.nix
+++ b/themes/sandstone-forest/default.nix
@@ -5,19 +5,6 @@
 
   stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
 
-  home-manager.sharedModules = [
-    {
-      programs.vscode = {
-        extensions = with inputs.nix-vscode-extensions.extensions.${system}; [
-          vscode-marketplace.sainnhe.everforest
-        ];
-        userSettings = {
-          "workbench.colorTheme" = "Everforest Dark";
-        };
-      };
-    }
-  ];
-
   stylix.fonts = {
     serif = {
       package = pkgs.dejavu_fonts;
diff --git a/themes/targets/all.nix b/themes/targets/all.nix
index 321ff9a..0ce97b6 100644
--- a/themes/targets/all.nix
+++ b/themes/targets/all.nix
@@ -1,6 +1,7 @@
 {
   stylix.autoEnable = true;
 
+
   home-manager.sharedModules = [
     {
       stylix.autoEnable = true;