diff --git a/tools/zed/keymap.json b/tools/zed/keymap.json
index 516848a..1d95b9f 100644
--- a/tools/zed/keymap.json
+++ b/tools/zed/keymap.json
@@ -62,7 +62,7 @@
     "context": "vim_mode == normal",
 
     "bindings": {
-      "H": "pane::ActivatePrevItem",
+      "H": "pane::ActivatePreviousItem",
       "I": "pane::ActivateNextItem"
     }
   },
@@ -89,7 +89,7 @@
       "e": "vim::Up",
       "i": "vim::Right",
       "k": "search::SelectNextMatch",
-      "K": "search::SelectPrevMatch",
+      "K": "search::SelectPreviousMatch",
       "N": ["workspace::SendKeystrokes", "n n n n n"],
       "E": ["workspace::SendKeystrokes", "e e e e e"]
     }
@@ -99,7 +99,7 @@
 
     "bindings": {
       "n": "menu::SelectNext",
-      "e": "menu::SelectPrev",
+      "e": "menu::SelectPrevious",
       "i": "project_panel::ExpandSelectedEntry",
       "A": "project_panel::NewDirectory",
       "a": "project_panel::NewFile",
diff --git a/tools/zed/keymap_backup.json b/tools/zed/keymap_backup.json
index 2791e19..516848a 100644
--- a/tools/zed/keymap_backup.json
+++ b/tools/zed/keymap_backup.json
@@ -47,20 +47,38 @@
     "bindings": {
       "N": "vim::JoinLines",
       "l": "vim::InsertBefore",
-      "L": "vim::InsertFirstNonWhitespace",
+      "L": "vim::InsertFirstNonWhitespace"
+    }
+  },
+  {
+    "context": "vim_mode == visual || vim_mode == operator",
+
+    "bindings": {
+      "H": "vim::StartOfLine",
+      "I": "vim::EndOfLine"
+    }
+  },
+  {
+    "context": "vim_mode == normal",
+
+    "bindings": {
       "H": "pane::ActivatePrevItem",
       "I": "pane::ActivateNextItem"
     }
   },
   {
-    "context": "vim_mode == normal || not_editing || EmptyPane",
+    "context": "GitPanel || ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView",
 
     "bindings": {
       "space space": "file_finder::Toggle",
       "space ;": "command_palette::Toggle",
       "space f c": "zed::OpenSettings",
       "space f e c": "zed::OpenSettings",
-      "space f t": "project_panel::ToggleFocus"
+      "space f t": "project_panel::ToggleFocus",
+      "ctrl-w h": "workspace::ActivatePaneLeft",
+      "ctrl-w i": "workspace::ActivatePaneRight",
+      "ctrl-w e": "workspace::ActivatePaneUp",
+      "ctrl-w n": "workspace::ActivatePaneDown"
     }
   },
   {
diff --git a/tools/zed/settings.json b/tools/zed/settings.json
index af1df69..14e8124 100644
--- a/tools/zed/settings.json
+++ b/tools/zed/settings.json
@@ -39,6 +39,6 @@
     "dark": "Catppuccin Mocha"
   },
   "relative_line_numbers": true,
-  "buffer_font_family": "JetBrainsMono Nerd Font",
+  "buffer_font_family": "Maple Mono NF CN",
   "remove_trailing_whitespace_on_save": true
 }