zsh: add branch to gws, move variables to zshenv, fix highlighting patterns