redid the colors a bit (internally)