Expand templates

From Armagetron
Expand templates