Updated all template files