Merge "Tweak SettingsTheme" into sc-dev