Expand templates

From ISMuseum
Expand templates