diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index 00ba43e..07d4b4c 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -8,8 +8,8 @@ nmap <leader>gD :GoDeclsDir<cr>
 
 nmap <leader>gv <esc>:vsplit<bar>:GoAlternate!<cr>
 nmap <leader>gs <esc>:split<bar>:GoAlternate!<cr>
-nmap <leader>gt <esc>:w <bar> :GoTest<cr>
-nmap <leader>gf <esc>:w <bar> :GoTestFunc<cr>
+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>
 
diff --git a/zshrc b/zshrc
index 371e1a8..c2d4e37 100644
--- a/zshrc
+++ b/zshrc
@@ -158,10 +158,15 @@ 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
+
 # Vim keymap
 bindkey -v
 bindkey '^P' up-history
 bindkey '^N' down-history
 bindkey '^w' backward-kill-word
 bindkey '^r' history-incremental-search-backward
+
+# fzf configuration
 export KEYTIMEOUT=2
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh