Update to be as compatible as possible with upstream ManjaroISO