Move output to XML element (with CDATA) instead of XML attribute
Update HTML.xslt to include output and traits