Expand templates

From Loonipedia

Expand templates