Improve coloring