Change to OmniROM
(rebased commits)