Changes to templates.

Thuis version released as V2.8.4!