Fix default handling of colors