Expand templates

From diff.wiki
Expand templates