diff --git a/dotfyle.json b/dotfyle.json
index da953c2..e0519de 100644
--- a/dotfyle.json
+++ b/dotfyle.json
@@ -1,137 +1 @@
-{
-  "distribution": "custom",
-  "masonTools": [
-    "bash-language-server",
-    "gopls",
-    "hadolint",
-    "jdtls",
-    "lua-language-server",
-    "pyright",
-    "pyright-langserver",
-    "rubocop",
-    "ruff",
-    "rust-analyzer",
-    "shellcheck",
-    "solargraph",
-    "typescript-language-server",
-    "typos-lsp",
-    "vim-language-server",
-    "vscode-eslint-language-server",
-    "vscode-json-language-server"
-  ],
-  "plugins": [
-    "2kabhishek/markit.nvim",
-    "2kabhishek/nerdy.nvim",
-    "2kabhishek/termim.nvim",
-    "CopilotC-Nvim/CopilotChat.nvim",
-    "Exafunction/codeium.vim",
-    "LudoPinelli/comment-box.nvim",
-    "MunifTanjim/nui.nvim",
-    "RRethy/nvim-treesitter-endwise",
-    "RRethy/nvim-treesitter-textsubjects",
-    "ThePrimeagen/refactoring.nvim",
-    "ThePrimeagen/vim-be-good",
-    "abecodes/tabout.nvim",
-    "akinsho/toggleterm.nvim",
-    "chrisgrieser/nvim-spider",
-    "creativenull/dotfyle-metadata.nvim",
-    "cvigilv/esqueleto.nvim",
-    "debugloop/telescope-undo.nvim",
-    "echasnovski/mini.ai",
-    "echasnovski/mini.surround",
-    "epwalsh/pomo.nvim",
-    "folke/flash.nvim",
-    "folke/lazy.nvim",
-    "folke/lazydev.nvim",
-    "folke/snacks.nvim",
-    "folke/which-key.nvim",
-    "giuxtaposition/blink-cmp-copilot",
-    "iamcco/markdown-preview.nvim",
-    "jay-babu/mason-null-ls.nvim",
-    "lewis6991/gitsigns.nvim",
-    "m4xshen/hardtime.nvim",
-    "mfussenegger/nvim-dap",
-    "michaelb/sniprun",
-    "mistricky/codesnap.nvim",
-    "navarasu/onedark.nvim",
-    "neovim/nvim-lspconfig",
-    "numToStr/Navigator.nvim",
-    "nvchad/showkeys",
-    "nvim-lua/plenary.nvim",
-    "nvim-lualine/lualine.nvim",
-    "nvim-neo-tree/neo-tree.nvim",
-    "nvim-neotest/neotest",
-    "nvim-neotest/neotest-jest",
-    "nvim-neotest/neotest-python",
-    "nvim-neotest/nvim-nio",
-    "nvim-telescope/telescope-file-browser.nvim",
-    "nvim-telescope/telescope-fzf-native.nvim",
-    "nvim-telescope/telescope.nvim",
-    "nvim-treesitter/nvim-treesitter",
-    "nvim-treesitter/nvim-treesitter-refactor",
-    "nvim-treesitter/nvim-treesitter-textobjects",
-    "nvimdev/lspsaga.nvim",
-    "nvimtools/none-ls.nvim",
-    "olimorris/neotest-rspec",
-    "rafamadriz/friendly-snippets",
-    "rcarriga/nvim-dap-ui",
-    "rcarriga/nvim-notify",
-    "ruifm/gitlinker.nvim",
-    "saghen/blink.cmp",
-    "stevearc/dressing.nvim",
-    "tpope/vim-fugitive",
-    "tpope/vim-rails",
-    "uga-rosa/ccc.nvim",
-    "wakatime/vim-wakatime",
-    "weizheheng/ror.nvim",
-    "williamboman/mason-lspconfig.nvim",
-    "williamboman/mason.nvim",
-    "windwp/nvim-autopairs",
-    "windwp/nvim-spectre",
-    "windwp/nvim-ts-autotag",
-    "zapling/mason-lock.nvim",
-    "zbirenbaum/copilot.lua"
-  ],
-  "pluginManager": "lazy.nvim",
-  "treesitterParsers": [
-    "bash",
-    "c",
-    "css",
-    "dart",
-    "elixir",
-    "gitcommit",
-    "go",
-    "html",
-    "java",
-    "javascript",
-    "json",
-    "lua",
-    "markdown",
-    "markdown_inline",
-    "python",
-    "ruby",
-    "rust",
-    "scss",
-    "typescript",
-    "vim",
-    "vimdoc",
-    "yaml"
-  ],
-  "lspServers": [
-    "bashls",
-    "eslint",
-    "gopls",
-    "jdtls",
-    "jsonls",
-    "lua_ls",
-    "pyright",
-    "rubocop",
-    "ruff",
-    "rust_analyzer",
-    "solargraph",
-    "ts_ls",
-    "typos_lsp",
-    "vimls"
-  ],
-  "leaderKey": "<Space>"
-}
+{"distribution": "custom", "masonTools": ["actionlint", "bash-language-server", "beautysh", "black", "clangd", "codespell", "cspell", "debugpy", "debugpy-adapter", "djlint", "docker-langserver", "eslint_d", "gofumpt", "goimports", "golangci-lint", "gopls", "hadolint", "iferr", "isort", "jdtls", "lua-language-server", "markdownlint", "marksman", "phpcs", "prettier", "prettierd", "proselint", "pylint", "pyright", "pyright-langserver", "rubocop", "ruff", "rust-analyzer", "selene", "shellcheck", "shfmt", "solargraph", "stylua", "tailwindcss-language-server", "taplo", "terraform-ls", "tinymist", "trivy", "typescript-language-server", "typos-lsp", "vim-language-server", "vint", "vscode-css-language-server", "vscode-eslint-language-server", "vscode-html-language-server", "vscode-json-language-server", "write-good", "yaml-language-server"], "plugins": ["2kabhishek/markit.nvim", "2kabhishek/nerdy.nvim", "2kabhishek/termim.nvim", "Exafunction/codeium.vim", "LudoPinelli/comment-box.nvim", "RRethy/nvim-treesitter-textsubjects", "ThePrimeagen/refactoring.nvim", "akinsho/toggleterm.nvim", "chrisgrieser/nvim-spider", "creativenull/dotfyle-metadata.nvim", "cvigilv/esqueleto.nvim", "debugloop/telescope-undo.nvim", "echasnovski/mini.ai", "echasnovski/mini.bracketed", "echasnovski/mini.files", "echasnovski/mini.pairs", "echasnovski/mini.surround", "folke/flash.nvim", "folke/lazy.nvim", "folke/lazydev.nvim", "folke/snacks.nvim", "folke/which-key.nvim", "iamcco/markdown-preview.nvim", "jay-babu/mason-null-ls.nvim", "lewis6991/gitsigns.nvim", "michaelb/sniprun", "mistricky/codesnap.nvim", "navarasu/onedark.nvim", "neovim/nvim-lspconfig", "numToStr/Navigator.nvim", "nvim-lua/plenary.nvim", "nvim-lualine/lualine.nvim", "nvim-telescope/telescope-fzf-native.nvim", "nvim-telescope/telescope.nvim", "nvim-tree/nvim-web-devicons", "nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter-refactor", "nvim-treesitter/nvim-treesitter-textobjects", "nvimdev/lspsaga.nvim", "nvimtools/none-ls.nvim", "rafamadriz/friendly-snippets", "ruifm/gitlinker.nvim", "saghen/blink.cmp", "stevearc/dressing.nvim", "tpope/vim-fugitive", "uga-rosa/ccc.nvim", "wakatime/vim-wakatime", "williamboman/mason-lspconfig.nvim", "williamboman/mason.nvim", "windwp/nvim-spectre", "zapling/mason-lock.nvim"], "pluginManager": "lazy.nvim", "treesitterParsers": ["bash", "c", "css", "dart", "elixir", "gitcommit", "go", "html", "java", "javascript", "json", "lua", "markdown", "markdown_inline", "python", "ruby", "rust", "scss", "typescript", "vim", "vimdoc", "yaml"], "lspServers": ["bashls", "clangd", "cssls", "dockerls", "eslint", "gopls", "html", "jdtls", "jsonls", "lua_ls", "marksman", "pyright", "rubocop", "ruff", "rust_analyzer", "solargraph", "tailwindcss", "taplo", "terraformls", "tinymist", "ts_ls", "typos_lsp", "vimls", "yamlls"], "leaderKey": "<Space>"}
\ No newline at end of file
diff --git a/lua/core/keys.lua b/lua/core/keys.lua
index fbc2369..b312698 100644
--- a/lua/core/keys.lua
+++ b/lua/core/keys.lua
@@ -15,8 +15,8 @@ vim.g.maplocalleader = ' '
 -- visual_block_mode = "x", term_mode = "t", command_mode = "c",
 
 -- Comment
-map({ 'n', 'v' }, '<leader>/', 'gcc', { desc = 'Comment toggle', remap = true })
-map({ 'v', 'x' }, '<leader>/', 'gc', { desc = 'Comment toggle', remap = true })
+-- map({ 'n', 'v' }, '<leader>;', 'gcc', { desc = 'Comment toggle', remap = true })
+-- map({ 'v', 'x' }, '<leader>;', 'gc', { desc = 'Comment toggle', remap = true })
 
 -- Able to use semicolon in normal mode
 map('n', ';', ':', { desc = '; Command mode' })
@@ -61,8 +61,8 @@ map('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 map('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 
 -- Move text up and down
-map({ 'v', 'x' }, 'J', ":move '>+1<CR>gv-gv", opts)
-map({ 'v', 'x' }, 'K', ":move '<-2<CR>gv-gv", opts)
+map({ 'v', 'x' }, 'J', ":move '>+1<cr>gv-gv", opts)
+map({ 'v', 'x' }, 'K', ":move '<-2<cr>gv-gv", opts)
 
 -- Clear search, diff update and redraw
 map({ 'i', 'n' }, '<esc>', '<cmd>noh<cr><esc>', { desc = 'Escape and clear hlsearch' })
diff --git a/lua/plugins/lang/lspconfig.lua b/lua/plugins/lang/lspconfig.lua
index 8c99db1..cd865af 100644
--- a/lua/plugins/lang/lspconfig.lua
+++ b/lua/plugins/lang/lspconfig.lua
@@ -9,8 +9,7 @@ end
 
 local default_setup = function(server)
     lspconfig[server].setup({
-        capabilities =
-            require('blink.cmp').get_lsp_capabilities()
+        capabilities = require('blink.cmp').get_lsp_capabilities(),
     })
 end
 
@@ -26,7 +25,6 @@ require('mason-lspconfig').setup({
         default_setup,
         lua_ls = function()
             lspconfig.lua_ls.setup({
-                capabilities = lsp_capabilities,
                 settings = {
                     Lua = {
                         runtime = { version = 'LuaJIT' },
diff --git a/lua/plugins/lang/spider.lua b/lua/plugins/lang/spider.lua
index 5903072..108eb09 100644
--- a/lua/plugins/lang/spider.lua
+++ b/lua/plugins/lang/spider.lua
@@ -4,7 +4,7 @@ spider.setup({
     skipInsignificantPunctuation = true,
 })
 
-vim.keymap.set({ 'n', 'o', 'x' }, 'w', "<cmd>lua require('spider').motion('w')<CR>", { desc = 'Spider-w' })
-vim.keymap.set({ 'n', 'o', 'x' }, 'e', "<cmd>lua require('spider').motion('e')<CR>", { desc = 'Spider-e' })
-vim.keymap.set({ 'n', 'o', 'x' }, 'b', "<cmd>lua require('spider').motion('b')<CR>", { desc = 'Spider-b' })
-vim.keymap.set({ 'n', 'o', 'x' }, 'ge', "<cmd>lua require('spider').motion('ge')<CR>", { desc = 'Spider-ge' })
+vim.keymap.set({ 'n', 'o', 'x' }, 'w', ":lua require('spider').motion('w')<CR>", { desc = 'Spider-w' })
+vim.keymap.set({ 'n', 'o', 'x' }, 'e', ":lua require('spider').motion('e')<CR>", { desc = 'Spider-e' })
+vim.keymap.set({ 'n', 'o', 'x' }, 'b', ":lua require('spider').motion('b')<CR>", { desc = 'Spider-b' })
+vim.keymap.set({ 'n', 'o', 'x' }, 'ge', ":lua require('spider').motion('ge')<CR>", { desc = 'Spider-ge' })
diff --git a/lua/plugins/lock.json b/lua/plugins/lock.json
index e1fc3f0..dee5290 100644
--- a/lua/plugins/lock.json
+++ b/lua/plugins/lock.json
@@ -1,6 +1,6 @@
 {
   "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
-  "blink.cmp": { "branch": "main", "commit": "18b352d12b35bca148427b607098df14b75a218f" },
+  "blink.cmp": { "branch": "main", "commit": "dcda20d3aa345025699a920c45b0a0603551f41d" },
   "ccc.nvim": { "branch": "main", "commit": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed" },
   "codeium.vim": { "branch": "main", "commit": "000de972de76f357c03da14f4f8dd9a969d4fe8c" },
   "codesnap.nvim": { "branch": "main", "commit": "6400480aa6cc366cbd931146c429aaa64680dab9" },
@@ -11,46 +11,46 @@
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
   "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
-  "gitsigns.nvim": { "branch": "main", "commit": "c3070fcc2e7da1798041219fde8d88f2e4bf7eb5" },
+  "gitsigns.nvim": { "branch": "main", "commit": "011dc6718bcebdf92a5336bb0da79189c3afe621" },
   "hardtime.nvim": { "branch": "main", "commit": "5d9adcbe2f12741de79e435c8b85dca69a3b22e4" },
-  "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lspsaga.nvim": { "branch": "main", "commit": "da8a66c53241876bba140980469876db3a183604" },
-  "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
+  "lspsaga.nvim": { "branch": "main", "commit": "6063935cf68de9aa6dd79f8e1caf5df0a9385de3" },
+  "lualine.nvim": { "branch": "master", "commit": "070cd91da2770df7d27d5c49241a8f4697350c6e" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "markit.nvim": { "branch": "main", "commit": "4b6428efa721d420aa1377a30b7608255aa56d3f" },
+  "markit.nvim": { "branch": "main", "commit": "9b031afab214aa6e6467f275f55640989f438925" },
   "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
   "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
-  "mini.bracketed": { "branch": "main", "commit": "95e1023c1734c805ad3b9da364fc3518e0881c70" },
+  "mini.bracketed": { "branch": "main", "commit": "0ec65567ffde0ad4d94d794d55f3b627203b496a" },
   "mini.files": { "branch": "main", "commit": "01001e0cfc1e79f581d055ae3f70fbac96a2f378" },
   "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
   "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
   "neotest": { "branch": "master", "commit": "d66cf4e05a116957f0d3a7755a24291c7d1e1f72" },
-  "nerdy.nvim": { "branch": "main", "commit": "a086fa89a0716d5a45c6c1bd3804e238ac87eaab" },
-  "none-ls.nvim": { "branch": "main", "commit": "f41624ea1a73f020ddbd33438f74abb95ea17d55" },
+  "nerdy.nvim": { "branch": "main", "commit": "14bdcd13265dfc80e6ca6cee0598c5880729e24f" },
+  "none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" },
   "nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1110787f1b464888c59a044c48c5119d14078044" },
+  "nvim-lspconfig": { "branch": "master", "commit": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0" },
   "nvim-spectre": { "branch": "master", "commit": "ddd7383e856a7c939cb4f5143278fe041bbb8cb9" },
-  "nvim-spider": { "branch": "main", "commit": "2b38e3e95e143313d78ca098eeecda7aebfce925" },
-  "nvim-treesitter": { "branch": "master", "commit": "a15dd9280f369fef4640e64de794f69456ecdf7a" },
+  "nvim-spider": { "branch": "main", "commit": "9b9a1cf88a10790de69d3b0562d7d612f23561d5" },
+  "nvim-treesitter": { "branch": "master", "commit": "548ed98f8a0af738d095ef1be5961f41061ed743" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
-  "nvim-treesitter-textsubjects": { "branch": "master", "commit": "9de6c64c41dff29d353ebbedefd033996f29d349" },
-  "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "143856b1cee509a190cc8c17ddb0638002171235" },
+  "nvim-treesitter-textsubjects": { "branch": "master", "commit": "abcbb0e537c9c24800b03b9ca33bee5806604629" },
+  "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" },
   "onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "refactoring.nvim": { "branch": "master", "commit": "74f7aea37b4a5afcab7273f19bff72485c9c5c8a" },
-  "snacks.nvim": { "branch": "main", "commit": "956fe69df328d2da924a04061802fb7d2ec5fef6" },
+  "refactoring.nvim": { "branch": "master", "commit": "36bd14ddd7ebf0546c15e6088e8bc93f8a98787d" },
+  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "sniprun": { "branch": "master", "commit": "151ada2c984aee1feb45c7e3c2abb19f597ecbd0" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "termim.nvim": { "branch": "main", "commit": "3e6aca613bb16dda69633f37d2da17c383eeec9f" },
+  "termim.nvim": { "branch": "main", "commit": "6bb3f8fb5a3c64ca614d7c4782d4965863c41675" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
   "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
   "vim-wakatime": { "branch": "master", "commit": "e46d7c4f98ee0f40782008dd60cb2a79c377fb1d" },
-  "which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" }
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
diff --git a/lua/plugins/tools/gitsigns.lua b/lua/plugins/tools/gitsigns.lua
index ed9c4aa..54b6c91 100644
--- a/lua/plugins/tools/gitsigns.lua
+++ b/lua/plugins/tools/gitsigns.lua
@@ -58,6 +58,6 @@ gitsigns.setup({
             return '<Ignore>'
         end, { expr = true, desc = 'Prev Change' })
 
-        map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+        map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<cr>')
     end,
 })
diff --git a/lua/plugins/tools/spectre.lua b/lua/plugins/tools/spectre.lua
index 6808f38..5100d02 100644
--- a/lua/plugins/tools/spectre.lua
+++ b/lua/plugins/tools/spectre.lua
@@ -10,47 +10,47 @@ spectre.setup({
     mapping = {
         ['toggle_line'] = {
             map = 't',
-            cmd = "<cmd>lua require('spectre').toggle_line()<CR>",
+            cmd = ":lua require('spectre').toggle_line()<cr>",
             desc = 'toggle current item',
         },
         ['enter_file'] = {
             map = '<cr>',
-            cmd = "<cmd>lua require('spectre.actions').select_entry()<CR>",
+            cmd = ":lua require('spectre.actions').select_entry()<cr>",
             desc = 'goto current file',
         },
         ['send_to_qf'] = {
             map = 'Q',
-            cmd = "<cmd>lua require('spectre.actions').send_to_qf()<CR>",
+            cmd = ":lua require('spectre.actions').send_to_qf()<cr>",
             desc = 'send all item to quickfix',
         },
         ['replace_cmd'] = {
             map = 'c',
-            cmd = "<cmd>lua require('spectre.actions').replace_cmd()<CR>",
+            cmd = ":lua require('spectre.actions').replace_cmd()<cr>",
             desc = 'input replace vim command',
         },
         ['show_option_menu'] = {
             map = 'o',
-            cmd = "<cmd>lua require('spectre').show_options()<CR>",
+            cmd = ":lua require('spectre').show_options()<cr>",
             desc = 'show option',
         },
         ['run_replace'] = {
             map = 'R',
-            cmd = "<cmd>lua require('spectre.actions').run_replace()<CR>",
+            cmd = ":lua require('spectre.actions').run_replace()<cr>",
             desc = 'replace all',
         },
         ['change_view_mode'] = {
             map = 'm',
-            cmd = "<cmd>lua require('spectre').change_view()<CR>",
+            cmd = ":lua require('spectre').change_view()<cr>",
             desc = 'change result view mode',
         },
         ['toggle_ignore_case'] = {
             map = 'I',
-            cmd = "<cmd>lua require('spectre').change_options('ignore-case')<CR>",
+            cmd = ":lua require('spectre').change_options('ignore-case')<cr>",
             desc = 'toggle ignore case',
         },
         ['toggle_ignore_hidden'] = {
             map = 'H',
-            cmd = "<cmd>lua require('spectre').change_options('hidden')<CR>",
+            cmd = ":lua require('spectre').change_options('hidden')<cr>",
             desc = 'toggle search hidden',
         },
     },
diff --git a/lua/plugins/tools/which-key.lua b/lua/plugins/tools/which-key.lua
index a61912a..e039155 100644
--- a/lua/plugins/tools/which-key.lua
+++ b/lua/plugins/tools/which-key.lua
@@ -1,5 +1,7 @@
 local which_key = require('which-key')
 local icons = require('lib.icons')
+local Snacks = require('snacks')
+local util = require('lib.util')
 
 local setup = {
     preset = 'helix',
@@ -39,34 +41,25 @@ local setup = {
 
 local normal_mappings = {
     mode = 'n',
-
-    { '<leader>b', group = ' Debug' },
-    { '<leader>bO', '<cmd>DapStepOut<cr>', desc = 'Out' },
-    { '<leader>bR', '<cmd>DapRestartFrame<cr>', desc = 'Restart Frame' },
-    { '<leader>bb', '<cmd>DapToggleBreakpoint<cr>', desc = 'Breakpoint' },
-    { '<leader>bc', '<cmd>DapContinue<cr>', desc = 'Continue' },
-    { '<leader>bi', '<cmd>DapStepInto<cr>', desc = 'Into' },
-    { '<leader>bl', "<cmd>lua require'dap'.run_last()<cr>", desc = 'Last' },
-    { '<leader>bo', '<cmd>DapStepOver<cr>', desc = 'Over' },
-    { '<leader>br', '<cmd>DapToggleRepl<cr>', desc = 'Repl' },
-    { '<leader>bt', '<cmd>DapUIToggle<cr>', desc = 'Debugger' },
-    { '<leader>bx', '<cmd>DapTerminate<cr>', desc = 'Exit' },
+    { '<leader><space>', ':lua Snacks.picker.smart()<cr>', desc = 'Smart Find Files' },
+    { '<leader>,', ':lua Snacks.picker.buffers()<cr>', desc = 'Buffers' },
+    { '<leader>/', ':lua Snacks.picker.search_history()<cr>', desc = 'Search History' },
+    { '<leader>:', ':lua Snacks.picker.command_history()<cr>', desc = 'Command History' },
+    { '<leader>x', ':x<cr>', desc = ' Save and Quit' },
 
     { '<leader>c', group = ' Code' },
-    { '<leader>cF', '<cmd>retab<cr>', desc = 'Fix Tabs' },
-    { '<leader>cP', '<cmd>CccConvert<cr>', desc = 'Convert Color' },
-    { '<leader>cR', '<cmd>ReloadConfig<cr>', desc = 'Reload Configs' },
-    { '<leader>cc', '<cmd>CccHighlighterToggle<cr>', desc = 'Highlight Colors' },
-    { '<leader>cd', '<cmd>RootDir<cr>', desc = 'Root Directory' },
-    { '<leader>ce', '<cmd>%SnipRun<cr>', desc = 'Execute File' },
-    { '<leader>cf', '<cmd>lua vim.lsp.buf.format({async = true})<cr>', desc = 'Format File' },
-    { '<leader>cl', '<cmd>:g/^\\s*$/d<cr>', desc = 'Clean Empty Lines' },
-    { '<leader>cm', '<cmd>MarkdownPreviewToggle<cr>', desc = 'Markdown Preview' },
-    { '<leader>cn', '<cmd>lua require("snacks").notifier.show_history()<cr>', desc = 'Notifications' },
-    { '<leader>co', '<cmd>Dashboard<cr>', desc = 'Dashboard' },
-    { '<leader>cp', '<cmd>CccPick<cr>', desc = 'Pick Color' },
-    { '<leader>cr', '<cmd>Telescope reloader<cr>', desc = 'Reload Module' },
-    { '<leader>cs', '<cmd>source %<cr>', desc = 'Source File' },
+    { '<leader>cF', ':retab<cr>', desc = 'Fix Tabs' },
+    { '<leader>cP', ':CccConvert<cr>', desc = 'Convert Color' },
+    { '<leader>cR', ':ReloadConfig<cr>', desc = 'Reload Configs' },
+    { '<leader>cc', ':CccHighlighterToggle<cr>', desc = 'Highlight Colors' },
+    { '<leader>cd', ':RootDir<cr>', desc = 'Root Directory' },
+    { '<leader>ce', ':%SnipRun<cr>', desc = 'Execute File' },
+    { '<leader>cf', ':lua vim.lsp.buf.format({async = true})<cr>', desc = 'Format File' },
+    { '<leader>cl', '::g/^\\s*$/d<cr>', desc = 'Clean Empty Lines' },
+    { '<leader>cm', ':MarkdownPreviewToggle<cr>', desc = 'Markdown Preview' },
+    { '<leader>co', ':Dashboard<cr>', desc = 'Dashboard' },
+    { '<leader>cp', ':CccPick<cr>', desc = 'Pick Color' },
+    { '<leader>cs', ':source %<cr>', desc = 'Source File' },
 
     { '<leader>C', group = ' Comment' },
     { '<leader>Cb', '<cmd>CBccbox<CR>', desc = 'Comment Box' },
@@ -76,281 +69,251 @@ local normal_mappings = {
     { '<leader>Cc', '<cmd>CBcatalog<CR>', desc = 'Catalog' },
     { '<leader>Cd', '<cmd>CBd<CR>', desc = 'Delete Comment Style' },
 
-    { '<leader>d', group = ' Database' },
-    { '<leader>dS', '<cmd>lua require("dbee").store("json", "buffer", { extra_arg = 0 })<cr>', desc = 'To JSON' },
-    { '<leader>db', '<cmd>DBToggle<cr>', desc = 'DB Explorer' },
-    { '<leader>dj', '<cmd>lua require("dbee").next()<cr>', desc = 'DB Next' },
-    { '<leader>dk', '<cmd>lua require("dbee").prev()<cr>', desc = 'DB Prev' },
-    { '<leader>ds', '<cmd>lua require("dbee").store("csv", "buffer", { extra_arg = 0 })<cr>', desc = 'To CSV' },
-    { '<leader>dt', '<cmd>lua require("dbee").store("table", "buffer", { extra_arg = 0 })<cr>', desc = 'To Table' },
-
     { '<leader>e', group = ' Edit' },
-    { '<leader>ea', '<cmd>b#<cr>', desc = 'Alternate File' },
-
+    { '<leader>ea', ':b#<cr>', desc = 'Alternate File' },
     { '<leader>ec', group = 'Edit Configs' },
-    { '<leader>eca', '<cmd>e ~/dotfiles/zsh/aliases.zsh<cr>', desc = 'Shell Aliases' },
-    {
-        '<leader>ecc',
-        '<cmd>lua require("telescope.builtin").find_files({cwd = vim.fn.stdpath("config")})<cr>',
-        desc = 'Neovim Configs',
-    },
-    {
-        '<leader>ecd',
-        '<cmd>lua require("telescope.builtin").find_files({cwd = vim.fn.expand("$DOTS_DIR")})<cr>',
-        desc = 'Dotfiles',
-    },
-    { '<leader>ecg', '<cmd>e ~/.gitconfig<cr>', desc = 'Git Config' },
-    { '<leader>eck', '<cmd>e ~/.config/kitty/kitty.conf<cr>', desc = 'Kitty Config' },
-    { '<leader>ecn', '<cmd>e $MYVIMRC<cr>', desc = 'Neovim Init' },
-    { '<leader>ecp', '<cmd>e ~/dotfiles/nvim/lua/plugins/list.lua<cr>', desc = 'Plugin List' },
-    { '<leader>ect', '<cmd>e ~/dotfiles/tmux/tmux.conf<cr>', desc = 'Tmux Config' },
-    { '<leader>eF', 'gf', desc = 'File Under Cursor' },
-    { '<leader>em', '<cmd>e README.md<cr>', desc = 'Readme' },
-    { '<leader>en', '<cmd>enew<cr>', desc = 'New File' },
+    { '<leader>ecc', ':lua Snacks.picker.files({ cwd = vim.fn.stdpath("config") })<cr>', desc = 'Neovim Configs' },
+    { '<leader>ecg', ':e ~/.gitconfig<cr>', desc = 'Git Config' },
+    { '<leader>eck', ':e ~/dotfiles/kitty/kitty.conf<cr>', desc = 'Kitty Config' },
+    { '<leader>ecn', ':e $MYVIMRC<cr>', desc = 'Neovim Init' },
+    { '<leader>ecp', ':e ~/dotfiles/nvim/lua/plugins/list.lua<cr>', desc = 'Plugin List' },
+    { '<leader>ect', ':e ~/dotfiles/tmux/tmux.conf<cr>', desc = 'Tmux Config' },
+    { '<leader>ecv', ':e ~/.vimrc<cr>', desc = 'Vim Config' },
+    { '<leader>ecz', ':e $ZDOTDIR/.zshrc<cr>', desc = 'Zsh Config' },
+    { '<leader>ecZ', ':e $ZDOTDIR/prompt/init.zsh<cr>', desc = 'Zsh Prompt Config' },
+    { '<leader>ee', ':lua MiniFiles.open()<cr>', desc = 'Explore Tree' },
+    { '<leader>eE', ':lua Snacks.explorer()<cr>', desc = 'File Explorer' },
+    { '<leader>ef', 'gf', desc = 'File Under Cursor' },
+    { '<leader>em', ':e README.md<cr>', desc = 'Readme' },
+    { '<leader>en', ':enew<cr>', desc = 'New File' },
 
     { '<leader>f', group = ' Find' },
-    { '<leader>fa', '<cmd>Telescope find_files<cr>', desc = 'All Files' },
-    { '<leader>fc', '<cmd>Telescope git_bcommits<cr>', desc = 'File Commits' },
-    { '<leader>ff', '<cmd>Telescope git_files<cr>', desc = 'Find files' },
-    {
-        '<leader>fg',
-        '<cmd>lua require("plugins.tools.telescope-custom").multi_grep()<cr>',
-        desc = 'Find Text',
-    },
-    { '<leader>fj', '<cmd>Telescope buffers<cr>', desc = 'Buffers' },
-    { '<leader>fl', '<cmd>Telescope loclist<cr>', desc = 'Location List' },
-    { '<leader>fm', '<cmd>Telescope git_status<cr>', desc = 'Modified files' },
-    { '<leader>fo', '<cmd>Telescope live_grep grep_open_files=true<cr>', desc = 'Find in Open Files' },
-    { '<leader>fp', '<cmd>Telescope resume<cr>', desc = 'Last Search' },
-    {
-        '<leader>fP',
-        '<cmd>lua require("telescope.builtin").find_files({cwd = vim.fs.joinpath(vim.fn.stdpath("data"), "lazy")})<cr>',
-        desc = 'Plugin Files',
-    },
-    { '<leader>fq', '<cmd>Telescope quickfix<cr>', desc = 'Quickfix' },
-    { '<leader>fr', '<cmd>Telescope oldfiles<cr>', desc = 'Recent Files' },
-    { '<leader>fs', '<cmd>Telescope current_buffer_fuzzy_find<cr>', desc = 'Fuzzy Find in File' },
-    { '<leader>ft', '<cmd>Telescope<cr>', desc = 'Panel' },
-    { '<leader>fu', '<cmd>Telescope undo<cr>', desc = 'Undo History' },
-    { '<leader>fw', '<cmd>Telescope grep_string<cr>', desc = 'Find Word' },
+    { '<leader>fa', ':lua Snacks.picker.files()<cr>', desc = 'Find Files' },
+    { '<leader>fb', ':lua Snacks.picker.buffers()<cr>', desc = 'Buffers' },
+    { '<leader>fc', ':lua Snacks.picker.git_log_file()<cr>', desc = 'File Commits' },
+    { '<leader>fd', ':lua Snacks.picker.projects()<cr>', desc = 'Project Dirs' },
+    { '<leader>ff', ':lua Snacks.picker.git_files()<cr>', desc = 'Find Git Files' },
+    { '<leader>fg', ':lua Snacks.picker.grep()<cr>', desc = 'Grep' },
+    { '<leader>fl', ':lua Snacks.picker.loclist()<cr>', desc = 'Location List' },
+    { '<leader>fm', ':lua Snacks.picker.git_status()<cr>', desc = 'Modified Files' },
+    { '<leader>fo', ':lua Snacks.picker.grep_buffers()<cr>', desc = 'Grep Open Buffers' },
+    { '<leader>fp', ':lua Snacks.picker.resume()<cr>', desc = 'Previous Picker' },
+    { '<leader>fq', ':lua Snacks.picker.qflist()<cr>', desc = 'Quickfix List' },
+    { '<leader>fr', ':lua Snacks.picker.recent()<cr>', desc = 'Recent' },
+    { '<leader>fs', ':lua Snacks.picker.lines()<cr>', desc = 'Buffer Lines' },
+    { '<leader>ft', ':lua Snacks.picker.pickers()<cr>', desc = 'All Pickers' },
+    { '<leader>fu', ':lua Snacks.picker.undo()<cr>', desc = 'Undo History' },
+    { '<leader>fw', ':lua Snacks.picker.grep_word()<cr>', desc = 'Word Grep' },
+    { '<leader>fz', ':lua Snacks.picker.zoxide()<cr>', desc = 'Zoxide' },
 
     { '<leader>g', group = ' Git' },
-    { '<leader>gA', '<cmd>Gitsigns stage_buffer<cr>', desc = 'Stage Buffer' },
-    { '<leader>gP', '<cmd>Git push<cr>', desc = 'Push' },
-    { '<leader>gR', '<cmd>Gitsigns reset_buffer<cr>', desc = 'Reset Buffer' },
-    { '<leader>gS', '<cmd>Telescope git_stash<cr>', desc = 'Stashed Changes' },
-    { '<leader>ga', '<cmd>Gitsigns stage_hunk<cr>', desc = 'Stage Hunk' },
-    { '<leader>gb', "<cmd>lua require('gitsigns').blame_line({full = true})<cr>", desc = 'Blame' },
-    { '<leader>gB', "<cmd>lua require('snacks').git.blame_line()<cr>", desc = 'Detailed Blame' },
-    { '<leader>gc', '<cmd>Telescope git_commits<cr>', desc = 'Find Commits' },
-    { '<leader>gd', '<cmd>Gitsigns diffthis HEAD<cr>', desc = 'Diff' },
-    { '<leader>gf', '<cmd>Git<cr>', desc = 'Fugitive Panel' },
-    { '<leader>gg', '<cmd>lua require("snacks").lazygit()<cr>', desc = 'Lazygit' },
-    { '<leader>gi', '<cmd>Gitsigns preview_hunk<cr>', desc = 'Hunk Info' },
-    { '<leader>gj', '<cmd>Gitsigns next_hunk<cr>', desc = 'Next Hunk' },
-    { '<leader>gk', '<cmd>Gitsigns prev_hunk<cr>', desc = 'Prev Hunk' },
-    { '<leader>gl', '<cmd>lua require("snacks").lazygit.log()<cr>', desc = 'Lazygit Log' },
-    { '<leader>gL', '<cmd>Git log<cr>', desc = 'Log' },
+    { '<leader>gA', ':Gitsigns stage_buffer<cr>', desc = 'Stage Buffer' },
+    { '<leader>gC', ':CoAuthor<cr>', desc = 'Co-Authors' },
+    { '<leader>gP', ':Git push<cr>', desc = 'Push' },
+    { '<leader>gR', ':Gitsigns reset_buffer<cr>', desc = 'Reset Buffer' },
+    { '<leader>ga', ':Gitsigns stage_hunk<cr>', desc = 'Stage Hunk' },
+    { '<leader>gb', ":lua require('gitsigns').blame_line({full = true})<cr>", desc = 'Blame' },
+    { '<leader>gB', ":lua require('snacks').git.blame_line()<cr>", desc = 'Detailed Blame' },
+    { '<leader>gd', ':Gitsigns diffthis HEAD<cr>', desc = 'Git Diff' },
+    { '<leader>gF', ':Git<cr>', desc = 'Fugitive Panel' },
+    { '<leader>gg', ':lua require("snacks").lazygit()<cr>', desc = 'Lazygit' },
+    { '<leader>gi', ':Gitsigns preview_hunk<cr>', desc = 'Hunk Info' },
+    { '<leader>gj', ':Gitsigns next_hunk<cr>', desc = 'Next Hunk' },
+    { '<leader>gk', ':Gitsigns prev_hunk<cr>', desc = 'Prev Hunk' },
+    { '<leader>gl', ':lua Snacks.picker.git_log_line()<cr>', desc = 'Git Log Line' },
+    { '<leader>gL', ':lua Snacks.picker.git_log()<cr>', desc = 'Git Log' },
     { '<leader>go', group = 'Octohub' },
-    { '<leader>gp', '<cmd>Git pull<cr>', desc = 'Pull' },
-    { '<leader>gr', '<cmd>Gitsigns reset_hunk<cr>', desc = 'Reset Hunk' },
-    { '<leader>gs', '<cmd>Telescope git_branches<cr>', desc = 'Switch Branch' },
+    { '<leader>gp', ':Git pull<cr>', desc = 'Pull' },
+    { '<leader>gr', ':Gitsigns reset_hunk<cr>', desc = 'Reset Hunk' },
+    { '<leader>gs', ':lua Snacks.picker.git_branches()<cr>', desc = 'Git Branches' },
+    { '<leader>gS', ':lua Snacks.picker.git_stash()<cr>', desc = 'Git Stash' },
     { '<leader>gt', group = 'Toggle' },
-    { '<leader>gtb', '<cmd>Gitsigns toggle_current_line_blame<cr>', desc = 'Blame' },
-    { '<leader>gtd', '<cmd>Gitsigns toggle_deleted<cr>', desc = 'Deleted' },
-    { '<leader>gtl', '<cmd>Gitsigns toggle_linehl<cr>', desc = 'Line HL' },
-    { '<leader>gtn', '<cmd>Gitsigns toggle_numhl<cr>', desc = 'Number HL' },
-    { '<leader>gts', '<cmd>Gitsigns toggle_signs<cr>', desc = 'Signs' },
-    { '<leader>gtw', '<cmd>Gitsigns toggle_word_diff<cr>', desc = 'Word Diff' },
-    { '<leader>gu', '<cmd>Gitsigns undo_stage_hunk<cr>', desc = 'Undo Stage Hunk' },
-    { '<leader>gv', '<cmd>Gitsigns select_hunk<cr>', desc = 'Select Hunk' },
-    { '<leader>gw', '<cmd>lua require("snacks").gitbrowse()<cr>', desc = 'Git Browse' },
-
-    { '<leader>h', group = ' Help' },
-    { '<leader>hh', '<cmd>Telescope help_tags<cr>', desc = 'Help Pages' },
-    { '<leader>hi', 'vim.show_pos', desc = 'Inspect Position' },
-    { '<leader>hk', '<cmd>Lspsaga hover_doc<cr>', desc = 'Hover Doc' },
-    { '<leader>hm', '<cmd>Telescope man_pages<cr>', desc = 'Man Pages' },
+    { '<leader>gtb', ':Gitsigns toggle_current_line_blame<cr>', desc = 'Blame' },
+    { '<leader>gtd', ':Gitsigns toggle_deleted<cr>', desc = 'Deleted' },
+    { '<leader>gtl', ':Gitsigns toggle_linehl<cr>', desc = 'Line HL' },
+    { '<leader>gtn', ':Gitsigns toggle_numhl<cr>', desc = 'Number HL' },
+    { '<leader>gts', ':Gitsigns toggle_signs<cr>', desc = 'Signs' },
+    { '<leader>gtw', ':Gitsigns toggle_word_diff<cr>', desc = 'Word Diff' },
+    { '<leader>gu', ':Gitsigns undo_stage_hunk<cr>', desc = 'Undo Stage Hunk' },
+    { '<leader>gv', ':Gitsigns select_hunk<cr>', desc = 'Select Hunk' },
+    { '<leader>gw', ':lua require("snacks").gitbrowse()<cr>', desc = 'Git Browse' },
 
     { '<leader>i', group = ' Insert' },
-    { '<leader>iP', '<cmd>put %:p<cr>', desc = 'Absolute Path' },
-    { '<leader>id', "<cmd>put =strftime('## %a, %d %b, %Y, %r')<cr>", desc = 'Date' },
-    { '<leader>if', "<cmd>put =expand('%:t')<cr>", desc = 'File Name' },
-    { '<leader>in', '<cmd>Nerdy<cr>', desc = 'Nerd Glyphs' },
-    { '<leader>ip', '<cmd>put %<cr>', desc = 'Relative Path' },
-    { '<leader>ir', '<cmd>Telescope registers<cr>', desc = 'Registers' },
-    { '<leader>it', "<cmd>put =strftime('## %r')<cr>", desc = 'Time' },
+    { '<leader>id', ":put =strftime('## %a, %d %b, %Y, %r')<cr>", desc = 'Date' },
+    { '<leader>if', ":put =expand('%:t')<cr>", desc = 'File Name' },
+    { '<leader>ii', ':lua Snacks.picker.icons()<cr>', desc = 'Icons' },
+    { '<leader>in', ':Nerdy<cr>', desc = 'Nerd Glyphs' },
+    { '<leader>ip', ':put %<cr>', desc = 'Relative Path' },
+    { '<leader>iP', ':put %:p<cr>', desc = 'Absolute Path' },
+    { '<leader>ir', ':lua Snacks.picker.registers()<cr>', desc = 'Registers' },
+    { '<leader>it', ":put =strftime('## %r')<cr>", desc = 'Time' },
+    { '<leader>iv', ':lua Snacks.picker.cliphist()<cr>', desc = 'Clipboard' },
 
     { '<leader>j', group = ' Jump' },
-    {
-        '<leader>jN',
-        "<cmd>lua require('flash').jump({search = { forward = false, wrap = false, multi_window = false },})<cr>",
-        desc = 'Search Backward',
-    },
     { '<leader>jc', '*', desc = 'Word' },
-    { '<leader>jd', '<cmd>FlashDiagnostics<cr>', desc = 'Diagnostics' },
-    { '<leader>jf', '<cmd>Telescope jumplist<cr>', desc = 'Jumplist' },
+    { '<leader>jd', ':FlashDiagnostics<cr>', desc = 'Diagnostics' },
+    { '<leader>jf', ':lua Snacks.picker.jumps()<cr>', desc = 'Jumps' },
     { '<leader>jh', '<C-o>', desc = 'Backward' },
-    { '<leader>jj', "<cmd>lua require('flash').remote()<cr>", desc = 'Remote' },
-    { '<leader>jk', "<cmd>lua require('flash').treesitter()<cr>", desc = 'Treesitter' },
+    { '<leader>jj', ":lua require('flash').remote()<cr>", desc = 'Remote' },
+    { '<leader>jk', ":lua require('flash').treesitter()<cr>", desc = 'Treesitter' },
     { '<leader>jl', '<C-i>', desc = 'Forward' },
+    { '<leader>jp', ":lua require('flash').jump({continue = true})<cr>", desc = 'Previous Jump' },
+    { '<leader>js', ":lua require('flash').jump()<cr>", desc = 'Search' },
+    { '<leader>jt', ":lua require('flash').treesitter_search()<cr>", desc = 'Remote Treesitter' },
     {
         '<leader>jn',
-        "<cmd>lua require('flash').jump({search = { forward = true, wrap = false, multi_window = false },})<cr>",
+        ":lua require('flash').jump({search = { forward = true, wrap = false, multi_window = false },})<cr>",
         desc = 'Search Forward',
     },
-    { '<leader>jp', "<cmd>lua require('flash').jump({continue = true})<cr>", desc = 'Previous Jump' },
-    { '<leader>js', "<cmd>lua require('flash').jump()<cr>", desc = 'Search' },
-    { '<leader>jt', "<cmd>lua require('flash').treesitter_search()<cr>", desc = 'Remote Treesitter' },
+    {
+        '<leader>jN',
+        ":lua require('flash').jump({search = { forward = false, wrap = false, multi_window = false },})<cr>",
+        desc = 'Search Backward',
+    },
     {
         '<leader>jw',
-        '<cmd>lua require("flash").jump({ pattern = vim.fn.expand("<cword>")})<cr>',
+        ':lua require("flash").jump({ pattern = vim.fn.expand("<cword>")})<cr>',
         desc = 'Current Word',
     },
 
-    { '<leader>k', group = ' Keys' },
-    { '<leader>kc', '<cmd>Telescope commands<cr>', desc = 'Commands' },
-    { '<leader>kh', '<cmd>Telescope command_history<cr>', desc = 'Command History' },
-    { '<leader>kk', '<cmd>Telescope keymaps<cr>', desc = 'Keymaps' },
-    { '<leader>ks', '<cmd>Telescope search_history<cr>', desc = 'Search History' },
-
     { '<leader>l', group = ' LSP' },
-    { '<leader>lF', '<cmd>Telescope lsp_references layout_strategy=vertical<cr>', desc = 'References' },
-    { '<leader>lL', '<cmd>Lspsaga show_workspace_diagnostics<cr>', desc = 'Workspace Diagnostics' },
-    { '<leader>lP', '<cmd>Telescope lsp_outgoing_calls<cr>', desc = 'Outgoing Calls' },
-    { '<leader>lQ', '<cmd>LspRestart<cr>', desc = 'Restart LSP' },
-    { '<leader>lR', '<cmd>Lspsaga project_replace<cr>', desc = 'Replace' },
-    { '<leader>lS', '<cmd>Telescope lsp_dynamic_workspace_symbols<cr>', desc = 'Workspace Symbols' },
-    { '<leader>lT', '<cmd>Lspsaga goto_type_definition<cr>', desc = 'Goto Type Definition' },
-    { '<leader>la', '<cmd>Lspsaga code_action<cr>', desc = 'Code Action' },
-    { '<leader>ld', '<cmd>Lspsaga peek_definition<cr>', desc = 'Peek Definition' },
-    { '<leader>lf', '<cmd>Lspsaga finder<cr>', desc = 'Finder' },
-    { '<leader>lg', '<cmd>Lspsaga goto_definition<cr>', desc = 'Goto Definition' },
-    { '<leader>lh', '<cmd>Lspsaga hover_doc<cr>', desc = 'Hover' },
-    { '<leader>li', '<cmd>LspInfo<cr>', desc = 'LSP Info' },
-    { '<leader>lj', '<cmd>Lspsaga diagnostic_jump_next<cr>', desc = 'Next Diagnostic' },
-    { '<leader>lk', '<cmd>Lspsaga diagnostic_jump_prev<cr>', desc = 'Prev Diagnostic' },
-    { '<leader>ll', '<cmd>Telescope diagnostics layout_strategy=vertical<cr>', desc = 'File Diagnostics' },
-    { '<leader>lo', '<cmd>Lspsaga outline<cr>', desc = 'Outline' },
-    { '<leader>lp', '<cmd>Telescope lsp_incoming_calls<cr>', desc = 'Incoming Calls' },
-    { '<leader>lq', '<cmd>LspStop<cr>', desc = 'Stop LSP' },
-    { '<leader>lr', '<cmd>Lspsaga rename<cr>', desc = 'Rename' },
-    { '<leader>ls', '<cmd>Telescope lsp_document_symbols theme=get_ivy<cr>', desc = 'Document Symbols' },
-    { '<leader>lt', '<cmd>Lspsaga peek_type_definition<cr>', desc = 'Peek Type Definition' },
+    { '<leader>la', ':Lspsaga code_action<cr>', desc = 'Code Action' },
+    { '<leader>ld', ':Lspsaga goto_definition<cr>', desc = 'Goto Definition' },
+    { '<leader>lD', ':Lspsaga peek_definition<cr>', desc = 'Peek Definition' },
+    { '<leader>lf', ':Lspsaga finder<cr>', desc = 'Finder' },
+    { '<leader>lF', ':lua Snacks.picker.lsp_references()<cr>', desc = 'References' },
+    { '<leader>lh', ':Lspsaga hover_doc<cr>', desc = 'Hover' },
+    { '<leader>li', ':lua Snacks.picker.lsp_implementations()<cr>', desc = 'Goto Implementation' },
+    { '<leader>lI', ':LspInfo<cr>', desc = 'LSP Info' },
+    { '<leader>lj', ':Lspsaga diagnostic_jump_next<cr>', desc = 'Next Diagnostic' },
+    { '<leader>ll', ':lua Snacks.picker.diagnostics_buffer()<cr>', desc = 'Buffer Diagnostics' },
+    { '<leader>lL', ':lua Snacks.picker.diagnostics()<cr>', desc = 'Diagnostics' },
+    { '<leader>lk', ':Lspsaga diagnostic_jump_prev<cr>', desc = 'Prev Diagnostic' },
+    { '<leader>lo', ':Lspsaga outline<cr>', desc = 'Outline' },
+    { '<leader>lp', ':lua Snacks.picker.lsp_declarations()<cr>', desc = 'Goto Definition' },
+    { '<leader>lq', ':LspStop<cr>', desc = 'Stop LSP' },
+    { '<leader>lQ', ':LspRestart<cr>', desc = 'Restart LSP' },
+    { '<leader>lr', ':Lspsaga rename<cr>', desc = 'Rename' },
+    { '<leader>lR', ':Lspsaga project_replace<cr>', desc = 'Replace' },
+    { '<leader>ls', ':lua Snacks.picker.lsp_symbols()<cr>', desc = 'Symbols' },
+    { '<leader>lS', ':lua Snacks.picker.lsp_workspace_symbols()<cr>', desc = 'Workspace Symbols' },
+    { '<leader>lt', ':Lspsaga goto_type_definition<cr>', desc = 'Goto Type Definition' },
+    { '<leader>lT', ':Lspsaga peek_type_definition<cr>', desc = 'Peek Type Definition' },
 
     { '<leader>m', group = ' Marks' },
-    { '<leader>m1', "<cmd>lua require('markit').toggle_bookmark1()<cr>", desc = 'Toggle Bookmark 0' },
-    { '<leader>m2', "<cmd>lua require('markit').toggle_bookmark2()<cr>", desc = 'Toggle Bookmark 2' },
-    { '<leader>m3', "<cmd>lua require('markit').toggle_bookmark3()<cr>", desc = 'Toggle Bookmark 3' },
-    { '<leader>m4', "<cmd>lua require('markit').toggle_bookmark4()<cr>", desc = 'Toggle Bookmark 4' },
-    { '<leader>mD', "<cmd>lua require('markit').delete_buf()<cr>", desc = 'Delete Buffer' },
-    { '<leader>mP', "<cmd>lua require('markit').preview()<cr>", desc = 'Preview' },
     {
         '<leader>mb',
-        "<cmd>lua require('telescope').extensions.markit_nvim.bookmarks_list_all()<cr>",
+        ":lua require('telescope').extensions.markit.bookmarks_list_all()<cr>",
         desc = 'Bookmarks',
     },
-    { '<leader>md', "<cmd>lua require('markit').delete_line()<cr>", desc = 'Delete Line' },
-    { '<leader>mh', "<cmd>lua require('markit').next_bookmark()<cr>", desc = 'Next Bookmark' },
-    { '<leader>mj', "<cmd>lua require('markit').next()<cr>", desc = 'Next' },
-    { '<leader>mk', "<cmd>lua require('markit').prev()<cr>", desc = 'Previous' },
-    { '<leader>ml', "<cmd>lua require('markit').prev_bookmark()<cr>", desc = 'Previous Bookmark' },
-    { '<leader>mm', '<cmd>Telescope markit<cr>', desc = 'All Marks' },
-    { '<leader>mn', group = 'Next Bookmark Group' },
-    { '<leader>mn1', "<cmd>lua require('markit').next_bookmark1()<cr>", desc = 'Next Bookmark 1' },
-    { '<leader>mn2', "<cmd>lua require('markit').next_bookmark2()<cr>", desc = 'Next Bookmark 2' },
-    { '<leader>mn3', "<cmd>lua require('markit').next_bookmark3()<cr>", desc = 'Next Bookmark 3' },
-    { '<leader>mn4', "<cmd>lua require('markit').next_bookmark4()<cr>", desc = 'Next Bookmark 4' },
-    { '<leader>mp', group = 'Previous Bookmark Group' },
-    { '<leader>mp1', "<cmd>lua require('markit').prev_bookmark1()<cr>", desc = 'Previous Bookmark 1' },
-    { '<leader>mp2', "<cmd>lua require('markit').prev_bookmark2()<cr>", desc = 'Previous Bookmark 2' },
-    { '<leader>mp3', "<cmd>lua require('markit').prev_bookmark3()<cr>", desc = 'Previous Bookmark 3' },
-    { '<leader>mp4', "<cmd>lua require('markit').prev_bookmark4()<cr>", desc = 'Previous Bookmark 4' },
-    { '<leader>ms', "<cmd>lua require('markit').set_next()<cr>", desc = 'Set Next' },
-    { '<leader>mt', "<cmd>lua require('markit').toggle()<cr>", desc = 'Toggle' },
-    { '<leader>mx', "<cmd>lua require('markit').delete_bookmark()<cr>", desc = 'Delete Bookmark' },
+    {
+        '<leader>mB',
+        ":lua require('telescope').extensions.markit.bookmarks_list_all({project_only = true})<cr>",
+        desc = 'Bookmarks In Project',
+    },
+    { '<leader>md', ":lua require('markit').delete_line()<cr>", desc = 'Delete Marks In Line' },
+    { '<leader>mD', ":lua require('markit').delete_buf()<cr>", desc = 'Delete Marks In Buffer' },
+    { '<leader>mg', group = 'Group Bookmarks' },
+    { '<leader>mG', group = 'Group Bookmarks In Project' },
+    { '<leader>mh', ":lua require('markit').prev_bookmark()<cr>", desc = 'Previous Bookmark' },
+    { '<leader>mj', ":lua require('markit').next()<cr>", desc = 'Next' },
+    { '<leader>mk', ":lua require('markit').prev()<cr>", desc = 'Previous' },
+    { '<leader>ml', ":lua require('markit').next_bookmark()<cr>", desc = 'Next Bookmark' },
+    --   { '<leader>mm', ':Telescope markit<cr>', desc = 'All Marks' },
+    { '<leader>mm', ':lua Snacks.picker.marks()<cr>', desc = 'Marks' },
+    { '<leader>mn', group = 'Next Bookmark In Group' },
+    { '<leader>mp', group = 'Previous Bookmark In Group' },
+    { '<leader>mP', ":lua require('markit').preview()<cr>", desc = 'Preview' },
+    { '<leader>ms', ":lua require('markit').set_next()<cr>", desc = 'Set Next' },
+    { '<leader>mt', ":lua require('markit').toggle()<cr>", desc = 'Toggle' },
+    { '<leader>mx', ":lua require('markit').delete_bookmark()<cr>", desc = 'Delete Bookmark' },
 
     { '<leader>o', group = ' Options' },
-    { '<leader>oc', '<cmd>Telescope colorscheme<cr>', desc = 'Colorscheme' },
-    { '<leader>oh', '<cmd>Telescope highlights<cr>', desc = 'Highlight Colors' },
-    { '<leader>on', '<cmd>set relativenumber!<cr>', desc = 'Relative Numbers' },
-    { '<leader>oo', '<cmd>Telescope vim_options<cr>', desc = 'All Options' },
+    { '<leader>oa', ':lua Snacks.picker.autocmds()<cr>', desc = 'Autocmds' },
+    { '<leader>oc', ':lua Snacks.picker.command_history()<cr>', desc = 'Command History' },
+    { '<leader>od', ':lua Snacks.picker.help()<cr>', desc = 'Docs' },
+    { '<leader>og', ':lua Snacks.picker.commands()<cr>', desc = 'Commands' },
+    { '<leader>oh', ':lua Snacks.picker.highlights()<cr>', desc = 'Highlights' },
+    { '<leader>oi', 'vim.show_pos', desc = 'Inspect Position' },
+    { '<leader>ok', ':lua Snacks.picker.keymaps()<cr>', desc = 'Keymaps' },
+    { '<leader>om', ':lua Snacks.picker.man()<cr>', desc = 'Man Pages' },
+    { '<leader>on', ':lua Snacks.picker.notifications()<cr>', desc = 'Notification History' },
+    { '<leader>or', ':set relativenumber!<cr>', desc = 'Relative Numbers' },
+    { '<leader>os', ':lua Snacks.picker.search_history()<cr>', desc = 'Search History' },
+    { '<leader>ot', ':lua Snacks.picker.colorschemes()<cr>', desc = 'Colorschemes' },
 
     { '<leader>p', group = ' Packages' },
-    { '<leader>pc', '<cmd>Lazy check<cr>', desc = 'Check' },
-    { '<leader>pd', '<cmd>Lazy debug<cr>', desc = 'Debug' },
-    { '<leader>pe', '<cmd>lua require("snacks").profiler.scratch()<cr>', desc = 'Profiler Scratch' },
-    { '<leader>pf', '<cmd>lua require("snacks").profiler.pick()<cr>', desc = 'Profiler Pick' },
-    { '<leader>pi', '<cmd>Lazy install<cr>', desc = 'Install' },
-    { '<leader>pl', '<cmd>Lazy log<cr>', desc = 'Log' },
-    { '<leader>pm', '<cmd>Mason<cr>', desc = 'Mason' },
-    { '<leader>pp', '<cmd>Lazy<cr>', desc = 'Plugins' },
-    { '<leader>pP', '<cmd>Lazy profile<cr>', desc = 'Profile' },
-    { '<leader>pr', '<cmd>Lazy restore<cr>', desc = 'Restore' },
-    { '<leader>ps', '<cmd>Lazy sync<cr>', desc = 'Sync' },
-    { '<leader>pt', '<cmd>lua require("snacks").profiler.toggle()<cr>', desc = 'Profiler Toggle' },
-    { '<leader>pu', '<cmd>Lazy update<cr>', desc = 'Update' },
-    { '<leader>px', '<cmd>Lazy clean<cr>', desc = 'Clean' },
+    { '<leader>pc', ':Lazy check<cr>', desc = 'Check' },
+    { '<leader>pd', ':Lazy debug<cr>', desc = 'Debug' },
+    { '<leader>pe', ':lua require("snacks").profiler.scratch()<cr>', desc = 'Profiler Scratch' },
+    { '<leader>pf', ':lua require("snacks").profiler.pick()<cr>', desc = 'Profiler Pick' },
+    { '<leader>pi', ':Lazy install<cr>', desc = 'Install' },
+    { '<leader>pl', ':Lazy log<cr>', desc = 'Log' },
+    { '<leader>pm', ':Mason<cr>', desc = 'Mason' },
+    { '<leader>pp', ':Lazy<cr>', desc = 'Plugins' },
+    { '<leader>pP', ':Lazy profile<cr>', desc = 'Profile' },
+    { '<leader>pr', ':Lazy restore<cr>', desc = 'Restore' },
+    { '<leader>ps', ':Lazy sync<cr>', desc = 'Sync' },
+    { '<leader>pt', ':lua require("snacks").profiler.toggle()<cr>', desc = 'Profiler Toggle' },
+    { '<leader>pu', ':Lazy update<cr>', desc = 'Update' },
+    { '<leader>px', ':Lazy clean<cr>', desc = 'Clean' },
+    { '<leader>pS', ':lua Snacks.picker.lazy()<cr>', desc = 'Search for Plugin Spec' },
 
     { '<leader>q', group = ' Quit' },
-    { '<leader>qa', '<cmd>qall<cr>', desc = 'Quit All' },
-    { '<leader>qc', '<cmd>bw<cr>', desc = 'Close Buffer' },
-    { '<leader>qd', '<cmd>lua require("snacks").bufdelete()<cr>', desc = 'Delete Buffer' },
-    { '<leader>qf', '<cmd>qall!<cr>', desc = 'Force Quit' },
+    { '<leader>qa', ':qall<cr>', desc = 'Quit All' },
+    { '<leader>qb', ':bw<cr>', desc = 'Close Buffer' },
+    { '<leader>qd', ':lua require("snacks").bufdelete()<cr>', desc = 'Delete Buffer' },
+    { '<leader>qf', ':qall!<cr>', desc = 'Force Quit' },
     { '<leader>qo', ':%bdelete|b#|bdelete#<cr>', desc = 'Close Others' },
-    { '<leader>qq', '<cmd>q<cr>', desc = 'Quit' },
+    { '<leader>qq', ':q<cr>', desc = 'Quit' },
     { '<leader>qs', '<C-w>c', desc = 'Close Split' },
-    { '<leader>qw', '<cmd>wq<cr>', desc = 'Write and Quit' },
+    { '<leader>qw', ':wq<cr>', desc = 'Write and Quit' },
 
     { '<leader>r', group = ' Refactor' },
-    {
-        '<leader>rR',
-        "<Esc><cmd>lua require('telescope').extensions.refactoring.refactors()<CR>",
-        desc = 'Refactor Commands',
-    },
-    { '<leader>rS', "<cmd>lua require('spectre').open()<cr>", desc = 'Replace' },
-    { '<leader>rb', "<cmd>lua require('spectre').open_file_search()<cr>", desc = 'Replace Buffer' },
-    { '<leader>rd', '', desc = 'Go To Definition' },
-    { '<leader>re', "<cmd>lua require('refactoring').refactor('Extract Block')<CR>", desc = 'Extract Block' },
-    {
-        '<leader>rf',
-        "<cmd>lua require('refactoring').refactor('Extract Block To File')<CR>",
-        desc = 'Extract To File',
-    },
+    { '<leader>rb', ":lua require('spectre').open_file_search()<cr>", desc = 'Replace Buffer' },
+    { '<leader>re', ":lua require('refactoring').refactor('Extract Block')<cr>", desc = 'Extract Block' },
+    { '<leader>ri', ":lua require('refactoring').refactor('Inline Variable')<cr>", desc = 'Inline Variable' },
+    { '<leader>rs', ':%s/\\<<C-r><C-w>\\>/<C-r><C-w>/gI<Left><Left><Left>', desc = 'Replace Word' },
+    { '<leader>rS', ":lua require('spectre').open()<cr>", desc = 'Replace' },
+    { '<leader>rt', ':lua Snacks.picker.treesitter()<cr>', desc = 'Treesitter Find' },
+    { '<leader>rv', ":lua require('refactoring').refactor('Extract Variable')<cr>", desc = 'Extract Variable' },
+    { '<leader>rw', ":lua require('spectre').open_visual({select_word=true})<cr>", desc = 'Replace Word' },
+    { '<leader>rd', '', desc = 'Go To Definition' }, -- treesitter navigation
     { '<leader>rh', '', desc = 'List Definition Head' },
-    { '<leader>ri', "<cmd>lua require('refactoring').refactor('Inline Variable')<CR>", desc = 'Inline Variable' },
     { '<leader>rj', '', desc = 'Next Usage' },
     { '<leader>rk', '', desc = 'Previous Usage' },
     { '<leader>rl', '', desc = 'List Definition' },
     { '<leader>rn', '', desc = 'Swap Next' },
     { '<leader>rp', '', desc = 'Swap Previous' },
     { '<leader>rr', '', desc = 'Smart Rename' },
-    { '<leader>rs', ':%s/\\<<C-r><C-w>\\>/<C-r><C-w>/gI<Left><Left><Left>', desc = 'Replace Word' },
-    { '<leader>rv', "<cmd>lua require('refactoring').refactor('Extract Variable')<CR>", desc = 'Extract Variable' },
-    { '<leader>rw', "<cmd>lua require('spectre').open_visual({select_word=true})<cr>", desc = 'Replace Word' },
+    {
+        '<leader>rf',
+        ":lua require('refactoring').refactor('Extract Block To File')<cr>",
+        desc = 'Extract To File',
+    },
 
     { '<leader>s', group = ' Split' },
-    { '<leader>s+', '<cmd>resize +10<cr>', desc = 'Increase window height' },
-    { '<leader>s-', '<cmd>vertical resize -20<cr>', desc = 'Decrease window width' },
+    { '<leader>s+', ':resize +10<cr>', desc = 'Increase window height' },
+    { '<leader>s-', ':vertical resize -20<cr>', desc = 'Decrease window width' },
     { '<leader>s/', '<C-w>s', desc = 'Split Below' },
-    { '<leader>s=', '<cmd>vertical resize +20<cr>', desc = 'Increase window width' },
-    { '<leader>sH', '<cmd>vertical resize -10<cr>', desc = 'Decrease window width' },
-    { '<leader>sJ', '<cmd>resize -5<cr>', desc = 'Decrease window height' },
-    { '<leader>sK', '<cmd>resize +5<cr>', desc = 'Increase window height' },
-    { '<leader>sL', '<cmd>vertical resize +10<cr>', desc = 'Increase window width' },
+    { '<leader>s=', ':vertical resize +20<cr>', desc = 'Increase window width' },
+    { '<leader>sH', ':vertical resize -10<cr>', desc = 'Decrease window width' },
+    { '<leader>sJ', ':resize -5<cr>', desc = 'Decrease window height' },
+    { '<leader>sK', ':resize +5<cr>', desc = 'Increase window height' },
+    { '<leader>sL', ':vertical resize +10<cr>', desc = 'Increase window width' },
     { '<leader>s\\', '<C-w>v', desc = 'Split Right' },
-    { '<leader>s_', '<cmd>resize -10<cr>', desc = 'Decrease window height' },
+    { '<leader>s_', ':resize -10<cr>', desc = 'Decrease window height' },
     { '<leader>s`', '<C-w>p', desc = 'Previous Window' },
-    { '<leader>sa', '<cmd>split<cr>', desc = 'Horizontal Split' },
-    { '<leader>sc', '<cmd>tabclose<cr>', desc = 'Close Tab' },
-    { '<leader>sf', '<cmd>tabfirst<cr>', desc = 'First Tab' },
+    { '<leader>sa', ':split<cr>', desc = 'Horizontal Split' },
+    { '<leader>sc', ':tabclose<cr>', desc = 'Close Tab' },
+    { '<leader>sf', ':tabfirst<cr>', desc = 'First Tab' },
     { '<leader>sh', '<C-w>h', desc = 'Move Left' },
     { '<leader>sj', '<C-w>j', desc = 'Move Down' },
     { '<leader>sk', '<C-w>k', desc = 'Move Up' },
     { '<leader>sl', '<C-w>l', desc = 'Move Right' },
-    { '<leader>sp', '<cmd>NavigatorPrevious<cr>', desc = 'Previous Pane' },
+    { '<leader>sp', ':NavigatorPrevious<cr>', desc = 'Previous Pane' },
     { '<leader>sq', '<C-w>c', desc = 'Close Split' },
-    { '<leader>ss', '<cmd>vsplit<cr>', desc = 'Vertical Split' },
+    { '<leader>ss', ':vsplit<cr>', desc = 'Vertical Split' },
 
     { '<leader>t', group = ' Terminal' },
     { '<leader>t1', '<cmd>1ToggleTerm<cr>', desc = 'Toggle Terminal' },
@@ -359,53 +322,83 @@ local normal_mappings = {
     { '<leader>tv', '<cmd>Vterm<cr>', desc = 'Vertical Terminal' },
     { '<leader>tc', '<Cmd>close<CR>', desc = 'Hide Terminal' },
 
-    { '<leader>u', group = ' Test' },
-    { '<leader>uc', '<cmd>lua require("neotest").run.run()<cr>', desc = 'Run Current Test' },
-    { '<leader>uf', '<cmd>lua require("neotest").run.run(vim.fn.expand("%"))<cr>', desc = 'Run Test File' },
-    { '<leader>uo', '<cmd>Neotest output-panel<cr>', desc = 'Test Output' },
-    { '<leader>us', '<cmd>Neotest summary<cr>', desc = 'Test Summary' },
-
-    { '<leader>v', group = ' Select' },
-    { '<leader>vB', 'vab', desc = 'Around Bracket' },
-    { '<leader>vP', 'vap', desc = 'Around Para' },
-    { '<leader>vQ', 'vaq', desc = 'Around Quote' },
-    { '<leader>vb', 'vib', desc = 'Bracket' },
-    { '<leader>vp', 'vip', desc = 'Paragraph' },
-    { '<leader>vq', 'viq', desc = 'Quote' },
-
     { '<leader>w', group = ' Writing' },
-    { '<leader>wc', '<cmd>set spell!<cr>', desc = 'Spellcheck' },
-    { '<leader>wd', '<cmd>lua require("snacks").dim.enable()<cr>', desc = 'Dim On' },
-    { '<leader>wD', '<cmd>lua require("snacks").dim.disable()<cr>', desc = 'Dim Off' },
-    { '<leader>wf', "<cmd>lua require'utils'.sudo_write()<cr>", desc = 'Force Write' },
+    { '<leader>wc', ':set spell!<cr>', desc = 'Spellcheck' },
+    { '<leader>wd', ':lua require("snacks").dim.enable()<cr>', desc = 'Dim On' },
+    { '<leader>wD', ':lua require("snacks").dim.disable()<cr>', desc = 'Dim Off' },
+    { '<leader>wf', ":lua require'utils'.sudo_write()<cr>", desc = 'Force Write' },
     { '<leader>wj', ']s', desc = 'Next Misspell' },
     { '<leader>wk', '[s', desc = 'Prev Misspell' },
-    { '<leader>wn', '<cmd>WriteNoFormat<cr>', desc = 'Write Without Formatting' },
-    { '<leader>wq', '<cmd>wq<cr>', desc = 'Write and Quit' },
-    { '<leader>wr', '<cmd>%d+<cr>', desc = 'Remove All Text' },
-    { '<leader>ws', '<cmd>Telescope spell_suggest<cr>', desc = 'Suggestions' },
-    { '<leader>ww', '<cmd>w<cr>', desc = 'Write and Quit' },
-    { '<leader>wz', '<cmd>lua require("snacks").zen.zen()<cr>', desc = 'Zen' },
-    { '<leader>wZ', '<cmd>lua require("snacks").zen.zoom()<cr>', desc = 'Zoom' },
-    { '<leader>x', '<cmd>x<cr>', desc = ' Save and Quit' },
+    { '<leader>wn', ':WriteNoFormat<cr>', desc = 'Write Without Formatting' },
+    { '<leader>ws', ':lua Snacks.picker.spelling()<cr>', desc = 'Spell Suggestions' },
+    { '<leader>wq', ':wq<cr>', desc = 'Write and Quit' },
+    { '<leader>ww', ':w<cr>', desc = 'Write' },
+    { '<leader>wz', ':lua require("snacks").zen.zen()<cr>', desc = 'Zen' },
+    { '<leader>wZ', ':lua require("snacks").zen.zoom()<cr>', desc = 'Zoom' },
 
     { '<leader>y', group = ' Yank' },
-    { '<leader>yL', '<cmd>CopyAbsolutePathWithLine<cr>', desc = 'Absolute Path with Line' },
-    { '<leader>yP', '<cmd>CopyAbsolutePath<cr>', desc = 'Absolute Path' },
-    { '<leader>ya', '<cmd>%y+<cr>', desc = 'Copy Whole File' },
-    { '<leader>yf', '<cmd>CopyFileName<cr>', desc = 'File Name' },
-    { '<leader>yg', '<cmd>lua require"gitlinker".get_buf_range_url()<cr>', desc = 'Copy Git URL' },
-    { '<leader>yl', '<cmd>CopyRelativePathWithLine<cr>', desc = 'Relative Path with Line' },
-    { '<leader>yp', '<cmd>CopyRelativePath<cr>', desc = 'Relative Path' },
+    { '<leader>yL', ':CopyAbsolutePathWithLine<cr>', desc = 'Absolute Path with Line' },
+    { '<leader>yP', ':CopyAbsolutePath<cr>', desc = 'Absolute Path' },
+    { '<leader>ya', ':%y+<cr>', desc = 'Copy Whole File' },
+    { '<leader>yf', ':CopyFileName<cr>', desc = 'File Name' },
+    { '<leader>yg', ':lua require"gitlinker".get_buf_range_url()<cr>', desc = 'Copy Git URL' },
+    { '<leader>yl', ':CopyRelativePathWithLine<cr>', desc = 'Relative Path with Line' },
+    { '<leader>yp', ':CopyRelativePath<cr>', desc = 'Relative Path' },
 }
 
--- Jump to file mappings
+-- Numerical mappings
+
 for i = 1, 9 do
+    table.insert(normal_mappings, {
+        string.format('<leader>n%d', i),
+        string.format('<cmd>Tdo %d<cr>', i),
+        desc = string.format('Todo %d Days In Future', i),
+    })
+
+    table.insert(normal_mappings, {
+        string.format('<leader>np%d', i),
+        string.format('<cmd>Tdo -%d<cr>', i),
+        desc = string.format('Todo %d Days From Past', i),
+    })
+
     table.insert(normal_mappings, {
         string.format('<leader>f%d', i),
         string.format('<cmd>LualineBuffersJump%d<cr>', i),
         desc = string.format('File %d', i),
     })
+
+    table.insert(normal_mappings, {
+        string.format('<leader>m%d', i),
+        string.format('<cmd>lua require("markit").toggle_bookmark%d()<cr>', i),
+        desc = string.format('Toggle Group %d Bookmark', i),
+    })
+
+    table.insert(normal_mappings, {
+        string.format('<leader>mp%d', i),
+        string.format('<cmd>lua require("markit").prev_bookmark%d()<cr>', i),
+        desc = string.format('Previous Group %d Bookmarks', i),
+    })
+
+    table.insert(normal_mappings, {
+        string.format('<leader>mn%d', i),
+        string.format('<cmd>lua require("markit").next_bookmark%d()<cr>', i),
+        desc = string.format('Next Group %d Bookmarks', i),
+    })
+
+    table.insert(normal_mappings, {
+        string.format('<leader>mg%d', i),
+        string.format('<cmd>lua require("telescope").extensions.markit.bookmarks_list_all({group = %d})<cr>', i),
+        desc = string.format('Group %d Bookmarks', i),
+    })
+
+    table.insert(normal_mappings, {
+        string.format('<leader>mG%d', i),
+        string.format(
+            '<cmd>lua require("telescope").extensions.markit.bookmarks_list_all({group = %d, project_only = true})<cr>',
+            i
+        ),
+        desc = string.format('Group %d Bookmarks In Project', i),
+    })
 end
 
 local visual_mappings = {
@@ -435,23 +428,23 @@ local visual_mappings = {
     { '<leader>j', group = ' Jump' },
     {
         '<leader>jN',
-        "<cmd>lua require('flash').jump({search = { forward = false, wrap = false, multi_window = false },})<cr>",
+        ":lua require('flash').jump({search = { forward = false, wrap = false, multi_window = false },})<cr>",
         desc = 'Search Backward',
     },
-    { '<leader>jd', '<cmd>FlashDiagnostics<cr>', desc = 'Diagnostics' },
-    { '<leader>jj', "<cmd>lua require('flash').remote()<cr>", desc = 'Remote' },
-    { '<leader>jk', "<cmd>lua require('flash').treesitter()<cr>", desc = 'Treesitter' },
+    { '<leader>jd', ':FlashDiagnostics<cr>', desc = 'Diagnostics' },
+    { '<leader>jj', ":lua require('flash').remote()<cr>", desc = 'Remote' },
+    { '<leader>jk', ":lua require('flash').treesitter()<cr>", desc = 'Treesitter' },
     {
         '<leader>jn',
-        "<cmd>lua require('flash').jump({search = { forward = true, wrap = false, multi_window = false },})<cr>",
+        ":lua require('flash').jump({search = { forward = true, wrap = false, multi_window = false },})<cr>",
         desc = 'Search Forward',
     },
-    { '<leader>jp', "<cmd>lua require('flash').jump({continue = true})<cr>", desc = 'Previous Jump' },
-    { '<leader>js', "<cmd>lua require('flash').jump()<cr>", desc = 'Search' },
-    { '<leader>jt', "<cmd>lua require('flash').treesitter_search()<cr>", desc = 'Remote Treesitter' },
+    { '<leader>jp', ":lua require('flash').jump({continue = true})<cr>", desc = 'Previous Jump' },
+    { '<leader>js', ":lua require('flash').jump()<cr>", desc = 'Search' },
+    { '<leader>jt', ":lua require('flash').treesitter_search()<cr>", desc = 'Remote Treesitter' },
     {
         '<leader>jw',
-        '<cmd>lua require("flash").jump({ pattern = vim.fn.expand("<cword>")})<cr>',
+        ':lua require("flash").jump({ pattern = vim.fn.expand("<cword>")})<cr>',
         desc = 'Current Word',
     },
 
@@ -472,23 +465,18 @@ local visual_mappings = {
     { '<leader>r', group = ' Refactor' },
     {
         '<leader>re',
-        "<esc><cmd>lua require('refactoring').refactor('Extract Function')<CR>",
+        "<esc>:lua require('refactoring').refactor('Extract Function')<cr>",
         desc = 'Extract Function',
     },
     {
         '<leader>rf',
-        "<esc><cmd>lua require('refactoring').refactor('Extract Function To File')<CR>",
+        "<esc>:lua require('refactoring').refactor('Extract Function To File')<cr>",
         desc = 'Extract To File',
     },
-    { '<leader>ri', "<esc><cmd>lua require('refactoring').refactor('Inline Variable')<CR>", desc = 'Inline Variable' },
-    {
-        '<leader>rr',
-        "<Esc><cmd>lua require('telescope').extensions.refactoring.refactors()<CR>",
-        desc = 'Refactor Commands',
-    },
+    { '<leader>ri', "<esc>:lua require('refactoring').refactor('Inline Variable')<cr>", desc = 'Inline Variable' },
     {
         '<leader>rv',
-        "<esc><cmd>lua require('refactoring').refactor('Extract Variable')<CR>",
+        "<esc>:lua require('refactoring').refactor('Extract Variable')<cr>",
         desc = 'Extract Variable',
     },
 
@@ -528,10 +516,59 @@ local no_leader_mappings = {
     { ']o', group = 'Textobjects' },
 }
 
+local tmux_mappings = {
+    { '<C-h>', ':NavigatorLeft<cr>', desc = 'Move Left' },
+    { '<C-j>', ':NavigatorDown<cr>', desc = 'Move Down' },
+    { '<C-k>', ':NavigatorUp<cr>', desc = 'Move Up' },
+    { '<C-l>', ':NavigatorRight<cr>', desc = 'Move Right' },
+    { '<C-\\>', ':NavigatorPrevious<cr>', desc = 'Previous Pane' },
+}
+
 if vim.fn.exists('$TMUX') == 1 then
     vim.tbl_extend('force', no_leader_mappings, tmux_mappings)
 end
 
+if util.get_user_config('enable_test_runner', false) then
+    local test_runner_bindings = {
+        { '<leader>u', group = ' Test' },
+        { '<leader>uc', ':lua require("neotest").run.run()<cr>', desc = 'Run Current Test' },
+        { '<leader>uf', ':lua require("neotest").run.run(vim.fn.expand("%"))<cr>', desc = 'Run Test File' },
+        { '<leader>uo', ':Neotest output-panel<cr>', desc = 'Test Output' },
+        { '<leader>us', ':Neotest summary<cr>', desc = 'Test Summary' },
+    }
+    vim.tbl_extend('force', normal_mappings, test_runner_bindings)
+end
+
+if util.get_user_config('enable_db_explorer', false) then
+    local db_explorer_bindings = {
+        { '<leader>d', group = ' Database' },
+        { '<leader>dS', ':lua require("dbee").store("json", "buffer", { extra_arg = 0 })<cr>', desc = 'To JSON' },
+        { '<leader>db', ':DBToggle<cr>', desc = 'DB Explorer' },
+        { '<leader>dj', ':lua require("dbee").next()<cr>', desc = 'DB Next' },
+        { '<leader>dk', ':lua require("dbee").prev()<cr>', desc = 'DB Prev' },
+        { '<leader>ds', ':lua require("dbee").store("csv", "buffer", { extra_arg = 0 })<cr>', desc = 'To CSV' },
+        { '<leader>dt', ':lua require("dbee").store("table", "buffer", { extra_arg = 0 })<cr>', desc = 'To Table' },
+    }
+    vim.tbl_extend('force', normal_mappings, db_explorer_bindings)
+end
+
+if util.get_user_config('enable_debugger', false) then
+    local debugger_bindings = {
+        { '<leader>b', group = ' Debug' },
+        { '<leader>bO', ':DapStepOut<cr>', desc = 'Out' },
+        { '<leader>bR', ':DapRestartFrame<cr>', desc = 'Restart Frame' },
+        { '<leader>bb', ':DapToggleBreakpoint<cr>', desc = 'Breakpoint' },
+        { '<leader>bc', ':DapContinue<cr>', desc = 'Continue' },
+        { '<leader>bi', ':DapStepInto<cr>', desc = 'Into' },
+        { '<leader>bl', ":lua require'dap'.run_last()<cr>", desc = 'Last' },
+        { '<leader>bo', ':DapStepOver<cr>', desc = 'Over' },
+        { '<leader>br', ':DapToggleRepl<cr>', desc = 'Repl' },
+        { '<leader>bt', ':DapUIToggle<cr>', desc = 'Debugger' },
+        { '<leader>bx', ':DapTerminate<cr>', desc = 'Exit' },
+    }
+    vim.tbl_extend('force', normal_mappings, debugger_bindings)
+end
+
 local user_keybindings = require('lib.util').get_user_config('user_keybindings', {})
 
 which_key.setup(setup)
diff --git a/lua/plugins/ui/snacks.lua b/lua/plugins/ui/snacks.lua
index 13124ae..7423bf0 100644
--- a/lua/plugins/ui/snacks.lua
+++ b/lua/plugins/ui/snacks.lua
@@ -1,6 +1,54 @@
 local Snacks = require('snacks')
 local icons = require('lib.icons')
 
+local function files_layout(preview_width, height, width)
+    preview_width = preview_width or 0.6
+    height = height or 0.8
+    width = width or 0.9
+    return {
+        layout = {
+            box = 'horizontal',
+            width = width,
+            min_width = 120,
+            height = height,
+            {
+                box = 'vertical',
+                border = 'rounded',
+                title = '{title} {live} {flags}',
+                { win = 'input', height = 1, border = 'bottom' },
+                { win = 'list', border = 'none' },
+            },
+            { win = 'preview', title = '{preview}', border = 'rounded', width = preview_width },
+        },
+    }
+end
+
+local function palette_layout(height, width)
+    height = height or 0.4
+    width = width or 0.6
+    return {
+        preview = false,
+        layout = {
+            backdrop = false,
+            row = 1,
+            width = width,
+            min_width = 80,
+            height = height,
+            border = 'rounded',
+            box = 'vertical',
+            {
+                win = 'input',
+                height = 1,
+                border = 'rounded',
+                title = '{title} {live} {flags}',
+                title_pos = 'center',
+            },
+            { win = 'list', border = 'hpad' },
+            { win = 'preview', title = '{preview}', border = 'rounded' },
+        },
+    }
+end
+
 Snacks.setup({
     animate = {
         enabled = true,
@@ -11,7 +59,7 @@ Snacks.setup({
     bigfile = {
         enabled = true,
         notify = true,
-        size = 1.5 * 1024 * 1024, -- 1.5MB
+        size = 100 * 1024, -- 100 KB
     },
     bufdelete = { enabled = true },
     dashboard = {
@@ -51,8 +99,10 @@ Snacks.setup({
             siblings = true,
         },
     },
+    explorer = { enabled = false },
     git = { enabled = true },
     gitbrowse = { enabled = true },
+    image = { enabled = true },
     indent = {
         enabled = true,
         priority = 1,
@@ -79,6 +129,7 @@ Snacks.setup({
         win = { style = 'input' },
         expand = true,
     },
+    layout = { enabled = true },
     lazygit = { enabled = true },
     notifier = {
         enabled = true,
@@ -103,6 +154,40 @@ Snacks.setup({
         refresh = 50,
     },
     notify = { enabled = true },
+    picker = {
+        enabled = true,
+        icon = icons.ui.Search,
+        icon_hl = 'SnacksPickerIcon',
+        icon_pos = 'left',
+        prompt_pos = 'title',
+        win = { style = 'picker' },
+        expand = true,
+        sources = {
+            -- layout options: dropdown, horizontal, vertical, vscode, ivy, ivy_split, telescope, top, left, right, bottom, sidebar
+            buffers = { layout = files_layout() },
+            commands = { layout = palette_layout() },
+            command_history = { layout = palette_layout() },
+            files = {
+                hidden = true,
+                layout = files_layout(),
+            },
+            icons = {
+                icon_sources = { 'nerd_fonts', 'emoji' },
+                layout = palette_layout(),
+            },
+            git_files = { layout = files_layout() },
+            git_branches = { layout = { preset = 'vertical' } },
+            git_status = { layout = files_layout() },
+            help = { layout = { preset = 'ivy_split' } },
+            man = { layout = { preset = 'ivy_split' } },
+            projects = { layout = files_layout(0.8) },
+            recent = { layout = files_layout() },
+            search_history = { layout = palette_layout() },
+            smart = { layout = files_layout() },
+            undo = { layout = { preset = 'ivy' } },
+            zoxide = { layout = files_layout(0.7) },
+        },
+    },
     profiler = { enabled = true },
     quickfile = { enabled = true },
     rename = { enabled = true },