Expand templates

From DreamCloud Academy Wiki
Expand templates