Expand templates

From AuraGaming
Expand templates