Major update to xsl setup