Preferences update

OK, here is the Preferences Update as merged into your new Android Studio project.