diff --git a/lua/core/keymap.lua b/lua/core/keymap.lua
index af95de9..91f5764 100644
--- a/lua/core/keymap.lua
+++ b/lua/core/keymap.lua
@@ -7,6 +7,17 @@ vim.g.mapleader = ' '
 vim.keymap.set('n', '<Tab>', '>>')
 vim.keymap.set('n', '<S-Tab>', '<<')
 
+--[[ Groups ]]
+K.GROUPS = {
+    { '<leader>s', group = 'Session' },
+    { '<leader>g', group = 'Git/Global' },
+    { '<leader>o', group = 'Ollama' },
+    { '<leader>f', group = 'File' },
+    { '<leader>d', group = 'Debugger' },
+    { '<leader>c', group = 'Code' },
+    { '<leader>a', group = 'Angular' },
+}
+
 --[[ Focus Shade ]]
 K.FOCUS_SHADE = {
     UP = {
diff --git a/lua/editor/key_list.lua b/lua/editor/key_list.lua
index 93aefa2..e4e90b5 100644
--- a/lua/editor/key_list.lua
+++ b/lua/editor/key_list.lua
@@ -1,8 +1,11 @@
+local K = require('core.keymap')
 return {
     'folke/which-key.nvim',
     config = function()
         vim.o.timeout = true
         vim.o.timeoutlen = 300
-        require('which-key').setup({})
+        local wk = require('which-key')
+        wk.add(K.GROUPS)
+        wk.setup({})
     end,
 }