diff --git a/nvim/.config/nvim/after/plugin/lspconfig.lua b/nvim/.config/nvim/after/plugin/lspconfig.lua
index ce56896..293f514 100644
--- a/nvim/.config/nvim/after/plugin/lspconfig.lua
+++ b/nvim/.config/nvim/after/plugin/lspconfig.lua
@@ -21,7 +21,7 @@ local on_attach = function(_, bufnr)
 
   -- See `:help K` for why this keymap
   nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
-  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
+  nmap('<leader>k', vim.lsp.buf.signature_help, 'Signature Documentation')
 
   -- Lesser used LSP functionality
   nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
diff --git a/nvim/.config/nvim/lua/lupan/plugins.lua b/nvim/.config/nvim/lua/lupan/plugins.lua
index 889b7e4..f943282 100644
--- a/nvim/.config/nvim/lua/lupan/plugins.lua
+++ b/nvim/.config/nvim/lua/lupan/plugins.lua
@@ -139,6 +139,8 @@ require('lazy').setup({
       direction = "float",
       open_mapping = [[<C-\>]],
     }
-  }
+  },
+
+  'ggandor/lightspeed.nvim',
 
 })
diff --git a/nvim/.config/nvim/lua/lupan/remap.lua b/nvim/.config/nvim/lua/lupan/remap.lua
index 85f7f6c..770e10b 100644
--- a/nvim/.config/nvim/lua/lupan/remap.lua
+++ b/nvim/.config/nvim/lua/lupan/remap.lua
@@ -1,29 +1,48 @@
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
-vim.keymap.set('v', '<Space>', '<Nop>', { silent = true })
+local key = vim.keymap.set
+local opts = { silent = true, noremap = true }
+
+key('v', '<Space>', '<Nop>', { silent = true })
 
 -- Remap for dealing with word wrap
-vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+key('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+key('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
-vim.keymap.set("n", "<leader>dd", ":Explore<cr>", { desc = "[D]isplay [d]irectory" })
-vim.keymap.set("n", "<leader>ct", ":ColorizerToggle<cr>", { desc = "[C]olorizer [t]oggle" })
-vim.keymap.set("n", "<leader>ut", ":UndotreeToggle<cr>", { desc = "[U]undotree [t]oggle" })
+key("n", "<leader>dd", ":Explore<cr>", { desc = "[D]isplay [d]irectory" })
+key("n", "<leader>dv", ":Vexplore<cr>", { desc = "[D]isplay directory ([v]ertical split)" })
+key("n", "<leader>dh", ":Sexplore<cr>", { desc = "[D]isplay [d]irectory ([h]orizontal split)" })
+key("n", "<leader>dt", ":Lexplore 30<cr>", { desc = "[D]isplay directory [t]oggle" })
+key("n", "<leader>ct", ":ColorizerToggle<cr>", { desc = "[C]olorizer [t]oggle" })
+key("n", "<leader>ut", ":UndotreeToggle<cr>", { desc = "[U]undotree [t]oggle" })
 
 -- Diagnostic keymaps
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
-vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
+key('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
+key('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
+key('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
+key('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
 
-vim.keymap.set('n', '<leader>N', ':bn<cr>', { desc = '[N]ext buffer' })
-vim.keymap.set('n', '<leader>P', ':bp<cr>', { desc = '[P]revious buffer' })
+key('n', '<leader>N', ':bn<cr>', { desc = '[N]ext buffer' })
+key('n', '<leader>P', ':bp<cr>', { desc = '[P]revious buffer' })
 
-vim.keymap.set('n', '<leader>tc', ':tabnew<cr>', { desc = '[T]ab [c]reate' })
-vim.keymap.set('n', '<leader>ts', ':tab split<cr>', { desc = '[T]ab [s]plit' })
-vim.keymap.set('n', '<leader>tn', ':tabnext<cr>', { desc = '[T]ab [n]ext' })
-vim.keymap.set('n', '<leader>tp', ':tabprevious<cr>', { desc = '[T]ab [p]revious' })
+key('n', '<leader>tc', ':tabnew<cr>', { desc = '[T]ab [c]reate' })
+key('n', '<leader>ts', ':tab split<cr>', { desc = '[T]ab [s]plit' })
+key('n', '<leader>tn', ':tabnext<cr>', { desc = '[T]ab [n]ext' })
+key('n', '<leader>tp', ':tabprevious<cr>', { desc = '[T]ab [p]revious' })
 
-vim.keymap.set('v', 'J', ":m '>+1<cr>gv=gv", { desc = "Move lines down" })
-vim.keymap.set('v', 'K', ":m '<-2<cr>gv=gv", { desc = "Move lines up" })
+key('v', 'J', ":m '>+1<cr>gv=gv", { desc = "Move lines down" })
+key('v', 'K', ":m '<-2<cr>gv=gv", { desc = "Move lines up" })
+
+-- Change window
+key('n', '<C-j>', '<C-w>j', opts)
+key('n', '<C-k>', '<C-w>k', opts)
+key('n', '<C-h>', '<C-w>h', opts)
+key('n', '<C-l>', '<C-w>l', opts)
+
+-- Stay in key mode
+key('v', '<', '<gv', opts)
+key('v', '>', '>gv', opts)
+
+-- Keep old value of register
+key('v', 'P', '"_dP', opts)