diff --git a/.config/nvim/lua/lazyvim/config/keymaps.lua b/.config/nvim/lua/lazyvim/config/keymaps.lua
index 196fde4..f5dc972 100644
--- a/.config/nvim/lua/lazyvim/config/keymaps.lua
+++ b/.config/nvim/lua/lazyvim/config/keymaps.lua
@@ -59,4 +59,4 @@ map("v", ">", ">gv", opts)
 map("v", "<C-j>", ":m .+1<CR>==<ESC>V", opts)
 map("v", "<C-k>", ":m .-2<CR>==<ESC>V", opts)
 
-vim.keymap.set("t", "<esc><esc>", "<c-\\><c-n>", { desc = "Enter Normal Mode" })
+map("t", "<esc><esc>", "<c-\\><c-n>", { desc = "Enter Normal Mode" })
diff --git a/.config/nvim/lua/lazyvim/plugins/utility.lua b/.config/nvim/lua/lazyvim/plugins/utility.lua
index 69f60d6..542620e 100644
--- a/.config/nvim/lua/lazyvim/plugins/utility.lua
+++ b/.config/nvim/lua/lazyvim/plugins/utility.lua
@@ -53,6 +53,7 @@ return {
 	},
 	{
 		"echasnovski/mini.bufremove",
+		event = "VeryLazy",
         -- stylua: ignore
         keys = {
           { "<leader>bd", function() require("mini.bufremove").delete(0, false) end, desc = "Delete Buffer" },
@@ -61,6 +62,7 @@ return {
 	},
 	{
 		"ghillb/cybu.nvim",
+		event = "VeryLazy",
 		keys = {
 			{ "<leader>bl", "<cmd>CybuNext<cr>", desc = "Next Buffer" },
 			{ "<leader>bh", "<cmd>CybuPrev<cr>", desc = "Prev Buffer" },
diff --git a/.config/nvim/lua/lazyvim/plugins/whichkey.lua b/.config/nvim/lua/lazyvim/plugins/whichkey.lua
index a9cbbb1..f8fcd52 100644
--- a/.config/nvim/lua/lazyvim/plugins/whichkey.lua
+++ b/.config/nvim/lua/lazyvim/plugins/whichkey.lua
@@ -70,15 +70,10 @@ return {
 				t = { name = "+todo" },
 				N = { name = "+noice" },
 
-				H = { "<cmd>split<cr>", "Split" },
-				V = { "<cmd>vsplit<cr>", "V Split" },
 				n = { "<cmd>NvimTreeToggle<cr>", "Explorer" },
-				P = { "<cmd>!opout %<cr><cr>", "Preview Document" },
-				q = { '<cmd>lua require("lazyvim.functions").smart_quit()<CR>', "Quit" },
-				w = { "<cmd>w<CR>", "Write" },
 				z = { "<cmd>ZenMode<cr>", "Zen" },
-				["'"] = { "<cmd>close<CR>", "Close split" },
 				u = { "<cmd>UndotreeToggle<cr>", "Undo Tree" },
+				["'"] = { "<cmd>close<CR>", "Close split" },
 
 				f = {
 					name = "+file",
@@ -97,16 +92,31 @@ return {
 					},
 				},
 
+				q = {
+					name = "+quit",
+					q = { "<cmd>wq<CR>", "Save and Quit Current" },
+					a = { "<cmd>wqa<cr>", "Save and Quit all" },
+				},
+
 				l = {
 					name = "+lsp",
 					l = { "<cmd>lopen<cr>", "Open Location List" },
 					q = { "<cmd>copen<cr>", "Open Quickfix List" },
 				},
 
-				C = {
+				c = {
 					name = "Compiler",
 					c = { "<cmd>w! | !compiler %<cr>", "Compile File" },
 					b = { "<cmd>w! | !pandoc % -t beamer -o presentation.pdf<cr>", "Beamer Presentation" },
+					p = { "<cmd>!opout %<cr><cr>", "Preview Document" },
+				},
+
+				w = {
+					name = "+window",
+					w = { "<C-W>p", "Other window" },
+					d = { "<C-W>c", "Delete Window" },
+					h = { "<C-W>s", "Split Below" },
+					v = { "<C-W>v", "Split Right" },
 				},
 
 				o = {
@@ -167,17 +177,7 @@ return {
 					},
 				},
 
-				-- o = {
-				-- 	name = "Options",
-				-- 	c = { "<cmd>lua vim.g.cmp_active=false<cr>", "Completion off" },
-				-- 	C = { "<cmd>lua vim.g.cmp_active=true<cr>", "Completion on" },
-				-- 	w = { '<cmd>lua require("user.functions").toggle_option("wrap")<cr>', "Wrap" },
-				-- 	r = { '<cmd>lua require("user.functions").toggle_option("relativenumber")<cr>', "Relative" },
-				-- 	l = { '<cmd>lua require("user.functions").toggle_option("cursorline")<cr>', "Cursorline" },
-				-- 	s = { '<cmd>lua require("user.functions").toggle_option("spell")<cr>', "Spell" },
-				-- 	t = { '<cmd>lua require("user.functions").toggle_tabline()<cr>', "Tabline" },
-				-- },
-
+				-- TODO: Add dap back into the project, bashbunni's dotfiles are a good resource.
 				-- d = {
 				-- 	name = "Debug",
 				-- 	b = { "<cmd>lua require'dap'.toggle_breakpoint()<cr>", "Breakpoint" },