New plugins, cleanup and html.tpl

In relation with #12, #3