Expand templates

From Harthorns-Reverie
Expand templates