diff --git a/lazy-lock.json b/lazy-lock.json
index 58fb501..6aa57c9 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,10 +1,12 @@
 {
   "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
+  "catppuccin": { "branch": "main", "commit": "a1439ad7c584efb3d0ce14ccb835967f030450fe" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "conform.nvim": { "branch": "master", "commit": "3d59cbd01a4b74124c5a6fb23b8cc63e5c2db3d5" },
   "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
   "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
   "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
+  "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" },
   "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "abac76482ec3012a2b359ba956a74e2ffd33d46f" },
   "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
diff --git a/lua/weeheavy/plugins/which-key.lua b/lua/weeheavy/plugins/which-key.lua
index 938cf8a..6b1f21a 100644
--- a/lua/weeheavy/plugins/which-key.lua
+++ b/lua/weeheavy/plugins/which-key.lua
@@ -1,6 +1,7 @@
 return {
 	"folke/which-key.nvim",
-	event = { "BufReadPre", "BufNewFile" },
+	--event = { "BufReadPre", "BufNewFile" },
+	--event = "VeryLazy",
 	init = function()
 		vim.o.timeout = true
 		vim.o.timeoutlen = 250
@@ -20,5 +21,20 @@ return {
 			winblend = 1, -- value between 0-100 0 for fully opaque and 100 for fully transparent
 			zindex = 1000, -- positive value to position WhichKey above other floating windows.
 		},
+		defaults = {
+			mode = { "n", "v" },
+			["<leader>d"] = { name = "diagnostics" },
+			["<leader>f"] = { name = "find shit" },
+			["<leader>g"] = { name = "git" },
+			["<leader>gl"] = { name = "git log" },
+			["<leader>gd"] = { name = "git diff" },
+			["<leader>q"] = { name = "trouble this buffer" },
+			["<leader>Q"] = { name = "trouble all buffers" },
+		},
 	},
+	config = function(_, opts)
+		local wk = require("which-key")
+		wk.setup(opts)
+		wk.register(opts.defaults)
+	end,
 }
diff --git a/lua/weeheavy/prefs.lua b/lua/weeheavy/prefs.lua
index c1766c5..8292440 100644
--- a/lua/weeheavy/prefs.lua
+++ b/lua/weeheavy/prefs.lua
@@ -51,7 +51,9 @@ vim.opt.background = "dark" -- light, dark
 --  tokyonight-storm
 --  tokyonight-day
 --  tokyonight-moon
-vim.cmd.colorscheme("tokyonight-storm")
+--vim.cmd.colorscheme("tokyonight-storm")
+--vim.cmd.colorscheme("catppuccin-macchiato")
+vim.cmd.colorscheme("kanagawa")
 
 -- Decrease update time
 vim.opt.updatetime = 250
diff --git a/lua/weeheavy/remap.lua b/lua/weeheavy/remap.lua
index f5a7686..2dd8dcc 100644
--- a/lua/weeheavy/remap.lua
+++ b/lua/weeheavy/remap.lua
@@ -5,7 +5,7 @@ vim.g.mapleader = " "
 
 --vim.keymap.set("n", "<leader>r", vim.cmd.Ex, { noremap = true, desc = "netrw File Browser" }) -- netrw file explorer
 --vim.keymap.set("n", "<leader>e", ":Oil<CR>", { desc = "File navigation" })
-vim.keymap.set("n", "<leader>e", ":Oil --float<CR>", { desc = "File navigation" })
+vim.keymap.set("n", "<leader>e", ":Oil --float<CR>", { desc = "Oil" })
 --vim.keymap.set("n", "<leader>e", "<cmd>lua require('oil').toggle_float('.')<CR>", { noremap = true, silent = true })
 
 -- List recently opened files
@@ -27,7 +27,7 @@ vim.keymap.set(
 vim.keymap.set("n", "<leader><leader>", ":Telescope buffers<CR>", { noremap = true, desc = "Show open buffers" })
 -- todo-comments.nvim
 vim.keymap.set("n", "<leader>ft", ":TodoTelescope<CR>", { noremap = true, desc = "Find TODOs" })
-vim.keymap.set("n", "<leader>gst", ":Telescope git_status<CR>", { noremap = true, desc = "Git status" })
+vim.keymap.set("n", "<leader>gs", ":Telescope git_status<CR>", { noremap = true, desc = "Git status" })
 vim.keymap.set(
 	"n",
 	"<leader>gla",
@@ -84,13 +84,13 @@ end, { desc = "Go to next diagnostic" })
 vim.keymap.set({ "n", "v" }, "<leader>de", function()
 	vim.diagnostic.goto_next({ severity = vim.diagnostic.severity.ERROR })
 	vim.api.nvim_feedkeys("zz", "n", false)
-end, { desc = "Go to next diagnostic" })
+end, { desc = "Go to next error diagnostic" })
 
 -- Got to next diagnostic item (warning severity)
 vim.keymap.set({ "n", "v" }, "<leader>dw", function()
 	vim.diagnostic.goto_next({ severity = vim.diagnostic.severity.WARN })
 	vim.api.nvim_feedkeys("zz", "n", false)
-end, { desc = "Go to next diagnostic" })
+end, { desc = "Go to next warning diagnostic" })
 
 -- Toggle trouble (for document)
 vim.keymap.set("n", "<leader>qq", ":TroubleToggle<CR>")