diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 485b7df27..f9fd0870e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -249,7 +249,7 @@ dependencies {
     val conductorVersion = "3.1.1"
     implementation("com.bluelinelabs:conductor:$conductorVersion")
     implementation("com.bluelinelabs:conductor-viewpager:$conductorVersion")
-    implementation("com.github.tachiyomiorg:conductor-support-preference:$conductorVersion")
+    implementation("com.github.tachiyomiorg:conductor-support-preference:3.1.2")
 
     // FlowBinding
     val flowbindingVersion = "1.2.0"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt b/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt
index e978ea6bf..58b2ea9a3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt
@@ -5,7 +5,6 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.biometric.BiometricPrompt
 import androidx.fragment.app.FragmentActivity
 import androidx.preference.CheckBoxPreference
-import androidx.preference.DialogPreference
 import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
@@ -66,19 +65,19 @@ inline fun PreferenceGroup.checkBoxPreference(block: (@DSL CheckBoxPreference).(
 }
 
 inline fun PreferenceGroup.editTextPreference(block: (@DSL EditTextPreference).() -> Unit): EditTextPreference {
-    return initThenAdd(EditTextPreference(context), block).also(::initDialog)
+    return initThenAdd(EditTextPreference(context), block)
 }
 
 inline fun PreferenceGroup.listPreference(block: (@DSL ListPreference).() -> Unit): ListPreference {
-    return initThenAdd(ListPreference(context), block).also(::initDialog)
+    return initThenAdd(ListPreference(context), block)
 }
 
 inline fun PreferenceGroup.intListPreference(block: (@DSL IntListPreference).() -> Unit): IntListPreference {
-    return initThenAdd(IntListPreference(context), block).also(::initDialog)
+    return initThenAdd(IntListPreference(context), block)
 }
 
 inline fun PreferenceGroup.multiSelectListPreference(block: (@DSL MultiSelectListPreference).() -> Unit): MultiSelectListPreference {
-    return initThenAdd(MultiSelectListPreference(context), block).also(::initDialog)
+    return initThenAdd(MultiSelectListPreference(context), block)
 }
 
 inline fun PreferenceScreen.preferenceCategory(block: (@DSL PreferenceCategory).() -> Unit): PreferenceCategory {
@@ -89,14 +88,6 @@ inline fun PreferenceScreen.preferenceScreen(block: (@DSL PreferenceScreen).() -
     return addThenInit(preferenceManager.createPreferenceScreen(context), block)
 }
 
-fun initDialog(dialogPreference: DialogPreference) {
-    with(dialogPreference) {
-        if (dialogTitle == null) {
-            dialogTitle = title
-        }
-    }
-}
-
 inline fun <P : Preference> PreferenceGroup.add(p: P): P {
     return p.apply {
         this.isIconSpaceReserved = false
diff --git a/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehaviorExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/BottomSheetBehaviorExtensions.kt
similarity index 84%
rename from app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehaviorExtensions.kt
rename to app/src/main/java/eu/kanade/tachiyomi/util/view/BottomSheetBehaviorExtensions.kt
index aba4d9960..a5da1a432 100644
--- a/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehaviorExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/BottomSheetBehaviorExtensions.kt
@@ -1,3 +1,5 @@
+@file:Suppress("PackageDirectoryMismatch")
+
 package com.google.android.material.bottomsheet
 
 import android.view.View
diff --git a/app/src/main/java/androidx/preference/EditTextPreferenceExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/EditTextPreferenceExtensions.kt
similarity index 84%
rename from app/src/main/java/androidx/preference/EditTextPreferenceExtensions.kt
rename to app/src/main/java/eu/kanade/tachiyomi/util/view/EditTextPreferenceExtensions.kt
index 0a3c817e3..4428fb9ae 100644
--- a/app/src/main/java/androidx/preference/EditTextPreferenceExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/EditTextPreferenceExtensions.kt
@@ -1,3 +1,5 @@
+@file:Suppress("PackageDirectoryMismatch")
+
 package androidx.preference
 
 /**
diff --git a/app/src/main/java/com/google/android/material/appbar/TachiyomiAppBarLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt
similarity index 99%
rename from app/src/main/java/com/google/android/material/appbar/TachiyomiAppBarLayout.kt
rename to app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt
index 1627c5d19..56bf8d633 100644
--- a/app/src/main/java/com/google/android/material/appbar/TachiyomiAppBarLayout.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt
@@ -1,3 +1,5 @@
+@file:Suppress("PackageDirectoryMismatch")
+
 package com.google.android.material.appbar
 
 import android.animation.AnimatorSet
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d95bcbe92..e7ee293e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -522,7 +522,7 @@
       <!-- Advanced section -->
     <string name="label_network">Network</string>
     <string name="pref_clear_cookies">Clear cookies</string>
-    <string name="pref_dns_over_https">DNS over HTTPS</string>
+    <string name="pref_dns_over_https">DNS over HTTPS (DoH)</string>
     <string name="requires_app_restart">Requires app restart to take effect</string>
     <string name="cookies_cleared">Cookies cleared</string>
     <string name="label_data">Data</string>