diff --git a/keymap.json b/keymap.json
index 4b98520..b23a308 100644
--- a/keymap.json
+++ b/keymap.json
@@ -9,15 +9,17 @@
   {
     "context": "",
     "bindings": {
-      "ctrl-q": null // "zed::Quit"
+      "ctrl-q": null, // "zed::Quit"
+      "alt-pageup": "workspace::ActivatePaneLeft",
+      "alt-pagedown": "workspace::ActivatePaneRight",
     }
   },
   {
     "context": "Workspace",
     "bindings": {
-      // "shift shift": "file_finder::Toggle"
       // "escape": "project_panel::ToggleFocus"
-      // "ctrl-j": null,
+      "ctrl-j": null, // "workspace::ToggleBottomDock"
+      "ctrl-a": "workspace::ToggleBottomDock"
     }
   },
   {
@@ -29,8 +31,8 @@
       // "ctrl-pagedown": "pane::ActivateNextItem" // default
       // "ctrl-shift-pageup": "pane::SwapItemLeft", // default
       // "ctrl-shift-pagedown": "pane::SwapItemRight" // default
-      "ctrl-,": "zed::OpenSettings",
-      "ctrl-;": "zed::OpenKeymap"
+      "ctrl-,": "zed::OpenSettings"
+      // "ctrl-;": "zed::OpenKeymap" //doesn't work
     }
   },
   {
@@ -68,7 +70,7 @@
       "ctrl-j": "editor::JoinLines",
       "ctrl-shift-j": null, // "editor::JoinLines"
       "ctrl-l": "editor::Fold",
-      "ctrl-;": "editor::UnfoldLines", // ctrl-ø
+      "ctrl-oslash": "editor::UnfoldLines", // ctrl-ø
 
       "f5": "editor::SortLinesCaseSensitive",
 
@@ -95,25 +97,20 @@
       "ctrl-'": ["editor::ToggleComments", { "advance_downwards": false }],
 
       "ctrl-r": "editor::ToggleLineNumbers"
-
-      // "alt-pageup": ["workspace::ActivatePaneInDirection", "Left"],
-      // "alt-pagedown": ["workspace::ActivatePaneInDirection", "Right"]
     }
   },
+  // ====================
+  // search behaviour
+  // ====================
   {
     "context": "Editor && mode == full",
     "bindings": {
-      "ctrl-f": ["buffer_search::Deploy", { "replace_enabled": true }]
-    }
-  },
-  {
-    "context": "BufferSearchBar",
-    "bindings": {
-      // "enter": "buffer_search::FocusEditor",
-      // "ctrl-f": "buffer_search::Dismiss"
-      "ctrl-f": null
+      // defaults are with '"replace_enabled": false'
+      // "ctrl-f": ["buffer_search::Deploy", { "replace_enabled": true }]
+      // "ctrl-shift-f": ["pane::DeploySearch", { "replace_enabled": true }]
     }
   },
+  // ====================
   {
     "context": "Terminal",
     "bindings": {
diff --git a/settings.json b/settings.json
index 3718424..bcd90e3 100644
--- a/settings.json
+++ b/settings.json
@@ -59,7 +59,9 @@
   },
   "git": {
     // I like it, but it is too slow https://github.com/zed-industries/zed/issues/13547
-    "inline_blame": { "enabled": false }
+    "inline_blame": {
+      "enabled": false
+    }
   },
   "format_on_save": "off",
   "preview_tabs": {
@@ -102,6 +104,9 @@
     "vhdl": true
   },
   "languages": {
+    "JSONC": {
+      "format_on_save": "on"
+    },
     // "Python": {
     //   "language_servers": ["pylsp", "!pyright", "!basedpyright"]
     //   // "enable_language_server": false,
@@ -115,7 +120,10 @@
       "formatter": {
         "external": {
           "command": "bash",
-          "arguments": ["-c", "t=\"$(mktemp)\"; cat >\"$t\"; just --unstable --fmt --justfile \"$t\"; cat \"$t\"; rm \"$t\";"]
+          "arguments": [
+            "-c",
+            "t=\"$(mktemp)\"; cat >\"$t\"; just --unstable --fmt --justfile \"$t\"; cat \"$t\"; rm \"$t\";"
+          ]
         }
       }
     },
@@ -175,7 +183,9 @@
     },
     "nil": {
       "initialization_options": {
-        "formatting": { "command": ["nixfmt"] }
+        "formatting": {
+          "command": ["nixfmt"]
+        }
         // bundled binary is dynamically linked
       }
     },