diff --git a/app/src/main/res/xml/ryd_prefs.xml b/app/src/main/res/xml/ryd_prefs.xml
index 0cbdb4c..0aa5329 100644
--- a/app/src/main/res/xml/ryd_prefs.xml
+++ b/app/src/main/res/xml/ryd_prefs.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <androidx.preference.PreferenceCategory
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
         android:title="@string/ryd_title">
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:title="@string/ryd_enable_title"
             android:summary="@string/ryd_enable_summary"
             android:key="vancedx_rydyt" />
-    </androidx.preference.PreferenceCategory>
+    </PreferenceCategory>
 
-    <androidx.preference.PreferenceCategory
+    <PreferenceCategory
         android:title="@string/ryd_knownissues">
-        <androidx.preference.Preference
+        <Preference
             android:summary="@string/ryd_limitaions" />
-    </androidx.preference.PreferenceCategory>
-    <androidx.preference.PreferenceCategory
+    </PreferenceCategory>
+    <PreferenceCategory
         android:title="@string/vancedx_about">
-        <androidx.preference.Preference
+        <Preference
             android:title="@string/ryd_about_integration"
             android:summary="@string/ryd_about_integration_summary">
             <intent
                 android:action="android.intent.action.VIEW"
                 android:data="https://www.returnyoutubedislike.com/" />
-        </androidx.preference.Preference>
-        <androidx.preference.Preference
+        </Preference>
+        <Preference
             android:title="@string/ryd_github_repository">
             <intent
                 android:action="android.intent.action.VIEW"
                 android:data="https://github.com/Anarios/return-youtube-dislike">
             </intent>
-        </androidx.preference.Preference>
-        </androidx.preference.PreferenceCategory>
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+        </Preference>
+        </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_fragment_cairo.xml b/app/src/main/res/xml/settings_fragment_cairo.xml
index fb49138..4296355 100644
--- a/app/src/main/res/xml/settings_fragment_cairo.xml
+++ b/app/src/main/res/xml/settings_fragment_cairo.xml
@@ -3,7 +3,7 @@
     <Preference
         android:icon="@drawable/yt_outline_gear_vd_theme_24"
         android:persistent="false"
-        android:layout="@layout/preference_with_icon"
+        android:layout=""
         android:title="@string/vancedx_settings_title"
         android:key=""
         android:fragment="" />
diff --git a/app/src/main/res/xml/sponsorblock_prefs.xml b/app/src/main/res/xml/sponsorblock_prefs.xml
index bed3434..5a09011 100644
--- a/app/src/main/res/xml/sponsorblock_prefs.xml
+++ b/app/src/main/res/xml/sponsorblock_prefs.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <androidx.preference.PreferenceCategory
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
         android:title="SponsorBlock">
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/sb_enable_sb"
             android:defaultValue="false"
             android:summary="@string/sb_enable_sb_sum"
             android:key="vancedx_sponsorblock" />
-    </androidx.preference.PreferenceCategory>
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/vancedx_prefs.xml b/app/src/main/res/xml/vancedx_prefs.xml
index f6328f9..6079dcf 100644
--- a/app/src/main/res/xml/vancedx_prefs.xml
+++ b/app/src/main/res/xml/vancedx_prefs.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto">
-    <androidx.preference.PreferenceCategory
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto">
+    <PreferenceCategory
         android:title="@string/microg_settings">
-    <androidx.preference.PreferenceScreen
+    <PreferenceScreen
         android:title="@string/microg_notification_settings"
         android:summary="@string/microg_notification_settings_summary">
     <intent
         android:targetPackage="com.mgoogle.android.gms"
         android:targetClass="org.microg.gms.ui.MainSettingsActivity" />
-    </androidx.preference.PreferenceScreen>
-    </androidx.preference.PreferenceCategory>
+    </PreferenceScreen>
+    </PreferenceCategory>
 
-    <androidx.preference.PreferenceCategory
+    <PreferenceCategory
         android:title="@string/vancedx_settings_title" />
-    <androidx.preference.PreferenceScreen
+    <PreferenceScreen
         android:title="@string/vancedx_video_title"
         android:summary="@string/vancedx_video_summary"
         android:key="vancedx_video_settings">
-        <androidx.preference.PreferenceCategory
+        <PreferenceCategory
             android:title="@string/vancedx_video_summary" >
-        <androidx.preference.ListPreference
+        <ListPreference
             android:title="@string/vancedx_video_quality_overwifi_title"
             android:key="vancedx_videoquality_overwifi"
             android:summary="@string/vancedx_setvalue_summary" />
-        <androidx.preference.ListPreference
+        <ListPreference
             android:title="@string/vancedx_video_quality_overcellular"
             android:key="vancedx_videoquality_overcellular"
             android:summary="@string/vancedx_setvalue_summary" />
-        <androidx.preference.ListPreference
+        <ListPreference
             android:title="@string/vancedx_default_video_speed_title"
             android:key="vancedx_videospeed"
             android:summary="@string/vancedx_setvalue_summary" />
-        </androidx.preference.PreferenceCategory>
-        <androidx.preference.PreferenceCategory
+        </PreferenceCategory>
+        <PreferenceCategory
             android:title="Experimential" >
             <SwitchPreference
                 android:title="@string/vancedx_fix_videoplayback_title"
                 android:key="vancedx_videoplaybackfix"
                 android:defaultValue="false"
                 android:summary="@string/vancedx_fix_videoplayback_summary" />
-        </androidx.preference.PreferenceCategory>
-        <androidx.preference.PreferenceCategory
+        </PreferenceCategory>
+        <PreferenceCategory
             android:title="Video codecs" >
             <SwitchPreference
                 android:title="@string/vancedx_vp9_codec_title"
@@ -52,281 +52,281 @@
                 android:key="vancedx_avc"
                 android:summaryOn="@string/vancedx_avc_codec_summaryon"
                 android:summaryOff="@string/vancedx_avc_codec_summaryoff" />
-        </androidx.preference.PreferenceCategory>
-    </androidx.preference.PreferenceScreen>
+        </PreferenceCategory>
+    </PreferenceScreen>
 
-    <androidx.preference.PreferenceScreen
+    <PreferenceScreen
         android:title="@string/ads_settings_title"
         android:summary="@string/ads_settings_summary"
         android:key="vancedx_adsettings">
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_remove_home_ads"
             android:key="vancedx_homeads"
             android:defaultValue="true"
             android:summaryOn="@string/vancedx_remove_homeads_enabled"
             android:summaryOff="@string/vancedx_disable_homeads_disabled" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_remove_videoads_title"
             android:key="vancedx_videoads"
             android:defaultValue="true"
             android:summaryOn="@string/vancedx_remove_videoads_enabled"
             android:summaryOff="@string/vancedx_remove_videoads_disabled" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_rm_community_posts"
             android:key="vancedx_rmcommunity"
             android:defaultValue="false"
             android:summaryOn="@string/vancedx_rm_community_posts_summaryon"
             android:summaryOff="@string/vancedx_rm_community_posts_summaryoff" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
                 android:title="@string/vancedx_rm_movies_shelf"
                 android:key="vancedx_movieshelf"
                 android:defaultValue="false"
                 android:summaryOn="@string/vancedx_rm_movies_shelf_summaryon"
                 android:summaryOff="@string/vancedx_rm_movies_shelf_summaryoff" />
-    </androidx.preference.PreferenceScreen>
+    </PreferenceScreen>
 
-    <androidx.preference.PreferenceScreen
+    <PreferenceScreen
         android:title="@string/vancedx_layout_title"
         android:summary="@string/vancedx_layout_summary"
         android:key="vancedx_layoutsettings">
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_endscreencard"
             android:key="vancedx_endscreencard"
             android:defaultValue="true"
             android:summaryOn="@string/vancedx_endscreencard_on"
             android:summaryOff="@string/vancedx_endscreencard_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_infocards"
             android:key="vancedx_infocard"
             android:defaultValue="true"
             android:summaryOn="@string/vancedx_infocards_on"
             android:summaryOff="@string/vancedx_infocards_off"/>
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_watermark"
             android:key="vancedx_watermark"
             android:defaultValue="true"
             android:summaryOn="@string/vancedx_watermark_on"
             android:summaryOff="@string/vancedx_watermark_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_castbutton"
             android:key="vancedx_castbutton"
             android:defaultValue="true"
             android:summaryOn="@string/vancedx_castbutton_on"
             android:summaryOff="@string/vancedx_castbutton_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_miniplayer"
             android:key="vancedx_miniplayer"
             android:defaultValue="false"
             android:summaryOn="@string/vancedx_miniplayer_on"
             android:summaryOff="@string/vancedx_miniplayer_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_createbutton"
             android:key="vancedx_createbutton"
             android:defaultValue="true"
             android:summaryOn="@string/vancedx_createbutton_on"
             android:summaryOff="@string/vancedx_createbutton_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_widesearchbar"
             android:key="vancedx_widesearchbar"
             android:defaultValue="false"
             android:summaryOn="@string/vancedx_widesearchbar_on"
             android:summaryOff="@string/vancedx_widesearchbar_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_old_library_title"
             android:key="vancedx_librarytab"
             android:defaultValue="false"
             android:summary="@string/vancedx_old_library_summary" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_old_explore_title"
             android:key="vancedx_explorebt"
             android:defaultValue="false"
             android:summaryOn="@string/vancedx_old_explore_on"
             android:summaryOff="@string/vancedx_old_explore_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_premiumheader_title"
             android:key="vancedx_premiumheader"
             android:defaultValue="false"
             android:summaryOn="@string/vancedx_premiumheader_on"
             android:summaryOff="@string/vancedx_premiumheader_off" />
-    </androidx.preference.PreferenceScreen>
+    </PreferenceScreen>
 
-        <androidx.preference.PreferenceScreen
+        <PreferenceScreen
             android:title="@string/vancedx_swipe_controls_title"
             android:summary="@string/vancedx_swipe_controls_summary"
             android:key="vancedx_swipecontrol_settings">
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_brightness_gesture_title"
             android:key="vancedx_swipebrightness"
             android:defaultValue="false"
             android:summaryOn="@string/vancedx_brightness_gesture_summary_on"
             android:summaryOff="@string/vancedx_brightness_gesture_summary_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_volume_gesture_title"
             android:key="vancedx_volumeswipe"
             android:defaultValue="false"
             android:summaryOn="@string/vancedx_volume_gesture_summary_on"
             android:summaryOff="@string/vancedx_volume_gesture_summary_off" />
-    </androidx.preference.PreferenceScreen>
+    </PreferenceScreen>
 
-        <androidx.preference.PreferenceScreen
+        <PreferenceScreen
             android:title="@string/vancedx_misc_title"
             android:summary="@string/vancedx_misc_summary"
             android:key="vancedx_miscsettings">
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_downloadbutton_title"
             android:key="vancedx_downloadbutton"
             android:defaultValue="true"
             android:summaryOn="@string/vancedx_downloadbutton_on"
             android:summaryOff="@string/vancedx_downloadbutton_off" />
-        <androidx.preference.EditTextPreference
+        <EditTextPreference
             android:title="@string/vancedx_pkgname"
             android:key="vancedx_downloader_pkgname" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_autorepeat_tilte"
             android:key="vancedx_autorepeat"
             android:defaultValue="false"
             android:summaryOn="@string/vancedx_autorepeat_on"
             android:summaryOff="@string/vancedx_autorepeat_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_copyurl_bt_title"
             android:key="vancedx_copybt"
             android:defaultValue="false"
             android:summary="@string/vancedx_copyurl_bt_summary" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:title="@string/vancedx_copyurl_timestamp_bt_title"
             android:key="vancedx_copybt_time"
             android:defaultValue="false"
             android:summary="@string/vancedx_copyurl_timestamp_bt_summary" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
                 android:title="@string/vancedx_bgplayback_title"
                 android:key="vancedx_bgplayback_policy"
                 android:defaultValue="true"
                 android:summaryOn="@string/vancedx_bgplayback_summary_on"
                 android:summaryOff="@string/vancedx_bgplayback_summary_off" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
                 android:title="@string/vancedx_googleone_frame_title"
                 android:icon="@drawable/googleone_circleframe"
                 android:key="vancedx_ggoneframe"
                 android:defaultValue="false"
                 android:summary="@string/vancedx_googleone_frame_summary" />
-    </androidx.preference.PreferenceScreen>
+    </PreferenceScreen>
 
-    <androidx.preference.PreferenceScreen
+    <PreferenceScreen
         android:title="@string/vancedx_about">
-        <androidx.preference.PreferenceScreen
+        <PreferenceScreen
             android:title="@string/vancedx_about"
             android:summary="@string/vancedx_about_summary"
             android:key="vancedx_aboutprefs">
-            <androidx.preference.Preference
+            <Preference
                 android:title="@string/vancedx_aboutproject_gitlab_title"
                 android:icon="@drawable/ic_gitlab"
                 android:summary="@string/vancedx_aboutproject_gitlab_summary">
                 <intent
                     android:action="android.intent.action.VIEW"
                     android:data="@string/vancedx_gitlab_url" />
-            </androidx.preference.Preference>
-            <androidx.preference.Preference
+            </Preference>
+            <Preference
                 android:title="@string/vancedx_aboutproject_sourceforge"
                 android:icon="@drawable/ic_sourceforge"
                 android:summary="@string/vancedx_aboutproject_sourceforge_summary">
                 <intent
                     android:action="android.intent.action.VIEW"
                     android:data="@string/vancedx_sourceforge_url" />
-            </androidx.preference.Preference>
-            <androidx.preference.Preference
+            </Preference>
+            <Preference
                 android:title="@string/vancedx_discord"
                 android:icon="@drawable/ic_discord"
                 android:summary="@string/vancedx_discord_summary">
                 <intent
                     android:action="android.intent.action.VIEW"
                     android:data="@string/vancedx_discord_url" />
-            </androidx.preference.Preference>
-            <androidx.preference.Preference
+            </Preference>
+            <Preference
                 android:title="@string/vancedx_aboutproject_tgchannel_title"
                 android:icon="@drawable/tglogo"
                 android:summary="@string/vancedx_aboutproject_tgchannel_summary">
                 <intent
                     android:action="android.intent.action.VIEW"
                     android:data="@string/vancedx_tgchannel_url" />
-            </androidx.preference.Preference>
-            <androidx.preference.Preference
+            </Preference>
+            <Preference
                 android:title="@string/vancedx_aboutproject_tgchat_title"
                 android:icon="@drawable/tglogo"
                 android:summary="@string/vancedx_aboutproject_tgchat_summary">
                 <intent
                     android:action="android.intent.action.VIEW"
                     android:data="@string/vancedx_tgchat_url" />
-            </androidx.preference.Preference>
-            <androidx.preference.PreferenceCategory
+            </Preference>
+            <PreferenceCategory
                 android:title="Contributors">
                 <!-- DO NOT REMOVE THIS CREDIT, OTHERWISE PROJECT CAN BE DEAD -->
-            <androidx.preference.Preference
+            <Preference
                 android:title="Cuynu"
                 android:summary="Implement Vanced+ - Vietnamese translation">
                 <intent
                     android:action="android.intent.action.VIEW"
                     android:data="@string/vancedx_authorchannel" />
-            </androidx.preference.Preference>
-            </androidx.preference.PreferenceCategory>
-        </androidx.preference.PreferenceScreen>
-    </androidx.preference.PreferenceScreen>
+            </Preference>
+            </PreferenceCategory>
+        </PreferenceScreen>
+    </PreferenceScreen>
 
-    <androidx.preference.PreferenceCategory
+    <PreferenceCategory
         android:title="@string/vancedx_patchinformation_title"/>
-    <androidx.preference.PreferenceScreen
+    <PreferenceScreen
         android:title="vancedx-patches"
         android:summary="@string/vancedx_details">
-        <androidx.preference.Preference
+        <Preference
             android:summary="@string/vancedx_warning_unknownsites">
             <intent
                 android:action="android.intent.action.VIEW"
                 android:data="https://gitlab.com/cuynu/vancedx/-/releases"/>
-        </androidx.preference.Preference>
-        <androidx.preference.Preference
+        </Preference>
+        <Preference
             android:title="@string/vancedx_patches_version"
             android:summary="v0.0.0-vancedx"/>
-        <androidx.preference.Preference
+        <Preference
             android:title="@string/vancedx_sourcecode"
             android:icon="@drawable/ic_gitlab"
             android:summary="@string/vancedx_patches_sourcecode">
             <intent
                 android:action="android.intent.action.VIEW"
                 android:data="https://gitlab.com/cuynu/vancedx-patches"/>
-        </androidx.preference.Preference>
-    </androidx.preference.PreferenceScreen>
-    <androidx.preference.PreferenceScreen
+        </Preference>
+    </PreferenceScreen>
+    <PreferenceScreen
         android:title="vancedx-integrations"
         android:summary="@string/vancedx_details">
-        <androidx.preference.Preference
+        <Preference
             android:summary="@string/vancedx_warning_unknownsites">
             <intent
                 android:action="android.intent.action.VIEW"
                 android:data="https://gitlab.com/cuynu/vancedx/-/releases"/>
-        </androidx.preference.Preference>
-        <androidx.preference.Preference
+        </Preference>
+        <Preference
             android:title="@string/vancedx_integrations_version"
             android:summary="v0.0.0-vancedx"/>
-        <androidx.preference.Preference
+        <Preference
             android:title="@string/vancedx_sourcecode"
             android:icon="@drawable/ic_gitlab"
             android:summary="@string/vancedx_integrations_sourcecode">
             <intent
                 android:action="android.intent.action.VIEW"
                 android:data="https://gitlab.com/cuynu/vancedx-integrations" />
-        </androidx.preference.Preference>
-    </androidx.preference.PreferenceScreen>
+        </Preference>
+    </PreferenceScreen>
 
-    <androidx.preference.PreferenceCategory
+    <PreferenceCategory
         android:title="@string/vancedx_debug">
-        <androidx.preference.Preference
+        <Preference
             android:title="@string/vancedx_restart_title"
             android:key="vancedx_rebootdialog" />
-        <androidx.preference.SwitchPreferenceCompat
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="vancedx_debuglogs"
             android:summaryOff="@string/vancedx_debug_mode_summaryoff"
             android:summaryOn="@string/vancedx_debug_mode_summaryon"
             android:title="@string/vancedx_debug_mode"
             android:enabled="true" />
-    </androidx.preference.PreferenceCategory>
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/ytm_vancedx_prefs.xml b/app/src/main/res/xml/ytm_vancedx_prefs.xml
index 647180e..a302581 100644
--- a/app/src/main/res/xml/ytm_vancedx_prefs.xml
+++ b/app/src/main/res/xml/ytm_vancedx_prefs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- This are YTM Vanced+ settings, do not use with normal YouTube app -->
-    <androidx.preference.PreferenceScreen
+    <PreferenceScreen
         android:title="@string/vancedx_settings_title"
         android:summary="Advanced options">
         <com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat
@@ -11,5 +11,5 @@
                 android:defaultValue="false"
                 android:key="ytmvancedx_adremoval"/>
         </com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat>
-    </androidx.preference.PreferenceScreen>
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+    </PreferenceScreen>
+</PreferenceScreen>
\ No newline at end of file