diff --git a/modules/home-manager/caelestia.nix b/modules/home-manager/caelestia.nix
index af7af11..9648cf4 100644
--- a/modules/home-manager/caelestia.nix
+++ b/modules/home-manager/caelestia.nix
@@ -405,7 +405,7 @@
       useFahrenheit = false;
       useFahrenheitPerformance = false;
       useTwelveHourClock = false;
-      smartScheme = true;
+      smartScheme = false; # default true
       visualisersBars = 45;
     };
     session = {
@@ -498,10 +498,10 @@
         extraArgs = [];
       };
       wallpaper = {
-        postHook = ""; # default "echo $WALLPAPER_PATH"
+        postHook = "caelestia scheme set -n gruvbox -f soft -m dark"; # sets the theme
       };
       theme = {
-        enableTerm = true;
+        enableTerm = false; # we do it manually by adapting our kitty config
         enableHypr = true;
         enableDiscord = true;
         enableSpicetify = true;
diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix
index f486c9b..1dfa5c6 100644
--- a/modules/home-manager/kitty.nix
+++ b/modules/home-manager/kitty.nix
@@ -7,7 +7,65 @@
     enable = true;
     #font.name = nerd-fonts._0xproto;
     #font.size = "10";
+    ## new config (matches with caelestia
+    ## old condfig
     extraConfig = ''
+      font_size 14
+bold_font auto
+italic_font auto
+bold_italic_font auto
+
+window_padding_width 25
+
+# --- Core ---
+foreground #ece0d9
+background #18120e
+
+selection_foreground #18120e
+selection_background #ece0d9
+
+cursor #ffb878
+cursor_text_color #18120e
+
+# --- Tabs ---
+active_tab_foreground #18120e
+active_tab_background #5c412a
+inactive_tab_foreground #d6c3b5
+inactive_tab_background #241e1a
+
+# --- Black / Gray ---
+color0  #353433
+color8  #b29f91
+
+# --- Red ---
+color1  #e17300
+color9  #ff8a20
+
+# --- Green ---
+color2  #ffc071
+color10 #ffd6a8
+
+# --- Yellow ---
+color3  #ffe0c6
+color11 #fff2e8
+
+# --- Blue ---
+color4  #b9ab66
+color12 #d7be91
+
+# --- Magenta ---
+color5  #ed9562
+color13 #fcad7e
+
+# --- Cyan ---
+color6  #f4c16d
+color14 #ffd497
+
+# --- White ---
+color7  #ebd4c1
+color15 #FFFFFF
+      '';
+    /*extraConfig = ''
       # font	nerd-fonts._0xproto # this key dont work and causes errors
       font_size	14
       bold_font        auto
@@ -60,6 +118,6 @@
       # white
       color7      #FFF0CC
       color15     #F0DBAA
-    '';
+    '';*/
   };
 }
diff --git a/modules/home-manager/neovim.nix b/modules/home-manager/neovim.nix
index 352318c..9652081 100644
--- a/modules/home-manager/neovim.nix
+++ b/modules/home-manager/neovim.nix
@@ -14,7 +14,8 @@
       pkgs-unstable.vimPlugins.vivify-vim
       pkgs-unstable.vimPlugins.vimtex
       pkgs-unstable.vimPlugins.zoxide-vim
-      pkgs-unstable.vimPlugins.gruvbox
+      #pkgs-unstable.vimPlugins.gruvbox
+      pkgs-unstable.vimPlugins.gruvbox-nvim
       pkgs-unstable.vimPlugins.neovim-sensible
       pkgs-unstable.vimPlugins.nvim-web-devicons
       pkgs-unstable.vimPlugins.nvim-tree-lua
@@ -127,7 +128,9 @@ vim.keymap.set('n', 'g,', '<Nop>', { desc = 'Disable g motion' })
       vim.opt.tabstop = 4
       vim.opt.shiftwidth = 4
       vim.opt.inccommand = 'split'
-      vim.opt.cursorline = true vim.opt.scrolloff = 10 vim.opt.termguicolors = true vim.o.background = "dark" vim.cmd("colorscheme gruvbox")
+      vim.opt.cursorline = true
+      vim.opt.scrolloff = 10
+      
 
       -- =========================
       -- BASIC KEYMAPS
@@ -370,7 +373,41 @@ vim.lsp.enable({ "lua_ls", "clangd", "pylsp", "texlab", "nixd"})
         -- Enable debug messages
         debug = false,
       })
+      -- ======================
+      -- gruvbox
+      -- ======================
 
+      require("gruvbox").setup({
+        terminal_colors = false, -- add neovim terminal colors
+        undercurl = true,
+        underline = true,
+        bold = true,
+        italic = {
+          strings = false,
+          emphasis = true,
+          comments = true,
+          operators = false,
+          folds = true,
+        },
+        strikethrough = true,
+        invert_selection = false,
+        invert_signs = false,
+        invert_tabline = false,
+        inverse = true, -- invert background for search, diffs, statuslines and errors
+        contrast = "hard", -- can be "hard", "soft" or empty string
+        palette_overrides = {  -- for overrides see https://github.com/ellisonleao/gruvbox.nvim/blob/main/lua/gruvbox.lua
+          dark0_hard = "#241F17"
+        },
+        overrides = {
+          String = {fg = "#FFB878", italic = false},
+          FoldColumn = {fg = faded_orange, bg = dark0_hard}
+        },
+        dim_inactive = false,
+        transparent_mode = false,
+      })
+      vim.opt.termguicolors = false
+      vim.o.background = "dark"
+      vim.cmd("colorscheme gruvbox")
       -- =========================
       -- LUALINE
       -- =========================