diff --git a/lua/custom/plugins/ui.lua b/lua/custom/plugins/ui.lua
index 8851be0..5cf3daa 100644
--- a/lua/custom/plugins/ui.lua
+++ b/lua/custom/plugins/ui.lua
@@ -118,8 +118,8 @@ return {
 
       local leap = require 'leap'
 
-      leap.opts.safe_labels = 'sfnutSFNLHMUGTZ?'
-      leap.opts.labels = 'sfnjklhodweimbuyvrgtaqpcxzSFNJKLHODWEIMBUYVRGTAQPCXZ?'
+      leap.opts.safe_labels = 'asfghjkliztrewb'
+      leap.opts.labels = 'sfnjklhodweimbuyvrgtaqpcxz'
       leap.opts.special_keys = {
         next_target = '<enter>',
         prev_target = '<tab>',
@@ -198,19 +198,24 @@ return {
       local wk = require 'which-key'
       local defaults = {
         mode = { 'n', 'v' },
-        ['<localleader>'] = { name = '+select', f = { name = '[F]ind' } },
-        ['g'] = { name = '+goto' },
-        [']'] = { name = '+next' },
-        ['['] = { name = '+prev' },
-        ['<leader>d'] = { name = '+[D]ebug', w = { name = '[W]indow' }, c = { name = '[C]hange' } },
-        ['<leader>c'] = { name = '+[C]ode/[C]olor', t = { name = '+[T]rouble' } },
-        ['<leader>g'] = { name = '+[G]ood tools' },
-        ['<leader>f'] = { name = '+[F]ormatting' },
-        ['<leader>r'] = { name = '[R]ename' },
-        ['<leader>w'] = { name = '[W]orkspace', b = { name = 'buffer' } },
-        ['<leader>t'] = { name = '[T]oggle', ['🚫'] = 'which_key_ignore' },
+        { '<leader>c', group = '[C]ode/[C]olor' },
+        { '<leader>ct', group = '[T]rouble' },
+        { '<leader>d', group = '[D]ebug' },
+        { '<leader>dc', group = '[C]hange' },
+        { '<leader>dw', group = '[W]indow' },
+        { '<leader>f', group = '[F]ormatting' },
+        { '<leader>g', group = '[G]ood tools' },
+        { '<leader>r', group = '[R]ename' },
+        { '<leader>t', group = '[T]oggle' },
+        { '<leader>w', group = '[W]orkspace' },
+        { '<leader>wb', group = 'buffer' },
+        { '<localleader>', group = 'select' },
+        { '<localleader>f', group = '[F]ind' },
+        { '[', group = 'prev' },
+        { ']', group = 'next' },
+        { 'g', group = 'goto' },
       }
-      wk.register(defaults, opts)
+      wk.add(defaults, opts)
     end,
   },
   {
@@ -638,6 +643,7 @@ return {
   },
   {
     'MeanderingProgrammer/dashboard.nvim',
+    enable = true,
     event = 'VimEnter',
     dependencies = {
       'MaximilianLloyd/ascii.nvim',