Expand templates

From Revwiki
Expand templates