Expand templates

From tgchan
Expand templates