Expand templates

From Squirrel's Lair
Expand templates