more Settings / Preference refactoring