diff --git a/flake.nix b/flake.nix
index e412467..b64358a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,7 +80,9 @@
       in
       {
         devShells = {
+          bun = import ./hosts/common/system/shells/bun { inherit pkgs; };
           nix = import ./hosts/common/system/shells/nix { inherit pkgs; };
+          nodejs = import ./hosts/common/system/shells/nodejs { inherit pkgs; };
           python = import ./hosts/common/system/shells/python { inherit pkgs; };
         };
 
diff --git a/hosts/common/system/shells/bun/default.nix b/hosts/common/system/shells/bun/default.nix
new file mode 100644
index 0000000..7baf42c
--- /dev/null
+++ b/hosts/common/system/shells/bun/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+pkgs.mkShell {
+  packages = with pkgs; [
+    bun
+  ];
+}
diff --git a/hosts/common/system/shells/nix/default.nix b/hosts/common/system/shells/nix/default.nix
index d85081c..ecbdbc4 100644
--- a/hosts/common/system/shells/nix/default.nix
+++ b/hosts/common/system/shells/nix/default.nix
@@ -5,8 +5,4 @@ pkgs.mkShell {
     nil
     nixpkgs-fmt
   ];
-
-  shellHook = ''
-    exec $SHELL
-  '';
 }
diff --git a/hosts/common/system/shells/nodejs/default.nix b/hosts/common/system/shells/nodejs/default.nix
new file mode 100644
index 0000000..b76036c
--- /dev/null
+++ b/hosts/common/system/shells/nodejs/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+pkgs.mkShell {
+  packages = with pkgs; [
+    nodejs
+  ];
+}
diff --git a/hosts/common/system/shells/python/default.nix b/hosts/common/system/shells/python/default.nix
index 0a2e362..d4ac783 100644
--- a/hosts/common/system/shells/python/default.nix
+++ b/hosts/common/system/shells/python/default.nix
@@ -11,8 +11,4 @@ pkgs.mkShell {
       ]
     ))
   ];
-
-  shellHook = ''
-    exec $SHELL
-  '';
 }
diff --git a/hosts/common/user/configs/gui/gtk/default.nix b/hosts/common/user/configs/gui/gtk/default.nix
index a7c8c28..6ff7cd0 100644
--- a/hosts/common/user/configs/gui/gtk/default.nix
+++ b/hosts/common/user/configs/gui/gtk/default.nix
@@ -97,8 +97,8 @@ in
             fi
 
             $DCONF_DBUS_RUN_SESSION bash -c "
-              dconf write /org/gnome/desktop/interface/gtk-theme "'$GTK_THEME'"
-              dconf write /org/gnome/desktop/interface/color-scheme "'prefer-$MODE'"
+              dconf write /org/gnome/desktop/interface/gtk-theme \"'$GTK_THEME'\"
+              dconf write /org/gnome/desktop/interface/color-scheme \"'prefer-$MODE'\"
             "
           '';
         }
diff --git a/hosts/common/user/configs/gui/vscode/default.nix b/hosts/common/user/configs/gui/vscode/default.nix
index 16df14c..04cdd3d 100644
--- a/hosts/common/user/configs/gui/vscode/default.nix
+++ b/hosts/common/user/configs/gui/vscode/default.nix
@@ -108,6 +108,7 @@ in
     imports = [
       ./langs/nix
       ./langs/python
+      ./langs/svelte
     ];
   };
 }
diff --git a/hosts/common/user/configs/gui/vscode/langs/svelte/default.nix b/hosts/common/user/configs/gui/vscode/langs/svelte/default.nix
new file mode 100644
index 0000000..a1e4547
--- /dev/null
+++ b/hosts/common/user/configs/gui/vscode/langs/svelte/default.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+{
+  programs.vscode = {
+    userSettings = {
+      "svelte.enable-ts-plugin" = true;
+    };
+
+    extensions =
+      with pkgs;
+      with vscode-extensions;
+      [
+        svelte.svelte-vscode
+      ];
+  };
+}