Expand templates

From Hackbox
Expand templates