diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 63d3861c..5df11179 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -19,7 +19,7 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "codeium.vim": { "branch": "main", "commit": "7b2f57ba35bbff7dabd5e3eaa6e60d0490516c78" },
   "compiler.nvim": { "branch": "main", "commit": "aa6c75ab5dd246b06899a665d21b0f91e6241718" },
-  "conform.nvim": { "branch": "master", "commit": "55abaaa9ed4684cd9ba8f0c062379be6cf41b8f3" },
+  "conform.nvim": { "branch": "master", "commit": "4897996612adeb9cb39325f95c9b0481ce892edf" },
   "crates.nvim": { "branch": "main", "commit": "aac57ef84cf4fecf7907114b22e875f84a6128ee" },
   "dial.nvim": { "branch": "master", "commit": "019bbe9daea397c93a99adc747f8f071379fee5c" },
   "diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" },
@@ -39,6 +39,8 @@
   "indent-blankline.nvim": { "branch": "master", "commit": "8a7b48f5823cc924f815129192288ec2e2b9288f" },
   "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" },
   "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" },
+  "lsp-lens.nvim": { "branch": "main", "commit": "296e0d33dddba1a1de9b69143f189cb994111c5a" },
+  "lsp-timeout.nvim": { "branch": "main", "commit": "9a28c3fe10a5db856f5e5ac505afcfe79b49934e" },
   "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" },
@@ -57,7 +59,7 @@
   "neoconf.nvim": { "branch": "main", "commit": "0e6b0a9fd9030ec6f13bf98c4b0ed87230e42928" },
   "neodev.nvim": { "branch": "main", "commit": "b094a663ccb71733543d8254b988e6bebdbdaca4" },
   "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
-  "neotest": { "branch": "master", "commit": "455155f65e3397022a7b23cc3e152b43a6fc5d23" },
+  "neotest": { "branch": "master", "commit": "901891484db3d46ce43d56871273dc7d40621356" },
   "neotest-go": { "branch": "main", "commit": "1a15e1136db43775214a3e7a598f8930c29c94b7" },
   "neotest-jest": { "branch": "main", "commit": "65ab61c77aa1c245f16982ffe1a4d31589e18023" },
   "neotest-mocha": { "branch": "main", "commit": "68f0e9768a94c3ebd4d5e67b2765e6a5df017d99" },
@@ -79,7 +81,7 @@
   "nvim-jdtls": { "branch": "master", "commit": "a09f8cdd75c546eb024d0f0b5b3ad185f05b738f" },
   "nvim-jqx": { "branch": "master", "commit": "11b1d0368e5b23b9c356da8e5f70bb5827f27f62" },
   "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
-  "nvim-lint": { "branch": "master", "commit": "09aa3289a7b288f3077be682b2d910060014504f" },
+  "nvim-lint": { "branch": "master", "commit": "e236bd9401709f1cfff7b9951445d965658fa3dc" },
   "nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" },
   "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
   "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" },
@@ -87,7 +89,7 @@
   "nvim-regexplainer": { "branch": "main", "commit": "187f8666c2ba0fcba4ddb991e48d7229b0a58d96" },
   "nvim-spectre": { "branch": "master", "commit": "696cff781a4a7ecc91549736835e2acbd00fe859" },
   "nvim-toggleterm.lua": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" },
-  "nvim-treesitter": { "branch": "master", "commit": "1bfefd1f98dae54576a54b59b42379b275a00414" },
+  "nvim-treesitter": { "branch": "master", "commit": "4a68f0778c05083cc458a3a144205cfc41474439" },
   "nvim-treesitter-context": { "branch": "master", "commit": "8aa32aa6b84dda357849dbc0f775e69f2e04c041" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "23f3840b7520e009121b3175f528178136dd9834" },
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 4794ad68..701f71d6 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -27,6 +27,7 @@
     "plugins.extras.annotation",
     "plugins.extras.breadcrumbs",
     "plugins.extras.codeium",
+    "plugins.extras.color",
     "plugins.extras.compiler",
     "plugins.extras.db",
     "plugins.extras.discordrcp",
@@ -34,11 +35,14 @@
     "plugins.extras.git",
     "plugins.extras.github",
     "plugins.extras.harpoon",
+    "plugins.extras.multicursor",
     "plugins.extras.rainbow-delimeters",
+    "plugins.extras.refactor",
     "plugins.extras.rest-client",
     "plugins.extras.scrollbar",
     "plugins.extras.smooth-scrolling",
     "plugins.extras.test-extended",
+    "plugins.extras.web",
     "plugins.extras.zen-mode"
   ],
   "news": {
diff --git a/.config/nvim/lua/plugins/context.lua b/.config/nvim/lua/plugins/context.lua
deleted file mode 100644
index ffd8bad9..00000000
--- a/.config/nvim/lua/plugins/context.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-  {
-    "nvim-treesitter/nvim-treesitter-context",
-    event = "LazyFile",
-    enabled = true,
-    opts = { mode = "cursor" },
-  },
-}
diff --git a/.config/nvim/lua/plugins/endwise.lua b/.config/nvim/lua/plugins/endwise.lua
deleted file mode 100644
index 7c6b9bc6..00000000
--- a/.config/nvim/lua/plugins/endwise.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-    {
-        "RRethy/nvim-treesitter-endwise",
-        event = "BufRead",
-    },
-}
diff --git a/.config/nvim/lua/plugins/ccc.lua b/.config/nvim/lua/plugins/extras/color.lua
similarity index 100%
rename from .config/nvim/lua/plugins/ccc.lua
rename to .config/nvim/lua/plugins/extras/color.lua
diff --git a/.config/nvim/lua/plugins/refactor.lua b/.config/nvim/lua/plugins/extras/refactor.lua
similarity index 92%
rename from .config/nvim/lua/plugins/refactor.lua
rename to .config/nvim/lua/plugins/extras/refactor.lua
index 7636e99d..fb1d54ed 100644
--- a/.config/nvim/lua/plugins/refactor.lua
+++ b/.config/nvim/lua/plugins/extras/refactor.lua
@@ -29,4 +29,10 @@ return {
       },
     },
   },
+  {
+    "nvim-telescope/telescope.nvim",
+    opts = function(_, opts)
+      require("telescope").load_extension("refactoring")
+    end,
+  },
 }
diff --git a/.config/nvim/lua/plugins/live-server.lua b/.config/nvim/lua/plugins/extras/web.lua
similarity index 69%
rename from .config/nvim/lua/plugins/live-server.lua
rename to .config/nvim/lua/plugins/extras/web.lua
index 32002e62..1790bdfb 100644
--- a/.config/nvim/lua/plugins/live-server.lua
+++ b/.config/nvim/lua/plugins/extras/web.lua
@@ -9,4 +9,10 @@ return {
       { "<leader>cL", "<cmd>LiveServer<CR>", desc = "LiveServer" },
     },
   },
+  {
+    "barrett-ruth/import-cost.nvim",
+    build = "sh install.sh yarn",
+    event = "BufReadPost",
+    config = true,
+  },
 }
diff --git a/.config/nvim/lua/plugins/glance.lua b/.config/nvim/lua/plugins/glance.lua
deleted file mode 100644
index ed85191f..00000000
--- a/.config/nvim/lua/plugins/glance.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  {
-    "dnlhc/glance.nvim",
-    cmd = { "Glance" },
-    opts = {
-      border = {
-        enable = true,
-      },
-    },
-  },
-}
diff --git a/.config/nvim/lua/plugins/import-cost.lua b/.config/nvim/lua/plugins/import-cost.lua
deleted file mode 100644
index 1787fa5d..00000000
--- a/.config/nvim/lua/plugins/import-cost.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-    {
-        "barrett-ruth/import-cost.nvim",
-        build = "sh install.sh yarn",
-        event = "BufReadPost",
-        config = true,
-    },
-}
diff --git a/.config/nvim/lua/plugins/lightbulb.lua b/.config/nvim/lua/plugins/lightbulb.lua
deleted file mode 100644
index 40f9e25e..00000000
--- a/.config/nvim/lua/plugins/lightbulb.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-return {
-  {
-    "kosayoda/nvim-lightbulb",
-    event = "BufReadPre",
-    opts = {
-      sign = {
-        enabled = false,
-        priority = 10,
-      },
-      float = {
-        enabled = true,
-        text = "💡",
-        win_opts = {},
-      },
-      virtual_text = {
-        enabled = false,
-        text = "💡",
-      },
-    },
-  },
-}
diff --git a/.config/nvim/lua/plugins/lsp-lens.lua b/.config/nvim/lua/plugins/lsp-lens.lua
deleted file mode 100644
index cfce508a..00000000
--- a/.config/nvim/lua/plugins/lsp-lens.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-  {
-    "VidocqH/lsp-lens.nvim",
-    event = "BufReadPost",
-    enabled = false,
-    opts = {},
-  },
-}
diff --git a/.config/nvim/lua/plugins/lsp-timeout.lua b/.config/nvim/lua/plugins/lsp-timeout.lua
deleted file mode 100644
index b742a30b..00000000
--- a/.config/nvim/lua/plugins/lsp-timeout.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-  {
-    "hinell/lsp-timeout.nvim",
-    event = "BufRead",
-    dependencies = { "neovim/nvim-lspconfig" },
-    enabled = false,
-    init = function()
-      vim.g["lsp-timeout-config"] = {
-        startTimeout = 1000 * 1, -- ms before restart
-      }
-    end,
-  },
-}
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index 2efbcbe2..73efce97 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -174,4 +174,42 @@ return {
       },
     },
   },
+  {
+    "kosayoda/nvim-lightbulb",
+    event = "BufReadPre",
+    opts = {
+      sign = {
+        enabled = false,
+        priority = 10,
+      },
+      float = {
+        enabled = true,
+        text = "💡",
+        win_opts = {},
+      },
+      virtual_text = {
+        enabled = false,
+        text = "💡",
+      },
+    },
+  },
+  {
+    "hinell/lsp-timeout.nvim",
+    event = "BufRead",
+    enabled = false,
+    dependencies = { "neovim/nvim-lspconfig" },
+    init = function()
+      vim.g["lsp-timeout-config"] = {
+        startTimeout = 1000 * 1, -- ms before restart
+      }
+    end,
+  },
+  {
+    "VidocqH/lsp-lens.nvim",
+    event = "BufReadPost",
+    opts = {},
+    keys = {
+      { "<leader>ue", "<cmd>LspLensToggle<cr>", desc = "Toggle Lsp Lens" },
+    },
+  },
 }
diff --git a/.config/nvim/lua/plugins/nerdy.lua b/.config/nvim/lua/plugins/nerdy.lua
deleted file mode 100644
index 8387e1a5..00000000
--- a/.config/nvim/lua/plugins/nerdy.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-    {
-        "2kabhishek/nerdy.nvim",
-        dependencies = {
-            "stevearc/dressing.nvim",
-            "nvim-telescope/telescope.nvim",
-        },
-        cmd = "Nerdy",
-        keys = {
-            { "<leader>sN", "<cmd>Nerdy<cr>", desc = "Nerd Fonts" },
-        },
-    },
-}
diff --git a/.config/nvim/lua/plugins/none-ls.lua b/.config/nvim/lua/plugins/none-ls.lua
deleted file mode 100644
index a6b67898..00000000
--- a/.config/nvim/lua/plugins/none-ls.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-return {
-  {
-    "nvimtools/none-ls.nvim",
-    enabled = false,
-    opts = function(_, opts)
-      local nls = require("null-ls")
-
-      opts.sources = opts.sources or {}
-      vim.list_extend(opts.sources, {
-        nls.builtins.formatting.beautysh,
-        nls.builtins.formatting.black,
-        nls.builtins.formatting.csharpier,
-        nls.builtins.formatting.rustywind,
-        nls.builtins.formatting.sqlfmt,
-        nls.builtins.formatting.rustfmt,
-        nls.builtins.formatting.fish_indent,
-        nls.builtins.formatting.taplo,
-        nls.builtins.diagnostics.fish,
-        --nls.builtins.diagnostics.cspell,
-        --nls.builtins.code_actions.cspell,
-        nls.builtins.hover.dictionary,
-        nls.builtins.hover.printenv,
-        --nls.builtins.diagnostics.markuplint,
-        nls.builtins.diagnostics.markdownlint,
-        --nls.builtins.diagnostics.codespell,
-      })
-    end,
-  },
-}
diff --git a/.config/nvim/lua/plugins/puppeteer.lua b/.config/nvim/lua/plugins/puppeteer.lua
deleted file mode 100644
index 7c1f4126..00000000
--- a/.config/nvim/lua/plugins/puppeteer.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
-    {
-        "chrisgrieser/nvim-puppeteer",
-        dependencies = "nvim-treesitter/nvim-treesitter",
-        lazy = false,
-    },
-}
diff --git a/.config/nvim/lua/plugins/symbol-usage.lua b/.config/nvim/lua/plugins/symbol-usage.lua
deleted file mode 100644
index ce822897..00000000
--- a/.config/nvim/lua/plugins/symbol-usage.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-  {
-    "Wansmer/symbol-usage.nvim",
-    event = "BufReadPre",
-    enabled = false,
-    config = function()
-      require("symbol-usage").setup()
-    end,
-  },
-}
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index 1c44f27f..f698173c 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -5,6 +5,16 @@ return {
   {
     "nvim-telescope/telescope.nvim",
     dependencies = {
+      {
+        "2kabhishek/nerdy.nvim",
+        dependencies = {
+          "stevearc/dressing.nvim",
+        },
+        cmd = "Nerdy",
+        keys = {
+          { "<leader>sN", "<cmd>Nerdy<cr>", desc = "Nerd Fonts" },
+        },
+      },
       {
         "nvim-telescope/telescope-fzf-native.nvim",
         build = "make",
@@ -407,7 +417,6 @@ return {
     },
     opts = {
       defaults = {
-
         mappings = {
           i = {
             ["<C-k>"] = actions.move_selection_previous,
@@ -450,7 +459,6 @@ return {
           },
         },
       },
-      require("telescope").load_extension("refactoring"),
     },
   },
   {
@@ -463,4 +471,12 @@ return {
       },
     },
   },
+  {
+    "axieax/urlview.nvim",
+    cmd = { "UrlView" },
+    keys = { { "<leader>su", "<cmd>UrlView<cr>", desc = "Search Urls" } },
+    opts = {
+      default_picker = "telescope",
+    },
+  },
 }
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
index 508b6b8b..dc66445e 100644
--- a/.config/nvim/lua/plugins/treesitter.lua
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -71,4 +71,19 @@ return {
       },
     },
   },
+  {
+    "RRethy/nvim-treesitter-endwise",
+    event = "BufRead",
+  },
+  {
+    "nvim-treesitter/nvim-treesitter-context",
+    event = "LazyFile",
+    enabled = true,
+    opts = { mode = "cursor" },
+  },
+  {
+    "chrisgrieser/nvim-puppeteer",
+    dependencies = "nvim-treesitter/nvim-treesitter",
+    lazy = false,
+  },
 }
diff --git a/.config/nvim/lua/plugins/urlview.lua b/.config/nvim/lua/plugins/urlview.lua
deleted file mode 100644
index e0e926c4..00000000
--- a/.config/nvim/lua/plugins/urlview.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-  {
-    "axieax/urlview.nvim",
-    cmd = { "UrlView" },
-    keys = { { "<leader>su", "<cmd>UrlView<cr>", desc = "Search Urls" } },
-    opts = {
-      default_picker = "telescope",
-    },
-  },
-}
diff --git a/.config/nvim/lua/plugins/wildfire.lua b/.config/nvim/lua/plugins/wildfire.lua
deleted file mode 100644
index 2ba77f95..00000000
--- a/.config/nvim/lua/plugins/wildfire.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  {
-    "sustech-data/wildfire.nvim",
-    event = "VeryLazy",
-    enabled = false,
-    dependencies = { "nvim-treesitter/nvim-treesitter" },
-    config = function()
-      require("wildfire").setup()
-    end,
-  },
-}