diff --git a/after/plugin/bufferline.lua b/after/plugin/bufferline.lua
index 778b9704..36767aac 100644
--- a/after/plugin/bufferline.lua
+++ b/after/plugin/bufferline.lua
@@ -2,19 +2,6 @@
 
 local opts = { silent = true, noremap = true }
 
-vim.keymap.set('n', '<C-PageDown>', ':BufferLineCycleNext<CR>', opts)
-vim.keymap.set('n', '<C-PageUp>', ':BufferLineCyclePrev<CR>', opts)
-vim.keymap.set('n', ']b', ':BufferLineCycleNext<CR>', opts)
-vim.keymap.set('n', '[b', ':BufferLineCyclePrev<CR>', opts)
-
-vim.keymap.set('n', '<C-S-PageDown>', ':BufferLineMoveNext<CR>', opts)
-vim.keymap.set('n', '<C-S-PageUp>', ':BufferLineMovePrev<CR>', opts)
-
 vim.keymap.set('n', '<leader>bp', ':BufferLineTogglePin<CR>', opts)
 vim.keymap.set('n', '<leader>bP', '<Cmd>BufferLineGroupClose ungrouped<CR>',
     { silent = true, noremap = true, desc = 'Delete non-pinned buffers' })
-
-for i = 1, 9, 1 do
-    vim.keymap.set('n', '<leader>' .. i, '<cmd>BufferLineGoToBuffer ' .. i .. '<CR>', opts)
-end
-vim.keymap.set('n', '<leader>$', '<cmd>BufferLineGoToBuffer -1<CR>', opts)
diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua
index 533bbf20..107587e9 100644
--- a/after/plugin/gitsigns.lua
+++ b/after/plugin/gitsigns.lua
@@ -16,14 +16,14 @@ require('gitsigns').setup {
         end
 
         -- Navigation
-        map('n', ']c', function()
-            if vim.wo.diff then return ']c' end
+        map('n', ']h', function()
+            if vim.wo.diff then return ']h' end
             vim.schedule(function() gs.next_hunk() end)
             return '<Ignore>'
         end, { expr = true, desc = "gitsigns: next hunk" })
 
-        map('n', '[c', function()
-            if vim.wo.diff then return '[c' end
+        map('n', '[h', function()
+            if vim.wo.diff then return '[h' end
             vim.schedule(function() gs.prev_hunk() end)
             return '<Ignore>'
         end, { expr = true, desc = "gitsigns: prev hunk" })
diff --git a/after/plugin/remap.lua b/after/plugin/remap.lua
index ee86adc1..cdd2e625 100644
--- a/after/plugin/remap.lua
+++ b/after/plugin/remap.lua
@@ -3,9 +3,8 @@ vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
 
 vim.keymap.set("n", "J", "mzJ`z")
 vim.keymap.set("n", "<C-d>", "<C-d>zz")
+vim.keymap.set("n", "<C-u>", "<C-u>zz")
 vim.keymap.set("n", "<C-s>", "<C-u>zz")
-vim.keymap.set("n", "<PageDown>", "<C-d>zz")
-vim.keymap.set("n", "<PageUp>", "<C-u>zz")
 vim.keymap.set("n", "{", "{zz")
 vim.keymap.set("n", "}", "}zz")
 vim.keymap.set("n", "n", "nzzzv")
@@ -27,21 +26,9 @@ vim.keymap.set("i", "<C-d>", "<C-o>de")
 vim.keymap.set("i", "<C-h>", "<Backspace>")
 vim.keymap.set("i", "<C-l>", "<Del>")
 
--- vim.keymap.set("n", "Q", "<nop>")
 vim.keymap.set("n", "<leader>f", vim.lsp.buf.format,
     { desc = "LSP: format buffer" })
 
-vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
-vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
-vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
-vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
-
-vim.keymap.set("n", "<leader>su",
+vim.keymap.set("n", "<leader>ru",
     [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
-    { desc = "[S]earch and replace word [U]nder cursor" })
-vim.keymap.set("n", "<leader>px", "<cmd>!chmod +x %<CR>", { silent = true })
-
-vim.keymap.set("n", "<S-h>", vim.cmd.bprevious,
-    { silent = true, desc = "Go to previous buffer" })
-vim.keymap.set("n", "<S-l>", vim.cmd.bnext,
-    { silent = true, desc = "Go to previous buffer" })
+    { desc = "[R]eplace word [U]nder cursor" })
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
index 578b3ea3..9ae1e656 100644
--- a/after/plugin/telescope.lua
+++ b/after/plugin/telescope.lua
@@ -23,3 +23,6 @@ vim.keymap.set('n', '<leader>sA',
 vim.keymap.set('n', '<leader>sk', telescope_builtin.keymaps,
     { desc = '[S]earch [K]eymaps' }
 )
+vim.keymap.set('n', '<leader>o', require('telescope.builtin').buffers,
+    { desc = '[o] Find existing buffers' }
+)
diff --git a/init.lua b/init.lua
index 97eaf843..b5f5ffca 100644
--- a/init.lua
+++ b/init.lua
@@ -304,7 +304,6 @@ pcall(require('telescope').load_extension, 'fzf')
 
 -- See `:help telescope.builtin`
 vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
-vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
 vim.keymap.set('n', '<leader>/', function()
   -- You can pass additional configuration to telescope to change theme, layout, etc.
   require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index a63cef00..2b08008d 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -11,10 +11,12 @@ return {
   "ahmedkhalf/project.nvim",
   "famiu/bufdelete.nvim",
   "tpope/vim-repeat",
+  "tpope/vim-unimpaired",
   "JoosepAlviste/nvim-ts-context-commentstring",
   "sindrets/diffview.nvim",
   "rhysd/git-messenger.vim",
   "lambdalisue/suda.vim",
+  "stevearc/dressing.nvim",
   {
     "windwp/nvim-ts-autotag",
     dependencies = {
@@ -95,8 +97,8 @@ return {
     cmd = { "TodoTrouble", "TodoTelescope" },
     config = true,
     keys = {
-      { "]t",         function() require("todo-comments").jump_next() end, desc = "Next todo comment" },
-      { "[t",         function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" },
+      { "]/",         function() require("todo-comments").jump_next() end, desc = "Next todo comment" },
+      { "[/",         function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" },
       { "<leader>xt", "<cmd>TodoTrouble<cr>",                              desc = "Todo (Trouble)" },
       { "<leader>xT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>",      desc = "Todo/Fix/Fixme (Trouble)" },
       { "<leader>st", "<cmd>TodoTelescope<cr>",                            desc = "Todo" },