A possible workable version of Howards pull request

The new class 'CustomMapsFolderPreference.java' is missing
* I will add this now