Expand templates

From Cape Scrambling

Expand templates