diff --git a/dotfiles/zshrc.sh b/dotfiles/zshrc.sh
new file mode 100644
index 0000000..02aba3d
--- /dev/null
+++ b/dotfiles/zshrc.sh
@@ -0,0 +1,49 @@
+#@IgnoreInspection AddShebang
+# ENVIRONMENT:
+export GJ_ENV=local_aptproxy
+
+export ZCFG=$HOME/.config/zsh-config
+# Path to your oh-my-zsh installation.
+export ZSH=$ZCFG/packages/oh-my-zsh
+
+export LANG=en_US.UTF-8
+
+# Compilation flags
+export ARCHFLAGS="-arch x86_64"
+
+# Themes are in (...)/oh-my-zsh/themes/ or "random"
+ZSH_THEME="mj"
+
+CASE_SENSITIVE="true"
+DISABLE_AUTO_UPDATE="true"
+#DISABLE_AUTO_TITLE="true"
+ENABLE_CORRECTION="false"
+COMPLETION_WAITING_DOTS="true"
+DISABLE_UNTRACKED_FILES_DIRTY="true"
+HIST_STAMPS="dd.mm.yyyy"
+ZSH_CUSTOM=ZCFG/custom
+
+plugins+=(command-not-found common-aliases debian dirhistory git history history-substring-search systemadmin zsh_reload)
+
+# User configuration
+export PATH=$HOME/bin:/usr/local/bin:$PATH
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# Environment
+if [ -f $ZCFG/dotfiles/environment.sh ]; then
+    . $ZCFG/dotfiles/environment.sh
+fi
+
+export HISTFILESIZE=
+export HISTSIZE=
+export HISTFILE=~/.history
+
+#source $ZSH/oh-my-zsh.sh
+source $HOME/.config/zsh-config/packages/oh-my-zsh/oh-my-zsh.sh
+
+export ZSH=$ZCFG/packages/oh-my-zsh
+
+# Aliases
+if [ -f $ZCFG/templates/bash_aliases.sh ]; then
+    . $ZCFG/templates/bash_aliases.sh
+fi
diff --git a/templates/zshrc.sh b/templates/zshrc.sh
index 686981f..0006d90 100644
--- a/templates/zshrc.sh
+++ b/templates/zshrc.sh
@@ -1,52 +1,27 @@
 #@IgnoreInspection AddShebang
+
 # ENVIRONMENT:
 export GJ_ENV=local_aptproxy
 
-export ZCFG=$HOME/.config/zsh-config
-# Path to your oh-my-zsh installation.
-export ZSH=$ZCFG/packages/oh-my-zsh
-
 export LANG=en_US.UTF-8
 
 # Compilation flags
 export ARCHFLAGS="-arch x86_64"
 
-# Themes are in (...)/oh-my-zsh/themes/ or "random"
-ZSH_THEME="mj"
-
-CASE_SENSITIVE="true"
-DISABLE_AUTO_UPDATE="true"
-#DISABLE_AUTO_TITLE="true"
-ENABLE_CORRECTION="false"
-COMPLETION_WAITING_DOTS="true"
-DISABLE_UNTRACKED_FILES_DIRTY="true"
-HIST_STAMPS="dd.mm.yyyy"
-ZSH_CUSTOM=ZCFG/custom
-
-plugins=(command-not-found common-aliases debian dirhistory git history history-substring-search systemadmin zsh_reload
-		#pip python virtualenv virtualenvwrapper
-		#meteor node npm
-)
-
 # User configuration
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
-# Environment
-if [ -f $ZCFG/dotfiles/environment.sh ]; then
-    . $ZCFG/dotfiles/environment.sh
-fi
-
-export HISTFILESIZE=
-export HISTSIZE=
-export HISTFILE=~/.history
-
-#source $ZSH/oh-my-zsh.sh
-source $HOME/.config/zsh-config/packages/oh-my-zsh/oh-my-zsh.sh
+plugins=(
+		pip python virtualenv virtualenvwrapper
+		#meteor node npm
+)
 
-export ZSH=$ZCFG/packages/oh-my-zsh
+# virtualenvwrapper:
+export WORKON_HOME=$HOME/.virtualenvs
+source /usr/local/bin/virtualenvwrapper.sh
 
 # Aliases
-if [ -f $ZCFG/templates/bash_aliases.sh ]; then
-    . $ZCFG/templates/bash_aliases.sh
-fi
+if [ -f $ZCFG/dotfiles/zshrc.sh ]; then
+    . $ZCFG/dotfiles/zshrc.sh
+fi
\ No newline at end of file