--- a/app/src/main/java/com/geekorum/ttrss/settings/SettingsActivity.kt	Tue Jun 25 10:46:56 2019 -0700
+++ b/app/src/main/java/com/geekorum/ttrss/settings/SettingsActivity.kt	Tue Jun 25 11:11:49 2019 -0700
@@ -87,9 +87,7 @@
 
             findPreference(KEY_THEME).apply {
                 summaryBinder.bindPreferenceSummaryToValue(this)
-                onPreferenceChangeListener = ThemePreferenceListener(
-                    requireActivity(),
-                    onPreferenceChangeListener)
+                onPreferenceChangeListener = ThemePreferenceListener(onPreferenceChangeListener)
             }
             displayVersion()
         }
@@ -106,7 +104,6 @@
     }
 
     private class ThemePreferenceListener(
-        private val activity: Activity,
         private val wrapped: Preference.OnPreferenceChangeListener
     ) : Preference.OnPreferenceChangeListener {
 
@@ -116,7 +113,6 @@
             if (newValue != oldValue) {
                 val nighMode = Integer.valueOf(newValue as String)
                 AppCompatDelegate.setDefaultNightMode(nighMode)
-                activity.recreate()
             }
             return result
         }

--- a/app/src/main/res/values/arrays.xml	Tue Jun 25 10:46:56 2019 -0700
+++ b/app/src/main/res/values/arrays.xml	Tue Jun 25 11:11:49 2019 -0700
@@ -23,13 +23,13 @@
 -->
 <resources>
     <string-array name="pref_theme_names">
-        <item>@string/theme_auto</item>
+        <item>@string/theme_system_default</item>
         <item>@string/theme_light</item>
         <item>@string/theme_dark</item>
     </string-array>
     <string-array name="pref_theme_values" translatable="false">
         <!-- follows value in AppCompatDelegate.MODE_NIGHT* -->
-        <item>-100</item> <!-- UNSPECIFIED -->
+        <item>-1</item> <!-- FOLLOW_SYSTEM -->
         <item>1</item>    <!-- NO -->
         <item>2</item>    <!-- YES -->
     </string-array>

--- a/app/src/main/res/values/strings.xml	Tue Jun 25 10:46:56 2019 -0700
+++ b/app/src/main/res/values/strings.xml	Tue Jun 25 11:11:49 2019 -0700
@@ -51,7 +51,7 @@
     <!-- Strings related to Settings -->
     <string name="activity_settings_title">Settings</string>
     <string name="pref_title_theme">Theme</string>
-    <string name="theme_auto">Automatic</string>
+    <string name="theme_system_default">Use system default</string>
     <string name="theme_light">Light</string>
     <string name="theme_dark">Dark</string>
     <string name="pref_category_user_interface">User interface</string>

--- a/app/src/main/res/xml/pref_general.xml	Tue Jun 25 10:46:56 2019 -0700
+++ b/app/src/main/res/xml/pref_general.xml	Tue Jun 25 11:11:49 2019 -0700
@@ -28,7 +28,7 @@
 
         <ListPreference
                 android:key="theme"
-                android:defaultValue="-100"
+                android:defaultValue="-1"
                 android:title="@string/pref_title_theme"
                 android:entries="@array/pref_theme_names"
                 android:entryValues="@array/pref_theme_values"