Adding first rev of @drw158's color updates.