diff --git a/after/plugin/whichkey.lua b/after/plugin/whichkey.lua
new file mode 100644
index 0000000..3991935
--- /dev/null
+++ b/after/plugin/whichkey.lua
@@ -0,0 +1,46 @@
+local status, whichkey = pcall(require, "which-key")
+if not status then
+    return
+end
+
+whichkey.setup({
+	key_labels = {
+		["<space>"] = "SPC",
+		["<cr>"] = "RET",
+		["<Tab>"] = "TAB",
+	},
+    icons = {
+        breadcrumb = "»",
+        separator = "➜",
+        group = "& ",
+    }
+})
+
+whichkey.register({
+	["<leader>"] = {
+		w = {
+			name = "window",
+		},
+		f = {
+			name = "find",
+		},
+		b = {
+			name = "buffer",
+		},
+		g = {
+			name = "git",
+		},
+		p = {
+			name = "packer",
+		},
+		t = {
+			name = "toggle",
+		},
+		v = {
+			name = "lsp",
+		},
+		h = {
+			name = "theme",
+		},
+	},
+})
diff --git a/lua/taken/opts.lua b/lua/taken/opts.lua
index 9cc68ad..a96ab1d 100644
--- a/lua/taken/opts.lua
+++ b/lua/taken/opts.lua
@@ -34,6 +34,10 @@ opt.isfname:append("@-@")
 
 opt.updatetime = 50
 
+--options for whichkey
+vim.o.timeout = true
+vim.o.timeoutlen = 300
+
 -- Options for nvim-tree
 g.loaded_netrw = 1
 g.loaded_netrwPlugin = 1
diff --git a/lua/taken/packer.lua b/lua/taken/packer.lua
index 44a1f26..d73809a 100644
--- a/lua/taken/packer.lua
+++ b/lua/taken/packer.lua
@@ -105,14 +105,7 @@ return packer.startup(function(use)
 	use("lewis6991/gitsigns.nvim")
 	use("f-person/git-blame.nvim")
 	-- useful plugins
-	use({
-		"folke/which-key.nvim",
-		config = function()
-			vim.o.timeout = true
-			vim.o.timeoutlen = 300
-			require("which-key").setup({})
-		end,
-	})
+	use("folke/which-key.nvim")
 	use({
 		"nvim-lualine/lualine.nvim",
 		requires = { "nvim-tree/nvim-web-devicons", opt = true },