4de2307 increase usage of color constants