Added prefs to switches (sort of)