diff --git a/oh-my-zsh.zsh b/oh-my-zsh.zsh
index c1538cd07..9334778fe 100644
--- a/oh-my-zsh.zsh
+++ b/oh-my-zsh.zsh
@@ -44,6 +44,9 @@ for plugin ($plugins); do
   fi
 done
 
+local ZSH_THEME
+zstyle -a :omz theme ZSH_THEME
+
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]
 then
diff --git a/templates/zshrc.arch-zsh-template b/templates/zshrc.arch-zsh-template
index a2c63913c..875de0228 100644
--- a/templates/zshrc.arch-zsh-template
+++ b/templates/zshrc.arch-zsh-template
@@ -1,6 +1,6 @@
 ZSH=/usr/share/oh-my-zsh
 
-ZSH_THEME="arch-blue"
+zstyle -a :omz theme "arch-blue"
 plugins=(archlinux sprunge)
 
 omz_init(){