Expand templates

From Cages for Newbies
Expand templates