Improve HTML highlighter

* add several more tags
* support tags with attributes