Expand templates

From HateotU
Expand templates