All the necessary changes for AOKP