diff --git a/symlinks/config/nvim/plugin/statusline.vim b/symlinks/config/nvim/plugin/statusline.vim
index 1cc7d8c..bce66bf 100644
--- a/symlinks/config/nvim/plugin/statusline.vim
+++ b/symlinks/config/nvim/plugin/statusline.vim
@@ -5,45 +5,45 @@
 function s:UpdateColors()
     let ctermbg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'cterm')
     let guibg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'gui')
-    let idguifg1 = synIDattr(synIDtrans(hlID('String')), 'fg', 'gui')
-    let idctermfg1 = synIDattr(synIDtrans(hlID('String')), 'fg', 'cterm')
-    " Green in darcula
+    let idguifg1 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'gui')
+    let idctermfg1 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'cterm')
+    " Green in gruvbox
     exec 'hi User1 guifg=' . l:idguifg1 .
                 \' guibg=' . l:guibg .
                 \' cterm=bold gui=bold'
     if l:idctermfg1
         exec 'hi User1 ctermfg=' . l:idctermfg1
     endif
-    let idguifg2 = synIDattr(synIDtrans(hlID('ErrorMsg')), 'fg', 'gui')
-    let idctermfg2 = synIDattr(synIDtrans(hlID('ErrorMsg')), 'fg', 'cterm')
-    " Red in darcula
+    let idguifg2 = synIDattr(synIDtrans(hlID('WarningMsg')), 'fg', 'gui')
+    let idctermfg2 = synIDattr(synIDtrans(hlID('WarningMsg')), 'fg', 'cterm')
+    " Red in gruvbox
     exec 'hi User2 guifg=' . l:idguifg2 .
                 \' guibg=' . l:guibg .
                 \' cterm=bold gui=bold'
     if l:idctermfg2
         exec 'hi User2 ctermfg=' . l:idctermfg2
     endif
-    let idguifg3 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'gui')
-    let idctermfg3 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'cterm')
-    " Yellow in darcula
+    let idguifg3 = synIDattr(synIDtrans(hlID('MoreMsg')), 'fg', 'gui')
+    let idctermfg3 = synIDattr(synIDtrans(hlID('MoreMsg')), 'fg', 'cterm')
+    " Yellow in gruvbox
     exec 'hi User3 guifg=' . l:idguifg3 .
                 \' guibg=' . l:guibg .
                 \' cterm=bold gui=bold'
     if l:idctermfg3
         exec 'hi User3 ctermfg=' . l:idctermfg3
     endif
-    let idguifg4 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'gui')
-    let idctermfg4 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'cterm')
-    " Blue in darcula
+    let idguifg4 = synIDattr(synIDtrans(hlID('Identifier')), 'fg', 'gui')
+    let idctermfg4 = synIDattr(synIDtrans(hlID('Identifier')), 'fg', 'cterm')
+    " Blue in gruvbox
     exec 'hi User4 guifg=' . l:idguifg4
                 \' guibg=' . l:guibg .
                 \' cterm=bold gui=bold'
     if l:idctermfg4
         exec 'hi User4 ctermfg=' . l:idctermfg4
     endif
-    let idguifg5 = synIDattr(synIDtrans(hlID('Constant')), 'fg', 'gui')
-    let idctermfg5 = synIDattr(synIDtrans(hlID('Constant')), 'fg', 'cterm')
-    " Purple in darcula
+    let idguifg5 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'gui')
+    let idctermfg5 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'cterm')
+    " Blue in gruvbox
     exec 'hi User5 guifg=' . l:idguifg5 .
                 \' guibg=' . l:guibg .
                 \' cterm=bold gui=bold'
diff --git a/symlinks/vim/plugin/statusline.vim b/symlinks/vim/plugin/statusline.vim
index 1cc7d8c..699d0b0 100644
--- a/symlinks/vim/plugin/statusline.vim
+++ b/symlinks/vim/plugin/statusline.vim
@@ -3,61 +3,48 @@
 " -----------------------------------------------------------------------------
 
 function s:UpdateColors()
-    let ctermbg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'cterm')
-    let guibg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'gui')
-    let idguifg1 = synIDattr(synIDtrans(hlID('String')), 'fg', 'gui')
-    let idctermfg1 = synIDattr(synIDtrans(hlID('String')), 'fg', 'cterm')
-    " Green in darcula
+    let ctermbg = synIDattr(synIDtrans(hlID('StatusLine')), 'fg', 'cterm')
+    let guibg = synIDattr(synIDtrans(hlID('StatusLine')), 'fg', 'gui')
+    let idguifg1 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'gui')
+    let idctermfg1 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'cterm')
+    " Green in gruvbox
     exec 'hi User1 guifg=' . l:idguifg1 .
+                \' ctermfg=' . l:idctermfg1 .
                 \' guibg=' . l:guibg .
+                \' ctermbg=' . l:ctermbg .
                 \' cterm=bold gui=bold'
-    if l:idctermfg1
-        exec 'hi User1 ctermfg=' . l:idctermfg1
-    endif
-    let idguifg2 = synIDattr(synIDtrans(hlID('ErrorMsg')), 'fg', 'gui')
-    let idctermfg2 = synIDattr(synIDtrans(hlID('ErrorMsg')), 'fg', 'cterm')
-    " Red in darcula
+    let idguifg2 = synIDattr(synIDtrans(hlID('WarningMsg')), 'fg', 'gui')
+    let idctermfg2 = synIDattr(synIDtrans(hlID('WarningMsg')), 'fg', 'cterm')
+    " Red in gruvbox
     exec 'hi User2 guifg=' . l:idguifg2 .
+                \' ctermfg=' . l:idctermfg2 .
                 \' guibg=' . l:guibg .
+                \' ctermbg=' . l:ctermbg .
                 \' cterm=bold gui=bold'
-    if l:idctermfg2
-        exec 'hi User2 ctermfg=' . l:idctermfg2
-    endif
-    let idguifg3 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'gui')
-    let idctermfg3 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'cterm')
-    " Yellow in darcula
+    let idguifg3 = synIDattr(synIDtrans(hlID('MoreMsg')), 'fg', 'gui')
+    let idctermfg3 = synIDattr(synIDtrans(hlID('MoreMsg')), 'fg', 'cterm')
+    " Yellow in gruvbox
     exec 'hi User3 guifg=' . l:idguifg3 .
+                \' ctermfg=' . l:idctermfg3 .
                 \' guibg=' . l:guibg .
+                \' ctermbg=' . l:ctermbg .
                 \' cterm=bold gui=bold'
-    if l:idctermfg3
-        exec 'hi User3 ctermfg=' . l:idctermfg3
-    endif
-    let idguifg4 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'gui')
-    let idctermfg4 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'cterm')
-    " Blue in darcula
-    exec 'hi User4 guifg=' . l:idguifg4
+    let idguifg4 = synIDattr(synIDtrans(hlID('Identifier')), 'fg', 'gui')
+    let idctermfg4 = synIDattr(synIDtrans(hlID('Identifier')), 'fg', 'cterm')
+    " Blue in gruvbox
+    exec 'hi User4 guifg=' . l:idguifg4 .
+                \' ctermfg=' . l:idctermfg4 .
                 \' guibg=' . l:guibg .
+                \' ctermbg=' . l:ctermbg .
                 \' cterm=bold gui=bold'
-    if l:idctermfg4
-        exec 'hi User4 ctermfg=' . l:idctermfg4
-    endif
-    let idguifg5 = synIDattr(synIDtrans(hlID('Constant')), 'fg', 'gui')
-    let idctermfg5 = synIDattr(synIDtrans(hlID('Constant')), 'fg', 'cterm')
-    " Purple in darcula
+    let idguifg5 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'gui')
+    let idctermfg5 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'cterm')
+    " Blue in gruvbox
     exec 'hi User5 guifg=' . l:idguifg5 .
+                \' ctermfg=' . l:idctermfg5 .
                 \' guibg=' . l:guibg .
+                \' ctermbg=' . l:ctermbg .
                 \' cterm=bold gui=bold'
-    if l:idctermfg5
-        exec 'hi User5 ctermfg=' . l:idctermfg5
-    endif
-
-    if l:ctermbg
-        exec 'hi User1 ctermbg=' . l:ctermbg
-        exec 'hi User2 ctermbg=' . l:ctermbg
-        exec 'hi User3 ctermbg=' . l:ctermbg
-        exec 'hi User4 ctermbg=' . l:ctermbg
-        exec 'hi User5 ctermbg=' . l:ctermbg
-    endif
 endfunction
 
 augroup statuslineconf
@@ -144,7 +131,7 @@ function! s:LinterStatus() abort
     let l:all_errors = l:counts.error + l:counts.style_error
     let l:all_non_errors = l:counts.total - l:all_errors
 
-    return l:counts.total == 0 ? '%1*OK%*' : printf(
+    return l:counts.total == 0 ? '%1* OK %*' : printf(
     \   '%%3*%dW%%* %%2*%dE%%*',
     \   all_non_errors,
     \   all_errors
diff --git a/symlinks/vim/plugins.vim b/symlinks/vim/plugins.vim
index cd322ce..7426d9a 100644
--- a/symlinks/vim/plugins.vim
+++ b/symlinks/vim/plugins.vim
@@ -45,7 +45,7 @@ Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'mhinz/vim-grepper'
 Plug 'direnv/direnv.vim'
-Plug 'doums/darcula'
+Plug 'flazz/vim-colorschemes'
 Plug 'tpope/vim-speeddating'
 
 " -----------------------------------------------------------------------------
diff --git a/symlinks/vim/vimrc b/symlinks/vim/vimrc
index 00b415b..00d22e1 100644
--- a/symlinks/vim/vimrc
+++ b/symlinks/vim/vimrc
@@ -43,8 +43,7 @@ set number
 set relativenumber
 " This has been killing vim until it was resized
 " set lines=50 columns=100
-set termguicolors
-colorscheme darcula
+colorscheme gruvbox
 set background=dark
 set guifont=SauceCodePro\ Nerd\ Font:h12