prefs refactoring: partial implementation (wip)