diff --git a/home/.vimrc b/home/.vimrc
index bd9750a..110211e 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -14,10 +14,6 @@ set ignorecase
 " Autoload settings from file
 set modeline
 
-" Highlight trailing spaces and spaces before tabs
-highlight ExtraWhitespace ctermbg=red guibg=red
-autocmd BufWinEnter * match ExtraWhitespace /\s\+$\| \+\ze\t/
-
 " Jump to the last position
 if has("autocmd")
   au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
@@ -47,6 +43,9 @@ let g:airline_powerline_fonts = 1
 let g:airline_solarized_bg='dark'
 let g:airline_theme='solarized'
 
+" Trailing whitespace highlighting
+Plug 'ntpeters/vim-better-whitespace'
+
 " Syntax highlighting/Language support
 Plug 'ElmCast/elm-vim', { 'for': 'elm' }
 Plug 'Glench/Vim-Jinja2-Syntax', { 'for': 'jinja' }