diff --git a/.config/nvim/lua/plugins/extras/editor/search-replace.lua b/.config/nvim/lua/plugins/extras/editor/search-replace.lua
index 8d80c024..1b524e16 100644
--- a/.config/nvim/lua/plugins/extras/editor/search-replace.lua
+++ b/.config/nvim/lua/plugins/extras/editor/search-replace.lua
@@ -10,8 +10,11 @@ return {
   { "<C-s>", "<CMD>SearchReplaceWithinVisualSelection<CR>", desc = "Search and Replace Within Visual Selection", mode = "v" },
   { "<C-b>", "<CMD>SearchReplaceWithinVisualSelectionCWord<CR>", desc = "Search and Replace Within Visual Selection (Current Word)", mode = "v" },
 
-  {  "<leader>srw", "<CMD>SearchReplaceSingleBufferSelections<CR>", desc = "Word on Buffer", mode = "n" },
   {  "<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" },
diff --git a/.config/nvim/lua/plugins/spectre.lua b/.config/nvim/lua/plugins/spectre.lua
index 14c33975..7382ceb2 100644
--- a/.config/nvim/lua/plugins/spectre.lua
+++ b/.config/nvim/lua/plugins/spectre.lua
@@ -6,8 +6,8 @@ return {
     -- stylua: ignore
     keys = {
       { "<leader>srg", function() require("spectre").toggle() end, desc = "Globally" },
-      { "<leader>srW", mode = { "n" }, function() require("spectre").open_visual({ select_word = true }) end, desc = "Word Globally" },
-      { "<leader>srW", mode = { "v" }, function() require("spectre").open_visual() end, desc = "Word Globally" },
+      { "<leader>srG", mode = { "n" }, function() require("spectre").open_visual({ select_word = true }) end, desc = "Word Globally" },
+      { "<leader>srG", mode = { "v" }, function() require("spectre").open_visual() end, desc = "Word Globally" },
     },
   },
   {