Expand templates

From WargameChess

Expand templates