Expand templates

From Jackpoint
Expand templates