Expand templates

From Hyperstage
Expand templates