Doing a massive upgrade of…

Doing a massive upgrade of the template generator. Stuff is breaking left, right and center! https://geek.hellyer.kiwi/?generator=on