Expand templates

From LifeTO
Expand templates