Updated settings to include the toggles we agreed on