diff --git a/modules/home/programs/terminal/editors/neovim/plugins/git-worktree.nix b/modules/home/programs/terminal/editors/neovim/plugins/git-worktree.nix
index 68af3cfbe..967a8485c 100644
--- a/modules/home/programs/terminal/editors/neovim/plugins/git-worktree.nix
+++ b/modules/home/programs/terminal/editors/neovim/plugins/git-worktree.nix
@@ -13,7 +13,7 @@ in
       };
 
       which-key.registrations."<leader>"."g"."W" = mkIf (cfg.enableTelescope && cfg.enable) {
-        name = "󰙅 Git Worktree";
+        name = "󰙅 Worktree";
       };
     };
 
diff --git a/modules/home/programs/terminal/editors/neovim/plugins/gitsigns.nix b/modules/home/programs/terminal/editors/neovim/plugins/gitsigns.nix
index 0349e95ce..70a7cbb68 100644
--- a/modules/home/programs/terminal/editors/neovim/plugins/gitsigns.nix
+++ b/modules/home/programs/terminal/editors/neovim/plugins/gitsigns.nix
@@ -25,8 +25,9 @@ in
         };
       };
 
-      which-key.registrations."<leader>"."g"."t" = mkIf config.programs.nixvim.plugins.gitsigns.enable {
-        name = "  Gitsigns Toggle";
+      which-key.registrations."<leader>"."g" = {
+        "h" = mkIf config.programs.nixvim.plugins.gitsigns.enable { name = "  Hunks"; };
+        "t" = mkIf config.programs.nixvim.plugins.gitsigns.enable { name = "  Toggle"; };
       };
     };
 
@@ -99,7 +100,7 @@ in
       }
       {
         mode = "n";
-        key = "<leader>gp";
+        key = "<leader>ghp";
         action.__raw = ''
           function()
             if vim.wo.diff then return ${toJSON "<leader>gp"} end
@@ -116,7 +117,7 @@ in
       }
       {
         mode = "n";
-        key = "<leader>gn";
+        key = "<leader>ghn";
         action.__raw = ''
           function()
             if vim.wo.diff then return ${toJSON "<leader>gn"} end
@@ -136,7 +137,7 @@ in
           "n"
           "v"
         ];
-        key = "<leader>gs";
+        key = "<leader>ghs";
         action = "<cmd>Gitsigns stage_hunk<CR>";
         options = {
           desc = "Stage hunk";
@@ -145,7 +146,7 @@ in
       }
       {
         mode = "n";
-        key = "<leader>gu";
+        key = "<leader>ghu";
         action = "<cmd>Gitsigns undo_stage_hunk<CR>";
         options = {
           desc = "Undo stage hunk";
@@ -157,7 +158,7 @@ in
           "n"
           "v"
         ];
-        key = "<leader>gr";
+        key = "<leader>ghr";
         action = "<cmd>Gitsigns reset_hunk<CR>";
         options = {
           desc = "Reset hunk";
@@ -166,7 +167,7 @@ in
       }
       {
         mode = "n";
-        key = "<leader>g<C-p>";
+        key = "<leader>ghP";
         action = "<cmd>Gitsigns preview_hunk<CR>";
         options = {
           desc = "Preview hunk";
@@ -175,9 +176,10 @@ in
       }
       {
         mode = "n";
-        key = "<leader>gP";
+        key = "<leader>gh<C-p>";
         action = "<cmd>Gitsigns preview_hunk_inline<CR>";
         options = {
+          desc = "Preview hunk inline";
           silent = true;
         };
       }
@@ -186,6 +188,7 @@ in
         key = "<leader>gS";
         action = "<cmd>Gitsigns stage_buffer<CR>";
         options = {
+          desc = "Stage buffer";
           silent = true;
         };
       }
@@ -194,14 +197,7 @@ in
         key = "<leader>gR";
         action = "<cmd>Gitsigns reset_buffer<CR>";
         options = {
-          silent = true;
-        };
-      }
-      {
-        mode = "n";
-        key = "<leader>gD";
-        action = "<cmd>Gitsigns diffthis HEAD<CR>";
-        options = {
+          desc = "Reset buffer";
           silent = true;
         };
       }
diff --git a/modules/home/programs/terminal/editors/neovim/plugins/glow.nix b/modules/home/programs/terminal/editors/neovim/plugins/glow.nix
index 214b07506..5365175b8 100644
--- a/modules/home/programs/terminal/editors/neovim/plugins/glow.nix
+++ b/modules/home/programs/terminal/editors/neovim/plugins/glow.nix
@@ -39,17 +39,17 @@ in
     keymaps = [
       {
         mode = "n";
-        key = "<leader>pm";
+        key = "<leader>pg";
         action = ":Glow<CR>";
         options = {
-          desc = "Preview Markdown";
+          desc = "Glow (Markdown)";
           silent = true;
         };
       }
     ];
 
     plugins.which-key.registrations."<leader>p" = {
-      mode = "v";
+      mode = "n";
       name = " Preview";
     };
   };
diff --git a/modules/home/programs/terminal/editors/neovim/plugins/markdown-preview.nix b/modules/home/programs/terminal/editors/neovim/plugins/markdown-preview.nix
index e2764c507..37f14018f 100644
--- a/modules/home/programs/terminal/editors/neovim/plugins/markdown-preview.nix
+++ b/modules/home/programs/terminal/editors/neovim/plugins/markdown-preview.nix
@@ -12,9 +12,12 @@ _: {
     keymaps = [
       {
         mode = "n";
-        key = "<leader>m";
+        key = "<leader>pm";
         action = ":MarkdownPreview<cr>";
-        options.silent = true;
+        options = {
+          desc = "Markdown Preview";
+          silent = true;
+        };
       }
     ];
   };
diff --git a/modules/home/programs/terminal/editors/neovim/plugins/mini.nix b/modules/home/programs/terminal/editors/neovim/plugins/mini.nix
index 87c3ffc0f..238ab001f 100644
--- a/modules/home/programs/terminal/editors/neovim/plugins/mini.nix
+++ b/modules/home/programs/terminal/editors/neovim/plugins/mini.nix
@@ -113,7 +113,7 @@ _: {
       }
       {
         mode = "n";
-        key = "<leader>ug";
+        key = "<leader>gto";
         action.__raw = # lua
           "MiniDiff.toggle_overlay";
         options = {
diff --git a/modules/home/programs/terminal/editors/neovim/plugins/toggleterm.nix b/modules/home/programs/terminal/editors/neovim/plugins/toggleterm.nix
index 53fcf7f13..5562b0ec5 100644
--- a/modules/home/programs/terminal/editors/neovim/plugins/toggleterm.nix
+++ b/modules/home/programs/terminal/editors/neovim/plugins/toggleterm.nix
@@ -14,7 +14,7 @@ _: {
         key = "<leader>tt";
         action = ":ToggleTerm<CR>";
         options = {
-          desc = "Toggle terminal";
+          desc = "Open Terminal";
           silent = true;
         };
       }
@@ -30,7 +30,7 @@ _: {
             end
           '';
         options = {
-          desc = "Toggle lazygit";
+          desc = "Open Lazygit";
           silent = true;
         };
       }
@@ -46,7 +46,7 @@ _: {
             end
           '';
         options = {
-          desc = "Toggle lazygit";
+          desc = "Open Lazygit";
           silent = true;
         };
       }
diff --git a/modules/home/programs/terminal/editors/neovim/plugins/yazi.nix b/modules/home/programs/terminal/editors/neovim/plugins/yazi.nix
index 616df9d85..7956aa87a 100644
--- a/modules/home/programs/terminal/editors/neovim/plugins/yazi.nix
+++ b/modules/home/programs/terminal/editors/neovim/plugins/yazi.nix
@@ -19,7 +19,7 @@
         key = "<leader>ty";
         action = ":Yazi<CR>";
         options = {
-          desc = "Toggle Yazi";
+          desc = "Open Yazi";
           silent = true;
         };
       }