diff --git a/.config/nvim/lua/plugins/extras/coding/annotation.lua b/.config/nvim/lua/plugins/extras/coding/annotation.lua
index 91417fb7..4017a968 100644
--- a/.config/nvim/lua/plugins/extras/coding/annotation.lua
+++ b/.config/nvim/lua/plugins/extras/coding/annotation.lua
@@ -8,7 +8,7 @@ return {
     -- stylua: ignore
     keys = {
       { "<leader>ad", function() require("neogen").generate() end, desc = "Default Annotation" },
-      { "<leader>ac", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
+      { "<leader>aC", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
       { "<leader>af", function() require("neogen").generate({ type = "func" }) end, desc = "Function" },
       { "<leader>at", function() require("neogen").generate({ type = "type" }) end, desc = "Type" },
       { "<leader>aF", function() require("neogen").generate({ type = "file" }) end, desc = "File" },
diff --git a/.config/nvim/lua/plugins/extras/ui/comment-box.lua b/.config/nvim/lua/plugins/extras/ui/comment-box.lua
index 04b4fe6b..6ba62cf1 100644
--- a/.config/nvim/lua/plugins/extras/ui/comment-box.lua
+++ b/.config/nvim/lua/plugins/extras/ui/comment-box.lua
@@ -1,5 +1,23 @@
 return {
-  "LudoPinelli/comment-box.nvim",
-  event = "LazyFile",
-  opts = {},
+  {
+    "LudoPinelli/comment-box.nvim",
+    opts = {},
+    keys = {
+      { "<leader>acb", "<cmd>CBccbox<CR>", mode = { "n", "v" }, desc = "Comment Box" },
+      { "<leader>act", "<cmd>CBllline<CR>", mode = { "n", "v" }, desc = "Tiled Line" },
+      { "<leader>acl", "<cmd>CBline<CR>", desc = "Line" },
+      { "<leader>acm", "<cmd>CBllbox14<CR>", mode = { "n", "v" }, desc = "Marked" },
+      { "<leader>acc", "<cmd>CBcatalog<CR>", desc = "Catalog" },
+      { "<leader>acd", "<cmd>CBd<CR>", mode = { "n", "v" }, desc = "Delete Comment Style" },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>a"] = { name = " annotation/snippets" },
+        ["<leader>ac"] = { name = "comments" },
+      },
+    },
+  },
 }