diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index fa430449..efb32066 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -46,7 +46,7 @@
   "import-cost.nvim": { "branch": "main", "commit": "39ef36f438574db0b26e9c957316eb1cb22e970f" },
   "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" },
   "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
-  "kitty-scrollback.nvim": { "branch": "main", "commit": "f9605398313077553433754adea1ed486107cdfa" },
+  "kitty-scrollback.nvim": { "branch": "main", "commit": "78dd609368aa20bd6fbd801cce73ea30787ebe21" },
   "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
   "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" },
   "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" },
@@ -65,7 +65,7 @@
   "multicursors.nvim": { "branch": "main", "commit": "8e876fe9db46c1b76c151202b418df21eca07bad" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a" },
   "neoconf.nvim": { "branch": "main", "commit": "e169205e76a2c19480906b66d747a569dc2af86b" },
-  "neodev.nvim": { "branch": "main", "commit": "a09881379ac7abddb8091c5edd292805a53ccf18" },
+  "neodev.nvim": { "branch": "main", "commit": "365ef03dbf5b8579e6eb205b3500fc3bee17484a" },
   "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
   "neotest": { "branch": "master", "commit": "89a5b1fc22ee5d459262955fe564c3d14e35fd67" },
   "neotest-bash": { "branch": "main", "commit": "2eaad2ae4577fadf4af1eec32ec169d0fb2698bb" },
@@ -79,7 +79,7 @@
   "nvim-ansible": { "branch": "main", "commit": "d115cb9bb3680c990e2684f58cf333663fff03b8" },
   "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" },
   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
-  "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" },
+  "nvim-dap": { "branch": "master", "commit": "3b4bdea2c0e9ed356d8cffbf974f3d0af891bbea" },
   "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" },
   "nvim-dap-python": { "branch": "master", "commit": "f5b6f3a90aae0284b61fb3565e575267c19a16e6" },
   "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
@@ -90,15 +90,15 @@
   "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
   "nvim-lint": { "branch": "master", "commit": "966ab3dc37eee3e413692264b44a3011b05a6060" },
   "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" },
-  "nvim-lspconfig": { "branch": "master", "commit": "76251e810256dce4db531c98b8b746a38c0ed488" },
+  "nvim-lspconfig": { "branch": "master", "commit": "c656fe5a58b9eae474f61d294648a897d53639cc" },
   "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" },
-  "nvim-origami": { "branch": "main", "commit": "4ec426ce4b0aad0303af44909f86e075dd65c615" },
+  "nvim-origami": { "branch": "main", "commit": "8615cdc4c97aaeb8c7723a49f48e9c44d749034a" },
   "nvim-puppeteer": { "branch": "main", "commit": "c9e7a941ac389a5e25f713ad0fe8b9371f0572ce" },
   "nvim-recorder": { "branch": "main", "commit": "bf9efe10bff3ae8461568eee7f0d6c8750b01569" },
   "nvim-regexplainer": { "branch": "main", "commit": "78fff711edcb986a05a03253c28a90e32c4ce31f" },
   "nvim-scissors": { "branch": "main", "commit": "beee2944a9055b3a182d66b74b6d3db9e13a9126" },
   "nvim-spectre": { "branch": "master", "commit": "6a0785ef64c839d935a2f92e20988e962fb6537e" },
-  "nvim-treesitter": { "branch": "master", "commit": "10d79b5dbbdffc3edf307b189284fb62e2e79a3e" },
+  "nvim-treesitter": { "branch": "master", "commit": "883c72cddc34195a3b916905f6e61d789ddd3599" },
   "nvim-treesitter-context": { "branch": "master", "commit": "f2ef98cd18fca352448756d3feb6e58d82583274" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" },
@@ -142,7 +142,7 @@
   "telescope-luasnip.nvim": { "branch": "master", "commit": "2ef7da3a363890686dbaad18ddbf59177cfe4f78" },
   "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
   "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" },
-  "telescope.nvim": { "branch": "master", "commit": "0f865f17af4f9bc1587a0132414cdfd32d91852e" },
+  "telescope.nvim": { "branch": "master", "commit": "eb88dc6434194bd8eebfcc6ade5dd36e850849ce" },
   "text-case.nvim": { "branch": "main", "commit": "5d85b7495c3cf8e842e4d2528edc68e6fe7c92c8" },
   "theme-loader.nvim": { "branch": "master", "commit": "ad8774ec8267a447d469b4e6603b43f49b946e53" },
   "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
@@ -167,7 +167,7 @@
   "vim-wakatime": { "branch": "master", "commit": "a4c66faea1eca47dce7c7c3586332f75cfbe9edf" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
   "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" },
-  "workspace-diagnostics.nvim": { "branch": "main", "commit": "ed04f40ec2ca55a9dab42ef0e4d3e7b655b752cd" },
+  "workspace-diagnostics.nvim": { "branch": "main", "commit": "9548a0ad133698be0a591980df253cf5d948407f" },
   "yanky.nvim": { "branch": "main", "commit": "7c5cbf0122ff2dfbb6a92f14885894f65949cc8b" },
   "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
 }
\ No newline at end of file
diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json
new file mode 100644
index 00000000..78ac4e3b
--- /dev/null
+++ b/config/nvim/lazyvim.json
@@ -0,0 +1,111 @@
+{
+  "extras": [
+    "lazyvim.plugins.extras.lang.python-semshi",
+    "lazyvim.plugins.extras.lang.yaml",
+    "lazyvim.plugins.extras.ui.edgy",
+    "lazyvim.plugins.extras.util.dot",
+    "plugins.extras.coding.ai.codeium",
+    "plugins.extras.coding.ai.gpt",
+    "plugins.extras.coding.annotation",
+    "plugins.extras.coding.cmp.autopairs",
+    "plugins.extras.coding.cmp.dotenv",
+    "plugins.extras.coding.cmp.under-comparator",
+    "plugins.extras.coding.debugprint",
+    "plugins.extras.coding.dial",
+    "plugins.extras.coding.multicursor",
+    "plugins.extras.coding.recorder",
+    "plugins.extras.coding.refactoring",
+    "plugins.extras.coding.snippets",
+    "plugins.extras.coding.sniprun",
+    "plugins.extras.coding.treesitter.endwise",
+    "plugins.extras.coding.treesitter.mini-align",
+    "plugins.extras.coding.treesitter.node-action",
+    "plugins.extras.coding.treesitter.puppeteer",
+    "plugins.extras.coding.treesitter.text-case",
+    "plugins.extras.coding.treesitter.various-textobjs",
+    "plugins.extras.coding.yanky",
+    "plugins.extras.dap.core",
+    "plugins.extras.dap.persistent-breakpoints",
+    "plugins.extras.dap.telescope",
+    "plugins.extras.editor.carbon-now",
+    "plugins.extras.editor.color",
+    "plugins.extras.editor.compiler",
+    "plugins.extras.editor.dev-container",
+    "plugins.extras.editor.docs.devdocs",
+    "plugins.extras.editor.fold",
+    "plugins.extras.editor.git.diffview",
+    "plugins.extras.editor.git.github",
+    "plugins.extras.editor.git.worktree",
+    "plugins.extras.editor.harpoon",
+    "plugins.extras.editor.live-server",
+    "plugins.extras.editor.oil",
+    "plugins.extras.editor.outline",
+    "plugins.extras.editor.package-info",
+    "plugins.extras.editor.regex",
+    "plugins.extras.editor.rest-client",
+    "plugins.extras.editor.search-replace",
+    "plugins.extras.editor.ssr",
+    "plugins.extras.editor.suda",
+    "plugins.extras.editor.telescope.all-recent",
+    "plugins.extras.editor.telescope.import",
+    "plugins.extras.editor.telescope.lazy",
+    "plugins.extras.editor.telescope.luasnip",
+    "plugins.extras.editor.telescope.undotree",
+    "plugins.extras.editor.telescope.urlview",
+    "plugins.extras.editor.telescope.zoxide",
+    "plugins.extras.editor.terminal.floaterm",
+    "plugins.extras.formatting.prettier-extended",
+    "plugins.extras.formatting.trim_newlines",
+    "plugins.extras.formatting.trim_whitespace",
+    "plugins.extras.lang.ansible",
+    "plugins.extras.lang.bash",
+    "plugins.extras.lang.docker-extended",
+    "plugins.extras.lang.git",
+    "plugins.extras.lang.go-extended",
+    "plugins.extras.lang.markdown-extended",
+    "plugins.extras.lang.python-extended",
+    "plugins.extras.lang.rust-extended",
+    "plugins.extras.lang.sql",
+    "plugins.extras.lang.web.html-css",
+    "plugins.extras.lang.web.tailwind-extended",
+    "plugins.extras.lang.web.typescript-extended",
+    "plugins.extras.lang.web.vue",
+    "plugins.extras.linting.biome",
+    "plugins.extras.linting.cspell",
+    "plugins.extras.linting.eslint-extended",
+    "plugins.extras.lsp.actions-preview",
+    "plugins.extras.lsp.file-operations",
+    "plugins.extras.lsp.garbage-day",
+    "plugins.extras.lsp.glance",
+    "plugins.extras.lsp.inc-rename",
+    "plugins.extras.lsp.lens",
+    "plugins.extras.lsp.lightbulb",
+    "plugins.extras.lsp.workspace-diagnostics",
+    "plugins.extras.test.core",
+    "plugins.extras.ui.breadcrumbs",
+    "plugins.extras.ui.colorschemes.catppuccin",
+    "plugins.extras.ui.comment-box",
+    "plugins.extras.ui.context",
+    "plugins.extras.ui.highlight-undo",
+    "plugins.extras.ui.import-cost",
+    "plugins.extras.ui.rainbow-delimeters",
+    "plugins.extras.ui.smooth-scrolling",
+    "plugins.extras.ui.windows",
+    "plugins.extras.ui.zen-mode",
+    "plugins.extras.util.bigfile",
+    "plugins.extras.util.discordrcp",
+    "plugins.extras.util.dotfyle",
+    "plugins.extras.util.icon-picker",
+    "plugins.extras.util.kitty-scrollback",
+    "plugins.extras.util.neovide",
+    "plugins.extras.util.smart-splits",
+    "plugins.extras.util.speedtyper",
+    "plugins.extras.util.vim-be-good",
+    "plugins.extras.util.vscode",
+    "plugins.extras.util.wakatime"
+  ],
+  "news": {
+    "NEWS.md": "2123"
+  },
+  "version": 2
+}
\ No newline at end of file
diff --git a/config/nvim/lua/plugins/extras/editor/harpoon.lua b/config/nvim/lua/plugins/extras/editor/harpoon.lua
index e28df367..7175df07 100644
--- a/config/nvim/lua/plugins/extras/editor/harpoon.lua
+++ b/config/nvim/lua/plugins/extras/editor/harpoon.lua
@@ -7,14 +7,14 @@ end
 
 table.insert(keys, { "<leader>ha", function() require("harpoon"):list():append() end, desc = "Add Mark" })
 table.insert(keys, { "<leader>hh", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, desc = "Menu" })
-table.insert(keys, { "<leader>hf", "<cmd>Telescope harpoon marks<CR>", desc = "Files" })
+table.insert(keys, { "<leader>hf", "<cmd>Telescope harpoon marks<CR>", desc = "Files (Telescope)" })
+table.insert(keys, { "hc", function() require("harpoon"):list():clear() end, desc = "Clear all Files" })
 
 table.insert(keys, { "]H", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" })
 table.insert(keys, { "[H", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" })
 
 table.insert(keys, { "<C-A-l>", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" })
 table.insert(keys, { "<C-A-h>", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" })
-table.insert(keys, { "hc", function() require("harpoon"):list():clear() end, desc = "Clear all Files" })
 -- stylua: ignore end
 
 return {
diff --git a/config/nvim/lua/plugins/extras/editor/rest-client.lua b/config/nvim/lua/plugins/extras/editor/rest-client.lua
index 3d9691c1..003f32df 100644
--- a/config/nvim/lua/plugins/extras/editor/rest-client.lua
+++ b/config/nvim/lua/plugins/extras/editor/rest-client.lua
@@ -63,12 +63,6 @@ return {
       { "<leader>sv", function() require("telescope").extensions.rest.select_env() end, desc = "Env Files" },
     },
   },
-  {
-    "nvim-lualine/lualine.nvim",
-    opts = function(_, opts)
-      table.insert(opts.sections.lualine_x, 2, "rest")
-    end,
-  },
   {
     "folke/which-key.nvim",
     opts = {