Expand templates

From WeAreDragons
Expand templates