diff --git a/zed_config/keymap.json b/zed_config/keymap.json
index a3a25b2..0281ff6 100644
--- a/zed_config/keymap.json
+++ b/zed_config/keymap.json
@@ -42,7 +42,6 @@
   {
     "context": "Editor",
     "bindings": {
-      "ctrl-shift-s": "editor::ToggleInlineCompletions",
       "escape": "editor::Cancel",
       "backspace": "editor::Backspace",
       "shift-backspace": "editor::Backspace",
@@ -202,20 +201,6 @@
       "cmd-alt-e": "editor::SelectEnclosingSymbol"
     }
   },
-  {
-    "context": "Editor && mode == full && inline_completion",
-    "bindings": {
-      "alt-]": "editor::NextInlineCompletion",
-      "alt-[": "editor::PreviousInlineCompletion",
-      "alt-right": "editor::AcceptPartialInlineCompletion"
-    }
-  },
-  {
-    "context": "Editor && !inline_completion",
-    "bindings": {
-      "alt-\\": "editor::ShowInlineCompletion"
-    }
-  },
   {
     "context": "Editor && mode == auto_height",
     "bindings": {
@@ -351,9 +336,7 @@
       "cmd-7": ["pane::ActivateItem", 6],
       "cmd-8": ["pane::ActivateItem", 7],
       "cmd-9": ["pane::ActivateItem", 8],
-      "cmd-0": "pane::ActivateLastItem",
-      "alt-cmd-left": ["workspace::ActivatePaneInDirection", "Left"],
-      "alt-cmd-right": ["workspace::ActivatePaneInDirection", "Right"]
+      "cmd-0": "pane::ActivateLastItem"
     }
   },
   // Bindings from VS Code
@@ -458,7 +441,6 @@
       ],
       "cmd-shift-o": "file_finder::Toggle",
       "cmd-r": "task::Spawn",
-      "alt-cmd-b": "branches::OpenRecent",
       "ctrl-~": "workspace::NewTerminal",
       "cmd-s": "workspace::Save",
       "cmd-k s": "workspace::SaveWithoutFormat",
@@ -495,14 +477,6 @@
       "cmd-alt-s": "workspace::SaveAll",
       "cmd-k m": "language_selector::Toggle",
       "escape": "workspace::Unfollow",
-      "cmd-k cmd-left": ["workspace::ActivatePaneInDirection", "Left"],
-      "cmd-k cmd-right": ["workspace::ActivatePaneInDirection", "Right"],
-      "cmd-k cmd-up": ["workspace::ActivatePaneInDirection", "Up"],
-      "cmd-k cmd-down": ["workspace::ActivatePaneInDirection", "Down"],
-      "cmd-k shift-left": ["workspace::SwapPaneInDirection", "Left"],
-      "cmd-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
-      "cmd-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
-      "cmd-k shift-down": ["workspace::SwapPaneInDirection", "Down"],
       "cmd-shift-x": "zed::Extensions",
       "alt-t": "task::Rerun",
       "alt-shift-t": "task::Spawn"
@@ -554,7 +528,7 @@
   {
     "context": "Editor && inline_completion && !showing_completions",
     "bindings": {
-      "tab": "editor::AcceptInlineCompletion"
+      "tab": "editor::ConfirmCompletion"
     }
   },
   {
@@ -710,7 +684,6 @@
   {
     "context": "Picker",
     "bindings": {
-      "f2": "picker::UseSelectedQuery",
       "alt-enter": [
         "picker::ConfirmInput",
         {
diff --git a/zed_config/settings.json b/zed_config/settings.json
index ee023f1..9efe3a0 100644
--- a/zed_config/settings.json
+++ b/zed_config/settings.json
@@ -18,7 +18,7 @@
   },
 
   "features": {
-    "inline_completion_provider": "none"
+    "edit_prediction_provider": "zed"
   },
   "collaboration_panel": {
     "button": false