Better colors, and a gitstatus bugfix