68 files changed, 217 insertions, 217 deletions

diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/autocmds.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/autocmds.lua
index feaa619..2fbff6c 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/autocmds.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/autocmds.lua
@@ -47,10 +47,10 @@ autocmd("BufReadPost", {
 	callback = function(event)
 		local exclude = { "gitcommit" }
 		local buf = event.buf
-		if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].thesiahxyz_last_loc then
+		if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].TheSiahxyz_last_loc then
 			return
 		end
-		vim.b[buf].thesiahxyz_last_loc = true
+		vim.b[buf].TheSiahxyz_last_loc = true
 		local mark = vim.api.nvim_buf_get_mark(buf, '"')
 		local lcount = vim.api.nvim_buf_line_count(buf)
 		if mark[1] > 0 and mark[1] <= lcount then
@@ -84,7 +84,7 @@ autocmd("FileType", {
 	},
 	callback = function(event)
 		vim.bo[event.buf].buflisted = false
-		vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = event.buf, silent = true })
+		vim.keymap.set("n", "q", "<Cmd>close<cr>", { buffer = event.buf, silent = true })
 	end,
 })
 autocmd("FileType", {
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/keymaps.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
index 09c63b5..c8ae8f2 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/keymaps.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
@@ -11,21 +11,21 @@ vim.keymap.set("n", "<leader>a9", ":.!figlet -w 200 -f big<cr>", { desc = "Ascii
 vim.keymap.set("n", "<leader>a0", ":.!figlet -w 200 -f shadow<cr>", { desc = "Ascii art shadow" })
 
 -- Buffers
-vim.keymap.set({ "n", "v", "x", "t" }, "<A-x>", "<cmd>bd!<cr>", { desc = "Delete buffer" })
-vim.keymap.set({ "i", "n", "t" }, "<C-p>", "<cmd>bprevious<cr>", { desc = "Previous buffer" })
-vim.keymap.set({ "i", "n", "t" }, "<C-n>", "<cmd>bnext<cr>", { desc = "Next buffer" })
-vim.keymap.set({ "n", "t" }, "<S-h>", "<cmd>bprevious<cr>", { desc = "Previous buffer" })
-vim.keymap.set({ "n", "t" }, "<S-l>", "<cmd>bnext<cr>", { desc = "Next buffer" })
-vim.keymap.set("n", "<leader><leader>", "<cmd>e #<cr>", { desc = "Switch to last buffer" })
-vim.keymap.set({ "n", "v", "x", "t" }, "<leader>bd", "<cmd>:bd<cr>", { desc = "Close buffer" })
-vim.keymap.set({ "n", "v", "x", "t" }, "<leader>BD", "<cmd>:bd!<cr>", { desc = "Force close buffer" })
-vim.keymap.set("n", "<leader>bn", "<cmd>enew<cr>", { desc = "Open new buffer" })
-vim.keymap.set("n", "<leader>bc", "<cmd>e!<cr>", { desc = "Clear edit" })
-vim.keymap.set({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save current buffer" })
-vim.keymap.set({ "n", "v" }, "<leader>wq", "<cmd>wq<cr>", { desc = "Save current buffer and quit" })
-vim.keymap.set({ "n", "v" }, "<leader>WQ", "<cmd>wqa<cr>", { desc = "Save all buffers and quit" })
-vim.keymap.set({ "n", "v" }, "<leader>qq", "<cmd>q!<cr>", { desc = "Force quit" })
-vim.keymap.set({ "n", "v" }, "<leader>QQ", "<cmd>qa!<cr>", { desc = "Force quit all" })
+vim.keymap.set({ "n", "v", "x", "t" }, "<A-x>", "<Cmd>bd!<cr>", { desc = "Delete buffer" })
+vim.keymap.set({ "i", "n", "t" }, "<C-p>", "<Cmd>bprevious<cr>", { desc = "Previous buffer" })
+vim.keymap.set({ "i", "n", "t" }, "<C-n>", "<Cmd>bnext<cr>", { desc = "Next buffer" })
+vim.keymap.set({ "n", "t" }, "<S-h>", "<Cmd>bprevious<cr>", { desc = "Previous buffer" })
+vim.keymap.set({ "n", "t" }, "<S-l>", "<Cmd>bnext<cr>", { desc = "Next buffer" })
+vim.keymap.set("n", "<leader><leader>", "<Cmd>e #<cr>", { desc = "Switch to last buffer" })
+vim.keymap.set({ "n", "v", "x", "t" }, "<leader>bd", "<Cmd>:bd<cr>", { desc = "Close buffer" })
+vim.keymap.set({ "n", "v", "x", "t" }, "<leader>BD", "<Cmd>:bd!<cr>", { desc = "Force close buffer" })
+vim.keymap.set("n", "<leader>bn", "<Cmd>enew<cr>", { desc = "Open new buffer" })
+vim.keymap.set("n", "<leader>bc", "<Cmd>e!<cr>", { desc = "Clear edit" })
+vim.keymap.set({ "i", "x", "n", "s" }, "<C-s>", "<Cmd>w<cr><esc>", { desc = "Save current buffer" })
+vim.keymap.set({ "n", "v" }, "<leader>wq", "<Cmd>wq<cr>", { desc = "Save current buffer and quit" })
+vim.keymap.set({ "n", "v" }, "<leader>WQ", "<Cmd>wqa<cr>", { desc = "Save all buffers and quit" })
+vim.keymap.set({ "n", "v" }, "<leader>qq", "<Cmd>q!<cr>", { desc = "Force quit" })
+vim.keymap.set({ "n", "v" }, "<leader>QQ", "<Cmd>qa!<cr>", { desc = "Force quit all" })
 vim.keymap.set("n", "<leader>rnf", function()
 	local current_name = vim.fn.expand("%:p") -- Get the full path of the current file
 	local directory = vim.fn.expand("%:p:h") -- Get the directory of the current file
@@ -68,13 +68,13 @@ vim.keymap.set("n", "gc.", ":cd ..<cr>:pwd<cr>", { desc = "Go to current file pa
 vim.keymap.set("n", "<leader>ch", ":checkhealth<cr>", { desc = "Check neovim health" })
 
 -- Clear search with <esc>
-vim.keymap.set({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Clear search highlights" })
+vim.keymap.set({ "i", "n" }, "<esc>", "<Cmd>noh<cr><esc>", { desc = "Clear search highlights" })
 
 -- Clear search / diff update / redraw
 vim.keymap.set(
 	"n",
 	"<leader>R",
-	"<cmd>nohlsearch<bar>diffupdate<bar>normal! <C-l><cr>",
+	"<Cmd>nohlsearch<bar>diffupdate<bar>normal! <C-l><cr>",
 	{ desc = "Redraw / Clear hlsearch / Diff Update" }
 )
 
@@ -156,18 +156,18 @@ vim.keymap.set("n", "<leader>qe", function()
 end, { desc = "Close explorer (netrw)" })
 
 -- Fix List & Trouble
-vim.keymap.set("n", "[o", "<cmd>lprev<cr>zz", { desc = "Previous location" })
-vim.keymap.set("n", "]o", "<cmd>lnext<cr>zz", { desc = "Next location" })
-vim.keymap.set("n", "[q", "<cmd>cprev<cr>zz", { desc = "Previous quickfix" })
-vim.keymap.set("n", "]q", "<cmd>cnext<cr>zz", { desc = "Next quickfix" })
+vim.keymap.set("n", "[o", "<Cmd>lprev<cr>zz", { desc = "Previous location" })
+vim.keymap.set("n", "]o", "<Cmd>lnext<cr>zz", { desc = "Next location" })
+vim.keymap.set("n", "[q", "<Cmd>cprev<cr>zz", { desc = "Previous quickfix" })
+vim.keymap.set("n", "]q", "<Cmd>cnext<cr>zz", { desc = "Next quickfix" })
 vim.keymap.set(
 	"n",
 	"<leader>rw",
 	[[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
 	{ desc = "Search and replace word under cursor" }
 )
-vim.keymap.set("n", "<leader>oo", "<cmd>lopen<cr>", { desc = "Open location list" })
-vim.keymap.set("n", "<leader>oq", "<cmd>copen<cr>", { desc = "Open quickfix list" })
+vim.keymap.set("n", "<leader>oo", "<Cmd>lopen<cr>", { desc = "Open location list" })
+vim.keymap.set("n", "<leader>oq", "<Cmd>copen<cr>", { desc = "Open quickfix list" })
 
 -- Formats
 vim.keymap.set("n", "<leader>cF", vim.lsp.buf.format, { desc = "Format buffer by default lsp" })
@@ -311,21 +311,21 @@ vim.keymap.set("n", "<leader>ch", ":checkhealth<cr>", { desc = "Check neovim hea
 vim.keymap.set("n", "<leader>ip", vim.show_pos, { desc = "Inspect position" })
 
 -- Keywordprg
-vim.keymap.set("n", "<leader>K", "<cmd>norm! K<cr>", { desc = "Look up keyword" })
+vim.keymap.set("n", "<leader>K", "<Cmd>norm! K<cr>", { desc = "Look up keyword" })
 
 -- Lines
--- vim.keymap.set("n", "<A-,>", "<cmd>m .-2<cr>==", { desc = "Move line up" })
--- vim.keymap.set("n", "<A-.>", "<cmd>m .+1<cr>==", { desc = "Move line down" })
+-- vim.keymap.set("n", "<A-,>", "<Cmd>m .-2<cr>==", { desc = "Move line up" })
+-- vim.keymap.set("n", "<A-.>", "<Cmd>m .+1<cr>==", { desc = "Move line down" })
 vim.keymap.set(
 	"i",
 	"<A-,>",
-	"<esc><cmd>m .-2<cr>==gi",
+	"<esc><Cmd>m .-2<cr>==gi",
 	{ noremap = true, silent = true, desc = "Move line up in insert mode" }
 )
 vim.keymap.set(
 	"i",
 	"<A-.>",
-	"<esc><cmd>m .+1<cr>==gi",
+	"<esc><Cmd>m .+1<cr>==gi",
 	{ noremap = true, silent = true, desc = "Move line down in insert mode" }
 )
 vim.keymap.set("v", "<C-,>", ":m '<-2<cr>gv=gv", { desc = "Move selected lines up" })
@@ -365,7 +365,7 @@ vim.keymap.set("n", "<leader>mD", function()
 end, { desc = "Delete all marks" })
 
 -- Ownerships
-vim.keymap.set("n", "<leader>cx", "<cmd>!chmod +x %<cr>", { silent = true, desc = "Make file executable" })
+vim.keymap.set("n", "<leader>cx", "<Cmd>!chmod +x %<cr>", { silent = true, desc = "Make file executable" })
 
 -- Remap Default
 vim.keymap.set("i", "jk", "<esc>", { noremap = true, silent = true, desc = "Escape to normal mode" })
@@ -584,8 +584,8 @@ vim.keymap.set("n", "z.", function()
 end, { desc = "Spelling repeat" })
 
 -- Sudo
-vim.keymap.set("n", "<leader>SW", "<cmd>SudoWrite<cr><cr>", { silent = true, desc = "Save file with sudo" })
-vim.keymap.set("n", "<leader>SWQ", "<cmd>SudoWritequit<cr>", { silent = true, desc = "Save and quit with sudo" })
+vim.keymap.set("n", "<leader>SW", "<Cmd>SudoWrite<cr><cr>", { silent = true, desc = "Save file with sudo" })
+vim.keymap.set("n", "<leader>SWQ", "<Cmd>SudoWritequit<cr>", { silent = true, desc = "Save and quit with sudo" })
 
 -- Surround
 vim.keymap.set("n", "sau", function()
@@ -686,38 +686,38 @@ vim.keymap.set("n", "gbd", function()
 end, { desc = "Toggle bold" })
 
 -- Tab
-vim.keymap.set("n", "<leader><tab>l", "<cmd>tablast<cr>", { desc = "Last Tab" })
-vim.keymap.set("n", "]]<tab>", "<cmd>tablast<cr>", { desc = "Last Tab" })
-vim.keymap.set("n", "<leader><tab>o", "<cmd>tabonly<cr>", { desc = "Close Other Tabs" })
-vim.keymap.set("n", "<leader><tab>f", "<cmd>tabfirst<cr>", { desc = "First Tab" })
-vim.keymap.set("n", "[[<tab>", "<cmd>tabfirst<cr>", { desc = "First Tab" })
-vim.keymap.set("n", "<leader><tab><tab>", "<cmd>tabnew<cr>", { desc = "New Tab" })
-vim.keymap.set("n", "<leader><tab>n", "<cmd>tabnext<cr>", { desc = "Next Tab" })
-vim.keymap.set("n", "]<tab>", "<cmd>tabnext<cr>", { desc = "Next Tab" })
-vim.keymap.set("n", "<leader><tab>d", "<cmd>tabclose<cr>", { desc = "Close Tab" })
-vim.keymap.set("n", "<leader><tab>p", "<cmd>tabprevious<cr>", { desc = "Previous Tab" })
-vim.keymap.set("n", "[<tab>", "<cmd>tabprevious<cr>", { desc = "Previous Tab" })
+vim.keymap.set("n", "<leader><tab>l", "<Cmd>tablast<cr>", { desc = "Last Tab" })
+vim.keymap.set("n", "]]<tab>", "<Cmd>tablast<cr>", { desc = "Last Tab" })
+vim.keymap.set("n", "<leader><tab>o", "<Cmd>tabonly<cr>", { desc = "Close Other Tabs" })
+vim.keymap.set("n", "<leader><tab>f", "<Cmd>tabfirst<cr>", { desc = "First Tab" })
+vim.keymap.set("n", "[[<tab>", "<Cmd>tabfirst<cr>", { desc = "First Tab" })
+vim.keymap.set("n", "<leader><tab><tab>", "<Cmd>tabnew<cr>", { desc = "New Tab" })
+vim.keymap.set("n", "<leader><tab>n", "<Cmd>tabnext<cr>", { desc = "Next Tab" })
+vim.keymap.set("n", "]<tab>", "<Cmd>tabnext<cr>", { desc = "Next Tab" })
+vim.keymap.set("n", "<leader><tab>d", "<Cmd>tabclose<cr>", { desc = "Close Tab" })
+vim.keymap.set("n", "<leader><tab>p", "<Cmd>tabprevious<cr>", { desc = "Previous Tab" })
+vim.keymap.set("n", "[<tab>", "<Cmd>tabprevious<cr>", { desc = "Previous Tab" })
 
 -- Terminal
-vim.keymap.set("n", "<leader>te", "<cmd>term<cr>", { desc = "Open terminal" })
-vim.keymap.set("n", "<leader>t-", "<cmd>sp term://zsh | startinsert<cr>", { desc = "Split terminal (horizontal)" })
-vim.keymap.set("n", "<leader>t|", "<cmd>vsp term://zsh | startinsert<cr>", { desc = "Split terminal (vertical)" })
+vim.keymap.set("n", "<leader>te", "<Cmd>term<cr>", { desc = "Open terminal" })
+vim.keymap.set("n", "<leader>t-", "<Cmd>sp term://zsh | startinsert<cr>", { desc = "Split terminal (horizontal)" })
+vim.keymap.set("n", "<leader>t|", "<Cmd>vsp term://zsh | startinsert<cr>", { desc = "Split terminal (vertical)" })
 vim.keymap.set("t", "<esc><esc>", "<C-\\><C-n>", { desc = "Escape terminal mode" })
-vim.keymap.set("t", "<C-h>", "<cmd>wincmd h<cr>", { desc = "Move to left window" })
-vim.keymap.set("t", "<C-j>", "<cmd>wincmd j<cr>", { desc = "Move to window below" })
-vim.keymap.set("t", "<C-k>", "<cmd>wincmd k<cr>", { desc = "Move to window above" })
-vim.keymap.set("t", "<C-l>", "<cmd>wincmd l<cr>", { desc = "Move to right window" })
+vim.keymap.set("t", "<C-h>", "<Cmd>wincmd h<cr>", { desc = "Move to left window" })
+vim.keymap.set("t", "<C-j>", "<Cmd>wincmd j<cr>", { desc = "Move to window below" })
+vim.keymap.set("t", "<C-k>", "<Cmd>wincmd k<cr>", { desc = "Move to window above" })
+vim.keymap.set("t", "<C-l>", "<Cmd>wincmd l<cr>", { desc = "Move to right window" })
 vim.keymap.set("t", "<C-Space>l", "clear<cr>", { silent = true, desc = "Clear terminal" })
 vim.keymap.set("t", "<C-\\>", "<C-\\><C-n>iexit<cr>", { desc = "Close terminal" })
-vim.keymap.set("t", "<C-/>", "<cmd>close<cr>", { desc = "Close terminal" })
-vim.keymap.set("t", "<C-_>", "<cmd>close<cr>", { desc = "Close terminal" })
+vim.keymap.set("t", "<C-/>", "<Cmd>close<cr>", { desc = "Close terminal" })
+vim.keymap.set("t", "<C-_>", "<Cmd>close<cr>", { desc = "Close terminal" })
 
 -- Tmux
 if vim.env.TMUX then
 	vim.keymap.set(
 		"n",
 		"<leader>tm",
-		"<cmd>silent !~/.config/tmux/plugins/tmux-fzf/scripts/session.sh<cr>",
+		"<Cmd>silent !~/.config/tmux/plugins/tmux-fzf/scripts/session.sh<cr>",
 		{ desc = "Find tmux session" }
 	)
 	vim.keymap.set("n", "<leader>RS", function()
@@ -753,10 +753,10 @@ vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Move to left window" })
 vim.keymap.set("n", "<C-j>", "<C-w><C-j>", { desc = "Move to window below" })
 vim.keymap.set("n", "<C-k>", "<C-w><C-k>", { desc = "Move to window above" })
 vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Move to right window" })
--- vim.keymap.set("n", "<C-up>", "<cmd>resize +2<cr>", { desc = "Increase window height" })
--- vim.keymap.set("n", "<C-down>", "<cmd>resize -2<cr>", { desc = "Decrease window height" })
--- vim.keymap.set("n", "<C-left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease window width" })
--- vim.keymap.set("n", "<C-right>", "<cmd>vertical resize +2<cr>", { desc = "Increase window width" })
+-- vim.keymap.set("n", "<C-up>", "<Cmd>resize +2<cr>", { desc = "Increase window height" })
+-- vim.keymap.set("n", "<C-down>", "<Cmd>resize -2<cr>", { desc = "Decrease window height" })
+-- vim.keymap.set("n", "<C-left>", "<Cmd>vertical resize -2<cr>", { desc = "Decrease window width" })
+-- vim.keymap.set("n", "<C-right>", "<Cmd>vertical resize +2<cr>", { desc = "Increase window width" })
 
 function WordDefinition(input)
 	-- Function to run the dict command and return its output
@@ -803,7 +803,7 @@ vim.api.nvim_set_keymap(
 )
 
 -- Lazy
-vim.keymap.set("n", "<leader>L", "<cmd>Lazy<cr>", { desc = "Open lazy plugin manager" })
+vim.keymap.set("n", "<leader>L", "<Cmd>Lazy<cr>", { desc = "Open lazy plugin manager" })
 
 -- Mason
-vim.keymap.set("n", "<leader>M", "<cmd>Mason<cr>", { desc = "Open mason" })
+vim.keymap.set("n", "<leader>M", "<Cmd>Mason<cr>", { desc = "Open mason" })
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/lazy.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/lazy.lua
index 7d0c281..52eff22 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/lazy.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/lazy.lua
@@ -26,7 +26,7 @@ require("lazy").setup({
 	-- highlight-start
 	spec = {
 		-- import your plugins
-		{ import = "thesiahxyz.plugins" },
+		{ import = "TheSiahxyz.plugins" },
 	},
 	-- highlight-end
 	-- Configure any other settings here. See the documentation for more details.
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/options.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/options.lua
index 86f4b49..86f4b49 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/options.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/options.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/health.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/health.lua
index dba5f3a..dba5f3a 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/health.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/health.lua
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/init.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/init.lua
new file mode 100644
index 0000000..58a3470
--- /dev/null
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/init.lua
@@ -0,0 +1,15 @@
+-- Core
+require("TheSiahxyz.core.options")
+require("TheSiahxyz.core.keymaps")
+require("TheSiahxyz.core.autocmds")
+require("TheSiahxyz.core.lazy")
+
+-- Custom
+for _, file in ipairs(vim.fn.readdir(vim.fn.stdpath("config") .. "/lua/TheSiahxyz/utils", [[v:val =~ '\.lua$']])) do
+	require("TheSiahxyz.utils." .. file:gsub("%.lua$", ""))
+end
+
+-- Plenary
+function R(name)
+	require("plenary.reload").reload_module(name)
+end
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/ai.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua
index 7dcc5d5..45aa240 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/ai.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua
@@ -127,29 +127,29 @@ return {
 			require("gp").setup(conf)
 
 			-- Setup shortcuts here (see Usage > Shortcuts in the Documentation/Readme)
-			vim.keymap.set({ "n", "i" }, "<leader>Gc", "<cmd>GpChatNew<cr>", keymapOptions("New chat"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gb", "<cmd>GpBufferChatNew<cr>", keymapOptions("New buffer chat"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gt", "<cmd>GpChatToggle<cr>", keymapOptions("Toggle chat"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gf", "<cmd>GpChatFinder<cr>", keymapOptions("Chat finder"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gc", "<Cmd>GpChatNew<cr>", keymapOptions("New chat"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gb", "<Cmd>GpBufferChatNew<cr>", keymapOptions("New buffer chat"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gt", "<Cmd>GpChatToggle<cr>", keymapOptions("Toggle chat"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gf", "<Cmd>GpChatFinder<cr>", keymapOptions("Chat finder"))
 
 			vim.keymap.set("v", "<leader>Gc", ":<C-u>'<,'>GpChatNew<cr>", keymapOptions("Chat new"))
 			vim.keymap.set("v", "<leader>Gb", ":<C-u>'<,'>GpBufferChatNew<cr>", keymapOptions("Buffer chat new"))
 			vim.keymap.set("v", "<leader>Gp", ":<C-u>'<,'>GpChatPaste<cr>", keymapOptions("Chat paste"))
 			vim.keymap.set("v", "<leader>Gt", ":<C-u>'<,'>GpChatToggle<cr>", keymapOptions("Toggle chat"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>Gh", "<cmd>gpchatnew split<cr>", keymapOptions("New chat split"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gv", "<cmd>gpchatnew vsplit<cr>", keymapOptions("New chat vsplit"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gn", "<cmd>gpchatnew tabnew<cr>", keymapOptions("New chat tabnew"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gh", "<Cmd>gpchatnew split<cr>", keymapOptions("New chat split"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gv", "<Cmd>gpchatnew vsplit<cr>", keymapOptions("New chat vsplit"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gn", "<Cmd>gpchatnew tabnew<cr>", keymapOptions("New chat tabnew"))
 
 			vim.keymap.set("v", "<leader>Gh", ":<C-u>'<,'>GpChatNew split<cr>", keymapOptions("Chat new split"))
 			vim.keymap.set("v", "<leader>Gv", ":<C-u>'<,'>GpChatNew vsplit<cr>", keymapOptions("Chat new vsplit"))
 			vim.keymap.set("v", "<leader>Gn", ":<C-u>'<,'>GpChatNew tabnew<cr>", keymapOptions("Chat new tabnew"))
 
 			-- Prompt commands
-			vim.keymap.set({ "n", "i" }, "<leader>Gw", "<cmd>GpRewrite<cr>", keymapOptions("Inline rewrite"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gr", "<cmd>GpCodeReview<cr>", keymapOptions("Code review"))
-			vim.keymap.set({ "n", "i" }, "<leader>G]", "<cmd>GpAppend<cr>", keymapOptions("Append (after)"))
-			vim.keymap.set({ "n", "i" }, "<leader>G[", "<cmd>GpPrepend<cr>", keymapOptions("Prepend (before)"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gw", "<Cmd>GpRewrite<cr>", keymapOptions("Inline rewrite"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gr", "<Cmd>GpCodeReview<cr>", keymapOptions("Code review"))
+			vim.keymap.set({ "n", "i" }, "<leader>G]", "<Cmd>GpAppend<cr>", keymapOptions("Append (after)"))
+			vim.keymap.set({ "n", "i" }, "<leader>G[", "<Cmd>GpPrepend<cr>", keymapOptions("Prepend (before)"))
 
 			vim.keymap.set("v", "<leader>Gw", ":<C-u>'<,'>GpRewrite<cr>", keymapOptions("Rewrite"))
 			vim.keymap.set("v", "<leader>Gr", ":<C-u>'<,'>GpCodeReview<cr>", keymapOptions("Code review"))
@@ -157,11 +157,11 @@ return {
 			vim.keymap.set("v", "<leader>G[", ":<C-u>'<,'>GpPrepend<cr>", keymapOptions("Prepend (before)"))
 			vim.keymap.set("v", "<leader>Gi", ":<C-u>'<,'>GpImplement<cr>", keymapOptions("Implement selection"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>Ggp", "<cmd>GpPopup<cr>", keymapOptions("Popup"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gge", "<cmd>GpEnew<cr>", keymapOptions("GpEnew"))
-			vim.keymap.set({ "n", "i" }, "<leader>Ggc", "<cmd>GpNew<cr>", keymapOptions("GpNew"))
-			vim.keymap.set({ "n", "i" }, "<leader>Ggv", "<cmd>GpVnew<cr>", keymapOptions("GpVnew"))
-			vim.keymap.set({ "n", "i" }, "<leader>Ggn", "<cmd>GpTabnew<cr>", keymapOptions("GpTabnew"))
+			vim.keymap.set({ "n", "i" }, "<leader>Ggp", "<Cmd>GpPopup<cr>", keymapOptions("Popup"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gge", "<Cmd>GpEnew<cr>", keymapOptions("GpEnew"))
+			vim.keymap.set({ "n", "i" }, "<leader>Ggc", "<Cmd>GpNew<cr>", keymapOptions("GpNew"))
+			vim.keymap.set({ "n", "i" }, "<leader>Ggv", "<Cmd>GpVnew<cr>", keymapOptions("GpVnew"))
+			vim.keymap.set({ "n", "i" }, "<leader>Ggn", "<Cmd>GpTabnew<cr>", keymapOptions("GpTabnew"))
 
 			vim.keymap.set("v", "<leader>Ggp", ":<C-u>'<,'>GpPopup<cr>", keymapOptions("Popup"))
 			vim.keymap.set("v", "<leader>Gge", ":<C-u>'<,'>GpEnew<cr>", keymapOptions("GpEnew"))
@@ -169,29 +169,29 @@ return {
 			vim.keymap.set("v", "<leader>Ggv", ":<C-u>'<,'>GpVnew<cr>", keymapOptions("GpVnew"))
 			vim.keymap.set("v", "<leader>Ggn", ":<C-u>'<,'>GpTabnew<cr>", keymapOptions("GpTabnew"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>Gx", "<cmd>GpContext<cr>", keymapOptions("Toggle context"))
+			vim.keymap.set({ "n", "i" }, "<leader>Gx", "<Cmd>GpContext<cr>", keymapOptions("Toggle context"))
 			vim.keymap.set("v", "<leader>Gx", ":<C-u>'<,'>GpContext<cr>", keymapOptions("Toggle context"))
 
-			vim.keymap.set({ "n", "i", "v", "x" }, "<leader>Ggs", "<cmd>GpStop<cr>", keymapOptions("Stop"))
-			vim.keymap.set({ "n", "i", "v", "x" }, "<leader>Gg]", "<cmd>GpNextAgent<cr>", keymapOptions("Next agent"))
+			vim.keymap.set({ "n", "i", "v", "x" }, "<leader>Ggs", "<Cmd>GpStop<cr>", keymapOptions("Stop"))
+			vim.keymap.set({ "n", "i", "v", "x" }, "<leader>Gg]", "<Cmd>GpNextAgent<cr>", keymapOptions("Next agent"))
 
 			-- optional Whisper commands with prefix <C-g>w
-			vim.keymap.set({ "n", "i" }, "<leader>GWw", "<cmd>GpWhisper<cr>", keymapOptions("Whisper"))
+			vim.keymap.set({ "n", "i" }, "<leader>GWw", "<Cmd>GpWhisper<cr>", keymapOptions("Whisper"))
 			vim.keymap.set("v", "<leader>GWw", ":<C-u>'<,'>GpWhisper<cr>", keymapOptions("Whisper"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>GWr", "<cmd>GpWhisperRewrite<cr>", keymapOptions("Inline rewrite"))
-			vim.keymap.set({ "n", "i" }, "<leader>GW]", "<cmd>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
-			vim.keymap.set({ "n", "i" }, "<leader>GW[", "<cmd>GpWhisperPrepend<cr>", keymapOptions("Prepend (before) "))
+			vim.keymap.set({ "n", "i" }, "<leader>GWr", "<Cmd>GpWhisperRewrite<cr>", keymapOptions("Inline rewrite"))
+			vim.keymap.set({ "n", "i" }, "<leader>GW]", "<Cmd>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
+			vim.keymap.set({ "n", "i" }, "<leader>GW[", "<Cmd>GpWhisperPrepend<cr>", keymapOptions("Prepend (before) "))
 
 			vim.keymap.set("v", "<leader>GWr", ":<C-u>'<,'>GpWhisperRewrite<cr>", keymapOptions("Rewrite"))
 			vim.keymap.set("v", "<leader>GW]", ":<C-u>'<,'>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
 			vim.keymap.set("v", "<leader>GW[", ":<C-u>'<,'>GpWhisperPrepend<cr>", keymapOptions("Prepend (before)"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>GWp", "<cmd>GpWhisperPopup<cr>", keymapOptions("Popup"))
-			vim.keymap.set({ "n", "i" }, "<leader>GWe", "<cmd>GpWhisperEnew<cr>", keymapOptions("Enew"))
-			vim.keymap.set({ "n", "i" }, "<leader>GWc", "<cmd>GpWhisperNew<cr>", keymapOptions("New"))
-			vim.keymap.set({ "n", "i" }, "<leader>GWv", "<cmd>GpWhisperVnew<cr>", keymapOptions("Vnew"))
-			vim.keymap.set({ "n", "i" }, "<leader>GWn", "<cmd>GpWhisperTabnew<cr>", keymapOptions("Tabnew"))
+			vim.keymap.set({ "n", "i" }, "<leader>GWp", "<Cmd>GpWhisperPopup<cr>", keymapOptions("Popup"))
+			vim.keymap.set({ "n", "i" }, "<leader>GWe", "<Cmd>GpWhisperEnew<cr>", keymapOptions("Enew"))
+			vim.keymap.set({ "n", "i" }, "<leader>GWc", "<Cmd>GpWhisperNew<cr>", keymapOptions("New"))
+			vim.keymap.set({ "n", "i" }, "<leader>GWv", "<Cmd>GpWhisperVnew<cr>", keymapOptions("Vnew"))
+			vim.keymap.set({ "n", "i" }, "<leader>GWn", "<Cmd>GpWhisperTabnew<cr>", keymapOptions("Tabnew"))
 
 			vim.keymap.set("v", "<leader>GWp", ":<C-u>'<,'>GpWhisperPopup<cr>", keymapOptions("Popup"))
 			vim.keymap.set("v", "<leader>GWe", ":<C-u>'<,'>GpWhisperEnew<cr>", keymapOptions("Enew"))
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/cloak.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/cloak.lua
index 09b14d8..ab26f00 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/cloak.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/cloak.lua
@@ -34,9 +34,9 @@ return {
 		})
 	end,
 	keys = {
-		{ "<leader>ce", "<cmd>CloakEnable<cr>", desc = "Enable cloak" },
-		{ "<leader>cd", "<cmd>CloakDisable<cr>", desc = "Disable cloak" },
-		{ "<leader>cl", "<cmd>CloakPreviewLine<cr>", desc = "Preview line cloak" },
-		{ "<leader>zC", "<cmd>CloakToggle<cr>", desc = "Toggle cloak" },
+		{ "<leader>ce", "<Cmd>CloakEnable<cr>", desc = "Enable cloak" },
+		{ "<leader>cd", "<Cmd>CloakDisable<cr>", desc = "Disable cloak" },
+		{ "<leader>cl", "<Cmd>CloakPreviewLine<cr>", desc = "Preview line cloak" },
+		{ "<leader>zC", "<Cmd>CloakToggle<cr>", desc = "Toggle cloak" },
 	},
 }
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/cmp.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/cmp.lua
index 2dd46f3..2dd46f3 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/cmp.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/cmp.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/colorizer.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/colorizer.lua
index 33e9ca7..bd82542 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/colorizer.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/colorizer.lua
@@ -68,9 +68,9 @@ return {
 		})
 	end,
 	keys = {
-		{ "<leader>zha", "<cmd>ColorizerAttachToBuffer<CR>", desc = "Attach colorizer" },
-		{ "<leader>zhd", "<cmd>ColorizerDetachFromBuffer<CR>", desc = "Detach colorizer" },
-		{ "<leader>zhr", "<cmd>ColorizerReloadAllBuffers<CR>", desc = "Refresh colorizer" },
-		{ "<leader>zht", "<cmd>ColorizerToggle<CR>", desc = "Toggle colorizer" },
+		{ "<leader>zha", "<Cmd>ColorizerAttachToBuffer<CR>", desc = "Attach colorizer" },
+		{ "<leader>zhd", "<Cmd>ColorizerDetachFromBuffer<CR>", desc = "Detach colorizer" },
+		{ "<leader>zhr", "<Cmd>ColorizerReloadAllBuffers<CR>", desc = "Refresh colorizer" },
+		{ "<leader>zht", "<Cmd>ColorizerToggle<CR>", desc = "Toggle colorizer" },
 	},
 }
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/colorschemes.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/colorschemes.lua
index 8fce515..8fce515 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/colorschemes.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/colorschemes.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/comment.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/comment.lua
index eb93c01..eb93c01 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/comment.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/comment.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/compiler.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/compiler.lua
index e0894dc..9dad4f8 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/compiler.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/compiler.lua
@@ -16,7 +16,7 @@ return {
 			vim.api.nvim_set_keymap(
 				"n",
 				"<leader>ro",
-				"<cmd>CompilerOpen<cr>",
+				"<Cmd>CompilerOpen<cr>",
 				{ noremap = true, silent = true, desc = "Open compiler" }
 			),
 
@@ -24,15 +24,15 @@ return {
 			vim.api.nvim_set_keymap(
 				"n",
 				"<leader>re",
-				"<cmd>CompilerStop<cr>" -- (Optional, to dispose all tasks before redo)
-					.. "<cmd>CompilerRedo<cr>",
+				"<Cmd>CompilerStop<cr>" -- (Optional, to dispose all tasks before redo)
+					.. "<Cmd>CompilerRedo<cr>",
 				{ noremap = true, silent = true, desc = "Recompile" }
 			),
 			-- Toggle compiler results
 			vim.api.nvim_set_keymap(
 				"n",
 				"<leader>rt",
-				"<cmd>CompilerToggleResults<cr>",
+				"<Cmd>CompilerToggleResults<cr>",
 				{ noremap = true, silent = true, desc = "Toggle compiler" }
 			),
 		},
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/context.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/context.lua
index 1daaa54..e2d8d2b 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/context.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/context.lua
@@ -20,6 +20,6 @@ return {
 		vim.keymap.set("n", "[t", function()
 			require("treesitter-context").go_to_context(vim.v.count1)
 		end, { silent = true, desc = "Go to context" })
-		vim.keymap.set({ "n", "v" }, "<leader>zc", "<cmd>TSContextToggle<cr>", { desc = "Toggle context" })
+		vim.keymap.set({ "n", "v" }, "<leader>zc", "<Cmd>TSContextToggle<cr>", { desc = "Toggle context" })
 	end,
 }
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/csv.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/csv.lua
index e2e66d9..bcf0239 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/csv.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/csv.lua
@@ -26,7 +26,7 @@ return {
 					vim.keymap.set(
 						"n",
 						"<leader>zv",
-						"<cmd>CsvViewToggle<cr>",
+						"<Cmd>CsvViewToggle<cr>",
 						{ desc = "Toggle CSV view", buffer = true }
 					)
 				end,
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/dadbod.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/dadbod.lua
index 730ebfe..5004a1c 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/dadbod.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/dadbod.lua
@@ -43,11 +43,11 @@ return {
 		})
 	end,
 	keys = {
-		{ "<localleader>du", "<cmd>DBUI<cr>", desc = "DB UI" },
-		{ "<localleader>dt", "<cmd>DBUIToggle<cr>", desc = "Toggle DB UI" },
-		{ "<localleader>da", "<cmd>DBUIAddConnection<cr>", desc = "Add connection" },
-		{ "<localleader>df", "<cmd>DBUIFindBuffer<cr>", desc = "Find buffer" },
-		{ "<localleader>dr", "<cmd>DBUIRenameBuffer<cr>", desc = "Rename buffer" },
-		{ "<localleader>di", "<cmd>DBUILastQueryInfo<cr>", desc = "Last query info" },
+		{ "<localleader>du", "<Cmd>DBUI<cr>", desc = "DB UI" },
+		{ "<localleader>dt", "<Cmd>DBUIToggle<cr>", desc = "Toggle DB UI" },
+		{ "<localleader>da", "<Cmd>DBUIAddConnection<cr>", desc = "Add connection" },
+		{ "<localleader>df", "<Cmd>DBUIFindBuffer<cr>", desc = "Find buffer" },
+		{ "<localleader>dr", "<Cmd>DBUIRenameBuffer<cr>", desc = "Rename buffer" },
+		{ "<localleader>di", "<Cmd>DBUILastQueryInfo<cr>", desc = "Last query info" },
 	},
 }
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/dap.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/dap.lua
index dba785b..fac4e5c 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/dap.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/dap.lua
@@ -190,7 +190,7 @@ return {
 			},
 			{
 				"<localleader>dpR",
-				"<cmd>lua require('dapui').open({ reset = true })<cr>",
+				"<Cmd>lua require('dapui').open({ reset = true })<cr>",
 				desc = "Dap UI reset",
 			},
 		},
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/docker.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/docker.lua
index 7bc26d5..7bc26d5 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/docker.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/docker.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/git.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/git.lua
index 1f18b61..399b263 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/git.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/git.lua
@@ -153,7 +153,7 @@ return {
 		-- setting the keybinding for LazyGit with 'keys' is recommended in
 		-- order to load the plugin when the command is run for the first time
 		keys = {
-			{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "Lazygit" },
+			{ "<leader>gg", "<Cmd>LazyGit<cr>", desc = "Lazygit" },
 		},
 	},
 	{
@@ -201,15 +201,15 @@ return {
 				pattern = "fugitive",
 				callback = function(event)
 					vim.bo[event.buf].buflisted = false
-					vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = event.buf, silent = true })
+					vim.keymap.set("n", "q", "<Cmd>close<cr>", { buffer = event.buf, silent = true })
 				end,
 			})
 		end,
 		keys = {
 			{ mode = "n", "<leader>g<leader>", ":Git ", desc = "Git" },
 			{ mode = "n", "<leader>gf", vim.cmd.Git, desc = "Git fugitive" },
-			{ mode = "n", "gm", "<cmd>diffget //2<cr>", desc = "Git diff on my side" },
-			{ mode = "n", "go", "<cmd>diffget //3<cr>", desc = "Git diff on their side" },
+			{ mode = "n", "gm", "<Cmd>diffget //2<cr>", desc = "Git diff on my side" },
+			{ mode = "n", "go", "<Cmd>diffget //3<cr>", desc = "Git diff on their side" },
 		},
 	},
 }
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/goyo.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/goyo.lua
index 86b9a03..86b9a03 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/goyo.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/goyo.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/grug-far.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/grug-far.lua
index 997b1a6..ca0de7d 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/grug-far.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/grug-far.lua
@@ -7,7 +7,7 @@ return {
 			pattern = "grug-far",
 			callback = function()
 				-- Map <Esc> to quit after ensuring we're in normal mode
-				vim.keymap.set({ "i", "n" }, "<Esc>", "<cmd>stopinsert | bd!<CR>", { buffer = true })
+				vim.keymap.set({ "i", "n" }, "<Esc>", "<Cmd>stopinsert | bd!<CR>", { buffer = true })
 			end,
 		})
 	end,
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/harpoon2.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/harpoon2.lua
index c68f385..c68f385 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/harpoon2.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/harpoon2.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/image.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/image.lua
index a117e28..a4f126f 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/image.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/image.lua
@@ -205,6 +205,6 @@ return {
 	end,
 	keys = {
 		-- suggested keymap
-		{ "<leader>pi", "<cmd>PasteImage<cr>", desc = "Paste image from clipboard" },
+		{ "<leader>pi", "<Cmd>PasteImage<cr>", desc = "Paste image from clipboard" },
 	},
 }
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/init.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/init.lua
index 0bcf162..0bcf162 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/init.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/init.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/keys.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/keys.lua
index be0c957..b263414 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/keys.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/keys.lua
@@ -4,7 +4,7 @@ return {
 		cmd = "ShowkeysToggle",
 		opts = {},
 		keys = {
-			{ "<leader>zk", "<cmd>ShowkeysToggle<cr>", desc = "Toggle keys" },
+			{ "<leader>zk", "<Cmd>ShowkeysToggle<cr>", desc = "Toggle keys" },
 		},
 	},
 	{
@@ -105,7 +105,7 @@ return {
 			},
 			{
 				"<leader>wK",
-				"<cmd>WhichKey<cr>",
+				"<Cmd>WhichKey<cr>",
 				mode = { "n", "v", "x" },
 				desc = "Which-key all key",
 			},
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/lf.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lf.lua
index b055c6b..3f82222 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/lf.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lf.lua
@@ -11,16 +11,16 @@ return {
 				vim.keymap.set(
 					"n",
 					"<leader><C-\\>",
-					"<cmd>ToggleTerm direction=float name=Terminal<cr>",
+					"<Cmd>ToggleTerm direction=float name=Terminal<cr>",
 					{ desc = "Toggle float terminal" }
 				)
 				vim.keymap.set(
 					"n",
 					"<leader><C-t>",
-					"<cmd>ToggleTermToggleAll<cr>",
+					"<Cmd>ToggleTermToggleAll<cr>",
 					{ desc = "Toggle all float terminals" }
 				)
-				vim.keymap.set("n", "<leader><C-u>", "<cmd>TermSelect<cr>", { desc = "Select float terminal" })
+				vim.keymap.set("n", "<leader><C-u>", "<Cmd>TermSelect<cr>", { desc = "Select float terminal" })
 
 				local function set_opfunc(opfunc)
 					_G._opfunc = opfunc -- Define the function globally
@@ -112,7 +112,7 @@ return {
 					a.buf,
 					"t",
 					"q",
-					"<cmd>q<CR>",
+					"<Cmd>q<CR>",
 					{ nowait = true, noremap = true, silent = true }
 				)
 			end,
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/lsp.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lsp.lua
index c725789..ecf3f86 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/lsp.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lsp.lua
@@ -369,7 +369,7 @@ return {
 			},
 			{
 				"<leader>ci",
-				"<cmd>PyrightOrganizeImports<cr>",
+				"<Cmd>PyrightOrganizeImports<cr>",
 				desc = "Organize imports",
 			},
 			{
@@ -381,17 +381,17 @@ return {
 			},
 			{
 				"<leader>le",
-				"<cmd>FormatEnable<CR>",
+				"<Cmd>FormatEnable<CR>",
 				desc = "Enable format",
 			},
 			{
 				"<leader>ld",
-				"<cmd>FormatDisable<CR>",
+				"<Cmd>FormatDisable<CR>",
 				desc = "Disable format",
 			},
 			{
 				"<leader>lD",
-				"<cmd>FormatDisable!<CR>",
+				"<Cmd>FormatDisable!<CR>",
 				desc = "Disable current buffer format",
 			},
 		},
@@ -644,7 +644,7 @@ return {
 	-- 		},
 	-- 		{
 	-- 			"<leader>ci",
-	-- 			"<cmd>PyrightOrganizeImports<cr>",
+	-- 			"<Cmd>PyrightOrganizeImports<cr>",
 	-- 			desc = "Organize imports",
 	-- 		},
 	-- 		{
@@ -656,17 +656,17 @@ return {
 	-- 		},
 	-- 		{
 	-- 			"<leader>le",
-	-- 			"<cmd>FormatEnable<CR>",
+	-- 			"<Cmd>FormatEnable<CR>",
 	-- 			desc = "Enable format",
 	-- 		},
 	-- 		{
 	-- 			"<leader>ld",
-	-- 			"<cmd>FormatDisable<CR>",
+	-- 			"<Cmd>FormatDisable<CR>",
 	-- 			desc = "Disable format",
 	-- 		},
 	-- 		{
 	-- 			"<leader>lD",
-	-- 			"<cmd>FormatDisable!<CR>",
+	-- 			"<Cmd>FormatDisable!<CR>",
 	-- 			desc = "Disable current buffer format",
 	-- 		},
 	-- 	},
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/lualine.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lualine.lua
index 9c4f0d9..9c4f0d9 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/lualine.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lualine.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/macro.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/macro.lua
index 2af1b49..2af1b49 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/macro.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/macro.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/markdown.lua
index 2098e32..600c664 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/markdown.lua
@@ -228,9 +228,9 @@ return {
 			})
 		end,
 		keys = {
-			{ "<leader>mp", "<cmd>MarkdownPreview<CR>", desc = "Markdown preview" },
-			{ "<leader>mx", "<cmd>MarkdownPreviewStop<CR>", desc = "Markdown stop" },
-			{ "<leader>md", "<cmd>MarkdownPreviewToggle<CR>", desc = "Markdown toggle" },
+			{ "<leader>mp", "<Cmd>MarkdownPreview<CR>", desc = "Markdown preview" },
+			{ "<leader>mx", "<Cmd>MarkdownPreviewStop<CR>", desc = "Markdown stop" },
+			{ "<leader>md", "<Cmd>MarkdownPreviewToggle<CR>", desc = "Markdown toggle" },
 		},
 	},
 	{
@@ -253,10 +253,10 @@ return {
 			})
 		end,
 		keys = {
-			{ "<leader>mlp", "<cmd>LivePreview start<CR>", desc = "Markdown live preview" },
-			{ "<leader>mlx", "<cmd>LivePreview close<CR>", desc = "Markdown live close" },
-			{ "<leader>mlc", "<cmd>LivePreview pick<CR>", desc = "Markdown live pick" },
-			{ "<leader>mlh", "<cmd>LivePreview help<CR>", desc = "Markdown live help" },
+			{ "<leader>mlp", "<Cmd>LivePreview start<CR>", desc = "Markdown live preview" },
+			{ "<leader>mlx", "<Cmd>LivePreview close<CR>", desc = "Markdown live close" },
+			{ "<leader>mlc", "<Cmd>LivePreview pick<CR>", desc = "Markdown live pick" },
+			{ "<leader>mlh", "<Cmd>LivePreview help<CR>", desc = "Markdown live help" },
 		},
 	},
 	{
@@ -269,7 +269,7 @@ return {
 			})
 		end,
 		keys = {
-			{ "<leader>mf", "<cmd>Glow<CR>", desc = "Floating markdown preview" },
+			{ "<leader>mf", "<Cmd>Glow<CR>", desc = "Floating markdown preview" },
 		},
 	},
 	{
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/marks.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/marks.lua
index d59d0f1..d59d0f1 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/marks.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/marks.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/mini.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/mini.lua
index 122f08d..d9ea466 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/mini.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/mini.lua
@@ -377,7 +377,7 @@ return {
 			end
 
 			local mini_files = require("mini.files")
-			local tmux_pane_function = require("thesiahxyz.utils.tmux").tmux_pane_function
+			local tmux_pane_function = require("TheSiahxyz.utils.tmux").tmux_pane_function
 
 			local open_tmux_pane = function()
 				local curr_entry = mini_files.get_fs_entry()
@@ -1061,11 +1061,11 @@ return {
 			})
 		end,
 		keys = {
-			{ "<leader>mo", "<cmd>lua MiniMap.open()<cr>", desc = "Open map" },
-			{ "<leader>mm", "<cmd>lua MiniMap.refresh()<cr>", desc = "Refresh map" },
-			{ "<leader>mc", "<cmd>lua MiniMap.close()<cr>", desc = "Close map" },
-			{ "<leader>mtm", "<cmd>lua MiniMap.toggle()<cr>", desc = "Toggle map" },
-			{ "<leader>mts", "<cmd>lua MiniMap.toggle_side()<cr>", desc = "Toggle side map" },
+			{ "<leader>mo", "<Cmd>lua MiniMap.open()<cr>", desc = "Open map" },
+			{ "<leader>mm", "<Cmd>lua MiniMap.refresh()<cr>", desc = "Refresh map" },
+			{ "<leader>mc", "<Cmd>lua MiniMap.close()<cr>", desc = "Close map" },
+			{ "<leader>mtm", "<Cmd>lua MiniMap.toggle()<cr>", desc = "Toggle map" },
+			{ "<leader>mts", "<Cmd>lua MiniMap.toggle_side()<cr>", desc = "Toggle side map" },
 		},
 	},
 	{
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/navic.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/navic.lua
index 89cfa81..89cfa81 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/navic.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/navic.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/neo-tree.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/neo-tree.lua
index 6666f2d..6666f2d 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/neo-tree.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/neo-tree.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/obsidian.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/obsidian.lua
index ea8e893..c5f3a59 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/obsidian.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/obsidian.lua
@@ -401,7 +401,7 @@ return {
 			callback = function()
 				vim.keymap.set("n", "gl", function()
 					if require("obsidian").util.cursor_on_markdown_link() then
-						return "<cmd>ObsidianFollowLink<cr>"
+						return "<Cmd>ObsidianFollowLink<cr>"
 					else
 						return "gl"
 					end
@@ -443,19 +443,19 @@ return {
 		},
 		{
 			"<leader>os",
-			"<cmd>ObsidianQuickSwitch<cr>",
+			"<Cmd>ObsidianQuickSwitch<cr>",
 			ft = "markdown",
 			desc = "Quick switch (Obsidian)",
 		},
 		{
 			"<leader>oL",
-			"<cmd>ObsidianFollowLink<cr>",
+			"<Cmd>ObsidianFollowLink<cr>",
 			ft = "markdown",
 			desc = "Follow link (Obsidian)",
 		},
 		{
 			"<leader>oH",
-			"<cmd>ObsidianBacklinks<cr>",
+			"<Cmd>ObsidianBacklinks<cr>",
 			ft = "markdown",
 			desc = "Back link (Obsidian)",
 		},
@@ -485,13 +485,13 @@ return {
 		},
 		{
 			"<leader>ony",
-			"<cmd>ObsidianYesterday<cr>",
+			"<Cmd>ObsidianYesterday<cr>",
 			ft = "markdown",
 			desc = "Yesterday note (Obsidian)",
 		},
 		{
 			"<leader>ont",
-			"<cmd>ObsidianTomorrow<cr>",
+			"<Cmd>ObsidianTomorrow<cr>",
 			ft = "markdown",
 			desc = "Tomorrow note (Obsidian)",
 		},
@@ -510,7 +510,7 @@ return {
 		},
 		{
 			"<leader>oti",
-			"<cmd>ObsidianTemplate<cr>",
+			"<Cmd>ObsidianTemplate<cr>",
 			ft = "markdown",
 			desc = "Insert templates (Obsidian)",
 		},
@@ -602,13 +602,13 @@ return {
 		},
 		{
 			"<leader>otn",
-			"<cmd>ObsidianNewFromTemplate<cr>",
+			"<Cmd>ObsidianNewFromTemplate<cr>",
 			ft = "markdown",
 			desc = "Open new note with template (Obsidian)",
 		},
 		{
 			"<leader>oc",
-			"<cmd>ObsidianTOC<cr>",
+			"<Cmd>ObsidianTOC<cr>",
 			ft = "markdown",
 			desc = "Open contents (Obsidian)",
 		},
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/outline.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/outline.lua
index e5b98f8..5d28f7d 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/outline.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/outline.lua
@@ -3,7 +3,7 @@ return {
 	lazy = true,
 	cmd = { "Outline", "OutlineOpen" },
 	keys = { -- Example mapping to toggle outline
-		{ "<leader>zo", "<cmd>Outline<cr>", desc = "Toggle outline" },
+		{ "<leader>zo", "<Cmd>Outline<cr>", desc = "Toggle outline" },
 	},
 	opts = {
 		-- Your setup opts here
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/project.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/project.lua
index 13ee82b..13ee82b 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/project.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/project.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/python.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/python.lua
index 607d647..bacdd9b 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/python.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/python.lua
@@ -48,8 +48,8 @@ return {
 			})
 		end,
 		keys = {
-			{ "<leader>vs", "<cmd>VenvSelect<cr>", desc = "Select virtual env", ft = "python" },
-			{ "<leader>vc", "<cmd>VenvSelectCached<cr>", desc = "Select venv (cache)", ft = "python" },
+			{ "<leader>vs", "<Cmd>VenvSelect<cr>", desc = "Select virtual env", ft = "python" },
+			{ "<leader>vc", "<Cmd>VenvSelectCached<cr>", desc = "Select venv (cache)", ft = "python" },
 		},
 	},
 }
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/quickfix.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/quickfix.lua
index 9a3998e..f586310 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/quickfix.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/quickfix.lua
@@ -33,16 +33,16 @@ return {
 			})
 		end,
 		keys = {
-			{ "<leader>xd", "<cmd>Trouble diagnostics toggle<cr>", desc = "Toggle diagnostics (Trouble)" },
+			{ "<leader>xd", "<Cmd>Trouble diagnostics toggle<cr>", desc = "Toggle diagnostics (Trouble)" },
 			{
 				"<leader>xD",
-				"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+				"<Cmd>Trouble diagnostics toggle filter.buf=0<cr>",
 				desc = "Toggle buffer Diagnostics (Trouble)",
 			},
-			{ "<leader>xs", "<cmd>Trouble symbols toggle<cr>", desc = "Toggle symbols (Trouble)" },
-			{ "<leader>xS", "<cmd>Trouble lsp toggle<cr>", desc = "Toggle LSP def/ref/... (Trouble)" },
-			{ "<leader>xl", "<cmd>Trouble loclist toggle<cr>", desc = "Toggle location List (Trouble)" },
-			{ "<leader>xq", "<cmd>Trouble qflist toggle<cr>", desc = "Toggle quickfix List (Trouble)" },
+			{ "<leader>xs", "<Cmd>Trouble symbols toggle<cr>", desc = "Toggle symbols (Trouble)" },
+			{ "<leader>xS", "<Cmd>Trouble lsp toggle<cr>", desc = "Toggle LSP def/ref/... (Trouble)" },
+			{ "<leader>xl", "<Cmd>Trouble loclist toggle<cr>", desc = "Toggle location List (Trouble)" },
+			{ "<leader>xq", "<Cmd>Trouble qflist toggle<cr>", desc = "Toggle quickfix List (Trouble)" },
 			{
 				"[x",
 				function()
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/refactoring.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/refactoring.lua
index 8bcf274..8bcf274 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/refactoring.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/refactoring.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/sessions.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/sessions.lua
index 2126196..3a644c1 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/sessions.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/sessions.lua
@@ -51,10 +51,10 @@ return {
 		})
 	end,
 	keys = {
-		{ "<leader>fs", "<cmd>SessionSearch<CR>", desc = "Session search" },
-		{ "<leader>ws", "<cmd>SessionSave<CR>", desc = "Save session" },
-		{ "<leader>wx", "<cmd>SessionDisableAutoSave<CR>", desc = "Disable autosave" },
-		{ "<leader>wp", "<cmd>SessionPurgeOrphaned<CR>", desc = "Purge autosave" },
-		{ "<leader>wa", "<cmd>SessionToggleAutoSave<CR>", desc = "Toggle autosave" },
+		{ "<leader>fs", "<Cmd>SessionSearch<CR>", desc = "Session search" },
+		{ "<leader>ws", "<Cmd>SessionSave<CR>", desc = "Save session" },
+		{ "<leader>wx", "<Cmd>SessionDisableAutoSave<CR>", desc = "Disable autosave" },
+		{ "<leader>wp", "<Cmd>SessionPurgeOrphaned<CR>", desc = "Purge autosave" },
+		{ "<leader>wa", "<Cmd>SessionToggleAutoSave<CR>", desc = "Toggle autosave" },
 	},
 }
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/silicon.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/silicon.lua
index f5bd3fa..f5bd3fa 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/silicon.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/silicon.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/snippets.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/snippets.lua
index eac9161..96c52a7 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/snippets.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/snippets.lua
@@ -28,10 +28,10 @@ return {
 			end
 
 			require("luasnip.loaders.from_vscode").lazy_load({
-				paths = { '"' .. vim.fn.stdpath("config") .. '/lua/thesiahxyz/snippets"' },
+				paths = { '"' .. vim.fn.stdpath("config") .. '/lua/TheSiahxyz/snippets"' },
 			})
 
-			vim.cmd.runtime({ args = { "lua/thesiahxyz/snippets/*.lua" }, bang = true }) -- load custom snippets
+			vim.cmd.runtime({ args = { "lua/TheSiahxyz/snippets/*.lua" }, bang = true }) -- load custom snippets
 
 			vim.keymap.set({ "i", "x" }, "<A-L>", function()
 				if ls.expand_or_jumpable() then
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/stay-centered.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/stay-centered.lua
index b64880b..b64880b 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/stay-centered.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/stay-centered.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/surround.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/surround.lua
index f3e0174..f3e0174 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/surround.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/surround.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/telescope.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua
index 6f931de..0ec51f1 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/telescope.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua
@@ -485,10 +485,10 @@ return {
 			{
 				"mzlogin/vim-markdown-toc",
 				keys = {
-					{ "<leader>tg", "<cmd>GenTocGFM<CR>", desc = "Generate ToC to GFM" },
-					{ "<leader>tr", "<cmd>GenTocRedcarpet<CR>", desc = "Generate ToC to Redcarpet" },
-					{ "<leader>tl", "<cmd>GenTocGitLab<CR>", desc = "Generate ToC to Gitlab" },
-					{ "<leader>tm", "<cmd>GenTocMarked<CR>", desc = "Generate ToC to Marked" },
+					{ "<leader>tg", "<Cmd>GenTocGFM<CR>", desc = "Generate ToC to GFM" },
+					{ "<leader>tr", "<Cmd>GenTocRedcarpet<CR>", desc = "Generate ToC to Redcarpet" },
+					{ "<leader>tl", "<Cmd>GenTocGitLab<CR>", desc = "Generate ToC to Gitlab" },
+					{ "<leader>tm", "<Cmd>GenTocMarked<CR>", desc = "Generate ToC to Marked" },
 				},
 			},
 			{
@@ -928,7 +928,7 @@ return {
 			require("telescope").load_extension("repo")
 		end,
 		keys = {
-			{ mode = "n", "<leader>fG", "<cmd>Telescope repo list<cr>", desc = "Find git files (repo)" },
+			{ mode = "n", "<leader>fG", "<Cmd>Telescope repo list<cr>", desc = "Find git files (repo)" },
 		},
 	},
 	{
@@ -958,7 +958,7 @@ return {
 		keys = {
 			{ -- lazy style key map
 				"<leader>fu",
-				"<cmd>Telescope undo<cr>",
+				"<Cmd>Telescope undo<cr>",
 				desc = "Find undo history",
 			},
 		},
@@ -994,7 +994,7 @@ return {
 				})
 			end, { desc = "Find frequency live grep" })
 
-			vim.keymap.set("n", "<leader>qd", "<cmd>FrecencyDelete<cr>", { desc = "Delete current buffer frequency" })
+			vim.keymap.set("n", "<leader>qd", "<Cmd>FrecencyDelete<cr>", { desc = "Delete current buffer frequency" })
 		end,
 	},
 	{
@@ -1021,7 +1021,7 @@ return {
 		keys = {
 			{
 				"<leader>fm",
-				"<cmd>Telescope media_files<cr>",
+				"<Cmd>Telescope media_files<cr>",
 				desc = "Find media files",
 			},
 		},
@@ -1076,7 +1076,7 @@ return {
 		keys = {
 			{
 				"<leader>fpj",
-				"<cmd>Telescope projects<cr>",
+				"<Cmd>Telescope projects<cr>",
 				desc = "Find projects",
 			},
 		},
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/textobject.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/textobject.lua
index 3002fc0..3002fc0 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/textobject.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/textobject.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/todo.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/todo.lua
index 76eca3a..87c168b 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/todo.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/todo.lua
@@ -64,14 +64,14 @@ return {
 				end,
 				desc = "Previous Todo Comment",
 			},
-			{ "<leader>tt", "<cmd>Trouble todo toggle<cr>", desc = "Toggle TODO (Trouble)" },
+			{ "<leader>tt", "<Cmd>Trouble todo toggle<cr>", desc = "Toggle TODO (Trouble)" },
 			{
 				"<leader>tT",
-				"<cmd>Trouble todo toggle filter = {tag = {TODO,FIX,FIXME}}<cr>",
+				"<Cmd>Trouble todo toggle filter = {tag = {TODO,FIX,FIXME}}<cr>",
 				desc = "Toggle Todo/Fix/Fixme (Trouble)",
 			},
-			{ "<leader>ft", "<cmd>TodoTelescope<cr>", desc = "Find Todo" },
-			{ "<leader>fT", "<cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>", desc = "Find Todo/Fix/Fixme" },
+			{ "<leader>ft", "<Cmd>TodoTelescope<cr>", desc = "Find Todo" },
+			{ "<leader>fT", "<Cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>", desc = "Find Todo/Fix/Fixme" },
 		},
 	},
 }
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/treesitter.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/treesitter.lua
index c486343..c486343 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/treesitter.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/treesitter.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/urlview.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/urlview.lua
index f13a561..1bfb434 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/urlview.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/urlview.lua
@@ -127,22 +127,22 @@ return {
 		})
 
 		-- Add a keymap for the Tmux plugins search context
-		vim.keymap.set("n", "<leader>ub", "<cmd>UrlView thesiah_urls<cr>", { desc = "Bookmarks URLs" })
-		vim.keymap.set("n", "<leader>ul", "<cmd>UrlView lazy<cr>", { desc = "Lazy plugin URLs" })
-		vim.keymap.set("n", "<leader>ur", "<cmd>UrlView<cr>", { desc = "Buffer URLs" })
-		vim.keymap.set("n", "<leader>ut", "<cmd>UrlView tmux_plugins<cr>", { desc = "Tmux plugin URLs" })
+		vim.keymap.set("n", "<leader>ub", "<Cmd>UrlView thesiah_urls<cr>", { desc = "Bookmarks URLs" })
+		vim.keymap.set("n", "<leader>ul", "<Cmd>UrlView lazy<cr>", { desc = "Lazy plugin URLs" })
+		vim.keymap.set("n", "<leader>ur", "<Cmd>UrlView<cr>", { desc = "Buffer URLs" })
+		vim.keymap.set("n", "<leader>ut", "<Cmd>UrlView tmux_plugins<cr>", { desc = "Tmux plugin URLs" })
 		vim.keymap.set(
 			"n",
 			"<leader>ucb",
-			"<cmd>UrlView thesiah_urls action=clipboard<cr>",
+			"<Cmd>UrlView thesiah_urls action=clipboard<cr>",
 			{ desc = "clipboard bookmarks URLs" }
 		)
-		vim.keymap.set("n", "<leader>ucl", "<cmd>UrlView lazy action=clipboard<cr>", { desc = "Copy Lazy plugin URLs" })
-		vim.keymap.set("n", "<leader>ucr", "<cmd>UrlView action=clipboard<cr>", { desc = "Copy buffer URLs" })
+		vim.keymap.set("n", "<leader>ucl", "<Cmd>UrlView lazy action=clipboard<cr>", { desc = "Copy Lazy plugin URLs" })
+		vim.keymap.set("n", "<leader>ucr", "<Cmd>UrlView action=clipboard<cr>", { desc = "Copy buffer URLs" })
 		vim.keymap.set(
 			"n",
 			"<leader>uct",
-			"<cmd>UrlView tmux_plugins action=clipboard<cr>",
+			"<Cmd>UrlView tmux_plugins action=clipboard<cr>",
 			{ desc = "clipboard tmux plugin URLs" }
 		)
 	end,
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/virt-column.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/virt-column.lua
index cadc77c..cadc77c 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/virt-column.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/virt-column.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/wiki.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/wiki.lua
index eda6e6f..86fcd52 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/wiki.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/wiki.lua
@@ -80,7 +80,7 @@ return {
 					vim.g.calendar_diary = "~/.local/share/vimwiki/diary"
 					vim.g.calendar_no_mappings = 1
 				end,
-				keys = { { "<leader>cA", "<cmd>CalendarT<CR>", desc = "Open calendar" } },
+				keys = { { "<leader>cA", "<Cmd>CalendarT<CR>", desc = "Open calendar" } },
 			},
 		},
 		init = function()
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/zenmode.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/zenmode.lua
index beb48f5..beb48f5 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/zenmode.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/zenmode.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/markdown.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/markdown.lua
index 7d91fab..7d91fab 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/markdown.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/markdown.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/neetcode1.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/neetcode1.lua
index 85da742..85da742 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/neetcode1.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/neetcode1.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/neetcode2.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/neetcode2.lua
index 98e7258..98e7258 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/neetcode2.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/neetcode2.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/quarto.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/quarto.lua
index 74b9fb8..d990edc 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/quarto.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/quarto.lua
@@ -8,7 +8,7 @@ local c = ls.choice_node
 -- local f = ls.function_node
 -- local r = ls.restore_node
 local fmt = require("luasnip.extras.fmt").fmta
--- local h = require("thesiahxyz.utils.snippet")
+-- local h = require("TheSiahxyz.utils.snippet")
 
 local code_cell_snippet = s(
 	"`",
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/whichkey.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/whichkey.lua
index fab5853..fab5853 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/snippets/whichkey.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/whichkey.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/cheatsheet.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/cheatsheet.lua
index dd5130a..bc5b210 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/cheatsheet.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/cheatsheet.lua
@@ -7,7 +7,7 @@ local options = {
 
 -- Define a keymap for opening the cheatsheet
 vim.keymap.set("n", "<leader>skc", function()
-	require("thesiahxyz.utils.cheatsheet.grid")()
+	require("TheSiahxyz.utils.cheatsheet.grid")()
 end, { desc = "Open Cheatsheet" })
 
 return options
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/cheatsheet/grid.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/cheatsheet/grid.lua
index ced539b..0c2581f 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/cheatsheet/grid.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/cheatsheet/grid.lua
@@ -1,5 +1,5 @@
 local api = vim.api
-local ch = require("thesiahxyz.utils.cheatsheet.init")
+local ch = require("TheSiahxyz.utils.cheatsheet.init")
 local state = ch.state
 
 local ascii = {
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/cheatsheet/init.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/cheatsheet/init.lua
index c4cc1f0..cf1dfe6 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/cheatsheet/init.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/cheatsheet/init.lua
@@ -1,6 +1,6 @@
 local M = {}
 local api = vim.api
-local config = require("thesiahxyz.utils.cheatsheet") -- Load cheatsheet options
+local config = require("TheSiahxyz.utils.cheatsheet") -- Load cheatsheet options
 
 local function capitalize(str)
 	return (str:gsub("^%l", string.upper))
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/icons.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/icons.lua
index 22d5f2d..22d5f2d 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/icons.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/icons.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/markdown.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/markdown.lua
index 1b1c591..1b1c591 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/markdown.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/markdown.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/snippet.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/snippet.lua
index 57bb211..57bb211 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/snippet.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/snippet.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/tasks.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/tasks.lua
index 34d5636..77f552c 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/tasks.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/tasks.lua
@@ -2,7 +2,7 @@
 local M = {}
 
 -- Import the create_floating_scratch function from utils.lua
-local utils = require("thesiahxyz.utils.utils")
+local utils = require("TheSiahxyz.utils.utils")
 
 function M.create_or_update_task()
 	local current_line = vim.fn.getline(".")
@@ -70,7 +70,7 @@ end
 vim.api.nvim_set_keymap(
 	"i",
 	"<C-t>",
-	"<cmd>lua require('thesiahxyz.utils.tasks').create_or_update_task()<cr>",
+	"<Cmd>lua require('TheSiahxyz.utils.tasks').create_or_update_task()<cr>",
 	{ noremap = true, silent = true, desc = "Create/Update task" }
 )
 
@@ -112,7 +112,7 @@ end
 vim.api.nvim_set_keymap(
 	"n",
 	"<localleader>td",
-	"<Cmd>lua require('thesiahxyz.utils.tasks').mark_task_done()<CR>",
+	"<Cmd>lua require('TheSiahxyz.utils.tasks').mark_task_done()<CR>",
 	{ noremap = true, silent = true, desc = "Mark task done" }
 )
 
@@ -150,7 +150,7 @@ end
 vim.api.nvim_set_keymap(
 	"n",
 	"<localleader>tt",
-	"<Cmd>lua require('thesiahxyz.utils.tasks').go_to_task_in_taskwarrior_tui()<CR>",
+	"<Cmd>lua require('TheSiahxyz.utils.tasks').go_to_task_in_taskwarrior_tui()<CR>",
 	{ noremap = true, silent = true, desc = "Open taskwarrior-tui" }
 )
 
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/tmux.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/tmux.lua
index 41869f8..41869f8 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/tmux.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/tmux.lua
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/utils.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/utils.lua
index 24aa264..f50d22f 100644
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/utils/utils.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/utils.lua
@@ -1,4 +1,4 @@
--- ~/.config/nvim/lua/thesiahxyz/utils/utils.lua
+-- ~/.config/nvim/lua/TheSiahxyz/utils/utils.lua
 local M = {}
 
 function M.print_current_file_dir()
@@ -63,7 +63,7 @@ end
 vim.api.nvim_set_keymap(
 	"i",
 	"<C-v>",
-	"<cmd>lua require('thesiahxyz.utils.utils').insert_file_path()<cr>",
+	"<Cmd>lua require('TheSiahxyz.utils.utils').insert_file_path()<cr>",
 	{ noremap = true, silent = true }
 )
 function M.create_floating_scratch(content)
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/init.lua b/ar/.config/TheSiahxyz/lua/thesiahxyz/init.lua
deleted file mode 100644
index f0204cf..0000000
--- a/ar/.config/TheSiahxyz/lua/thesiahxyz/init.lua
+++ /dev/null
@@ -1,15 +0,0 @@
--- Core
-require("thesiahxyz.core.options")
-require("thesiahxyz.core.keymaps")
-require("thesiahxyz.core.autocmds")
-require("thesiahxyz.core.lazy")
-
--- Custom
-for _, file in ipairs(vim.fn.readdir(vim.fn.stdpath("config") .. "/lua/thesiahxyz/utils", [[v:val =~ '\.lua$']])) do
-	require("thesiahxyz.utils." .. file:gsub("%.lua$", ""))
-end
-
--- Plenary
-function R(name)
-	require("plenary.reload").reload_module(name)
-end