Updated/New Composer support for HTML_Common2

See diff for full changes