XML changes
Merge https://github.com/tommy-the-cat/mfti