Expand templates

From jldecoi's wiki

Expand templates