fixed all templates