Fix option references in HTML templates
Upgrade generator and template dependencies, re-organise output structure