diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
index 05670f49c..fe8d1e9e5 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
@@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys
 import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.util.preference.*
 import eu.kanade.tachiyomi.util.system.toast
 import exh.EH_SOURCE_ID
 import exh.EXH_SOURCE_ID
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt
index b29be094e..ea6dd3e25 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt
@@ -2,6 +2,8 @@ package eu.kanade.tachiyomi.ui.setting
 
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys
+import eu.kanade.tachiyomi.util.preference.defaultValue
+import eu.kanade.tachiyomi.util.preference.switchPreference
 
 /**
  * hitomi.la Settings fragment
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsNhController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsNhController.kt
index 26f105b0e..2e7d27ba0 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsNhController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsNhController.kt
@@ -2,6 +2,8 @@ package eu.kanade.tachiyomi.ui.setting
 
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys
+import eu.kanade.tachiyomi.util.preference.defaultValue
+import eu.kanade.tachiyomi.util.preference.switchPreference
 
 /**
  * nhentai Settings fragment
diff --git a/app/src/main/java/exh/debug/SettingsDebugController.kt b/app/src/main/java/exh/debug/SettingsDebugController.kt
index 27fe8da5c..d0c97df00 100644
--- a/app/src/main/java/exh/debug/SettingsDebugController.kt
+++ b/app/src/main/java/exh/debug/SettingsDebugController.kt
@@ -9,6 +9,7 @@ import android.widget.TextView
 import androidx.preference.PreferenceScreen
 import com.afollestad.materialdialogs.MaterialDialog
 import eu.kanade.tachiyomi.ui.setting.*
+import eu.kanade.tachiyomi.util.preference.*
 import kotlin.reflect.KVisibility
 import kotlin.reflect.full.declaredFunctions
 
diff --git a/app/src/main/java/exh/ui/lock/FingerLockPreference.kt b/app/src/main/java/exh/ui/lock/FingerLockPreference.kt
index 1af80c5ff..a87ab7a96 100644
--- a/app/src/main/java/exh/ui/lock/FingerLockPreference.kt
+++ b/app/src/main/java/exh/ui/lock/FingerLockPreference.kt
@@ -17,7 +17,7 @@ import com.github.ajalt.reprint.rxjava.RxReprint
 import com.mattprecious.swirl.SwirlView
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
-import eu.kanade.tachiyomi.ui.setting.onChange
+import eu.kanade.tachiyomi.util.preference.onChange
 import exh.util.dpToPx
 import rx.android.schedulers.AndroidSchedulers
 import uy.kohesive.injekt.injectLazy
diff --git a/app/src/main/java/exh/ui/lock/LockPreference.kt b/app/src/main/java/exh/ui/lock/LockPreference.kt
index 8d5c61406..b87f4be07 100755
--- a/app/src/main/java/exh/ui/lock/LockPreference.kt
+++ b/app/src/main/java/exh/ui/lock/LockPreference.kt
@@ -7,7 +7,7 @@ import androidx.preference.SwitchPreferenceCompat
 import com.afollestad.materialdialogs.MaterialDialog
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.ui.setting.onChange
+import eu.kanade.tachiyomi.util.preference.onChange
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers