Expand templates

From Wicri Water
Expand templates