more color cleanup