Expand templates

From Gridkaschool
Expand templates