diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua
index 57650fa..0d1ed17 100644
--- a/lua/core/mappings.lua
+++ b/lua/core/mappings.lua
@@ -35,9 +35,9 @@ vim.keymap.set("n", "<C-Home>", ":BufferLineCyclePrev<CR>", opts)
 --- General mappings ---
 -- yank/put using named register
 vim.keymap.set("n", "<leader>y", '"0y', opts)
-vim.keymap.set("v", "<leader>y", '"0y', opts)
+vim.keymap.set("x", "<leader>y", '"0y', opts)
 vim.keymap.set("n", "<leader>p", '"0p', opts)
-vim.keymap.set("v", "<leader>p", '"0p', opts)
+vim.keymap.set("x", "<leader>p", '"0p', opts)
 -- Allow exiting insert mode in terminal by hitting <ESC>
 vim.keymap.set("t", "<Esc>", "<C-\\><C-n>", opts)
 -- Navigate forward/backwards
@@ -45,9 +45,9 @@ vim.keymap.set("n", "<C-l>", "<C-i>", opts)
 vim.keymap.set("n", "<C-h>", "<C-o>", opts)
 -- Use :diffput/get instead of normal one to allow staging visual selection
 vim.keymap.set("n", "<leader>dp", "&diff ? ':diffput<CR>' : '<leader>dp'", opts_expr)
-vim.keymap.set("v", "<leader>dp", "&diff ? ':diffput<CR>' : '<leader>dp'", opts_expr)
+vim.keymap.set("x", "<leader>dp", "&diff ? ':diffput<CR>' : '<leader>dp'", opts_expr)
 vim.keymap.set("n", "<leader>do", "&diff ? ':diffget<CR>' : '<leader>do'", opts_expr)
-vim.keymap.set("v", "<leader>do", "&diff ? ':diffget<CR>' : '<leader>do'", opts_expr)
+vim.keymap.set("x", "<leader>do", "&diff ? ':diffget<CR>' : '<leader>do'", opts_expr)
 
 -- Remove default mappings
 vim.keymap.set("", "<C-LeftMouse>", "")
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index ba1c41f..2a4cfc4 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -188,7 +188,7 @@ function P.on_attach(client, bufnr)
     vim.keymap.set("n", "<leader>rn", ca_rename, opts)
     vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts)
     vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
-    vim.keymap.set({ "n", "v", }, "<leader>lf", function () vim.lsp.buf.format({ async = true, }) end, opts)
+    vim.keymap.set({ "n", "x", }, "<leader>lf", function () vim.lsp.buf.format({ async = true, }) end, opts)
     -- if client.server_capabilities.document_range_formatting then
     -- end
 
diff --git a/lua/plugin/config/gitsigns.lua b/lua/plugin/config/gitsigns.lua
index 088bbad..e4f277d 100644
--- a/lua/plugin/config/gitsigns.lua
+++ b/lua/plugin/config/gitsigns.lua
@@ -26,7 +26,7 @@ require("gitsigns").setup({
     on_attach = function (bufnr)
         local gs = package.loaded.gitsigns
         map(bufnr, "n", "<leader>gv", gs.select_hunk)
-        map(bufnr, { "n", "v", }, "<leader>gr", ":Gitsigns reset_hunk<CR>") -- gs.reset_hunk() doesn't work with selected lines
+        map(bufnr, { "n", "x", }, "<leader>gr", ":Gitsigns reset_hunk<CR>") -- gs.reset_hunk() doesn't work with selected lines
         map(bufnr, "n", "<leader>g?", gs.preview_hunk)
         map(bufnr, "n", "<leader>gb", function ()
             gs.blame_line { full = true, }