clean up color names for consistency