diff --git a/config/plugins/git/gitsigns.nix b/config/plugins/git/gitsigns.nix
index c9d5aeb..cfa5131 100644
--- a/config/plugins/git/gitsigns.nix
+++ b/config/plugins/git/gitsigns.nix
@@ -6,7 +6,7 @@
   keymaps = [
     {
       mode = ["n" "v"];
-      key = "<leader>hs";
+      key = "<leader>gs";
       action = "<cmd>Gitsigns stage_hunk<cr>";
       options = {
         silent = true;
@@ -16,7 +16,7 @@
 
     {
       mode = ["n" "v"];
-      key = "<leader>hr";
+      key = "<leader>gr";
       action = "<cmd>Gitsigns reset_hunk<cr>";
       options = {
         silent = true;
@@ -26,7 +26,7 @@
 
     {
       mode = "n";
-      key = "<leader>hS";
+      key = "<leader>gS";
       action = "<cmd>Gitsigns stage_buffer<cr>";
       options = {
         silent = true;
@@ -36,7 +36,7 @@
 
     {
       mode = "n";
-      key = "<leader>hu";
+      key = "<leader>gu";
       action = "<cmd>Gitsigns undo_stage_hunk<cr>";
       options = {
         silent = true;
@@ -46,7 +46,7 @@
 
     {
       mode = "n";
-      key = "<leader>hR";
+      key = "<leader>gR";
       action = "<cmd>Gitsigns reset_buffer<cr>";
       options = {
         silent = true;
@@ -56,7 +56,7 @@
 
     {
       mode = "n";
-      key = "<leader>hp";
+      key = "<leader>gp";
       action = "<cmd>Gitsigns preview_hunk_inline<cr>";
       options = {
         silent = true;
@@ -66,7 +66,7 @@
 
     {
       mode = "n";
-      key = "<leader>hb";
+      key = "<leader>gb";
       action = "<cmd>Gitsigns blame<cr>";
       options = {
         silent = true;
@@ -76,7 +76,7 @@
 
     {
       mode = "n";
-      key = "<leader>tb";
+      key = "<leader>gtb";
       action = "<cmd>Gitsigns toggle_current_line_blame<cr>";
       options = {
         silent = true;
@@ -86,7 +86,7 @@
 
     {
       mode = "n";
-      key = "<leader>hd";
+      key = "<leader>gd";
       action = "<cmd>Gitsigns diffthis<cr>";
       options = {
         silent = true;
@@ -96,7 +96,7 @@
 
     {
       mode = "n";
-      key = "<leader>td";
+      key = "<leader>gtd";
       action = "<cmd>Gitsigns toggle_deleted<cr>";
       options = {
         silent = true;
diff --git a/config/plugins/git/lazygit.nix b/config/plugins/git/lazygit.nix
index a932071..c0c982b 100644
--- a/config/plugins/git/lazygit.nix
+++ b/config/plugins/git/lazygit.nix
@@ -6,7 +6,7 @@
   keymaps = [
     {
       mode = "n";
-      key = "<leader>gg";
+      key = "<leader>g<cr>";
       action = "<cmd>LazyGit<cr>";
       options = {
         desc = "Open LazyGit";
@@ -15,7 +15,7 @@
 
     {
       mode = "n";
-      key = "<leader>lr";
+      key = "<leader>glr";
       action = "<cmd>lua require(\"telescope\").extensions.lazygit.lazygit()<cr>";
       options = {
         desc = "List repositories";
diff --git a/config/plugins/lsp/conform.nix b/config/plugins/lsp/conform.nix
index da7bb4d..8631886 100644
--- a/config/plugins/lsp/conform.nix
+++ b/config/plugins/lsp/conform.nix
@@ -63,7 +63,7 @@
         end
       '';
       options = {
-        desc = "Format buffer";
+        desc = "format_buffer";
       };
     }
   ];
diff --git a/config/plugins/ui/neo-tree.nix b/config/plugins/ui/neo-tree.nix
index d735ce6..09c1eb3 100644
--- a/config/plugins/ui/neo-tree.nix
+++ b/config/plugins/ui/neo-tree.nix
@@ -7,9 +7,9 @@
   keymaps = [
     {
       mode = "n";
-      key = "<leader>\\";
+      key = "<leader>e";
       action = "<cmd>Neotree<cr>";
-      options.desc = "Focus Neotree";
+      options.desc = "focus_neotree";
     }
   ];
 }
diff --git a/config/plugins/utils/telescope.nix b/config/plugins/utils/telescope.nix
index f7816d8..0ba7de2 100644
--- a/config/plugins/utils/telescope.nix
+++ b/config/plugins/utils/telescope.nix
@@ -16,31 +16,24 @@
 
     # Configure our telescope keymaps.
     keymaps = {
-      # File Pickers
-      "<leader>sf" = {
-        action = "find_files";
-        options = {
-          desc = "Search project files";
-        };
-      };
       "<leader>/" = {
         action = "live_grep";
         options = {
-          desc = "Grep (root dir)";
-        };
-      };
-
-      # Vim Pickers
-      "<leader>sb" = {
-        action = "buffers";
-        options = {
-          desc = "Search open buffers";
+          desc = "live_grep";
         };
       };
       "<leader>:" = {
         action = "command_history";
         options = {
-          desc = "Command History";
+          desc = "command_history";
+        };
+      };
+
+      # Search
+      "<leader>sb" = {
+        action = "buffers";
+        options = {
+          desc = "Search open buffers";
         };
       };
       "<leader>sc" = {
@@ -49,46 +42,50 @@
           desc = "Search Commands";
         };
       };
-
-      # Git Pickers
-      "<leader>lc" = {
-        action = "git_bcommits";
+      "<leader>sf" = {
+        action = "find_files";
         options = {
-          desc = "List buffers commits";
+          desc = "Search project files";
         };
       };
-      "<leader>lC" = {
-        action = "git_commits";
-        options = {
-          desc = "List git commits";
-        };
-      };
-      "<leader>lb" = {
-        action = "git_branches";
-        options = {
-          desc = "List git branches";
-        };
-      };
-      "<leader>ld" = {
-        action = "git_status";
-        options = {
-          desc = "List git diff";
-        };
-      };
-      "<leader>ls" = {
-        action = "git_stash";
-        options = {
-          desc = "List git stash";
-        };
-      };
-
-      # Extensions
       "<leader>sl" = {
         action = "software-licenses find";
         options = {
           desc = "Search Software Licenses";
         };
       };
+
+      # List
+      "<leader>glc" = {
+        action = "git_bcommits";
+        options = {
+          desc = "List git commits";
+        };
+      };
+      "<leader>glC" = {
+        action = "git_commits";
+        options = {
+          desc = "List git commits";
+        };
+      };
+      "<leader>glb" = {
+        action = "git_branches";
+        options = {
+          desc = "List git branches";
+        };
+      };
+      "<leader>gld" = {
+        action = "git_status";
+        options = {
+          desc = "List git diff";
+        };
+      };
+      "<leader>gls" = {
+        action = "git_stash";
+        options = {
+          desc = "List git stash";
+        };
+      };
     };
   };
 }
diff --git a/config/plugins/utils/whichkey.nix b/config/plugins/utils/whichkey.nix
index 7501f1e..f226fd1 100644
--- a/config/plugins/utils/whichkey.nix
+++ b/config/plugins/utils/whichkey.nix
@@ -13,25 +13,7 @@
         desc = "+search";
       };
     }
-
-    {
-      mode = "n";
-      key = "<leader>h";
-      action = "<Nop>";
-      options = {
-        desc = "+hunks";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>t";
-      action = "<Nop>";
-      options = {
-        desc = "+toggle";
-      };
-    }
-
+ 
     {
       mode = "n";
       key = "<leader>b";
@@ -61,11 +43,20 @@
 
     {
       mode = "n";
-      key = "<leader>l";
+      key = "<leader>gl";
       action = "<Nop>";
       options = {
         desc = "+list";
       };
     }
+
+    {
+      mode = "n";
+      key = "<leader>gt";
+      action = "<Nop>";
+      options = {
+        desc = "+toggle";
+      };
+    }
   ];
 }