diff --git a/common/.config/Code/User/keybindings.json b/common/.config/Code/User/keybindings.json
index 1f0af5a..41ba740 100644
--- a/common/.config/Code/User/keybindings.json
+++ b/common/.config/Code/User/keybindings.json
@@ -72,19 +72,23 @@
     // Navigation
     {
         "key": "ctrl+h",
-        "command": "workbench.action.navigateLeft"
+        "command": "workbench.action.navigateLeft",
+        "when": "vim.mode == 'Normal' && editorTextFocus"
     },
     {
         "key": "ctrl+l",
-        "command": "workbench.action.navigateRight"
+        "command": "workbench.action.navigateRight",
+        "when": "vim.mode == 'Normal' && editorTextFocus"
     },
     {
         "key": "ctrl+k",
-        "command": "workbench.action.navigateUp"
+        "command": "workbench.action.navigateUp",
+        "when": "vim.mode == 'Normal' && editorTextFocus"
     },
     {
         "key": "ctrl+j",
-        "command": "workbench.action.navigateDown"
+        "command": "workbench.action.navigateDown",
+        "when": "vim.mode == 'Normal' && editorTextFocus"
     },
     {
         "key": "space b l",
@@ -115,7 +119,7 @@
                 "workbench.files.action.focusFilesExplorer"
             ]
         },
-        "when": "vim.mode == 'Normal'"
+        "when": "vim.mode == 'Normal' && editorTextFocus"
     },
     {
         "key": "space e",
@@ -138,20 +142,12 @@
     {
         "key": "shift shift",
         "command": "workbench.action.quickOpen",
-        "when": "vim.mode == 'Normal'"
-    },
-    {
-        "key": "space g g",
-        "command": "runCommands",
-        "when": "vim.mode == 'Normal'",
-        "args": {
-            "commands": ["workbench.view.scm", "workbench.scm.focus"]
-        }
+        "when": "vim.mode == 'Normal' && editorTextFocus"
     },
     {
         "key": "ctrl+alt+f",
         "command": "workbench.action.findInFiles",
-        "when": "vim.mode == 'Normal'"
+        "when": "vim.mode == 'Normal' && editorTextFocus"
     },
     {
         "key": "space p",
@@ -284,6 +280,46 @@
         "when": "vim.mode == 'Normal' && editorTextFocus"
     },
 
+    // Git
+    {
+        "key": "space g g",
+        "command": "runCommands",
+        "when": "vim.mode == 'Normal' && editorTextFocus",
+        "args": {
+            "commands": ["workbench.view.scm", "workbench.scm.focus"]
+        }
+    },
+    {
+        "key": "] g",
+        "command": "workbench.action.editor.nextChange",
+        "when": "vim.mode == 'Normal' && editorTextFocus"
+    },
+    {
+        "key": "[ g",
+        "command": "workbench.action.editor.previousChange",
+        "when": "vim.mode == 'Normal' && editorTextFocus"
+    },
+    {
+        "key": "space g b",
+        "command": "git.checkout",
+        "when": "vim.mode == 'Normal' && editorTextFocus"
+    },
+    {
+        "key": "space g p",
+        "command": "editor.action.dirtydiff.next",
+        "when": "vim.mode == 'Normal' && editorTextFocus && !textCompareEditorActive"
+    },
+    {
+        "key": "space g c",
+        "command": "git-graph.view",
+        "when": "vim.mode == 'Normal' && editorTextFocus && !textCompareEditorActive"
+    },
+    {
+        "key": "space g l",
+        "command": "git-graph.view",
+        "when": "vim.mode == 'Normal' && editorTextFocus && !textCompareEditorActive"
+    },
+
     // Test commands
     {
         "key": "space t t",
diff --git a/common/.config/Code/User/settings.json b/common/.config/Code/User/settings.json
index d6f5138..afd3fb4 100644
--- a/common/.config/Code/User/settings.json
+++ b/common/.config/Code/User/settings.json
@@ -6,19 +6,18 @@
     // Privacy
     "telemetry.telemetryLevel": "off",
     "extensions.ignoreRecommendations": true,
+    "security.workspace.trust.untrustedFiles": "open",
 
     // Editor
-    "editor.fontSize": 15,
-    "editor.cursorWidth": 3,
-    "editor.minimap.enabled": false,
+    "editor.cursorWidth": 2,
+    "editor.tabSize": 4,
     "editor.wordWrap": "on",
     "editor.formatOnSave": true,
     "editor.formatOnPaste": true,
-    "editor.copyWithSyntaxHighlighting": true,
+    "editor.copyWithSyntaxHighlighting": false,
     "editor.acceptSuggestionOnEnter": "smart",
     "editor.snippetSuggestions": "top",
     "editor.guides.indentation": true,
-    "editor.tabSize": 4,
     "editor.insertSpaces": true,
     "editor.detectIndentation": false,
     "editor.multiCursorModifier": "ctrlCmd",
@@ -26,19 +25,22 @@
     "files.trimTrailingWhitespace": true,
     "files.autoSave": "afterDelay",
     "files.autoSaveDelay": 500,
-    "diffEditor.renderSideBySide": true,
-    "diffEditor.ignoreTrimWhitespace": false,
+    "files.insertFinalNewline": true,
+    "files.trimFinalNewlines": true,
     "terminal.integrated.shell.linux": "/bin/zsh",
+    "explorer.confirmDragAndDrop": false,
+    "workbench.sideBar.location": "right",
 
-    // Editor Font
+    // Editor Typography
     "editor.fontFamily": "FiraCode Nerd Font Mono",
     "editor.fontLigatures": true,
+    "editor.fontSize": 15,
     "terminal.integrated.fontFamily": "FiraCode Nerd Font Mono",
     "terminal.integrated.fontSize": 15,
+
+    // Theme
     "workbench.iconTheme": "material-icon-theme",
-    "workbench.startupEditor": "newUntitledFile",
-    "workbench.sideBar.location": "right",
-    "workbench.colorTheme": "GitHub Dark Default",
+    "workbench.colorTheme": "Catppuccin Mocha",
     "workbench.colorCustomizations": {
         "tab.activeBackground": "#07f7af3f",
         "tab.activeBorder": "#ffffff",
@@ -48,9 +50,46 @@
         "statusBar.foreground": "#ffffff",
         "statusBar.debuggingForeground": "#ffffff"
     },
-    "window.menuBarVisibility": "compact",
-    "explorer.confirmDragAndDrop": false,
-    "security.workspace.trust.untrustedFiles": "open",
+
+    // Silence the Noise
+    "window.menuBarVisibility": "toggle",
+    "workbench.startupEditor": "newUntitledFile",
+    "editor.minimap.enabled": false,
+    "editor.hover.delay": 1500,
+    "workbench.tips.enabled": false,
+    "workbench.tree.enableStickyScroll": false,
+    "editor.stickyScroll.enabled": false,
+    "editor.overviewRulerBorder": false,
+    "editor.hideCursorInOverviewRuler": true,
+    "editor.gotoLocation.multipleReferences": "goto",
+    "editor.gotoLocation.multipleDefinitions": "goto",
+    "editor.gotoLocation.multipleDeclarations": "goto",
+    "editor.gotoLocation.multipleImplementations": "goto",
+    "editor.gotoLocation.multipleTypeDefinitions": "goto",
+    "workbench.editor.enablePreviewFromQuickOpen": false,
+
+    // Search
+    "search.useIgnoreFiles": false,
+    "search.exclude": {
+        // Hide everything in /public
+        "**/public/{[^i],?[^n]}*": true,
+        "**/node_modules": true,
+        "**/dist": true,
+        "**/composer.lock": true,
+        "**/package-lock.json": true
+    },
+
+    // Code
+    "breadcrumbs.enabled": true,
+    "diffEditor.renderSideBySide": true,
+    "diffEditor.ignoreTrimWhitespace": false,
+    "diffEditor.wordWrap": "on",
+    "emmet.includeLanguages": {
+        "vue-html": "html",
+        "vue": "html",
+        "react": "html",
+        "javascript": "html"
+    },
 
     // Project Manager
     "projectManager.git.baseFolders": [".git"],
@@ -77,7 +116,7 @@
     "debug.javascript.autoAttachFilter": "disabled",
     "debug.onTaskErrors": "debugAnyway",
 
-    // Prettier Plugin
+    // Prettier
     "prettier.tabWidth": 4,
     "prettier.useTabs": false,
     "prettier.printWidth": 85,