diff --git a/app/src/main/java/ani/dantotsu/media/MediaListDialogFragment.kt b/app/src/main/java/ani/dantotsu/media/MediaListDialogFragment.kt
index b1576e40ab5..fe5c0c93a04 100644
--- a/app/src/main/java/ani/dantotsu/media/MediaListDialogFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaListDialogFragment.kt
@@ -16,7 +16,7 @@ import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.api.FuzzyDate
 import ani.dantotsu.connections.mal.MAL
 import ani.dantotsu.databinding.BottomSheetMediaListBinding
-import com.google.android.material.switchmaterial.SwitchMaterial
+import com.google.android.material.materialswitch.MaterialSwitch
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -196,7 +196,7 @@ class MediaListDialogFragment : BottomSheetDialogFragment() {
                     }
 
                 media?.inCustomListsOf?.forEach {
-                    SwitchMaterial(requireContext()).apply {
+                    MaterialSwitch(requireContext()).apply {
                         isChecked = it.value
                         text = it.key
                         setOnCheckedChangeListener { _, isChecked ->
diff --git a/app/src/main/res/color/button_switch_track.xml b/app/src/main/res/color/button_switch_track.xml
index a22a2cc2511..b6b00672a3f 100644
--- a/app/src/main/res/color/button_switch_track.xml
+++ b/app/src/main/res/color/button_switch_track.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnBackground" android:state_checked="false"/>
-    <item android:color="?attr/colorPrimary" android:state_checked="true"/>
-</selector>
+    <item android:color="?android:colorBackground" android:state_checked="true"/>
+    <item android:color="?attr/colorPrimary" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_player_settings.xml b/app/src/main/res/layout/activity_player_settings.xml
index 2685484ca1c..3980f9d6b00 100644
--- a/app/src/main/res/layout/activity_player_settings.xml
+++ b/app/src/main/res/layout/activity_player_settings.xml
@@ -90,7 +90,7 @@
                 android:paddingEnd="32dp"
                 android:text="@string/video" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsVideoInfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -111,7 +111,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
@@ -239,7 +239,7 @@
                 app:iconPadding="16dp"
                 app:iconSize="24dp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsCursedSpeeds"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -299,7 +299,7 @@
                 android:paddingEnd="32dp"
                 android:text="@string/subtitles" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/subSwitch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -546,7 +546,7 @@
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
                     tools:ignore="TextContrastCheck" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/playerSettingsTimeStamps"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -567,7 +567,7 @@
                     app:showText="false"
                     app:thumbTint="@color/button_switch_track" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/playerSettingsTimeStampsProxy"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -601,7 +601,7 @@
                     android:text="@string/timestamp_proxy_desc"
                     android:textSize="14sp" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/playerSettingsShowTimeStamp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -622,7 +622,7 @@
                     app:showText="false"
                     app:thumbTint="@color/button_switch_track">
 
-                </com.google.android.material.switchmaterial.SwitchMaterial>
+                </com.google.android.material.materialswitch.MaterialSwitch>
 
             </ani.dantotsu.others.Xpandable>
 
@@ -643,7 +643,7 @@
                 android:paddingEnd="32dp"
                 android:text="@string/auto" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsAutoSkipOpEd"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -676,7 +676,7 @@
                 android:text="@string/requires_time_stamps_to_be_enabled"
                 android:textSize="14sp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsAutoPlay"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -697,7 +697,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
@@ -711,7 +711,7 @@
                 android:text="@string/auto_play_next_episode_info"
                 android:textSize="14sp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsAutoSkip"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -732,7 +732,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
@@ -765,7 +765,7 @@
                 android:paddingEnd="32dp"
                 android:text="@string/update_progress" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsAskUpdateProgress"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -786,7 +786,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
@@ -800,7 +800,7 @@
                 android:text="@string/ask_update_progress_info_ep"
                 android:textSize="14sp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsAskUpdateHentai"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -821,7 +821,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
@@ -882,7 +882,7 @@
                 android:paddingEnd="32dp"
                 android:text="@string/behaviour" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsAlwaysContinue"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -903,9 +903,9 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsPauseVideo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -925,9 +925,9 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsVerticalGestures"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -947,9 +947,9 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsFastForward"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -970,9 +970,9 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsDoubleTap"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -993,7 +993,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
@@ -1155,7 +1155,7 @@
                 android:textColor="?attr/colorSecondary"
                 tools:ignore="TextContrastCheck" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsPiP"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -1175,10 +1175,10 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/playerSettingsCast"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -1199,7 +1199,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_reader_settings.xml b/app/src/main/res/layout/activity_reader_settings.xml
index 8eb5982266f..0600341a155 100644
--- a/app/src/main/res/layout/activity_reader_settings.xml
+++ b/app/src/main/res/layout/activity_reader_settings.xml
@@ -84,7 +84,7 @@
                 android:textColor="?attr/colorSecondary"
                 tools:ignore="TextContrastCheck" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsSourceName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -105,9 +105,9 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsSystemBars"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -128,7 +128,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
         <ani.dantotsu.others.Xpandable
             android:layout_width="match_parent"
@@ -148,7 +148,7 @@
                 app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
                 tools:ignore="TextContrastCheck" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsAutoWebToon"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -169,7 +169,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
@@ -428,7 +428,7 @@
                 android:text="@string/dual_page_info"
                 android:textSize="14sp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsOverscroll"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -448,7 +448,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsTrueColors"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -480,7 +480,7 @@
                 android:text="@string/true_colors_info"
                 android:textSize="14sp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsImageRotation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -500,7 +500,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsCropBorders"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -521,7 +521,7 @@
                 app:thumbTint="@color/button_switch_track"
                 tools:ignore="TextContrastCheck" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsPadding"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -541,7 +541,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsHidePageNumbers"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -561,7 +561,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsHorizontalScrollBar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -582,7 +582,7 @@
                 app:thumbTint="@color/button_switch_track"
                 tools:ignore="TextContrastCheck" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsKeepScreenOn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -602,7 +602,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsVolumeButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -622,7 +622,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsWrapImages"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -654,7 +654,7 @@
                 android:text="@string/wrap_images_info"
                 android:textSize="14sp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsLongClickImage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -688,7 +688,7 @@
                 android:textColor="?attr/colorSecondary"
                 tools:ignore="TextContrastCheck" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsAskUpdateProgress"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -709,7 +709,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
@@ -723,7 +723,7 @@
                 android:text="@string/ask_update_progress_info_chap"
                 android:textSize="14sp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/readerSettingsAskUpdateDoujins"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -744,7 +744,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 849098faef6..5424f526df4 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -161,7 +161,7 @@
 
                 </LinearLayout>
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsUseOLED"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -230,7 +230,7 @@
                     android:textColor="?attr/colorSecondary"
                     android:gravity="center"
                     android:padding="16dp"/>
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsUseMaterialYou"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -248,7 +248,7 @@
                     app:showText="false"
                     app:thumbTint="@color/button_switch_track" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsUseSourceTheme"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -273,7 +273,7 @@
                     android:fontFamily="@font/poppins_bold"
                     android:text="@string/custom_theme"/>
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsUseCustomTheme"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -341,7 +341,7 @@
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
                     tools:ignore="TextContrastCheck" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsIncognito"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -611,7 +611,7 @@
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
                     tools:ignore="TextContrastCheck" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsForceLegacyInstall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -629,7 +629,7 @@
                     app:showText="false"
                     app:thumbTint="@color/button_switch_track" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/skipExtensionIcons"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -647,7 +647,7 @@
                     app:showText="false"
                     app:thumbTint="@color/button_switch_track" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/NSFWExtension"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -898,7 +898,7 @@
                     app:iconPadding="16dp"
                     app:iconSize="24dp" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsDownloadInSd"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -916,7 +916,7 @@
                     app:showText="false"
                     app:thumbTint="@color/button_switch_track" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsContinueMedia"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -934,7 +934,7 @@
                     app:showText="false"
                     app:thumbTint="@color/button_switch_track" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsRecentlyListOnly"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -997,7 +997,7 @@
                     android:text="@string/subscriptions_info"
                     android:textSize="14sp" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsNotificationsCheckingSubscriptions"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1066,7 +1066,7 @@
                         tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
                 </com.google.android.material.textfield.TextInputLayout>
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsPreferDub"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1084,7 +1084,7 @@
                     app:showText="false"
                     app:thumbTint="@color/button_switch_track" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsShowYt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1400,7 +1400,7 @@
                     app:iconSize="24dp"
                     app:iconTint="?attr/colorPrimary" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/settingsCheckUpdate"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_user_interface_settings.xml b/app/src/main/res/layout/activity_user_interface_settings.xml
index 60142526409..ed878152e8f 100644
--- a/app/src/main/res/layout/activity_user_interface_settings.xml
+++ b/app/src/main/res/layout/activity_user_interface_settings.xml
@@ -98,7 +98,7 @@
                 android:textColor="?attr/colorSecondary"
                 tools:ignore="TextContrastCheck" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/uiSettingsImmersive"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -119,7 +119,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <com.google.android.material.switchmaterial.SwitchMaterial
                 android:id="@+id/uiSettingsImmersiveList"
@@ -177,7 +177,7 @@
                 android:layout_marginEnd="16dp"
                 android:background="?android:attr/listDivider" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/uiSettingsSmallView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -197,7 +197,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
@@ -210,7 +210,7 @@
                 android:textColor="?attr/colorSecondary"
                 tools:ignore="TextContrastCheck" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/uiSettingsBannerAnimation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -230,9 +230,9 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/uiSettingsLayoutAnimation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -253,7 +253,7 @@
                 app:showText="false"
                 app:thumbTint="@color/button_switch_track">
 
-            </com.google.android.material.switchmaterial.SwitchMaterial>
+            </com.google.android.material.materialswitch.MaterialSwitch>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/bottom_sheet_current_novel_reader_settings.xml b/app/src/main/res/layout/bottom_sheet_current_novel_reader_settings.xml
index da2c8d409d3..5d74623885a 100644
--- a/app/src/main/res/layout/bottom_sheet_current_novel_reader_settings.xml
+++ b/app/src/main/res/layout/bottom_sheet_current_novel_reader_settings.xml
@@ -493,7 +493,7 @@
             android:text="Maximum height (horizontal writing) or width (vertical writing)"
             android:textSize="14sp" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/useDarkTheme"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -512,7 +512,7 @@
             app:thumbTint="@color/button_switch_track"
             tools:ignore="VisualLintButtonSize" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/keepScreenOn"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -531,7 +531,7 @@
             app:thumbTint="@color/button_switch_track"
             tools:ignore="VisualLintButtonSize" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/volumeButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/bottom_sheet_current_reader_settings.xml b/app/src/main/res/layout/bottom_sheet_current_reader_settings.xml
index 89a717dd9f1..236c195e362 100644
--- a/app/src/main/res/layout/bottom_sheet_current_reader_settings.xml
+++ b/app/src/main/res/layout/bottom_sheet_current_reader_settings.xml
@@ -258,7 +258,7 @@
             android:text="@string/dual_page_info"
             android:textSize="14sp" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerOverscroll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -276,7 +276,7 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerTrueColors"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -304,7 +304,7 @@
             android:text="@string/true_colors_info"
             android:textSize="14sp" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerImageRotation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -322,7 +322,7 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerCropBorders"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -341,7 +341,7 @@
             app:thumbTint="@color/button_switch_track"
             tools:ignore="TextContrastCheck" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerPadding"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -359,7 +359,7 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerHidePageNumbers"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -377,7 +377,7 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerHorizontalScrollBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -395,7 +395,7 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerKeepScreenOn"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -413,7 +413,7 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerVolumeButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -431,7 +431,7 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerWrapImage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -458,7 +458,7 @@
             android:text="@string/wrap_images_info"
             android:textSize="14sp" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerLongClickImage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/bottom_sheet_media_list.xml b/app/src/main/res/layout/bottom_sheet_media_list.xml
index 9958a9199bf..d0754ffacbd 100644
--- a/app/src/main/res/layout/bottom_sheet_media_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_media_list.xml
@@ -329,7 +329,7 @@
 
                 </com.google.android.material.textfield.TextInputLayout>
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:layout_marginTop="16dp"
                     android:id="@+id/mediaListPrivate"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/bottom_sheet_media_list_small.xml b/app/src/main/res/layout/bottom_sheet_media_list_small.xml
index 99d8d27c10c..94714bbd45c 100644
--- a/app/src/main/res/layout/bottom_sheet_media_list_small.xml
+++ b/app/src/main/res/layout/bottom_sheet_media_list_small.xml
@@ -170,7 +170,7 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/mediaListPrivate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_anime_watch.xml b/app/src/main/res/layout/item_anime_watch.xml
index 3d91872e816..22cae13624c 100644
--- a/app/src/main/res/layout/item_anime_watch.xml
+++ b/app/src/main/res/layout/item_anime_watch.xml
@@ -160,7 +160,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/animeSourceDubbed"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"