diff --git a/fish/conf.d/fish_frozen_theme.fish.bak b/fish/conf.d/fish_frozen_theme.fish.bak
new file mode 100644
index 0000000..2008093
--- /dev/null
+++ b/fish/conf.d/fish_frozen_theme.fish.bak
@@ -0,0 +1,49 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# theme variables from universal to global scope.
+# Don't edit this file, as it will be written by the web-config tool (`fish_config`).
+# To customize your theme, delete this file and see
+#     help interactive#syntax-highlighting
+# or
+#     man fish-interactive | less +/^SYNTAX.HIGHLIGHTING
+# for appropriate commands to add to ~/.config/fish/config.fish instead.
+# See also the release notes for fish 4.3.0 (run `help relnotes`).
+
+set --global fish_color_autosuggestion 6c7086
+set --global fish_color_cancel f38ba8
+set --global fish_color_command 89b4fa
+set --global fish_color_comment 7f849c
+set --global fish_color_cwd f9e2af
+set --global fish_color_cwd_root red
+set --global fish_color_end fab387
+set --global fish_color_error f38ba8
+set --global fish_color_escape eba0ac
+set --global fish_color_gray 6c7086
+set --global fish_color_history_current --bold
+set --global fish_color_host 89b4fa
+set --global fish_color_host_remote a6e3a1
+set --global fish_color_keyword f38ba8
+set --global fish_color_match --background=brblue
+set --global fish_color_normal cdd6f4
+set --global fish_color_operator f5c2e7
+set --global fish_color_option a6e3a1
+set --global fish_color_param f2cdcd
+set --global fish_color_quote a6e3a1
+set --global fish_color_redirection f5c2e7
+set --global fish_color_search_match --background=313244
+set --global fish_color_selection --background=313244
+set --global fish_color_status f38ba8
+set --global fish_color_user 94e2d5
+set --global fish_color_valid_path --underline
+set --global fish_pager_color_background
+set --global fish_pager_color_completion cdd6f4
+set --global fish_pager_color_description 6c7086
+set --global fish_pager_color_prefix f5c2e7
+set --global fish_pager_color_progress 6c7086
+set --global fish_pager_color_secondary_background
+set --global fish_pager_color_secondary_completion
+set --global fish_pager_color_secondary_description
+set --global fish_pager_color_secondary_prefix
+set --global fish_pager_color_selected_background
+set --global fish_pager_color_selected_completion
+set --global fish_pager_color_selected_description
+set --global fish_pager_color_selected_prefix
diff --git a/fish/fish_variables b/fish/fish_variables
index 0cef8d8..ad10b9b 100644
--- a/fish/fish_variables
+++ b/fish/fish_variables
@@ -1,42 +1,3 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR __fish_initialized:3800
-SETUVAR fish_color_autosuggestion:6c7086
-SETUVAR fish_color_cancel:f38ba8
-SETUVAR fish_color_command:89b4fa
-SETUVAR fish_color_comment:7f849c
-SETUVAR fish_color_cwd:f9e2af
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:fab387
-SETUVAR fish_color_error:f38ba8
-SETUVAR fish_color_escape:eba0ac
-SETUVAR fish_color_gray:6c7086
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:89b4fa
-SETUVAR fish_color_host_remote:a6e3a1
-SETUVAR fish_color_keyword:f38ba8
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:cdd6f4
-SETUVAR fish_color_operator:f5c2e7
-SETUVAR fish_color_option:a6e3a1
-SETUVAR fish_color_param:f2cdcd
-SETUVAR fish_color_quote:a6e3a1
-SETUVAR fish_color_redirection:f5c2e7
-SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d313244
-SETUVAR fish_color_selection:\x2d\x2dbackground\x3d313244
-SETUVAR fish_color_status:f38ba8
-SETUVAR fish_color_user:94e2d5
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_pager_color_background:\x1d
-SETUVAR fish_pager_color_completion:cdd6f4
-SETUVAR fish_pager_color_description:6c7086
-SETUVAR fish_pager_color_prefix:f5c2e7
-SETUVAR fish_pager_color_progress:6c7086
-SETUVAR fish_pager_color_secondary_background:\x1d
-SETUVAR fish_pager_color_secondary_completion:\x1d
-SETUVAR fish_pager_color_secondary_description:\x1d
-SETUVAR fish_pager_color_secondary_prefix:\x1d
-SETUVAR fish_pager_color_selected_background:\x1d
-SETUVAR fish_pager_color_selected_completion:\x1d
-SETUVAR fish_pager_color_selected_description:\x1d
-SETUVAR fish_pager_color_selected_prefix:\x1d
+SETUVAR __fish_initialized:4300
diff --git a/nvim/lua/plugins/alpha.lua b/nvim/lua/plugins/alpha.lua
deleted file mode 100644
index 6514e5f..0000000
--- a/nvim/lua/plugins/alpha.lua
+++ /dev/null
@@ -1,83 +0,0 @@
-return {
-	"goolord/alpha-nvim",
-	event = "VimEnter",
-	config = function()
-		local opts = { noremap = true, silent = true }
-		vim.keymap.set("n", "<leader>aA", ":Alpha<CR>", opts)
-		local dashboard = require("alpha.themes.dashboard")
-		local logo = [[
-    (q\_/p)
-.-.  |. .|                            (\
-   \ =\,/=                           (\_\_^__o
-    )/ _ \                 ___        `-'/ `_/
-   (/\):(/\               '`--\________/   |
-    \_   _/          '        /            |
-    `""^""`      `    .  ' `-`/.----------'\^-'
-    ]]
-
-		local status_ok, alpha = pcall(require, "alpha")
-		if not status_ok then
-			return
-		end
-
-		dashboard.section.header.val = vim.split(logo, "\n")
-		dashboard.section.buttons.val = {
-			dashboard.button("f", " " .. " Find file", ":lua require('fzf-lua').frecency({ cwd_only = true }) <CR>"),
-			dashboard.button("r", " " .. " Recent files", ":lua  require('fzf-lua').frecency() <CR>"),
-			dashboard.button("R", " " .. " Restore session", ":so Session.vim<CR>"),
-			dashboard.button("g", " " .. " Find text", ":lua require('fzf-lua').live_grep() <CR>"),
-			dashboard.button("G", " " .. " Git Status", ":lua require('fzf-lua').git_status() <CR>"),
-			dashboard.button("t", " " .. " Open file tree", ":Neotree<CR>"),
-			dashboard.button("l", "󰒲 " .. " Lazy", ":Lazy<CR>"),
-			dashboard.button(
-				"d",
-				" " .. " Git Graph",
-				":lua require('gitgraph').draw({}, { all = true, max_count = 5000 })<CR>"
-			),
-			dashboard.button("q", " " .. " Quit", ":qa<CR>"),
-		}
-		dashboard.section.buttons.opts.spacing = 0
-		local f = io.popen("/bin/hostname")
-		if f == nil then
-			return
-		end
-		local hostname = f:read("*a") or ""
-		f:close()
-		hostname = string.gsub(hostname, "\n$", "")
-		hostname = string.gsub(hostname, ".lan$", "")
-
-		local v = vim.version()
-		local version = " v" .. v.major .. "." .. v.minor .. "." .. v.patch
-		local machine = "󰌢  " .. vim.fn.expand("$USER") .. "@" .. hostname
-
-		vim.api.nvim_create_autocmd("User", {
-			pattern = "LazyVimStarted",
-			callback = function()
-				local stats = require("lazy").stats()
-				local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
-				dashboard.section.footer.val = {
-					"",
-					version,
-					"",
-					machine,
-					"",
-					"⚡ Neovim loaded " .. stats.count .. " plugins in " .. ms .. "ms",
-				}
-				pcall(vim.cmd.AlphaRedraw)
-			end,
-		})
-
-		dashboard.section.footer.val = {}
-
-		dashboard.section.footer.opts.hl = "Type"
-		dashboard.section.header.opts.hl = "Include"
-		dashboard.section.buttons.opts.hl = "Keyword"
-
-		dashboard.opts.opts.noautocmd = true
-		alpha.setup(dashboard.opts)
-
-		dashboard.section.header.opts.hl = "AlphaHeader"
-		dashboard.opts.layout[1].val = 6
-		return dashboard
-	end,
-}
diff --git a/nvim/lua/plugins/flash.lua b/nvim/lua/plugins/flash.lua
new file mode 100644
index 0000000..97d3ec0
--- /dev/null
+++ b/nvim/lua/plugins/flash.lua
@@ -0,0 +1,13 @@
+return {
+	"folke/flash.nvim",
+	event = "VeryLazy",
+	opts = {},
+	-- stylua: ignore
+	keys = {
+		{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
+		{ "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
+		{ "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
+		{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+		{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+	},
+}
diff --git a/nvim/lua/plugins/fzf-lua.lua b/nvim/lua/plugins/fzf-lua.lua
index 39ff04d..3154304 100644
--- a/nvim/lua/plugins/fzf-lua.lua
+++ b/nvim/lua/plugins/fzf-lua.lua
@@ -3,42 +3,188 @@ return {
 	event = "VeryLazy",
 	-- optional for icon support
 	dependencies = { "nvim-tree/nvim-web-devicons", "elanmed/fzf-lua-frecency.nvim" },
+	keys = {
+		{
+			"<c-G>",
+			function()
+				require("fzf-lua").live_grep()
+			end,
+			desc = "Files",
+		},
+		{
+			"<c-P>",
+			function()
+				require("fzf-lua").files({ line_query = true })
+			end,
+			desc = "Files",
+		},
+		{
+			"<leader>fzg",
+			function()
+				require("fzf-lua").live_grep()
+			end,
+			desc = "Live grep",
+		},
+		{
+			"<leader>fzf",
+			function()
+				require("fzf-lua").frecency({ cwd_only = true })
+			end,
+			desc = "Frecency",
+		},
+		{
+			"<leader>fzF",
+			function()
+				require("fzf-lua").files({ line_query = true })
+			end,
+			desc = "Files",
+		},
+		{
+			"<leader>fzr",
+			function()
+				require("fzf-lua").resume()
+			end,
+			desc = "Resume",
+		},
+		{
+			"<leader>fzo",
+			function()
+				require("fzf-lua").oldfiles()
+			end,
+			desc = "Old files",
+		},
+		{
+			"<leader>fzG",
+			function()
+				require("fzf-lua").git_status()
+			end,
+			desc = "Git Status",
+		},
+		{
+			"<leader>fzq",
+			function()
+				require("fzf-lua").quickfix()
+			end,
+			desc = "Quickfix",
+		},
+		{
+			"<leader>fzb",
+			function()
+				require("fzf-lua").buffers()
+			end,
+			desc = "Buffers",
+		},
+		{
+			"<leader>fzz",
+			function()
+				require("fzf-lua").global()
+			end,
+			desc = "Global",
+		},
+		{
+			"<leader>fzk",
+			function()
+				require("fzf-lua").keymaps()
+			end,
+			desc = "Keymaps",
+		},
+		{
+			"<leader>fzu",
+			function()
+				require("fzf-lua").undotree()
+			end,
+			desc = "Undotree",
+		},
+		{
+			"<leader>fzlr",
+			function()
+				require("fzf-lua").lsp_references()
+			end,
+			desc = "References",
+		},
+		{
+			"<leader>fzlD",
+			function()
+				require("fzf-lua").lsp_definitions()
+			end,
+			desc = "Definitions",
+		},
+		{
+			"<leader>fzlc",
+			function()
+				require("fzf-lua").lsp_declarations()
+			end,
+			desc = "Declarations",
+		},
+		{
+			"<leader>fzlt",
+			function()
+				require("fzf-lua").lsp_typedefs()
+			end,
+			desc = "Type Definitions",
+		},
+		{
+			"<leader>ff",
+			function()
+				require("fzf-lua").files()
+			end,
+			desc = "Files",
+		},
+		{
+			"<leader>fg",
+			function()
+				require("fzf-lua").live_grep()
+			end,
+			desc = "Live grep",
+		},
+		{
+			"<leader>fb",
+			function()
+				require("fzf-lua").buffers()
+			end,
+			desc = "Buffers",
+		},
+		{
+			"<leader>fh",
+			function()
+				require("fzf-lua").help_tags()
+			end,
+			desc = "Help tags",
+		},
+		{
+			"<leader>fd",
+			function()
+				require("fzf-lua").lsp_definitions({ jump1 = false })
+			end,
+			desc = "Definitions",
+		},
+		{
+			"<leader>fr",
+			function()
+				require("fzf-lua").lsp_references()
+			end,
+			desc = "References",
+		},
+		{
+			"gr",
+			function()
+				require("fzf-lua").lsp_references({ jump1 = true, ignore_current_line = true })
+			end,
+			desc = "LSP References",
+		},
+		{
+			"gd",
+			function()
+				require("fzf-lua").lsp_definitions({ jump1 = true })
+			end,
+			desc = "LSP Definitions",
+		},
+	},
 	config = function()
 		-- calling `setup` is optional for customization
 		local frecency = require("fzf-lua-frecency")
 		frecency.setup()
 		require("fzf-lua").setup({ "default-title" })
-		vim.keymap.set("n", "<c-G>", require("fzf-lua").live_grep, { desc = "Files" })
-		vim.keymap.set("n", "<c-P>", function()
-			require("fzf-lua").files({ line_query = true })
-		end, { desc = "Files" })
-		vim.keymap.set("n", "<leader>fzg", require("fzf-lua").live_grep, { desc = "Live grep" })
-		vim.keymap.set("n", "<leader>fzf", function()
-			require("fzf-lua").frecency({ cwd_only = true })
-		end, { desc = "Frecency" })
-		vim.keymap.set("n", "<leader>fzF", function()
-			require("fzf-lua").files({ line_query = true })
-		end, { desc = "Files" })
-		vim.keymap.set("n", "<leader>fzr", require("fzf-lua").resume, { desc = "Resume" })
-		vim.keymap.set("n", "<leader>fzo", require("fzf-lua").oldfiles, { desc = "Old files" })
-		vim.keymap.set("n", "<leader>fzG", require("fzf-lua").git_status, { desc = "Git Status" })
-		vim.keymap.set("n", "<leader>fzq", require("fzf-lua").quickfix, { desc = "Quickfix" })
-		vim.keymap.set("n", "<leader>fzb", require("fzf-lua").buffers, { desc = "Buffers" })
-		vim.keymap.set("n", "<leader>fzz", require("fzf-lua").global, { desc = "Global" })
-		vim.keymap.set("n", "<leader>fzk", require("fzf-lua").keymaps, { desc = "Keymaps" })
-		vim.keymap.set("n", "<leader>fzu", require("fzf-lua").undotree, { desc = "Undotree" })
-		vim.keymap.set("n", "<leader>fzlr", require("fzf-lua").lsp_references, { desc = "References" })
-		vim.keymap.set("n", "<leader>fzlD", require("fzf-lua").lsp_definitions, { desc = "Definitions" })
-		vim.keymap.set("n", "<leader>fzlc", require("fzf-lua").lsp_declarations, { desc = "Declarations" })
-		vim.keymap.set("n", "<leader>fzlt", require("fzf-lua").lsp_typedefs, { desc = "Type Definitions" })
-		vim.keymap.set("n", "<leader>ff", require("fzf-lua").files, { desc = "Files" })
-		vim.keymap.set("n", "<leader>fg", require("fzf-lua").live_grep, { desc = "Live grep" })
-		vim.keymap.set("n", "<leader>fb", require("fzf-lua").buffers, { desc = "Buffers" })
-		vim.keymap.set("n", "<leader>fh", require("fzf-lua").help_tags, { desc = "Help tags" })
-		vim.keymap.set("n", "<leader>fd", function()
-			require("fzf-lua").lsp_definitions({ jump1 = false })
-		end, { desc = "Definitions" })
-		vim.keymap.set("n", "<leader>fr", require("fzf-lua").lsp_references, { desc = "References" })
 		require("fzf-lua").register_ui_select()
 	end,
 }
diff --git a/nvim/lua/plugins/gitsigns.lua b/nvim/lua/plugins/gitsigns.lua
index 90cb429..08c6f39 100644
--- a/nvim/lua/plugins/gitsigns.lua
+++ b/nvim/lua/plugins/gitsigns.lua
@@ -3,19 +3,21 @@ return {
 	"lewis6991/gitsigns.nvim",
 	event = { "BufReadPre", "BufNewFile" },
 	opts = {},
+	keys = {
+		{ "<leader>gb", ":Gitsigns toggle_current_line_blame<CR>", desc = "Toggle Line Blame" },
+		{ "<leader>gs", ":Gitsigns stage_hunk<CR>", desc = "Stage Hunk" },
+		{ "<leader>gu", ":Gitsigns undo_stage_hunk<CR>", desc = "Undo Stage Hunk" },
+		{ "<leader>gr", ":Gitsigns reset_hunk<CR>", desc = "Reset Hunk" },
+		{ "<leader>gR", ":Gitsigns reset_buffer<CR>", desc = "Reset Buffer" },
+		{ "<leader>gp", ":Gitsigns preview_hunk<CR>", desc = "Preview Hunk" },
+		{ "<leader>gj", ":Gitsigns next_hunk<CR>", desc = "Next Hunk" },
+		{ "<leader>gk", ":Gitsigns prev_hunk<CR>", desc = "Previous Hunk" },
+		{ "<leader>gl", ":Gitsigns toggle_numhl<CR>", desc = "Toggle Num HL" },
+		{ "<leader>gh", ":Gitsigns toggle_linehl<CR>", desc = "Toggle Line HL" },
+		{ "<leader>gS", ":Gitsigns stage_buffer<CR>", desc = "Stage Buffer" },
+		{ "<leader>gU", ":Gitsigns reset_buffer_index<CR>", desc = "Reset Buffer Index" },
+	},
 	config = function()
 		require("gitsigns").setup()
-		vim.keymap.set("n", "<Leader>gb", ":Gitsigns toggle_current_line_blame<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gs", ":Gitsigns stage_hunk<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gu", ":Gitsigns undo_stage_hunk<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gr", ":Gitsigns reset_hunk<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gR", ":Gitsigns reset_buffer<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gp", ":Gitsigns preview_hunk<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gj", ":Gitsigns next_hunk<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gk", ":Gitsigns prev_hunk<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gl", ":Gitsigns toggle_numhl<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gh", ":Gitsigns toggle_linehl<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gS", ":Gitsigns stage_buffer<CR>", { noremap = true, silent = true })
-		vim.keymap.set("n", "<Leader>gU", ":Gitsigns reset_buffer_index<CR>", { noremap = true, silent = true })
 	end,
 }
diff --git a/nvim/lua/plugins/grug-far.lua b/nvim/lua/plugins/grug-far.lua
new file mode 100644
index 0000000..36953ac
--- /dev/null
+++ b/nvim/lua/plugins/grug-far.lua
@@ -0,0 +1,22 @@
+return {
+	"MagicDuck/grug-far.nvim",
+	opts = { headerMaxWidth = 80 },
+	cmd = "GrugFar",
+	keys = {
+		{
+			"<leader>sr",
+			function()
+				local grug = require("grug-far")
+				local ext = vim.bo.buftype == "" and vim.fn.expand("%:e")
+				grug.open({
+					transient = true,
+					prefills = {
+						filesFilter = ext and ext ~= "" and "*." .. ext or nil,
+					},
+				})
+			end,
+			mode = { "n", "v" },
+			desc = "Search and Replace",
+		},
+	},
+}
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index 958f022..f239a2d 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -1,5 +1,4 @@
 return {
-	{ "danro/rename.vim", event = { "BufReadPost", "BufNewFile" } },
 	{ "tpope/vim-endwise", event = { "BufReadPost", "BufNewFile" } },
 	{ "tpope/vim-repeat", event = { "BufReadPost", "BufNewFile" } },
 	{ "kosayoda/nvim-lightbulb", event = { "BufReadPost", "BufNewFile" } },
diff --git a/nvim/lua/plugins/lazydev.lua b/nvim/lua/plugins/lazydev.lua
index 36f3a3f..7390358 100644
--- a/nvim/lua/plugins/lazydev.lua
+++ b/nvim/lua/plugins/lazydev.lua
@@ -7,6 +7,8 @@ return {
 				-- See the configuration section for more details
 				-- Load luvit types when the `vim.uv` word is found
 				{ path = "luvit-meta/library", words = { "vim%.uv" } },
+				{ path = "snacks.nvim", words = { "Snacks" } },
+				{ path = "lazy.nvim", words = { "LazyVim" } },
 			},
 		},
 	},
diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua
index eb8947e..166b242 100644
--- a/nvim/lua/plugins/mason.lua
+++ b/nvim/lua/plugins/mason.lua
@@ -27,6 +27,124 @@ return {
 				"suketa/nvim-dap-ruby",
 				{ "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } },
 			},
+			keys = {
+				{
+					"<F5>",
+					function()
+						require("dap").continue()
+					end,
+					desc = "Debug: Continue",
+				},
+				{
+					"<F10>",
+					function()
+						require("dap").step_over()
+					end,
+					desc = "Debug: Step Over",
+				},
+				{
+					"<F11>",
+					function()
+						require("dap").step_into()
+					end,
+					desc = "Debug: Step Into",
+				},
+				{
+					"<F12>",
+					function()
+						require("dap").step_out()
+					end,
+					desc = "Debug: Step Out",
+				},
+				{
+					"<leader><space>5",
+					function()
+						require("dap").continue()
+					end,
+					desc = "Debug: Continue",
+				},
+				{
+					"<leader><space>0",
+					function()
+						require("dap").step_over()
+					end,
+					desc = "Debug: Step Over",
+				},
+				{
+					"<leader><space>1",
+					function()
+						require("dap").step_into()
+					end,
+					desc = "Debug: Step Into",
+				},
+				{
+					"<leader><space>2",
+					function()
+						require("dap").step_out()
+					end,
+					desc = "Debug: Step Out",
+				},
+				{
+					"<Leader><space>b",
+					function()
+						require("dap").toggle_breakpoint()
+					end,
+					desc = "Debug: Toggle Breakpoint",
+				},
+				{
+					"<Leader><space>B",
+					function()
+						require("dap").set_breakpoint()
+					end,
+					desc = "Debug: Set Breakpoint",
+				},
+				{
+					"<Leader><space>pr",
+					function()
+						require("dap").repl.open()
+					end,
+					desc = "Debug: Open REPL",
+				},
+				{
+					"<Leader><space>pl",
+					function()
+						require("dap").run_last()
+					end,
+					desc = "Debug: Run Last",
+				},
+				{
+					"<Leader><space>ph",
+					function()
+						require("dap.ui.widgets").hover()
+					end,
+					mode = { "n", "v" },
+					desc = "Debug: Hover Widget",
+				},
+				{
+					"<Leader><space>pp",
+					function()
+						require("dap.ui.widgets").preview()
+					end,
+					mode = { "n", "v" },
+					desc = "Debug: Preview Widget",
+				},
+				{
+					"<Leader><space>pf",
+					function()
+						local widgets = require("dap.ui.widgets")
+						widgets.centered_float(widgets.frames)
+					end,
+					desc = "Debug: Widget Frames",
+				},
+				{
+					"<Leader><space>ps",
+					function()
+						local widgets = require("dap.ui.widgets")
+						widgets.centered_float(widgets.scopes)
+					end,
+					desc = "Debug: Center Scopes",
+				},
+			},
 			config = function()
 				require("mason-nvim-dap").setup({
 					ensure_installed = {
@@ -50,56 +168,6 @@ return {
 				dap.listeners.before.event_exited.dapui_config = function()
 					dapui.close()
 				end
-				vim.keymap.set("n", "<F5>", function()
-					require("dap").continue()
-				end)
-				vim.keymap.set("n", "<F10>", function()
-					require("dap").step_over()
-				end)
-				vim.keymap.set("n", "<F11>", function()
-					require("dap").step_into()
-				end)
-				vim.keymap.set("n", "<F12>", function()
-					require("dap").step_out()
-				end)
-				vim.keymap.set("n", "<leader><space>5", function()
-					require("dap").continue()
-				end, { desc = "Continue" })
-				vim.keymap.set("n", "<leader><space>0", function()
-					require("dap").step_over()
-				end, { desc = "Step over" })
-				vim.keymap.set("n", "<leader><space>1", function()
-					require("dap").step_into()
-				end, { desc = "Step into" })
-				vim.keymap.set("n", "<leader><space>2", function()
-					require("dap").step_out()
-				end, { desc = "Step out" })
-				vim.keymap.set("n", "<Leader><space>b", function()
-					require("dap").toggle_breakpoint()
-				end, { desc = "Toggle breakpoint" })
-				vim.keymap.set("n", "<Leader><space>B", function()
-					require("dap").set_breakpoint()
-				end, { desc = "Breakpoint" })
-				vim.keymap.set("n", "<Leader><space>pr", function()
-					require("dap").repl.open()
-				end, { desc = "Open REPL" })
-				vim.keymap.set("n", "<Leader><space>pl", function()
-					require("dap").run_last()
-				end, { desc = "Run last" })
-				vim.keymap.set({ "n", "v" }, "<Leader><space>ph", function()
-					require("dap.ui.widgets").hover()
-				end, { desc = "Hover widget" })
-				vim.keymap.set({ "n", "v" }, "<Leader><space>pp", function()
-					require("dap.ui.widgets").preview()
-				end, { desc = "Preview widget" })
-				vim.keymap.set("n", "<Leader><space>pf", function()
-					local widgets = require("dap.ui.widgets")
-					widgets.centered_float(widgets.frames)
-				end, { desc = "Widget frames" })
-				vim.keymap.set("n", "<Leader><space>ps", function()
-					local widgets = require("dap.ui.widgets")
-					widgets.centered_float(widgets.scopes)
-				end, { desc = "Centre scopes" })
 			end,
 		},
 	},
diff --git a/nvim/lua/plugins/mini-ai.lua b/nvim/lua/plugins/mini-ai.lua
new file mode 100644
index 0000000..f87724d
--- /dev/null
+++ b/nvim/lua/plugins/mini-ai.lua
@@ -0,0 +1,22 @@
+return {
+	"echasnovski/mini.ai",
+	event = "VeryLazy",
+	opts = function()
+		local ai = require("mini.ai")
+		return {
+			n_lines = 500,
+			custom_textobjects = {
+				o = ai.gen_spec.treesitter({
+					a = { "@block.outer", "@conditional.outer", "@loop.outer" },
+					i = { "@block.inner", "@conditional.inner", "@loop.inner" },
+				}, {}),
+				f = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }, {}),
+				c = ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }, {}),
+				t = { "<([%p%w]-)%f[^<%w][^<>]->.-</%1>", "^<.->().*()</[^/]->$" },
+			},
+		}
+	end,
+	config = function(_, opts)
+		require("mini.ai").setup(opts)
+	end,
+}
diff --git a/nvim/lua/plugins/neo-tree.lua b/nvim/lua/plugins/neo-tree.lua
index 1f3e274..b9be784 100644
--- a/nvim/lua/plugins/neo-tree.lua
+++ b/nvim/lua/plugins/neo-tree.lua
@@ -6,6 +6,11 @@ return {
 		"MunifTanjim/nui.nvim",
 	},
 	event = "VeryLazy",
+	keys = {
+		{ "<leader>tg", ":Neotree toggle<CR>", desc = "Toggle Neo-tree" },
+		{ "<leader>tF", ":Neotree filesystem reveal left<CR>", desc = "Reveal File in Neo-tree" },
+		{ "<leader>tb", ":Neotree buffers reveal float<CR>", desc = "Neo-tree Buffers" },
+	},
 	config = function()
 		require("neo-tree").setup({
 			default_component_configs = {
@@ -63,8 +68,5 @@ return {
 				"document_symbols",
 			},
 		})
-		vim.keymap.set("n", "<leader>tg", ":Neotree toggle<CR>", {})
-		vim.keymap.set("n", "<leader>tF", ":Neotree filesystem reveal left<CR>", {})
-		vim.keymap.set("n", "<leader>tb", ":Neotree buffers reveal float<CR>", {})
 	end,
 }
diff --git a/nvim/lua/plugins/neogit.lua b/nvim/lua/plugins/neogit.lua
index f193e39..5b04225 100644
--- a/nvim/lua/plugins/neogit.lua
+++ b/nvim/lua/plugins/neogit.lua
@@ -7,5 +7,7 @@ return {
 		"sindrets/diffview.nvim", -- optional
 	},
 	config = true,
-	vim.keymap.set("n", "<Leader>gc", ":Neogit commit<CR>", { noremap = true, silent = true }),
+	keys = {
+		{ "<leader>gc", ":Neogit commit<CR>", desc = "Neogit commit" },
+	},
 }
diff --git a/nvim/lua/plugins/noice.lua b/nvim/lua/plugins/noice.lua
index 3c2f844..8b782f4 100644
--- a/nvim/lua/plugins/noice.lua
+++ b/nvim/lua/plugins/noice.lua
@@ -58,9 +58,5 @@ return {
 	dependencies = {
 		-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
 		"MunifTanjim/nui.nvim",
-		-- OPTIONAL:
-		--   `nvim-notify` is only needed, if you want to use the notification view.
-		--   If not available, we use `mini` as the fallback
-		"rcarriga/nvim-notify",
 	},
 }
diff --git a/nvim/lua/plugins/nvim-lint.lua b/nvim/lua/plugins/nvim-lint.lua
index ceffaed..919d1e3 100644
--- a/nvim/lua/plugins/nvim-lint.lua
+++ b/nvim/lua/plugins/nvim-lint.lua
@@ -32,9 +32,14 @@ return {
 				lint.try_lint()
 			end,
 		})
-
-		vim.keymap.set("n", "<leader><space>l", function()
-			lint.try_lint()
-		end, { desc = "Trigger linting for current file" })
 	end,
+	keys = {
+		{
+			"<leader><space>l",
+			function()
+				require("lint").try_lint()
+			end,
+			desc = "Trigger linting for current file",
+		},
+	},
 }
diff --git a/nvim/lua/plugins/nvim-notify.lua b/nvim/lua/plugins/nvim-notify.lua
deleted file mode 100644
index 14de58e..0000000
--- a/nvim/lua/plugins/nvim-notify.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-	"rcarriga/nvim-notify",
-	event = "VeryLazy",
-	config = function()
-		require("notify").setup({
-			stages = "fade_in_slide_out",
-			timeout = 2000,
-		})
-		vim.notify = require("notify")
-	end,
-}
diff --git a/nvim/lua/plugins/nvim-spectre.lua b/nvim/lua/plugins/nvim-spectre.lua
deleted file mode 100644
index 5bcf5b3..0000000
--- a/nvim/lua/plugins/nvim-spectre.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-return {
-	"nvim-pack/nvim-spectre",
-	cmd = "Spectre",
-	event = "VeryLazy",
-	keys = {
-		{
-			"<leader>St",
-			function()
-				require("spectre").toggle()
-			end,
-			desc = "Replace in files (Spectre)",
-		},
-		{
-			"<leader>Sw",
-			function()
-				require("spectre").open_visual({ select_word = true })
-			end,
-			desc = "Search current word",
-		},
-		{
-			"<leader>Sf",
-			function()
-				require("spectre").open_file_search({ select_word = true })
-			end,
-			desc = "Search current file",
-		},
-	},
-}
diff --git a/nvim/lua/plugins/rename-inc.lua b/nvim/lua/plugins/rename-inc.lua
index 3b5783d..2f3b462 100644
--- a/nvim/lua/plugins/rename-inc.lua
+++ b/nvim/lua/plugins/rename-inc.lua
@@ -1,8 +1,10 @@
 return {
 	"smjonas/inc-rename.nvim",
 	event = "VeryLazy",
+	keys = {
+		{ "<leader><space>P", ":IncRename ", desc = "Incremental Rename" },
+	},
 	config = function()
 		require("inc_rename").setup()
-		vim.keymap.set("n", "<leader><space>P", ":IncRename ")
 	end,
 }
diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua
index 1189397..999184f 100644
--- a/nvim/lua/plugins/snacks.lua
+++ b/nvim/lua/plugins/snacks.lua
@@ -12,8 +12,93 @@ return {
 		notifier = { enabled = true },
 		quickfile = { enabled = true },
 		scroll = { enabled = true },
+		dashboard = {
+			enabled = true,
+			sections = {
+				{
+					text = [[
+    (q\_/p)
+.-.  |. .|                            (\
+   \ =\,/=                           (\_\_^__o
+    )/ _ \                 ___        `-'/ `_/
+   (/\):(/\               '`--\________/   |
+    \_   _/          '        /            |
+    `""^""`      `    .  ' `-`/.----------'\^-'
+]],
+					hl = "header",
+					padding = 1,
+				},
+				{ section = "keys", gap = 0, padding = 1 },
+				{
+					text = " v" .. vim.version().major .. "." .. vim.version().minor .. "." .. vim.version().patch,
+					hl = "SnacksDashboardFooter",
+					align = "center",
+				},
+				{
+					text = "󰌢 " .. vim.env.USER .. "@" .. vim.fn.hostname(),
+					hl = "SnacksDashboardFooter",
+					align = "center",
+				},
+				{ section = "startup" },
+			},
+			preset = {
+				keys = {
+					{
+						icon = " ",
+						key = "f",
+						desc = "Find file",
+						action = function()
+							require("fzf-lua").frecency({ cwd_only = true })
+						end,
+					},
+					{
+						icon = " ",
+						key = "r",
+						desc = "Recent files",
+						action = function()
+							require("fzf-lua").frecency()
+						end,
+					},
+					{ icon = " ", key = "R", desc = "Restore session", action = ":so Session.vim" },
+					{
+						icon = " ",
+						key = "g",
+						desc = "Find text",
+						action = function()
+							require("fzf-lua").live_grep()
+						end,
+					},
+					{
+						icon = " ",
+						key = "G",
+						desc = "Git Status",
+						action = function()
+							require("fzf-lua").git_status()
+						end,
+					},
+					{ icon = " ", key = "t", desc = "Open file tree", action = ":Neotree" },
+					{ icon = "󰒲 ", key = "l", desc = "Lazy", action = ":Lazy" },
+					{
+						icon = " ",
+						key = "d",
+						desc = "Git Graph",
+						action = function()
+							require("gitgraph").draw({}, { all = true, max_count = 5000 })
+						end,
+					},
+					{ icon = " ", key = "q", desc = "Quit", action = ":qa" },
+				},
+			},
+		},
 	},
 	keys = {
+		{
+			"<leader>aA",
+			function()
+				require("snacks").dashboard()
+			end,
+			desc = "Snacks Dashboard",
+		},
 		{
 			"<leader>fn",
 			function()
diff --git a/nvim/lua/plugins/todo-comments.lua b/nvim/lua/plugins/todo-comments.lua
new file mode 100644
index 0000000..43d4749
--- /dev/null
+++ b/nvim/lua/plugins/todo-comments.lua
@@ -0,0 +1,27 @@
+return {
+	"folke/todo-comments.nvim",
+	dependencies = { "nvim-lua/plenary.nvim" },
+	event = { "BufReadPost", "BufNewFile" },
+	opts = {},
+	keys = {
+		{
+			"]t",
+			function()
+				require("todo-comments").jump_next()
+			end,
+			desc = "Next Todo Comment",
+		},
+		{
+			"[t",
+			function()
+				require("todo-comments").jump_prev()
+			end,
+			desc = "Previous Todo Comment",
+		},
+		{
+			"<leader>ft",
+			":TodoFzf<CR>",
+			desc = "Todo (FZF)",
+		},
+	},
+}
diff --git a/nvim/lua/plugins/vim-obsession.lua b/nvim/lua/plugins/vim-obsession.lua
index c5521d3..63504bd 100644
--- a/nvim/lua/plugins/vim-obsession.lua
+++ b/nvim/lua/plugins/vim-obsession.lua
@@ -1,8 +1,10 @@
 return {
 	"tpope/vim-obsession",
+	keys = {
+		{ "<leader>ss", ":Obsession<CR>", desc = "Start/Stop Session" },
+		{ "<leader>sr", ":so Session.vim<CR>", desc = "Restore Session" },
+	},
 	config = function()
 		vim.sessions_dir = "~/.config/vim-sessions"
-		vim.keymap.set("n", "<Leader>ss", ":Obsession<CR>")
-		vim.keymap.set("n", "<Leader>sr", ":so Session.vim<CR>")
 	end,
 }
diff --git a/nvim/lua/plugins/vim-tmux-navigator.lua b/nvim/lua/plugins/vim-tmux-navigator.lua
index 3460913..65d5f68 100644
--- a/nvim/lua/plugins/vim-tmux-navigator.lua
+++ b/nvim/lua/plugins/vim-tmux-navigator.lua
@@ -1,8 +1,10 @@
 return {
 	"christoomey/vim-tmux-navigator",
 	event = "VeryLazy",
-	vim.keymap.set("n", "C-h", ":TmuxNavigateLeft<CR>"),
-	vim.keymap.set("n", "C-j", ":TmuxNavigateDown<CR>"),
-	vim.keymap.set("n", "C-k", ":TmuxNavigateUp<CR>"),
-	vim.keymap.set("n", "C-l", ":TmuxNavigateRight<CR>"),
+	keys = {
+		{ "<c-h>", ":TmuxNavigateLeft<CR>", desc = "Window Left" },
+		{ "<c-j>", ":TmuxNavigateDown<CR>", desc = "Window Down" },
+		{ "<c-k>", ":TmuxNavigateUp<CR>", desc = "Window Up" },
+		{ "<c-l>", ":TmuxNavigateRight<CR>", desc = "Window Right" },
+	},
 }
diff --git a/nvim/lua/plugins/vimtest.lua b/nvim/lua/plugins/vimtest.lua
index ec796a6..e0c1fc1 100644
--- a/nvim/lua/plugins/vimtest.lua
+++ b/nvim/lua/plugins/vimtest.lua
@@ -4,10 +4,14 @@ return {
 	dependencies = {
 		"preservim/vimux",
 	},
-	vim.keymap.set("n", "<leader>tn", ":TestNearest<CR>"),
-	vim.keymap.set("n", "<leader>tf", ":TestFile<CR>"),
-	vim.keymap.set("n", "<leader>ts", ":TestSuite<CR>"),
-	vim.keymap.set("n", "<leader>tl", ":TestLast<CR>"),
-	vim.keymap.set("n", "<leader>tv", ":TestVisit<CR>"),
-	vim.cmd("let test#strategy = 'vimux'"),
+	keys = {
+		{ "<leader>tn", ":TestNearest<CR>", desc = "Test Nearest" },
+		{ "<leader>tf", ":TestFile<CR>", desc = "Test File" },
+		{ "<leader>ts", ":TestSuite<CR>", desc = "Test Suite" },
+		{ "<leader>tl", ":TestLast<CR>", desc = "Test Last" },
+		{ "<leader>tv", ":TestVisit<CR>", desc = "Test Visit" },
+	},
+	config = function()
+		vim.cmd("let test#strategy = 'vimux'")
+	end,
 }
diff --git a/nvim/lua/plugins/which-key.lua b/nvim/lua/plugins/which-key.lua
index a84bcf1..2e1959d 100644
--- a/nvim/lua/plugins/which-key.lua
+++ b/nvim/lua/plugins/which-key.lua
@@ -22,12 +22,12 @@ return {
 			{ "<leader><space>i", desc = "Show implementation", icon = "󰈇" },
 			{ "<leader><space>r", desc = "Show references", icon = "󰈇" },
 			{ "<leader>P", hidden = true },
-			{ "<leader>S", desc = "Search & Replace" },
+			{ "<leader>S", desc = "Search & Replace (Flash)" },
 			{ "<leader>_", group = "Comments" },
 			{ "<leader>w", desc = "Save", icon = "" },
 			{ "<leader>q", desc = "Quit" },
 			{ "<leader>a", desc = "Dashboard & Outline", icon = "󱥈" },
-			{ "<leader>aA", desc = "Alpha Dashboard", icon = "󱥈" },
+			{ "<leader>aA", desc = "Dashboard", icon = "󱥈" },
 			{ "<leader>c", group = "Copilot & Path", icon = " " },
 			{ "<leader>cc", desc = "Copilot Chat", icon = "" },
 			{ "<leader>cf", desc = "Copy full path", icon = "" },
@@ -42,6 +42,7 @@ return {
 			{ "<leader>fg", desc = "Search (grep)" },
 			{ "<leader>fh", desc = "Help", icon = "󰋖" },
 			{ "<leader>fm", group = "Format" },
+			{ "<leader>ft", desc = "Todo Comments" },
 			{ "<Leader>fz", group = "fzf" },
 			{ "<Leader>fzl", group = "LSP" },
 			{ "<leader>fmt", desc = "Format [LSP]" },