Revert "Removed accidently added useless .xml~ files in previous commit."

This reverts commit 254d67502587b5e0b80bc20e8c6aca2b4be3de68.
Revert "Revert "Switch vigor to CyanogenMod code where possible""

This reverts commit 41a1b0afc445ad2a5f56edbe8fd6ff35978e42b1.