Expand templates

From Mintarc Forge
Expand templates