diff --git a/vimrc b/vimrc
index 28641b7..d478172 100644
--- a/vimrc
+++ b/vimrc
@@ -3,12 +3,13 @@ set background:dark
 colorscheme earendel
 
 au BufRead ~/.mutt/temp/mutt-* set tw=72
+au BufRead .git/COMMIT_EDITMSG set tw=72
 
 autocmd FileType make setlocal noexpandtab
 autocmd BufWritePre *.php :%s/\s\+$//e
 
 " Highlight everything right of the 80th column
-highlight rightMargin ctermfg=darkred guifg=darkred
+highlight rightMargin ctermfg=red guifg=red
 autocmd BufWinEnter * let w:m1=matchadd('rightMargin', '\%>79v', -1)
 " Highlight all trailing whitespace
 highlight trailWhite ctermbg=darkgray guibg=darkgray