Shape and color correction with special case mapping. Tweaked color detection.