Expand templates

From Thurisia

Expand templates