Expand templates

From UFO:AI
Expand templates