[562357] Re-add and reorganize some of the preferences relevant
         to remaining functionality
6 files changed