Expand templates

From The Hive
Expand templates