diff --git a/vimrc b/vimrc
index 7400333..2b13f27 100644
--- a/vimrc
+++ b/vimrc
@@ -9,6 +9,9 @@ color solarized
 
 set background=dark
 
+" FIX: Spell check highlighting broke for some reason
+hi SpellBad ctermfg=white ctermbg=red
+
 set ai et si sts=2 sw=2 ts=2
 set hid
 set hls ic is
@@ -19,7 +22,8 @@ set undodir=~/.local/share/vim/undo,/tmp
 set undofile
 
 autocmd FileType php setl sts=4 sw=4 ts=4
-autocmd FileType gitcommit,markdown,text setl nosi spell tw=80 wm=2
+autocmd FileType gitcommit,markdown,text setl nosi spell
+autocmd FileType markdown,text setl tw=80 wm=2
 
 autocmd BufWritePre * :%s/\s\+$//e