Really fix the coloring, this time.