Check XML's per apk

Preparations for a bigger update in the near future