More color cleanup