diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua
index 854b4ad..309c3e3 100644
--- a/lua/plugins/astrocore.lua
+++ b/lua/plugins/astrocore.lua
@@ -205,10 +205,10 @@ return {
         ["L"] = { "<Cmd>BufferLineCycleNext<CR>", desc = "Next buffer" },
         ["H"] = { "<Cmd>BufferLineCyclePrev<CR>", desc = "Previous buffer" },
         -- Window navigation
-        ["<C-h>"] = { "<C-w>h", desc = "Navigate to left window" },
-        ["<C-j>"] = { "<C-w>j", desc = "Navigate to bottom window" },
-        ["<C-k>"] = { "<C-w>k", desc = "Navigate to top window" },
-        ["<C-l>"] = { "<C-w>l", desc = "Navigate to right window" },
+        ["<C-h>"] = { function() require("kitty-navigator").navigateLeft() end, desc = "Navigate to left window" },
+        ["<C-j>"] = { function() require("kitty-navigator").navigateDown() end, desc = "Navigate to bottom window" },
+        ["<C-k>"] = { function() require("kitty-navigator").navigateUp() end, desc = "Navigate to top window" },
+        ["<C-l>"] = { function() require("kitty-navigator").navigateRight() end, desc = "Navigate to right window" },
         ["<C-e>"] = { "<Cmd>Neotree toggle<CR>", desc = "Open Explorer" },
         ["<C-m>"] = { "<Cmd>OverseerRun<CR>", desc = "Run Overseer" },
         ["<leader><leader>"] = {
diff --git a/lua/plugins/buildtools.lua b/lua/plugins/buildtools.lua
index 69c5aaf..1f624d6 100644
--- a/lua/plugins/buildtools.lua
+++ b/lua/plugins/buildtools.lua
@@ -285,7 +285,6 @@ return {
     },
   },
 
-  { "wakatime/vim-wakatime", lazy = false },
   -- Git integration for collaborative development
   {
     "lewis6991/gitsigns.nvim",