diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6f336eb0a74..c61059f715c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1127,14 +1127,12 @@
 
     <!-- Titles for ui dark mode preference. -->
     <string-array name="dark_ui_mode_entries" >
-        <item>Automatic (based on time of day)</item>
-        <item>Always on</item>
-        <item>Always off</item>
+        <item>Dark</item>
+        <item>Light</item>
     </string-array>
 
     <!-- Values for ui dark mode preference. -->
     <string-array name="dark_ui_mode_values" translatable="false" >
-        <item>auto</item>
         <item>yes</item>
         <item>no</item>
     </string-array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 723f7aa06b3..5f67950e96b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9597,10 +9597,10 @@
     <string name="demo_mode">System UI demo mode</string>
 
     <!-- [CHAR LIMIT=60] Name of setting that changes the UI to dark -->
-    <string name="dark_ui_mode">Dark mode</string>
+    <string name="dark_ui_mode">Theme</string>
 
     <!-- [CHAR LIMIT=60] Name of dev option that changes the color of the UI -->
-    <string name="dark_ui_mode_title">Set Dark mode</string>
+    <string name="dark_ui_mode_title">Set Theme</string>
 
     <!-- [CHAR LIMIT=60] Name of dev option to enable extra quick settings tiles -->
     <string name="quick_settings_developer_tiles">Quick settings developer tiles</string>
diff --git a/src/com/android/settings/display/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java
index c3aafeefb5b..21af60321eb 100644
--- a/src/com/android/settings/display/DarkUIPreferenceController.java
+++ b/src/com/android/settings/display/DarkUIPreferenceController.java
@@ -51,7 +51,7 @@ public class DarkUIPreferenceController extends BasePreferenceController
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         int value = mUiModeManager.getNightMode();
-        ListPreference preference = (ListPreference) screen.findPreference(getPreferenceKey());
+        ListPreference preference = screen.findPreference(getPreferenceKey());
         preference.setValue(modeToString(value));
     }
 
@@ -70,24 +70,22 @@ public class DarkUIPreferenceController extends BasePreferenceController
     private String modeToDescription(int mode) {
         String[] values = mContext.getResources().getStringArray(R.array.dark_ui_mode_entries);
         switch (mode) {
-            case UiModeManager.MODE_NIGHT_AUTO:
-                return values[0];
             case UiModeManager.MODE_NIGHT_YES:
-                return values[1];
+                return values[0];
             case UiModeManager.MODE_NIGHT_NO:
+            case UiModeManager.MODE_NIGHT_AUTO:
             default:
-                return values[2];
+                return values[1];
 
         }
     }
 
     private String modeToString(int mode) {
         switch (mode) {
-            case UiModeManager.MODE_NIGHT_AUTO:
-                return "auto";
             case UiModeManager.MODE_NIGHT_YES:
                 return "yes";
             case UiModeManager.MODE_NIGHT_NO:
+            case UiModeManager.MODE_NIGHT_AUTO:
             default:
                 return "no";
 
@@ -96,11 +94,10 @@ public class DarkUIPreferenceController extends BasePreferenceController
 
     private int modeToInt(String mode) {
         switch (mode) {
-            case "auto":
-                return UiModeManager.MODE_NIGHT_AUTO;
             case "yes":
                 return UiModeManager.MODE_NIGHT_YES;
             case "no":
+            case "auto":
             default:
                 return UiModeManager.MODE_NIGHT_NO;
         }
diff --git a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
index 0344a14cfd3..c8f847b8872 100644
--- a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
@@ -59,8 +59,9 @@ public class DarkUIPreferenceControllerTest {
 
     @Test
     public void onPreferenceChanged_setAuto() {
+        // Auto was deprecated, it should default to NO.
         mController.onPreferenceChange(mPreference, "auto");
-        verify(mUiModeManager).setNightMode(eq(UiModeManager.MODE_NIGHT_AUTO));
+        verify(mUiModeManager).setNightMode(eq(UiModeManager.MODE_NIGHT_NO));
     }
 
     @Test