standardise xmls
Merge branch 'themechange'
standardise xml