major templates update