diff --git a/config.nix b/config.nix
index 6a7a32a..e0a645a 100644
--- a/config.nix
+++ b/config.nix
@@ -14,7 +14,7 @@ lib: {
       description = "Main user's email address";
     };
     theme = lib.mkOption {
-      type = lib.types.enum ["tokyo-night" "kanagawa" "everforest" "catppuccin"];
+      type = lib.types.enum ["tokyo-night" "kanagawa" "everforest" "catppuccin" "nord" "gruvbox"];
       default = "tokyo-night";
       description = "Theme to use for Omarchy configuration";
     };
diff --git a/config/themes/gruvbox/wallpapers/gruvbox-1.jpg b/config/themes/gruvbox/wallpapers/gruvbox-1.jpg
new file mode 100644
index 0000000..54f6766
Binary files /dev/null and b/config/themes/gruvbox/wallpapers/gruvbox-1.jpg differ
diff --git a/config/themes/nord/wallpapers/nord-1.png b/config/themes/nord/wallpapers/nord-1.png
new file mode 100644
index 0000000..0152fa6
Binary files /dev/null and b/config/themes/nord/wallpapers/nord-1.png differ
diff --git a/modules/home-manager/alacritty.nix b/modules/home-manager/alacritty.nix
index 7b438fb..d1fbc12 100644
--- a/modules/home-manager/alacritty.nix
+++ b/modules/home-manager/alacritty.nix
@@ -2,7 +2,9 @@
   config,
   pkgs,
   ...
-}: {
+}: let
+  cfg = config.omarchy;
+in {
   programs.alacritty = {
     enable = true;
     settings = {
diff --git a/modules/home-manager/hyprpaper.nix b/modules/home-manager/hyprpaper.nix
index 3040352..f817bdf 100644
--- a/modules/home-manager/hyprpaper.nix
+++ b/modules/home-manager/hyprpaper.nix
@@ -14,6 +14,12 @@
     "everforest" = [
       "1-everforest.jpg"
     ];
+    "nord" = [
+      "nord-1.png"
+    ];
+    "gruvbox" = [
+      "gruvbox-1.jpg"
+    ];
   };
 
   selected_wallpaper = builtins.elemAt (wallpapers.${cfg.theme}) 0;
diff --git a/modules/home-manager/vscode.nix b/modules/home-manager/vscode.nix
index a620de7..2e005d1 100644
--- a/modules/home-manager/vscode.nix
+++ b/modules/home-manager/vscode.nix
@@ -41,6 +41,18 @@ in {
             version = "1.5.1";
             sha256 = "sha256-AGGioXcK/fjPaFaWk2jqLxovUNR59gwpotcSpGNbj1c=";
           }
+          {
+            name = "nord-visual-studio-code";
+            publisher = "arcticicestudio";
+            version = "0.19.0";
+            sha256 = "sha256-awbqFv6YuYI0tzM/QbHRTUl4B2vNUdy52F4nPmv+dRU=";
+          }
+          {
+            name = "gruvbox";
+            publisher = "jdinhlife";
+            version = "1.28.0";
+            sha256 = "sha256-XwQzbbZU6MfYcT50/0YgQp8UaOeQskEvEQPZXG72lLk=";
+          }
         ];
     };
   };
diff --git a/modules/themes.nix b/modules/themes.nix
index c87ab71..a4025e6 100644
--- a/modules/themes.nix
+++ b/modules/themes.nix
@@ -18,63 +18,13 @@
     vscode-theme = "Everforest Dark";
   };
 
+  "nord" = {
+    base16-theme = "nord";
+    vscode-theme = "Nord";
+  };
   "gruvbox" = {
-    vscode-theme = "Gruvbox Dark";
+    base16-theme = "gruvbox-dark-hard";
+    vscode-theme = "Gruvbox Dark Hard";
   };
-
-  "catppuccin-mocha" = {
-    # Base colors
-    background = "#1e1e2e";
-    foreground = "#cdd6f4";
-    surface = "#313244";
-    surface_variant = "#6c7086";
-
-    # Primary colors
-    primary = "#89b4fa";
-    primary_variant = "#74c7ec";
-    secondary = "#cba6f7";
-    accent = "#b4befe";
-
-    # Status colors
-    success = "#a6e3a1";
-    warning = "#f9e2af";
-    error = "#f38ba8";
-    info = "#89b4fa";
-
-    # Terminal colors
-    black = "#45475a";
-    red = "#f38ba8";
-    green = "#a6e3a1";
-    yellow = "#f9e2af";
-    blue = "#89b4fa";
-    magenta = "#cba6f7";
-    cyan = "#74c7ec";
-    white = "#bac2de";
-
-    # Bright terminal colors
-    bright_black = "#585b70";
-    bright_red = "#f38ba8";
-    bright_green = "#a6e3a1";
-    bright_yellow = "#f9e2af";
-    bright_blue = "#89b4fa";
-    bright_magenta = "#cba6f7";
-    bright_cyan = "#74c7ec";
-    bright_white = "#a6adc8";
-
-    # UI elements
-    border = "#b4befe";
-    selection = "#f5e0dc";
-    inactive = "#6c7086";
-    foreground_muted = "#cdd6f4";
-
-    # Special colors
-    orange = "#fab387";
-    rosewater = "#f5e0dc";
-
-    # VSCode theme
-    vscode-theme = "Catppuccin Mocha";
-  };
-
-  # "nord" = {};
   # Add more themes here
 }