Changed files based on diff from DiffMerge and got up to xmlui.xconf.