diff --git a/after/ftplugin/xml.lua b/after/ftplugin/xml.lua
new file mode 100644
index 0000000..7c8fdcc
--- /dev/null
+++ b/after/ftplugin/xml.lua
@@ -0,0 +1,3 @@
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
+vim.opt_local.softtabstop = 2
diff --git a/lazy-lock.json b/lazy-lock.json
index 713c72c..4ff5b39 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,104 +1,104 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
-  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "blink-cmp-git": { "branch": "master", "commit": "863e0670217d0dffb9edc6ab41b676a4128f813b" },
-  "blink-emoji.nvim": { "branch": "master", "commit": "a77aebc092ebece1eed108f301452ae774d6b67a" },
-  "blink-ripgrep.nvim": { "branch": "main", "commit": "89c4d158bc6d6ca03b4059452f2f9ffaa850db8a" },
-  "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
+  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
+  "blink-cmp-git": { "branch": "master", "commit": "e78e9ff3de63f82685e3c5f2eed1ec203222f63b" },
+  "blink-emoji.nvim": { "branch": "master", "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9" },
+  "blink-ripgrep.nvim": { "branch": "main", "commit": "a910b62c896eee2d0e74eb48b3ff5eedd211db69" },
+  "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
   "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
-  "catppuccin.nvim": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
-  "ccc.nvim": { "branch": "main", "commit": "af2cf5a963f401aad868c065222ee13d4bbc9050" },
+  "catppuccin.nvim": { "branch": "main", "commit": "56a9dfd1e05868cf3189369aad87242941396563" },
+  "ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" },
   "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
   "cheatsheet.nvim": { "branch": "master", "commit": "8ee4d76b6f902c4017dc28eddd79d925dfc55066" },
   "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" },
-  "cmake-tools.nvim": { "branch": "master", "commit": "1ee065c33ca777c0e03cd7c358010202ee70bb88" },
+  "cmake-tools.nvim": { "branch": "master", "commit": "591ae37fc5494677e929118f0a182d2b61fe1af1" },
   "cmp-dbee": { "branch": "main", "commit": "1650f67b9bf43c029fc37570665ca895a33cdf5a" },
-  "colorful-menu.nvim": { "branch": "master", "commit": "f80feb8a6706f965321aff24d0ed3849f02a7f77" },
-  "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
-  "crates.nvim": { "branch": "main", "commit": "85356807f3a0e9a3f7015586f3a010170d338686" },
+  "colorful-menu.nvim": { "branch": "master", "commit": "bc3e82609f2fcf7dad7ca87c20e65e51d5d9d87c" },
+  "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
+  "crates.nvim": { "branch": "main", "commit": "afcd1cc3eeceb5783676fc8464389b9216a29d05" },
   "cratesearch.nvim": { "branch": "master", "commit": "9d09625d017f6b2e116503f935bc6862961313fa" },
   "css-vars.nvim": { "branch": "main", "commit": "0615782c320f729b04d9c51a8a61fb498ee4234a" },
-  "csvview.nvim": { "branch": "main", "commit": "6eb9c7293d35c40a71ec1eb9c653d80e8de5a2e9" },
+  "csvview.nvim": { "branch": "main", "commit": "c44d9ed0664de67f3ac333fe83cb187ab241f82a" },
   "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" },
   "darkvoid.nvim": { "branch": "master", "commit": "45be993a5617e05811b6b293c05e6aded7003cc9" },
   "demicolon.nvim": { "branch": "main", "commit": "8d79e527dbbef9de06405a30258b8d752c0638c4" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "dracula.nvim": { "branch": "main", "commit": "96c9d19ce81b26053055ad6f688277d655b3f7d2" },
   "flow.nvim": { "branch": "main", "commit": "095c54bbaf55473418dd09d61d3167891684cf85" },
-  "friendly-snippets": { "branch": "main", "commit": "fc8f183479a472df60aa86f00e295462f2308178" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "gh.nvim": { "branch": "main", "commit": "6f367b2ab8f9d4a0a23df2b703a3f91137618387" },
-  "gitignore.nvim": { "branch": "master", "commit": "47cefc0b6ea412e1e149552b10ebfe9f7f0b8952" },
+  "gitignore.nvim": { "branch": "master", "commit": "0344f643768c4d64af4add8c1bdddf6f7d4c9010" },
   "gitpad.nvim": { "branch": "main", "commit": "1e0f6fa335c72c05d1d3635120c572e198e5ae0d" },
-  "gitsigns.nvim": { "branch": "main", "commit": "9cd665f46ab7af2e49d140d328b8e72ea1cf511b" },
-  "gruvbox.nvim": { "branch": "main", "commit": "8d79de155785f9eaf0031bba92d0289318208fc9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "8bdaccdb897945a3c99c1ad8df94db0ddf5c8790" },
+  "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
+  "hardtime.nvim": { "branch": "main", "commit": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6" },
   "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
-  "harpoon-lualine": { "branch": "master", "commit": "eae10bc6bddddbc73daa0956ba4ee5cc29cf9a49" },
   "http-codes.nvim": { "branch": "main", "commit": "77aea3a73d5f3134089941ebf6d4172af34a4a8d" },
   "img-clip.nvim": { "branch": "main", "commit": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "7a698a1d7ed755af9f5a88733b23ca246ce2df28" },
   "inlay-hint.nvim": { "branch": "main", "commit": "9dce1b25bc60fd9cf06e548c2143ab87517c5cd6" },
   "inlay-hints.nvim": { "branch": "master", "commit": "3259b54f3b954b4d8260f3ee49ceabe978ea5636" },
   "jupynium.nvim": { "branch": "master", "commit": "4086e40f5ab3b8b74330c5a69a26791953da5cd2" },
   "jupytext.nvim": { "branch": "master", "commit": "2e86acfa4345f611c86f57116db0c06ffecb721d" },
-  "kanagawa.nvim": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" },
-  "lackluster.nvim": { "branch": "main", "commit": "d2519d14b2b6e9eef05752d5d4486ed5c48d6178" },
+  "kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" },
+  "lackluster.nvim": { "branch": "main", "commit": "b247a6f51cb43e49f3f753f4a59553b698bf5438" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
   "litee.nvim": { "branch": "main", "commit": "4efaf373322d9e71eaff31164abb393417cc6f6a" },
+  "lsp-progress.nvim": { "branch": "main", "commit": "f3df1df8f5ea33d082db047b5d2d2b83cc01cd8a" },
   "lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" },
   "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
-  "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
-  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "lualine-harpoon.nvim": { "branch": "main", "commit": "9ee90e6309c4219d6a06b771b53db6a59c8d32fa" },
+  "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" },
   "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
   "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" },
-  "markview.nvim": { "branch": "main", "commit": "6bbbbf5790cdea622b53fe94b49b9801037e2db9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
+  "markview.nvim": { "branch": "main", "commit": "1edad11ca4a1fddf171c07a1a3d81e24cef08410" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "67da97f8c2fd12d05427bb485ce07ee6418e0a51" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+  "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
   "melange.nvim": { "branch": "master", "commit": "2db5407f2f6d6d6286f50f2f7365728d66f6f3ae" },
   "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "neoconf.nvim": { "branch": "main", "commit": "33880483b4ca91fef04d574b9c8b8cca88061c8f" },
-  "neocord": { "branch": "main", "commit": "41bacd44e9d36f5e36e0271672ac2c02f6fa355a" },
+  "mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" },
+  "neoconf.nvim": { "branch": "main", "commit": "5ebd6c29c88931fe7c603f087b4c32ac8157d901" },
+  "neocord": { "branch": "main", "commit": "2ebf3792a8100376bb65fd66d5dbf60f50af7529" },
   "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" },
   "neogit": { "branch": "master", "commit": "43fa47fb61773b0d90a78ebc2521ea8faaeebd86" },
   "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" },
   "neorg-telescope": { "branch": "main", "commit": "7fb6ca6a632c3c095601d379a664c0c1f802dc6c" },
-  "neotest": { "branch": "master", "commit": "6267dcd577aa519c828d2526b05844770d3a2c6a" },
+  "neotest": { "branch": "master", "commit": "ef492755730e59e1d8122c461abbd086bee4c76b" },
   "neotest-gtest": { "branch": "main", "commit": "16989561a6356878ec4ecd6afed4f0d7a471d1db" },
-  "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
+  "neotest-python": { "branch": "master", "commit": "34c9f6f3dc53fc462ea658b5071238037f95f7aa" },
   "neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" },
-  "nightfly.nvim": { "branch": "master", "commit": "033e0240479126267deae2f9a4a1b0864f14bba6" },
+  "nightfly.nvim": { "branch": "master", "commit": "8c55003e89f321a48a8cd4bb426dd3e7c58f0646" },
   "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
-  "nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" },
-  "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
+  "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
-  "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
-  "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
+  "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
+  "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" },
   "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
-  "nvim-dbee": { "branch": "master", "commit": "b4aebcabedbf0f5aa90ca391c87d6095e365ac33" },
-  "nvim-java": { "branch": "main", "commit": "e552f06d86752edd77aedf50b9b49e59f6de1b65" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
+  "nvim-dbee": { "branch": "master", "commit": "9656fc59841291e9dbd2f3b50b1cb4c77d9fea79" },
+  "nvim-java": { "branch": "main", "commit": "7c2e81caa301b0d1bc7992b88981af883b3b5d6b" },
   "nvim-java-core": { "branch": "main", "commit": "401bf7683012a25929a359deec418f36beb876e2" },
   "nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" },
   "nvim-java-refactor": { "branch": "main", "commit": "b51a57d862338999059e1d1717df3bc80a3a15c0" },
   "nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" },
-  "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
-  "nvim-lspconfig": { "branch": "master", "commit": "f448052a80c0bd93f479bb644a5164b9a4e2a31d" },
+  "nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" },
+  "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" },
-  "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" },
-  "nvim-treesitter": { "branch": "master", "commit": "3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "6daca3ad780f045550b820f262002f35175a6c04" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ed373482db797bbf71bdff37a15c7555a84dce47" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "0f051e9813a36481f48ca1f833897210dbcfffde" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
-  "nvim-ufo": { "branch": "main", "commit": "cac999ec9f6302d2fd4ad8a846bf8f731af6e7cf" },
-  "nvim-web-devicons": { "branch": "master", "commit": "50b5b06bff13a9b4eab946de7c7033649a6618a1" },
+  "nvim-ufo": { "branch": "main", "commit": "3c7a3570e9c9dc198a2ad4491b0b0e51c4d4ba08" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
   "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
   "oil.nvim": { "branch": "master", "commit": "975a77cce3c8cb742bc1b3629f4328f5ca977dad" },
-  "onedark.nvim": { "branch": "master", "commit": "0e5512d1bebd1f08954710086f87a5caa173a924" },
-  "otter.nvim": { "branch": "main", "commit": "c72e597f03ad53479424f52c9df71ddebe34c3d8" },
+  "onedark.nvim": { "branch": "master", "commit": "11de4da47f3e69cb70c3ae9816bd8af166cbe121" },
+  "otter.nvim": { "branch": "main", "commit": "fa436071c67233e6cd466268212feaf4ff4ed406" },
   "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
   "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
@@ -106,7 +106,7 @@
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" },
   "rainbow_csv.nvim": { "branch": "main", "commit": "26de78d8324f7ac6a3e478319d1eb1f17123eb5b" },
-  "rose-pine.nvim": { "branch": "main", "commit": "96ff3993a67356ee85d1cdab9be652cdc1c5d1ac" },
+  "rose-pine.nvim": { "branch": "main", "commit": "6b9840790cc7acdfadde07f308d34b62dd9cc675" },
   "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "spellwarn.nvim": { "branch": "main", "commit": "12734b47b008d912b4925c0bc2c1248eb534409d" },
@@ -114,18 +114,18 @@
   "tagbar": { "branch": "master", "commit": "8de7694c0aeda253073098bbc9fb890b2902ddb8" },
   "tailwind-fold.nvim": { "branch": "main", "commit": "b1e07f4734dc2bd56778ae690a3cbaeda1a53bf2" },
   "telescope-bibtex.nvim": { "branch": "master", "commit": "289a6f86ebec06e8ae1590533b732b9981d84900" },
-  "telescope-frecency.nvim": { "branch": "master", "commit": "4d2f5854d3a161b355c4949059e6cd1087fd1d4a" },
+  "telescope-frecency.nvim": { "branch": "master", "commit": "03a0efd1a8668b902bddef4b82cb7d46cd5ab22c" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope-git-diffs.nvim": { "branch": "main", "commit": "b8e5c9e13b9e27f8ccfd14430d04739b9996ae76" },
   "telescope-heading.nvim": { "branch": "main", "commit": "e85c0f69cb64048f56e76548dcb2f10277576df9" },
-  "telescope-import.nvim": { "branch": "main", "commit": "6fd69447679a99b463025e7f2f787e8b185dd740" },
   "telescope-lazy.nvim": { "branch": "main", "commit": "810f7859c98e88b9c4e45de16cb5317207c9b3e8" },
   "telescope-luasnip.nvim": { "branch": "master", "commit": "07a2a2936a7557404c782dba021ac0a03165b343" },
   "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" },
   "telescope-software-licenses.nvim": { "branch": "master", "commit": "fb5fc33b6afc994756e2f372423c365bf66f2256" },
   "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "timber.nvim": { "branch": "main", "commit": "7e96bc1a01cea35e872e4ac387edfc1c68ca37f6" },
+  "timber.nvim": { "branch": "main", "commit": "aac3a12753652a60955d3178b75fdb6c247b9f7d" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
   "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
   "tree-sitter-bruno": { "branch": "main", "commit": "347e99f256930213cd7fcd0efe3f9af83035c4b1" },
@@ -135,15 +135,15 @@
   "ts-error-translator.nvim": { "branch": "main", "commit": "47e5ba89f71b9e6c72eaaaaa519dd59bd6897df4" },
   "typecheck.nvim": { "branch": "main", "commit": "5a0b0f50be009e85c337f3e183fa6cd28a3c95a0" },
   "typescript-tools.nvim": { "branch": "master", "commit": "3c501d7c7f79457932a8750a2a1476a004c5c1a9" },
-  "typst-preview.nvim": { "branch": "master", "commit": "2503b188cd2a17ce44fdd21a944a93335e935215" },
+  "typst-preview.nvim": { "branch": "master", "commit": "dea4525d5420b7c32eebda7de15a6beb9d6574fa" },
   "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
   "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" },
   "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
-  "vim-illuminate": { "branch": "master", "commit": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf" },
+  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
+  "vim-just": { "branch": "main", "commit": "b7f9505f93ede57c4ec011405592280b3f1755ec" },
   "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" },
-  "vim-tmux-navigator": { "branch": "master", "commit": "33afa80db65113561dc53fa732b7f5e53d5ecfd0" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "a74836d404c295e799a6ba59794e37fe257509ec" },
   "vimtex": { "branch": "master", "commit": "bcb14eb6e3739f0c1902115a710292bc37c62d2e" },
   "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" },
-  "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" },
-  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
+  "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }
 }
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 751b3c4..b291f39 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -34,7 +34,7 @@ nmap("<C-Down>", "<cmd>resize +2<cr>", "Resize window down")
 nmap("<C-Left>", "<cmd>vertical resize -2<cr>", "Resize window left")
 nmap("<C-Right>", "<cmd>vertical resize +2<cr>", "Resize window right")
 
-nmap("<C-f>", "<cmd>!tmux neww tmux-sessionizer<cr>", "Open tmux sessionizer")
+-- nmap("<C-f>", "<cmd>!tmux neww tmux-sessionizer<cr>", "Open tmux sessionizer")
 
 nmap("<A-k>", "<cmd>m .-2<cr>==", "Move line up")
 nmap("<A-j>", "<cmd>m .+1<cr>==", "Move line down")
@@ -69,3 +69,47 @@ vmap("<A-j>", ":m '>+1<cr>gv=gv", "Move lines down")
 -- tmap("t", "<C-j>", "<C-\\><C-N><C-w>j")
 -- tmap("t", "<C-k>", "<C-\\><C-N><C-w>k")
 -- tmap("t", "<C-l>", "<C-\\><C-N><C-w>l")
+
+local function fzf_sesh_connect()
+	-- build the fzf-tmux command exactly as in your zsh widget
+	local fzf_cmd = [[
+sesh list --icons | fzf-tmux -p 80%,70% \
+  --no-sort --ansi \
+  --border-label ' sesh ' \
+  --prompt '⚡  ' \
+  --header '  ^a all  ^t tmux  ^g configs  ^x zoxide  ^d tmux kill  ^f find' \
+  --bind 'tab:down,btab:up' \
+  --bind 'ctrl-a:change-prompt(⚡  )+reload(sesh list --icons)' \
+  --bind 'ctrl-t:change-prompt(🪟  )+reload(sesh list -t --icons)' \
+  --bind 'ctrl-g:change-prompt(⚙️  )+reload(sesh list -c --icons)' \
+  --bind 'ctrl-x:change-prompt(📁  )+reload(sesh list -z --icons)' \
+  --bind 'ctrl-f:change-prompt(🔎  )+reload(fd -H -d 2 -t d -E .Trash . ~)' \
+  --bind 'ctrl-d:execute(tmux kill-session -t {2..})+change-prompt(⚡  )+reload(sesh list --icons)' \
+  --preview-window 'right:55%' \
+  --preview 'sesh preview {}'
+]]
+
+	-- spawn fzf-tmux, read its output
+	local handle = io.popen(fzf_cmd)
+	if not handle then
+		vim.notify("Failed to launch fzf-tmux", vim.log.levels.ERROR)
+		return
+	end
+	local session = handle:read("*a")
+	handle:close()
+
+	-- trim trailing newline/whitespace
+	session = session:gsub("%s+$", "")
+
+	if session == "" then
+		-- user cancelled or no selection
+		return
+	end
+
+	-- execute the tmux connect command
+	-- opens a shell command in the current Neovim window
+	vim.cmd('!sesh connect "' .. session .. '"')
+end
+
+-- bind <C-f> in Normal mode to our function
+nmap("<C-f>", fzf_sesh_connect)
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index 27b4e0a..6d1c3d2 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -1,5 +1,3 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-
 -- Bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
@@ -8,7 +6,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 	if vim.v.shell_error ~= 0 then
 		vim.api.nvim_echo({
 			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-			{ out, "WarningMsg" },
+			{ out,                            "WarningMsg" },
 			{ "\nPress any key to exit..." },
 		}, true, {})
 		vim.fn.getchar()
diff --git a/lua/plugins/autopairs.lua b/lua/plugins/autopairs.lua
deleted file mode 100644
index d64868f..0000000
--- a/lua/plugins/autopairs.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-return {
-	"windwp/nvim-autopairs",
-	enabled = false,
-	event = "InsertEnter",
-	opts = {
-		disable_filetype = { "TelescopePrompt", "spectre_panel" },
-		disable_in_macro = true, -- disable when recording or executing a macro
-		disable_in_visualblock = false, -- disable when insert after visual block mode
-		disable_in_replace_mode = true,
-		ignored_next_char = [=[[%w%%%'%[%"%.%`%$]]=],
-		enable_moveright = true,
-		enable_afterquote = true, -- add bracket pairs after quote
-		enable_check_bracket_line = true, --- check bracket in same line
-		enable_bracket_in_quote = true,
-		enable_abbr = false, -- trigger abbreviation
-		break_undo = true, -- switch for basic rule break undo sequence
-		check_ts = false,
-		map_cr = true,
-		map_bs = true, -- map the <BS> key
-		map_c_h = false, -- Map the <C-h> key to delete a pair
-		map_c_w = true, -- map <c-w> to delete a pair if possible
-	},
-}
diff --git a/lua/plugins/ccc.lua b/lua/plugins/ccc.lua
index 38f0ecd..1496a32 100644
--- a/lua/plugins/ccc.lua
+++ b/lua/plugins/ccc.lua
@@ -1,6 +1,6 @@
 return {
 	"uga-rosa/ccc.nvim",
-	config = function()
+	opts = function()
 		local ccc = require("ccc")
 		local ColorInput = require("ccc.input")
 		local convert = require("ccc.utils.convert")
@@ -61,72 +61,29 @@ return {
 			end
 		end
 
-		ccc.setup({
+		return {
 			pickers = {
 				ccc.picker.custom_entries({
-					bg = "#1a1b26",
-					bg_dark = "#16161e",
-					bg_float = "#16161e",
-					bg_highlight = "#292e42",
-					bg_popup = "#16161e",
-					bg_search = "#3d59a1",
-					bg_sidebar = "#16161e",
-					bg_statusline = "#16161e",
-					bg_visual = "#283457",
-					black = "#15161e",
-					blue = "#7aa2f7",
-					blue0 = "#3d59a1",
-					blue1 = "#2ac3de",
-					blue2 = "#0db9d7",
-					blue5 = "#89ddff",
-					blue6 = "#b4f9f8",
-					blue7 = "#394b70",
-					border = "#15161e",
-					border_highlight = "#27a1b9",
-					comment = "#565f89",
-					cyan = "#7dcfff",
-					dark3 = "#545c7e",
-					dark5 = "#737aa2",
-					delta_add = "#2c5a66",
-					delta_delete = "#713137",
-					diff_add = "#20303b",
-					diff_change = "#1f2231",
-					diff_delete = "#37222c",
-					diff_text = "#394b70",
-					error = "#db4b4b",
-					fg = "#c0caf5",
-					fg_dark = "#a9b1d6",
-					fg_float = "#c0caf5",
-					fg_gutter = "#3b4261",
-					fg_sidebar = "#a9b1d6",
-					git_add = "#449dab",
-					git_change = "#6183bb",
-					git_delete = "#914c54",
-					git_ignore = "#545c7e",
-					gitSigns_add = "#266d6a",
-					gitSigns_change = "#536c9e",
-					gitSigns_delete = "#b2555b",
-					green = "#9ece6a",
-					green1 = "#73daca",
-					green2 = "#41a6b5",
-					hint = "#1abc9c",
-					info = "#0db9d7",
-					magenta = "#bb9af7",
-					magenta2 = "#ff007c",
-					none = "NONE",
-					orange = "#ff9e64",
-					purple = "#9d7cd8",
-					red = "#f7768e",
-					red1 = "#db4b4b",
-					teal = "#1abc9c",
-					terminal_black = "#414868",
-					warning = "#e0af68",
-					yellow = "#e0af68",
+					base = "#191724",
+					surface = "#1f1d2e",
+					overlay = "#26233a",
+					muted = "#6e6a86",
+					subtle = "#908caa",
+					text = "#e0def4",
+					love = "#eb6f92",
+					gold = "#f6c177",
+					rose = "#ebbcba",
+					pine = "#31748f",
+					foam = "#9ccfd8",
+					iris = "#c4a7e7",
+					highlight_low = "#21202e",
+					highlight_med = "#403d52",
+					highlight_high = "#524f67",
 				}),
 			},
 			inputs = {
 				RgbHslInput,
 			},
-		})
+		}
 	end,
 }
diff --git a/lua/plugins/cellular-automaton.lua b/lua/plugins/cellular-automaton.lua
index 6814f8f..47410da 100644
--- a/lua/plugins/cellular-automaton.lua
+++ b/lua/plugins/cellular-automaton.lua
@@ -5,7 +5,7 @@ return {
 		{
 			"<leader>mr",
 			"<cmd>CellularAutomaton make_it_rain<cr>",
-			desc = "[M]ake it [R]ain",
+			desc = "Make it Rain",
 		},
 	},
 }
diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua
index 0f80344..ad7bbe8 100644
--- a/lua/plugins/conform.lua
+++ b/lua/plugins/conform.lua
@@ -10,7 +10,7 @@ return {
 				require("conform").format({ async = true, lsp_fallback = "fallback" })
 			end,
 			mode = "",
-			desc = "[F]ormat buffer",
+			desc = "Format buffer",
 		},
 	},
 	opts = {
diff --git a/lua/plugins/crates.lua b/lua/plugins/crates.lua
index 68d3a6c..8f6c6cb 100644
--- a/lua/plugins/crates.lua
+++ b/lua/plugins/crates.lua
@@ -8,7 +8,7 @@ return {
 			{
 				"<leader>ru",
 				require("crates").upgrade_all_crates,
-				desc = "[U]pgrade all crates",
+				desc = "Upgrade all crates",
 				ft = { "rust", "toml" },
 			},
 		},
diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua
index de57e32..df8bddd 100644
--- a/lua/plugins/dap.lua
+++ b/lua/plugins/dap.lua
@@ -30,7 +30,7 @@ return {
 			function()
 				require("dap-python").test_method()
 			end,
-			desc = "Test [M]ethod",
+			desc = "Test Method",
 			ft = "python",
 		},
 		{
@@ -38,7 +38,7 @@ return {
 			function()
 				require("dap-python").test_class()
 			end,
-			desc = "Test [C]lass",
+			desc = "Test Class",
 			ft = "python",
 		},
 		{
@@ -46,7 +46,7 @@ return {
 			function()
 				require("dap-python").debug_selection()
 			end,
-			desc = "Debug [S]election",
+			desc = "Debug Selection",
 			ft = "python",
 		},
 		{
@@ -54,7 +54,7 @@ return {
 			function()
 				require("dapui").toggle()
 			end,
-			desc = "[T]oggle DAP-UI",
+			desc = "Toggle DAP-UI",
 		},
 		{
 			"<leader>dc",
@@ -68,49 +68,49 @@ return {
 			function()
 				require("dap").step_into()
 			end,
-			desc = "Step [I]nto Code",
+			desc = "Step Into Code",
 		},
 		{
 			"<leader>do",
 			function()
 				require("dap").step_over()
 			end,
-			desc = "Step [O]ver Code",
+			desc = "Step Over Code",
 		},
 		{
 			"<leader>dO",
 			function()
 				require("dap").step_out()
 			end,
-			desc = "Step [O]ut of Code",
+			desc = "Step Out of Code",
 		},
 		{
 			"<leader>dT",
 			function()
 				require("dap").terminate()
 			end,
-			desc = "[T]erminate",
+			desc = "Terminate",
 		},
 		{
 			"<leader>dl",
 			function()
 				require("dap").run_last()
 			end,
-			desc = "Run [L]ast",
+			desc = "Run Last",
 		},
 		{
 			"<leader>dh",
 			function()
 				require("dap.ui.widgets").hover()
 			end,
-			desc = "[H]over",
+			desc = "Hover",
 		},
 		{
 			"<leader>dP",
 			function()
 				require("dap.ui.widgets").preview()
 			end,
-			desc = "[P]review",
+			desc = "Preview",
 		},
 		{
 			"<leader>df",
@@ -118,7 +118,7 @@ return {
 				local widgets = require("dap.ui.widgets")
 				widgets.centered_float(widgets.frames)
 			end,
-			desc = "[F]rames",
+			desc = "Frames",
 		},
 		{
 			"<leader>ds",
@@ -126,7 +126,7 @@ return {
 				local widgets = require("dap.ui.widgets")
 				widgets.centered_float(widgets.scopes)
 			end,
-			desc = "[S]copes",
+			desc = "Scopes",
 		},
 		{
 			"<F1>",
diff --git a/lua/plugins/gh.lua b/lua/plugins/gh.lua
index a667a14..e9764e0 100644
--- a/lua/plugins/gh.lua
+++ b/lua/plugins/gh.lua
@@ -7,9 +7,9 @@ return {
 				require("litee.lib").setup()
 			end,
 		},
-		"folke/which-key.nvim",
+		-- "folke/which-key.nvim",
 	},
-	otps = {
+	opts = {
 		-- deprecated, around for compatability for now.
 		jump_mode = "invoking",
 		-- remap the arrow keys to resize any litee.nvim windows.
diff --git a/lua/plugins/gitignore.lua b/lua/plugins/gitignore.lua
index c9230a2..6efb87f 100644
--- a/lua/plugins/gitignore.lua
+++ b/lua/plugins/gitignore.lua
@@ -8,7 +8,7 @@ return {
 			function()
 				require("gitignore").generate()
 			end,
-			desc = "[G]it [I]gnore",
+			desc = "Git Ignore",
 		},
 	},
 	config = function()
diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua
index a793c0c..4d345f8 100644
--- a/lua/plugins/gitsigns.lua
+++ b/lua/plugins/gitsigns.lua
@@ -8,7 +8,7 @@ return {
 			function()
 				vim.cmd.Gitsigns("blame_line")
 			end,
-			desc = "[G]it [B]lame",
+			desc = "Git Blame",
 		},
 	},
 	opts = {
diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua
new file mode 100644
index 0000000..7fc9444
--- /dev/null
+++ b/lua/plugins/hardtime.lua
@@ -0,0 +1,7 @@
+return {
+	"m4xshen/hardtime.nvim",
+	enabled = false,
+	lazy = false,
+	dependencies = { "MunifTanjim/nui.nvim" },
+	opts = {},
+}
diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua
index 3fc231b..eb1f242 100644
--- a/lua/plugins/harpoon.lua
+++ b/lua/plugins/harpoon.lua
@@ -8,7 +8,7 @@ return {
 			function()
 				require("harpoon"):list():add()
 			end,
-			desc = "Harpoon [A]dd File",
+			desc = "Harpoon Add File",
 		},
 		{
 			"<C-e>",
diff --git a/lua/plugins/http-codes.lua b/lua/plugins/http-codes.lua
index 504e26c..6289821 100644
--- a/lua/plugins/http-codes.lua
+++ b/lua/plugins/http-codes.lua
@@ -1,6 +1,6 @@
 return {
 	"barrett-ruth/http-codes.nvim",
 	dependencies = { "nvim-telescope/telescope.nvim" },
-	keys = { { "<leader>pdh", vim.cmd.HTTPCodes, desc = "[H]TTP" } },
+	keys = { { "<leader>pdh", vim.cmd.HTTPCodes, desc = "HTTP" } },
 	config = true,
 }
diff --git a/lua/plugins/ibl.lua b/lua/plugins/ibl.lua
deleted file mode 100644
index 34a3f3a..0000000
--- a/lua/plugins/ibl.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-return {
-	"lukas-reineke/indent-blankline.nvim",
-	enabled = false,
-	main = "ibl",
-	version = "*",
-	opts = {
-		indent = {
-			smart_indent_cap = true,
-		},
-		whitespace = {
-			remove_blankline_trail = true,
-		},
-		scope = {
-			show_start = true,
-			show_end = true,
-			show_exact_scope = true,
-		},
-		exclude = {
-			filetypes = {
-				"NvimTree",
-				"Trouble",
-				"alpha",
-				"dashboard",
-				"help",
-				"lazy",
-				"neogitstatus",
-				"packer",
-				"startify",
-				"lspinfo",
-				"dbee",
-			},
-			buftypes = {
-				"terminal",
-				"nofile",
-				"quickfix",
-				"prompt",
-			},
-		},
-	},
-}
diff --git a/lua/plugins/image.lua b/lua/plugins/image.lua
index 679337b..7629f1a 100644
--- a/lua/plugins/image.lua
+++ b/lua/plugins/image.lua
@@ -1,3 +1,6 @@
+local function is_typst()
+	return vim.bo.filetype == "typst"
+end
 return {
 	"HakonHarnes/img-clip.nvim",
 	event = "VeryLazy",
@@ -7,11 +10,29 @@ return {
 	opts = {
 		default = {
 			dir_path = "assets/img",
-			extension = "webp",
-			process_cmd = "convert - -quality 75 webp:-",
-			file_name = "%Y-%m-%d-%H%M%S",
+			extension = function()
+				if is_typst() then
+					return "png"
+				else
+					return "webp"
+				end
+			end,
+			process_cmd = function()
+				if is_typst() then
+					return ""
+				else
+					return "convert - -quality 75 webp:-"
+				end
+			end,
+			file_name = "%Y-%m-%d_%H-%M-%S",
 			relative_to_current_file = false,
-			prompt_for_file_name = false,
+			prompt_for_file_name = function()
+				return is_typst()
+			end,
+			embed_image_as_base64 = false,
+			drag_and_drop = {
+				insert_mode = true,
+			},
 		},
 		filetypes = {
 			markdown = {
@@ -20,6 +41,14 @@ return {
 			vimwiki = {
 				template = "![[$FILE_PATH]]",
 			},
+			typst = {
+				template = [[
+#figure(
+  image("$FILE_PATH", width: 80%),
+  caption: [$CURSOR],
+) <$LABEL>
+    ]],
+			},
 		},
 	},
 }
diff --git a/lua/plugins/java.lua b/lua/plugins/java.lua
deleted file mode 100644
index 49854a8..0000000
--- a/lua/plugins/java.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-	"nvim-java/nvim-java",
-}
diff --git a/lua/plugins/just.lua b/lua/plugins/just.lua
new file mode 100644
index 0000000..92a27f1
--- /dev/null
+++ b/lua/plugins/just.lua
@@ -0,0 +1,4 @@
+return {
+	"NoahTheDuke/vim-just",
+	ft = { "just" },
+}
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 164aa84..9cb9133 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -7,7 +7,6 @@ return {
 		"nvim-telescope/telescope.nvim",
 		"folke/trouble.nvim",
 		"folke/neoconf.nvim",
-		"piersolenski/telescope-import.nvim",
 		"mrcjkb/rustaceanvim",
 		"pmizio/typescript-tools.nvim",
 		"nvim-java/nvim-java",
@@ -28,11 +27,25 @@ return {
 		end
 
 		local default_setup = function(server)
+			local server_config = opts.servers[server]
 			local capabilities = require("blink.cmp").get_lsp_capabilities()
-			lspconfig[server].setup({
-				capabilities = extend_capabilities(capabilities),
-			})
+
+			local final_config = {}
+			if server_config then
+				-- Deep extend custom config with default capabilities
+				final_config = vim.tbl_deep_extend("force", {}, server_config, {
+					capabilities = extend_capabilities(capabilities),
+				})
+			else
+				-- Basic setup with default capabilities if no custom config exists
+				final_config = {
+					capabilities = extend_capabilities(capabilities),
+				}
+			end
+
+			lspconfig[server].setup(final_config)
 		end
+
 		vim.api.nvim_create_autocmd("LspAttach", {
 			desc = "LSP actions",
 			callback = function(event)
@@ -71,12 +84,12 @@ return {
 				nmap("<leader>lk", function()
 					vim.diagnostic.jump({ count = -1, float = true })
 				end, "Diagnostic Prev")
-				-- nmap("]d", function()
-				-- 	trouble.next({ mode = "diagnostics", skip_groups = true, jump = true })
-				-- end, "LSP: Trouble Next")
-				-- nmap("[d", function()
-				-- 	trouble.prev({ mode = "diagnostics", skip_groups = true, jump = true })
-				-- end, "Trouble Prev")
+				nmap("]d", function()
+					trouble:next({ mode = "diagnostics", skip_groups = true, jump = true })
+				end, "LSP: Trouble Next")
+				nmap("[d", function()
+					trouble.prev({ mode = "diagnostics", skip_groups = true, jump = true })
+				end, "Trouble Prev")
 				vim.keymap.set(
 					{ "n", "v" },
 					"<leader>la",
@@ -116,6 +129,7 @@ return {
 		require("mason-lspconfig").setup({
 			automatic_installation = true,
 			automatic_setup = true,
+			automatic_enable = true,
 			ensure_installed = {
 				"basedpyright",
 				"bashls",
@@ -139,12 +153,6 @@ return {
 			},
 		})
 
-		for server, config in pairs(opts.servers) do
-			local capabilities = require("blink.cmp").get_lsp_capabilities(config.capabilities)
-			config.capabilities = extend_capabilities(capabilities)
-			lspconfig[server].setup(config)
-		end
-
 		local function setup_ghostty_lsp()
 			-- Only activate ghostty-lsp when editing the ghostty config
 			if vim.fn.expand("%:p") == vim.fs.normalize("**/ghostty/config") then
@@ -321,25 +329,25 @@ return {
 					provideFormatter = false,
 				},
 			},
-			-- tinymist = {
-			-- 	offset_encoding = "utf-8",
-			-- 	settings = {
-			-- 		formatterMode = "typstyle",
-			-- 		exportPdf = "none",
-			-- 		outputPath = "$root/target/$dir/$name",
-			-- 		semanticTokens = "disable",
-			-- 	},
-			-- },
-			matlab_ls = {
-				indexWorkspace = true,
-				matlabConnectionTiming = "onStart",
-				telemetry = false,
-				filetypes = {
-					"matlab",
-					"octave",
+			tinymist = {
+				offset_encoding = "utf-8",
+				settings = {
+					formatterMode = "typstyle",
+					exportPdf = "none",
+					outputPath = "$root/target/$dir/$name",
+					semanticTokens = "disable",
+				},
+			},
+			-- jdtls = {},
+			markdown_oxide = {
+				capabilities = {
+					workspace = {
+						didChangeWatchedFiles = {
+							dynamicRegistration = true,
+						},
+					},
 				},
 			},
-			jdtls = {},
 		},
 	},
 }
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index 0bafa7e..5e7f143 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -1,30 +1,51 @@
+--- Adds `[]` around the string
+---@param str string
+---@param ctx table
+---@return string
+local function wrap_string(str, ctx)
+	return "[" .. str:gsub("%s+", "") .. "]"
+end
+
+local function diff_source()
+	local gitsigns = vim.b.gitsigns_status_dict
+	if gitsigns then
+		return {
+			added = gitsigns.added,
+			modified = gitsigns.changed,
+			removed = gitsigns.removed,
+		}
+	end
+end
+
 return {
 	"nvim-lualine/lualine.nvim",
+	event = "VimEnter",
 	dependencies = {
 		"nvim-tree/nvim-web-devicons",
-		"arkav/lualine-lsp-progress",
-		{ "letieu/harpoon-lualine", dependencies = {
-			"ThePrimeagen/harpoon",
-		} },
+		{
+			"linrongbin16/lsp-progress.nvim",
+			config = function()
+				require("lsp-progress").setup()
+			end,
+		},
+		"lewis6991/gitsigns.nvim",
+		{
+			"kristoferssolo/lualine-harpoon.nvim",
+			-- dir = "~/repos/lualine-harpoon.nvim/",
+			dependencies = {
+				{
+					"ThePrimeagen/harpoon",
+					branch = "harpoon2",
+				},
+			},
+		},
+		"folke/noice.nvim",
 	},
 	opts = {
 		options = {
-			icons_enabled = true,
-			theme = "auto",
 			component_separators = { left = "", right = "" },
 			section_separators = { left = "", right = "" },
-			disabled_filetypes = {
-				statusline = {},
-				winbar = {},
-			},
-			ignore_focus = {},
-			always_divide_middle = false,
-			globalstatus = true,
-			refresh = {
-				statusline = 1000,
-				tabline = 1000,
-				winbar = 1000,
-			},
+			color = { bg = "" },
 		},
 		--[[ Available components
 			`branch` (git branch)
@@ -45,24 +66,53 @@ return {
 			`tabs` (shows currently available tabs)
 			`windows` (shows currently available windows) ]]
 		sections = {
-			lualine_a = { "mode" },
-			lualine_b = { "branch" },
-			lualine_c = { "filename", "diff", "harpoon2", "lsp_progress" },
-			lualine_x = { "diagnostics", "encoding", "filetype", "filesize" },
-			lualine_y = { "progress" },
-			lualine_z = { "location" },
-		},
-		inactive_sections = {
 			lualine_a = {},
-			lualine_b = {},
-			lualine_c = { "filename" },
-			lualine_x = { "location" },
-			lualine_y = {},
+			lualine_b = {
+				{ "mode", fmt = wrap_string },
+				{ "b:gitsigns_head", icon = "" },
+			},
+			lualine_c = {
+				{
+					"filetype",
+					padding = { right = 0, left = 1 },
+					icon_only = true,
+				},
+				{
+					"filename",
+					padding = { right = 1, left = 0 },
+				},
+				{ "diff", source = diff_source },
+				"harpoon",
+			},
+			lualine_x = {
+				{
+					require("noice").api.statusline.mode.get,
+					cond = require("noice").api.statusline.mode.has,
+					color = { fg = "#f6c177" },
+				},
+				function()
+					return require("lsp-progress").progress()
+				end,
+				"diagnostics",
+			},
+			lualine_y = {
+				"filesize",
+				{
+					"location",
+					padding = 0,
+					fmt = function(str, _)
+						return "[" .. str:gsub("%s+", "") .. " "
+					end,
+				},
+				{
+					"progress",
+					padding = 0,
+					fmt = function(str, _)
+						return str:gsub("%s+", "") .. "]"
+					end,
+				},
+			},
 			lualine_z = {},
 		},
-		tabline = {},
-		winbar = {},
-		inactive_winbar = {},
-		extentions = {},
 	},
 }
diff --git a/lua/plugins/markdown.lua b/lua/plugins/markdown.lua
index c02080b..f75c1c3 100644
--- a/lua/plugins/markdown.lua
+++ b/lua/plugins/markdown.lua
@@ -1,28 +1,7 @@
 return {
-	-- {
-	-- 	"nfrid/markdown-togglecheck",
-	-- 	dependencies = { "nfrid/treesitter-utils" },
-	-- 	ft = { "markdown" },
-	-- 	keys = {
-	-- 		{
-	-- 			"<C-space>",
-	-- 			function()
-	-- 				require("markdown-togglecheck").toggle()
-	-- 			end,
-	-- 			desc = "Toggle Checkmark",
-	-- 			ft = "markdown",
-	-- 		},
-	-- 	},
-	-- 	opts = {
-	-- 		-- create empty checkbox on item without any while toggling
-	-- 		create = true,
-	-- 		-- remove checked checkbox instead of unckecking it while toggling
-	-- 		remove = false,
-	-- 	},
-	-- },
 	{
 		"tadmccorkle/markdown.nvim",
-		ft = { "markdown" },
+		ft = { "markdown", "Avante" },
 		opts = {
 			-- Disable all keymaps by setting mappings field to 'false'.
 			-- Selectively disable keymaps by setting corresponding field to 'false'.
@@ -88,6 +67,7 @@ return {
 	{
 		"OXY2DEV/markview.nvim",
 		-- enabled = false,
+		ft = { "markdown", "Avante" },
 		lazy = false,
 		opts = {
 			preview = {
diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua
new file mode 100644
index 0000000..c6ec06b
--- /dev/null
+++ b/lua/plugins/mini.lua
@@ -0,0 +1,17 @@
+return {
+	"echasnovski/mini.nvim",
+	version = "*",
+	opts = {
+		enabled = {
+			"ai",
+			-- "pairs",
+			"splitjoin",
+			"surround",
+		},
+	},
+	config = function(_, opts)
+		for _, value in ipairs(opts.enabled) do
+			require("mini." .. value).setup()
+		end
+	end,
+}
diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua
index 112392a..ced45f7 100644
--- a/lua/plugins/neogit.lua
+++ b/lua/plugins/neogit.lua
@@ -13,9 +13,9 @@ return {
 			function()
 				require("neogit").open({ kind = "split" })
 			end,
-			desc = "[G]it",
+			desc = "Git",
 		},
-		{ "<leader>gd", vim.cmd.DiffviewOpen, desc = "[G]it [D]iff" },
+		{ "<leader>gd", vim.cmd.DiffviewOpen, desc = "Git Diff" },
 	},
 	opts = {
 		-- Hides the hints at the top of the status buffer
diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua
index 3a2a6f5..90ee745 100644
--- a/lua/plugins/neorg.lua
+++ b/lua/plugins/neorg.lua
@@ -7,17 +7,42 @@ return {
 	},
 	cmd = { "Neorg" },
 	keys = {
-		{ "<C-Space>", "<Plug>(neorg.qol.todo-items.todo.task-cycle)", desc = "Cycle Todo Item", ft = { "norg" } },
+		{
+			"<C-Space>",
+			"<Plug>(neorg.qol.todo-items.todo.task-cycle)",
+			desc = "Cycle Todo Item",
+			ft = { "norg" },
+		},
 		{
 			"<LocalLeader>cm",
 			"<Plug>(neorg.looking-glass.magnify-code-block)",
 			desc = "Mignify Code Block",
 			ft = { "norg" },
 		},
-		{ "<LocalLeader>id", "<Plug>(neorg.tempus.insert-date)", desc = "Insert Date", ft = { "norg" } },
-		{ "<LocalLeader>li", "<Plug>(neorg.pivot.list.invert)", desc = "List invert", ft = { "norg" } },
-		{ "<LocalLeader>lt", "<Plug>(neorg.pivot.list.toggle)", desc = "List Toggle", ft = { "norg" } },
-		{ "<LocalLeader>nn", "<Plug>(neorg.dirman.new-note)", desc = "New Note", ft = { "norg" } },
+		{
+			"<LocalLeader>id",
+			"<Plug>(neorg.tempus.insert-date)",
+			desc = "Insert Date",
+			ft = { "norg" },
+		},
+		{
+			"<LocalLeader>li",
+			"<Plug>(neorg.pivot.list.invert)",
+			desc = "List invert",
+			ft = { "norg" },
+		},
+		{
+			"<LocalLeader>lt",
+			"<Plug>(neorg.pivot.list.toggle)",
+			desc = "List Toggle",
+			ft = { "norg" },
+		},
+		{
+			"<LocalLeader>nn",
+			"<Plug>(neorg.dirman.new-note)",
+			desc = "New Note",
+			ft = { "norg" },
+		},
 		{
 			"<LocalLeader>ta",
 			"<Plug>(neorg.qol.todo-items.todo.task-ambiguous)",
diff --git a/lua/plugins/neotest.lua b/lua/plugins/neotest.lua
index 7738b0f..c4b473f 100644
--- a/lua/plugins/neotest.lua
+++ b/lua/plugins/neotest.lua
@@ -17,14 +17,14 @@ return {
 			function()
 				require("neotest").watch.toggle(vim.fn.expand("%"))
 			end,
-			desc = "Toggle Neo[T]est",
+			desc = "Toggle NeoTest",
 		},
 		{
 			"<leader>ts",
 			function()
 				require("neotest").summary.toggle()
 			end,
-			desc = "Toggle [S]ummary",
+			desc = "Toggle Summary",
 		},
 		{
 			"<leader>tj",
diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua
new file mode 100644
index 0000000..e44482a
--- /dev/null
+++ b/lua/plugins/noice.lua
@@ -0,0 +1,45 @@
+return {
+	"folke/noice.nvim",
+	event = "VeryLazy",
+	dependencies = {
+		"MunifTanjim/nui.nvim",
+	},
+	keys = {
+		{
+			"<S-Enter>",
+			function()
+				require("noice").redirect(vim.fn.getcmdline())
+			end,
+			mode = "c",
+			desc = "Redirect Cmdline",
+		},
+	},
+	opts = {
+		cmdline = {
+			view = "cmdline",
+		},
+		routes = {
+			{
+				view = "notify",
+				filter = { event = "msg_showmode" },
+			},
+		},
+		lsp = {
+			progress = {
+				enabled = false,
+			},
+			override = {
+				["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+				["vim.lsp.util.stylize_markdown"] = true,
+				["cmp.entry.get_documentation"] = true,
+			},
+		},
+		presets = {
+			bottom_search = true, -- use a classic bottom cmdline for search
+			command_palette = false, -- position the cmdline and popupmenu together
+			long_message_to_split = true, -- long messages will be sent to a split
+			inc_rename = false, -- enables an input dialog for inc-rename.nvim
+			lsp_doc_border = true, -- add a border to hover docs and signature help
+		},
+	},
+}
diff --git a/lua/plugins/otter.lua b/lua/plugins/otter.lua
index 656cffd..8827fbb 100644
--- a/lua/plugins/otter.lua
+++ b/lua/plugins/otter.lua
@@ -3,6 +3,5 @@ return {
 	dependencies = {
 		"nvim-treesitter/nvim-treesitter",
 	},
-	enabled = false,
 	opts = {},
 }
diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
index 39aec97..4c3dede 100644
--- a/lua/plugins/snacks.lua
+++ b/lua/plugins/snacks.lua
@@ -1,5 +1,9 @@
 return {
 	"folke/snacks.nvim",
+	dependencies = {
+		"echasnovski/mini.icons",
+		"stevearc/oil.nvim",
+	},
 	priority = 1000,
 	lazy = false,
 	opts = function()
@@ -12,11 +16,11 @@ return {
 			bigfile = { enabled = true },
 			bufdelete = { enabled = true },
 			dashboard = { enabled = false },
-			debug = { enabled = false },
+			debug = { enabled = true },
 			dim = { enabled = true },
 			explorer = { enabled = false },
 			git = { enabled = false },
-			gitbrowse = { enabled = false },
+			gitbrowse = { enabled = true },
 			image = {
 				enabled = true,
 				doc = {
@@ -41,29 +45,19 @@ return {
 			scope = { enabled = false },
 			scratch = { enabled = false },
 			scroll = { enabled = false },
-			statuscolumn = { enabled = false },
+			statuscolumn = {
+				enabled = true,
+				left = { "mark", "sign", "git" },
+				right = { "fold" },
+			},
 			terminal = { enabled = false },
-			toggle = { enabled = false },
+			toggle = { enabled = true },
 			win = { enabled = false },
 			words = { enabled = true },
-			zen = { enabled = true },
+			zen = { enabled = false },
 		}
 	end,
 	keys = {
-		{
-			"<leader>zz",
-			function()
-				Snacks.zen()
-			end,
-			desc = "Toggle Zen Mode",
-		},
-		{
-			"<leader>zZ",
-			function()
-				Snacks.zen.zoom()
-			end,
-			desc = "Toggle Zoom",
-		},
 		{
 			"<leader>Nn",
 			function()
@@ -78,6 +72,13 @@ return {
 			end,
 			desc = "Profiler Scratch Bufer",
 		},
+		{
+			"<leader>gB",
+			function()
+				Snacks.gitbrowse()
+			end,
+			desc = "Git Browse",
+		},
 	},
 	init = function()
 		vim.api.nvim_create_autocmd("User", {
diff --git a/lua/plugins/spellwarn.lua b/lua/plugins/spellwarn.lua
index f150564..d2188aa 100644
--- a/lua/plugins/spellwarn.lua
+++ b/lua/plugins/spellwarn.lua
@@ -9,7 +9,7 @@ return {
 			function()
 				vim.cmd.Spellwarn("toggle")
 			end,
-			desc = "[S]pellwarn toggle",
+			desc = "Spellwarn toggle",
 		},
 	},
 
diff --git a/lua/plugins/surround.lua b/lua/plugins/surround.lua
deleted file mode 100644
index 10800f3..0000000
--- a/lua/plugins/surround.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-	"kylechui/nvim-surround",
-	version = "*", -- Use for stability; omit to use `main` branch for the latest features
-	event = "VeryLazy",
-	opts = {},
-}
diff --git a/lua/plugins/tagbar.lua b/lua/plugins/tagbar.lua
index 24e3fa1..4dea242 100644
--- a/lua/plugins/tagbar.lua
+++ b/lua/plugins/tagbar.lua
@@ -1,6 +1,6 @@
 return {
 	"preservim/tagbar",
 	keys = {
-		{ "<leader>b", vim.cmd.TagbarToggle, desc = "Toggle Tag[b]ar" },
+		{ "<leader>b", vim.cmd.TagbarToggle, desc = "Toggle Tagbar" },
 	},
 }
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 1ce714e..1be4328 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -3,19 +3,19 @@ return {
 	version = "*",
 	dependencies = {
 		"nvim-lua/plenary.nvim",
-		{ "nvim-tree/nvim-web-devicons" },
+		"nvim-tree/nvim-web-devicons",
 		{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
-		{ "nvim-telescope/telescope-media-files.nvim" },
-		{ "nvim-telescope/telescope-symbols.nvim" },
-		{ "nvim-telescope/telescope-bibtex.nvim" },
-		{ "tsakirist/telescope-lazy.nvim" },
-		{ "chip/telescope-software-licenses.nvim" },
-		{ "crispgm/telescope-heading.nvim" },
-		{ "benfowler/telescope-luasnip.nvim" },
-		{ "paopaol/telescope-git-diffs.nvim" },
+		"nvim-telescope/telescope-media-files.nvim",
+		"nvim-telescope/telescope-symbols.nvim",
+		"nvim-telescope/telescope-bibtex.nvim",
+		"tsakirist/telescope-lazy.nvim",
+		"chip/telescope-software-licenses.nvim",
+		"crispgm/telescope-heading.nvim",
+		"benfowler/telescope-luasnip.nvim",
+		"paopaol/telescope-git-diffs.nvim",
 		{ "ThePrimeagen/harpoon", branch = "harpoon2" },
-		{ "piersolenski/telescope-import.nvim" },
-		{ "nvim-telescope/telescope-frecency.nvim" },
+		"nvim-telescope/telescope-frecency.nvim",
+		"nvim-telescope/telescope-ui-select.nvim",
 	},
 	keys = {
 		{
@@ -26,7 +26,7 @@ return {
 		{
 			"<leader>pf",
 			require("telescope.builtin").find_files,
-			desc = "[F]iles",
+			desc = "Files",
 		},
 		{
 			"<leader>/",
@@ -38,70 +38,70 @@ return {
 			desc = "Current Buffer Fuzzy",
 		},
 		{ "<leader>ps", require("telescope.builtin").live_grep, desc = "Live Grep" },
-		{ "<leader>pb", require("telescope.builtin").buffers, desc = "Find [B]uffers" },
-		{ "<leader>pws", require("telescope.builtin").grep_string, desc = "[S]tring under the cursor" },
-		{ "<leader>pe", require("telescope.builtin").symbols, desc = "[E]moji" },
-		{ "<leader>pd", require("telescope.builtin").diagnostic, desc = "[D]iagnostics" },
-		{ "<leader>pB", require("telescope.builtin").git_branches, desc = "Checkout [B]ranch" },
-		{ "<leader>ph", require("telescope.builtin").help_tags, desc = "[H]elp" },
-		{ "<leader>pM", require("telescope.builtin").man_pages, desc = "[M]an Pages" },
-		{ "<leader>pr", require("telescope.builtin").oldfiles, desc = "Open [R]ecent Files" },
-		{ "<leader>pR", require("telescope.builtin").registers, desc = "[R]egisters" },
-		{ "<leader>pg", require("telescope.builtin").git_files, desc = "[G]it Files" },
-		{ "<leader>pk", require("telescope.builtin").keymaps, desc = "[K]eymaps" },
-		{ "<leader>pC", require("telescope.builtin").commands, desc = "[C]ommands" },
-		{ "<leader>pt", vim.cmd.TodoTelescope, desc = "[T]odo" },
+		{ "<leader>pb", require("telescope.builtin").buffers, desc = "Find Buffers" },
+		{ "<leader>pws", require("telescope.builtin").grep_string, desc = "String under the cursor" },
+		{ "<leader>pe", require("telescope.builtin").symbols, desc = "Emoji" },
+		{ "<leader>pd", require("telescope.builtin").diagnostic, desc = "Diagnostics" },
+		{ "<leader>pB", require("telescope.builtin").git_branches, desc = "Checkout Branch" },
+		{ "<leader>ph", require("telescope.builtin").help_tags, desc = "Help" },
+		{ "<leader>pM", require("telescope.builtin").man_pages, desc = "Man Pages" },
+		{ "<leader>pr", require("telescope.builtin").oldfiles, desc = "Open Recent Files" },
+		{ "<leader>pR", require("telescope.builtin").registers, desc = "Registers" },
+		{ "<leader>pg", require("telescope.builtin").git_files, desc = "Git Files" },
+		{ "<leader>pk", require("telescope.builtin").keymaps, desc = "Keymaps" },
+		{ "<leader>pC", require("telescope.builtin").commands, desc = "Commands" },
+		{ "<leader>pt", vim.cmd.TodoTelescope, desc = "Todo" },
 		{
 			"<leader>pm",
 			function()
 				require("telescope").extensions.media_files.media_files()
 			end,
-			desc = "[M]edia",
+			desc = "Media",
 		},
 		{
 			"<leader>pc",
 			function()
 				require("telescope.builtin").colorscheme({ enable_preview = true })
 			end,
-			desc = "[C]olorscheme with Preview",
+			desc = "Colorscheme with Preview",
 		},
 		{
 			"<leader>pl",
 			function()
 				require("telescope").extensions.lazy.lazy()
 			end,
-			desc = "[L]azy",
+			desc = "Lazy",
 		},
 		{
 			"<leader>pL",
 			function()
 				require("telescope").extensions.luasnip.luasnip()
 			end,
-			desc = "[L]uasnip",
+			desc = "Luasnip",
 		},
 		{
 			"<leader>pH",
 			function()
 				require("telescope").extensions.heading.heading()
 			end,
-			desc = "[H]eading",
+			desc = "Heading",
 		},
 		{
 			"<leader>pds",
 			"<cmd>Telescope software-licenses find<cr>",
-			desc = "[S]oftware Licenses",
+			desc = "Software Licenses",
 		},
 		{
 			"<leader>pD",
 			function()
 				require("telescope").extensions.git_diffs.diff_commits()
 			end,
-			desc = "[G]it [D]iff Telescope",
+			desc = "Git Diff Telescope",
 		},
 		{
 			"<leader>tB",
 			require("telescope.builtin").bibtex,
-			desc = "Telescope [B]ibtex",
+			desc = "Telescope Bibtex",
 		},
 	},
 	opts = {
@@ -251,17 +251,6 @@ return {
 				hide_current_buffer = true,
 				show_scores = true,
 			},
-			import = {
-				insert_at_top = true,
-				custom_languages = {
-					-- {
-					-- 	extensions = { "js", "ts" },
-					-- 	filetypes = { "vue" },
-					-- 	insert_at_line = 2,
-					-- 	regex = [[^(?:import(?:[\"'\s]*([\w*{}\n, ]+)from\s*)?[\"'\s](.*?)[\"'\s].*)]],
-					-- },
-				},
-			},
 			package_info = {
 				-- Optional theme (the extension doesn't set a default theme)
 				theme = "ivy",
@@ -274,6 +263,7 @@ return {
 		telescope.setup(opts)
 
 		pcall(telescope.load_extension, "fzf")
+		pcall(telescope.load_extension, "ui-select")
 		pcall(telescope.load_extension, "media_files") -- Telescope media_files
 		pcall(telescope.load_extension, "lazy") -- Telescope lazy
 		pcall(telescope.load_extension, "software-licenses") -- Telescope software-licenses list
diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua
index ca7d876..2a87e0b 100644
--- a/lua/plugins/todo-comments.lua
+++ b/lua/plugins/todo-comments.lua
@@ -16,7 +16,7 @@ return {
 			HACK = { icon = " ", color = "warning" },
 			WARN = { icon = " ", color = "warning", alt = { "WARNING", "XXX" } },
 			PERF = { icon = " ", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } },
-			NOTE = { icon = " ", color = "hint", alt = { "INFO" } },
+			NOTE = { icon = " ", color = "hint", alt = { "INFO", "HINT" } },
 			TEST = { icon = "⏲ ", color = "test", alt = { "TESTING", "PASSED", "FAILED" } },
 		},
 		gui_style = {
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 83396e7..9ab7c99 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -35,6 +35,7 @@ return {
 
 		highlight = {
 			enable = true,
+			disable = { "just" },
 			-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
 			-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
 			-- Using this option may slow down your editor, and you may see some duplicate highlights.
diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua
index 4613c68..acdcada 100644
--- a/lua/plugins/trouble.lua
+++ b/lua/plugins/trouble.lua
@@ -13,7 +13,7 @@ return {
 		{
 			"<leader>xd",
 			"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
-			desc = "[D]ocument Diagnostics",
+			desc = "Document Diagnostics",
 		},
 	},
 	opts = {},
diff --git a/lua/plugins/undotree.lua b/lua/plugins/undotree.lua
index c4823ce..d5e387d 100644
--- a/lua/plugins/undotree.lua
+++ b/lua/plugins/undotree.lua
@@ -1,6 +1,6 @@
 return {
 	"mbbill/undotree",
 	keys = {
-		{ "<leader>u", vim.cmd.UndotreeToggle, desc = "Toggle [U]ndotree" },
+		{ "<leader>u", vim.cmd.UndotreeToggle, desc = "Toggle Undotree" },
 	},
 }
diff --git a/lua/plugins/vimtex.lua b/lua/plugins/vimtex.lua
index 29a1003..592442f 100644
--- a/lua/plugins/vimtex.lua
+++ b/lua/plugins/vimtex.lua
@@ -3,12 +3,12 @@ return {
 	enabled = false,
 	ft = "tex",
 	keys = {
-		{ "<leader>Tb", vim.cmd.VimtexCompile, desc = "[B]uild", ft = "tex" },
-		{ "<leader>Tv", vim.cmd.VimtexView, desc = "[V]iew", ft = "tex" },
-		{ "<leader>Tw", vim.cmd.VimtexCountWords, desc = "[W]ord Count", ft = "tex" },
-		{ "<leader>Tt", vim.cmd.VimtexTocToggle, desc = "[T]able of Contents", ft = "tex" },
-		{ "<leader>Tc", vim.cmd.VimtexClean, desc = "[C]lean aux", ft = "tex" },
-		{ "<leader>Te", vim.cmd.VimtexErrors, desc = "Report [E]rrors", ft = "tex" },
-		{ "<leader>Ti", vim.cmd.VimtexInfo, desc = "[I]nfo", ft = "tex" },
+		{ "<leader>Tb", vim.cmd.VimtexCompile, desc = "Build", ft = "tex" },
+		{ "<leader>Tv", vim.cmd.VimtexView, desc = "View", ft = "tex" },
+		{ "<leader>Tw", vim.cmd.VimtexCountWords, desc = "Word Count", ft = "tex" },
+		{ "<leader>Tt", vim.cmd.VimtexTocToggle, desc = "Table of Contents", ft = "tex" },
+		{ "<leader>Tc", vim.cmd.VimtexClean, desc = "Clean aux", ft = "tex" },
+		{ "<leader>Te", vim.cmd.VimtexErrors, desc = "Report Errors", ft = "tex" },
+		{ "<leader>Ti", vim.cmd.VimtexInfo, desc = "Info", ft = "tex" },
 	},
 }
diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua
index 6e649c8..8b8003c 100644
--- a/lua/plugins/which-key.lua
+++ b/lua/plugins/which-key.lua
@@ -4,13 +4,20 @@ return {
 	dependencies = {
 		"echasnovski/mini.icons",
 	},
-	version = "*",
+	version = "v3",
+	keys = {
+		{
+			"<leader>?",
+			function()
+				require("which-key").show({ global = false })
+			end,
+			desc = "Buffer Local Keymaps (which-key)",
+		},
+	},
 	opts = {
 		preset = "modern",
 		sort = { "alphanum", "local", "order", "group", "mod", "lower", "icase" },
-		icons = {
-			rules = false,
-		},
+		icons = {},
 		defaults = {},
 		disable = {
 			ft = {},
@@ -21,44 +28,44 @@ return {
 				mode = "v",
 				"<leader>s",
 				":s///gI<Left><Left><Left><Left>",
-				desc = "[s]ubstitute word",
+				desc = "substitute word",
 			},
 			{
-				{ "<leader>c", vim.cmd.bdelete, desc = "[C]lose Buffer" },
+				{ "<leader>c", vim.cmd.bdelete, desc = "Close Buffer" },
 				{
 					"<leader>X",
 					function()
 						vim.cmd("!chmod +x %")
 					end,
-					desc = "Make E[x]ecutable",
+					desc = "Make Executable",
 				},
 				{ "<leader>x", group = "Trouble" },
-				{ "<leader>g", group = "[G]it" },
+				{ "<leader>g", group = "Git" },
 				{ "<leader>q", group = "Persistence" },
-				{ "<leader>l", group = "[L]SP" },
-				{ "<leader>w", group = "[W]orkspace" },
-				{ "<leader>p", group = "Telescope", { "<leader>pd", group = "[D]evelopment" } },
-				{ "<leader>z", group = "[Z]en" },
+				{ "<leader>l", group = "LSP" },
+				{ "<leader>w", group = "Workspace" },
+				{ "<leader>p", group = "Telescope", { "<leader>pd", group = "Development" } },
+				{ "<leader>z", group = "Zen" },
 				{ "<leader>o", group = "Action" },
-				{ "<leader>r", group = "[R]ust" },
+				{ "<leader>r", group = "Rust" },
 				{ "<leader>n", group = "Gitpat" },
-				{ "<leader>m", group = "[M]isc" },
-				{ "<leader>T", group = "Vim[T]ex" },
-				{ "<leader>N", group = "[N]otifications" },
-				{ "<leader>O", group = "[O]bsidian" },
+				{ "<leader>m", group = "Misc" },
+				{ "<leader>T", group = "VimTex" },
+				{ "<leader>N", group = "Notifications" },
+				{ "<leader>O", group = "Obsidian" },
 				{ "<leader>s", group = "Neogen" },
-				{ "<leader>t", group = "Neo[t]est" },
+				{ "<leader>t", group = "Neotest" },
 				{
 					"<leader>d",
-					group = "[D]AP",
+					group = "DAP",
 					{
 						"<leader>dp",
-						group = "[P]ython",
+						group = "Python",
 					},
 				},
 				{
 					"<leader>L",
-					group = "[L]anguate settings",
+					group = "Languate settings",
 					{ "<leader>Lc", "<cmd>setlocal formatoptions-=cro<cr>", desc = "Disable autocomment" },
 					{ "<leader>LC", "<cmd>setlocal formatoptions=cro<cr>", desc = "Enable autocomment" },
 					{ "<leader>Ls", "<cmd>setlocal spell!<cr>", desc = "Toggle spellchecker" },
@@ -73,7 +80,7 @@ return {
 					{
 						{
 							"<leader>Pl",
-							group = "[L]atex",
+							group = "Latex",
 							cond = function()
 								return vim.bo.filetype == "lua"
 							end,
diff --git a/lua/plugins/zen-mode.lua b/lua/plugins/zen-mode.lua
deleted file mode 100644
index 6bf813e..0000000
--- a/lua/plugins/zen-mode.lua
+++ /dev/null
@@ -1,63 +0,0 @@
-return {
-	"folke/zen-mode.nvim",
-	dependencies = { "lukas-reineke/indent-blankline.nvim" },
-	enabled = false,
-	keys = {
-		{
-			"<leader>zz",
-			function()
-				require("zen-mode").toggle()
-			end,
-			desc = "Toggle [Z]en Mode",
-		},
-	},
-	opts = {
-		window = {
-			backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
-			-- height and width can be:
-			-- * an absolute number of cells when > 1
-			-- * a percentage of the width / height of the editor when <= 1
-			-- * a function that returns the width or the height
-			width = 120, -- width of the Zen window
-			height = 1, -- height of the Zen window
-			-- by default, no options are changed for the Zen window
-			-- uncomment any of the options below, or add other vim.wo options you want to apply
-			options = {
-				signcolumn = "no", -- disable signcolumn
-				number = false, -- disable number column
-				relativenumber = false, -- disable relative numbers
-				cursorline = false, -- disable cursorline
-				cursorcolumn = false, -- disable cursor column
-				foldcolumn = "0", -- disable fold column
-				colorcolumn = "0", -- disable colorcolumn
-				list = false, -- disable whitespace characters
-				wrap = false, -- disable word wrap
-			},
-		},
-		plugins = {
-			-- disable some global vim options (vim.o...)
-			-- comment the lines to not apply the options
-			options = {
-				enabled = true,
-				ruler = false, -- disables the ruler text in the cmd line area
-				showcmd = false, -- disables the command in the last line of the screen
-				-- you may turn on/off statusline in zen mode by setting 'laststatus'
-				-- statusline will be shown only if 'laststatus' == 3
-				laststatus = 0, -- turn off the statusline in zen mode
-			},
-			twilight = { enabled = true }, -- enable to start Twilight when zen mode opens
-			gitsigns = { enabled = true }, -- disables git signs
-			tmux = { enabled = true }, -- disables the tmux statusline
-			alacritty = {
-				enabled = false,
-				font = "14", -- font size
-			},
-		},
-		-- callback where you can add custom code when the Zen window opens
-		on_open = function(win)
-			require("ibl").setup({ enabled = false })
-		end,
-		-- callback where you can add custom code when the Zen window closes
-		on_close = function() end,
-	},
-}
diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
index 45e5357..b4b8b78 100644
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -23,3 +23,8 @@ province
 retargeting
 remarketing
 config
+procedurally
+frequency
+Distributivity
+Associativity
+Commutativity
diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl
index d91762d..455da3a 100644
Binary files a/spell/en.utf-8.add.spl and b/spell/en.utf-8.add.spl differ
diff --git a/spell/lv.utf-8.add b/spell/lv.utf-8.add
index 9b9bd13..b1329d4 100644
--- a/spell/lv.utf-8.add
+++ b/spell/lv.utf-8.add
@@ -463,3 +463,106 @@ rodas
 Dota
 triviāla
 iterācijas
+zīmolu
+zīmola
+atļauties
+ekskluzivitāti
+prezentēts
+piedalās
+zīmoli
+tiecas
+skeptisms
+cenšas
+izceļ
+atzītākajiem
+pašapliecināšanās
+dzīvesstilu
+iejusties
+justies
+neatņemama
+dzīvesstila
+patīkams
+ekskluzivitātes
+piesaiste
+burtiski
+izcelties
+demogrāfiskā
+Visticamāk
+āra
+zīmoliem
+pārvēršas
+pieaugošiem
+draudiem
+negatīvām
+Burtiska
+Pieskaras
+pozicionēts
+visticamāk
+viesstrādnieku
+būvmateriālu
+viesstrādniekiem
+stereotipisku
+distancējas
+pozicionētu
+remontdarbus
+protekcionistiskiem
+negatīva
+stereotipizējošais
+ilgtermiņā
+Viesstrādnieks
+viesstrādnieks
+Stereotipiskais
+metaforisku
+negatīvo
+pozicionē
+Stereotipizācija
+stereotipiski
+kariķitēti
+noniecinošu
+Zīmols
+logo
+nepārprotami
+nepārprotams
+negatīvi
+aizskarošs
+noniecinošs
+nepieļauj
+Distancējoties
+rūpējas
+sociālekonomisks
+negatīvam
+avioreisu
+birokrātisko
+atklāj
+birokrātiskais
+skeptiskumu
+kliedz
+slēpjas
+priviliģētu
+atšķiras
+komerclidojumiem
+svinību
+bezrūpības
+steidzamu
+glancēts
+komercreisu
+priviliģēto
+atpūsties
+sarkastiska
+sakot
+pašsaprotamu
+atgriež
+iterācijā
+beidzies
+Visātrāk
+pieaugošais
+iteration
+iteration
+iteration
+iteration
+iteration
+pieskaras
+pakāpes
+pakāpes
+pakāpes
+pakāpes
diff --git a/spell/lv.utf-8.add.spl b/spell/lv.utf-8.add.spl
index b26d889..c7aa974 100644
Binary files a/spell/lv.utf-8.add.spl and b/spell/lv.utf-8.add.spl differ