Thank you very much for your resource material made publicly available. It is extremely valuable.
If anyone is interested, I have made some changes to the template to cater to the new Properties features and also annotation tags.
See multiple variations with some custom options here:
NB: For the template there to work (with the project tag conversion and all), you need to have the author’s javascript files filed away.