Updated/New Composer support for HTML_Common

See diff for full changes