Further coloring changes