Merge remote-tracking branch 'origin/theming'

Merging in the refactored theming since we no longer rely on ZSH_THEME variable anymore

Conflicts:
	oh-my-zsh.zsh
	templates/zshrc.arch-zsh-template
	templates/zshrc.zsh-template

oh-my-zsh.zsh

@@ -44,21 +44,6 @@ for plugin ($plugins); do
   fi
 done
 
-local ZSH_THEME
-zstyle -a :omz:style theme ZSH_THEME
-
-# Load the theme
-if [ "$ZSH_THEME" = "random" ]
-then
-  themes=($ZSH/themes/*zsh-theme)
-  N=${#themes[@]}
-  ((N=(RANDOM%N)+1))
-  RANDOM_THEME=${themes[$N]}
-  source "$RANDOM_THEME"
-  echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
-else
-  if [ ! "$ZSH_THEME" = ""  ]
-  then
-    source "$ZSH/themes/$ZSH_THEME.zsh-theme"
-  fi
-fi
+local theme
+zstyle -a :omz:style theme theme
+set_theme theme