Updated/New Composer support for XML_SVG

See diff for full changes