diff --git a/defaults/keymaps-common.toml b/defaults/keymaps-common.toml
index 146504aa..931c31a4 100644
--- a/defaults/keymaps-common.toml
+++ b/defaults/keymaps-common.toml
@@ -1,38 +1,38 @@
-# --------------------------------- General --------------------------------------------
-
-[[keymaps]]
-key = "F1"
-command = "palette.command"
-
-# --------------------------------- Basic editing ---------------------------------------
-
-[[keymaps]]
-key = "alt+up"
-command = "move_line_up"
-mode = "i"
-
-[[keymaps]]
-key = "alt+down"
-command = "move_line_down"
-mode = "i"
+# --------------------------------- General --------------------------------------------
+
+[[keymaps]]
+key = "F1"
+command = "palette.command"
+
+# --------------------------------- Basic editing ---------------------------------------
+
+[[keymaps]]
+key = "alt+up"
+command = "move_line_up"
+mode = "i"
+
+[[keymaps]]
+key = "alt+down"
+command = "move_line_down"
+mode = "i"
 
 [[keymaps]]
 key = "Delete"
 command = "delete_forward"
 mode = "i"
-
-[[keymaps]]
-key = "backspace"
-command = "delete_backward"
-mode = "i"
-
-[[keymaps]]
-key = "Home"
-command = "line_start_non_blank"
-
-[[keymaps]]
-key = "End"
-command = "line_end"
+
+[[keymaps]]
+key = "backspace"
+command = "delete_backward"
+mode = "i"
+
+[[keymaps]]
+key = "Home"
+command = "line_start_non_blank"
+
+[[keymaps]]
+key = "End"
+command = "line_end"
 
 [[keymaps]]
 key = "PageUp"
@@ -49,14 +49,14 @@ command = "scroll_up"
 [[keymaps]]
 key = "Ctrl+PageDown"
 command = "scroll_down"
-
-# ------------------------------------ Multi cursor -------------------------------------
-
-[[keymaps]]
-key = "alt+I"
-command = "insert_cursor_end_of_line"
+
+# ------------------------------------ Multi cursor -------------------------------------
+
+[[keymaps]]
+key = "alt+I"
+command = "insert_cursor_end_of_line"
 mode = "i"
-
+
 # --------------------------------- Rich Lanaguage Editing ----------------------------
 
 [[keymaps]]
@@ -88,8 +88,8 @@ mode = "i"
 [[keymaps]]
 key = "Ctrl+`"
 command = "toggle_terminal_focus"
-
-# ------------------------------------ ------------ -------------------------------------
+
+# ------------------------------------ ------------ -------------------------------------
 
 [[keymaps]]
 key = "tab"
@@ -102,136 +102,136 @@ key = "shift+tab"
 command = "jump_to_prev_snippet_placeholder"
 when = "in_snippet"
 mode = "i"
-
-[[keymaps]]
-key = "esc"
-command = "clear_search"
-when = "search_focus"
-
-[[keymaps]]
-key = "ctrl+m"
-command = "list.select"
-when = "list_focus"
-
-[[keymaps]]
-key = "enter"
-command = "list.select"
-when = "list_focus"
-
-[[keymaps]]
-key = "ctrl+p"
-command = "list.previous"
-when = "list_focus"
-
-[[keymaps]]
-key = "up"
-command = "list.previous"
-when = "list_focus"
-
-[[keymaps]]
-key = "ctrl+n"
-command = "list.next"
-when = "list_focus"
-
-[[keymaps]]
-key = "down"
-command = "list.next"
-when = "list_focus"
-
-[[keymaps]]
-key = "o"
-command = "list.expand"
-when = "list_focus"
-mode = "n"
-
-[[keymaps]]
-key = "/"
-command = "palette.line"
-mode = "n"
-
+
+[[keymaps]]
+key = "esc"
+command = "clear_search"
+when = "search_focus"
+
+[[keymaps]]
+key = "ctrl+m"
+command = "list.select"
+when = "list_focus"
+
+[[keymaps]]
+key = "enter"
+command = "list.select"
+when = "list_focus"
+
+[[keymaps]]
+key = "ctrl+p"
+command = "list.previous"
+when = "list_focus"
+
+[[keymaps]]
+key = "up"
+command = "list.previous"
+when = "list_focus"
+
+[[keymaps]]
+key = "ctrl+n"
+command = "list.next"
+when = "list_focus"
+
+[[keymaps]]
+key = "down"
+command = "list.next"
+when = "list_focus"
+
+[[keymaps]]
+key = "o"
+command = "list.expand"
+when = "list_focus"
+mode = "n"
+
+[[keymaps]]
+key = "/"
+command = "palette.line"
+mode = "n"
+
 [[keymaps]]
 key = "esc"
 command = "modal.close"
-when = "modal_focus"
-
-[[keymaps]]
-key = "ctrl+b"
-command = "left"
-mode = "i"
-
-[[keymaps]]
-key = "ctrl+f"
-command = "right"
-mode = "i"
-
-[[keymaps]]
-key = "right"
-command = "right"
-
-[[keymaps]]
-key = "left"
-command = "left"
-
-[[keymaps]]
-key = "up"
-command = "up"
-when = "!list_focus"
-
-[[keymaps]]
-key = "down"
-command = "down"
-when = "!list_focus"
-
-[[keymaps]]
-key = "ctrl+h"
-command = "delete_backward"
-mode = "i"
-
-[[keymaps]]
-key = "enter"
-command = "insert_new_line"
-when = "!list_focus"
-mode = "i"
-
-[[keymaps]]
-key = "shift+enter"
-command = "search_backward"
-when = "search_focus"
-mode = "i"
-
-[[keymaps]]
-key = "tab"
-command = "insert_tab"
-when = "!in_snippet"
-mode = "i"
-
-[[keymaps]]
-key = "ctrl+m"
-command = "insert_new_line"
+when = "modal_focus"
+
+[[keymaps]]
+key = "ctrl+b"
+command = "left"
+mode = "i"
+
+[[keymaps]]
+key = "ctrl+f"
+command = "right"
+mode = "i"
+
+[[keymaps]]
+key = "right"
+command = "right"
+
+[[keymaps]]
+key = "left"
+command = "left"
+
+[[keymaps]]
+key = "up"
+command = "up"
 when = "!list_focus"
-mode = "i"
-
-# ------------------------------------ Modal -----------------------------------------
-
-[[keymaps]]
-key = "esc"
-command = "normal_mode"
-mode = "niv"
-when = "!search_focus"
-
-[[keymaps]]
-key = ":"
-command = "palette.command"
-mode = "n"
+
+[[keymaps]]
+key = "down"
+command = "down"
+when = "!list_focus"
+
+[[keymaps]]
+key = "ctrl+h"
+command = "delete_backward"
+mode = "i"
+
+[[keymaps]]
+key = "enter"
+command = "insert_new_line"
+when = "!list_focus"
+mode = "i"
+
+[[keymaps]]
+key = "shift+enter"
+command = "search_backward"
+when = "search_focus"
+mode = "i"
+
+[[keymaps]]
+key = "tab"
+command = "insert_tab"
+when = "!in_snippet"
+mode = "i"
+
+[[keymaps]]
+key = "ctrl+m"
+command = "insert_new_line"
+when = "!list_focus"
+mode = "i"
+
+# ------------------------------------ Modal -----------------------------------------
+
+[[keymaps]]
+key = "esc"
+command = "normal_mode"
+mode = "niv"
+when = "!search_focus"
+
+[[keymaps]]
+key = ":"
+command = "palette.command"
+mode = "n"
 
 [[keymaps]]
 key = "G"
-command = "go_to_line_deault_last"
+command = "go_to_line_default_last"
 mode = "nv"
 
 [[keymaps]]
 key = "g g"
-command = "go_to_line_deault_first"
+command = "go_to_line_default_first"
 mode = "nv"
 
 [[keymaps]]
@@ -523,18 +523,18 @@ mode = "n"
 key = "ctrl+w v"
 command = "split_vertical"
 mode = "n"
-
-[[keymaps]]
-key = "space"
-command = "toggle_code_lens"
-mode = "nv"
 
-[[keymaps]]
-key = ">"
-command = "indent_line"
-mode = "v"
+[[keymaps]]
+key = "space"
+command = "toggle_code_lens"
+mode = "nv"
 
-[[keymaps]]
-key = "<"
-command = "outdent_line"
-mode = "v"
+[[keymaps]]
+key = ">"
+command = "indent_line"
+mode = "v"
+
+[[keymaps]]
+key = "<"
+command = "outdent_line"
+mode = "v"
diff --git a/lapce-data/src/command.rs b/lapce-data/src/command.rs
index 9684bf49..e7dc4d13 100644
--- a/lapce-data/src/command.rs
+++ b/lapce-data/src/command.rs
@@ -414,9 +414,9 @@ pub enum LapceCommand {
     LineStart,
     #[strum(serialize = "line_start_non_blank")]
     LineStartNonBlank,
-    #[strum(serialize = "go_to_line_deault_last")]
+    #[strum(serialize = "go_to_line_default_last")]
     GotoLineDefaultLast,
-    #[strum(serialize = "go_to_line_deault_first")]
+    #[strum(serialize = "go_to_line_default_first")]
     GotoLineDefaultFirst,
     #[strum(serialize = "append")]
     Append,