diff --git a/app/build.gradle b/app/build.gradle
index f054a6a07..e9a3873fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -296,7 +296,7 @@ dependencies {
     //implementation group: 'com.google.android.material', name: 'material', version: '1.6.0-alpha01'
 
     //
-    implementation "net.slions.android:preference:0.0.4"
+    implementation "net.slions.android:preference:0.0.5"
 
     // Play Store billing
     playstoreImplementation 'com.android.billingclient:billing:6.2.0'
diff --git a/app/src/main/java/fulguris/settings/fragment/CookiesSettingsFragment.kt b/app/src/main/java/fulguris/settings/fragment/CookiesSettingsFragment.kt
index 3b08a445c..f32ae1dbc 100644
--- a/app/src/main/java/fulguris/settings/fragment/CookiesSettingsFragment.kt
+++ b/app/src/main/java/fulguris/settings/fragment/CookiesSettingsFragment.kt
@@ -44,7 +44,7 @@ import fulguris.app
 import fulguris.extensions.copyToClipboard
 import fulguris.extensions.snackbar
 import fulguris.extensions.toast
-import slions.BasicPreference
+import slions.pref.BasicPreference
 import fulguris.utils.WebUtils
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import timber.log.Timber
diff --git a/app/src/main/java/fulguris/settings/fragment/DisplaySettingsFragment.kt b/app/src/main/java/fulguris/settings/fragment/DisplaySettingsFragment.kt
index e5e231b50..1f993b6e4 100644
--- a/app/src/main/java/fulguris/settings/fragment/DisplaySettingsFragment.kt
+++ b/app/src/main/java/fulguris/settings/fragment/DisplaySettingsFragment.kt
@@ -29,7 +29,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import fulguris.app
 import fulguris.extensions.configId
-import slions.BasicPreference
+import slions.pref.BasicPreference
 import fulguris.settings.Config
 import java.io.File
 import javax.inject.Inject
diff --git a/app/src/main/java/fulguris/settings/fragment/DomainSettingsFragment.kt b/app/src/main/java/fulguris/settings/fragment/DomainSettingsFragment.kt
index 37b098acd..f60f228bb 100644
--- a/app/src/main/java/fulguris/settings/fragment/DomainSettingsFragment.kt
+++ b/app/src/main/java/fulguris/settings/fragment/DomainSettingsFragment.kt
@@ -31,7 +31,7 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.preference.Preference
 import dagger.hilt.android.AndroidEntryPoint
-import slions.BasicPreference
+import slions.pref.BasicPreference
 
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/fulguris/settings/fragment/DomainsSettingsFragment.kt b/app/src/main/java/fulguris/settings/fragment/DomainsSettingsFragment.kt
index 9911cbd09..4d826de37 100644
--- a/app/src/main/java/fulguris/settings/fragment/DomainsSettingsFragment.kt
+++ b/app/src/main/java/fulguris/settings/fragment/DomainsSettingsFragment.kt
@@ -32,7 +32,7 @@ import fulguris.extensions.resizeAndShow
 import fulguris.extensions.reverseDomainName
 import fulguris.favicon.FaviconModel
 import fulguris.settings.preferences.DomainPreferences
-import slions.BasicPreference
+import slions.pref.BasicPreference
 import fulguris.utils.Utils
 import android.annotation.SuppressLint
 import android.content.SharedPreferences
diff --git a/app/src/main/java/fulguris/settings/fragment/PageHistorySettingsFragment.kt b/app/src/main/java/fulguris/settings/fragment/PageHistorySettingsFragment.kt
index 6f2fb950f..1a5959e3f 100644
--- a/app/src/main/java/fulguris/settings/fragment/PageHistorySettingsFragment.kt
+++ b/app/src/main/java/fulguris/settings/fragment/PageHistorySettingsFragment.kt
@@ -39,7 +39,7 @@ import androidx.core.graphics.scale
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import dagger.hilt.android.AndroidEntryPoint
-import slions.BasicPreference
+import slions.pref.BasicPreference
 import io.reactivex.Scheduler
 import io.reactivex.rxkotlin.subscribeBy
 import javax.inject.Inject
diff --git a/app/src/main/java/fulguris/settings/fragment/ResponsiveSettingsFragment.kt b/app/src/main/java/fulguris/settings/fragment/ResponsiveSettingsFragment.kt
index adc4ca1cd..eea6a10b0 100644
--- a/app/src/main/java/fulguris/settings/fragment/ResponsiveSettingsFragment.kt
+++ b/app/src/main/java/fulguris/settings/fragment/ResponsiveSettingsFragment.kt
@@ -8,7 +8,7 @@ import androidx.fragment.app.commit
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceHeaderFragmentCompat
-import slions.BasicPreference
+import slions.pref.BasicPreference
 import timber.log.Timber
 
 
diff --git a/app/src/main/res/xml/preference_configuration.xml b/app/src/main/res/xml/preference_configuration.xml
index 34107bfcb..2310d3e8e 100644
--- a/app/src/main/res/xml/preference_configuration.xml
+++ b/app/src/main/res/xml/preference_configuration.xml
@@ -101,7 +101,7 @@
         a:iconSpaceReserved="false"
         a:singleLineTitle="false" />
 
-    <slions.EnumListPreference
+    <slions.pref.EnumListPreference
         a:key="@string/pref_key_cutout_mode"
         a:title="@string/pref_title_cutout_mode"
         a:useSimpleSummaryProvider="true"
@@ -112,7 +112,7 @@
         a:enumClassName="fulguris.enums.CutoutMode"
         />
 
-    <slions.SliderPreference
+    <slions.pref.SliderPreference
         a:key="@string/pref_key_desktop_width"
         a:title="@string/pref_title_desktop_width"
         a:summary="@string/pref_summary_desktop_width"
diff --git a/app/src/main/res/xml/preference_debug.xml b/app/src/main/res/xml/preference_debug.xml
index d10cc2644..0c9772cda 100644
--- a/app/src/main/res/xml/preference_debug.xml
+++ b/app/src/main/res/xml/preference_debug.xml
@@ -35,7 +35,7 @@
         a:singleLineTitle="false"
         />
 
-    <slions.EnumListPreference
+    <slions.pref.EnumListPreference
         a:key="@string/pref_key_log_level"
         a:dependency="@string/pref_key_logs"
         a:title="@string/pref_title_log_level"
diff --git a/app/src/main/res/xml/preference_display.xml b/app/src/main/res/xml/preference_display.xml
index 75389b137..f8ba50a35 100644
--- a/app/src/main/res/xml/preference_display.xml
+++ b/app/src/main/res/xml/preference_display.xml
@@ -76,7 +76,7 @@
             a:singleLineTitle="false"
             />
 
-        <slions.EnumListPreference
+        <slions.pref.EnumListPreference
             a:key="@string/pref_key_toolbar_label"
             a:title="@string/settings_title_toolbar_label"
             a:useSimpleSummaryProvider="true"
@@ -87,7 +87,7 @@
             a:enumClassName="fulguris.enums.HeaderInfo"
             />
 
-        <slions.EnumListPreference
+        <slions.pref.EnumListPreference
             a:key="@string/pref_key_task_label"
             a:title="@string/settings_title_task_label"
             a:useSimpleSummaryProvider="true"
@@ -193,7 +193,7 @@
 
     <PreferenceCategory android:title="@string/pref_category_webpage">
 
-        <slions.EnumListPreference
+        <slions.pref.EnumListPreference
             a:key="@string/pref_key_layer_type"
             a:title="@string/settings_title_layer_type"
             a:useSimpleSummaryProvider="true"
diff --git a/app/src/main/res/xml/preference_domain.xml b/app/src/main/res/xml/preference_domain.xml
index 0068f94bc..6e58c052b 100644
--- a/app/src/main/res/xml/preference_domain.xml
+++ b/app/src/main/res/xml/preference_domain.xml
@@ -52,7 +52,7 @@
 
     </Preference>
 
-    <slions.BasicPreference
+    <slions.pref.BasicPreference
         a:fragment="fulguris.settings.fragment.DomainSettingsFragment"
         a:key="@string/pref_key_parent"
         a:title="@string/settings_title_parent"
@@ -180,7 +180,7 @@
             a:iconSpaceReserved="true"
             a:singleLineTitle="false" />
 
-        <slions.EnumListPreference
+        <slions.pref.EnumListPreference
             a:key="@string/pref_key_launch_app"
             a:title="@string/settings_title_launch_app"
             a:useSimpleSummaryProvider="true"
@@ -207,7 +207,7 @@
             a:iconSpaceReserved="true"
             a:singleLineTitle="false" />
 
-        <slions.EnumListPreference
+        <slions.pref.EnumListPreference
             a:key="@string/pref_key_ssl_error"
             a:title="@string/settings_title_ssl_error"
             a:useSimpleSummaryProvider="true"
@@ -234,7 +234,7 @@
         />
 
 
-    <slions.BasicPreference
+    <slions.pref.BasicPreference
         a:key="@string/pref_key_delete"
         a:title="@string/settings_title_delete_domain_settings"
         a:summary="@string/settings_summary_delete_domain_settings"
diff --git a/app/src/main/res/xml/preference_domain_default.xml b/app/src/main/res/xml/preference_domain_default.xml
index eeaceb35a..cfa3eb5b8 100644
--- a/app/src/main/res/xml/preference_domain_default.xml
+++ b/app/src/main/res/xml/preference_domain_default.xml
@@ -71,7 +71,7 @@
         a:iconSpaceReserved="false"
         a:singleLineTitle="false" />
 
-    <slions.EnumListPreference
+    <slions.pref.EnumListPreference
         a:key="@string/pref_key_launch_app"
         a:title="@string/settings_title_launch_app"
         a:useSimpleSummaryProvider="true"
@@ -82,7 +82,7 @@
         a:enumClassName="fulguris.settings.NoYesAsk"
         />
 
-    <slions.EnumListPreference
+    <slions.pref.EnumListPreference
         a:key="@string/pref_key_ssl_error"
         a:title="@string/settings_title_ssl_error"
         a:useSimpleSummaryProvider="true"
diff --git a/app/src/main/res/xml/preference_scrollbars.xml b/app/src/main/res/xml/preference_scrollbars.xml
index c964b3630..9ec678cb7 100644
--- a/app/src/main/res/xml/preference_scrollbars.xml
+++ b/app/src/main/res/xml/preference_scrollbars.xml
@@ -12,7 +12,7 @@
         app:layout="@layout/preference_category_material"
         tools:ignore="PrivateResource" />
 
-    <slions.SliderPreference
+    <slions.pref.SliderPreference
         app:key="@string/pref_key_scrollbar_size"
         app:title="@string/pref_title_scrollbar_size"
         app:summary="@string/pref_summary_scrollbar_size"
@@ -39,7 +39,7 @@
         app:singleLineTitle="false"
         />
 
-    <slions.SliderPreference
+    <slions.pref.SliderPreference
         app:key="@string/pref_key_scrollbar_delay_before_fade"
         app:dependency="@string/pref_key_scrollbar_fading"
         app:title="@string/pref_title_scrollbar_delay_before_fade"
@@ -58,7 +58,7 @@
         app:singleLineTitle="false"
         />
 
-    <slions.SliderPreference
+    <slions.pref.SliderPreference
         app:key="@string/pref_key_scrollbar_fade_duration"
         app:dependency="@string/pref_key_scrollbar_fading"
         app:title="@string/pref_title_scrollbar_fade_duration"
diff --git a/app/src/main/res/xml/preference_tab.xml b/app/src/main/res/xml/preference_tab.xml
index 7a09935b2..0a43cbb1a 100644
--- a/app/src/main/res/xml/preference_tab.xml
+++ b/app/src/main/res/xml/preference_tab.xml
@@ -52,7 +52,7 @@
             a:singleLineTitle="false"
             />
 
-        <slions.SliderPreference
+        <slions.pref.SliderPreference
             a:key="@string/pref_key_on_tab_flip_animation_duration"
             a:dependency="@string/pref_key_on_tab_back_show_animation"
             a:title="@string/settings_title_animation_duration"