diff --git a/lua/keybinds.lua b/lua/keybinds.lua
index c875b40..5f4a455 100644
--- a/lua/keybinds.lua
+++ b/lua/keybinds.lua
@@ -3,6 +3,10 @@ vim.keymap.set("n", "<C-j>", "<C-w><C-j>", { desc = "Go to split above" })
 vim.keymap.set("n", "<C-k>", "<C-w><C-k>", { desc = "Go to split below" })
 vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Go to split on right" })
 
+vim.keymap.set("n", "<leader>|", "<C-w>v", { desc = "Split window right" })
+vim.keymap.set("n", "<leader>-", "<C-w>s", { desc = "Split window below" })
+vim.keymap.set("n", "<leader>wd", "<C-w>c", { desc = "Delete window" })
+
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move lines under cursor up" })
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move lines under cursor down" })
 
@@ -14,7 +18,4 @@ vim.keymap.set("x", "<Leader>p", "\"_dP", { desc = "Paste without replacing clip
 vim.keymap.set("n", "<Leader>y", "\"*y", { desc = "Yank into system clipboard" })
 vim.keymap.set("v", "<Leader>y", "\"*y", { desc = "Yank into system clipboard" })
 
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
-    { desc = "Like `ciw` for any highlighted text (doesn't have to be word)" })
-
 vim.keymap.set("i", "jk", "<Esc>", { desc = "Exit insert mode" })
diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua
index a8a64e2..0e0ab2a 100644
--- a/lua/plugins/coding.lua
+++ b/lua/plugins/coding.lua
@@ -65,12 +65,12 @@ return {
         version = false,
         opts = {
             mappings = {
-                add = "gsa", -- Add surrounding in Normal and Visual modes
-                delete = "gsd", -- Delete surrounding
-                find = "gsf", -- Find surrounding (to the right)
-                find_left = "gsF", -- Find surrounding (to the left)
-                highlight = "gsh", -- Highlight surrounding
-                replace = "gsr", -- Replace surrounding
+                add = "gsa",            -- Add surrounding in Normal and Visual modes
+                delete = "gsd",         -- Delete surrounding
+                find = "gsf",           -- Find surrounding (to the right)
+                find_left = "gsF",      -- Find surrounding (to the left)
+                highlight = "gsh",      -- Highlight surrounding
+                replace = "gsr",        -- Replace surrounding
                 update_n_lines = "gsn", -- Update `n_lines`
             },
         },
diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua
index 4af3788..13ee7e6 100644
--- a/lua/plugins/editor.lua
+++ b/lua/plugins/editor.lua
@@ -98,7 +98,9 @@ return {
             vim.keymap.set("n", "<Leader>fg", builtin.live_grep, { desc = "Grep git_files" })
             vim.keymap.set("n", "<Leader>fh", builtin.help_tags, { desc = "View help tags" })
             vim.keymap.set("n", "<Leader>fb", builtin.buffers, { desc = "Search buffers" })
+            vim.keymap.set("n", "<Leader>sk", builtin.keymaps, { desc = "Resume" })
             vim.keymap.set("n", "<Leader>sR", builtin.resume, { desc = "Resume" })
+            vim.keymap.set("n", "<Leader>st", "<cmd>TodoTelescope<cr>", { desc = "Search TODOs" })
         end,
     },
     {