diff --git a/themes/spaceduck/default.nix b/themes/spaceduck/default.nix
index 21ad77d..dbfbb04 100644
--- a/themes/spaceduck/default.nix
+++ b/themes/spaceduck/default.nix
@@ -3,6 +3,21 @@
 
   stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/spaceduck.yaml";
 
+  home-manager.sharedModules = [
+    {
+      programs.vscode = {
+        extensions = with inputs.nix-vscode-extensions.extensions.${system}; [
+          vscode-marketplace.youssefbouzekri.spaceduck
+          vscode-marketplace.vscode-icons-team.vscode-icons
+        ];
+        userSettings = {
+          "workbench.colorTheme" = "Spaceduck";
+          "workbench.iconTheme" = "vscode-icons";
+        };
+      };
+    }
+  ];
+
   stylix.fonts = {
     serif = {
       package = pkgs.dejavu_fonts;
diff --git a/themes/tokyonight/default.nix b/themes/tokyonight/default.nix
new file mode 100644
index 0000000..f3ca5b9
--- /dev/null
+++ b/themes/tokyonight/default.nix
@@ -0,0 +1,42 @@
+{pkgs, ...}: {
+  stylix.image = ./wallpaper.jpg;
+
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml";
+
+  home-manager.sharedModules = [
+    {
+      programs.vscode = {
+        extensions = with inputs.nix-vscode-extensions.extensions.${system}; [
+          vscode-marketplace.enkia.tokyo-night
+          vscode-marketplace.vscode-icons-team.vscode-icons
+        ];
+        userSettings = {
+          "workbench.colorTheme" = "Tokyo Night";
+          "workbench.iconTheme" = "vscode-icons";
+        };
+      };
+    }
+  ];
+
+  stylix.fonts = {
+    serif = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Serif";
+    };
+
+    sansSerif = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Sans";
+    };
+
+    monospace = {
+      package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
+      name = "JetBrainsMono Nerd Font";
+    };
+
+    emoji = {
+      package = pkgs.noto-fonts-emoji;
+      name = "Noto Color Emoji";
+    };
+  };
+}
diff --git a/themes/tokyonight/wallpaper.jpg b/themes/tokyonight/wallpaper.jpg
new file mode 100644
index 0000000..00e6b68
Binary files /dev/null and b/themes/tokyonight/wallpaper.jpg differ