added template tags to template files