Improve use of colors