diff --git a/keymap.json b/keymap.json
index 015dbd8..230030a 100644
--- a/keymap.json
+++ b/keymap.json
@@ -9,24 +9,11 @@
   {
     "context": "Workspace",
     "bindings": {
-      "ctrl-h": [
-        "workspace::ActivatePaneInDirection",
-        "Left"
-      ],
-      "ctrl-l": [
-        "workspace::ActivatePaneInDirection",
-        "Right"
-      ],
-      "ctrl-k": [
-        "workspace::ActivatePaneInDirection",
-        "Up"
-      ],
-      "ctrl-j": [
-        "workspace::ActivatePaneInDirection",
-        "Down"
-      ]
+      "ctrl-h": "workspace::ActivatePaneLeft",
+      "ctrl-l": "workspace::ActivatePaneRight",
+      "ctrl-k": "workspace::ActivatePaneUp",
+      "ctrl-j": "workspace::ActivatePaneDown"
     },
-    "ctrl-x": "workspace::ToggleBottomDock"
   },
   {
     "context": "Editor",
@@ -71,22 +58,10 @@
       "space space": "file_finder::Toggle",
       "shift-tab": "pane::ActivatePrevItem",
       "tab": "pane::ActivateNextItem",
-      "ctrl-h": [
-        "workspace::ActivatePaneInDirection",
-        "Left"
-      ],
-      "ctrl-l": [
-        "workspace::ActivatePaneInDirection",
-        "Right"
-      ],
-      "ctrl-k": [
-        "workspace::ActivatePaneInDirection",
-        "Up"
-      ],
-      "ctrl-j": [
-        "workspace::ActivatePaneInDirection",
-        "Down"
-      ]
+      "ctrl-h": "workspace::ActivatePaneLeft",
+      "ctrl-l": "workspace::ActivatePaneRight",
+      "ctrl-k": "workspace::ActivatePaneUp",
+      "ctrl-j": "workspace::ActivatePaneDown"
     }
   },
   {
diff --git a/settings.json b/settings.json
index 236258c..d006541 100644
--- a/settings.json
+++ b/settings.json
@@ -7,227 +7,228 @@
 // custom settings, run the `zed: Open Default Settings` command
 // from the command palette
 {
-  "assistant": {
-    "enabled": false,
-    "button": true,
-    "dock": "right",
-    "default_width": 640,
-    "default_height": 320,
-    "provider": "openai",
-    "version": "2",
-    "default_model": {
-      "provider": "openai",
-      "model": "gpt-4o"
+    "icon_theme": "Zed (Default)",
+    "assistant": {
+        "button": true,
+        "dock": "right",
+        "default_width": 640,
+        "default_height": 320,
+        "provider": "openai",
+        "version": "2",
+        "default_model": {
+            "provider": "openai",
+            "model": "gpt-4o"
+        },
     },
-  },
-  "always_treat_brackets_as_autoclosed": false,
-  "base_keymap": "VSCode",
-  "ui_font_size": 14,
-  "ui_font_family": "JetBrainsMonoNL Nerd Font Mono",
-  "buffer_font_size": 14,
-  "buffer_font_family": "JetBrainsMonoNL Nerd Font Mono",
-  "buffer_font_weight": 400,
-  "buffer_line_height": "comfortable",
-  "confirm_quit": false,
-  "current_line_highlight": "all",
-  "cursor_blink": true,
-  "cursor_shape": "bar",
-  "collaboration_panel": {
-    "button": false
-  },
-  "chat_panel": {
-    "button": false
-  },
-  "features": {
-    "inline_completion_provider": "none"
-  },
-  "format_on_save": "on",
-  "formatter": "language_server",
-  "enable_language_server": true,
-  "languages": {
-    "JSON": {
-      "tab_size": 4
+    "always_treat_brackets_as_autoclosed": false,
+    "base_keymap": "VSCode",
+    "tab_size": 4,
+    "ui_font_size": 14,
+    "ui_font_family": "JetBrainsMonoNL Nerd Font Mono",
+    "buffer_font_size": 14.0,
+    "buffer_font_family": "JetBrainsMonoNL Nerd Font Mono",
+    "buffer_font_weight": 400,
+    "buffer_line_height": "comfortable",
+    "confirm_quit": false,
+    "current_line_highlight": "all",
+    "cursor_blink": true,
+    "cursor_shape": "bar",
+    "collaboration_panel": {
+        "button": false
     },
-    "JavaScript": {
-      "formatter": {
-        "external": {
-          "command": "prettier",
-          "arguments": [
-            "--stdin-filepath",
-            "{buffer_path}"
-          ]
+    "chat_panel": {
+        "button": "never"
+    },
+    "features": {
+        "inline_completion_provider": "none"
+    },
+    "format_on_save": "on",
+    "formatter": "language_server",
+    "enable_language_server": true,
+    "languages": {
+        "HTML": {
+            "tab_size": 2
+        },
+        "JSON": {
+            "tab_size": 4
+        },
+        "JavaScript": {
+            "formatter": {
+                "external": {
+                    "command": "prettier",
+                    "arguments": [
+                        "--stdin-filepath",
+                        "{buffer_path}"
+                    ]
+                }
+            }
+        },
+        "TypeScript": {
+            "language_servers": [
+                "typescript-language-server",
+                "!vtsls"
+            ],
+            "formatter": {
+                "external": {
+                    "command": "prettier",
+                    "arguments": [
+                        "--stdin-filepath",
+                        "{buffer_path}"
+                    ]
+                }
+            },
+            "code_actions_on_format": {
+                "source.organizeImports": true
+            }
+        },
+        "TSX": {
+            "language_servers": [
+                "typescript-language-server",
+                "!vtsls"
+            ],
+            "formatter": {
+                "external": {
+                    "command": "prettier",
+                    "arguments": [
+                        "--stdin-filepath",
+                        "{buffer_path}"
+                    ]
+                }
+            },
+            "code_actions_on_format": {
+                "source.organizeImports": true
+            }
         }
-      }
     },
-    "TypeScript": {
-      "language_servers": [
-        "typescript-language-server",
-        "!vtsls"
-      ],
-      "formatter": {
-        "external": {
-          "command": "prettier",
-          "arguments": [
-            "--stdin-filepath",
-            "{buffer_path}"
-          ]
-        }
-      },
-      "code_actions_on_format": {
-        "source.organizeImports": true
-      }
+    "file_types": {
+        "Dockerfile": [
+            "Dockerfile*"
+        ]
     },
-    "TSX": {
-      "language_servers": [
-        "typescript-language-server",
-        "!vtsls"
-      ],
-      "formatter": {
-        "external": {
-          "command": "prettier",
-          "arguments": [
-            "--stdin-filepath",
-            "{buffer_path}"
-          ]
+    "git": {
+        "git_gutter": "tracked_files",
+        "inline_blame": {
+            "enabled": true
         }
-      },
-      "code_actions_on_format": {
-        "source.organizeImports": true
-      }
-    }
-  },
-  "file_types": {
-    "Dockerfile": [
-      "Dockerfile*"
+    },
+    "hard_tabs": false,
+    "indent_guides": {
+        "enabled": true,
+        "line_width": 1,
+        "active_line_width": 2,
+        "coloring": "fixed",
+        "background_coloring": "disabled"
+    },
+    "inlay_hints": {
+        "enabled": false,
+        "show_type_hints": true,
+        "show_parameter_hints": true,
+        "show_other_hints": true,
+        "show_background": false,
+        "edit_debounce_ms": 700,
+        "scroll_debounce_ms": 50
+    },
+    "outline_panel": {
+        "button": true,
+        "default_width": 240,
+        "dock": "left",
+        "file_icons": true,
+        "folder_icons": true,
+        "git_status": true,
+        "indent_size": 20,
+        "auto_reveal_entries": true,
+        "auto_fold_dirs": true
+    },
+    "preview_tabs": {
+        "enabled": false,
+        "enable_preview_from_file_finder": false,
+        "enable_preview_from_code_navigation": false
+    },
+    "project_panel": {
+        "button": true,
+        "default_width": 240,
+        "dock": "left",
+        "file_icons": true,
+        "folder_icons": true,
+        "git_status": true,
+        "indent_size": 20,
+        "auto_reveal_entries": true,
+        "auto_fold_dirs": true
+    },
+    "relative_line_numbers": true,
+    "search": {
+        "whole_word": false,
+        "case_sensitive": false,
+        "include_ignored": false,
+        "regex": true
+    },
+    "show_wrap_guides": true,
+    "wrap_guides": [
+        80
     ],
-    "CSS": [
-      "CSS"
-    ]
-  },
-  "git": {
-    "git_gutter": "tracked_files",
-    "inline_blame": {
-      "enabled": true
-    }
-  },
-  "hard_tabs": false,
-  "indent_guides": {
-    "enabled": true,
-    "line_width": 1,
-    "active_line_width": 2,
-    "coloring": "fixed",
-    "background_coloring": "disabled"
-  },
-  "inlay_hints": {
-    "enabled": false,
-    "show_type_hints": true,
-    "show_parameter_hints": true,
-    "show_other_hints": true,
-    "show_background": false,
-    "edit_debounce_ms": 700,
-    "scroll_debounce_ms": 50
-  },
-  "outline_panel": {
-    "button": true,
-    "default_width": 240,
-    "dock": "left",
-    "file_icons": true,
-    "folder_icons": true,
-    "git_status": true,
-    "indent_size": 20,
-    "auto_reveal_entries": true,
-    "auto_fold_dirs": true
-  },
-  "preview_tabs": {
-    "enabled": false,
-    "enable_preview_from_file_finder": false,
-    "enable_preview_from_code_navigation": false
-  },
-  "project_panel": {
-    "button": true,
-    "default_width": 240,
-    "dock": "left",
-    "file_icons": true,
-    "folder_icons": true,
-    "git_status": true,
-    "indent_size": 20,
-    "auto_reveal_entries": true,
-    "auto_fold_dirs": true
-  },
-  "relative_line_numbers": true,
-  "search": {
-    "whole_word": false,
-    "case_sensitive": false,
-    "include_ignored": false,
-    "regex": true
-  },
-  "show_wrap_guides": true,
-  "wrap_guides": [
-    80
-  ],
-  "scrollbar": {
-    "show": "auto",
-    "cursors": true,
-    "git_diff": true,
-    "search_results": true,
-    "selected_symbol": true,
-    "diagnostics": true
-  },
-  "soft_wrap": "editor_width",
-  "tab_bar": {
-    "show": true,
-    "show_nav_history_buttons": false
-  },
-  "tabs": {
-    "close_position": "right",
-    "file_icons": true,
-    "git_status": true
-  },
-  "toolbar": {
-    "breadcrumbs": true,
-    "quick_actions": true
-  },
-  "telemetry": {
-    "diagnostics": false,
-    "metrics": false
-  },
-  "terminal": {
-    "alternate_scroll": "off",
-    "blinking": "terminal_controlled",
-    "copy_on_select": false,
-    "dock": "bottom",
-    "detect_venv": {
-      "on": {
-        "directories": [
-          ".env",
-          "env",
-          ".venv",
-          "venv"
-        ],
-        "activate_script": "default"
-      }
+    "scrollbar": {
+        "show": "auto",
+        "cursors": true,
+        "git_diff": true,
+        "search_results": true,
+        "selected_symbol": true,
+        "diagnostics": true
     },
-    "env": {
-      "ZED": "1",
-      "EXAMPLE": "value1:value2"
+    "soft_wrap": "editor_width",
+    "tab_bar": {
+        "show": true,
+        "show_nav_history_buttons": false
+    },
+    "tabs": {
+        "close_position": "right",
+        "file_icons": true,
+        "git_status": true
     },
-    "font_family": null,
-    "font_features": null,
-    "font_size": 14,
-    "line_height": "comfortable",
-    "option_as_meta": true,
-    "button": true,
-    "shell": "system",
     "toolbar": {
-      "title": true
+        "breadcrumbs": true,
+        "quick_actions": true
     },
-    "working_directory": "current_project_directory"
-  },
-  "theme": {
-    "mode": "light",
-    "light": "Solarized Light",
-    "dark": "One Dark"
-  },
-  "unnecessary_code_fade": 0.0,
-  "vim_mode": true,
+    "telemetry": {
+        "diagnostics": false,
+        "metrics": false
+    },
+    "terminal": {
+        "alternate_scroll": "off",
+        "blinking": "terminal_controlled",
+        "copy_on_select": false,
+        "dock": "bottom",
+        "detect_venv": {
+            "on": {
+                "directories": [
+                    ".env",
+                    "env",
+                    ".venv",
+                    "venv"
+                ],
+                "activate_script": "default"
+            }
+        },
+        "env": {
+            "ZED": "1",
+            "EXAMPLE": "value1:value2"
+        },
+        "font_family": null,
+        "font_features": null,
+        "font_size": 14,
+        "line_height": "comfortable",
+        "option_as_meta": true,
+        "button": true,
+        "shell": "system",
+        "toolbar": {
+            "title": true
+        },
+        "working_directory": "current_project_directory"
+    },
+    "theme": {
+        "mode": "light",
+        "light": "Solarized Light",
+        "dark": "One Dark"
+    },
+    "unnecessary_code_fade": 0.0,
+    "vim_mode": true,
 }