Expand templates

From Scammer Hammer
Expand templates