diff --git a/.vim/colors/zellnerbrb.vim b/.vim/colors/zellnerbrb.vim
new file mode 100644
index 0000000..8bc69f5
--- /dev/null
+++ b/.vim/colors/zellnerbrb.vim
@@ -0,0 +1,54 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" Last Change:	2003 May 02
+
+set background=light
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "zellnerbrb"
+
+hi Comment term=bold ctermfg=Red guifg=Red
+hi Normal guifg=black guibg=white
+hi Constant term=underline ctermfg=Magenta guifg=Magenta
+hi Special term=bold ctermfg=Magenta guifg=Magenta
+hi Identifier term=underline ctermfg=Blue guifg=Blue
+hi Statement term=bold ctermfg=DarkRed gui=NONE guifg=Brown
+hi PreProc term=underline ctermfg=Magenta guifg=Purple
+hi Type term=underline ctermfg=Blue gui=NONE guifg=Blue
+hi Visual term=reverse ctermfg=Black ctermbg=Red gui=NONE guifg=Black guibg=Yellow
+hi Search term=reverse ctermfg=Black ctermbg=Cyan gui=NONE guifg=Black guibg=Cyan
+hi Tag term=bold ctermfg=DarkGreen guifg=DarkGreen
+hi Error term=reverse ctermfg=15 ctermbg=9 guibg=Red guifg=White
+hi Todo term=standout ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow
+hi  StatusLine term=bold,reverse cterm=NONE ctermfg=Yellow ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray
+hi! link MoreMsg Comment
+hi! link ErrorMsg Visual
+hi! link WarningMsg ErrorMsg
+hi! link Question Comment
+hi link String	Constant
+hi link Character	Constant
+hi link Number	Constant
+hi link Boolean	Constant
+hi link Float		Number
+hi link Function	Identifier
+hi link Conditional	Statement
+hi link Repeat	Statement
+hi link Label		Statement
+hi link Operator	Statement
+hi link Keyword	Statement
+hi link Exception	Statement
+hi link Include	PreProc
+hi link Define	PreProc
+hi link Macro		PreProc
+hi link PreCondit	PreProc
+hi link StorageClass	Type
+hi link Structure	Type
+hi link Typedef	Type
+hi link SpecialChar	Special
+hi link Delimiter	Special
+hi link SpecialComment Special
+hi link Debug		Special
diff --git a/home/.vimrc b/home/.vimrc
index b29c1b9..70a4418 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -12,7 +12,10 @@ set hlsearch
 set backspace=indent,eol,start
 set nocompatible
 set nobackup
-colorscheme zellner
+colorscheme zellnerbrb
+hi ErrorMsg term=standout cterm=bold ctermfg=9 ctermbg=9
+hi WarningMsg term=standout cterm=bold ctermfg=1 guifg=Black
+
 syntax on
 filetype plugin on
 filetype indent off
@@ -67,3 +70,6 @@ vmap v <Plug>(expand_region_expand)
 vmap <C-v> <Plug>(expand_region_shrink)
 set rtp+=$GOPATH/src/github.com/golang/lint/misc/vim
 autocmd BufWritePost,FileWritePost *.go execute 'Lint' | cwindow
+
+" Use `goimports` instead of `gofmt`
+let g:go_fmt_command = "goimports"