diff --git a/.gitignore b/.gitignore
index 721c83d6..7fd59c08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ spell/
 CLAUDE.md
 STATUS.md
 VIDINTEL.md
+KEYBIND_ANALYSIS.md
diff --git a/init.lua b/init.lua
index fe6d8a1f..d953804b 100644
--- a/init.lua
+++ b/init.lua
@@ -428,41 +428,7 @@ require('lazy').setup({
       pcall(require('telescope').load_extension, 'fzf')
       pcall(require('telescope').load_extension, 'ui-select')
 
-      -- See `:help telescope.builtin`
-      local builtin = require 'telescope.builtin'
-      vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
-      vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
-      vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' })
-      vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
-      vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' })
-      vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
-      vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
-      vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
-      vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
-      vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
-
-      -- Slightly advanced example of overriding default behavior and theme
-      vim.keymap.set('n', '<leader>/', function()
-        -- You can pass additional configuration to Telescope to change the theme, layout, etc.
-        builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
-          winblend = 10,
-          previewer = false,
-        })
-      end, { desc = '[/] Fuzzily search in current buffer' })
-
-      -- It's also possible to pass additional configuration options.
-      --  See `:help telescope.builtin.live_grep()` for information about particular keys
-      vim.keymap.set('n', '<leader>s/', function()
-        builtin.live_grep {
-          grep_open_files = true,
-          prompt_title = 'Live Grep in Open Files',
-        }
-      end, { desc = '[S]earch [/] in Open Files' })
-
-      -- Shortcut for searching your Neovim configuration files
-      vim.keymap.set('n', '<leader>sn', function()
-        builtin.find_files { cwd = vim.fn.stdpath 'config' }
-      end, { desc = '[S]earch [N]eovim files' })
+      -- Telescope keymaps are now handled by custom.plugins.telescope
     end,
   },
 
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 0f699e4a..aa6c8637 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -4,11 +4,11 @@
 -- See the kickstart.nvim README for more information
 return {
   -- { import = 'custom.plugins.completion' },
-  -- { import = 'custom.plugins.debug' },
-  -- { import = 'custom.plugins.formatting' },
+  { import = 'custom.plugins.debug' },
+  { import = 'custom.plugins.formatting' },
   { import = 'custom.plugins.lsp' },
-  -- { import = 'custom.plugins.nvim-tmux-navigator' },
-  -- { import = 'custom.plugins.telescope' },
+  { import = 'custom.plugins.nvim-tmux-navigator' },
+  { import = 'custom.plugins.telescope' },
   -- { import = 'custom.plugins.theme' },
-  -- { import = 'custom.plugins.treesitter' },
+  { import = 'custom.plugins.treesitter' },
 }
diff --git a/lua/custom/plugins/nvim-tmux-navigator.lua b/lua/custom/plugins/nvim-tmux-navigator.lua
index a63ac994..0a3762b7 100644
--- a/lua/custom/plugins/nvim-tmux-navigator.lua
+++ b/lua/custom/plugins/nvim-tmux-navigator.lua
@@ -1,7 +1,11 @@
 return {
-  'christoomey/vim-tmux-navigator',
-  vim.keymap.set('n', '<C-h>', ':TmuxNavigateLeft<CR>'),
-  vim.keymap.set('n', '<C-j>', ':TmuxNavigateDown<CR>'),
-  vim.keymap.set('n', '<C-k>', ':TmuxNavigateUp<CR>'),
-  vim.keymap.set('n', '<C-l>', ':TmuxNavigateRight<CR>'),
+  {
+    'christoomey/vim-tmux-navigator',
+    config = function()
+      vim.keymap.set('n', '<C-h>', ':TmuxNavigateLeft<CR>', { desc = 'Navigate to left tmux pane' })
+      vim.keymap.set('n', '<C-j>', ':TmuxNavigateDown<CR>', { desc = 'Navigate to lower tmux pane' })
+      vim.keymap.set('n', '<C-k>', ':TmuxNavigateUp<CR>', { desc = 'Navigate to upper tmux pane' })
+      vim.keymap.set('n', '<C-l>', ':TmuxNavigateRight<CR>', { desc = 'Navigate to right tmux pane' })
+    end,
+  },
 }