diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index d7efbd4..e56b3e9 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -1,4 +1,4 @@
-nmap <leader>gb :GoBuild<cr>
+nmap <leader>gb :up<bar>:GoBuild<cr>
 nmap <leader>gr :GoRun<cr>
 nmap <leader>gc :GoCallers<cr>
 nmap <leader>gi :GoImplements<cr>
@@ -15,7 +15,8 @@ nmap <leader>gt <esc>:up<bar>:GoTest<cr>
 nmap <leader>gf <esc>:up<bar>:GoTestFunc<cr>
 nmap <leader>gat <esc>:GoAddTags<cr>
 nmap <leader>grt <esc>:GoRemoveTags<cr>
-nmap <leader>ge :GoIfErr<cr>
+nmap <leader>gec <esc>:up<bar>:GoErrCheck<cr>
+nmap <leader>gie :GoIfErr<cr>
 
 nnoremap <silent> dr :GoDebugBreakpoint<cr>
 nnoremap <silent> d! :GoDebugStart<cr>
diff --git a/vimrc b/vimrc
index 30f07df..5f6bfca 100644
--- a/vimrc
+++ b/vimrc
@@ -23,7 +23,7 @@ set shiftwidth=2
 set shiftround
 set tabstop=2
 set expandtab
-" set smarttab
+set smarttab
 set splitbelow
 set splitright
 set encoding=utf-8
@@ -58,10 +58,10 @@ set lazyredraw
 set timeoutlen=1000
 set ballooneval
 set balloonevalterm
-set scrolloff=5
+set scrolloff=15
 set dictionary=/usr/share/dict/words
 set shortmess+=I
-set updatetime=100
+set updatetime=250
 set pastetoggle=<f2>
 " See :help thesaurus
 set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt
@@ -78,7 +78,10 @@ if exists('+termguicolors')
 endif
 
 " Colour scheme:
-colorscheme iceberg
+packadd! gruvbox
+let g:gruvbox_contrast_dark='soft'
+let g:gruvbox_contrast_light='soft'
+colorscheme gruvbox
 
 augroup vimrc
   autocmd!
@@ -89,6 +92,8 @@ augroup vimrc
   " set cursor line highlight in insert mode.
   autocmd InsertEnter * set cul
   autocmd InsertLeavePre * set nocul
+  " use tabs in .gitconfig
+  autocmd FileType gitconfig setlocal shiftwidth=2 tabstop=2 noexpandtab
 augroup end
 
 " But, don't remember the current directory for a given file:
@@ -106,6 +111,8 @@ imap <up> <nop>
 imap <down> <nop>
 imap <left> <nop>
 imap <right> <nop>
+nmap ]q :cn<cr>
+nmap [q :cp<cr>
 
 nnoremap <silent> ,/ :nohlsearch<cr>
 map <c-t> <esc>:tabnew<cr>
@@ -172,8 +179,11 @@ xmap ah <Plug>(GitGutterTextObjectOuterVisual)
 let g:rustfmt_autosave = 1
 
 " echodoc configuration:
-set cmdheight=2
+set cmdheight=1
+set noshowmode
+let g:echodoc#type='echo'
 let g:echodoc#enable_at_startup = 1
+packadd! echodoc.vim
 
 " ALE configuration:
 function SymbolSearch()
@@ -259,7 +269,6 @@ runtime macros/matchit.vim
 packadd! ale
 
 " load other plugins:
-packadd! echodoc.vim
 packadd! lightline.vim
 packadd! tmux-complete.vim
 packadd! vim-commentary
diff --git a/zshrc b/zshrc
index e0b98e4..56497d5 100644
--- a/zshrc
+++ b/zshrc
@@ -161,7 +161,7 @@ setxkbmap -option caps:none
 # Set zshfunctions dir as per https://github.com/alacritty/alacritty/blob/master/INSTALL.md#debianubuntu
 fpath+=${ZDOTDIR:-~}/.zsh_functions
 
-export BAT_THEME=Nord
+export BAT_THEME=gruvbox-dark
 
 # Vim keymap
 bindkey -v