Improving the color handling.