diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua
index 5b9473b..be5da19 100644
--- a/nvim/lua/config/keymaps.lua
+++ b/nvim/lua/config/keymaps.lua
@@ -32,9 +32,10 @@ end, { expr = true })
 
 vim.api.nvim_create_autocmd("Filetype", {
   pattern = "lua",
-  group = vim.api.nvim_create_augroup("RunLua", { clear = true }),
+  group = vim.api.nvim_create_augroup("Execute Lua", { clear = true }),
   callback = function()
-    vim.keymap.set("n", "<leader>x", "<cmd>. lua<cr>", { buffer = true })
-    vim.keymap.set("n", "<leader><leader>x", "<cmd>% lua<cr>", { buffer = true })
+    vim.keymap.set("n", "<leader>x", "<cmd>.lua<cr>", { buffer = true })
+    vim.keymap.set("x", "<leader>x", ":lua<cr>", { buffer = true })
+    vim.keymap.set("n", "<leader><leader>x", "<cmd>%lua<cr>", { buffer = true })
   end,
 })
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index 1098974..2d2e062 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -35,3 +35,11 @@ opt.fillchars = { eob = " " }
 
 opt.exrc = true
 opt.mouse = "a"
+
+vim.api.nvim_create_autocmd("TextYankPost", {
+  pattern = "*",
+  group = vim.api.nvim_create_augroup("Highlight on Yank", { clear = true }),
+  callback = function()
+    vim.highlight.on_yank()
+  end
+})