Make colors more consistent