diff --git a/.config/nvim/lua/core/keymap.lua b/.config/nvim/lua/core/keymap.lua
index 76ceba0..d8f6f9f 100644
--- a/.config/nvim/lua/core/keymap.lua
+++ b/.config/nvim/lua/core/keymap.lua
@@ -181,23 +181,7 @@ keymap.set('n', '<leader>hB', function()
 end, opts('Toggle line blame'))
 keymap.set({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', opts('Gitsigns select hunk'))
 
---  ────────────────────────────────────────────────( fancy comments )─
-keymap.set({ 'n', 'v' }, '<leader>Cd', '<cmd>CBd<CR>', opts('Delete comment decoration'))
-keymap.set({ 'n', 'v' }, '<leader>Cy', '<cmd>CBy<CR>', opts('Yank comment'))
---  ────────────────────────────────────────────────── comment boxes ──
-keymap.set({ 'n', 'v' }, '<leader>Cbl', '<cmd>CBllbox12<CR>', opts('Insert a comment box'))
-keymap.set({ 'n', 'v' }, '<leader>Cbc', '<cmd>CBccbox18<CR>', opts('Insert a comment box'))
-keymap.set({ 'n', 'v' }, '<leader>Cbr', '<cmd>CBrrbox15<CR>', opts('Insert a comment box'))
-keymap.set({ 'n', 'v' }, '<leader>Cba', '<cmd>CBccbox6<CR>', opts('Insert a callout'))
---  ────────────────────────────────────────────────── comment lines ──
-keymap.set({ 'n', 'v' }, '<leader>Cll', '<cmd>CBclline7<CR>', opts('Insert a left-aligned comment line'))
-keymap.set({ 'n', 'v' }, '<leader>Clc', '<cmd>CBccline7<CR>', opts('Insert a centered comment line'))
-keymap.set({ 'n', 'v' }, '<leader>Clr', '<cmd>CBcrline7<CR>', opts('Insert a right-aligned comment line'))
-keymap.set({ 'n', 'v' }, '<leader>ClL', '<cmd>CBclline<CR>', opts('Insert a simple comment line'))
-keymap.set({ 'n', 'v' }, '<leader>ClC', '<cmd>CBccline<CR>', opts('Insert a simple comment line'))
-keymap.set({ 'n', 'v' }, '<leader>ClR', '<cmd>CBcrline<CR>', opts('Insert a simple comment line'))
-
 --  ───────────────────────────────────────────────────( icon picker )─
 keymap.set('n', '<Leader>i', '<cmd>Telescope symbols initial_mode=normal theme=get_ivy<cr>', opts('Open icon picker'))
 -- keymap.set("n", "<Leader>iy", "<cmd>IconPickerYank<cr>", opts("Yank icon into register")) --> Yank the selected icon into register
--- keymap.set("i", "<C-i>", "<cmd>Telescope symbols initial_mode=normal theme=get_ivy<cr>", opts("Open icon picker"))
+-- keymap.set("i", "<C-i>", "<cmd>Telescope symbols initial_mode=normal theme=get_ivy<cr>", opts("Open icon picker"))
\ No newline at end of file
diff --git a/.config/nvim/lua/plugins/comment-box.lua b/.config/nvim/lua/plugins/comment-box.lua
index d4c26e2..14aadaf 100644
--- a/.config/nvim/lua/plugins/comment-box.lua
+++ b/.config/nvim/lua/plugins/comment-box.lua
@@ -1,6 +1,5 @@
 return {
    'LudoPinelli/comment-box.nvim',
-   event = { 'BufReadPre', 'BufNewFile', 'VeryLazy' },
    opts = {
       doc_width = 80,
       box_width = 60,
@@ -9,4 +8,18 @@ return {
       outer_blank_lines_below = true,
       inner_blank_lines = true,
    },
+   keys = {
+      { '<leader>Cd', '<cmd>CBd<CR>', desc = 'Delete comment decoration' },
+      { '<leader>Cy', '<cmd>CBy<CR>', desc = 'Yank comment' },
+      { '<leader>Cbl', '<cmd>CBllbox12<CR>', desc = 'Insert a comment box' },
+      { '<leader>Cbc', '<cmd>CBccbox18<CR>', desc = 'Insert a comment box' },
+      { '<leader>Cbr', '<cmd>CBrrbox15<CR>', desc = 'Insert a comment box' },
+      { '<leader>Cba', '<cmd>CBccbox6<CR>', desc = 'Insert a callout' },
+      { '<leader>Cll', '<cmd>CBclline7<CR>', desc = 'Insert a left-aligned comment line' },
+      { '<leader>Clc', '<cmd>CBccline7<CR>', desc = 'Insert a centered comment line' },
+      { '<leader>Clr', '<cmd>CBcrline7<CR>', desc = 'Insert a right-aligned comment line' },
+      { '<leader>ClL', '<cmd>CBclline<CR>', desc = 'Insert a simple comment line' },
+      { '<leader>ClC', '<cmd>CBccline<CR>', desc = 'Insert a simple comment line' },
+      { '<leader>ClR', '<cmd>CBcrline<CR>', desc = 'Insert a simple comment line' },
+   },
 }