New colors, changes and fixes all over the place