Add SVG version to cl, cr, and remove png