Expand templates

From GridPlay
Expand templates