diff --git a/dotfiles/zshrc.sh b/dotfiles/zshrc.sh
index 02aba3d..6aa8801 100644
--- a/dotfiles/zshrc.sh
+++ b/dotfiles/zshrc.sh
@@ -2,7 +2,6 @@
 # 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
 
@@ -34,16 +33,15 @@ if [ -f $ZCFG/dotfiles/environment.sh ]; then
     . $ZCFG/dotfiles/environment.sh
 fi
 
+# History
 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
+# Apply
+source $ZSH/oh-my-zsh.sh
 
 # Aliases
 if [ -f $ZCFG/templates/bash_aliases.sh ]; then
     . $ZCFG/templates/bash_aliases.sh
-fi
+fi
\ No newline at end of file
diff --git a/templates/zshrc.sh b/templates/zshrc.sh
index 0006d90..b9b3b29 100644
--- a/templates/zshrc.sh
+++ b/templates/zshrc.sh
@@ -1,5 +1,7 @@
 #@IgnoreInspection AddShebang
 
+export ZCFG=$HOME/.config/zsh-config
+
 # ENVIRONMENT:
 export GJ_ENV=local_aptproxy