Adapted to new color class names