Expand templates

From Wolf Scrapbook

Expand templates