diff --git a/vimrc b/vimrc
index 03b4c05..7033707 100644
--- a/vimrc
+++ b/vimrc
@@ -160,9 +160,6 @@ if has('mouse')
 endif
 
 if has('autocmd')
-   " unhighlight search when idle
-   autocmd CursorHold * nohls | redraw
-
    " always refresh syntax from the start
    autocmd BufEnter * syntax sync fromstart
 
@@ -248,8 +245,11 @@ map Y y$
 vmap K k
 
 " :W and :Q are annoying
-cmap W w
-cmap Q q
+command! -nargs=0 -bang X x<bang>
+command! -nargs=0 -bang Q q<bang>
+command! -nargs=0 -bang W w<bang>
+command! -nargs=0 -bang WQ wq<bang>
+command! -nargs=0 -bang Wq wq<bang>
 
 " just continue
 nmap K K<cr>
@@ -257,6 +257,7 @@ nmap K K<cr>
 " Toggle numbers with F12
 nmap <silent> <F12> :silent set number!<CR>
 imap <silent> <F12> <C-O>:silent set number!<CR>
+noremap <silent> <F4> :set hls!<CR>
 
 " Don't force column 0 for #
 inoremap # X<BS>#