diff --git a/lua/core/remap.lua b/lua/core/remap.lua
index e928142..0b85d74 100644
--- a/lua/core/remap.lua
+++ b/lua/core/remap.lua
@@ -25,6 +25,8 @@ vim.api.nvim_set_keymap("n", "<leader>bp", "<cmd>bprevious<cr>", {})
 -- quickfix operations
 vim.api.nvim_set_keymap("n", "<leader>qc", "<cmd>ccl<cr>", {})
 vim.api.nvim_set_keymap("n", "<leader>qw", "<cmd>cw<cr>", {})
+vim.api.nvim_set_keymap("n", "<leader>cn", "<cmd>cnext<cr>", {})
+vim.api.nvim_set_keymap("n", "<leader>cp", "<cmd>cprev<cr>", {})
 
 -- moving visual blocks
 vim.api.nvim_set_keymap("v", "J", ":m '>+1<cr>gv=gv", {})
@@ -59,6 +61,13 @@ vim.api.nvim_set_keymap("n", "<leader>XX", ":qa!<cr>", {})
 vim.api.nvim_set_keymap("n", "<leader>XZZ", ":wqa!<cr>", {})
 vim.api.nvim_set_keymap("n", "<leader>x", ":q<cr>", {})
 
+-- faster substitution
+vim.api.nvim_set_keymap("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+-- single line
+vim.api.nvim_set_keymap("n", "<leader>S", [[:s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+-- selection mode
+vim.api.nvim_set_keymap("v", "<leader>s", [[:s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+
 -- vertical resize
 vim.api.nvim_set_keymap("n", "<leader>vr", ":vertical-resize ", {})