Shared xml

Actual changes are here. Rest is reformatting