clean up header, new color names