Expand templates

From Ketarin
Expand templates