Expand templates

From Liberation Map
Expand templates