diff --git a/app/build.gradle b/app/build.gradle
index 07840f3eb3..3f2c547399 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -60,6 +60,9 @@ android {
             versionNameSuffix "-${getCommitCount()}"
             applicationIdSuffix ".debug"
         }
+        release {
+            applicationIdSuffix = '.j2k'
+        }
     }
 
     flavorDimensions "default"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 6545b4a39e..feac514ab7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -33,7 +33,7 @@ class PreferencesHelper(val context: Context) {
 
     fun clear() = prefs.edit().clear().apply()
 
-    fun theme() = prefs.getInt(Keys.theme, 1)
+    fun theme() = prefs.getInt(Keys.theme, 5)
 
     fun rotation() = rxPrefs.getInteger(Keys.rotation, 1)
 
@@ -65,7 +65,7 @@ class PreferencesHelper(val context: Context) {
 
     fun zoomStart() = rxPrefs.getInteger(Keys.zoomStart, 1)
 
-    fun readerTheme() = rxPrefs.getInteger(Keys.readerTheme, 0)
+    fun readerTheme() = rxPrefs.getInteger(Keys.readerTheme, 2)
 
     fun cropBorders() = rxPrefs.getBoolean(Keys.cropBorders, false)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index bb4da456a2..023ba82acc 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -65,11 +65,6 @@ class MainActivity : BaseActivity() {
     lateinit var tabAnimator: TabsAnimator
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        /*delegate.setLocalNightMode(when (preferences.theme()) {
-            1 -> MODE_NIGHT_NO
-            2, 3, 4 -> MODE_NIGHT_YES
-            else -> MODE_NIGHT_FOLLOW_SYSTEM
-        })*/
         setDefaultNightMode(when (preferences.theme()) {
             1 -> MODE_NIGHT_NO
             2, 3, 4 -> MODE_NIGHT_YES
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index 87d8a7f7fc..5d2a61ef3c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -56,23 +56,12 @@ class SettingsGeneralController : SettingsController() {
             titleRes = R.string.pref_theme
             entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme,
                   R.string.amoled_theme, R.string.darkblue_theme,
-                  R.string.system_theme, R.string.system_amoled_theme, R.string.system_darkblue_theme)
+                  R.string.system_default, R.string.system_amoled_theme, R.string.system_darkblue_theme)
             entryValues = arrayOf("1", "2", "3", "4", "5", "6", "7")
             defaultValue = "5"
             summary = "%s"
 
-            onChange {newValue ->
-              val activity = activity ?: return@onChange false
-              val app = activity.application
-              AppCompatDelegate.setDefaultNightMode(when (newValue) {
-                "1" -> AppCompatDelegate.MODE_NIGHT_NO
-                "2", "3", "4" -> AppCompatDelegate.MODE_NIGHT_YES
-                else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-              })
-              //LocaleHelper.changeLocale(newValue.toString())
-              //LocaleHelper.updateConfiguration(app, app.resources.configuration)
-              //activity?.recreate()
-
+            onChange { newValue ->
                 activity?.recreate()
                 true
             }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
index 4d9425bf79..d1722ec1f4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
@@ -50,7 +50,7 @@ class SettingsReaderController : SettingsController() {
         intListPreference {
             key = Keys.readerTheme
             titleRes = R.string.pref_reader_theme
-            entriesRes = arrayOf(R.string.white_background, R.string.black_background, R.string.auto_background)
+            entriesRes = arrayOf(R.string.white_background, R.string.black_background, R.string.zoom_start_automatic)
             entryValues = arrayOf("0", "1", "2")
             defaultValue = "0"
             summary = "%s"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ae22047bd8..5122b7b697 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -143,7 +143,6 @@
     <string name="dark_theme">Dark theme</string>
     <string name="amoled_theme">AMOLED theme</string>
     <string name="darkblue_theme">Dark blue</string>
-    <string name="system_theme">System default</string>
     <string name="system_amoled_theme">System default (AMOLED)</string>
     <string name="system_darkblue_theme">System default (Dark blue)</string>
     <string name="pref_start_screen">Start screen</string>