From 47a10063f02c1a9f7fcad0a1512efd0a64f195c2 Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Thu, 14 Oct 2021 23:57:17 +0700
Subject: [PATCH] Theme ui elements using accent color palette

---
 build.gradle                                  |   1 +
 lawnchair/res/values/attrs.xml                |   1 +
 lawnchair/res/values/styles.xml               |  12 ++
 .../src/app/lawnchair/LawnchairLauncher.kt    |   4 +-
 .../allapps/FallbackSearchInputView.kt        |  13 +-
 .../lawnchair/allapps/SearchItemBackground.kt |   6 +-
 .../src/app/lawnchair/theme/ResourceToken.kt  |  15 +++
 .../src/app/lawnchair/theme/ThemeProvider.kt  |  77 +++++++++++
 .../src/app/lawnchair/theme/UiColorMode.kt    |  23 ++++
 .../app/lawnchair/theme/color/AndroidColor.kt |   5 +
 .../app/lawnchair/theme/color/ColorToken.kt   | 118 ++++++++++++++++
 .../lawnchair/theme/color/ColorTokenUtils.kt  |   3 +
 .../app/lawnchair/theme/color/ColorTokens.kt  |  58 ++++++++
 .../theme/color/SystemColorScheme.kt          |  28 ++++
 .../lawnchair/theme/drawable/DrawableToken.kt |  57 ++++++++
 .../theme/drawable/DrawableTokens.kt          |  56 ++++++++
 lawnchair/src/app/lawnchair/ui/theme/Color.kt |  10 +-
 lawnchair/src/app/lawnchair/ui/theme/Theme.kt |  55 ++++----
 .../dev/kdrag0n/monet/theme/ColorScheme.kt    |  20 +++
 .../kdrag0n/monet/theme/DynamicColorScheme.kt | 100 ++++++++++++++
 .../kdrag0n/monet/theme/MaterialYouTargets.kt | 127 ++++++++++++++++++
 .../launcher3/QuickstepTransitionManager.java |   5 +-
 .../uioverrides/states/OverviewState.java     |   4 +-
 .../uioverrides/states/QuickSwitchState.java  |   6 +-
 .../quickstep/fallback/RecentsState.java      |   6 +-
 .../android/quickstep/views/RecentsView.java  |   4 +-
 res/values/colors.xml                         |  10 +-
 .../launcher3/AppWidgetResizeFrame.java       |  12 +-
 .../android/launcher3/ButtonDropTarget.java   |  17 +++
 src/com/android/launcher3/CellLayout.java     |   7 +-
 .../allapps/AllAppsContainerView.java         |   5 +-
 src/com/android/launcher3/folder/Folder.java  |   4 +-
 .../folder/FolderAnimationManager.java        |   4 +-
 .../launcher3/folder/PreviewBackground.java   |   6 +-
 src/com/android/launcher3/graphics/Scrim.java |   4 +-
 .../android/launcher3/popup/ArrowPopup.java   |  19 +--
 .../popup/PopupContainerWithArrow.java        |   5 +
 .../android/launcher3/states/HintState.java   |   6 +-
 .../launcher3/widget/WidgetsBottomSheet.java  |   3 +
 .../widget/picker/WidgetsFullSheet.java       |   8 ++
 .../picker/WidgetsListDrawableFactory.java    |   4 +-
 41 files changed, 836 insertions(+), 92 deletions(-)
 create mode 100644 lawnchair/src/app/lawnchair/theme/ResourceToken.kt
 create mode 100644 lawnchair/src/app/lawnchair/theme/ThemeProvider.kt
 create mode 100644 lawnchair/src/app/lawnchair/theme/UiColorMode.kt
 create mode 100644 lawnchair/src/app/lawnchair/theme/color/AndroidColor.kt
 create mode 100644 lawnchair/src/app/lawnchair/theme/color/ColorToken.kt
 create mode 100644 lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt
 create mode 100644 lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt
 create mode 100644 lawnchair/src/app/lawnchair/theme/color/SystemColorScheme.kt
 create mode 100644 lawnchair/src/app/lawnchair/theme/drawable/DrawableToken.kt
 create mode 100644 lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt
 create mode 100644 lawnchair/src/dev/kdrag0n/monet/theme/ColorScheme.kt
 create mode 100644 lawnchair/src/dev/kdrag0n/monet/theme/DynamicColorScheme.kt
 create mode 100644 lawnchair/src/dev/kdrag0n/monet/theme/MaterialYouTargets.kt

diff --git a/build.gradle b/build.gradle
index bc06a27a4a..e433dfea3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -308,6 +308,7 @@ dependencies {
     implementation "com.google.accompanist:accompanist-placeholder-material:$accompanist_version"
     implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
     implementation "com.github.fornewid:material-motion-compose:0.6.1"
+    implementation 'dev.kdrag0n:colorkt:1.0.3'
     implementation "io.coil-kt:coil-compose:1.3.1"
     implementation 'me.xdrop:fuzzywuzzy:1.3.1'
 
diff --git a/lawnchair/res/values/attrs.xml b/lawnchair/res/values/attrs.xml
index 2ea5f4028d..3a34f60ae6 100644
--- a/lawnchair/res/values/attrs.xml
+++ b/lawnchair/res/values/attrs.xml
@@ -16,6 +16,7 @@
   -->
 
 <resources>
+    <attr name="uiColorMode" format="integer" />
     <attr name="allAppsAlternateTextColor" format="color" />
     <attr name="searchboxHighlight" format="color" />
     <attr name="focusHighlight" format="color" />
diff --git a/lawnchair/res/values/styles.xml b/lawnchair/res/values/styles.xml
index 4d2b655ba6..c9a0e26e47 100644
--- a/lawnchair/res/values/styles.xml
+++ b/lawnchair/res/values/styles.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="AppTheme" parent="@style/LauncherTheme">
+        <item name="uiColorMode">0</item>
+
         <item name="android:colorAccent">@color/accent_light</item>
         <item name="android:colorBackground">@color/background_device_default_light</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_light</item>
@@ -23,6 +25,8 @@
         <item name="searchboxHighlight">@color/surface_variant_light</item>
     </style>
     <style name="AppTheme.DarkMainColor" parent="@style/LauncherTheme.DarkMainColor">
+        <item name="uiColorMode">4</item>
+
         <item name="android:colorAccent">@color/accent_light</item>
         <item name="android:colorBackground">@color/background_device_default_light</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_light</item>
@@ -45,6 +49,8 @@
         <item name="searchboxHighlight">@color/surface_variant_light</item>
     </style>
     <style name="AppTheme.DarkText" parent="@style/LauncherTheme.DarkText">
+        <item name="uiColorMode">2</item>
+
         <item name="android:colorAccent">@color/accent_light</item>
         <item name="android:colorBackground">@color/background_device_default_light</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_light</item>
@@ -68,6 +74,8 @@
     </style>
 
     <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark">
+        <item name="uiColorMode">1</item>
+
         <item name="android:colorAccent">@color/accent_dark</item>
         <item name="android:colorBackground">@color/background_device_default_dark</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_dark</item>
@@ -90,6 +98,8 @@
         <item name="searchboxHighlight">@color/system_neutral1_800</item>
     </style>
     <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor">
+        <item name="uiColorMode">5</item>
+
         <item name="android:colorAccent">@color/accent_dark</item>
         <item name="android:colorBackground">@color/background_device_default_dark</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_dark</item>
@@ -112,6 +122,8 @@
         <item name="searchboxHighlight">@color/system_neutral1_800</item>
     </style>
     <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText">
+        <item name="uiColorMode">3</item>
+
         <item name="android:colorAccent">@color/accent_dark</item>
         <item name="android:colorBackground">@color/background_device_default_dark</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_dark</item>
diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt
index a7e7878441..144fd0526f 100644
--- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt
+++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt
@@ -36,13 +36,13 @@ import app.lawnchair.preferences.PreferenceManager
 import app.lawnchair.root.RootHelperManager
 import app.lawnchair.root.RootNotAvailableException
 import app.lawnchair.search.LawnchairSearchAdapterProvider
+import app.lawnchair.theme.color.ColorTokens
 import com.android.launcher3.*
 import com.android.launcher3.allapps.AllAppsContainerView
 import com.android.launcher3.allapps.search.SearchAdapterProvider
 import com.android.launcher3.statemanager.StateManager
 import com.android.launcher3.uioverrides.QuickstepLauncher
 import com.android.launcher3.uioverrides.states.OverviewState
-import com.android.launcher3.util.Themes
 import com.android.systemui.plugins.shared.LauncherOverlayManager
 import com.android.systemui.shared.system.QuickStepContract
 import kotlinx.coroutines.launch
@@ -72,7 +72,7 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner,
 
         prefs.launcherTheme.subscribeChanges(this, ::updateTheme)
         prefs.drawerOpacity.subscribeValues(this) { opacity ->
-            val scrimColor = Themes.getAttrColor(this, R.attr.allAppsScrimColor)
+            val scrimColor = ColorTokens.AllAppsScrimColor.resolveColor(this)
             val alpha = (opacity * 255).roundToInt()
             allAppsScrimColor = ColorUtils.setAlphaComponent(scrimColor, alpha)
         }
diff --git a/lawnchair/src/app/lawnchair/allapps/FallbackSearchInputView.kt b/lawnchair/src/app/lawnchair/allapps/FallbackSearchInputView.kt
index 8e98d5c402..73d0bd3afc 100644
--- a/lawnchair/src/app/lawnchair/allapps/FallbackSearchInputView.kt
+++ b/lawnchair/src/app/lawnchair/allapps/FallbackSearchInputView.kt
@@ -5,8 +5,8 @@ import android.content.Context
 import android.graphics.Rect
 import android.util.AttributeSet
 import android.view.Gravity
+import app.lawnchair.theme.drawable.DrawableTokens
 import com.android.launcher3.ExtendedEditText
-import com.android.launcher3.R
 import com.android.launcher3.allapps.AllAppsContainerView
 
 class FallbackSearchInputView(context: Context, attrs: AttributeSet?) : ExtendedEditText(context, attrs) {
@@ -19,6 +19,11 @@ class FallbackSearchInputView(context: Context, attrs: AttributeSet?) : Extended
                 updateBackground()
             }
         }
+    private val bg = DrawableTokens.SearchInputFg.resolve(context)
+
+    init {
+        background = bg
+    }
 
     fun initialize(appsView: AllAppsContainerView) {
         this.appsView = appsView
@@ -26,11 +31,7 @@ class FallbackSearchInputView(context: Context, attrs: AttributeSet?) : Extended
 
     private fun updateBackground() {
         val showBackground = shown && !isFocused
-        if (showBackground) {
-            setBackgroundResource(R.drawable.search_input_fg)
-        } else {
-            background = null
-        }
+        background = if (showBackground) bg else null
     }
 
     override fun show() {
diff --git a/lawnchair/src/app/lawnchair/allapps/SearchItemBackground.kt b/lawnchair/src/app/lawnchair/allapps/SearchItemBackground.kt
index e1a14e2e76..a7bf56a150 100644
--- a/lawnchair/src/app/lawnchair/allapps/SearchItemBackground.kt
+++ b/lawnchair/src/app/lawnchair/allapps/SearchItemBackground.kt
@@ -6,8 +6,8 @@ import android.graphics.Paint
 import android.graphics.Path
 import android.graphics.RectF
 import android.view.View
+import app.lawnchair.theme.color.ColorTokens
 import com.android.launcher3.R
-import com.android.launcher3.util.Themes
 
 class SearchItemBackground(
     context: Context,
@@ -18,8 +18,8 @@ class SearchItemBackground(
     private val resources = context.resources
 
     private val searchDecorationPadding = resources.getDimensionPixelSize(R.dimen.search_decoration_padding)
-    private val focusHighlight = Themes.getAttrColor(context, R.attr.focusHighlight)
-    private val groupHighlight = if (showBackground) Themes.getAttrColor(context, R.attr.groupHighlight) else 0
+    private val focusHighlight = ColorTokens.FocusHighlight.resolveColor(context)
+    private val groupHighlight = if (showBackground) ColorTokens.GroupHighlight.resolveColor(context) else 0
 
     private val cornerRadii: FloatArray
     private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
diff --git a/lawnchair/src/app/lawnchair/theme/ResourceToken.kt b/lawnchair/src/app/lawnchair/theme/ResourceToken.kt
new file mode 100644
index 0000000000..61ca36626a
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/ResourceToken.kt
@@ -0,0 +1,15 @@
+package app.lawnchair.theme
+
+import android.content.Context
+import com.android.launcher3.R
+import com.android.launcher3.util.Themes
+import dev.kdrag0n.monet.theme.ColorScheme
+
+interface ResourceToken<T> {
+    fun resolve(context: Context) = resolve(context, UiColorMode(Themes.getAttrInteger(context, R.attr.uiColorMode)))
+    fun resolve(context: Context, uiColorMode: UiColorMode): T {
+        val themeProvider = ThemeProvider.INSTANCE.get(context)
+        return resolve(context, themeProvider.colorScheme, uiColorMode)
+    }
+    fun resolve(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode): T
+}
diff --git a/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt b/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt
new file mode 100644
index 0000000000..48e6790e2c
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/ThemeProvider.kt
@@ -0,0 +1,77 @@
+package app.lawnchair.theme
+
+import android.content.Context
+import android.util.SparseArray
+import androidx.core.graphics.ColorUtils
+import app.lawnchair.preferences.PreferenceManager
+import app.lawnchair.theme.color.AndroidColor
+import app.lawnchair.theme.color.SystemColorScheme
+import app.lawnchair.ui.theme.getSystemAccent
+import com.android.launcher3.Utilities
+import com.android.launcher3.util.MainThreadInitializedObject
+import dev.kdrag0n.colorkt.Color
+import dev.kdrag0n.colorkt.cam.Zcam
+import dev.kdrag0n.colorkt.conversion.ConversionGraph.convert
+import dev.kdrag0n.colorkt.data.Illuminants
+import dev.kdrag0n.colorkt.rgb.Srgb
+import dev.kdrag0n.colorkt.tristimulus.CieXyzAbs
+import dev.kdrag0n.colorkt.tristimulus.CieXyzAbs.Companion.toAbs
+import dev.kdrag0n.colorkt.ucs.lab.CieLab
+import dev.kdrag0n.monet.theme.ColorScheme
+import dev.kdrag0n.monet.theme.DynamicColorScheme
+import dev.kdrag0n.monet.theme.MaterialYouTargets
+
+class ThemeProvider(private val context: Context) {
+    private val prefs = PreferenceManager.getInstance(context)
+    private val useSystemAccent by prefs.useSystemAccent
+    private val customAccentColor by prefs.accentColor
+
+    private val targets = MaterialYouTargets(1.0, false, viewingCondition)
+    private val colorSchemeMap = SparseArray<ColorScheme>()
+
+    init {
+        if (Utilities.ATLEAST_S) {
+            colorSchemeMap.append(0, SystemColorScheme(context))
+        }
+    }
+
+    val colorScheme get() = when {
+        useSystemAccent -> systemColorScheme
+        else -> getColorScheme(customAccentColor)
+    }
+
+    val systemColorScheme get() = when {
+        Utilities.ATLEAST_S -> getColorScheme(0)
+        else -> getColorScheme(context.getSystemAccent(darkTheme = false))
+    }
+
+    fun getColorScheme(colorInt: Int): ColorScheme {
+        var colorScheme = colorSchemeMap[colorInt]
+        if (colorScheme == null) {
+            val color = Srgb(colorInt)
+            colorScheme = DynamicColorScheme(targets, color, 1.0, viewingCondition, true)
+            colorSchemeMap.append(colorInt, colorScheme)
+        }
+        return colorScheme
+    }
+
+    companion object {
+        @JvmField
+        val INSTANCE = MainThreadInitializedObject(::ThemeProvider)
+
+        val viewingCondition = Zcam.ViewingConditions(
+            Zcam.ViewingConditions.SURROUND_AVERAGE,
+            0.4f * CieXyzAbs.DEFAULT_SDR_WHITE_LUMINANCE,
+            CieLab(50.0, 0.0, 0.0, Illuminants.D65).toXyz().y * CieXyzAbs.DEFAULT_SDR_WHITE_LUMINANCE,
+            Illuminants.D65.toAbs(CieXyzAbs.DEFAULT_SDR_WHITE_LUMINANCE)
+        )
+    }
+}
+
+fun Color.toAndroidColor(): Int {
+    return when (this) {
+        is AndroidColor -> color
+        is Srgb -> ColorUtils.setAlphaComponent(toRgb8(), 255)
+        else -> convert<Srgb>().toAndroidColor()
+    }
+}
diff --git a/lawnchair/src/app/lawnchair/theme/UiColorMode.kt b/lawnchair/src/app/lawnchair/theme/UiColorMode.kt
new file mode 100644
index 0000000000..869339f023
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/UiColorMode.kt
@@ -0,0 +1,23 @@
+package app.lawnchair.theme
+
+@JvmInline
+value class UiColorMode(val mode: Int) {
+
+    val isDarkTheme get() = (mode and FLAG_DARK) != 0
+    val isDarkText get() = (mode and FLAG_DARK_TEXT) != 0
+    val isDarkPrimaryColor get() = (mode and FLAG_DARK_PRIMARY_COLOR) != 0
+
+    companion object {
+        const val FLAG_DARK = 1 shl 0
+        const val FLAG_DARK_TEXT = 1 shl 1
+        const val FLAG_DARK_PRIMARY_COLOR = 1 shl 2
+
+        val Light = UiColorMode(0)
+        val Light_DarkText = UiColorMode(FLAG_DARK_TEXT)
+        val Light_DarkPrimaryColor = UiColorMode(FLAG_DARK_PRIMARY_COLOR)
+
+        val Dark = UiColorMode(FLAG_DARK)
+        val Dark_DarkText = UiColorMode(FLAG_DARK and FLAG_DARK_TEXT)
+        val Dark_DarkPrimaryColor = UiColorMode(FLAG_DARK and FLAG_DARK_PRIMARY_COLOR)
+    }
+}
diff --git a/lawnchair/src/app/lawnchair/theme/color/AndroidColor.kt b/lawnchair/src/app/lawnchair/theme/color/AndroidColor.kt
new file mode 100644
index 0000000000..b1f07af6c7
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/color/AndroidColor.kt
@@ -0,0 +1,5 @@
+package app.lawnchair.theme.color
+
+import dev.kdrag0n.colorkt.Color
+
+data class AndroidColor(val color: Int) : Color
diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorToken.kt b/lawnchair/src/app/lawnchair/theme/color/ColorToken.kt
new file mode 100644
index 0000000000..8d72db4145
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/color/ColorToken.kt
@@ -0,0 +1,118 @@
+package app.lawnchair.theme.color
+
+import android.content.Context
+import android.util.Log
+import app.lawnchair.theme.ResourceToken
+import app.lawnchair.theme.ThemeProvider
+import app.lawnchair.theme.UiColorMode
+import app.lawnchair.theme.toAndroidColor
+import com.android.launcher3.R
+import com.android.launcher3.util.Themes
+import dev.kdrag0n.colorkt.Color
+import dev.kdrag0n.colorkt.cam.Zcam.Companion.toZcam
+import dev.kdrag0n.colorkt.conversion.ConversionGraph.convert
+import dev.kdrag0n.colorkt.gamut.LchGamut
+import dev.kdrag0n.colorkt.gamut.LchGamut.clipToLinearSrgb
+import dev.kdrag0n.colorkt.tristimulus.CieXyzAbs
+import dev.kdrag0n.monet.theme.ColorScheme
+
+interface ColorToken : ResourceToken<Color> {
+    fun resolveColor(context: Context) = resolveColor(context, UiColorMode(Themes.getAttrInteger(context, R.attr.uiColorMode)))
+    fun resolveColor(context: Context, uiColorMode: UiColorMode): Int {
+        val themeProvider = ThemeProvider.INSTANCE.get(context)
+        return resolveColor(context, themeProvider.colorScheme, uiColorMode)
+    }
+    fun resolveColor(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode): Int {
+        return try {
+            resolve(context, scheme, uiColorMode).toAndroidColor()
+        } catch (t: Throwable) {
+            Log.e("ColorToken", "failed to resolve color", t)
+            android.graphics.Color.WHITE
+        }
+    }
+}
+
+data class SwatchColorToken(
+    private val swatch: Swatch,
+    private val shade: Shade
+) : ColorToken {
+
+    override fun resolve(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode): Color {
+        val swatch = when (swatch) {
+            Swatch.Neutral1 -> scheme.neutral1
+            Swatch.Neutral2 -> scheme.neutral2
+            Swatch.Accent1 -> scheme.accent1
+            Swatch.Accent2 -> scheme.accent2
+            Swatch.Accent3 -> scheme.accent3
+        }
+        return swatch[shade.lightness]!!
+    }
+}
+
+data class DayNightColorToken(
+    private val lightToken: ColorToken,
+    private val darkToken: ColorToken
+) : ColorToken {
+
+    override fun resolve(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode): Color {
+        return if (uiColorMode.isDarkTheme) {
+            darkToken.resolve(context, scheme, uiColorMode)
+        } else {
+            lightToken.resolve(context, scheme, uiColorMode)
+        }
+    }
+}
+
+
+data class DarkTextColorToken(
+    private val lightToken: ColorToken,
+    private val darkToken: ColorToken
+) : ColorToken {
+
+    override fun resolve(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode): Color {
+        return if (uiColorMode.isDarkText) {
+            darkToken.resolve(context, scheme, uiColorMode)
+        } else {
+            lightToken.resolve(context, scheme, uiColorMode)
+        }
+    }
+}
+
+data class SetLStarColorToken(
+    private val token: ColorToken,
+    private val lStar: Double
+) : ColorToken {
+
+    override fun resolve(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode): Color {
+        return token.resolve(context, scheme, uiColorMode)
+            .convert<CieXyzAbs>()
+            .toZcam(ThemeProvider.viewingCondition, include2D = false)
+            .copy(lightness = lStar)
+            .clipToLinearSrgb(LchGamut.ClipMethod.PRESERVE_LIGHTNESS)
+    }
+}
+
+enum class Swatch { Neutral1, Neutral2, Accent1, Accent2, Accent3 }
+
+@JvmInline
+value class Shade private constructor(val lightness: Int) {
+    @Suppress("unused")
+    companion object {
+        val S0 = Shade(0)
+        val S10 = Shade(10)
+        val S20 = Shade(20)
+        val S50 = Shade(50)
+        val S100 = Shade(100)
+        val S200 = Shade(200)
+        val S300 = Shade(300)
+        val S400 = Shade(400)
+        val S500 = Shade(500)
+        val S600 = Shade(600)
+        val S650 = Shade(650)
+        val S700 = Shade(700)
+        val S800 = Shade(800)
+        val S900 = Shade(900)
+        val S950 = Shade(950)
+        val S1000 = Shade(1000)
+    }
+}
diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt b/lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt
new file mode 100644
index 0000000000..5a0b85a253
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt
@@ -0,0 +1,3 @@
+package app.lawnchair.theme.color
+
+fun ColorToken.setLStar(lStar: Double) = SetLStarColorToken(this, lStar)
diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt b/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt
new file mode 100644
index 0000000000..7ce3d44798
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt
@@ -0,0 +1,58 @@
+package app.lawnchair.theme.color
+
+@Suppress("MemberVisibilityCanBePrivate", "unused")
+object ColorTokens {
+    val Neutral1_0 = SwatchColorToken(Swatch.Neutral1, Shade.S0)
+    val Neutral1_50 = SwatchColorToken(Swatch.Neutral1, Shade.S50)
+    val Neutral1_100 = SwatchColorToken(Swatch.Neutral1, Shade.S100)
+    val Neutral1_500 = SwatchColorToken(Swatch.Neutral1, Shade.S500)
+    val Neutral1_700 = SwatchColorToken(Swatch.Neutral1, Shade.S700)
+    val Neutral1_800 = SwatchColorToken(Swatch.Neutral1, Shade.S800)
+    val Neutral1_900 = SwatchColorToken(Swatch.Neutral1, Shade.S900)
+
+    val Neutral2_50 = SwatchColorToken(Swatch.Neutral2, Shade.S50)
+    val Neutral2_100 = SwatchColorToken(Swatch.Neutral2, Shade.S100)
+    val Neutral2_300 = SwatchColorToken(Swatch.Neutral2, Shade.S300)
+    val Neutral2_500 = SwatchColorToken(Swatch.Neutral2, Shade.S500)
+    val Neutral2_700 = SwatchColorToken(Swatch.Neutral2, Shade.S700)
+    val Neutral2_800 = SwatchColorToken(Swatch.Neutral2, Shade.S800)
+
+    val Accent1_100 = SwatchColorToken(Swatch.Accent1, Shade.S100)
+    val Accent1_200 = SwatchColorToken(Swatch.Accent1, Shade.S200)
+    val Accent1_500 = SwatchColorToken(Swatch.Accent1, Shade.S500)
+    val Accent1_600 = SwatchColorToken(Swatch.Accent1, Shade.S600)
+
+    val Accent2_50 = SwatchColorToken(Swatch.Accent2, Shade.S50)
+    val Accent2_600 = SwatchColorToken(Swatch.Accent2, Shade.S600)
+
+    val SurfaceLight = Neutral1_500.setLStar(98.0)
+    val SurfaceDark = Neutral1_800
+    @JvmField val Surface = DayNightColorToken(SurfaceLight, SurfaceDark)
+
+    val SurfaceVariantLight = Neutral2_100
+    val SurfaceVariantDark = Neutral1_700
+
+    @JvmField val ColorAccent = DayNightColorToken(Accent1_600, Accent1_100)
+    @JvmField val ColorBackground = DayNightColorToken(Neutral1_50, Neutral1_900)
+
+    @JvmField val AllAppsHeaderProtectionColor = DayNightColorToken(Neutral1_100, Neutral1_700)
+    @JvmField val AllAppsScrimColor = ColorBackground
+    @JvmField val FocusHighlight = DayNightColorToken(Neutral1_0, Neutral1_700)
+    @JvmField val GroupHighlight = Surface
+    @JvmField val OverviewScrim = DayNightColorToken(Neutral2_500.setLStar(87.0), Neutral1_800)
+    @JvmField val SearchboxHighlight = DayNightColorToken(SurfaceVariantLight, Neutral1_800)
+
+    @JvmField val FolderDotColor = Accent2_50
+    @JvmField val FolderFillColor = DayNightColorToken(Neutral1_50.setLStar(98.0), Neutral2_50.setLStar(30.0))
+
+    @JvmField val PopupColorPrimary = DayNightColorToken(Accent2_50, Neutral2_800)
+    @JvmField val PopupColorSecondary = DayNightColorToken(Neutral2_100, Neutral1_900)
+    @JvmField val PopupColorTertiary = DayNightColorToken(Neutral2_300, Neutral2_700)
+
+    @JvmField val PopupShadeFirst = DayNightColorToken(PopupColorPrimary.setLStar(98.0), PopupColorPrimary.setLStar(20.0))
+    @JvmField val PopupShadeSecond = DayNightColorToken(PopupColorPrimary.setLStar(95.0), PopupColorPrimary.setLStar(15.0))
+    @JvmField val PopupShadeThird = DayNightColorToken(PopupColorPrimary.setLStar(90.0), PopupColorPrimary.setLStar(10.0))
+    @JvmField val WallpaperPopupScrim = Neutral1_900
+
+    @JvmField val WorkspaceAccentColor = DarkTextColorToken(Accent1_100, Accent2_600)
+}
diff --git a/lawnchair/src/app/lawnchair/theme/color/SystemColorScheme.kt b/lawnchair/src/app/lawnchair/theme/color/SystemColorScheme.kt
new file mode 100644
index 0000000000..0b978dd459
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/color/SystemColorScheme.kt
@@ -0,0 +1,28 @@
+package app.lawnchair.theme.color
+
+import android.content.Context
+import dev.kdrag0n.colorkt.Color
+import dev.kdrag0n.colorkt.rgb.Srgb
+import dev.kdrag0n.monet.theme.ColorScheme
+
+class SystemColorScheme(private val context: Context) : ColorScheme() {
+    private val resources = context.resources
+
+    override val neutral1 = systemPaletteMap("neutral1")
+    override val neutral2 = systemPaletteMap("neutral2")
+
+    override val accent1 = systemPaletteMap("accent1")
+    override val accent2 = systemPaletteMap("accent2")
+    override val accent3 = systemPaletteMap("accent3")
+
+    private fun systemPaletteMap(paletteName: String): Map<Int, Color> {
+        val lums = listOf(0, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000)
+        return lums.associateWith { loadSystemColor(paletteName, it) }
+    }
+
+    private fun loadSystemColor(paletteName: String, lum: Int): Srgb {
+        val colorName = "system_${paletteName}_$lum"
+        val colorId = resources.getIdentifier(colorName, "color", "android")
+        return Srgb(resources.getColor(colorId))
+    }
+}
diff --git a/lawnchair/src/app/lawnchair/theme/drawable/DrawableToken.kt b/lawnchair/src/app/lawnchair/theme/drawable/DrawableToken.kt
new file mode 100644
index 0000000000..080b5ebe37
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/drawable/DrawableToken.kt
@@ -0,0 +1,57 @@
+package app.lawnchair.theme.drawable
+
+import android.content.Context
+import android.content.res.Resources
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
+import android.util.TypedValue
+import androidx.annotation.DrawableRes
+import androidx.appcompat.content.res.AppCompatResources
+import app.lawnchair.theme.ResourceToken
+import app.lawnchair.theme.UiColorMode
+import app.lawnchair.theme.color.ColorToken
+import dev.kdrag0n.monet.theme.ColorScheme
+
+interface DrawableToken<T : Drawable> : ResourceToken<T>
+
+data class ResourceDrawableToken<T : Drawable>(@DrawableRes private val resId: Int) :
+    DrawableToken<T> {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun resolve(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode): T {
+        return AppCompatResources.getDrawable(context, resId) as T
+    }
+}
+
+data class MutatedDrawableToken<T : Drawable>(
+    private val token: DrawableToken<T>,
+    private val mutateBlock: T.(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode) -> Unit
+) : DrawableToken<T> {
+
+    override fun resolve(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode): T {
+        val drawable = token.resolve(context, scheme, uiColorMode)
+        mutateBlock(drawable, context, scheme, uiColorMode)
+        return drawable
+    }
+}
+
+fun <T : Drawable> DrawableToken<T>.mutate(
+    mutateBlock: T.(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode) -> Unit
+) = MutatedDrawableToken(this, mutateBlock)
+
+fun <T : GradientDrawable> DrawableToken<T>.setColor(color: ColorToken) = mutate { context, scheme, uiColorMode ->
+    setColor(color.resolveColor(context, scheme, uiColorMode))
+}
+
+fun <T : Drawable> DrawableToken<T>.setTint(color: ColorToken) = mutate { context, scheme, uiColorMode ->
+    setTint(color.resolveColor(context, scheme, uiColorMode))
+}
+
+fun <T : GradientDrawable> DrawableToken<T>.setStroke(widthDp: Float, color: ColorToken) = mutate { context, scheme, uiColorMode ->
+    val widthPx = TypedValue.applyDimension(
+        TypedValue.COMPLEX_UNIT_DIP,
+        widthDp,
+        Resources.getSystem().displayMetrics
+    )
+    setStroke(widthPx.toInt(), color.resolveColor(context, scheme, uiColorMode))
+}
diff --git a/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt b/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt
new file mode 100644
index 0000000000..26c61650bf
--- /dev/null
+++ b/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt
@@ -0,0 +1,56 @@
+package app.lawnchair.theme.drawable
+
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.LayerDrawable
+import android.graphics.drawable.StateListDrawable
+import app.lawnchair.theme.color.ColorTokens
+import com.android.launcher3.R
+
+object DrawableTokens {
+    @JvmField
+    val SearchInputFg = ResourceDrawableToken<LayerDrawable>(R.drawable.search_input_fg)
+        .mutate { context, scheme, darkTheme ->
+            val shape = getDrawable(0) as GradientDrawable
+            shape.setColor(ColorTokens.SearchboxHighlight.resolveColor(context, scheme, darkTheme))
+        }
+
+    @JvmField
+    val BgCellLayout = ResourceDrawableToken<Drawable>(R.drawable.bg_celllayout)
+        .setTint(ColorTokens.ColorAccent)
+
+    @JvmField
+    val BgWidgetsPickerHandle = ResourceDrawableToken<LayerDrawable>(R.drawable.bg_widgets_picker_handle)
+        .mutate { context, scheme, darkTheme ->
+            val shape = getDrawable(0) as GradientDrawable
+            shape.setColor(ColorTokens.ColorBackground.resolveColor(context, scheme, darkTheme))
+        }
+
+    @JvmField
+    val BgWidgetsSearchbox = ResourceDrawableToken<GradientDrawable>(R.drawable.bg_widgets_searchbox)
+        .setColor(ColorTokens.Surface)
+
+    @JvmField
+    val DropTargetBackground = ResourceDrawableToken<Drawable>(R.drawable.drop_target_background)
+        .setTint(ColorTokens.WorkspaceAccentColor)
+
+    @JvmField
+    val MiddleItemPrimary = ResourceDrawableToken<GradientDrawable>(R.drawable.middle_item_primary)
+        .setColor(ColorTokens.PopupColorPrimary)
+
+    @JvmField
+    val RoundRectFolder = ResourceDrawableToken<GradientDrawable>(R.drawable.round_rect_folder)
+        .setColor(ColorTokens.FolderFillColor)
+
+    @JvmField
+    val SingleItemPrimary = ResourceDrawableToken<GradientDrawable>(R.drawable.single_item_primary)
+        .setColor(ColorTokens.PopupColorPrimary)
+
+    @JvmField
+    val WidgetsBottomSheetBackground = ResourceDrawableToken<GradientDrawable>(R.drawable.widgets_bottom_sheet_background)
+        .setColor(ColorTokens.Surface)
+
+    @JvmField
+    val WidgetResizeFrame = ResourceDrawableToken<GradientDrawable>(R.drawable.widget_resize_frame)
+        .setStroke(2f, ColorTokens.WorkspaceAccentColor)
+}
diff --git a/lawnchair/src/app/lawnchair/ui/theme/Color.kt b/lawnchair/src/app/lawnchair/ui/theme/Color.kt
index 465f3c4b8e..b0c91e3b06 100644
--- a/lawnchair/src/app/lawnchair/ui/theme/Color.kt
+++ b/lawnchair/src/app/lawnchair/ui/theme/Color.kt
@@ -7,7 +7,8 @@ import android.util.TypedValue
 import android.view.ContextThemeWrapper
 import androidx.annotation.ColorInt
 import androidx.core.graphics.ColorUtils
-import app.lawnchair.preferences.PreferenceManager
+import app.lawnchair.theme.UiColorMode
+import app.lawnchair.theme.color.ColorTokens
 import com.android.launcher3.R
 import com.android.launcher3.Utilities
 import com.android.launcher3.util.Themes
@@ -16,12 +17,7 @@ const val LAWNCHAIR_BLUE: Long = 0xFF007FFF
 
 @JvmOverloads
 fun Context.getAccentColor(darkTheme: Boolean = Themes.getAttrBoolean(this, R.attr.isMainColorDark)): Int {
-    val prefs = PreferenceManager.getInstance(this)
-    val customAccentColor = prefs.accentColor.get()
-    val useSystemAccent = prefs.useSystemAccent.get()
-    val accentColor = if (useSystemAccent) this.getSystemAccent(darkTheme = darkTheme) else customAccentColor
-
-    return if (darkTheme) lightenColor(accentColor) else accentColor
+    return ColorTokens.ColorAccent.resolveColor(this, if (darkTheme) UiColorMode.Dark else UiColorMode.Light)
 }
 
 @ColorInt
diff --git a/lawnchair/src/app/lawnchair/ui/theme/Theme.kt b/lawnchair/src/app/lawnchair/ui/theme/Theme.kt
index a12a90099b..693000b837 100644
--- a/lawnchair/src/app/lawnchair/ui/theme/Theme.kt
+++ b/lawnchair/src/app/lawnchair/ui/theme/Theme.kt
@@ -16,7 +16,6 @@
 
 package app.lawnchair.ui.theme
 
-import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.Colors
 import androidx.compose.material.MaterialTheme
@@ -27,12 +26,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.colorResource
 import app.lawnchair.preferences.PreferenceManager
 import app.lawnchair.preferences.observeAsState
 import app.lawnchair.preferences.preferenceManager
+import app.lawnchair.theme.ThemeProvider
+import app.lawnchair.theme.toAndroidColor
 import app.lawnchair.ui.preferences.components.ThemeChoice
-import app.lawnchair.util.androidColorId
 import com.android.launcher3.Utilities
 
 @Composable
@@ -54,36 +53,30 @@ fun getColors(darkTheme: Boolean): Colors {
     val prefs = PreferenceManager.getInstance(context)
     val customColor = prefs.accentColor.observeAsState().value
     val useSystemAccent = prefs.useSystemAccent.observeAsState().value
-    val accentColor by animateColorAsState(targetValue = remember(darkTheme, customColor, useSystemAccent) {
-        Color(
-            context.getAccentColor(darkTheme)
-        )
-    })
+    val colorScheme = remember(customColor, useSystemAccent) {
+        ThemeProvider.INSTANCE.get(context).colorScheme
+    }
 
-    return when {
-        Utilities.ATLEAST_S -> {
-            if (darkTheme) {
-                val surface = colorResource(id = androidColorId(name = "system_neutral1_800"))
-                val background = colorResource(id = androidColorId(name = "system_neutral1_900"))
-                darkColors(
-                    primary = accentColor,
-                    secondary = accentColor,
-                    background = background,
-                    surface = surface
-                )
-            } else {
-                val surface = colorResource(id = androidColorId(name = "system_neutral1_100"))
-                val background = colorResource(id = androidColorId(name = "system_neutral1_50"))
-                lightColors(
-                    primary = accentColor,
-                    secondary = accentColor,
-                    background = background,
-                    surface = surface
-                )
-            }
+    return remember(colorScheme) {
+        val accent = Color(colorScheme.accent1[if (darkTheme) 100 else 600]!!.toAndroidColor())
+        val surface = Color(colorScheme.neutral1[if (darkTheme) 800 else 100]!!.toAndroidColor())
+        val background = Color(colorScheme.neutral1[if (darkTheme) 900 else 50]!!.toAndroidColor())
+
+        if (darkTheme) {
+            darkColors(
+                primary = accent,
+                secondary = accent,
+                background = background,
+                surface = surface
+            )
+        } else {
+            lightColors(
+                primary = accent,
+                secondary = accent,
+                background = background,
+                surface = surface
+            )
         }
-        darkTheme -> darkColors(primary = accentColor, secondary = accentColor)
-        else -> lightColors(primary = accentColor, secondary = accentColor)
     }
 }
 
diff --git a/lawnchair/src/dev/kdrag0n/monet/theme/ColorScheme.kt b/lawnchair/src/dev/kdrag0n/monet/theme/ColorScheme.kt
new file mode 100644
index 0000000000..a61c8e0514
--- /dev/null
+++ b/lawnchair/src/dev/kdrag0n/monet/theme/ColorScheme.kt
@@ -0,0 +1,20 @@
+package dev.kdrag0n.monet.theme
+
+import dev.kdrag0n.colorkt.Color
+
+typealias ColorSwatch = Map<Int, Color>
+
+abstract class ColorScheme {
+    abstract val neutral1: ColorSwatch
+    abstract val neutral2: ColorSwatch
+
+    abstract val accent1: ColorSwatch
+    abstract val accent2: ColorSwatch
+    abstract val accent3: ColorSwatch
+
+    // Helpers
+    val neutralColors: List<ColorSwatch>
+        get() = listOf(neutral1, neutral2)
+    val accentColors: List<ColorSwatch>
+        get() = listOf(accent1, accent2, accent3)
+}
diff --git a/lawnchair/src/dev/kdrag0n/monet/theme/DynamicColorScheme.kt b/lawnchair/src/dev/kdrag0n/monet/theme/DynamicColorScheme.kt
new file mode 100644
index 0000000000..b4118437b5
--- /dev/null
+++ b/lawnchair/src/dev/kdrag0n/monet/theme/DynamicColorScheme.kt
@@ -0,0 +1,100 @@
+package dev.kdrag0n.monet.theme
+
+import android.util.Log
+import dev.kdrag0n.colorkt.Color
+import dev.kdrag0n.colorkt.cam.Zcam
+import dev.kdrag0n.colorkt.cam.Zcam.Companion.toZcam
+import dev.kdrag0n.colorkt.conversion.ConversionGraph.convert
+import dev.kdrag0n.colorkt.gamut.LchGamut
+import dev.kdrag0n.colorkt.gamut.LchGamut.clipToLinearSrgb
+import dev.kdrag0n.colorkt.rgb.Srgb
+import dev.kdrag0n.colorkt.tristimulus.CieXyz
+import dev.kdrag0n.colorkt.tristimulus.CieXyzAbs.Companion.toAbs
+
+class DynamicColorScheme(
+    targets: ColorScheme,
+    seedColor: Color,
+    chromaFactor: Double = 1.0,
+    private val cond: Zcam.ViewingConditions,
+    private val accurateShades: Boolean = true,
+) : ColorScheme() {
+    private val seedNeutral = seedColor.convert<CieXyz>().toAbs(cond.referenceWhite.y).toZcam(cond, include2D = false).let { lch ->
+        lch.copy(chroma = lch.chroma * chromaFactor)
+    }
+    private val seedAccent = seedNeutral
+
+    init {
+        Log.i(TAG, "Seed color: ${seedColor.convert<Srgb>().toHex()} => $seedNeutral")
+    }
+
+    // Main accent color. Generally, this is close to the seed color.
+    override val accent1 = transformSwatch(targets.accent1, seedAccent, targets.accent1)
+    // Secondary accent color. Darker shades of accent1.
+    override val accent2 = transformSwatch(targets.accent2, seedAccent, targets.accent1)
+    // Tertiary accent color. Seed color shifted to the next secondary color via hue offset.
+    override val accent3 = transformSwatch(
+        swatch = targets.accent3,
+        seed = seedAccent.copy(hue = seedAccent.hue + ACCENT3_HUE_SHIFT_DEGREES),
+        referenceSwatch = targets.accent1
+    )
+
+    // Main background color. Tinted with the seed color.
+    override val neutral1 = transformSwatch(targets.neutral1, seedNeutral, targets.neutral1)
+    // Secondary background color. Slightly tinted with the seed color.
+    override val neutral2 = transformSwatch(targets.neutral2, seedNeutral, targets.neutral1)
+
+    private fun transformSwatch(
+        swatch: ColorSwatch,
+        seed: Zcam,
+        referenceSwatch: ColorSwatch,
+    ): ColorSwatch {
+        return swatch.map { (shade, color) ->
+            val target = color as? Zcam
+                ?: color.convert<CieXyz>().toAbs(cond.referenceWhite.y).toZcam(cond, include2D = false)
+            val reference = referenceSwatch[shade]!! as? Zcam
+                ?: color.convert<CieXyz>().toAbs(cond.referenceWhite.y).toZcam(cond, include2D = false)
+            val newLch = transformColor(target, seed, reference)
+            val newSrgb = newLch.convert<Srgb>()
+
+            Log.d(TAG, "Transform: [$shade] $target => $newLch => ${newSrgb.toHex()}")
+            shade to newSrgb
+        }.toMap()
+    }
+
+    private fun transformColor(target: Zcam, seed: Zcam, reference: Zcam): Color {
+        // Keep target lightness.
+        val lightness = target.lightness
+        // Allow colorless gray and low-chroma colors by clamping.
+        // To preserve chroma ratios, scale chroma by the reference (A-1 / N-1).
+        val scaleC = if (reference.chroma == 0.0) {
+            // Zero reference chroma won't have chroma anyway, so use 0 to avoid a divide-by-zero
+            0.0
+        } else {
+            // Non-zero reference chroma = possible chroma scale
+            seed.chroma.coerceIn(0.0, reference.chroma) / reference.chroma
+        }
+        val chroma = target.chroma * scaleC
+        // Use the seed color's hue, since it's the most prominent feature of the theme.
+        val hue = seed.hue
+
+        val newColor = Zcam(
+            lightness = lightness,
+            chroma = chroma,
+            hue = hue,
+            viewingConditions = cond,
+        )
+        return if (accurateShades) {
+            newColor.clipToLinearSrgb(LchGamut.ClipMethod.PRESERVE_LIGHTNESS)
+        } else {
+            newColor.clipToLinearSrgb(LchGamut.ClipMethod.ADAPTIVE_TOWARDS_MID, alpha = 5.0)
+        }
+    }
+
+    companion object {
+        private const val TAG = "DynamicColorScheme"
+
+        // Hue shift for the tertiary accent color (accent3), in degrees.
+        // 60 degrees = shifting by a secondary color
+        private const val ACCENT3_HUE_SHIFT_DEGREES = 60.0
+    }
+}
diff --git a/lawnchair/src/dev/kdrag0n/monet/theme/MaterialYouTargets.kt b/lawnchair/src/dev/kdrag0n/monet/theme/MaterialYouTargets.kt
new file mode 100644
index 0000000000..f403ab3b92
--- /dev/null
+++ b/lawnchair/src/dev/kdrag0n/monet/theme/MaterialYouTargets.kt
@@ -0,0 +1,127 @@
+package dev.kdrag0n.monet.theme
+
+import dev.kdrag0n.colorkt.Color
+import dev.kdrag0n.colorkt.cam.Zcam
+import dev.kdrag0n.colorkt.cam.Zcam.Companion.toZcam
+import dev.kdrag0n.colorkt.rgb.LinearSrgb.Companion.toLinear
+import dev.kdrag0n.colorkt.rgb.Srgb
+import dev.kdrag0n.colorkt.tristimulus.CieXyz.Companion.toXyz
+import dev.kdrag0n.colorkt.tristimulus.CieXyzAbs.Companion.toAbs
+import dev.kdrag0n.colorkt.ucs.lab.CieLab
+
+/*
+ * Default target colors, conforming to Material You standards.
+ *
+ * Derived from AOSP and Pixel defaults.
+ */
+class MaterialYouTargets(
+    private val chromaFactor: Double = 1.0,
+    useLinearLightness: Boolean,
+    val cond: Zcam.ViewingConditions,
+) : ColorScheme() {
+    companion object {
+        // Linear ZCAM lightness
+        private val LINEAR_LIGHTNESS_MAP = mapOf(
+            0    to 100.0,
+            10   to  99.0,
+            20   to  98.0,
+            50   to  95.0,
+            100  to  90.0,
+            200  to  80.0,
+            300  to  70.0,
+            400  to  60.0,
+            500  to  50.0,
+            600  to  40.0,
+            650  to  35.0,
+            700  to  30.0,
+            800  to  20.0,
+            900  to  10.0,
+            950  to   5.0,
+            1000 to   0.0,
+        )
+
+        // CIELAB lightness from AOSP defaults
+        private val CIELAB_LIGHTNESS_MAP = LINEAR_LIGHTNESS_MAP
+            .map { it.key to if (it.value == 50.0) 49.6 else it.value }
+            .toMap()
+
+        // Accent colors from Pixel defaults
+        private val REF_ACCENT1_COLORS = listOf(
+            0xd3e3fd,
+            0xa8c7fa,
+            0x7cacf8,
+            0x4c8df6,
+            0x1b6ef3,
+            0x0b57d0,
+            0x0842a0,
+            0x062e6f,
+            0x041e49,
+        )
+
+        private const val ACCENT1_REF_CHROMA_FACTOR = 1.2
+    }
+
+    override val neutral1: ColorSwatch
+    override val neutral2: ColorSwatch
+
+    override val accent1: ColorSwatch
+    override val accent2: ColorSwatch
+    override val accent3: ColorSwatch
+
+    init {
+        val lightnessMap = if (useLinearLightness) {
+            LINEAR_LIGHTNESS_MAP
+        } else {
+            CIELAB_LIGHTNESS_MAP
+                .map { it.key to cielabL(it.value) }
+                .toMap()
+        }
+
+        // Accent chroma from Pixel defaults
+        // We use the most chromatic color as the reference
+        // A-1 chroma = avg(default Pixel Blue shades 100-900)
+        // Excluding very bright variants (10, 50) to avoid light bias
+        // A-1 > A-3 > A-2
+        val accent1Chroma = calcAccent1Chroma() * ACCENT1_REF_CHROMA_FACTOR
+        val accent2Chroma = accent1Chroma / 3
+        val accent3Chroma = accent2Chroma * 2
+
+        // Custom neutral chroma
+        val neutral1Chroma = accent1Chroma / 8
+        val neutral2Chroma = accent1Chroma / 5
+
+        neutral1 = shadesWithChroma(neutral1Chroma, lightnessMap)
+        neutral2 = shadesWithChroma(neutral2Chroma, lightnessMap)
+
+        accent1 = shadesWithChroma(accent1Chroma, lightnessMap)
+        accent2 = shadesWithChroma(accent2Chroma, lightnessMap)
+        accent3 = shadesWithChroma(accent3Chroma, lightnessMap)
+    }
+
+    private fun cielabL(l: Double) = CieLab(
+        L = l,
+        a = 0.0,
+        b = 0.0,
+    ).toXyz().toAbs(cond.referenceWhite.y).toZcam(cond, include2D = false).lightness
+
+    private fun calcAccent1Chroma() = REF_ACCENT1_COLORS
+        .map { Srgb(it).toLinear().toXyz().toAbs(cond.referenceWhite.y).toZcam(cond, include2D = false).chroma }
+        .average()
+
+    private fun shadesWithChroma(
+        chroma: Double,
+        lightnessMap: Map<Int, Double>,
+    ): Map<Int, Color> {
+        // Adjusted chroma
+        val chromaAdj = chroma * chromaFactor
+
+        return lightnessMap.map {
+            it.key to Zcam(
+                lightness = it.value,
+                chroma = chromaAdj,
+                hue = 0.0,
+                viewingConditions = cond,
+            )
+        }.toMap()
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 658a123865..2653a8beb8 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -89,7 +89,6 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.RunnableList;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.FloatingIconView;
 import com.android.launcher3.views.ScrimView;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
@@ -120,6 +119,8 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
+import app.lawnchair.theme.color.ColorTokens;
+
 /**
  * Manages the opening and closing app transitions from Launcher
  */
@@ -512,7 +513,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
             final boolean scrimEnabled = ENABLE_SCRIM_FOR_APP_LAUNCH.get();
             if (scrimEnabled) {
-                int scrimColor = Themes.getAttrColor(mLauncher, R.attr.overviewScrimColor);
+                int scrimColor = ColorTokens.OverviewScrim.resolveColor(mLauncher);
                 int scrimColorTrans = ColorUtils.setAlphaComponent(scrimColor, 0);
                 int[] colors = isAppOpening
                         ? new int[]{scrimColorTrans, scrimColor}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 9642f27283..fb1769fcda 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -29,13 +29,13 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.util.Themes;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 
 import app.lawnchair.preferences.PreferenceManager;
+import app.lawnchair.theme.color.ColorTokens;
 
 /**
  * Definition for overview state
@@ -114,7 +114,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public int getWorkspaceScrimColor(Launcher launcher) {
-        return Themes.getAttrColor(launcher, R.attr.overviewScrimColor);
+        return ColorTokens.OverviewScrim.resolveColor(launcher);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
index d36e76b89b..5a258b8458 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
@@ -18,8 +18,8 @@ package com.android.launcher3.uioverrides.states;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
-import com.android.launcher3.util.Themes;
+
+import app.lawnchair.theme.color.ColorTokens;
 
 /**
  * State to indicate we are about to launch a recent task. Note that this state is only used when
@@ -42,7 +42,7 @@ public class QuickSwitchState extends BackgroundAppState {
 
     @Override
     public int getWorkspaceScrimColor(Launcher launcher) {
-        return Themes.getAttrColor(launcher, R.attr.overviewScrimColor);
+        return ColorTokens.OverviewScrim.resolveColor(launcher);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
index b6cfdce65a..99a5dd57e9 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
@@ -22,12 +22,12 @@ import android.content.Context;
 import android.graphics.Color;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.R;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.BaseState;
-import com.android.launcher3.util.Themes;
 import com.android.quickstep.RecentsActivity;
 
+import app.lawnchair.theme.color.ColorTokens;
+
 /**
  * State definition for Fallback recents
  */
@@ -121,7 +121,7 @@ public class RecentsState implements BaseState<RecentsState> {
      * For this state, what color scrim should be drawn behind overview.
      */
     public int getScrimColor(RecentsActivity activity) {
-        return hasFlag(FLAG_SCRIM) ? Themes.getAttrColor(activity, R.attr.overviewScrimColor)
+        return hasFlag(FLAG_SCRIM) ? ColorTokens.OverviewScrim.resolveColor(activity)
                 : Color.TRANSPARENT;
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f8a845ff73..b22398f385 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -172,7 +172,7 @@ import java.util.List;
 import java.util.function.Consumer;
 
 import app.lawnchair.LawnchairApp;
-import app.lawnchair.LawnchairAppKt;
+import app.lawnchair.theme.color.ColorTokens;
 import app.lawnchair.util.OverScrollerCompat;
 
 /**
@@ -3923,7 +3923,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     /** Get the color used for foreground scrimming the RecentsView for sharing. */
     public static int getForegroundScrimDimColor(Context context) {
-        int baseColor = Themes.getAttrColor(context, R.attr.overviewScrimColor);
+        int baseColor = ColorTokens.OverviewScrim.resolveColor(context);
         // The Black blending is temporary until we have the proper color token.
         return ColorUtils.blendARGB(Color.BLACK, baseColor, 0.25f);
     }
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 086c7d3c0d..5e3083b896 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -66,17 +66,17 @@
     <color name="workspace_text_color_light">#FFF</color>
     <color name="workspace_text_color_dark">#FF000000</color>
 
-    <color name="folder_hint_text_color_light">#FFF</color>
-    <color name="folder_hint_text_color_dark">#FF000000</color>
+    <color name="folder_hint_text_color_light">@color/system_neutral1_50</color>
+    <color name="folder_hint_text_color_dark">@color/system_neutral2_700</color>
 
     <color name="folder_background_light">#F9F9F9</color>
     <color name="folder_background_dark">#464746</color>
 
     <color name="folder_dot_color">@color/system_accent2_50</color>
 
-    <color name="text_color_primary_dark">#FFFFFFFF</color>
-    <color name="text_color_secondary_dark">#FFFFFFFF</color>
-    <color name="text_color_tertiary_dark">#CCFFFFFF</color>
+    <color name="text_color_primary_dark">@color/system_neutral1_50</color>
+    <color name="text_color_secondary_dark">@color/system_neutral2_200</color>
+    <color name="text_color_tertiary_dark">@color/system_neutral2_400</color>
 
     <color name="wallpaper_popup_scrim">@color/system_neutral1_900</color>
     <color name="wallpaper_scrim_color">#0D878787</color>
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index ee711463d9..91343cfa6d 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -1,7 +1,6 @@
 package com.android.launcher3;
 
 import static android.appwidget.AppWidgetHostView.getDefaultPaddingForWidget;
-
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_HEIGHT;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_WIDTH;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_RESIZE_COMPLETED;
@@ -41,6 +40,9 @@ import com.android.launcher3.widget.util.WidgetSizes;
 import java.util.ArrayList;
 import java.util.List;
 
+import app.lawnchair.theme.color.ColorTokens;
+import app.lawnchair.theme.drawable.DrawableTokens;
+
 public class AppWidgetResizeFrame extends AbstractFloatingView implements View.OnKeyListener {
     private static final int SNAP_DURATION = 150;
     private static final float DIMMED_HANDLE_ALPHA = 0f;
@@ -159,6 +161,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         mDragHandles[INDEX_TOP] = findViewById(R.id.widget_resize_top_handle);
         mDragHandles[INDEX_RIGHT] = findViewById(R.id.widget_resize_right_handle);
         mDragHandles[INDEX_BOTTOM] = findViewById(R.id.widget_resize_bottom_handle);
+
+        int workspaceAccentColor = ColorTokens.WorkspaceAccentColor.resolveColor(getContext());
+        for (int i = 0; i < HANDLE_COUNT; i++) {
+            ((ImageView) mDragHandles[i]).setColorFilter(workspaceAccentColor);
+        }
     }
 
     @Override
@@ -181,9 +188,10 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         DragLayer dl = launcher.getDragLayer();
         AppWidgetResizeFrame frame = (AppWidgetResizeFrame) launcher.getLayoutInflater()
                 .inflate(R.layout.app_widget_resize_frame, dl, false);
+        ImageView imageView = frame.findViewById(R.id.widget_resize_frame);
+        imageView.setImageDrawable(DrawableTokens.WidgetResizeFrame.resolve(launcher));
         if (widget.hasEnforcedCornerRadius()) {
             float enforcedCornerRadius = widget.getEnforcedCornerRadius();
-            ImageView imageView = frame.findViewById(R.id.widget_resize_frame);
             Drawable d = imageView.getDrawable();
             if (d instanceof GradientDrawable) {
                 GradientDrawable gd = (GradientDrawable) d.mutate();
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 61b5564941..46b0a5b236 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -21,6 +21,7 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import static com.android.launcher3.LauncherState.NORMAL;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -39,6 +40,11 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.util.Themes;
+
+import app.lawnchair.theme.color.ColorTokens;
+import app.lawnchair.theme.drawable.DrawableToken;
+import app.lawnchair.theme.drawable.DrawableTokens;
 
 /**
  * Implements a DropTarget.
@@ -92,6 +98,17 @@ public abstract class ButtonDropTarget extends TextView
         super.onFinishInflate();
         mText = getText();
         setContentDescription(mText);
+        setBackground(DrawableTokens.DropTargetBackground.resolve(getContext()));
+        setTextColor();
+    }
+
+    private void setTextColor() {
+        int normalColor = ColorTokens.ColorAccent.resolveColor(getContext());
+        int selectedColor = Themes.getAttrColor(getContext(), R.attr.dropTargetHoverTextColor);
+        setTextColor(new ColorStateList(
+                new int[][]{new int[]{-android.R.attr.state_selected}, new int[]{android.R.attr.state_selected}},
+                new int[]{normalColor, selectedColor}
+        ));
     }
 
     protected void updateText(int resId) {
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index a6adfc4bf6..e24ee43a03 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -80,6 +80,9 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Stack;
 
+import app.lawnchair.theme.color.ColorTokens;
+import app.lawnchair.theme.drawable.DrawableTokens;
+
 public class CellLayout extends ViewGroup {
     private static final String TAG = "CellLayout";
     private static final boolean LOGD = false;
@@ -259,11 +262,11 @@ public class CellLayout extends ViewGroup {
 
         Resources res = getResources();
 
-        mBackground = getContext().getDrawable(R.drawable.bg_celllayout);
+        mBackground = DrawableTokens.BgCellLayout.resolve(getContext());
         mBackground.setCallback(this);
         mBackground.setAlpha(0);
 
-        mGridColor = Themes.getAttrColor(getContext(), R.attr.workspaceAccentColor);
+        mGridColor = ColorTokens.WorkspaceAccentColor.resolveColor(getContext());
         mGridVisualizationPadding =
                 res.getDimensionPixelSize(R.dimen.grid_visualization_cell_spacing);
         mGridVisualizationRoundingRadius =
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 34013cc4ce..5a2d167f8c 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -78,6 +78,7 @@ import com.android.launcher3.views.ScrimView;
 import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
 
 import app.lawnchair.allapps.LawnchairAlphabeticalAppsList;
+import app.lawnchair.theme.color.ColorTokens;
 import app.lawnchair.ui.StretchRecyclerViewContainer;
 
 /**
@@ -151,10 +152,10 @@ public class AllAppsContainerView extends StretchRecyclerViewContainer implement
 
         mLauncher = BaseDraggingActivity.fromContext(context);
 
-        mScrimColor = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
+        mScrimColor = ColorTokens.AllAppsScrimColor.resolveColor(context);
         mHeaderThreshold = getResources().getDimensionPixelSize(
                 R.dimen.dynamic_grid_cell_border_spacing);
-        mHeaderProtectionColor = Themes.getAttrColor(context, R.attr.allappsHeaderProtectionColor);
+        mHeaderProtectionColor = ColorTokens.AllAppsHeaderProtectionColor.resolveColor(context);
 
         mLauncher.addOnDeviceProfileChangeListener(this);
 
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 699d85f143..7dccc62141 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -113,6 +113,7 @@ import java.util.StringJoiner;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import app.lawnchair.theme.drawable.DrawableTokens;
 import app.lawnchair.util.EditTextExtensions;
 
 /**
@@ -272,8 +273,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         final DeviceProfile dp = mActivityContext.getDeviceProfile();
         final int paddingLeftRight = dp.folderContentPaddingLeftRight;
 
-        mBackground = (GradientDrawable) ResourcesCompat.getDrawable(getResources(),
-                R.drawable.round_rect_folder, getContext().getTheme());
+        mBackground = DrawableTokens.RoundRectFolder.resolve(getContext());
 
         mContent = findViewById(R.id.folder_content);
         mContent.setPadding(paddingLeftRight, dp.folderContentPaddingTop, paddingLeftRight, 0);
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 1ff172f035..0681dda713 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -51,6 +51,8 @@ import com.android.launcher3.views.BaseDragLayer;
 
 import java.util.List;
 
+import app.lawnchair.theme.color.ColorTokens;
+
 /**
  * Manages the opening and closing animations for a {@link Folder}.
  *
@@ -178,7 +180,7 @@ public class FolderAnimationManager {
 
         // Set up the Folder background.
         final int finalColor;
-        int folderFillColor = Themes.getAttrColor(mContext, R.attr.folderFillColor);
+        int folderFillColor = ColorTokens.FolderFillColor.resolveColor(mContext);
         if (mIsOpening) {
             finalColor = folderFillColor;
         } else {
diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java
index 752c0d75fc..d8682372da 100644
--- a/src/com/android/launcher3/folder/PreviewBackground.java
+++ b/src/com/android/launcher3/folder/PreviewBackground.java
@@ -45,6 +45,8 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.views.ActivityContext;
 
+import app.lawnchair.theme.color.ColorTokens;
+
 /**
  * This object represents a FolderIcon preview background. It stores drawing / measurement
  * information, handles drawing, and animation (accept state <--> rest state).
@@ -152,9 +154,9 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
         mInvalidateDelegate = invalidateDelegate;
 
         TypedArray ta = context.getTheme().obtainStyledAttributes(R.styleable.FolderIconPreview);
-        mDotColor = ta.getColor(R.styleable.FolderIconPreview_folderDotColor, 0);
+        mDotColor = ColorTokens.FolderDotColor.resolveColor(context);
         mStrokeColor = ta.getColor(R.styleable.FolderIconPreview_folderIconBorderColor, 0);
-        mBgColor = ta.getColor(R.styleable.FolderIconPreview_folderFillColor, 0);
+        mBgColor = ColorTokens.FolderFillColor.resolveColor(context);
         ta.recycle();
 
         DeviceProfile grid = activity.getDeviceProfile();
diff --git a/src/com/android/launcher3/graphics/Scrim.java b/src/com/android/launcher3/graphics/Scrim.java
index a77e0587c0..db5856a88f 100644
--- a/src/com/android/launcher3/graphics/Scrim.java
+++ b/src/com/android/launcher3/graphics/Scrim.java
@@ -22,7 +22,7 @@ import android.graphics.Canvas;
 import android.util.FloatProperty;
 import android.view.View;
 
-import com.android.launcher3.R;
+import app.lawnchair.theme.color.ColorTokens;
 
 /**
  * Contains general scrim properties such as wallpaper-extracted color that subclasses can use.
@@ -50,7 +50,7 @@ public class Scrim {
 
     public Scrim(View view) {
         mRoot = view;
-        mScrimColor = mRoot.getContext().getColor(R.color.wallpaper_popup_scrim);
+        mScrimColor = ColorTokens.WallpaperPopupScrim.resolveColor(mRoot.getContext());
     }
 
     public void draw(Canvas canvas) {
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index a534ee3eb4..4ec3e2fb9a 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3.popup;
 
-import static androidx.core.content.ContextCompat.getColorStateList;
-
 import static com.android.launcher3.anim.Interpolators.ACCELERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.DECELERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -72,6 +70,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
+import app.lawnchair.theme.color.ColorTokens;
+import app.lawnchair.theme.drawable.DrawableTokens;
+
 /**
  * A container for shortcuts to deep links and notifications associated with an app.
  *
@@ -146,7 +147,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mLauncher = BaseDraggingActivity.fromContext(context);
         mIsRtl = Utilities.isRtl(getResources());
 
-        mBackgroundColor = Themes.getAttrColor(context, R.attr.popupColorPrimary);
+        mBackgroundColor = ColorTokens.PopupColorPrimary.resolveColor(context);
         mArrowColor = mBackgroundColor;
         mElevation = getResources().getDimension(R.dimen.deep_shortcuts_elevation);
 
@@ -183,12 +184,12 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
         if (isAboveAnotherSurface) {
             mColors = new int[] {
-                    getColorStateList(context, R.color.popup_shade_first).getDefaultColor()};
+                    ColorTokens.PopupShadeFirst.resolveColor(context)};
         } else {
             mColors = new int[] {
-                    getColorStateList(context, R.color.popup_shade_first).getDefaultColor(),
-                    getColorStateList(context, R.color.popup_shade_second).getDefaultColor(),
-                    getColorStateList(context, R.color.popup_shade_third).getDefaultColor()};
+                    ColorTokens.PopupShadeFirst.resolveColor(context),
+                    ColorTokens.PopupShadeSecond.resolveColor(context),
+                    ColorTokens.PopupShadeThird.resolveColor(context)};
         }
     }
 
@@ -283,14 +284,14 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
                 if (view instanceof DeepShortcutView) {
                     if (totalVisibleShortcuts == 1) {
-                        view.setBackgroundResource(R.drawable.single_item_primary);
+                        view.setBackground(DrawableTokens.SingleItemPrimary.resolve(getContext()));
                     } else if (totalVisibleShortcuts > 1) {
                         if (numVisibleShortcut == 0) {
                             view.setBackground(mRoundedTop.getConstantState().newDrawable());
                         } else if (numVisibleShortcut == (totalVisibleShortcuts - 1)) {
                             view.setBackground(mRoundedBottom.getConstantState().newDrawable());
                         } else {
-                            view.setBackgroundResource(R.drawable.middle_item_primary);
+                            view.setBackground(DrawableTokens.MiddleItemPrimary.resolve(getContext()));
                         }
                         numVisibleShortcut++;
                     }
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 18f263a8ec..a078245384 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -78,6 +78,9 @@ import java.util.Objects;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import app.lawnchair.theme.color.ColorTokens;
+import app.lawnchair.theme.drawable.DrawableTokens;
+
 /**
  * A container for shortcuts to deep links and notifications associated with an app.
  *
@@ -260,6 +263,7 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
             // Add notification entries
             if (mNotificationContainer == null) {
                 mNotificationContainer = findViewById(R.id.notification_container);
+                mNotificationContainer.setBackgroundColor(ColorTokens.PopupColorPrimary.resolveColor(getContext()));
                 mNotificationContainer.setVisibility(VISIBLE);
             }
             View.inflate(getContext(), R.layout.notification_content, mNotificationContainer);
@@ -297,6 +301,7 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
                     }
                 }
                 mSystemShortcutContainer = inflateAndAdd(R.layout.system_shortcut_icons, this);
+                mSystemShortcutContainer.setBackground(DrawableTokens.SingleItemPrimary.resolve(getContext()));
 
                 for (SystemShortcut shortcut : systemShortcuts) {
                     if (!(shortcut instanceof SystemShortcut.Widgets)) {
diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java
index 8b520165ce..323719e006 100644
--- a/src/com/android/launcher3/states/HintState.java
+++ b/src/com/android/launcher3/states/HintState.java
@@ -23,8 +23,8 @@ import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.R;
-import com.android.launcher3.util.Themes;
+
+import app.lawnchair.theme.color.ColorTokens;
 
 /**
  * Scale down workspace/hotseat to hint at going to either overview (on pause) or first home screen.
@@ -55,7 +55,7 @@ public class HintState extends LauncherState {
     @Override
     public int getWorkspaceScrimColor(Launcher launcher) {
         return ColorUtils.setAlphaComponent(
-                Themes.getAttrColor(launcher, R.attr.overviewScrimColor), 100);
+                ColorTokens.OverviewScrim.resolveColor(launcher), 100);
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index dedcc65d11..4254771851 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -47,6 +47,8 @@ import com.android.launcher3.widget.util.WidgetsTableUtils;
 
 import java.util.List;
 
+import app.lawnchair.theme.drawable.DrawableTokens;
+
 /**
  * Bottom sheet for the "Widgets" system shortcut in the long-press popup.
  */
@@ -123,6 +125,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet {
     protected void onFinishInflate() {
         super.onFinishInflate();
         mContent = findViewById(R.id.widgets_bottom_sheet);
+        mContent.setBackground(DrawableTokens.WidgetsBottomSheetBackground.resolve(getContext()));
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index c32948c25e..3afa591e8e 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -75,6 +75,9 @@ import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.IntStream;
 
+import app.lawnchair.theme.color.ColorTokens;
+import app.lawnchair.theme.drawable.DrawableTokens;
+
 /**
  * Popup for showing the full list of available widgets
  */
@@ -196,6 +199,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         super.onFinishInflate();
         mContent = findViewById(R.id.container);
         TopRoundedCornerView springLayout = (TopRoundedCornerView) mContent;
+        springLayout.setBackgroundColor(ColorTokens.ColorBackground.resolveColor(getContext()));
 
         LayoutInflater layoutInflater = LayoutInflater.from(getContext());
         int contentLayoutRes = mHasWorkProfile ? R.layout.widgets_full_sheet_paged_view
@@ -823,6 +827,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             });
             mRecommendedWidgetsTable.setWidgetCellLongClickListener(WidgetsFullSheet.this);
             mRecommendedWidgetsTable.setWidgetCellOnClickListener(WidgetsFullSheet.this);
+
+            mCollapseHandle.setBackground(DrawableTokens.BgWidgetsPickerHandle.resolve(getContext()));
+            mSearchBarContainer.setBackgroundColor(ColorTokens.ColorBackground.resolveColor(getContext()));
+            ((View) mSearchBar).setBackground(DrawableTokens.BgWidgetsSearchbox.resolve(getContext()));
         }
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListDrawableFactory.java b/src/com/android/launcher3/widget/picker/WidgetsListDrawableFactory.java
index c61e3a4349..3db632b89a 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListDrawableFactory.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListDrawableFactory.java
@@ -33,6 +33,8 @@ import android.graphics.drawable.StateListDrawable;
 import com.android.launcher3.R;
 import com.android.launcher3.util.Themes;
 
+import app.lawnchair.theme.color.ColorTokens;
+
 /** Factory for creating drawables to use as background for list elements. */
 final class WidgetsListDrawableFactory {
 
@@ -45,7 +47,7 @@ final class WidgetsListDrawableFactory {
         Resources res = context.getResources();
         mTopBottomCornerRadius = res.getDimension(R.dimen.widget_list_top_bottom_corner_radius);
         mMiddleCornerRadius = res.getDimension(R.dimen.widget_list_content_corner_radius);
-        mSurfaceColor = context.getColorStateList(R.color.surface);
+        mSurfaceColor = ColorStateList.valueOf(ColorTokens.Surface.resolveColor(context));
         mRippleColor = ColorStateList.valueOf(
                 Themes.getAttrColor(context, android.R.attr.colorControlHighlight));
     }