Expand templates

From vjmedia
Expand templates