Finish the job

<hyPiRion> `arrdem: Could you fix it for the other templates too?  [23:28]
<`arrdem> hyPiRion: sure.. gimme 30 to try and turn this project in before the deadline
<hyPiRion> App at least
<hyPiRion> ok, sweet

Delivering for the other tested template. One duplicate diff as I updated my fork by hand rather than merging.