Expand templates

From Open Source Qabalah

Expand templates