Updated formatting
Added preliminary HTML support
Added preliminary support for built-in generic components