diff --git a/app/src/main/java/org/transdroid/core/app/settings/SystemSettings.java b/app/src/main/java/org/transdroid/core/app/settings/SystemSettings.java
index f0cd1e42..3bc6fff8 100644
--- a/app/src/main/java/org/transdroid/core/app/settings/SystemSettings.java
+++ b/app/src/main/java/org/transdroid/core/app/settings/SystemSettings.java
@@ -59,6 +59,10 @@ public class SystemSettings {
 		return prefs.getBoolean("system_checkupdates", true);
 	}
 
+	public boolean autoDarkTheme() {
+		return prefs.getBoolean("system_autodarktheme", true);
+	}
+
 	public boolean useDarkTheme() {
 		return prefs.getBoolean("system_usedarktheme", false);
 	}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1759d96f..fa121ee9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -347,6 +347,8 @@
 	<string name="pref_dormantasinactive_info">Torrents at 0KB/s (no data transfer) will be filtered as being inactive</string>
 	<string name="pref_checkupdates">Check for updates</string>
 	<string name="pref_checkupdates_info">Check transdroid.org for latest app version</string>
+	<string name="pref_autodarktheme">Auto night mode</string>
+	<string name="pref_autodarktheme_info">Automatically choose between light or dark theme</string>
 	<string name="pref_usedarktheme">Use dark UI theme</string>
 	<string name="pref_usedarktheme_info">Requires a restart to take effect</string>
 	<string name="pref_clearsearch">Clear search history</string>
diff --git a/app/src/main/res/xml/pref_system.xml b/app/src/main/res/xml/pref_system.xml
index 75b3eeec..234400a2 100644
--- a/app/src/main/res/xml/pref_system.xml
+++ b/app/src/main/res/xml/pref_system.xml
@@ -30,9 +30,17 @@
 		android:entries="@array/pref_autorefresh_intervals"
 		android:entryValues="@array/pref_autorefresh_intervalvalues"
 		android:defaultValue="0" />
-	
+
+	<CheckBoxPreference
+		android:key="system_autodarktheme"
+		android:title="@string/pref_autodarktheme"
+		android:summary="@string/pref_autodarktheme_info"
+		android:disableDependentsState="true"
+		android:defaultValue="true" />
+
 	<CheckBoxPreference
 		android:key="system_usedarktheme"
+		android:dependency="system_autodarktheme"
 		android:title="@string/pref_usedarktheme"
 		android:summary="@string/pref_usedarktheme_info"
 		android:defaultValue="false" />