Expand templates

From Sky Pirate Time

Expand templates