diff --git a/config/plugins/editor/comment.nix b/config/plugins/editor/comment.nix
index a682347..2e8056f 100644
--- a/config/plugins/editor/comment.nix
+++ b/config/plugins/editor/comment.nix
@@ -1,30 +1,39 @@
 {...}: {
   plugins.comment = {
     enable = true;
+
     settings = {
-      # LHS of toggle mappings in NORMAL mode
       toggler = {
-        # Line-comment toggle keymap
-        line = "<leader>c<space>";
-        # Block-comment toggle keymap
-        block = "<leader>c<enter>";
+        line = "<leader>cl<Return>";
+        block = "<leader>cb<Return>";
       };
-      # LHS of operator-pending mappings in NORMAL and VISUAL mode
+
       opleader = {
-        # Line-comment keymap
-        line = "<leader>c<space>";
-        # Block-comment keymap
-        block = "<leader>c<enter>";
+        line = "<leader>cl";
+        block = "<leader>cb";
       };
-      # LHS of extra mappings
+
       extra = {
-        # Add comment on the line above
-        above = "<leader>co";
-        # Add comment on the line below
-        below = "<leader>ce";
-        # Add comment at the end of line
-        eol = "<leader>ca";
+        above = "<leader>c<Up>";
+        below = "<leader>c<Down>";
+        eol = "<leader>c<End>";
+      };
+
+      mappings = {
+        basic = true;
+        extra = true;
       };
     };
   };
+
+  keymaps = [
+    { # prefix: comment
+      mode = ["n" "v"];
+      key = "<leader>c";
+      action = "<Nop>";
+      options = {
+        desc = "+comment";
+      };
+    }
+  ];
 }
diff --git a/config/plugins/ui/whichkey.nix b/config/plugins/ui/whichkey.nix
index 27c4f9e..480ffb7 100644
--- a/config/plugins/ui/whichkey.nix
+++ b/config/plugins/ui/whichkey.nix
@@ -17,15 +17,6 @@
       };
     }
  
-    {
-      mode = ["n" "v"];
-      key = "<leader>c";
-      action = "<Nop>";
-      options = {
-        desc = "+comment";
-      };
-    }
-
     {
       mode = "n";
       key = "<leader>g";