Expand templates

From Guide to Girona
Expand templates