Expand templates

From Caltech IMSS Wikis
Expand templates