WIP color cleanup