diff --git a/colors.vim b/colors.vim
index b3231a3..6541af9 100644
--- a/colors.vim
+++ b/colors.vim
@@ -2,25 +2,34 @@
 set t_Co=16
 
 " Code
-highlight Cursor      ctermfg=14
-highlight Keyword     ctermfg=06
-highlight Define      ctermfg=06
-highlight Comment     ctermfg=03
-highlight Type        ctermfg=08
-highlight Operator    ctermfg=05
-highlight Identifier  ctermfg=13
-highlight Constant    ctermfg=11
-highlight Function    ctermfg=01
-highlight Include     ctermfg=06
-highlight Statement   ctermfg=06
-highlight String      ctermfg=03
+highlight Cursor           ctermfg=14
+highlight Keyword          ctermfg=06
+highlight Define           ctermfg=06
+highlight Comment          ctermfg=03
+highlight Type             ctermfg=08
+highlight Operator         ctermfg=05
+highlight Identifier       ctermfg=13
+highlight Constant         ctermfg=11
+highlight Function         ctermfg=01
+highlight Include          ctermfg=06
+highlight Statement        ctermfg=06
+highlight String           ctermfg=03
 
 " Editor UI
-highlight NonText     ctermfg=00
-highlight Visual      ctermfg=none  ctermbg=00
-highlight VertSplit   ctermfg=08    cterm=none
-highlight Search      ctermfg=00    ctermbg=10
-highlight LineNr      ctermfg=08
-highlight Pmenu       ctermfg=12    ctermbg=00
+highlight NonText          ctermfg=00
+highlight Visual           ctermfg=none  ctermbg=00
+highlight VertSplit        ctermfg=08    ctermbg=none
+highlight Search           ctermfg=none  ctermbg=00
+highlight LineNr           ctermfg=08
+highlight Pmenu            ctermfg=12    ctermbg=00
+
+" Spelling
+highlight SpellBad         ctermfg=01    ctermbg=00    cterm=underline
+highlight SpellCap         ctermfg=03                  cterm=underline
+
+" Neomake
+highlight NeomakeWarning   ctermfg=03                  cterm=underline
+highlight ErrorMsg         ctermfg=01    ctermbg=none
+highlight WarningMsg       ctermfg=03
 
 set fillchars+=vert:│