Expand templates

From Dysothtria
Expand templates