renamed templates, added tags