Expand templates

From Aloniverse
Expand templates