diff --git a/app/src/main/res/layout/list_item_view_switch.xml b/app/src/main/res/layout/list_item_view_switch.xml
index 70a8f401..a536b1fa 100644
--- a/app/src/main/res/layout/list_item_view_switch.xml
+++ b/app/src/main/res/layout/list_item_view_switch.xml
@@ -72,7 +72,7 @@
         android:orientation="vertical"
         app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
 
-    <code.name.monkey.retromusic.views.ATESwitch
+    <code.name.monkey.appthemehelper.common.views.ATESwitch
         android:id="@android:id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item_view_switch_no_title.xml b/app/src/main/res/layout/list_item_view_switch_no_title.xml
index 9414de65..4f65d0a6 100644
--- a/app/src/main/res/layout/list_item_view_switch_no_title.xml
+++ b/app/src/main/res/layout/list_item_view_switch_no_title.xml
@@ -60,7 +60,7 @@
         android:orientation="vertical"
         app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
 
-    <code.name.monkey.retromusic.views.ATESwitch
+    <code.name.monkey.appthemehelper.common.views.ATESwitch
         android:id="@android:id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
index bcea73fb..16fe3a50 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
@@ -299,5 +299,9 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
             }
             return true
         }
+
+        fun isMD3Enabled(context: Context): Boolean {
+            return prefs(context).getBoolean(ThemeStorePrefKeys.KEY_MATERIAL_YOU, false)
+        }
     }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt
index fcec0cb6..8b6c8aeb 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt
@@ -27,5 +27,7 @@ internal interface ThemeStorePrefKeys {
         const val KEY_APPLY_PRIMARYDARK_STATUSBAR = "apply_primarydark_statusbar"
         const val KEY_APPLY_PRIMARY_NAVBAR = "apply_primary_navbar"
         const val KEY_AUTO_GENERATE_PRIMARYDARK = "auto_generate_primarydark"
+
+        const val KEY_MATERIAL_YOU = "material_you"
     }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
index 56b40c92..911487e4 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
@@ -16,9 +16,11 @@ package code.name.monkey.appthemehelper.common.views
 
 import android.content.Context
 import android.util.AttributeSet
-
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.content.ContextCompat
+import code.name.monkey.appthemehelper.R
 import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.VersionUtils
 
 class ATEAccentTextView @JvmOverloads constructor(
     context: Context,
@@ -27,6 +29,13 @@ class ATEAccentTextView @JvmOverloads constructor(
 ) : AppCompatTextView(context, attrs, defStyleAttr) {
 
     init {
-        setTextColor(ThemeStore.accentColor(context))
+        setTextColor(
+            // Set MD3 accent if MD3 is enabled or in-app accent otherwise
+            if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) {
+                ContextCompat.getColor(context, R.color.m3_accent_color)
+            } else {
+                ThemeStore.accentColor(context)
+            }
+        )
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ATESwitch.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
similarity index 72%
rename from app/src/main/java/code/name/monkey/retromusic/views/ATESwitch.kt
rename to appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
index f487b40b..62cd23e3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/ATESwitch.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
@@ -1,13 +1,14 @@
-package code.name.monkey.retromusic.views
+package code.name.monkey.appthemehelper.common.views
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.SwitchCompat
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import code.name.monkey.appthemehelper.ATH
+import code.name.monkey.appthemehelper.R
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroColorUtil
+import code.name.monkey.appthemehelper.util.VersionUtils
 
 /**
  * @author Aidan Follestad (afollestad)
@@ -31,8 +32,8 @@ class ATESwitch : SwitchCompat {
     }
 
     private fun init(context: Context) {
-        if (PreferenceUtil.materialYou) {
-            ATH.setTint(this, RetroColorUtil.getMD3AccentColor(context))
+        if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) {
+            ATH.setTint(this, ContextCompat.getColor(context, R.color.m3_accent_color))
         } else {
             ATH.setTint(this, ThemeStore.accentColor(context))
         }
diff --git a/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml b/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml
index d471145f..2f6f3889 100755
--- a/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<code.name.monkey.retromusic.views.ATESwitch xmlns:android="http://schemas.android.com/apk/res/android"
+<ATESwitch xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/checkbox"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-night-v31/colors.xml b/appthemehelper/src/main/res/values-night-v31/colors.xml
similarity index 100%
rename from app/src/main/res/values-night-v31/colors.xml
rename to appthemehelper/src/main/res/values-night-v31/colors.xml
diff --git a/app/src/main/res/values-v31/colors.xml b/appthemehelper/src/main/res/values-v31/colors.xml
old mode 100644
new mode 100755
similarity index 90%
rename from app/src/main/res/values-v31/colors.xml
rename to appthemehelper/src/main/res/values-v31/colors.xml
index 5fb206d5..7afe8f64
--- a/app/src/main/res/values-v31/colors.xml
+++ b/appthemehelper/src/main/res/values-v31/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="m3_accent_color">@android:color/system_accent1_600</color>
-</resources>
\ No newline at end of file
+</resources>