Bring categories back to XML export -- fixes #25