Switched to new pref file everywhere