diff --git a/site-modules/core/files/vim/plugin/colors.vim b/site-modules/core/files/vim/plugin/colors.vim
index ca668bc..43eede9 100644
--- a/site-modules/core/files/vim/plugin/colors.vim
+++ b/site-modules/core/files/vim/plugin/colors.vim
@@ -1,7 +1,8 @@
 " Set color theme
-let base16colorspace=256
-let g:github_dark_sidebar = 0
-colorscheme base16-tomorrow-night
+if exists('$BASE16_THEME') && (!exists('g:colors_name') || g:colors_name != 'base16-$BASE16_THEME')
+  let base16colorspace=256
+  colorscheme base16-$BASE16_THEME
+endif
 
 " Set tailing white space to errors
 match ErrorMsg '\s\+$'
diff --git a/site-modules/core/files/zshrc b/site-modules/core/files/zshrc
index f8e6ccc..d2f7ba1 100644
--- a/site-modules/core/files/zshrc
+++ b/site-modules/core/files/zshrc
@@ -48,8 +48,8 @@ printf '\033[5 q'
 # emacs or vim
 #
 if [[ -z "$VIM" ]] && [[ -z "$INSIDE_EMACS" ]] && [[ -z "$SSH_TTY" ]] ; then
-  BASE16_SHELL="$HOME/.config/base16-shell/"
-  [ -s "$BASE16_SHELL/profile_helper.sh" ] && source "$BASE16_SHELL/profile_helper.sh"
+  BASE16_CONFIG_PATH="$HOME/.config/base16-shell/"
+  [ -s "$BASE16_CONFIG_PATH/profile_helper.sh" ] && source "$BASE16_CONFIG_PATH/profile_helper.sh"
 fi
 
 #