Updated to include latest color class names.