diff --git a/nvim/.config/nvim/colors/yolokai.vim b/nvim/.config/nvim/colors/yolokai.vim
index d3917ee..6d961f7 100644
--- a/nvim/.config/nvim/colors/yolokai.vim
+++ b/nvim/.config/nvim/colors/yolokai.vim
@@ -648,10 +648,11 @@ local highlight_groups = {
 
 	--[[ 4.4.11 Which key ]]
 	WhichKey          = 'Function' ,
-	WhichKeySeperator = 'DiffAdded',
+	WhichKeySeperator = {bg=black,  fg=green,  style=NONE },
 	WhichKeyGroup     = 'Keyword'  ,
 	WhichKeyDesc      = {bg=black,  fg=orange, style=NONE },
-	WhichKeyFloating  = 'Pmenu'    ,
+	WhichKeyFloat     = 'Pmenu'    ,
+	WhichKeyValue     = 'Comment'  ,
 
 	--[[ 4.4.12 conflict-marker ]]
 	ConflictMarkerBegin               = {bg=black,  fg=purple,  style=NONE },
diff --git a/nvim/.config/nvim/lua/modules/which_key.lua b/nvim/.config/nvim/lua/modules/which_key.lua
index f0c2528..97ef68b 100644
--- a/nvim/.config/nvim/lua/modules/which_key.lua
+++ b/nvim/.config/nvim/lua/modules/which_key.lua
@@ -1,6 +1,4 @@
-local remap = vim.api.nvim_set_keymap
+local wk = require("which-key")
 
-vim.g.which_key_use_floating_win = 1
-
-remap('n', '<Leader>', ':<C-U>WhichKey \'<Space>\'<CR>', { noremap = true, silent = true })
-remap('n', '<LocalLeader>', ':<C-U>WhichKey \',\'<CR>',  { noremap = true, silent = true })
+wk.register({}, { prefix = "<Leader>" })
+wk.register({}, { prefix = "<LocalLeader>" })
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 8d4dd29..a2cd38b 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -90,7 +90,7 @@ local init = function ()
   use 'justinmk/vim-dirvish'
   -- Show leader key bindings
   use {
-    'liuchengxu/vim-which-key',
+    'folke/which-key.nvim',
     config = "require('modules.which_key')"
   }
   -- Clipboard