XML style reworked
Lexicon class adds Terms/Categories to match new XML style