diff --git a/site-modules/core/files/zshrc b/site-modules/core/files/zshrc
index 0e5efea..30302cd 100644
--- a/site-modules/core/files/zshrc
+++ b/site-modules/core/files/zshrc
@@ -52,8 +52,6 @@ if [[ -z $INSIDE_EMACS ]] && [[ -z "$SSH_TTY" ]] ; then
     [ -n "$PS1" ] && \
         [ -s "$BASE16_SHELL/profile_helper.sh" ] && \
             eval "$("$BASE16_SHELL/profile_helper.sh")"
-
-    $HOME/.dotfiles/bin/base16_theme;
 fi
 
 #
@@ -86,7 +84,7 @@ fi
 #
 source $ZSH/oh-my-zsh.sh
 
-export EDITOR="emacs --no-wait"
+export EDITOR="emacsclient -nw"
 
 #
 # Import local alases if the file exists
diff --git a/site-modules/core/templates/git/gitconfig.erb b/site-modules/core/templates/git/gitconfig.erb
index cb80f12..dce0b9c 100644
--- a/site-modules/core/templates/git/gitconfig.erb
+++ b/site-modules/core/templates/git/gitconfig.erb
@@ -7,7 +7,7 @@
   name = <%= scope.call_function('lookup', ["user_name"]) %>
 
 [core]
-  editor = $ZSH/plugins/emacs/emacsclient.sh -nw
+  editor = $ZSH/plugins/emacs/emacsclient.sh
   autocrlf = input
 
 [rerere]