Expand templates

From 3C Christianity
Expand templates