Expand templates

From Wikisign
Expand templates