diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua
index fb5ee99e..4e4b322e 100644
--- a/lua/lazyvim/plugins/editor.lua
+++ b/lua/lazyvim/plugins/editor.lua
@@ -49,30 +49,29 @@ return {
     cmd = "Telescope",
     version = false, -- telescope did only one release, so use HEAD for now
     keys = {
+      { "<leader>,", "<cmd>Telescope buffers show_all_buffers=true<cr>", desc = "Switch Buffer" },
       { "<leader>/", util.telescope("live_grep"), desc = "Find in Files (Grep)" },
+      { "<leader>:", "<cmd>Telescope command_history<cr>", desc = "Command History" },
       { "<leader><space>", util.telescope("files"), desc = "Find Files (root dir)" },
+      { "<leader>fF", util.telescope("files", { cwd = false }), desc = "Find Files (cwd)" },
       { "<leader>fb", "<cmd>Telescope buffers<cr>", desc = "Buffers" },
       { "<leader>ff", util.telescope("files"), desc = "Find Files (root dir)" },
-      { "<leader>fF", util.telescope("files", { cwd = false }), desc = "Find Files (cwd)" },
       { "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent" },
       { "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "commits" },
       { "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "status" },
-      { "<leader>ha", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" },
-      { "<leader>hc", "<cmd>Telescope commands<cr>", desc = "Commands" },
-      { "<leader>hf", "<cmd>Telescope filetypes<cr>", desc = "File Types" },
-      { "<leader>hh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },
-      { "<leader>hk", "<cmd>Telescope keymaps<cr>", desc = "Key Maps" },
-      { "<leader>hm", "<cmd>Telescope man_pages<cr>", desc = "Man Pages" },
-      { "<leader>ho", "<cmd>Telescope vim_options<cr>", desc = "Options" },
-      { "<leader>hs", "<cmd>Telescope highlights<cr>", desc = "Search Highlight Groups" },
-      { "<leader>ht", "<cmd>Telescope builtin<cr>", desc = "Telescope" },
+      { "<leader>sa", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" },
+      { "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
+      { "<leader>so", "<cmd>Telescope vim_options<cr>", desc = "Options" },
+      { "<leader>st", "<cmd>Telescope builtin<cr>", desc = "Telescope" },
+      { "<leader>sh", "<cmd>Telescope highlights<cr>", desc = "Search Highlight Groups" },
+      { "<leader>sG", util.telescope("live_grep", { cwd = false }), desc = "Grep (cwd)" },
+      { "<leader>sk", "<cmd>Telescope keymaps<cr>", desc = "Key Maps" },
+      { "<leader>sM", "<cmd>Telescope man_pages<cr>", desc = "Man Pages" },
       { "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer" },
       { "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Command History" },
       { "<leader>sg", util.telescope("live_grep"), desc = "Grep (root dir)" },
-      { "<leader>sG", util.telescope("live_grep", { cwd = false }), desc = "Grep (cwd)" },
+      { "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },
       { "<leader>sm", "<cmd>Telescope marks<cr>", desc = "Jump to Mark" },
-      { "<leader>,", "<cmd>Telescope buffers show_all_buffers=true<cr>", desc = "Switch Buffer" },
-      { "<leader>:", "<cmd>Telescope command_history<cr>", desc = "Command History" },
       {
         "<leader>ss",
         util.telescope("lsp_document_symbols", {
@@ -149,19 +148,18 @@ return {
         ["g"] = { name = "+goto" },
         ["]"] = { name = "+next" },
         ["["] = { name = "+prev" },
+        ["<leader><tab>"] = { name = "+tabs" },
         ["<leader>b"] = { name = "+buffer" },
         ["<leader>c"] = { name = "+code" },
-        ["<leader>f"] = { name = "+file" },
+        ["<leader>f"] = { name = "+file/find" },
         ["<leader>g"] = { name = "+git" },
-        ["<leader>h"] = { name = "+help" },
-        ["<leader>n"] = { name = "+noice" },
-        ["<leader>o"] = { name = "+open" },
+        ["<leader>gh"] = { name = "+hunks" },
         ["<leader>q"] = { name = "+quit/session" },
         ["<leader>s"] = { name = "+search" },
+        ["<leader>sn"] = { name = "+noice" },
         ["<leader>u"] = { name = "+UI" },
-        ["<leader>x"] = { name = "+diagnostics/quickfix" },
         ["<leader>w"] = { name = "+windows" },
-        ["<leader><tab>"] = { name = "+tabs" },
+        ["<leader>x"] = { name = "+diagnostics/quickfix" },
       })
     end,
   },