diff --git a/vscode/keybindings.json b/vscode/keybindings.json
index 66cfb2c..37a774c 100644
--- a/vscode/keybindings.json
+++ b/vscode/keybindings.json
@@ -77,7 +77,7 @@
     },
     {
         "key": "escape",
-        "command": "workbench.action.toggleSidebarVisibility",
+        "command": "workbench.action.focusFirstEditorGroup",
         "when": "explorerViewletFocus"
     },
     // Terminal management
@@ -86,7 +86,7 @@
         "command": "workbench.action.terminal.toggleTerminal"
     },
     {
-        "key": "ctrl+shift+n",
+        "key": "ctrl+shift+t",
         "command": "workbench.action.terminal.new",
         "when": "terminalFocus"
     },
@@ -96,12 +96,12 @@
         "when": "terminalFocus"
     },
     {
-        "key": "ctrl+shift+j",
+        "key": "ctrl+tab",
         "command": "workbench.action.terminal.focusNext",
         "when": "terminalFocus"
     },
     {
-        "key": "ctrl+shift+k",
+        "key": "ctrl+shift+tab",
         "command": "workbench.action.terminal.focusPrevious",
         "when": "terminalFocus"
     },
diff --git a/vscode/settings.json b/vscode/settings.json
index 39e1b91..4d11057 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -27,7 +27,6 @@
     "vim.hlsearch": true,
     "vim.easymotion": true,
     "vim.useSystemClipboard": true,
-    "vim.smartRelativeLine": true,
     "vim.statusBarColorControl": false,
     "vim.ignorecase": true,
     "vim.normalModeKeyBindings": [
@@ -58,6 +57,22 @@
                 ":noh"
             ]
         },
+        {
+            "before": [
+                "u"
+            ],
+            "commands": [
+                "undo"
+            ]
+        },
+        {
+            "before": [
+                "<C-r>"
+            ],
+            "commands": [
+                "redo"
+            ]
+        },
         {
             "before": [
                 "<Leader>",
@@ -190,7 +205,7 @@
                 "g"
             ],
             "commands": [
-                "workbench.action.quickOpen"
+                "workbench.action.showAllSymbols"
             ]
         },
         {
@@ -199,7 +214,16 @@
                 "f"
             ],
             "commands": [
-                "workbench.files.action.showActiveFileInExplorer"
+                "workbench.action.quickOpen"
+            ]
+        },
+        {
+            "before": [
+                "<Leader>",
+                "t"
+            ],
+            "commands": [
+                "breadcrumbs.focus"
             ]
         },
         {
@@ -211,33 +235,6 @@
                 "editor.action.showHover"
             ]
         },
-        {
-            "before": [
-                "<Leader>",
-                "<Enter>"
-            ],
-            "commands": [
-                "editor.action.revealDefinition"
-            ]
-        },
-        {
-            "before": [
-                "<Tab>"
-            ],
-            "after": [
-                ">",
-                ">"
-            ]
-        },
-        {
-            "before": [
-                "<S-Tab>"
-            ],
-            "after": [
-                "<",
-                "<"
-            ]
-        }
     ],
     "vim.insertModeKeyBindings": [
         {
@@ -248,9 +245,67 @@
             "after": [
                 "<Esc>"
             ]
-        }
+        },
+        {
+            "before": [
+                "<C-j>"
+            ],
+            "after": [
+                "<ESC>",
+                "j",
+                "a",
+            ]
+        },
+        {
+            "before": [
+                "<C-k>"
+            ],
+            "after": [
+                "<ESC>",
+                "k",
+                "a",
+            ]
+        },
+        {
+            "before": [
+                "<C-h>"
+            ],
+            "after": [
+                "<ESC>",
+                "h",
+                "a",
+            ]
+        },
+        {
+            "before": [
+                "<C-l>"
+            ],
+            "after": [
+                "<ESC>",
+                "l",
+                "a",
+            ]
+        },
     ],
     "vim.visualModeKeyBindings": [
+        {
+            "before": [
+                "J"
+            ],
+            "after": [
+                "5",
+                "j"
+            ]
+        },
+        {
+            "before": [
+                "K"
+            ],
+            "after": [
+                "5",
+                "k"
+            ]
+        },
         {
             "before": [
                 "<Tab>"
@@ -276,5 +331,4 @@
                 "extension.vim_escape"
             ]
         }
-    ]
-}
+    ],