diff --git a/nvim/m-housh/lua/user/keymaps.lua b/nvim/m-housh/lua/user/keymaps.lua
index 244e1a1..92b68fa 100755
--- a/nvim/m-housh/lua/user/keymaps.lua
+++ b/nvim/m-housh/lua/user/keymaps.lua
@@ -7,7 +7,7 @@ local telescope = require('telescope.builtin')
 local wk = require("which-key")
 
 local wk_add = function(mode, keymaps)
-  wk.add(keymaps, { mode = mode, noremap = true, silent = true })
+  wk.add(keymaps, { mode = mode, silent = true })
 end
 
 local find_files = function(dir)
@@ -39,6 +39,9 @@ wk_add("n", {
   { "<C-n>", "<CMD>:Neotree toggle<CR>", desc = "Toggle Neotree" },
   { "<C-s>", "<CMD>:write<CR>", desc = "[S]ave" },
 
+  { "J", ":move .+1<CR>==", desc = "Move line down" },
+  { "K", ":move .-2<CR>==", desc = "Move line up" },
+
   -- Git
   { "<leader>gg", ":LazyGit<CR>", desc = "Open [G]it" },
   { "<leader>gf", ":Telescope git_files<CR>", desc = "Find [G]it [F]ile" },
@@ -63,10 +66,20 @@ wk_add("n", {
 --   { "p", "\"_dP", desc = "[P]aste" },
 -- })
 
-wk_add("x", {
-  { "K", ":move '<-2<CR>gv-gv", desc = "Move selected block up" },
-  { "J", ":move '>+1<CR>gv-gv", desc = "Move selected block down" },
-})
+-- wk_add("v", {
+--   { "K", ":move '<-2<CR>", desc = "Move selected block up" },
+--   { "J", ":move '>+1<CR>", desc = "Move selected block down" },
+-- })
+vim.keymap.set(
+  "v", "K",
+  ":move '<-2<CR>gv=gv",
+  { desc = "Move selected block up.", silent = true, noremap = true }
+)
+vim.keymap.set(
+  "v", "J",
+  ":move '>+1<CR>gv=gv",
+  { desc = "Move selected block up.", silent = true, noremap = true }
+)
 
 -- Toggle term key maps, that get attached when terminal is opened.
 function _G.set_terminal_keymaps()
diff --git a/nvim/m-housh/lua/user/plugin/harpoon.lua b/nvim/m-housh/lua/user/plugin/harpoon.lua
index b52f6aa..5f9ba34 100644
--- a/nvim/m-housh/lua/user/plugin/harpoon.lua
+++ b/nvim/m-housh/lua/user/plugin/harpoon.lua
@@ -41,13 +41,23 @@ return {
     )
 
     -- Toggle previous and next buffers.
-    vim.keymap.set("n", "<C-S-P>",
+    vim.keymap.set("n", "<C-[>",
       function() harpoon:list():prev() end,
       { desc = "[P]revious harpoon buffer." }
     )
-    vim.keymap.set("n", "<C-S-N>",
+    vim.keymap.set("n", "<C-]>",
       function() harpoon:list():next() end,
       { desc = "[N]ext harpoon buffer." }
     )
+
+    -- Extensions
+    harpoon:extend({
+      UI_CREATE = function(cx)
+        vim.keymap.set("n", "<C-v>",
+          function() harpoon.ui:select_menu_item({ vsplit = true }) end,
+          { buffer = cx.buffer, desc = "Open in [V]split" }
+        )
+      end
+    })
   end
 }
diff --git a/nvim/m-housh/lua/user/plugin/lsp.lua b/nvim/m-housh/lua/user/plugin/lsp.lua
index 0f04723..7abfa58 100755
--- a/nvim/m-housh/lua/user/plugin/lsp.lua
+++ b/nvim/m-housh/lua/user/plugin/lsp.lua
@@ -70,7 +70,7 @@ return {
           local wk = require('which-key')
 
           wk.add({
-            { "K", vim.lsp.buf.hover, desc = "LSP hover info" },
+            { "<C-k>", vim.lsp.buf.hover, desc = "LSP hover info" },
             { "gd", vim.lsp.buf.definition, desc = "[G]oto [D]efinition" },
             { "gD", vim.lsp.buf.declaration, desc = "[G]oto [D]eclaration" },
             { "gi", vim.lsp.buf.implementation, desc = "[G]oto [I]mplementation" },