diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c8cf894..bd059a9 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -50,6 +50,30 @@ vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live gr
 vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
 vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
 
+vim.keymap.set('t', '<Esc>', [[<C-\><C-n>]])
+
+vim.keymap.set('t', '<A-h>', [[<C-\><C-N><C-w>h]])
+vim.keymap.set('t', '<A-j>', [[<C-\><C-N><C-w>j]])
+vim.keymap.set('t', '<A-k>', [[<C-\><C-N><C-w>k]])
+vim.keymap.set('t', '<A-l>', [[<C-\><C-N><C-w>l]])
+
+vim.keymap.set('i', '<A-h>', [[<C-\><C-N><C-w>h]])
+vim.keymap.set('i', '<A-j>', [[<C-\><C-N><C-w>j]])
+vim.keymap.set('i', '<A-k>', [[<C-\><C-N><C-w>k]])
+vim.keymap.set('i', '<A-l>', [[<C-\><C-N><C-w>l]])
+
+vim.keymap.set('n', '<A-h>', [[<C-w>h]])
+vim.keymap.set('n', '<A-j>', [[<C-w>j]])
+vim.keymap.set('n', '<A-k>', [[<C-w>k]])
+vim.keymap.set('n', '<A-l>', [[<C-w>l]])
+
+vim.keymap.set('n', '<C-s>v', "<Cmd>vsplit<CR>")
+vim.keymap.set('n', '<C-s>h', "<Cmd>split<CR>")
+vim.keymap.set('n', '<A-q>', [[<C-w>q]])
+vim.keymap.set('n', '<A-J>', [[<C-w>+]])
+vim.keymap.set('n', '<A-K>', [[<C-w>-]])
+vim.keymap.set('n', '<A-H>', [[<C-w>>]])
+vim.keymap.set('n', '<A-L>', [[<C-w><]])
 -- Other:
 -- :BarbarEnable - enables barbar (enabled by default)
 -- :BarbarDisable - very bad command, should never be used
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 7b1b3ca..d895d40 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,7 +1,7 @@
 {
   "LazyVim": { "branch": "main", "commit": "cb40a09538dc0c417a7ffbbacdbdec90be4a792c" },
   "barbar.nvim": { "branch": "master", "commit": "7c28de8c22f4c00ed43a78ae16c13dd6a248fe1a" },
-  "coc.nvim": { "branch": "master", "commit": "9fd857818977ce9f9f6f7271034fc917dede7035" },
+  "coc.nvim": { "branch": "master", "commit": "5fdf3d6bdbefbd04bed82a4e605d5952024dd25b" },
   "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" },
   "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },