Merge "Adding a SettingsEnum for a new screen"