Update to better match AOKP