Merge "Factor and consolidate style and color names."