Expand templates

From Camotool
Expand templates