Expand templates

From TimeSnapper
Expand templates