diff --git a/src/keybind/builtin/emacs.json b/src/keybind/builtin/emacs.json
index d57d10e..c76dea2 100644
--- a/src/keybind/builtin/emacs.json
+++ b/src/keybind/builtin/emacs.json
@@ -6,7 +6,6 @@
             ["ctrl+=", "adjust_fontsize", 1.0],
             ["ctrl+-", "adjust_fontsize", -1.0],
             ["ctrl+r", "find_file"],
-            ["ctrl+x d", "open_project_file_tree"],
             ["ctrl+h ctrl+a", "open_help"],
             ["ctrl+c ctrl+o", "open_recent_project"],
             ["ctrl+c g", "find_in_files"],
diff --git a/src/keybind/builtin/flow.json b/src/keybind/builtin/flow.json
index 6453eda..bb2d412 100644
--- a/src/keybind/builtin/flow.json
+++ b/src/keybind/builtin/flow.json
@@ -28,7 +28,6 @@
             ["ctrl+w", "close_split"],
             ["ctrl+o", "open_file"],
             ["ctrl+e", "open_recent"],
-            ["ctrl+shift+e", "open_project_file_tree"],
             ["alt+o", "open_previous_file"],
             ["ctrl+shift+t", "restore_closed_tab"],
             ["ctrl+shift+f5", "reload_file"],
@@ -63,7 +62,7 @@
             ["ctrl+page_up", "previous_tab"],
             ["ctrl+shift+page_down", "move_tab_next"],
             ["ctrl+shift+page_up", "move_tab_previous"],
-            ["ctrl+k e", "switch_buffers"],
+            ["ctrl+shift+e", "switch_buffers"],
             ["alt+shift+v", "clipboard_history"],
             ["ctrl+0", "reset_fontsize"],
             ["ctrl+plus", "adjust_fontsize", 1.0],
diff --git a/src/keybind/builtin/helix.json b/src/keybind/builtin/helix.json
index 56cc684..c6223b9 100644
--- a/src/keybind/builtin/helix.json
+++ b/src/keybind/builtin/helix.json
@@ -220,7 +220,6 @@
             ["page_down", "move_scroll_page_down"],
 
             ["space F", "find_file"],
-            ["space e", "open_project_file_tree"],
             ["space S", "workspace_symbol_picker"],
             ["space D", "workspace_diagnostics_picker"],
             ["space P", "system_paste"],
diff --git a/src/tui/mode/overlay/palette.zig b/src/tui/mode/overlay/palette.zig
index 74764a5..63a541b 100644
--- a/src/tui/mode/overlay/palette.zig
+++ b/src/tui/mode/overlay/palette.zig
@@ -317,7 +317,7 @@ pub fn Create(options: type) type {
             self.inputbox.hint.print(self.inputbox.allocator, "{d}/{d}", .{ self.total_items, self.entries.items.len }) catch {};
         }
 
-        pub fn start_query(self: *Self, n: usize) !void {
+        fn start_query(self: *Self, n: usize) !void {
             defer tui.reset_hover(@src());
             defer self.update_count_hint();
             self.items = 0;
diff --git a/src/tui/mode/overlay/project_file_tree_palette.zig b/src/tui/mode/overlay/project_file_tree_palette.zig
deleted file mode 100644
index 25cc726..0000000
--- a/src/tui/mode/overlay/project_file_tree_palette.zig
+++ /dev/null
@@ -1,320 +0,0 @@
-const std = @import("std");
-const cbor = @import("cbor");
-const tp = @import("thespian");
-const root = @import("soft_root").root;
-const command = @import("command");
-const file_type_config = @import("file_type_config");
-
-const tui = @import("../../tui.zig");
-pub const Type = @import("palette.zig").Create(@This());
-const module_name = @typeName(@This());
-const Widget = @import("../../Widget.zig");
-
-pub const label = "File Explorer";
-pub const name = "File Explorer";
-pub const description = "Project file explorer";
-pub const icon = "  ";
-pub const modal_dim = true;
-pub const placement = .top_center;
-
-pub const NodeType = enum {
-    file,
-    folder,
-};
-
-pub const Node = struct {
-    name: []const u8,
-    type_: NodeType,
-    expanded: bool = false,
-    children: ?std.ArrayList(Node) = null,
-    parent: ?*Node = null,
-    path: []const u8,
-};
-
-pub const Entry = struct {
-    label: []const u8, // TODO: Just needed because of pallete.zig L:328 self.longest = @max(self.longest, entry.label.len)
-    indent: usize,
-    file_icon: []const u8,
-    file_color: u24,
-    node: *Node,
-};
-
-fn createNodeFromPath(allocator: std.mem.Allocator, path: []const u8) !*Node {
-    const node = try allocator.create(Node);
-    errdefer allocator.destroy(node);
-
-    const basename = std.fs.path.basename(path);
-    node.* = .{
-        .name = try allocator.dupe(u8, basename),
-        .path = try allocator.dupe(u8, path),
-        .type_ = undefined,
-        .expanded = false,
-        .children = null,
-        .parent = null,
-    };
-
-    var dir = std.fs.cwd().openDir(path, .{}) catch |err| {
-        if (err == error.NotDir or err == error.FileNotFound) {
-            node.*.type_ = .file;
-            return node;
-        }
-        return err;
-    };
-    defer dir.close();
-    node.*.type_ = .folder;
-    return node;
-}
-
-fn loadNodeChildren(allocator: std.mem.Allocator, node: *Node, recursive: bool) !void {
-    if (node.type_ != .folder) return;
-    if (node.children != null) return;
-
-    var children: std.ArrayList(Node) = .empty;
-    errdefer children.deinit(allocator);
-
-    var dir = try std.fs.cwd().openDir(node.path, .{ .iterate = true });
-    defer dir.close();
-
-    var iter = dir.iterateAssumeFirstIteration();
-    while (try iter.next()) |entry| {
-        const child_path = try std.fs.path.join(allocator, &[_][]const u8{ node.path, entry.name });
-        errdefer allocator.free(child_path);
-
-        var child_node = Node{
-            .name = try allocator.dupe(u8, entry.name),
-            .path = child_path,
-            .type_ = if (entry.kind == .directory) .folder else .file,
-            .expanded = false,
-            .children = null,
-            .parent = node,
-        };
-
-        if (recursive) {
-            try loadNodeChildren(allocator, &child_node, recursive);
-        }
-
-        try children.append(allocator, child_node);
-    }
-
-    node.children = children;
-}
-
-fn deinitNode(allocator: std.mem.Allocator, node: *Node) void {
-    allocator.free(node.name);
-    allocator.free(node.path);
-    if (node.children) |*children| {
-        for (children.items) |*child| {
-            deinitNode(allocator, child);
-        }
-        children.deinit(allocator);
-    }
-}
-
-fn deinitRootNode(allocator: std.mem.Allocator, node: *Node) void {
-    deinitNode(allocator, node);
-    allocator.destroy(node);
-}
-
-var root_node: ?*Node = null;
-
-pub fn load_entries(palette: *Type) !usize {
-    palette.entries.clearRetainingCapacity();
-
-    const project_path = tp.env.get().str("project");
-    if (project_path.len == 0) {
-        return 0;
-    }
-
-    if (root_node == null) {
-        root_node = try createNodeFromPath(palette.allocator, project_path);
-        try loadNodeChildren(palette.allocator, root_node.?, false);
-        root_node.?.expanded = true;
-    }
-
-    try buildVisibleList(palette, root_node.?, 0);
-
-    return palette.entries.items.len;
-}
-
-fn buildVisibleList(palette: *Type, node: *Node, depth: usize) !void {
-    const file_icon, const file_color = try getNodeIconAndColor(node);
-    try palette.entries.append(palette.allocator, .{
-        .label = node.name,
-        .indent = depth,
-        .file_icon = file_icon,
-        .file_color = file_color,
-        .node = node,
-    });
-
-    if (node.type_ == .folder and node.expanded) {
-        if (node.children) |children| {
-            for (children.items) |*child| {
-                try buildVisibleList(palette, child, depth + 1);
-            }
-        }
-    }
-}
-
-fn isNodeVisible(node: *const Node, root_ptr: *const Node) bool {
-    var current: ?*const Node = node;
-    while (current) |c| {
-        if (c == root_ptr) return true;
-        if (!c.expanded) return false;
-        current = c.parent;
-    }
-    return false;
-}
-
-fn getNodeIconAndColor(node: *const Node) !struct { []const u8, u24 } {
-
-    // Add folder icon or file icon
-    if (node.type_ == .folder) {
-        if (node.expanded) {
-            return .{ "", 0 };
-        } else return .{ "", 0 };
-    }
-
-    _, const icon_, const color_ = guess_file_type(node.path);
-    return .{ icon_, color_ };
-}
-
-fn default_ft() struct { []const u8, []const u8, u24 } {
-    return .{
-        file_type_config.default.name,
-        file_type_config.default.icon,
-        0,
-    };
-}
-
-pub fn guess_file_type(file_path: []const u8) struct { []const u8, []const u8, u24 } {
-    var buf: [1024]u8 = undefined;
-    const content: []const u8 = blk: {
-        const file = std.fs.cwd().openFile(file_path, .{ .mode = .read_only }) catch break :blk &.{};
-        defer file.close();
-        const size = file.read(&buf) catch break :blk &.{};
-        break :blk buf[0..size];
-    };
-    return if (file_type_config.guess_file_type(file_path, content)) |ft| .{
-        ft.name,
-        ft.icon orelse file_type_config.default.icon,
-        ft.color orelse file_type_config.default.color,
-    } else default_ft();
-}
-
-pub fn updated(palette: *Type, button_: ?*Type.ButtonType) !void {
-    _ = palette;
-    _ = button_;
-}
-
-pub fn on_render_menu(_: *Type, button: *Type.ButtonType, theme: *const Widget.Theme, selected: bool) bool {
-    const style_base = theme.editor_widget;
-    const style_label = if (button.active) theme.editor_cursor else if (button.hover or selected) theme.editor_selection else theme.editor_widget;
-    const style_hint = if (tui.find_scope_style(theme, "entity.name")) |sty| sty.style else style_label;
-    button.plane.set_base_style(style_base);
-    button.plane.erase();
-    button.plane.home();
-    button.plane.set_style(style_label);
-    if (button.active or button.hover or selected) {
-        button.plane.fill(" ");
-        button.plane.home();
-    }
-    var label_str: []const u8 = undefined;
-    var file_icon: []const u8 = undefined;
-    var indent: usize = 0;
-    var entry_index: usize = 0;
-    var icon_color: u24 = 0;
-
-    var iter = button.opts.label;
-    if (!(cbor.matchString(&iter, &label_str) catch false)) return false;
-    if (!(cbor.matchInt(usize, &iter, &entry_index) catch false)) return false;
-    if (!(cbor.matchInt(usize, &iter, &indent) catch false)) return false;
-    if (!(cbor.matchString(&iter, &file_icon) catch false)) return false;
-    if (!(cbor.matchInt(u24, &iter, &icon_color) catch false)) return false;
-
-    button.plane.set_style(style_hint);
-    tui.render_pointer(&button.plane, selected);
-    for (0..indent) |_| _ = button.plane.print(" ", .{}) catch {};
-
-    const icon_width = tui.render_file_icon(&button.plane, file_icon, icon_color);
-
-    button.plane.set_style(style_label);
-    _ = button.plane.print("{s} ", .{label_str}) catch {};
-    button.plane.set_style(style_hint);
-    var index: usize = 0;
-    var len = cbor.decodeArrayHeader(&iter) catch return false;
-    while (len > 0) : (len -= 1) {
-        if (cbor.matchValue(&iter, cbor.extract(&index)) catch break) {
-            tui.render_match_cell(&button.plane, 0, index + 2 + icon_width + indent, theme) catch break;
-        } else break;
-    }
-    return false;
-}
-
-fn select(menu: **Type.MenuType, button: *Type.ButtonType, _: Type.Pos) void {
-    const palette = menu.*.opts.ctx;
-
-    var label_str: []const u8 = undefined;
-    var entry_idx: usize = undefined;
-    var iter = button.opts.label;
-    if (!(cbor.matchString(&iter, &label_str) catch false)) return;
-    if (!(cbor.matchValue(&iter, cbor.extract(&entry_idx)) catch false)) return;
-
-    if (entry_idx >= palette.entries.items.len) return;
-
-    const entry = palette.entries.items[entry_idx];
-    const node = entry.node;
-
-    if (node.type_ == .folder) {
-        if (!node.expanded and node.children == null) {
-            loadNodeChildren(palette.allocator, node, false) catch |e| {
-                palette.logger.err("loadNodeChildren", e);
-                return;
-            };
-        }
-        node.expanded = !node.expanded;
-        _ = load_entries(palette) catch unreachable;
-
-        palette.inputbox.text.shrinkRetainingCapacity(0);
-        palette.inputbox.cursor = tui.egc_chunk_width(palette.inputbox.text.items, 0, 8);
-
-        const new_idx = for (palette.entries.items, 0..) |e, i| {
-            if (e.node == node) break i + 1;
-        } else 0;
-
-        palette.initial_selected = new_idx;
-        palette.start_query(0) catch unreachable;
-
-        tui.need_render(@src());
-    } else {
-        tp.self_pid().send(.{ "cmd", "exit_overlay_mode" }) catch |e| palette.logger.err(module_name, e);
-        tp.self_pid().send(.{ "cmd", "navigate", .{ .file = node.path } }) catch |e| palette.logger.err(module_name, e);
-    }
-}
-
-pub fn add_menu_entry(palette: *Type, entry: *Entry, matches: ?[]const usize) !void {
-    var value: std.Io.Writer.Allocating = .init(palette.allocator);
-    defer value.deinit();
-    const writer = &value.writer;
-    try cbor.writeValue(writer, entry.label);
-    const entry_idx = for (palette.entries.items, 0..) |existing_entry, idx| {
-        if (existing_entry.node == entry.node) break idx;
-    } else palette.entries.items.len;
-    try cbor.writeValue(writer, entry_idx);
-    try cbor.writeValue(writer, entry.indent);
-    try cbor.writeValue(writer, entry.file_icon);
-    try cbor.writeValue(writer, entry.file_color);
-    try cbor.writeValue(writer, matches orelse &[_]usize{});
-    try palette.menu.add_item_with_handler(value.written(), select);
-    palette.items += 1;
-}
-
-pub fn clear_entries(palette: *Type) void {
-    palette.entries.clearRetainingCapacity();
-}
-
-pub fn deinit(palette: *Type) void {
-    if (root_node) |node| {
-        deinitRootNode(palette.allocator, node);
-        root_node = null;
-    }
-}
diff --git a/src/tui/tui.zig b/src/tui/tui.zig
index 1ed8ad5..9396713 100644
--- a/src/tui/tui.zig
+++ b/src/tui/tui.zig
@@ -1371,11 +1371,6 @@ const cmds = struct {
     }
     pub const open_command_palette_meta: Meta = .{ .description = "Command palette" };
 
-    pub fn open_project_file_tree(self: *Self, _: Ctx) Result {
-        return self.enter_overlay_mode(@import("mode/overlay/project_file_tree_palette.zig").Type);
-    }
-    pub const open_project_file_tree_meta: Meta = .{ .description = "Project file tree explorer" };
-
     pub fn insert_command_name(self: *Self, _: Ctx) Result {
         return self.enter_overlay_mode(@import("mode/overlay/list_all_commands_palette.zig").Type);
     }