diff --git a/config.nix b/config.nix
index e0a645a..d273c8a 100644
--- a/config.nix
+++ b/config.nix
@@ -14,7 +14,15 @@ lib: {
       description = "Main user's email address";
     };
     theme = lib.mkOption {
-      type = lib.types.enum ["tokyo-night" "kanagawa" "everforest" "catppuccin" "nord" "gruvbox"];
+      type = lib.types.enum [
+        "tokyo-night"
+        "kanagawa"
+        "everforest"
+        "catppuccin"
+        "nord"
+        "gruvbox"
+        "gruvbox-light"
+      ];
       default = "tokyo-night";
       description = "Theme to use for Omarchy configuration";
     };
diff --git a/config/themes/tokyo-night/wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg b/config/themes/wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg
similarity index 100%
rename from config/themes/tokyo-night/wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg
rename to config/themes/wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg
diff --git a/config/themes/everforest/wallpapers/1-everforest.jpg b/config/themes/wallpapers/1-everforest.jpg
similarity index 100%
rename from config/themes/everforest/wallpapers/1-everforest.jpg
rename to config/themes/wallpapers/1-everforest.jpg
diff --git a/config/themes/gruvbox/wallpapers/gruvbox-1.jpg b/config/themes/wallpapers/gruvbox-1.jpg
similarity index 100%
rename from config/themes/gruvbox/wallpapers/gruvbox-1.jpg
rename to config/themes/wallpapers/gruvbox-1.jpg
diff --git a/config/themes/kanagawa/wallpapers/kanagawa-1.png b/config/themes/wallpapers/kanagawa-1.png
similarity index 100%
rename from config/themes/kanagawa/wallpapers/kanagawa-1.png
rename to config/themes/wallpapers/kanagawa-1.png
diff --git a/config/themes/nord/wallpapers/nord-1.png b/config/themes/wallpapers/nord-1.png
similarity index 100%
rename from config/themes/nord/wallpapers/nord-1.png
rename to config/themes/wallpapers/nord-1.png
diff --git a/modules/home-manager/alacritty.nix b/modules/home-manager/alacritty.nix
deleted file mode 100644
index d1fbc12..0000000
--- a/modules/home-manager/alacritty.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.omarchy;
-in {
-  programs.alacritty = {
-    enable = true;
-    settings = {
-      # Window settings
-      window = {
-        padding = {
-          x = 14;
-          y = 14;
-        };
-        decorations = "none";
-        opacity = 0.95;
-      };
-
-      font = {
-        normal = {
-          family = cfg.primary_font;
-          style = "Regular";
-        };
-        bold = {
-          family = cfg.primary_font;
-          style = "Bold";
-        };
-        italic = {
-          family = cfg.primary_font;
-          style = "Italic";
-        };
-        bold_italic = {
-          family = cfg.primary_font;
-          style = "Bold Italic";
-        };
-        size = 11.0;
-      };
-
-      # Colors
-      colors = {
-        primary.background = "#${config.colorScheme.palette.base00}";
-        primary.foreground = "#${config.colorScheme.palette.base05}";
-
-        normal.black = "#${config.colorScheme.palette.base00}"; 
-        normal.red = "#${config.colorScheme.palette.base08}"; 
-        normal.green = "#${config.colorScheme.palette.base0B}"; 
-        normal.yellow = "#${config.colorScheme.palette.base0A}"; 
-        normal.blue = "#${config.colorScheme.palette.base0D}"; 
-        normal.magenta = "#${config.colorScheme.palette.base0E}"; 
-        normal.cyan = "#${config.colorScheme.palette.base0C}"; 
-        normal.white = "#${config.colorScheme.palette.base05}"; 
-
-        bright.black = "#${config.colorScheme.palette.base03}"; 
-        bright.red = "#${config.colorScheme.palette.base09}"; 
-        bright.green = "#${config.colorScheme.palette.base01}"; 
-        bright.yellow = "#${config.colorScheme.palette.base02}"; 
-        bright.blue = "#${config.colorScheme.palette.base04}"; 
-        bright.magenta = "#${config.colorScheme.palette.base06}"; 
-        bright.cyan = "#${config.colorScheme.palette.base0F}"; 
-        bright.white = "#${config.colorScheme.palette.base07}"; 
-      };
-    };
-  };
-}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 1135ca1..016e614 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -13,7 +13,7 @@ in {
     (import ./hyprlock.nix inputs)
     (import ./hyprpaper.nix)
     (import ./hypridle.nix)
-    (import ./alacritty.nix)
+    (import ./ghostty.nix)
     (import ./btop.nix)
     (import ./direnv.nix)
     (import ./git.nix)
diff --git a/modules/home-manager/ghostty.nix b/modules/home-manager/ghostty.nix
new file mode 100644
index 0000000..1f1babf
--- /dev/null
+++ b/modules/home-manager/ghostty.nix
@@ -0,0 +1,57 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.omarchy;
+  palette = config.colorScheme.palette;
+in {
+  programs.ghostty = {
+    enable = true;
+    settings = {
+      # Window settings
+      window-padding-x = 14;
+      window-padding-y = 14;
+      background-opacity = 0.95;
+      window-decoration = "none";
+
+      font-family = cfg.primary_font;
+      font-size = 12;
+
+      theme = "omarchy";
+    };
+    themes = {
+      omarchy = {
+        background = "#${palette.base00}";
+        foreground = "#${palette.base05}";
+
+        selection-background = "#${palette.base02}";
+        selection-foreground = "#${palette.base00}";
+        palette = [
+          "0=#${palette.base00}"
+          "1=#${palette.base08}"
+          "2=#${palette.base0B}"
+          "3=#${palette.base0A}"
+          "4=#${palette.base0D}"
+          "5=#${palette.base0E}"
+          "6=#${palette.base0C}"
+          "7=#${palette.base05}"
+          "8=#${palette.base03}"
+          "9=#${palette.base08}"
+          "10=#${palette.base0B}"
+          "11=#${palette.base0A}"
+          "12=#${palette.base0D}"
+          "13=#${palette.base0E}"
+          "14=#${palette.base0C}"
+          "15=#${palette.base07}"
+          "16=#${palette.base09}"
+          "17=#${palette.base0F}"
+          "18=#${palette.base01}"
+          "19=#${palette.base02}"
+          "20=#${palette.base04}"
+          "21=#${palette.base06}"
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/home-manager/hyprland/bindings.nix b/modules/home-manager/hyprland/bindings.nix
index 9b9b152..67eaa36 100644
--- a/modules/home-manager/hyprland/bindings.nix
+++ b/modules/home-manager/hyprland/bindings.nix
@@ -91,7 +91,7 @@ in {
         "SUPER, PRINT, exec, hyprpicker -a"
 
         # Clipse
-        "CTRL SUPER, V, exec, alacritty --class clipse -e clipse"
+        "CTRL SUPER, V, exec, ghostty --class clipse -e clipse"
       ];
 
     bindm = [
diff --git a/modules/home-manager/hyprland/configuration.nix b/modules/home-manager/hyprland/configuration.nix
index a18f3b4..66933fa 100644
--- a/modules/home-manager/hyprland/configuration.nix
+++ b/modules/home-manager/hyprland/configuration.nix
@@ -15,7 +15,7 @@ in {
   ];
   wayland.windowManager.hyprland.settings = {
     # Default applications
-    "$terminal" = lib.mkDefault "alacritty";
+    "$terminal" = lib.mkDefault "ghostty";
     "$fileManager" = lib.mkDefault "nautilus --new-window";
     "$browser" = lib.mkDefault "chromium --new-window --ozone-platform=wayland";
     "$music" = lib.mkDefault "spotify";
diff --git a/modules/home-manager/hyprland/windows.nix b/modules/home-manager/hyprland/windows.nix
index 80e6594..962b8e4 100644
--- a/modules/home-manager/hyprland/windows.nix
+++ b/modules/home-manager/hyprland/windows.nix
@@ -17,9 +17,6 @@
       # Float Steam, fullscreen RetroArch
       "float, class:^(steam)$"
       "fullscreen, class:^(com.libretro.RetroArch)$"
-      
-
-
 
       # Just dash of transparency
       "opacity 0.97 0.9, class:.*"
diff --git a/modules/home-manager/hyprlock.nix b/modules/home-manager/hyprlock.nix
index 35a2cd4..1d22348 100644
--- a/modules/home-manager/hyprlock.nix
+++ b/modules/home-manager/hyprlock.nix
@@ -4,14 +4,13 @@ inputs: {
   lib,
   ...
 }: let
-
   palette = config.colorScheme.palette;
   convert = inputs.nix-colors.lib.conversions.hexToRGBString;
 
-  backgroundRgb = "rgb(${convert ", " palette.base00 })"; 
-  surfaceRgb = "rgb(${convert ", " palette.base02 })"; 
-  foregroundRgb =  "rgb(${convert ", " palette.base0B })"; 
-  foregroundMutedRgb =  "rgb(${convert ", " palette.base04 })";
+  backgroundRgb = "rgba(${convert ", " palette.base00}, 0.8)";
+  surfaceRgb = "rgb(${convert ", " palette.base02})";
+  foregroundRgb = "rgb(${convert ", " palette.base0B})";
+  foregroundMutedRgb = "rgb(${convert ", " palette.base04})";
 in {
   programs.hyprlock = {
     enable = true;
@@ -25,7 +24,10 @@ in {
       };
       background = {
         monitor = "";
-        color = backgroundRgb;
+        path = "screenshot";
+        # color = backgroundRgb;
+        blur_passes = 3;
+        brightness = 0.6;
       };
 
       input-field = {
diff --git a/modules/home-manager/hyprpaper.nix b/modules/home-manager/hyprpaper.nix
index f817bdf..ad84a80 100644
--- a/modules/home-manager/hyprpaper.nix
+++ b/modules/home-manager/hyprpaper.nix
@@ -20,6 +20,9 @@
     "gruvbox" = [
       "gruvbox-1.jpg"
     ];
+    "gruvbox-light" = [
+      "gruvbox-1.jpg"
+    ];
   };
 
   selected_wallpaper = builtins.elemAt (wallpapers.${cfg.theme}) 0;
@@ -27,7 +30,7 @@
 in {
   home.file = {
     "Pictures/Wallpapers" = {
-      source = ../../config/themes/${cfg.theme}/wallpapers;
+      source = ../../config/themes/wallpapers;
       recursive = true;
     };
   };
diff --git a/modules/home-manager/mako.nix b/modules/home-manager/mako.nix
index 44d7cc0..477b222 100644
--- a/modules/home-manager/mako.nix
+++ b/modules/home-manager/mako.nix
@@ -9,10 +9,10 @@ in {
     enable = true;
 
     settings = {
-      background-color = "#${config.colorScheme.palette.base00}"; 
-      text-color = "${config.colorScheme.palette.base05}"; 
+      background-color = "#${config.colorScheme.palette.base00}";
+      text-color = "${config.colorScheme.palette.base05}";
       border-color = "${config.colorScheme.palette.base04}";
-      progress-color = "${config.colorScheme.palette.base0D}"; 
+      progress-color = "${config.colorScheme.palette.base0D}";
 
       width = 420;
       height = 110;
diff --git a/modules/home-manager/vscode.nix b/modules/home-manager/vscode.nix
index 2e005d1..7350178 100644
--- a/modules/home-manager/vscode.nix
+++ b/modules/home-manager/vscode.nix
@@ -21,6 +21,7 @@ in {
       extensions = with pkgs.vscode-extensions;
         [
           bbenoist.nix
+          vscodevim.vim
         ]
         ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
           {
diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
index aab4e15..7cbd681 100644
--- a/modules/home-manager/waybar.nix
+++ b/modules/home-manager/waybar.nix
@@ -68,7 +68,7 @@
         cpu = {
           interval = 5;
           format = "󰍛";
-          on-click = "alacritty -e btop";
+          on-click = "ghostty -e btop";
         };
         clock = {
           format = "{:%A %I:%M %p}";
@@ -86,7 +86,7 @@
           tooltip-format-disconnected = "Disconnected";
           interval = 3;
           nospacing = 1;
-          on-click = "alacritty -e iwctl";
+          on-click = "ghostty -e iwctl";
         };
         battery = {
           interval = 5;
diff --git a/modules/home-manager/wofi.nix b/modules/home-manager/wofi.nix
index 91b89af..2d10f66 100644
--- a/modules/home-manager/wofi.nix
+++ b/modules/home-manager/wofi.nix
@@ -14,7 +14,7 @@
         window {
           margin: 0px;
           padding: 20px;
-          background-color: #${config.colorScheme.palette.base00}; 
+          background-color: #${config.colorScheme.palette.base00};
           opacity: 0.95;
         }
 
@@ -22,28 +22,28 @@
           margin: 0;
           padding: 0;
           border: none;
-          background-color: #${config.colorScheme.palette.base00}; 
+          background-color: #${config.colorScheme.palette.base00};
         }
 
         #outer-box {
           margin: 0;
           padding: 20px;
           border: none;
-          background-color: #${config.colorScheme.palette.base00}; 
+          background-color: #${config.colorScheme.palette.base00};
         }
 
         #scroll {
           margin: 0;
           padding: 0;
           border: none;
-          background-color: #${config.colorScheme.palette.base00}; 
+          background-color: #${config.colorScheme.palette.base00};
         }
 
         #input {
           margin: 0;
           padding: 10px;
           border: none;
-          background-color: #${config.colorScheme.palette.base00}; 
+          background-color: #${config.colorScheme.palette.base00};
           color: @text;
         }
 
@@ -56,11 +56,11 @@
         #text {
           margin: 5px;
           border: none;
-          color: #${config.colorScheme.palette.base06}; 
+          color: #${config.colorScheme.palette.base06};
         }
 
         #entry {
-          background-color: #${config.colorScheme.palette.base00}; 
+          background-color: #${config.colorScheme.palette.base00};
         }
 
         #entry:selected {
diff --git a/modules/nixos/system.nix b/modules/nixos/system.nix
index 324e8ad..20dcb26 100644
--- a/modules/nixos/system.nix
+++ b/modules/nixos/system.nix
@@ -38,6 +38,4 @@ in {
     noto-fonts-emoji
     nerd-fonts.caskaydia-mono
   ];
-
-
 }
diff --git a/modules/packages.nix b/modules/packages.nix
index 3568f35..23de092 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -8,7 +8,6 @@
     pavucontrol
     brightnessctl
     ffmpeg
-    alacritty
     nautilus
     hyprshot
     hyprpicker
diff --git a/modules/themes.nix b/modules/themes.nix
index a4025e6..7197e59 100644
--- a/modules/themes.nix
+++ b/modules/themes.nix
@@ -26,5 +26,9 @@
     base16-theme = "gruvbox-dark-hard";
     vscode-theme = "Gruvbox Dark Hard";
   };
+  "gruvbox-light" = {
+    base16-theme = "gruvbox-light-medium";
+    vscode-theme = "Gruvbox Light Medium";
+  };
   # Add more themes here
 }