Expand templates

From Wikienfk5
Expand templates