updating default zsh theme
fixing merge: