diff --git a/.config/nvim/lua/tovi/core/options.lua b/.config/nvim/lua/tovi/core/options.lua
index cd1cc7b..3f5f6fe 100644
--- a/.config/nvim/lua/tovi/core/options.lua
+++ b/.config/nvim/lua/tovi/core/options.lua
@@ -6,7 +6,7 @@ vim.opt.hlsearch = false
 vim.opt.incsearch = true
 vim.opt.ignorecase = true
 
-vim.opt.mouse = 'a'
+vim.opt.mouse = 'nv'
 vim.opt.smartcase = true
 vim.opt.linebreak = true
 
@@ -31,13 +31,17 @@ vim.opt.scrolloff = 8
 vim.opt.signcolumn = 'yes'
 vim.opt.isfname:append('@-@')
 
+vim.opt.pumheight = 10
+
 vim.opt.updatetime = 50
 
 vim.opt.colorcolumn = "80"
+vim.opt.cursorline = true
 
 vim.opt.formatoptions = 'tqj'
 
 vim.opt.splitbelow = true
 vim.opt.splitright = true
+vim.opt.diffopt:append('vertical')
 
 vim.opt.termguicolors = true
diff --git a/.config/nvim/lua/tovi/core/remaps.lua b/.config/nvim/lua/tovi/core/remaps.lua
index 5279ff8..850cb77 100644
--- a/.config/nvim/lua/tovi/core/remaps.lua
+++ b/.config/nvim/lua/tovi/core/remaps.lua
@@ -14,8 +14,9 @@ vim.keymap.set("n", "<leader>o", function()
     vim.cmd("setlocal spell! spelllang=en_au")
 end, { desc = "Toggle spell check" })
 
--- Map Q to nop
-vim.keymap.set("n", "Q", "<nop>", { desc = "Remap Q to <nop> because Q is the worst" })
+-- Map Q to run q macro
+vim.keymap.set("n", "Q", "@q", { desc = "Remap Q to run @q macro" })
+vim.keymap.set("x", "Q", ":norm @q<CR>", { desc = "Remap Q to run @q macro" })
 
 -- Keep highlight when indenting
 vim.keymap.set("v", "<", "<gv", { desc = "Keep highlight when indenting" })