Merge SettingsRevamp into master