Expand templates

From SocialStack
Expand templates