Expand templates

From Yahamaga
Expand templates