Bug #872676 - Making the default template a bit more dev/user-friendly. WIP