Expand templates

From Istaria Lexica

Expand templates