Update for CTM and Custom Colors support