improved html.snippets
Merge tag 'tmp'