diff --git a/keymap.json b/keymap.json
index cb6806f..015dbd8 100644
--- a/keymap.json
+++ b/keymap.json
@@ -4,11 +4,11 @@
 // documentation: https://zed.dev/docs/key-bindings
 // To see the default key bindings run `zed: Open Default Keymap`
 // from the command palette.
+// NOTE: defaults on: https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-macos.json
 [
   {
     "context": "Workspace",
     "bindings": {
-      // "shift shift": "file_finder::Toggle"
       "ctrl-h": [
         "workspace::ActivatePaneInDirection",
         "Left"
@@ -25,7 +25,8 @@
         "workspace::ActivatePaneInDirection",
         "Down"
       ]
-    }
+    },
+    "ctrl-x": "workspace::ToggleBottomDock"
   },
   {
     "context": "Editor",
@@ -33,16 +34,31 @@
       // "j k": ["workspace::SendKeystrokes", "escape"]
       "ctrl-t": "workspace::NewFile",
       "ctrl-w": "pane::CloseActiveItem",
-      "ctrl-W": "pane::CloseAllItems"
+      "ctrl-W": "pane::CloseAllItems",
+      "ctrl-n": "workspace::ToggleLeftDock",
+      "ctrl-m": "workspace::ToggleBottomDock"
     }
   },
   {
     "context": "Editor && vim_mode == insert",
     "bindings": {
-      "j k": [
-        "workspace::SendKeystrokes",
-        "escape"
-      ]
+      // "j k": [
+      //   "workspace::SendKeystrokes",
+      //   "escape"
+      // ]
+    }
+  },
+  {
+    "context": "Editor && (showing_code_actions || showing_completions)",
+    "bindings": {
+      "up": "editor::ContextMenuPrev",
+      "ctrl-p": "editor::ContextMenuPrev",
+      "down": "editor::ContextMenuNext",
+      "ctrl-n": "editor::ContextMenuNext",
+      "pageup": "editor::ContextMenuFirst",
+      "pagedown": "editor::ContextMenuLast",
+      "tab": "editor::ContextMenuNext",
+      "shift-tab": "editor::ContextMenuPrev"
     }
   },
   {
@@ -51,6 +67,8 @@
       "space x": "pane::CloseActiveItem",
       "space X": "pane::CloseAllItems",
       "space b": "workspace::NewFile",
+      "space f f": "file_finder::Toggle",
+      "space space": "file_finder::Toggle",
       "shift-tab": "pane::ActivatePrevItem",
       "tab": "pane::ActivateNextItem",
       "ctrl-h": [
@@ -74,8 +92,10 @@
   {
     "context": "Terminal",
     "bindings": {
+      "ctrl-n": "workspace::ToggleLeftDock",
       "ctrl-t": "workspace::NewTerminal",
-      "ctrl-w": "pane::CloseActiveItem"
+      "ctrl-w": "pane::CloseActiveItem",
+      "ctrl-m": "workspace::ToggleBottomDock"
     }
   },
   {
diff --git a/settings.json b/settings.json
index bca8037..236258c 100644
--- a/settings.json
+++ b/settings.json
@@ -141,7 +141,7 @@
   "preview_tabs": {
     "enabled": false,
     "enable_preview_from_file_finder": false,
-    "enable_preview_from_code_navigation": false,
+    "enable_preview_from_code_navigation": false
   },
   "project_panel": {
     "button": true,