diff --git a/runcoms/zlogin b/runcoms/zlogin
index 141a242..e919d6f 100644
--- a/runcoms/zlogin
+++ b/runcoms/zlogin
@@ -20,4 +20,4 @@ if (( $+commands[fortune] )); then
   print
 fi
 
-[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx || exit 0
+[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx || return 0
diff --git a/runcoms/zprofile b/runcoms/zprofile
index e2f6d63..ce7414b 100644
--- a/runcoms/zprofile
+++ b/runcoms/zprofile
@@ -17,8 +17,8 @@ fi
 # Editors
 #
 
-export EDITOR='vi'
-export VISUAL='vi'
+export EDITOR='vim'
+export VISUAL='vim'
 export PAGER='less'
 
 #
diff --git a/runcoms/zshrc b/runcoms/zshrc
index 9f2971d..2abed64 100644
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -14,8 +14,6 @@ fi
 export GOPATH=/home/ian/.go
 export PATH=$GOPATH/bin:$PATH
 export VIRTUAL_ENV_DISABLE_PROMPT=1
-export VISUAL=vim
-export EDITOR=vim
 
 alias open=xdg-open
 alias vi=vim