Use new template for addons.
Get rid of unused templates and images