Update to new paranoidandroid standards i sorted from master branch