Expand templates

From Rare Gaming Dump
Expand templates