diff --git a/after/plugin/bufdelete.lua b/after/plugin/bufdelete.lua
index 3bfda1f6..81e759c5 100644
--- a/after/plugin/bufdelete.lua
+++ b/after/plugin/bufdelete.lua
@@ -1,3 +1,2 @@
-vim.keymap.set("n", "<S-q>", "<cmd>Bdelete<CR>")
 vim.keymap.set("n", "<leader>bd", "<cmd>Bdelete<CR>")
 vim.keymap.set("n", "<leader>bD", "<cmd>Bdelete!<CR>")
diff --git a/after/plugin/remap.lua b/after/plugin/remap.lua
index cdd2e625..b8596464 100644
--- a/after/plugin/remap.lua
+++ b/after/plugin/remap.lua
@@ -21,10 +21,6 @@ vim.keymap.set("n", "<leader>Y", [["+Y]])
 vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
 
 vim.keymap.set("i", "<C-c>", "<Esc>")
-vim.keymap.set({ "i", "x" }, "kj", "<Esc>")
-vim.keymap.set("i", "<C-d>", "<C-o>de")
-vim.keymap.set("i", "<C-h>", "<Backspace>")
-vim.keymap.set("i", "<C-l>", "<Del>")
 
 vim.keymap.set("n", "<leader>f", vim.lsp.buf.format,
     { desc = "LSP: format buffer" })
@@ -32,3 +28,6 @@ vim.keymap.set("n", "<leader>f", vim.lsp.buf.format,
 vim.keymap.set("n", "<leader>ru",
     [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
     { desc = "[R]eplace word [U]nder cursor" })
+
+vim.keymap.set("n", "S", ":w<cr>")
+vim.keymap.set("n", "Q", ":q<cr>")
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 86a96275..64b63476 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -12,6 +12,7 @@ return {
   "famiu/bufdelete.nvim",
   "tpope/vim-repeat",
   "tpope/vim-unimpaired",
+  "tpope/vim-rsi",
   "JoosepAlviste/nvim-ts-context-commentstring",
   "sindrets/diffview.nvim",
   "rhysd/git-messenger.vim",