Updated the way the new settings and toggles are handled