Updated templates for using it in Firefly 1.0.5