Further continuing transition to ColorModel