Finalised the default ontology XML files, committing so that these settings will be available. Need still to propagate changes to all other ontologies, thus this commit is not final.