Final fixes to coloring