Expand templates

From SambaWiki
Expand templates