diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index f3cfdfce..c8a3b214 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -29,8 +29,6 @@
     "plugins.extras.editor.marks.grapple",
     "plugins.extras.editor.neo-tree-extended",
     "plugins.extras.editor.package-info",
-    "plugins.extras.editor.search-replace",
-    "plugins.extras.editor.spectre-extended",
     "plugins.extras.editor.suda",
     "plugins.extras.editor.telescope.lazy",
     "plugins.extras.editor.telescope.telescope-extended",
@@ -79,7 +77,7 @@
     "plugins.extras.util.yadm"
   ],
   "news": {
-    "NEWS.md": "6077"
+    "NEWS.md": "6296"
   },
   "version": 6
 }
\ No newline at end of file
diff --git a/.config/nvim/lua/plugins/extras/editor/search-replace.lua b/.config/nvim/lua/plugins/extras/editor/search-replace.lua
index 243e31e4..f413cba5 100644
--- a/.config/nvim/lua/plugins/extras/editor/search-replace.lua
+++ b/.config/nvim/lua/plugins/extras/editor/search-replace.lua
@@ -1,26 +1,40 @@
 return {
-  "roobert/search-replace.nvim",
-  opts = {
-    default_replace_single_buffer_options = "gcI",
-    default_replace_multi_buffer_options = "egcI",
+  {
+    "roobert/search-replace.nvim",
+    opts = {
+      default_replace_single_buffer_options = "gcI",
+      default_replace_multi_buffer_options = "egcI",
+    },
+    -- stylua: ignore
+    keys = {
+    { "<leader>srb", "<CMD>SearchReplaceSingleBufferVisualSelection<CR>", desc = "Buffer", mode = "v" },
+    { "<leader>srv", "<CMD>SearchReplaceWithinVisualSelection<CR>", desc = "Visual Selection", mode = "v" },
+    { "<leader>srw", "<CMD>SearchReplaceWithinVisualSelectionCWord<CR>", desc = "Word on Buffer", mode = "v" },
+
+    { "<leader>srb", "<CMD>SearchReplaceSingleBufferOpen<CR>", desc = "Buffer", mode = "n" },
+    { "<leader>srw", "<CMD>SearchReplaceSingleBufferCWord<CR>", desc = "Word on Buffer", mode = "n" },
+    { "<leader>srW", "<CMD>SearchReplaceSingleBufferCWORD<CR>", desc = "WORD on Buffer", mode = "n" },
+    { "<leader>sre", "<CMD>SearchReplaceSingleBufferCExpr<CR>", desc = "Expression on Buffer", mode = "n" },
+    { "<leader>srf", "<CMD>SearchReplaceSingleBufferCFile<CR>", desc = "File on Buffer", mode = "n" },
+
+    -- { "n", "<leader>rbs", "<CMD>SearchReplaceMultiBufferSelections<CR>", desc = "Search and Replace in Multi Buffer Selections" },
+    -- { "n", "<leader>rbo", "<CMD>SearchReplaceMultiBufferOpen<CR>", desc = "Search and Replace in Multi Buffer, Open" },
+    -- { "n", "<leader>rbw", "<CMD>SearchReplaceMultiBufferCWord<CR>", desc = "Search and Replace in Multi Buffer (Current Word)" },
+    -- { "n", "<leader>rbW", "<CMD>SearchReplaceMultiBufferCWORD<CR>", desc = "Search and Replace in Multi Buffer (Current WORD)" },
+    -- { "n", "<leader>rbe", "<CMD>SearchReplaceMultiBufferCExpr<CR>", desc = "Search and Replace in Multi Buffer (Current Expression)" },
+    -- { "n", "<leader>rbf", "<CMD>SearchReplaceMultiBufferCFile<CR>", desc = "Search and Replace in Multi Buffer (Current File)" },
+    },
   },
-  -- stylua: ignore
-  keys = {
-  { "<leader>srb", "<CMD>SearchReplaceSingleBufferVisualSelection<CR>", desc = "Buffer", mode = "v" },
-  { "<leader>srv", "<CMD>SearchReplaceWithinVisualSelection<CR>", desc = "Visual Selection", mode = "v" },
-  { "<leader>srw", "<CMD>SearchReplaceWithinVisualSelectionCWord<CR>", desc = "Word on Buffer", mode = "v" },
-
-  {  "<leader>srb", "<CMD>SearchReplaceSingleBufferOpen<CR>", desc = "Buffer", mode = "n" },
-  {  "<leader>srw", "<CMD>SearchReplaceSingleBufferCWord<CR>", desc = "Word on Buffer", mode = "n" },
-  {  "<leader>srW", "<CMD>SearchReplaceSingleBufferCWORD<CR>", desc = "WORD on Buffer", mode = "n" },
-  {  "<leader>sre", "<CMD>SearchReplaceSingleBufferCExpr<CR>", desc = "Expression on Buffer", mode = "n" },
-  {  "<leader>srf", "<CMD>SearchReplaceSingleBufferCFile<CR>", desc = "File on Buffer", mode = "n" },
-
-  -- { "n", "<leader>rbs", "<CMD>SearchReplaceMultiBufferSelections<CR>", desc = "Search and Replace in Multi Buffer Selections" },
-  -- { "n", "<leader>rbo", "<CMD>SearchReplaceMultiBufferOpen<CR>", desc = "Search and Replace in Multi Buffer, Open" },
-  -- { "n", "<leader>rbw", "<CMD>SearchReplaceMultiBufferCWord<CR>", desc = "Search and Replace in Multi Buffer (Current Word)" },
-  -- { "n", "<leader>rbW", "<CMD>SearchReplaceMultiBufferCWORD<CR>", desc = "Search and Replace in Multi Buffer (Current WORD)" },
-  -- { "n", "<leader>rbe", "<CMD>SearchReplaceMultiBufferCExpr<CR>", desc = "Search and Replace in Multi Buffer (Current Expression)" },
-  -- { "n", "<leader>rbf", "<CMD>SearchReplaceMultiBufferCFile<CR>", desc = "Search and Replace in Multi Buffer (Current File)" },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      spec = {
+        { "<leader>sr", group = "replace", icon = " " },
+      },
+    },
+  },
+  {
+    "MagicDuck/grug-far.nvim",
+    enabled = false,
   },
 }
diff --git a/.config/nvim/lua/plugins/extras/editor/spectre-extended.lua b/.config/nvim/lua/plugins/extras/editor/spectre.lua
similarity index 86%
rename from .config/nvim/lua/plugins/extras/editor/spectre-extended.lua
rename to .config/nvim/lua/plugins/extras/editor/spectre.lua
index 72fdf86d..0bfb56af 100644
--- a/.config/nvim/lua/plugins/extras/editor/spectre-extended.lua
+++ b/.config/nvim/lua/plugins/extras/editor/spectre.lua
@@ -1,8 +1,10 @@
 return {
   {
     "nvim-pack/nvim-spectre",
+    build = false,
     cmd = "Spectre",
     opts = {
+      open_cmd = "noswapfile vnew",
       default = {
         find = {
           cmd = "rg",
@@ -28,4 +30,8 @@ return {
       },
     },
   },
+  {
+    "MagicDuck/grug-far.nvim",
+    enabled = false,
+  },
 }