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
Conflicts: templates/zshrc.arch-zsh-template templates/zshrc.zsh-template