diff --git a/nvim/lib/colorscheme.vim b/nvim/lib/colorscheme.vim
index 9d907cb..43a64e1 100644
--- a/nvim/lib/colorscheme.vim
+++ b/nvim/lib/colorscheme.vim
@@ -5,12 +5,10 @@ let s:base16_theme_name = 'eighties'
 
 " Color definitions {{{
 
-  let g:base16_shell_path = get(g:, 'base16_shell_path', expand('~/.zgen/chriskempson/base16-shell-master'))
-  let s:base16_shell_script = g:base16_shell_path . '/scripts/base16-' . s:base16_theme_name . '.sh'
-  if filereadable(s:base16_shell_script) && !&termguicolors
-    " call system(shellescape(s:base16_shell_script))
-  else
+  if empty($BASE16_SHELL) || !filereadable($BASE16_SHELL . '/scripts/base16-' . s:base16_theme_name . '.sh') || &termguicolors
     set termguicolors
+  else
+    " call system(shellescape(s:base16_shell_script))
   endif
 
   " Eighties scheme by Chris Kempson (http://chriskempson.com)
diff --git a/zsh/zshrc b/zsh/zshrc
index 34b5317..132db7a 100755
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -9,7 +9,7 @@ done
 
 command_exists rbenv && eval "$(rbenv init -)"
 
-BASE16_SHELL="$HOME/.zgen/chriskempson/base16-shell-master"
+export BASE16_SHELL="$HOME/.zgen/chriskempson/base16-shell-master"
 BASE16_SHELL_profile_helper="$BASE16_SHELL/profile_helper.sh"
 [[ -n "$PS1" && -r "$BASE16_SHELL_profile_helper" ]] && eval "$("$BASE16_SHELL_profile_helper")"