Expand templates

From Fakeroot-ng
Expand templates