diff --git a/lua/pcode/user/keymaps.lua b/lua/pcode/user/keymaps.lua
index 716dfbf..39f8c5f 100644
--- a/lua/pcode/user/keymaps.lua
+++ b/lua/pcode/user/keymaps.lua
@@ -16,15 +16,17 @@ vim.g.maplocalleader = " "
 -- command mode = "c"
 
 for _, mode in ipairs({ "i", "v", "n", "x" }) do
-	-- duplicate line
-	keymap(mode, "<S-Down>", "<cmd>t.<cr>", opts)
-	keymap(mode, "<S-Up>", "<cmd>t -1<cr>", opts)
-	-- save file
-	keymap(mode, "<C-s>", "<cmd>silent! w<cr>", opts)
+  -- duplicate line
+  keymap(mode, "<S-Down>", "<cmd>t.<cr>", opts)
+  keymap(mode, "<S-Up>", "<cmd>t -1<cr>", opts)
+  -- save file
+  keymap(mode, "<C-s>", "<cmd>silent! w<cr>", opts)
 end
+
 -- duplicate line visual block
 keymap("x", "<S-Down>", ":'<,'>t'><cr>", opts)
 keymap("x", "<S-Up>", ":'<,'>t-1<cr>", opts)
+
 -- move text up and down
 keymap("x", "<A-Down>", ":move '>+1<CR>gv-gv", opts)
 keymap("x", "<A-Up>", ":move '<-2<CR>gv-gv", opts)
@@ -32,6 +34,7 @@ keymap("n", "<M-Down>", "<cmd>m+<cr>", opts)
 keymap("i", "<M-Down>", "<cmd>m+<cr>", opts)
 keymap("n", "<M-Up>", "<cmd>m-2<cr>", opts)
 keymap("i", "<M-Up>", "<cmd>m-2<cr>", opts)
+
 -- create comment CTRL + / all mode
 keymap("v", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", opts)
 keymap("v", "<C-/>", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", opts)
@@ -45,3 +48,46 @@ keymap("n", "<C-/>", "<esc><cmd>lua require('Comment.api').toggle.linewise.curre
 -- close windows
 keymap("n", "q", "<cmd>q<cr>", opts)
 keymap("n", "f", "<cmd>NvimTreeFindFileToggle<cr><cr><Up>", opts)
+
+-- window navigation
+keymap("n", "<c-h>", "<C-w>h", opts)
+keymap("n", "<c-j>", "<C-w>j", opts)
+keymap("n", "<c-k>", "<C-w>k", opts)
+keymap("n", "<c-l>", "<C-w>l", opts)
+keymap("n", "<c-a>", "gg0v$G", opts)
+keymap("i", "<c-a>", "<esc>gg0v$G", opts)
+keymap("n", "<c-c>", '"+y', opts)
+keymap("v", "<c-c>", '"+y', opts)
+keymap("x", "<c-c>", '"+y', opts)
+keymap("n", "<c-v>", '"+P', opts)
+keymap("v", "<c-v>", '"+P', opts)
+keymap("i", "<c-v>", "<esc>pa<Left>", opts)
+keymap("x", "<c-v>", '"+P', opts)
+keymap("n", "<c-z>", "<cmd>undo<CR>", opts)
+keymap("x", "<c-z>", "<esc><cmd>undo<CR>", opts)
+keymap("v", "<c-z>", "<esc><cmd>undo<CR>", opts)
+keymap("i", "<c-z>", "<esc><cmd>undo<CR>", opts)
+
+-- Navigate buffers
+keymap("n", "<S-l>", ":bnext<CR>", opts)
+keymap("n", "<S-Left>", "<Esc>:bnext<CR>", opts)
+keymap("n", "<S-h>", ":bprevious<CR>", opts)
+keymap("n", "<S-Right>", "<Esc>:bprevious<CR>", opts)
+
+-- Reordering Bufferline
+keymap("n", "<S-PageUp>", "<cmd>BufferLineMovePrev<cr>", opts)
+keymap("n", "<S-PageDown>", "<cmd>BufferLineMoveNext<cr>", opts)
+
+-- Press jk fast to exit insert mode
+keymap("i", "jk", "<ESC>", opts)
+keymap("i", "kj", "<ESC>", opts)
+
+-- Stay in indent mode
+keymap("v", "<", "<gv", opts)
+keymap("v", ">", ">gv", opts)
+
+-- ALT + l to open terminal and run live-server
+keymap("n", "<A-l>", "<cmd>terminal live-server<cr>", opts)
+
+-- close current buffer
+keymap("n", "<S-t>", "<cmd>lua require('auto-bufferline.configs.utils').bufremove()<cr>", opts)