Expand templates

From Peaceful Science
Expand templates