diff --git a/common/vim.noxdg.vimrc b/common/vim.noxdg.vimrc
index c402dcf..08b99b8 100644
--- a/common/vim.noxdg.vimrc
+++ b/common/vim.noxdg.vimrc
@@ -13,8 +13,14 @@ endif
 noremap n j
 noremap e k
 noremap i l
-noremap N J
-noremap E K
+nnoremap N 5j
+nnoremap E 5k
+vnoremap H ^
+xnoremap H ^
+onoremap H ^
+vnoremap I $
+xnoremap I $
+onoremap I $
 noremap I L
 
 " Similar position to i
diff --git a/common/vimrc b/common/vimrc
index d4234d7..8bac7e8 100644
--- a/common/vimrc
+++ b/common/vimrc
@@ -8,8 +8,14 @@
 noremap n j
 noremap e k
 noremap i l
-noremap N J
-noremap E K
+nnoremap N 5j
+nnoremap E 5k
+vnoremap H ^
+xnoremap H ^
+onoremap H ^
+vnoremap I $
+xnoremap I $
+onoremap I $
 noremap I L
 
 " Similar position to i
diff --git a/tools/nvim/lua/keymaps/basic.lua b/tools/nvim/lua/keymaps/basic.lua
index 5e9d68b..87ae316 100644
--- a/tools/nvim/lua/keymaps/basic.lua
+++ b/tools/nvim/lua/keymaps/basic.lua
@@ -54,12 +54,15 @@ local keymaps_basic = { -- Modification of Original Keymap - Colemak
 
   { mode = mode_arrow, keys = "h", cmd = "h", opts = { desc = "Left", silent = true } },
   { mode = mode_arrow, keys = "i", cmd = "l", opts = { desc = "Right", silent = true } },
-  { keys = "H", cmd = ":bprevious<CR>", opts = { desc = "Previous Buffer" } },
-  { keys = "I", cmd = ":bnext<CR>", opts = { desc = "Next Buffer" } },
+  { mode = {"n"}, keys = "H", cmd = "<cmd>bprevious<CR>", opts = { desc = "Previous Buffer" } },
+  { mode = {"n"}, keys = "I", cmd = "<cmd>bnext<CR>", opts = { desc = "Next Buffer" } },
+  { mode = {"v", "o", "x"}, keys = "H", cmd = "^", opts = { desc = "Start of Line" } },
+  { mode = {"v", "o", "x"}, keys = "I", cmd = "$", opts = { desc = "End of Line" } },
   { mode = mode_arrow, keys = "N", cmd = "5j", opts = { desc = "Up 5 Lines" } },
   { mode = mode_arrow, keys = "E", cmd = "5e", opts = { desc = "Down 5 Lines" } },
   { keys = "Y", cmd = "y$", opts = { desc = "Yank to End of Line" } },
-  { keys = "E", cmd = "5k" },
+  { mode = mode_arrow, keys = "N", cmd = "5j" },
+  { mode = mode_arrow, keys = "E", cmd = "5k" },
   { mode = { "n", "o", "x" }, keys = "l", cmd = "i", opts = { desc = "Insert" } },
   { keys = "L", cmd = "I", opts = { desc = "Insert at Start of Line" } },
   { mode = mode_arrow, keys = "k", cmd = "n", opts = { desc = "Next Search" } },
diff --git a/tools/vscode/vscode.vimrc b/tools/vscode/vscode.vimrc
index bc65a4e..2ced56a 100644
--- a/tools/vscode/vscode.vimrc
+++ b/tools/vscode/vscode.vimrc
@@ -17,8 +17,15 @@ noremap e k
 noremap i l
 
 " Switch between tabs
-noremap H :bprevious<CR>
-noremap I :bnext<CR>
+nnoremap H :bprevious<CR>
+nnoremap I :bnext<CR>
+vnoremap H ^
+xnoremap H ^
+onoremap H ^
+vnoremap I $
+xnoremap I $
+onoremap I $
+
 
 noremap N 5j
 noremap E 5k
@@ -68,10 +75,11 @@ vnoremap > editor.action.indentLines
 nmap w cjkWordHandler.cursorWordEndRight
 nmap b cjkWordHandler.cursorWordStartLeft
 
-noremap <C-w>n <C-w>j
-noremap <C-w>e <C-w>k
-noremap <C-w>i <C-w>l
-noremap <C-w>x workbench.action.toggleEditorGroupLayout
-" Use C-w C-w as original C-w
-noremap <C-w><C-w> workbench.action.closeActiveEditor
-noremap <C-w><A-n> workbench.action.togglePanel
+" <C-w> will be parsed by VSCode itself.
+" noremap <C-w>n <C-w>j
+" noremap <C-w>e <C-w>k
+" noremap <C-w>i <C-w>l
+" noremap <C-w>x workbench.action.toggleEditorGroupLayout
+" " Use C-w C-w as original C-w
+" noremap <C-w><C-w> workbench.action.closeActiveEditor
+" noremap <C-w><A-n> workbench.action.togglePanel