Unified CS of XML files, minor fixes to tags.xml