Expand templates

From Reboil
Expand templates