Rearange theme stuff
Merge branch 'kitkat' of https://github.com/AICP-BLOOD/vendor_aicp into kitkat