diff --git a/ghostty/config b/ghostty/config
index d9ce68a..73a4135 100644
--- a/ghostty/config
+++ b/ghostty/config
@@ -26,3 +26,4 @@ adjust-cell-height = 20%
 window-colorspace = display-p3
 clipboard-read = allow
 window-save-state = always
+macos-option-as-alt = true
diff --git a/nvim/lua/keys.lua b/nvim/lua/keys.lua
index c7c2eb5..f9f6398 100644
--- a/nvim/lua/keys.lua
+++ b/nvim/lua/keys.lua
@@ -48,6 +48,21 @@ vim.keymap.set("n", "<leader>q", ":q<CR>", { silent = true })
 vim.keymap.set("", "<leader>sp", ":split<cr>")
 vim.keymap.set("", "<leader>sh", ":split<cr>")
 vim.keymap.set("", "<leader>sv", ":vsplit<cr>")
+vim.keymap.set("", "<leader>sH", "<C-w>H")
+vim.keymap.set("", "<leader>sJ", "<C-w>J")
+vim.keymap.set("", "<leader>sK", "<C-w>K")
+vim.keymap.set("", "<leader>sL", "<C-w>L")
+vim.keymap.set("", "<leader>se", "<C-w>=")
+vim.keymap.set("", "<leader>sx", ":close<CR>")
+vim.keymap.set("", "<leader>sw", "<C-w>x")
+vim.keymap.set("", "<leader>sr", "<C-w>r")
+vim.keymap.set("", "<leader>sR", "<C-w>R")
+
+-- Split Resize
+vim.keymap.set("n", "<M-k>", ":resize +2<CR>")
+vim.keymap.set("n", "<M-j>", ":resize -2<CR>")
+vim.keymap.set("n", "<M-h>", ":vertical resize -2<CR>")
+vim.keymap.set("n", "<M-l>", ":vertical resize +2<CR>")
 
 -- File operations
 vim.api.nvim_create_user_command("CopyFullPath", function()
diff --git a/nvim/lua/plugins/fzf-lua.lua b/nvim/lua/plugins/fzf-lua.lua
index 3154304..ac22cd2 100644
--- a/nvim/lua/plugins/fzf-lua.lua
+++ b/nvim/lua/plugins/fzf-lua.lua
@@ -137,6 +137,13 @@ return {
 			end,
 			desc = "Live grep",
 		},
+		{
+			"<leader>fG",
+			function()
+				require("fzf-lua").git_status()
+			end,
+			desc = "Git Status",
+		},
 		{
 			"<leader>fb",
 			function()
diff --git a/nvim/lua/plugins/which-key.lua b/nvim/lua/plugins/which-key.lua
index 2e1959d..3581b0c 100644
--- a/nvim/lua/plugins/which-key.lua
+++ b/nvim/lua/plugins/which-key.lua
@@ -22,7 +22,7 @@ return {
 			{ "<leader><space>i", desc = "Show implementation", icon = "󰈇" },
 			{ "<leader><space>r", desc = "Show references", icon = "󰈇" },
 			{ "<leader>P", hidden = true },
-			{ "<leader>S", desc = "Search & Replace (Flash)" },
+			{ "<leader>S", desc = "Search & Replace (Flash)", icon = "⚡" },
 			{ "<leader>_", group = "Comments" },
 			{ "<leader>w", desc = "Save", icon = "" },
 			{ "<leader>q", desc = "Quit" },
@@ -35,16 +35,32 @@ return {
 			{ "<leader>cp", desc = "Copilot Panel", icon = "" },
 			{ "<leader>cr", desc = "Copy relative path", icon = "" },
 			{ "<leader>f", group = "Finding & Format" },
-			{ "<leader>fb", desc = "Buffers" },
-			{ "<leader>ff", desc = "Files" },
-			{ "<leader>fr", desc = "References" },
-			{ "<leader>fd", desc = "Definitions" },
-			{ "<leader>fg", desc = "Search (grep)" },
+			{ "<leader>fb", desc = "Buffers", icon = "󰈯" },
+			{ "<leader>ff", desc = "Files", icon = "󰈞" },
+			{ "<leader>fG", desc = "Git Status", icon = "󰊢" },
+			{ "<leader>fr", desc = "References", icon = "󰈇" },
+			{ "<leader>fd", desc = "Definitions", icon = "󰈇" },
+			{ "<leader>fg", desc = "Search (grep)", icon = "" },
 			{ "<leader>fh", desc = "Help", icon = "󰋖" },
-			{ "<leader>fm", group = "Format" },
-			{ "<leader>ft", desc = "Todo Comments" },
-			{ "<Leader>fz", group = "fzf" },
-			{ "<Leader>fzl", group = "LSP" },
+			{ "<leader>fm", group = "Format", icon = "󰉼" },
+			{ "<leader>ft", desc = "Todo Comments", icon = "☑" },
+			{ "<leader>fz", group = "fzf", icon = "" },
+			{ "<leader>fzb", desc = "Buffers", icon = "󰈯" },
+			{ "<leader>fzf", desc = "Frecency", icon = "󰋚" },
+			{ "<leader>fzF", desc = "Files", icon = "󰈞" },
+			{ "<leader>fzg", desc = "Live Grep", icon = "" },
+			{ "<leader>fzG", desc = "Git Status", icon = "󰊢" },
+			{ "<leader>fzk", desc = "Keymaps", icon = "󰌋" },
+			{ "<leader>fzo", desc = "Old Files", icon = "󰋚" },
+			{ "<leader>fzq", desc = "Quickfix", icon = "󰁨" },
+			{ "<leader>fzr", desc = "Resume", icon = "" },
+			{ "<leader>fzu", desc = "Undotree", icon = "󰕌" },
+			{ "<leader>fzz", desc = "Global", icon = "󰈇" },
+			{ "<leader>fzl", group = "LSP", icon = "" },
+			{ "<leader>fzlc", desc = "Declarations", icon = "󰈇" },
+			{ "<leader>fzlD", desc = "Definitions", icon = "󰈇" },
+			{ "<leader>fzlr", desc = "References", icon = "󰈇" },
+			{ "<leader>fzlt", desc = "Type Definitions", icon = "󰈇" },
 			{ "<leader>fmt", desc = "Format [LSP]" },
 			{ "<leader>fn", desc = "Notify" },
 			{ "<leader>g", group = "Git" },
@@ -52,15 +68,15 @@ return {
 			{ "<leader>gR", desc = "Reset buffer", icon = "" },
 			{ "<leader>gS", desc = "Stage buffer", icon = "" },
 			{ "<leader>gU", desc = "Reset buffer index", icon = "" },
-			{ "<leader>gb", desc = "Toggle Line Blame" },
+			{ "<leader>gb", desc = "Toggle Line Blame", icon = "󰊢" },
 			{ "<leader>gc", desc = "Commit", icon = "" },
 			{ "<leader>gh", desc = "Line highlight", icon = "󰘤" },
-			{ "<leader>gj", desc = "Next hunk", icon = "" },
-			{ "<leader>gk", desc = "Previous hunk", icon = "" },
+			{ "<leader>gj", desc = "Next hunk", icon = "󰒭" },
+			{ "<leader>gk", desc = "Previous hunk", icon = "󰒮" },
 			{ "<leader>gl", desc = "Toggle number highlight", icon = "󰘤" },
-			{ "<leader>gp", desc = "Preview hunk", icon = "" },
+			{ "<leader>gp", desc = "Preview hunk", icon = "󰆷" },
 			{ "<leader>gr", desc = "Reset hunk", icon = "" },
-			{ "<leader>gs", desc = "Stage hunk", icon = "" },
+			{ "<leader>gs", desc = "Stage hunk", icon = "󰆓" },
 			{ "<leader>gu", desc = "Undo stage hunk", icon = "" },
 			{ "<leader>h", group = "Git signs" },
 			{ "<leader>k", hidden = true },
@@ -77,17 +93,31 @@ return {
 			{ "<leader>p", hidden = true },
 			{ "<leader>r", group = "Relative line numbering", icon = "󰉻" },
 			{ "<leader>rn", desc = "Relative line numbering", icon = "󰉻" },
-			{ "<leader>s", desc = "Session, Source, and Split" },
+			{ "<leader>s", desc = "Session, Source, and Split", icon = "󰆓" },
+			{ "<leader>sh", desc = "Split Horizontal", icon = "󰝘" },
+			{ "<leader>sp", desc = "Split Horizontal", icon = "󰝘" },
+			{ "<leader>sv", desc = "Split Vertical", icon = "󰝗" },
+			{ "<leader>sH", desc = "Move Split Left", icon = "" },
+			{ "<leader>sJ", desc = "Move Split Down", icon = "" },
+			{ "<leader>sK", desc = "Move Split Up", icon = "" },
+			{ "<leader>sL", desc = "Move Split Right", icon = "" },
+			{ "<leader>se", desc = "Equalize Splits", icon = "󰖯" },
+			{ "<leader>sx", desc = "Close Split", icon = "󰅖" },
+			{ "<leader>ss", desc = "Start/Stop Session", icon = "󰑋" },
+			{ "<leader>sr", desc = "Restore Session", icon = "" },
+			{ "<leader>sw", desc = "Swap With Next", icon = "󰒺" },
+			{ "<leader>sr", desc = "Rotate Splits Clockwise", icon = "↻" },
+			{ "<leader>sR", desc = "Rotate Splits Anti-Clockwise", icon = "↺" },
 			{ "<leader>t", group = "Testing & Tree" },
 			{ "<leader>tF", desc = "Neo-tree Filesystem", icon = "󰉓" },
 			{ "<leader>tb", desc = "Neo-tree Buffers", icon = "󰉋" },
 			{ "<leader>tf", desc = "Test file", icon = "󰈔" },
 			{ "<leader>tg", desc = "Toggle Neo-tree", icon = "󰙅" },
-			{ "<leader>tl", desc = "Test last" },
-			{ "<leader>tn", desc = "Test nearest" },
+			{ "<leader>tl", desc = "Test last", icon = "󰒭" },
+			{ "<leader>tn", desc = "Test nearest", icon = "󰛣" },
 			{ "<leader>ts", desc = "Test suite", icon = "󱞊" },
 			{ "<leader>tt", desc = "Trouble", icon = "󰙅" },
-			{ "<leader>tv", desc = "Test visit" },
+			{ "<leader>tv", desc = "Test visit", icon = "󰆷" },
 			{ "<leader>u", desc = "Undo tree", icon = "󰕌" },
 			{ "<leader><space>5", desc = "Continue", icon = "" },
 			{ "<leader><space>0", desc = "Step over", icon = "" },