Expand templates

From TeachingOpenSource
Expand templates