More color cleanup.