AOKP: change a few things

* No need to start from scratch. Initial changes to the awesome
      groundwork that DH has built

Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>