Expand templates

From YSTV Documentation Wiki
Expand templates