Amend these to use the Minerva XML style format, so they can be re-used by
other apps, and the API.

