Expand templates

From Bloompedia
Expand templates