diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 2e2f2d1..a855b7a 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -5,10 +5,7 @@ vim.cmd("set softtabstop=2")
 vim.cmd("set shiftwidth=2")
 
 -- Configure Navigation Keys
---vim.keymap.set('n', '<c-Left>', ':wincmd h<CR>')
---vim.keymap.set('n', '<c-Right>', ':wincmd l<CR>')
---vim.keymap.set('n', '<c-Up>', ':wincmd k<CR>')
---vim.keymap.set('n', '<c-Down>', ':wincmd j<CR>')
+-- This is all handled by the vim-tmux-navigator plugin now
 
 -- Configure Editor Settings
 vim.cmd("set number")
@@ -76,20 +73,6 @@ vim.keymap.set("n", "<A-q>", ":BufferClose<CR>", { desc = "Close Buffer" })
 vim.keymap.set("n", "<leader>bp", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
 vim.keymap.set("n", "<leader>bn", ":BufferNext<CR>", { desc = "Next Buffer" })
 
--- Configure Pane Navigation
-vim.keymap.set("n", "<C-h>", "<Nop>")
-vim.keymap.set("n", "<C-j>", "<Nop>")
-vim.keymap.set("n", "<C-k>", "<Nop>")
-vim.keymap.set("n", "<C-l>", "<Nop>")
-vim.keymap.set("n", "<A-h>", ":wincmd h<CR>", { desc = "Navigate Left" })
-vim.keymap.set("n", "<A-j>", ":wincmd j<CR>", { desc = "Navigate Down" })
-vim.keymap.set("n", "<A-k>", ":wincmd k<CR>", { desc = "Navigate Up" })
-vim.keymap.set("n", "<A-l>", ":wincmd l<CR>", { desc = "Navigate Right" })
-vim.keymap.set("i", "<A-h>", ":wincmd h<CR>", { desc = "Navigate Left" })
-vim.keymap.set("i", "<A-j>", ":wincmd j<CR>", { desc = "Navigate Down" })
-vim.keymap.set("i", "<A-k>", ":wincmd k<CR>", { desc = "Navigate Up" })
-vim.keymap.set("i", "<A-l>", ":wincmd l<CR>", { desc = "Navigate Right" })
-
 -- Configure f-key shortcuts
 vim.keymap.set("n", "<F1>", vim.lsp.buf.hover)
 vim.keymap.set("i", "<F1>", vim.lsp.buf.hover)
diff --git a/.zshrc b/.zshrc
index fa03e16..b82db72 100644
--- a/.zshrc
+++ b/.zshrc
@@ -141,7 +141,7 @@ zinit snippet OMZP::colored-man-pages
 zinit snippet OMZP::encode64
 zinit snippet OMZP::gh
 zinit snippet OMZP::pip
-zinit snippet OMZP::sudo
+#zinit snippet OMZP::sudo
 
 zinit light zsh-users/zsh-autosuggestions
 zinit light zsh-users/zsh-syntax-highlighting
@@ -150,3 +150,4 @@ zinit light zsh-users/zsh-syntax-highlighting
 KEYTIMEOUT=5
 # ^[ for esc; ^I for tab
 bindkey '^a' autosuggest-accept
+bindkey '^[^[' vi-cmd-mode