Un-android-21 and add Prefs