diff --git a/mastodon/src/main/res/values-v31/colors.xml b/mastodon/src/main/res/values-v31/colors.xml
index 8937b4048..b622faf32 100644
--- a/mastodon/src/main/res/values-v31/colors.xml
+++ b/mastodon/src/main/res/values-v31/colors.xml
@@ -4,32 +4,57 @@
 
 	<color name="m3_navigation_bar_bg">@android:color/system_neutral1_50</color>
 
-	<color name="m3_gray_900">@android:color/system_neutral1_900</color>
-	<color name="m3_gray_800t">@android:color/system_neutral1_800</color>
-	<color name="m3_gray_800">@android:color/system_neutral1_800</color>
-	<color name="m3_gray_700">@android:color/system_neutral1_700</color>
-	<color name="m3_gray_600">@android:color/system_neutral1_600</color>
-	<color name="m3_gray_500">@android:color/system_neutral1_500</color>
-	<color name="m3_gray_400">@android:color/system_neutral1_400</color>
-	<color name="m3_gray_300">@android:color/system_neutral1_300</color>
-	<color name="m3_gray_200">@android:color/system_neutral1_200</color>
-	<color name="m3_gray_100">@android:color/system_neutral1_100</color>
-	<color name="m3_gray_50t">@android:color/system_neutral1_50</color>
-	<color name="m3_gray_50">@android:color/system_neutral1_50</color>
-	<color name="m3_gray_25">@android:color/system_neutral1_10</color>
+	<color name="m3_neutral1_900">@android:color/system_neutral1_900</color>
+	<color name="m3_neutral1_800t">@android:color/system_neutral1_800</color>
+	<color name="m3_neutral1_800">@android:color/system_neutral1_800</color>
+	<color name="m3_neutral1_700">@android:color/system_neutral1_700</color>
+	<color name="m3_neutral1_600">@android:color/system_neutral1_600</color>
+	<color name="m3_neutral1_500">@android:color/system_neutral1_500</color>
+	<color name="m3_neutral1_400">@android:color/system_neutral1_400</color>
+	<color name="m3_neutral1_300">@android:color/system_neutral1_300</color>
+	<color name="m3_neutral1_200">@android:color/system_neutral1_200</color>
+	<color name="m3_neutral1_100">@android:color/system_neutral1_100</color>
+	<color name="m3_neutral1_50t">@android:color/system_neutral1_50</color>
+	<color name="m3_neutral1_50">@android:color/system_neutral1_50</color>
+	<color name="m3_neutral1_25">@android:color/system_neutral1_10</color>
 
-	<color name="m3_primary_25">@android:color/system_accent1_10</color>
-	<color name="m3_primary_50">@android:color/system_accent1_50</color>
-	<color name="m3_primary_100">@android:color/system_accent1_100</color>
-	<color name="m3_primary_200">@android:color/system_accent1_200</color>
-	<color name="m3_primary_300">@android:color/system_accent1_300</color>
-	<color name="m3_primary_400">@android:color/system_accent1_400</color>
-	<color name="m3_primary_500">@android:color/system_accent1_500</color>
-	<color name="m3_primary_600">@android:color/system_accent1_600</color>
-	<color name="m3_primary_700">@android:color/system_accent1_700</color>
-	<color name="m3_primary_800">@android:color/system_accent1_800</color>
-	<color name="m3_primary_900">@android:color/system_accent1_900</color>
+	<color name="m3_accent1_25">@android:color/system_accent1_10</color>
+	<color name="m3_accent1_50">@android:color/system_accent1_50</color>
+	<color name="m3_accent1_100">@android:color/system_accent1_100</color>
+	<color name="m3_accent1_200">@android:color/system_accent1_200</color>
+	<color name="m3_accent1_300">@android:color/system_accent1_300</color>
+	<color name="m3_accent1_400">@android:color/system_accent1_400</color>
+	<color name="m3_accent1_500">@android:color/system_accent1_500</color>
+	<color name="m3_accent1_600">@android:color/system_accent1_600</color>
+	<color name="m3_accent1_700">@android:color/system_accent1_700</color>
+	<color name="m3_accent1_800">@android:color/system_accent1_800</color>
+	<color name="m3_accent1_900">@android:color/system_accent1_900</color>
 
+	<color name="m3_neutral2_900">@android:color/system_neutral2_900</color>
+	<color name="m3_neutral2_800t">@android:color/system_neutral2_800</color>
+	<color name="m3_neutral2_800">@android:color/system_neutral2_800</color>
+	<color name="m3_neutral2_700">@android:color/system_neutral2_700</color>
+	<color name="m3_neutral2_600">@android:color/system_neutral2_600</color>
+	<color name="m3_neutral2_500">@android:color/system_neutral2_500</color>
+	<color name="m3_neutral2_400">@android:color/system_neutral2_400</color>
+	<color name="m3_neutral2_300">@android:color/system_neutral2_300</color>
+	<color name="m3_neutral2_200">@android:color/system_neutral2_200</color>
+	<color name="m3_neutral2_100">@android:color/system_neutral2_100</color>
+	<color name="m3_neutral2_50t">@android:color/system_neutral2_50</color>
+	<color name="m3_neutral2_50">@android:color/system_neutral2_50</color>
+	<color name="m3_neutral2_25">@android:color/system_neutral2_10</color>
+
+	<color name="m3_accent2_25">@android:color/system_accent2_10</color>
+	<color name="m3_accent2_50">@android:color/system_accent2_50</color>
+	<color name="m3_accent2_100">@android:color/system_accent2_100</color>
+	<color name="m3_accent2_200">@android:color/system_accent2_200</color>
+	<color name="m3_accent2_300">@android:color/system_accent2_300</color>
+	<color name="m3_accent2_400">@android:color/system_accent2_400</color>
+	<color name="m3_accent2_500">@android:color/system_accent2_500</color>
+	<color name="m3_accent2_600">@android:color/system_accent2_600</color>
+	<color name="m3_accent2_700">@android:color/system_accent2_700</color>
+	<color name="m3_accent2_800">@android:color/system_accent2_800</color>
+	<color name="m3_accent2_900">@android:color/system_accent2_900</color>
 
 	<!-- light theme -->
 	<color name="m3_sys_light_primary">@android:color/system_accent1_600</color>
diff --git a/mastodon/src/main/res/values/attrs.xml b/mastodon/src/main/res/values/attrs.xml
index 6c0e11247..5755462c2 100644
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -106,4 +106,42 @@
 	<attr name="colorGray800" format="color" />
 	<attr name="colorGray800t" format="color" />
 	<attr name="colorGray900" format="color" />
+
+	<attr name="colorSecondary25" format="color" />
+	<attr name="colorSecondary50" format="color" />
+	<attr name="colorSecondary100" format="color" />
+	<attr name="colorSecondary200" format="color" />
+	<attr name="colorSecondary300" format="color" />
+	<attr name="colorSecondary400" format="color" />
+	<attr name="colorSecondary500" format="color" />
+	<attr name="colorSecondary600" format="color" />
+	<attr name="colorSecondary700" format="color" />
+	<attr name="colorSecondary800" format="color" />
+	<attr name="colorSecondary900" format="color" />
+
+	<attr name="colorTertiary25" format="color" />
+	<attr name="colorTertiary50" format="color" />
+	<attr name="colorTertiary100" format="color" />
+	<attr name="colorTertiary200" format="color" />
+	<attr name="colorTertiary300" format="color" />
+	<attr name="colorTertiary400" format="color" />
+	<attr name="colorTertiary500" format="color" />
+	<attr name="colorTertiary600" format="color" />
+	<attr name="colorTertiary700" format="color" />
+	<attr name="colorTertiary800" format="color" />
+	<attr name="colorTertiary900" format="color" />
+
+	<attr name="colorNeutral25" format="color" />
+	<attr name="colorNeutral50" format="color" />
+	<attr name="colorNeutral50t" format="color" />
+	<attr name="colorNeutral100" format="color" />
+	<attr name="colorNeutral200" format="color" />
+	<attr name="colorNeutral300" format="color" />
+	<attr name="colorNeutral400" format="color" />
+	<attr name="colorNeutral500" format="color" />
+	<attr name="colorNeutral600" format="color" />
+	<attr name="colorNeutral700" format="color" />
+	<attr name="colorNeutral800" format="color" />
+	<attr name="colorNeutral800t" format="color" />
+	<attr name="colorNeutral900" format="color" />
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/colors.xml b/mastodon/src/main/res/values/colors.xml
index 7e403a784..74cdd7449 100644
--- a/mastodon/src/main/res/values/colors.xml
+++ b/mastodon/src/main/res/values/colors.xml
@@ -103,31 +103,69 @@
 	<!-- M3 dynamic colors -->
 	<color name="m3_navigation_bar_bg">@color/gray_50</color>
 
-	<color name="m3_gray_900">@color/gray_900</color>
-	<color name="m3_gray_800t">@color/gray_800t</color>
-	<color name="m3_gray_800">@color/gray_800</color>
-	<color name="m3_gray_700">@color/gray_700</color>
-	<color name="m3_gray_600">@color/gray_600</color>
-	<color name="m3_gray_500">@color/gray_500</color>
-	<color name="m3_gray_400">@color/gray_400</color>
-	<color name="m3_gray_300">@color/gray_300</color>
-	<color name="m3_gray_200">@color/gray_200</color>
-	<color name="m3_gray_100">@color/gray_100</color>
-	<color name="m3_gray_50t">@color/gray_50t</color>
-	<color name="m3_gray_50">@color/gray_50</color>
-	<color name="m3_gray_25">@color/gray_25</color>
+	<color name="m3_neutral1_900">@color/gray_900</color>
+	<color name="m3_neutral1_800t">@color/gray_800t</color>
+	<color name="m3_neutral1_800">@color/gray_800</color>
+	<color name="m3_neutral1_700">@color/gray_700</color>
+	<color name="m3_neutral1_600">@color/gray_600</color>
+	<color name="m3_neutral1_500">@color/gray_500</color>
+	<color name="m3_neutral1_400">@color/gray_400</color>
+	<color name="m3_neutral1_300">@color/gray_300</color>
+	<color name="m3_neutral1_200">@color/gray_200</color>
+	<color name="m3_neutral1_100">@color/gray_100</color>
+	<color name="m3_neutral1_50t">@color/gray_50t</color>
+	<color name="m3_neutral1_50">@color/gray_50</color>
+	<color name="m3_neutral1_25">@color/gray_25</color>
 
-	<color name="m3_primary_25">@color/primary_25</color>
-	<color name="m3_primary_50">@color/primary_50</color>
-	<color name="m3_primary_100">@color/primary_100</color>
-	<color name="m3_primary_200">@color/primary_200</color>
-	<color name="m3_primary_300">@color/primary_300</color>
-	<color name="m3_primary_400">@color/primary_400</color>
-	<color name="m3_primary_500">@color/primary_500</color>
-	<color name="m3_primary_600">@color/primary_600</color>
-	<color name="m3_primary_700">@color/primary_700</color>
-	<color name="m3_primary_800">@color/primary_800</color>
-	<color name="m3_primary_900">@color/primary_900</color>
+	<color name="m3_neutral2_900">@color/gray_900</color>
+	<color name="m3_neutral2_800t">@color/gray_800t</color>
+	<color name="m3_neutral2_800">@color/gray_800</color>
+	<color name="m3_neutral2_700">@color/gray_700</color>
+	<color name="m3_neutral2_600">@color/gray_600</color>
+	<color name="m3_neutral2_500">@color/gray_500</color>
+	<color name="m3_neutral2_400">@color/gray_400</color>
+	<color name="m3_neutral2_300">@color/gray_300</color>
+	<color name="m3_neutral2_200">@color/gray_200</color>
+	<color name="m3_neutral2_100">@color/gray_100</color>
+	<color name="m3_neutral2_50t">@color/gray_50t</color>
+	<color name="m3_neutral2_50">@color/gray_50</color>
+	<color name="m3_neutral2_25">@color/gray_25</color>
+
+	<color name="m3_accent1_25">@color/primary_25</color>
+	<color name="m3_accent1_50">@color/primary_50</color>
+	<color name="m3_accent1_100">@color/primary_100</color>
+	<color name="m3_accent1_200">@color/primary_200</color>
+	<color name="m3_accent1_300">@color/primary_300</color>
+	<color name="m3_accent1_400">@color/primary_400</color>
+	<color name="m3_accent1_500">@color/primary_500</color>
+	<color name="m3_accent1_600">@color/primary_600</color>
+	<color name="m3_accent1_700">@color/primary_700</color>
+	<color name="m3_accent1_800">@color/primary_800</color>
+	<color name="m3_accent1_900">@color/primary_900</color>
+
+	<color name="m3_accent2_25">@color/primary_25</color>
+	<color name="m3_accent2_50">@color/primary_50</color>
+	<color name="m3_accent2_100">@color/primary_100</color>
+	<color name="m3_accent2_200">@color/primary_200</color>
+	<color name="m3_accent2_300">@color/primary_300</color>
+	<color name="m3_accent2_400">@color/primary_400</color>
+	<color name="m3_accent2_500">@color/primary_500</color>
+	<color name="m3_accent2_600">@color/primary_600</color>
+	<color name="m3_accent2_700">@color/primary_700</color>
+	<color name="m3_accent2_800">@color/primary_800</color>
+	<color name="m3_accent2_900">@color/primary_900</color>
+
+	<color name="m3_accent3_25">@color/primary_25</color>
+	<color name="m3_accent3_50">@color/primary_50</color>
+	<color name="m3_accent3_100">@color/primary_100</color>
+	<color name="m3_accent3_200">@color/primary_200</color>
+	<color name="m3_accent3_300">@color/primary_300</color>
+	<color name="m3_accent3_400">@color/primary_400</color>
+	<color name="m3_accent3_500">@color/primary_500</color>
+	<color name="m3_accent3_600">@color/primary_600</color>
+	<color name="m3_accent3_700">@color/primary_700</color>
+	<color name="m3_accent3_800">@color/primary_800</color>
+	<color name="m3_accent3_900">@color/primary_900</color>
 
 	<!-- light theme -->
 	<color name="m3_sys_light_primary">#6750A4</color>
diff --git a/mastodon/src/main/res/values/palettes.xml b/mastodon/src/main/res/values/palettes.xml
index 4c4c9caf7..3a285c813 100644
--- a/mastodon/src/main/res/values/palettes.xml
+++ b/mastodon/src/main/res/values/palettes.xml
@@ -26,34 +26,115 @@
 		<item name="colorGray50t">@color/gray_50t</item>
 		<item name="colorGray50">@color/gray_50</item>
 		<item name="colorGray25">@color/gray_25</item>
+
+		<!--
+		custom themes generally don't have secondary/tertiary accent colors -
+		falling back to primary colors
+		-->
+
+		<item name="colorSecondary25">@color/primary_25</item>
+		<item name="colorSecondary50">@color/primary_50</item>
+		<item name="colorSecondary100">@color/primary_100</item>
+		<item name="colorSecondary200">@color/primary_200</item>
+		<item name="colorSecondary300">@color/primary_300</item>
+		<item name="colorSecondary400">@color/primary_400</item>
+		<item name="colorSecondary500">@color/primary_500</item>
+		<item name="colorSecondary600">@color/primary_600</item>
+		<item name="colorSecondary700">@color/primary_700</item>
+		<item name="colorSecondary800">@color/primary_800</item>
+		<item name="colorSecondary900">@color/primary_900</item>
+
+		<item name="colorTertiary25">@color/primary_25</item>
+		<item name="colorTertiary50">@color/primary_50</item>
+		<item name="colorTertiary100">@color/primary_100</item>
+		<item name="colorTertiary200">@color/primary_200</item>
+		<item name="colorTertiary300">@color/primary_300</item>
+		<item name="colorTertiary400">@color/primary_400</item>
+		<item name="colorTertiary500">@color/primary_500</item>
+		<item name="colorTertiary600">@color/primary_600</item>
+		<item name="colorTertiary700">@color/primary_700</item>
+		<item name="colorTertiary800">@color/primary_800</item>
+		<item name="colorTertiary900">@color/primary_900</item>
+
+		<item name="colorNeutral900">@color/gray_900</item>
+		<item name="colorNeutral800t">@color/gray_800t</item>
+		<item name="colorNeutral800">@color/gray_800</item>
+		<item name="colorNeutral700">@color/gray_700</item>
+		<item name="colorNeutral600">@color/gray_600</item>
+		<item name="colorNeutral500">@color/gray_500</item>
+		<item name="colorNeutral400">@color/gray_400</item>
+		<item name="colorNeutral300">@color/gray_300</item>
+		<item name="colorNeutral200">@color/gray_200</item>
+		<item name="colorNeutral100">@color/gray_100</item>
+		<item name="colorNeutral50t">@color/gray_50t</item>
+		<item name="colorNeutral50">@color/gray_50</item>
+		<item name="colorNeutral25">@color/gray_25</item>
 	</style>
 
 	<style name="ColorPalette.Material3">
-		<item name="colorPrimary25">@color/m3_primary_25</item>
-		<item name="colorPrimary50">@color/m3_primary_50</item>
-		<item name="colorPrimary100">@color/m3_primary_100</item>
-		<item name="colorPrimary200">@color/m3_primary_200</item>
-		<item name="colorPrimary300">@color/m3_primary_300</item>
-		<item name="colorPrimary400">@color/m3_primary_400</item>
-		<item name="colorPrimary500">@color/m3_primary_500</item>
-		<item name="colorPrimary600">@color/m3_primary_600</item>
-		<item name="colorPrimary700">@color/m3_primary_700</item>
-		<item name="colorPrimary800">@color/m3_primary_800</item>
-		<item name="colorPrimary900">@color/m3_primary_900</item>
+		<item name="colorPrimary25">@color/m3_accent1_25</item>
+		<item name="colorPrimary50">@color/m3_accent1_50</item>
+		<item name="colorPrimary100">@color/m3_accent1_100</item>
+		<item name="colorPrimary200">@color/m3_accent1_200</item>
+		<item name="colorPrimary300">@color/m3_accent1_300</item>
+		<item name="colorPrimary400">@color/m3_accent1_400</item>
+		<item name="colorPrimary500">@color/m3_accent1_500</item>
+		<item name="colorPrimary600">@color/m3_accent1_600</item>
+		<item name="colorPrimary700">@color/m3_accent1_700</item>
+		<item name="colorPrimary800">@color/m3_accent1_800</item>
+		<item name="colorPrimary900">@color/m3_accent1_900</item>
 
-		<item name="colorGray900">@color/m3_gray_900</item>
-		<item name="colorGray800t">@color/m3_gray_800t</item>
-		<item name="colorGray800">@color/m3_gray_800</item>
-		<item name="colorGray700">@color/m3_gray_700</item>
-		<item name="colorGray600">@color/m3_gray_600</item>
-		<item name="colorGray500">@color/m3_gray_500</item>
-		<item name="colorGray400">@color/m3_gray_400</item>
-		<item name="colorGray300">@color/m3_gray_300</item>
-		<item name="colorGray200">@color/m3_gray_200</item>
-		<item name="colorGray100">@color/m3_gray_100</item>
-		<item name="colorGray50t">@color/m3_gray_50t</item>
-		<item name="colorGray50">@color/m3_gray_50</item>
-		<item name="colorGray25">@color/m3_gray_25</item>
+		<item name="colorSecondary25">@color/m3_accent2_25</item>
+		<item name="colorSecondary50">@color/m3_accent2_50</item>
+		<item name="colorSecondary100">@color/m3_accent2_100</item>
+		<item name="colorSecondary200">@color/m3_accent2_200</item>
+		<item name="colorSecondary300">@color/m3_accent2_300</item>
+		<item name="colorSecondary400">@color/m3_accent2_400</item>
+		<item name="colorSecondary500">@color/m3_accent2_500</item>
+		<item name="colorSecondary600">@color/m3_accent2_600</item>
+		<item name="colorSecondary700">@color/m3_accent2_700</item>
+		<item name="colorSecondary800">@color/m3_accent2_800</item>
+		<item name="colorSecondary900">@color/m3_accent2_900</item>
+
+		<item name="colorTertiary25">@color/m3_accent3_25</item>
+		<item name="colorTertiary50">@color/m3_accent3_50</item>
+		<item name="colorTertiary100">@color/m3_accent3_100</item>
+		<item name="colorTertiary200">@color/m3_accent3_200</item>
+		<item name="colorTertiary300">@color/m3_accent3_300</item>
+		<item name="colorTertiary400">@color/m3_accent3_400</item>
+		<item name="colorTertiary500">@color/m3_accent3_500</item>
+		<item name="colorTertiary600">@color/m3_accent3_600</item>
+		<item name="colorTertiary700">@color/m3_accent3_700</item>
+		<item name="colorTertiary800">@color/m3_accent3_800</item>
+		<item name="colorTertiary900">@color/m3_accent3_900</item>
+
+		<item name="colorGray900">@color/m3_neutral1_900</item>
+		<item name="colorGray800t">@color/m3_neutral1_800t</item>
+		<item name="colorGray800">@color/m3_neutral1_800</item>
+		<item name="colorGray700">@color/m3_neutral1_700</item>
+		<item name="colorGray600">@color/m3_neutral1_600</item>
+		<item name="colorGray500">@color/m3_neutral1_500</item>
+		<item name="colorGray400">@color/m3_neutral1_400</item>
+		<item name="colorGray300">@color/m3_neutral1_300</item>
+		<item name="colorGray200">@color/m3_neutral1_200</item>
+		<item name="colorGray100">@color/m3_neutral1_100</item>
+		<item name="colorGray50t">@color/m3_neutral1_50t</item>
+		<item name="colorGray50">@color/m3_neutral1_50</item>
+		<item name="colorGray25">@color/m3_neutral1_25</item>
+
+		<item name="colorNeutral900">@color/m3_neutral2_900</item>
+		<item name="colorNeutral800t">@color/m3_neutral2_800t</item>
+		<item name="colorNeutral800">@color/m3_neutral2_800</item>
+		<item name="colorNeutral700">@color/m3_neutral2_700</item>
+		<item name="colorNeutral600">@color/m3_neutral2_600</item>
+		<item name="colorNeutral500">@color/m3_neutral2_500</item>
+		<item name="colorNeutral400">@color/m3_neutral2_400</item>
+		<item name="colorNeutral300">@color/m3_neutral2_300</item>
+		<item name="colorNeutral200">@color/m3_neutral2_200</item>
+		<item name="colorNeutral100">@color/m3_neutral2_100</item>
+		<item name="colorNeutral50t">@color/m3_neutral2_50t</item>
+		<item name="colorNeutral50">@color/m3_neutral2_50</item>
+		<item name="colorNeutral25">@color/m3_neutral2_25</item>
 	</style>
 
 	<style name="ColorPalette.Material3.Dark">
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index d44c60df1..89935eb60 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -63,29 +63,29 @@
 		<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
 		
 		<!-- M3 colors -->
-		<item name="colorM3Primary">@color/m3_sys_light_primary</item>
-		<item name="colorM3OnPrimary">@color/m3_sys_light_on_primary</item>
-		<item name="colorM3PrimaryContainer">@color/m3_sys_light_primary_container</item>
-		<item name="colorM3OnPrimaryContainer">@color/m3_sys_light_on_primary_container</item>
-		<item name="colorM3Secondary">@color/m3_sys_light_secondary</item>
-		<item name="colorM3OnSecondary">@color/m3_sys_light_on_secondary</item>
-		<item name="colorM3SecondaryContainer">@color/m3_sys_light_secondary_container</item>
-		<item name="colorM3OnSecondaryContainer">@color/m3_sys_light_on_secondary_container</item>
-		<item name="colorM3Tertiary">@color/m3_sys_light_tertiary</item>
-		<item name="colorM3OnTertiary">@color/m3_sys_light_on_tertiary</item>
-		<item name="colorM3TertiaryContainer">@color/m3_sys_light_tertiary_container</item>
-		<item name="colorM3OnTertiaryContainer">@color/m3_sys_light_on_tertiary_container</item>
-		<item name="colorM3Background">@color/m3_sys_light_background</item>
-		<item name="colorM3OnBackground">@color/m3_sys_light_on_background</item>
-		<item name="colorM3Surface">@color/m3_sys_light_surface</item>
-		<item name="colorM3OnSurface">@color/m3_sys_light_on_surface</item>
-		<item name="colorM3SurfaceVariant">@color/m3_sys_light_surface_variant</item>
-		<item name="colorM3OnSurfaceVariant">@color/m3_sys_light_on_surface_variant</item>
-		<item name="colorM3Outline">@color/m3_sys_light_outline</item>
+		<item name="colorM3Primary">?colorPrimary600</item>
+		<item name="colorM3OnPrimary">@color/white</item>
+		<item name="colorM3PrimaryContainer">?colorPrimary100</item>
+		<item name="colorM3OnPrimaryContainer">?colorPrimary900</item>
+		<item name="colorM3Secondary">?colorSecondary600</item>
+		<item name="colorM3OnSecondary">@color/white</item>
+		<item name="colorM3SecondaryContainer">?colorSecondary100</item>
+		<item name="colorM3OnSecondaryContainer">?colorSecondary900</item>
+		<item name="colorM3Tertiary">?colorTertiary600</item>
+		<item name="colorM3OnTertiary">@color/white</item>
+		<item name="colorM3TertiaryContainer">?colorTertiary100</item>
+		<item name="colorM3OnTertiaryContainer">?colorTertiary900</item>
+		<item name="colorM3Background">?colorGray25</item>
+		<item name="colorM3OnBackground">?colorGray900</item>
+		<item name="colorM3Surface">?colorGray25</item>
+		<item name="colorM3OnSurface">?colorGray900</item>
+		<item name="colorM3SurfaceVariant">?colorNeutral100</item>
+		<item name="colorM3OnSurfaceVariant">?colorNeutral700</item>
+		<item name="colorM3Outline">?colorNeutral500</item>
 		<item name="colorM3DisabledBackground">#1F1F1F1F</item>
-		<item name="colorM3PressedOverlay">@color/m3_sys_light_on_primary</item>
+		<item name="colorM3PressedOverlay">@color/white</item>
 		<item name="colorM3Error">#B3261E</item>
-		<item name="colorM3OnError">#FFF</item>
+		<item name="colorM3OnError">@color/white</item>
 		<item name="colorM3ErrorContainer">#F9DEDC</item>
 		<item name="colorM3OnErrorContainer">#410E0B</item>
 
@@ -163,27 +163,27 @@
 		<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
 
 		<!-- M3 colors -->
-		<item name="colorM3Primary">@color/m3_sys_dark_primary</item>
-		<item name="colorM3OnPrimary">@color/m3_sys_dark_on_primary</item>
-		<item name="colorM3PrimaryContainer">@color/m3_sys_dark_primary_container</item>
-		<item name="colorM3OnPrimaryContainer">@color/m3_sys_dark_on_primary_container</item>
-		<item name="colorM3Secondary">@color/m3_sys_dark_secondary</item>
-		<item name="colorM3OnSecondary">@color/m3_sys_dark_on_secondary</item>
-		<item name="colorM3SecondaryContainer">@color/m3_sys_dark_secondary_container</item>
-		<item name="colorM3OnSecondaryContainer">@color/m3_sys_dark_on_secondary_container</item>
-		<item name="colorM3Tertiary">@color/m3_sys_dark_tertiary</item>
-		<item name="colorM3OnTertiary">@color/m3_sys_dark_on_tertiary</item>
-		<item name="colorM3TertiaryContainer">@color/m3_sys_dark_tertiary_container</item>
-		<item name="colorM3OnTertiaryContainer">@color/m3_sys_dark_on_tertiary_container</item>
-		<item name="colorM3Background">@color/m3_sys_dark_background</item>
-		<item name="colorM3OnBackground">@color/m3_sys_dark_on_background</item>
-		<item name="colorM3Surface">@color/m3_sys_dark_surface</item>
-		<item name="colorM3OnSurface">@color/m3_sys_dark_on_surface</item>
-		<item name="colorM3SurfaceVariant">@color/m3_sys_dark_surface_variant</item>
-		<item name="colorM3OnSurfaceVariant">@color/m3_sys_dark_on_surface_variant</item>
-		<item name="colorM3Outline">@color/m3_sys_dark_outline</item>
+		<item name="colorM3Primary">?colorPrimary200</item>
+		<item name="colorM3OnPrimary">?colorPrimary800</item>
+		<item name="colorM3PrimaryContainer">?colorPrimary700</item>
+		<item name="colorM3OnPrimaryContainer">?colorPrimary100</item>
+		<item name="colorM3Secondary">?colorSecondary200</item>
+		<item name="colorM3OnSecondary">?colorSecondary800</item>
+		<item name="colorM3SecondaryContainer">?colorSecondary700</item>
+		<item name="colorM3OnSecondaryContainer">?colorSecondary100</item>
+		<item name="colorM3Tertiary">?colorTertiary200</item>
+		<item name="colorM3OnTertiary">?colorTertiary800</item>
+		<item name="colorM3TertiaryContainer">?colorTertiary700</item>
+		<item name="colorM3OnTertiaryContainer">?colorTertiary100</item>
+		<item name="colorM3Background">?colorGray900</item>
+		<item name="colorM3OnBackground">?colorGray100</item>
+		<item name="colorM3Surface">?colorGray900</item>
+		<item name="colorM3OnSurface">?colorGray100</item>
+		<item name="colorM3SurfaceVariant">?colorNeutral700</item>
+		<item name="colorM3OnSurfaceVariant">?colorNeutral200</item>
+		<item name="colorM3Outline">?colorNeutral400</item>
 		<item name="colorM3DisabledBackground">#1FE3E3E3</item>
-		<item name="colorM3PressedOverlay">@color/m3_sys_dark_primary</item>
+		<item name="colorM3PressedOverlay">?colorPrimary200</item>
 		<item name="colorM3Error">#F2B8B5</item>
 		<item name="colorM3OnError">#601410</item>
 		<item name="colorM3ErrorContainer">#8C1D18</item>
@@ -231,7 +231,8 @@
 		<item name="colorComposeButton">?android:colorAccent</item>
 		<item name="colorComposeButtonBackground">?colorGray900</item>
 
-		<item name="colorM3Background">#000</item>
+		<item name="colorM3Background">@color/black</item>
+		<item name="colorM3Surface">@color/black</item>
 <!--		<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray900</item>-->
 	</style>