diff --git a/after/plugin/bufdelete.lua b/after/plugin/bufdelete.lua
index d3f7a26d..3bfda1f6 100644
--- a/after/plugin/bufdelete.lua
+++ b/after/plugin/bufdelete.lua
@@ -1 +1,3 @@
 vim.keymap.set("n", "<S-q>", "<cmd>Bdelete<CR>")
+vim.keymap.set("n", "<leader>bd", "<cmd>Bdelete<CR>")
+vim.keymap.set("n", "<leader>bD", "<cmd>Bdelete!<CR>")
diff --git a/after/plugin/bufferline.lua b/after/plugin/bufferline.lua
index b38afa4c..ae55e9d4 100644
--- a/after/plugin/bufferline.lua
+++ b/after/plugin/bufferline.lua
@@ -12,6 +12,10 @@ vim.keymap.set('n', '<C-S-PageUp>', ':BufferLineMovePrev<CR>', opts)
 vim.keymap.set('n', '<leader>}', ':BufferLineMoveNext<CR>', opts)
 vim.keymap.set('n', '<leader>{', ':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
diff --git a/after/plugin/remap.lua b/after/plugin/remap.lua
index f5831393..3c787771 100644
--- a/after/plugin/remap.lua
+++ b/after/plugin/remap.lua
@@ -1,5 +1,3 @@
-vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
-
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
 
@@ -33,8 +31,10 @@ 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>sr", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
-vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
+vim.keymap.set("n", "<leader>su",
+    [[:%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" })
diff --git a/after/plugin/trouble.lua b/after/plugin/trouble.lua
index f80cc436..d68dbbe6 100644
--- a/after/plugin/trouble.lua
+++ b/after/plugin/trouble.lua
@@ -1,21 +1,18 @@
-vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>",
-    { silent = true, noremap = true }
-)
 vim.keymap.set("n", "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<cr>",
     { silent = true, noremap = true }
 )
-vim.keymap.set("n", "<leader>xd", "<cmd>TroubleToggle document_diagnostics<cr>",
+vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle document_diagnostics<cr>",
+    { silent = true, noremap = true }
+)
+vim.keymap.set("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>",
     { silent = true, noremap = true }
 )
--- vim.keymap.set("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>",
---   {silent = true, noremap = true}
--- )
 vim.keymap.set("n", "<leader>xq", "<cmd>TroubleToggle quickfix<cr>",
     { silent = true, noremap = true }
 )
--- vim.keymap.set("n", "gR", "<cmd>TroubleToggle lsp_references<cr>",
---   {silent = true, noremap = true}
--- )
+vim.keymap.set("n", "<leader>xR", "<cmd>TroubleToggle lsp_references<cr>",
+    { silent = true, noremap = true }
+)
 
 local signs = {
     Error = " ",