Expand templates

From NixNet
Expand templates