diff --git a/lib/java/com/google/android/material/color/res/values-v31/tokens.xml b/lib/java/com/google/android/material/color/res/values-v31/tokens.xml
index 2840b4a0b75..1215fcc0e49 100644
--- a/lib/java/com/google/android/material/color/res/values-v31/tokens.xml
+++ b/lib/java/com/google/android/material/color/res/values-v31/tokens.xml
@@ -21,130 +21,130 @@
   <!-- Generated from token set (md.sys.color) in context (theme=dark). -->
   <!-- Primary colors -->
   <color name="m3_sys_color_dynamic_dark_primary">@color/m3_ref_palette_dynamic_primary80</color>
-  <color name="m3_sys_color_dynamic_dark_on_primary">@color/m3_ref_palette_dynamic_primary20</color>
-  <color name="m3_sys_color_dynamic_dark_inverse_primary">@color/m3_ref_palette_dynamic_primary40</color>
   <color name="m3_sys_color_dynamic_dark_primary_container">@color/m3_ref_palette_dynamic_primary30</color>
+  <color name="m3_sys_color_dynamic_dark_on_primary">@color/m3_ref_palette_dynamic_primary20</color>
   <color name="m3_sys_color_dynamic_dark_on_primary_container">@color/m3_ref_palette_dynamic_primary90</color>
+  <color name="m3_sys_color_dynamic_dark_inverse_primary">@color/m3_ref_palette_dynamic_primary40</color>
+  <!-- Secondary colors -->
+  <color name="m3_sys_color_dynamic_dark_secondary">@color/m3_ref_palette_dynamic_secondary80</color>
+  <color name="m3_sys_color_dynamic_dark_secondary_container">@color/m3_ref_palette_dynamic_secondary30</color>
+  <color name="m3_sys_color_dynamic_dark_on_secondary">@color/m3_ref_palette_dynamic_secondary20</color>
+  <color name="m3_sys_color_dynamic_dark_on_secondary_container">@color/m3_ref_palette_dynamic_secondary90</color>
+  <!-- Tertiary colors -->
+  <color name="m3_sys_color_dynamic_dark_tertiary">@color/m3_ref_palette_dynamic_tertiary80</color>
+  <color name="m3_sys_color_dynamic_dark_tertiary_container">@color/m3_ref_palette_dynamic_tertiary30</color>
+  <color name="m3_sys_color_dynamic_dark_on_tertiary">@color/m3_ref_palette_dynamic_tertiary20</color>
+  <color name="m3_sys_color_dynamic_dark_on_tertiary_container">@color/m3_ref_palette_dynamic_tertiary90</color>
   <!-- Surface colors -->
   <color name="m3_sys_color_dynamic_dark_surface">@color/m3_ref_palette_dynamic_neutral10</color>
+  <color name="m3_sys_color_dynamic_dark_surface_variant">@color/m3_ref_palette_dynamic_neutral_variant30</color>
   <color name="m3_sys_color_dynamic_dark_on_surface">@color/m3_ref_palette_dynamic_neutral90</color>
+  <color name="m3_sys_color_dynamic_dark_on_surface_variant">@color/m3_ref_palette_dynamic_neutral_variant80</color>
   <color name="m3_sys_color_dynamic_dark_inverse_surface">@color/m3_ref_palette_dynamic_neutral90</color>
-  <color name="m3_sys_color_dynamic_dark_surface_variant">@color/m3_ref_palette_dynamic_neutral_variant30</color>
   <color name="m3_sys_color_dynamic_dark_inverse_on_surface">@color/m3_ref_palette_dynamic_neutral20</color>
-  <color name="m3_sys_color_dynamic_dark_on_surface_variant">@color/m3_ref_palette_dynamic_neutral_variant80</color>
-  <!-- Hairline colors -->
-  <color name="m3_sys_color_dynamic_dark_outline">@color/m3_ref_palette_dynamic_neutral_variant60</color>
-  <!-- Tertiary colors -->
-  <color name="m3_sys_color_dynamic_dark_tertiary">@color/m3_ref_palette_dynamic_tertiary80</color>
-  <color name="m3_sys_color_dynamic_dark_on_tertiary">@color/m3_ref_palette_dynamic_tertiary20</color>
-  <color name="m3_sys_color_dynamic_dark_tertiary_container">@color/m3_ref_palette_dynamic_tertiary30</color>
-  <color name="m3_sys_color_dynamic_dark_on_tertiary_container">@color/m3_ref_palette_dynamic_tertiary90</color>
-  <!-- Secondary colors -->
-  <color name="m3_sys_color_dynamic_dark_secondary">@color/m3_ref_palette_dynamic_secondary80</color>
-  <color name="m3_sys_color_dynamic_dark_on_secondary">@color/m3_ref_palette_dynamic_secondary20</color>
-  <color name="m3_sys_color_dynamic_dark_secondary_container">@color/m3_ref_palette_dynamic_secondary30</color>
-  <color name="m3_sys_color_dynamic_dark_on_secondary_container">@color/m3_ref_palette_dynamic_secondary90</color>
   <!-- Background colors -->
   <color name="m3_sys_color_dynamic_dark_background">@color/m3_ref_palette_dynamic_neutral10</color>
   <color name="m3_sys_color_dynamic_dark_on_background">@color/m3_ref_palette_dynamic_neutral90</color>
+  <!-- Hairline colors -->
+  <color name="m3_sys_color_dynamic_dark_outline">@color/m3_ref_palette_dynamic_neutral_variant60</color>
   <!-- Generated from token set (md.sys.color) in context (theme=light). -->
   <!-- Primary colors -->
   <color name="m3_sys_color_dynamic_light_primary">@color/m3_ref_palette_dynamic_primary40</color>
-  <color name="m3_sys_color_dynamic_light_on_primary">@color/m3_ref_palette_dynamic_primary100</color>
-  <color name="m3_sys_color_dynamic_light_inverse_primary">@color/m3_ref_palette_dynamic_primary80</color>
   <color name="m3_sys_color_dynamic_light_primary_container">@color/m3_ref_palette_dynamic_primary90</color>
+  <color name="m3_sys_color_dynamic_light_on_primary">@color/m3_ref_palette_dynamic_primary100</color>
   <color name="m3_sys_color_dynamic_light_on_primary_container">@color/m3_ref_palette_dynamic_primary10</color>
+  <color name="m3_sys_color_dynamic_light_inverse_primary">@color/m3_ref_palette_dynamic_primary80</color>
+  <!-- Secondary colors -->
+  <color name="m3_sys_color_dynamic_light_secondary">@color/m3_ref_palette_dynamic_secondary40</color>
+  <color name="m3_sys_color_dynamic_light_secondary_container">@color/m3_ref_palette_dynamic_secondary90</color>
+  <color name="m3_sys_color_dynamic_light_on_secondary">@color/m3_ref_palette_dynamic_secondary100</color>
+  <color name="m3_sys_color_dynamic_light_on_secondary_container">@color/m3_ref_palette_dynamic_secondary10</color>
+  <!-- Tertiary colors -->
+  <color name="m3_sys_color_dynamic_light_tertiary">@color/m3_ref_palette_dynamic_tertiary40</color>
+  <color name="m3_sys_color_dynamic_light_tertiary_container">@color/m3_ref_palette_dynamic_tertiary90</color>
+  <color name="m3_sys_color_dynamic_light_on_tertiary">@color/m3_ref_palette_dynamic_tertiary100</color>
+  <color name="m3_sys_color_dynamic_light_on_tertiary_container">@color/m3_ref_palette_dynamic_tertiary10</color>
   <!-- Surface colors -->
   <color name="m3_sys_color_dynamic_light_surface">@color/m3_ref_palette_dynamic_neutral99</color>
+  <color name="m3_sys_color_dynamic_light_surface_variant">@color/m3_ref_palette_dynamic_neutral_variant90</color>
   <color name="m3_sys_color_dynamic_light_on_surface">@color/m3_ref_palette_dynamic_neutral10</color>
+  <color name="m3_sys_color_dynamic_light_on_surface_variant">@color/m3_ref_palette_dynamic_neutral_variant30</color>
   <color name="m3_sys_color_dynamic_light_inverse_surface">@color/m3_ref_palette_dynamic_neutral20</color>
-  <color name="m3_sys_color_dynamic_light_surface_variant">@color/m3_ref_palette_dynamic_neutral_variant90</color>
   <color name="m3_sys_color_dynamic_light_inverse_on_surface">@color/m3_ref_palette_dynamic_neutral95</color>
-  <color name="m3_sys_color_dynamic_light_on_surface_variant">@color/m3_ref_palette_dynamic_neutral_variant30</color>
-  <!-- Hairline colors -->
-  <color name="m3_sys_color_dynamic_light_outline">@color/m3_ref_palette_dynamic_neutral_variant50</color>
-  <!-- Tertiary colors -->
-  <color name="m3_sys_color_dynamic_light_tertiary">@color/m3_ref_palette_dynamic_tertiary40</color>
-  <color name="m3_sys_color_dynamic_light_on_tertiary">@color/m3_ref_palette_dynamic_tertiary100</color>
-  <color name="m3_sys_color_dynamic_light_tertiary_container">@color/m3_ref_palette_dynamic_tertiary90</color>
-  <color name="m3_sys_color_dynamic_light_on_tertiary_container">@color/m3_ref_palette_dynamic_tertiary10</color>
-  <!-- Secondary colors -->
-  <color name="m3_sys_color_dynamic_light_secondary">@color/m3_ref_palette_dynamic_secondary40</color>
-  <color name="m3_sys_color_dynamic_light_on_secondary">@color/m3_ref_palette_dynamic_secondary100</color>
-  <color name="m3_sys_color_dynamic_light_secondary_container">@color/m3_ref_palette_dynamic_secondary90</color>
-  <color name="m3_sys_color_dynamic_light_on_secondary_container">@color/m3_ref_palette_dynamic_secondary10</color>
   <!-- Background colors -->
   <color name="m3_sys_color_dynamic_light_background">@color/m3_ref_palette_dynamic_neutral99</color>
   <color name="m3_sys_color_dynamic_light_on_background">@color/m3_ref_palette_dynamic_neutral10</color>
+  <!-- Hairline colors -->
+  <color name="m3_sys_color_dynamic_light_outline">@color/m3_ref_palette_dynamic_neutral_variant50</color>
   <!-- Generated from token set (md.ref.palette) in context (audience=3p). -->
-  <!-- Baseline palette – Neutral -->
-  <color name="m3_ref_palette_dynamic_neutral0">@android:color/system_neutral1_1000</color>
-  <color name="m3_ref_palette_dynamic_neutral10">@android:color/system_neutral1_900</color>
-  <color name="m3_ref_palette_dynamic_neutral20">@android:color/system_neutral1_800</color>
-  <color name="m3_ref_palette_dynamic_neutral30">@android:color/system_neutral1_700</color>
-  <color name="m3_ref_palette_dynamic_neutral40">@android:color/system_neutral1_600</color>
-  <color name="m3_ref_palette_dynamic_neutral50">@android:color/system_neutral1_500</color>
-  <color name="m3_ref_palette_dynamic_neutral60">@android:color/system_neutral1_400</color>
-  <color name="m3_ref_palette_dynamic_neutral70">@android:color/system_neutral1_300</color>
-  <color name="m3_ref_palette_dynamic_neutral80">@android:color/system_neutral1_200</color>
-  <color name="m3_ref_palette_dynamic_neutral90">@android:color/system_neutral1_100</color>
-  <color name="m3_ref_palette_dynamic_neutral95">@android:color/system_neutral1_50</color>
-  <color name="m3_ref_palette_dynamic_neutral99">@android:color/system_neutral1_10</color>
-  <color name="m3_ref_palette_dynamic_neutral100">@android:color/system_neutral1_0</color>
   <!-- Baseline palette – Primary -->
-  <color name="m3_ref_palette_dynamic_primary0">@android:color/system_accent1_1000</color>
-  <color name="m3_ref_palette_dynamic_primary10">@android:color/system_accent1_900</color>
-  <color name="m3_ref_palette_dynamic_primary20">@android:color/system_accent1_800</color>
-  <color name="m3_ref_palette_dynamic_primary30">@android:color/system_accent1_700</color>
-  <color name="m3_ref_palette_dynamic_primary40">@android:color/system_accent1_600</color>
-  <color name="m3_ref_palette_dynamic_primary50">@android:color/system_accent1_500</color>
-  <color name="m3_ref_palette_dynamic_primary60">@android:color/system_accent1_400</color>
-  <color name="m3_ref_palette_dynamic_primary70">@android:color/system_accent1_300</color>
-  <color name="m3_ref_palette_dynamic_primary80">@android:color/system_accent1_200</color>
-  <color name="m3_ref_palette_dynamic_primary90">@android:color/system_accent1_100</color>
-  <color name="m3_ref_palette_dynamic_primary95">@android:color/system_accent1_50</color>
-  <color name="m3_ref_palette_dynamic_primary99">@android:color/system_accent1_10</color>
   <color name="m3_ref_palette_dynamic_primary100">@android:color/system_accent1_0</color>
-  <!-- Baseline palette – Tertiary -->
-  <color name="m3_ref_palette_dynamic_tertiary0">@android:color/system_accent3_1000</color>
-  <color name="m3_ref_palette_dynamic_tertiary10">@android:color/system_accent3_900</color>
-  <color name="m3_ref_palette_dynamic_tertiary20">@android:color/system_accent3_800</color>
-  <color name="m3_ref_palette_dynamic_tertiary30">@android:color/system_accent3_700</color>
-  <color name="m3_ref_palette_dynamic_tertiary40">@android:color/system_accent3_600</color>
-  <color name="m3_ref_palette_dynamic_tertiary50">@android:color/system_accent3_500</color>
-  <color name="m3_ref_palette_dynamic_tertiary60">@android:color/system_accent3_400</color>
-  <color name="m3_ref_palette_dynamic_tertiary70">@android:color/system_accent3_300</color>
-  <color name="m3_ref_palette_dynamic_tertiary80">@android:color/system_accent3_200</color>
-  <color name="m3_ref_palette_dynamic_tertiary90">@android:color/system_accent3_100</color>
-  <color name="m3_ref_palette_dynamic_tertiary95">@android:color/system_accent3_50</color>
-  <color name="m3_ref_palette_dynamic_tertiary99">@android:color/system_accent3_10</color>
-  <color name="m3_ref_palette_dynamic_tertiary100">@android:color/system_accent3_0</color>
+  <color name="m3_ref_palette_dynamic_primary99">@android:color/system_accent1_10</color>
+  <color name="m3_ref_palette_dynamic_primary95">@android:color/system_accent1_50</color>
+  <color name="m3_ref_palette_dynamic_primary90">@android:color/system_accent1_100</color>
+  <color name="m3_ref_palette_dynamic_primary80">@android:color/system_accent1_200</color>
+  <color name="m3_ref_palette_dynamic_primary70">@android:color/system_accent1_300</color>
+  <color name="m3_ref_palette_dynamic_primary60">@android:color/system_accent1_400</color>
+  <color name="m3_ref_palette_dynamic_primary50">@android:color/system_accent1_500</color>
+  <color name="m3_ref_palette_dynamic_primary40">@android:color/system_accent1_600</color>
+  <color name="m3_ref_palette_dynamic_primary30">@android:color/system_accent1_700</color>
+  <color name="m3_ref_palette_dynamic_primary20">@android:color/system_accent1_800</color>
+  <color name="m3_ref_palette_dynamic_primary10">@android:color/system_accent1_900</color>
+  <color name="m3_ref_palette_dynamic_primary0">@android:color/system_accent1_1000</color>
   <!-- Baseline palette – Secondary -->
-  <color name="m3_ref_palette_dynamic_secondary0">@android:color/system_accent2_1000</color>
-  <color name="m3_ref_palette_dynamic_secondary10">@android:color/system_accent2_900</color>
-  <color name="m3_ref_palette_dynamic_secondary20">@android:color/system_accent2_800</color>
-  <color name="m3_ref_palette_dynamic_secondary30">@android:color/system_accent2_700</color>
-  <color name="m3_ref_palette_dynamic_secondary40">@android:color/system_accent2_600</color>
-  <color name="m3_ref_palette_dynamic_secondary50">@android:color/system_accent2_500</color>
-  <color name="m3_ref_palette_dynamic_secondary60">@android:color/system_accent2_400</color>
-  <color name="m3_ref_palette_dynamic_secondary70">@android:color/system_accent2_300</color>
-  <color name="m3_ref_palette_dynamic_secondary80">@android:color/system_accent2_200</color>
-  <color name="m3_ref_palette_dynamic_secondary90">@android:color/system_accent2_100</color>
-  <color name="m3_ref_palette_dynamic_secondary95">@android:color/system_accent2_50</color>
-  <color name="m3_ref_palette_dynamic_secondary99">@android:color/system_accent2_10</color>
   <color name="m3_ref_palette_dynamic_secondary100">@android:color/system_accent2_0</color>
+  <color name="m3_ref_palette_dynamic_secondary99">@android:color/system_accent2_10</color>
+  <color name="m3_ref_palette_dynamic_secondary95">@android:color/system_accent2_50</color>
+  <color name="m3_ref_palette_dynamic_secondary90">@android:color/system_accent2_100</color>
+  <color name="m3_ref_palette_dynamic_secondary80">@android:color/system_accent2_200</color>
+  <color name="m3_ref_palette_dynamic_secondary70">@android:color/system_accent2_300</color>
+  <color name="m3_ref_palette_dynamic_secondary60">@android:color/system_accent2_400</color>
+  <color name="m3_ref_palette_dynamic_secondary50">@android:color/system_accent2_500</color>
+  <color name="m3_ref_palette_dynamic_secondary40">@android:color/system_accent2_600</color>
+  <color name="m3_ref_palette_dynamic_secondary30">@android:color/system_accent2_700</color>
+  <color name="m3_ref_palette_dynamic_secondary20">@android:color/system_accent2_800</color>
+  <color name="m3_ref_palette_dynamic_secondary10">@android:color/system_accent2_900</color>
+  <color name="m3_ref_palette_dynamic_secondary0">@android:color/system_accent2_1000</color>
+  <!-- Baseline palette – Tertiary -->
+  <color name="m3_ref_palette_dynamic_tertiary100">@android:color/system_accent3_0</color>
+  <color name="m3_ref_palette_dynamic_tertiary99">@android:color/system_accent3_10</color>
+  <color name="m3_ref_palette_dynamic_tertiary95">@android:color/system_accent3_50</color>
+  <color name="m3_ref_palette_dynamic_tertiary90">@android:color/system_accent3_100</color>
+  <color name="m3_ref_palette_dynamic_tertiary80">@android:color/system_accent3_200</color>
+  <color name="m3_ref_palette_dynamic_tertiary70">@android:color/system_accent3_300</color>
+  <color name="m3_ref_palette_dynamic_tertiary60">@android:color/system_accent3_400</color>
+  <color name="m3_ref_palette_dynamic_tertiary50">@android:color/system_accent3_500</color>
+  <color name="m3_ref_palette_dynamic_tertiary40">@android:color/system_accent3_600</color>
+  <color name="m3_ref_palette_dynamic_tertiary30">@android:color/system_accent3_700</color>
+  <color name="m3_ref_palette_dynamic_tertiary20">@android:color/system_accent3_800</color>
+  <color name="m3_ref_palette_dynamic_tertiary10">@android:color/system_accent3_900</color>
+  <color name="m3_ref_palette_dynamic_tertiary0">@android:color/system_accent3_1000</color>
+  <!-- Baseline palette – Neutral -->
+  <color name="m3_ref_palette_dynamic_neutral100">@android:color/system_neutral1_0</color>
+  <color name="m3_ref_palette_dynamic_neutral99">@android:color/system_neutral1_10</color>
+  <color name="m3_ref_palette_dynamic_neutral95">@android:color/system_neutral1_50</color>
+  <color name="m3_ref_palette_dynamic_neutral90">@android:color/system_neutral1_100</color>
+  <color name="m3_ref_palette_dynamic_neutral80">@android:color/system_neutral1_200</color>
+  <color name="m3_ref_palette_dynamic_neutral70">@android:color/system_neutral1_300</color>
+  <color name="m3_ref_palette_dynamic_neutral60">@android:color/system_neutral1_400</color>
+  <color name="m3_ref_palette_dynamic_neutral50">@android:color/system_neutral1_500</color>
+  <color name="m3_ref_palette_dynamic_neutral40">@android:color/system_neutral1_600</color>
+  <color name="m3_ref_palette_dynamic_neutral30">@android:color/system_neutral1_700</color>
+  <color name="m3_ref_palette_dynamic_neutral20">@android:color/system_neutral1_800</color>
+  <color name="m3_ref_palette_dynamic_neutral10">@android:color/system_neutral1_900</color>
+  <color name="m3_ref_palette_dynamic_neutral0">@android:color/system_neutral1_1000</color>
   <!-- Baseline palette – Neutral variant -->
-  <color name="m3_ref_palette_dynamic_neutral_variant0">@android:color/system_neutral2_1000</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant10">@android:color/system_neutral2_900</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant20">@android:color/system_neutral2_800</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant30">@android:color/system_neutral2_700</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant40">@android:color/system_neutral2_600</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant50">@android:color/system_neutral2_500</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant60">@android:color/system_neutral2_400</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant70">@android:color/system_neutral2_300</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant80">@android:color/system_neutral2_200</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant90">@android:color/system_neutral2_100</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant95">@android:color/system_neutral2_50</color>
-  <color name="m3_ref_palette_dynamic_neutral_variant99">@android:color/system_neutral2_10</color>
   <color name="m3_ref_palette_dynamic_neutral_variant100">@android:color/system_neutral2_0</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant99">@android:color/system_neutral2_10</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant95">@android:color/system_neutral2_50</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant90">@android:color/system_neutral2_100</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant80">@android:color/system_neutral2_200</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant70">@android:color/system_neutral2_300</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant60">@android:color/system_neutral2_400</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant50">@android:color/system_neutral2_500</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant40">@android:color/system_neutral2_600</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant30">@android:color/system_neutral2_700</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant20">@android:color/system_neutral2_800</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant10">@android:color/system_neutral2_900</color>
+  <color name="m3_ref_palette_dynamic_neutral_variant0">@android:color/system_neutral2_1000</color>
 </resources>
diff --git a/lib/java/com/google/android/material/color/res/values/tokens.xml b/lib/java/com/google/android/material/color/res/values/tokens.xml
index 970a146f898..78dc50c0b27 100644
--- a/lib/java/com/google/android/material/color/res/values/tokens.xml
+++ b/lib/java/com/google/android/material/color/res/values/tokens.xml
@@ -19,156 +19,156 @@
 
 <resources>
   <!-- Generated from token set (md.sys.color) in context (theme=dark). -->
-  <!-- Error colors -->
-  <color name="m3_sys_color_dark_error">@color/m3_ref_palette_error80</color>
-  <color name="m3_sys_color_dark_on_error">@color/m3_ref_palette_error20</color>
-  <color name="m3_sys_color_dark_error_container">@color/m3_ref_palette_error30</color>
-  <color name="m3_sys_color_dark_on_error_container">@color/m3_ref_palette_error80</color>
   <!-- Primary colors -->
   <color name="m3_sys_color_dark_primary">@color/m3_ref_palette_primary80</color>
-  <color name="m3_sys_color_dark_on_primary">@color/m3_ref_palette_primary20</color>
-  <color name="m3_sys_color_dark_inverse_primary">@color/m3_ref_palette_primary40</color>
   <color name="m3_sys_color_dark_primary_container">@color/m3_ref_palette_primary30</color>
+  <color name="m3_sys_color_dark_on_primary">@color/m3_ref_palette_primary20</color>
   <color name="m3_sys_color_dark_on_primary_container">@color/m3_ref_palette_primary90</color>
+  <color name="m3_sys_color_dark_inverse_primary">@color/m3_ref_palette_primary40</color>
+  <!-- Secondary colors -->
+  <color name="m3_sys_color_dark_secondary">@color/m3_ref_palette_secondary80</color>
+  <color name="m3_sys_color_dark_secondary_container">@color/m3_ref_palette_secondary30</color>
+  <color name="m3_sys_color_dark_on_secondary">@color/m3_ref_palette_secondary20</color>
+  <color name="m3_sys_color_dark_on_secondary_container">@color/m3_ref_palette_secondary90</color>
+  <!-- Tertiary colors -->
+  <color name="m3_sys_color_dark_tertiary">@color/m3_ref_palette_tertiary80</color>
+  <color name="m3_sys_color_dark_tertiary_container">@color/m3_ref_palette_tertiary30</color>
+  <color name="m3_sys_color_dark_on_tertiary">@color/m3_ref_palette_tertiary20</color>
+  <color name="m3_sys_color_dark_on_tertiary_container">@color/m3_ref_palette_tertiary90</color>
   <!-- Surface colors -->
   <color name="m3_sys_color_dark_surface">@color/m3_ref_palette_neutral10</color>
+  <color name="m3_sys_color_dark_surface_variant">@color/m3_ref_palette_neutral_variant30</color>
   <color name="m3_sys_color_dark_on_surface">@color/m3_ref_palette_neutral90</color>
+  <color name="m3_sys_color_dark_on_surface_variant">@color/m3_ref_palette_neutral_variant80</color>
   <color name="m3_sys_color_dark_inverse_surface">@color/m3_ref_palette_neutral90</color>
-  <color name="m3_sys_color_dark_surface_variant">@color/m3_ref_palette_neutral_variant30</color>
   <color name="m3_sys_color_dark_inverse_on_surface">@color/m3_ref_palette_neutral20</color>
-  <color name="m3_sys_color_dark_on_surface_variant">@color/m3_ref_palette_neutral_variant80</color>
-  <!-- Hairline colors -->
-  <color name="m3_sys_color_dark_outline">@color/m3_ref_palette_neutral_variant60</color>
-  <!-- Tertiary colors -->
-  <color name="m3_sys_color_dark_tertiary">@color/m3_ref_palette_tertiary80</color>
-  <color name="m3_sys_color_dark_on_tertiary">@color/m3_ref_palette_tertiary20</color>
-  <color name="m3_sys_color_dark_tertiary_container">@color/m3_ref_palette_tertiary30</color>
-  <color name="m3_sys_color_dark_on_tertiary_container">@color/m3_ref_palette_tertiary90</color>
-  <!-- Secondary colors -->
-  <color name="m3_sys_color_dark_secondary">@color/m3_ref_palette_secondary80</color>
-  <color name="m3_sys_color_dark_on_secondary">@color/m3_ref_palette_secondary20</color>
-  <color name="m3_sys_color_dark_secondary_container">@color/m3_ref_palette_secondary30</color>
-  <color name="m3_sys_color_dark_on_secondary_container">@color/m3_ref_palette_secondary90</color>
   <!-- Background colors -->
   <color name="m3_sys_color_dark_background">@color/m3_ref_palette_neutral10</color>
   <color name="m3_sys_color_dark_on_background">@color/m3_ref_palette_neutral90</color>
-  <!-- Generated from token set (md.sys.color) in context (theme=light). -->
+  <!-- Hairline colors -->
+  <color name="m3_sys_color_dark_outline">@color/m3_ref_palette_neutral_variant60</color>
   <!-- Error colors -->
-  <color name="m3_sys_color_light_error">@color/m3_ref_palette_error40</color>
-  <color name="m3_sys_color_light_on_error">@color/m3_ref_palette_error100</color>
-  <color name="m3_sys_color_light_error_container">@color/m3_ref_palette_error90</color>
-  <color name="m3_sys_color_light_on_error_container">@color/m3_ref_palette_error10</color>
+  <color name="m3_sys_color_dark_error">@color/m3_ref_palette_error80</color>
+  <color name="m3_sys_color_dark_error_container">@color/m3_ref_palette_error30</color>
+  <color name="m3_sys_color_dark_on_error">@color/m3_ref_palette_error20</color>
+  <color name="m3_sys_color_dark_on_error_container">@color/m3_ref_palette_error80</color>
+  <!-- Generated from token set (md.sys.color) in context (theme=light). -->
   <!-- Primary colors -->
   <color name="m3_sys_color_light_primary">@color/m3_ref_palette_primary40</color>
-  <color name="m3_sys_color_light_on_primary">@color/m3_ref_palette_primary100</color>
-  <color name="m3_sys_color_light_inverse_primary">@color/m3_ref_palette_primary80</color>
   <color name="m3_sys_color_light_primary_container">@color/m3_ref_palette_primary90</color>
+  <color name="m3_sys_color_light_on_primary">@color/m3_ref_palette_primary100</color>
   <color name="m3_sys_color_light_on_primary_container">@color/m3_ref_palette_primary10</color>
+  <color name="m3_sys_color_light_inverse_primary">@color/m3_ref_palette_primary80</color>
+  <!-- Secondary colors -->
+  <color name="m3_sys_color_light_secondary">@color/m3_ref_palette_secondary40</color>
+  <color name="m3_sys_color_light_secondary_container">@color/m3_ref_palette_secondary90</color>
+  <color name="m3_sys_color_light_on_secondary">@color/m3_ref_palette_secondary100</color>
+  <color name="m3_sys_color_light_on_secondary_container">@color/m3_ref_palette_secondary10</color>
+  <!-- Tertiary colors -->
+  <color name="m3_sys_color_light_tertiary">@color/m3_ref_palette_tertiary40</color>
+  <color name="m3_sys_color_light_tertiary_container">@color/m3_ref_palette_tertiary90</color>
+  <color name="m3_sys_color_light_on_tertiary">@color/m3_ref_palette_tertiary100</color>
+  <color name="m3_sys_color_light_on_tertiary_container">@color/m3_ref_palette_tertiary10</color>
   <!-- Surface colors -->
   <color name="m3_sys_color_light_surface">@color/m3_ref_palette_neutral99</color>
+  <color name="m3_sys_color_light_surface_variant">@color/m3_ref_palette_neutral_variant90</color>
   <color name="m3_sys_color_light_on_surface">@color/m3_ref_palette_neutral10</color>
+  <color name="m3_sys_color_light_on_surface_variant">@color/m3_ref_palette_neutral_variant30</color>
   <color name="m3_sys_color_light_inverse_surface">@color/m3_ref_palette_neutral20</color>
-  <color name="m3_sys_color_light_surface_variant">@color/m3_ref_palette_neutral_variant90</color>
   <color name="m3_sys_color_light_inverse_on_surface">@color/m3_ref_palette_neutral95</color>
-  <color name="m3_sys_color_light_on_surface_variant">@color/m3_ref_palette_neutral_variant30</color>
-  <!-- Hairline colors -->
-  <color name="m3_sys_color_light_outline">@color/m3_ref_palette_neutral_variant50</color>
-  <!-- Tertiary colors -->
-  <color name="m3_sys_color_light_tertiary">@color/m3_ref_palette_tertiary40</color>
-  <color name="m3_sys_color_light_on_tertiary">@color/m3_ref_palette_tertiary100</color>
-  <color name="m3_sys_color_light_tertiary_container">@color/m3_ref_palette_tertiary90</color>
-  <color name="m3_sys_color_light_on_tertiary_container">@color/m3_ref_palette_tertiary10</color>
-  <!-- Secondary colors -->
-  <color name="m3_sys_color_light_secondary">@color/m3_ref_palette_secondary40</color>
-  <color name="m3_sys_color_light_on_secondary">@color/m3_ref_palette_secondary100</color>
-  <color name="m3_sys_color_light_secondary_container">@color/m3_ref_palette_secondary90</color>
-  <color name="m3_sys_color_light_on_secondary_container">@color/m3_ref_palette_secondary10</color>
   <!-- Background colors -->
   <color name="m3_sys_color_light_background">@color/m3_ref_palette_neutral99</color>
   <color name="m3_sys_color_light_on_background">@color/m3_ref_palette_neutral10</color>
+  <!-- Hairline colors -->
+  <color name="m3_sys_color_light_outline">@color/m3_ref_palette_neutral_variant50</color>
+  <!-- Error colors -->
+  <color name="m3_sys_color_light_error">@color/m3_ref_palette_error40</color>
+  <color name="m3_sys_color_light_error_container">@color/m3_ref_palette_error90</color>
+  <color name="m3_sys_color_light_on_error">@color/m3_ref_palette_error100</color>
+  <color name="m3_sys_color_light_on_error_container">@color/m3_ref_palette_error10</color>
   <!-- Generated from token set (md.ref.palette) in context (audience=3p). -->
-  <!-- Baseline palette – Error -->
-  <color name="m3_ref_palette_error0">#ff000000</color>
-  <color name="m3_ref_palette_error10">#ff410e0b</color>
-  <color name="m3_ref_palette_error20">#ff601410</color>
-  <color name="m3_ref_palette_error30">#ff8c1d18</color>
-  <color name="m3_ref_palette_error40">#ffb3261e</color>
-  <color name="m3_ref_palette_error50">#ffdc362e</color>
-  <color name="m3_ref_palette_error60">#ffe46962</color>
-  <color name="m3_ref_palette_error70">#ffec928e</color>
-  <color name="m3_ref_palette_error80">#fff2b8b5</color>
-  <color name="m3_ref_palette_error90">#fff9dedc</color>
-  <color name="m3_ref_palette_error95">#fffceeee</color>
-  <color name="m3_ref_palette_error99">#fffffbf9</color>
-  <color name="m3_ref_palette_error100">#ffffffff</color>
-  <!-- Baseline palette – Neutral -->
-  <color name="m3_ref_palette_neutral0">#ff000000</color>
-  <color name="m3_ref_palette_neutral10">#ff1c1b1f</color>
-  <color name="m3_ref_palette_neutral20">#ff313033</color>
-  <color name="m3_ref_palette_neutral30">#ff484649</color>
-  <color name="m3_ref_palette_neutral40">#ff605d62</color>
-  <color name="m3_ref_palette_neutral50">#ff787579</color>
-  <color name="m3_ref_palette_neutral60">#ff939094</color>
-  <color name="m3_ref_palette_neutral70">#ffaeaaae</color>
-  <color name="m3_ref_palette_neutral80">#ffc9c5ca</color>
-  <color name="m3_ref_palette_neutral90">#ffe6e1e5</color>
-  <color name="m3_ref_palette_neutral95">#fff4eff4</color>
-  <color name="m3_ref_palette_neutral99">#fffffbfe</color>
-  <color name="m3_ref_palette_neutral100">#ffffffff</color>
   <!-- Baseline palette – Primary -->
-  <color name="m3_ref_palette_primary0">#ff000000</color>
-  <color name="m3_ref_palette_primary10">#ff21005d</color>
-  <color name="m3_ref_palette_primary20">#ff381e72</color>
-  <color name="m3_ref_palette_primary30">#ff4f378b</color>
-  <color name="m3_ref_palette_primary40">#ff6750a4</color>
-  <color name="m3_ref_palette_primary50">#ff7f67be</color>
-  <color name="m3_ref_palette_primary60">#ff9a82db</color>
-  <color name="m3_ref_palette_primary70">#ffb69df8</color>
-  <color name="m3_ref_palette_primary80">#ffd0bcff</color>
-  <color name="m3_ref_palette_primary90">#ffeaddff</color>
-  <color name="m3_ref_palette_primary95">#fff6edff</color>
-  <color name="m3_ref_palette_primary99">#fffffbfe</color>
   <color name="m3_ref_palette_primary100">#ffffffff</color>
-  <!-- Baseline palette – Tertiary -->
-  <color name="m3_ref_palette_tertiary0">#ff000000</color>
-  <color name="m3_ref_palette_tertiary10">#ff31111d</color>
-  <color name="m3_ref_palette_tertiary20">#ff492532</color>
-  <color name="m3_ref_palette_tertiary30">#ff633b48</color>
-  <color name="m3_ref_palette_tertiary40">#ff7d5260</color>
-  <color name="m3_ref_palette_tertiary50">#ff986977</color>
-  <color name="m3_ref_palette_tertiary60">#ffb58392</color>
-  <color name="m3_ref_palette_tertiary70">#ffd29dac</color>
-  <color name="m3_ref_palette_tertiary80">#ffefb8c8</color>
-  <color name="m3_ref_palette_tertiary90">#ffffd8e4</color>
-  <color name="m3_ref_palette_tertiary95">#ffffecf1</color>
-  <color name="m3_ref_palette_tertiary99">#fffffbfa</color>
-  <color name="m3_ref_palette_tertiary100">#ffffffff</color>
+  <color name="m3_ref_palette_primary99">#fffffbfe</color>
+  <color name="m3_ref_palette_primary95">#fff6edff</color>
+  <color name="m3_ref_palette_primary90">#ffeaddff</color>
+  <color name="m3_ref_palette_primary80">#ffd0bcff</color>
+  <color name="m3_ref_palette_primary70">#ffb69df8</color>
+  <color name="m3_ref_palette_primary60">#ff9a82db</color>
+  <color name="m3_ref_palette_primary50">#ff7f67be</color>
+  <color name="m3_ref_palette_primary40">#ff6750a4</color>
+  <color name="m3_ref_palette_primary30">#ff4f378b</color>
+  <color name="m3_ref_palette_primary20">#ff381e72</color>
+  <color name="m3_ref_palette_primary10">#ff21005d</color>
+  <color name="m3_ref_palette_primary0">#ff000000</color>
   <!-- Baseline palette – Secondary -->
-  <color name="m3_ref_palette_secondary0">#ff000000</color>
-  <color name="m3_ref_palette_secondary10">#ff1d192b</color>
-  <color name="m3_ref_palette_secondary20">#ff332d41</color>
-  <color name="m3_ref_palette_secondary30">#ff4a4458</color>
-  <color name="m3_ref_palette_secondary40">#ff625b71</color>
-  <color name="m3_ref_palette_secondary50">#ff7a7289</color>
-  <color name="m3_ref_palette_secondary60">#ff958da5</color>
-  <color name="m3_ref_palette_secondary70">#ffb0a7c0</color>
-  <color name="m3_ref_palette_secondary80">#ffccc2dc</color>
-  <color name="m3_ref_palette_secondary90">#ffe8def8</color>
-  <color name="m3_ref_palette_secondary95">#fff6edff</color>
-  <color name="m3_ref_palette_secondary99">#fffffbfe</color>
   <color name="m3_ref_palette_secondary100">#ffffffff</color>
+  <color name="m3_ref_palette_secondary99">#fffffbfe</color>
+  <color name="m3_ref_palette_secondary95">#fff6edff</color>
+  <color name="m3_ref_palette_secondary90">#ffe8def8</color>
+  <color name="m3_ref_palette_secondary80">#ffccc2dc</color>
+  <color name="m3_ref_palette_secondary70">#ffb0a7c0</color>
+  <color name="m3_ref_palette_secondary60">#ff958da5</color>
+  <color name="m3_ref_palette_secondary50">#ff7a7289</color>
+  <color name="m3_ref_palette_secondary40">#ff625b71</color>
+  <color name="m3_ref_palette_secondary30">#ff4a4458</color>
+  <color name="m3_ref_palette_secondary20">#ff332d41</color>
+  <color name="m3_ref_palette_secondary10">#ff1d192b</color>
+  <color name="m3_ref_palette_secondary0">#ff000000</color>
+  <!-- Baseline palette – Tertiary -->
+  <color name="m3_ref_palette_tertiary100">#ffffffff</color>
+  <color name="m3_ref_palette_tertiary99">#fffffbfa</color>
+  <color name="m3_ref_palette_tertiary95">#ffffecf1</color>
+  <color name="m3_ref_palette_tertiary90">#ffffd8e4</color>
+  <color name="m3_ref_palette_tertiary80">#ffefb8c8</color>
+  <color name="m3_ref_palette_tertiary70">#ffd29dac</color>
+  <color name="m3_ref_palette_tertiary60">#ffb58392</color>
+  <color name="m3_ref_palette_tertiary50">#ff986977</color>
+  <color name="m3_ref_palette_tertiary40">#ff7d5260</color>
+  <color name="m3_ref_palette_tertiary30">#ff633b48</color>
+  <color name="m3_ref_palette_tertiary20">#ff492532</color>
+  <color name="m3_ref_palette_tertiary10">#ff31111d</color>
+  <color name="m3_ref_palette_tertiary0">#ff000000</color>
+  <!-- Baseline palette – Error -->
+  <color name="m3_ref_palette_error100">#ffffffff</color>
+  <color name="m3_ref_palette_error99">#fffffbf9</color>
+  <color name="m3_ref_palette_error95">#fffceeee</color>
+  <color name="m3_ref_palette_error90">#fff9dedc</color>
+  <color name="m3_ref_palette_error80">#fff2b8b5</color>
+  <color name="m3_ref_palette_error70">#ffec928e</color>
+  <color name="m3_ref_palette_error60">#ffe46962</color>
+  <color name="m3_ref_palette_error50">#ffdc362e</color>
+  <color name="m3_ref_palette_error40">#ffb3261e</color>
+  <color name="m3_ref_palette_error30">#ff8c1d18</color>
+  <color name="m3_ref_palette_error20">#ff601410</color>
+  <color name="m3_ref_palette_error10">#ff410e0b</color>
+  <color name="m3_ref_palette_error0">#ff000000</color>
+  <!-- Baseline palette – Neutral -->
+  <color name="m3_ref_palette_neutral100">#ffffffff</color>
+  <color name="m3_ref_palette_neutral99">#fffffbfe</color>
+  <color name="m3_ref_palette_neutral95">#fff4eff4</color>
+  <color name="m3_ref_palette_neutral90">#ffe6e1e5</color>
+  <color name="m3_ref_palette_neutral80">#ffc9c5ca</color>
+  <color name="m3_ref_palette_neutral70">#ffaeaaae</color>
+  <color name="m3_ref_palette_neutral60">#ff939094</color>
+  <color name="m3_ref_palette_neutral50">#ff787579</color>
+  <color name="m3_ref_palette_neutral40">#ff605d62</color>
+  <color name="m3_ref_palette_neutral30">#ff484649</color>
+  <color name="m3_ref_palette_neutral20">#ff313033</color>
+  <color name="m3_ref_palette_neutral10">#ff1c1b1f</color>
+  <color name="m3_ref_palette_neutral0">#ff000000</color>
   <!-- Baseline palette – Neutral variant -->
-  <color name="m3_ref_palette_neutral_variant0">#ff000000</color>
-  <color name="m3_ref_palette_neutral_variant10">#ff1d1a22</color>
-  <color name="m3_ref_palette_neutral_variant20">#ff322f37</color>
-  <color name="m3_ref_palette_neutral_variant30">#ff49454f</color>
-  <color name="m3_ref_palette_neutral_variant40">#ff605d66</color>
-  <color name="m3_ref_palette_neutral_variant50">#ff79747e</color>
-  <color name="m3_ref_palette_neutral_variant60">#ff938f99</color>
-  <color name="m3_ref_palette_neutral_variant70">#ffaea9b4</color>
-  <color name="m3_ref_palette_neutral_variant80">#ffcac4d0</color>
-  <color name="m3_ref_palette_neutral_variant90">#ffe7e0ec</color>
-  <color name="m3_ref_palette_neutral_variant95">#fff5eefa</color>
-  <color name="m3_ref_palette_neutral_variant99">#fffffbfe</color>
   <color name="m3_ref_palette_neutral_variant100">#ffffffff</color>
+  <color name="m3_ref_palette_neutral_variant99">#fffffbfe</color>
+  <color name="m3_ref_palette_neutral_variant95">#fff5eefa</color>
+  <color name="m3_ref_palette_neutral_variant90">#ffe7e0ec</color>
+  <color name="m3_ref_palette_neutral_variant80">#ffcac4d0</color>
+  <color name="m3_ref_palette_neutral_variant70">#ffaea9b4</color>
+  <color name="m3_ref_palette_neutral_variant60">#ff938f99</color>
+  <color name="m3_ref_palette_neutral_variant50">#ff79747e</color>
+  <color name="m3_ref_palette_neutral_variant40">#ff605d66</color>
+  <color name="m3_ref_palette_neutral_variant30">#ff49454f</color>
+  <color name="m3_ref_palette_neutral_variant20">#ff322f37</color>
+  <color name="m3_ref_palette_neutral_variant10">#ff1d1a22</color>
+  <color name="m3_ref_palette_neutral_variant0">#ff000000</color>
 </resources>
diff --git a/lib/java/com/google/android/material/motion/res/values/tokens.xml b/lib/java/com/google/android/material/motion/res/values/tokens.xml
index eeb5daadb3f..12bd71a99db 100644
--- a/lib/java/com/google/android/material/motion/res/values/tokens.xml
+++ b/lib/java/com/google/android/material/motion/res/values/tokens.xml
@@ -48,12 +48,12 @@
   <string name="m3_sys_motion_easing_emphasized_accelerate" translatable="false">cubic-bezier(0.3, 0.0, 0.8, 0.2)</string>
   <string name="m3_sys_motion_easing_emphasized_decelerate" translatable="false">cubic-bezier(0.1, 0.7, 0.1, 1.0)</string>
   <!-- Deprecated tokens -->
-  <integer name="m3_sys_motion_duration_long1">500</integer>
-  <integer name="m3_sys_motion_duration_long2">600</integer>
   <integer name="m3_sys_motion_duration_short1">100</integer>
   <integer name="m3_sys_motion_duration_short2">200</integer>
   <integer name="m3_sys_motion_duration_medium1">300</integer>
   <integer name="m3_sys_motion_duration_medium2">400</integer>
+  <integer name="m3_sys_motion_duration_long1">500</integer>
+  <integer name="m3_sys_motion_duration_long2">600</integer>
   <string name="m3_sys_motion_easing_accelerated" translatable="false">cubic-bezier(0.4, 0.0, 1.0, 1.0)</string>
   <string name="m3_sys_motion_easing_decelerated" translatable="false">cubic-bezier(0.0, 0.0, 0.2, 1.0)</string>
 </resources>
diff --git a/lib/java/com/google/android/material/shape/res/values/tokens.xml b/lib/java/com/google/android/material/shape/res/values/tokens.xml
index 43ab682cc97..fe19ac5a617 100644
--- a/lib/java/com/google/android/material/shape/res/values/tokens.xml
+++ b/lib/java/com/google/android/material/shape/res/values/tokens.xml
@@ -76,12 +76,12 @@
     <item name="cornerFamily">rounded</item>
     <item name="cornerSize">8dp</item>
   </style>
-  <style name="ShapeAppearance.M3.Sys.Shape.Small" parent="">
-    <item name="cornerFamily">rounded</item>
-    <item name="cornerSize">4dp</item>
-  </style>
   <style name="ShapeAppearance.M3.Sys.Shape.Medium" parent="">
     <item name="cornerFamily">rounded</item>
     <item name="cornerSize">8dp</item>
   </style>
+  <style name="ShapeAppearance.M3.Sys.Shape.Small" parent="">
+    <item name="cornerFamily">rounded</item>
+    <item name="cornerSize">4dp</item>
+  </style>
 </resources>
diff --git a/lib/java/com/google/android/material/typography/res/values-v21/tokens.xml b/lib/java/com/google/android/material/typography/res/values-v21/tokens.xml
index 9086bc229ca..10b2eefc81b 100644
--- a/lib/java/com/google/android/material/typography/res/values-v21/tokens.xml
+++ b/lib/java/com/google/android/material/typography/res/values-v21/tokens.xml
@@ -19,49 +19,58 @@
 
 <resources>
   <!-- Generated from token set (md.sys.typescale) in default context. -->
-  <!-- Body Large -->
-  <style name="TextAppearance.M3.Sys.Typescale.BodyLarge" parent="TextAppearance.AppCompat.Body2">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
+  <!-- Display Large -->
+  <style name="TextAppearance.M3.Sys.Typescale.DisplayLarge" parent="TextAppearance.AppCompat.Display3">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">16sp</item>
-    <item name="android:letterSpacing">0.03125</item>
+    <item name="android:textSize">57sp</item>
+    <item name="android:letterSpacing">-0.00438596</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Body Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.BodySmall" parent="TextAppearance.AppCompat.Caption">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
+  <!-- Display Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.DisplayMedium" parent="TextAppearance.AppCompat.Display2">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">12sp</item>
-    <item name="android:letterSpacing">0.03333333</item>
+    <item name="android:textSize">45sp</item>
+    <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Body Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.BodyMedium" parent="TextAppearance.AppCompat.Body1">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
+  <!-- Display Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.DisplaySmall" parent="TextAppearance.AppCompat.Display1">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">14sp</item>
-    <item name="android:letterSpacing">0.01785714</item>
+    <item name="android:textSize">36sp</item>
+    <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Label Large -->
-  <style name="TextAppearance.M3.Sys.Typescale.LabelLarge" parent="TextAppearance.AppCompat.Body1">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
+  <!-- Headline Large -->
+  <style name="TextAppearance.M3.Sys.Typescale.HeadlineLarge" parent="TextAppearance.AppCompat.Display1">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">14sp</item>
-    <item name="android:letterSpacing">0.00714286</item>
+    <item name="android:textSize">32sp</item>
+    <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Label Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.LabelSmall" parent="TextAppearance.AppCompat.Caption">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
+  <!-- Headline Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.HeadlineMedium" parent="TextAppearance.AppCompat.Headline">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">11sp</item>
-    <item name="android:letterSpacing">0.04545455</item>
+    <item name="android:textSize">28sp</item>
+    <item name="android:letterSpacing">0</item>
+    <item name="android:textAllCaps">false</item>
+  </style>
+  <!-- Headline Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.HeadlineSmall" parent="TextAppearance.AppCompat.Title">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:textStyle">normal</item>
+    <item name="android:textSize">24sp</item>
+    <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Title Large -->
@@ -73,94 +82,85 @@
     <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Title Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.TitleSmall" parent="TextAppearance.AppCompat.Subhead">
+  <!-- Title Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.TitleMedium" parent="TextAppearance.AppCompat.Subhead">
     <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">14sp</item>
-    <item name="android:letterSpacing">0.00714286</item>
+    <item name="android:textSize">16sp</item>
+    <item name="android:letterSpacing">0.009375</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Label Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.LabelMedium" parent="TextAppearance.AppCompat.Caption">
+  <!-- Title Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.TitleSmall" parent="TextAppearance.AppCompat.Subhead">
     <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">12sp</item>
-    <item name="android:letterSpacing">0.04166667</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:letterSpacing">0.00714286</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Title Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.TitleMedium" parent="TextAppearance.AppCompat.Subhead">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
+  <!-- Body Large -->
+  <style name="TextAppearance.M3.Sys.Typescale.BodyLarge" parent="TextAppearance.AppCompat.Body2">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">16sp</item>
-    <item name="android:letterSpacing">0.009375</item>
-    <item name="android:textAllCaps">false</item>
-  </style>
-  <!-- Display Large -->
-  <style name="TextAppearance.M3.Sys.Typescale.DisplayLarge" parent="TextAppearance.AppCompat.Display3">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:textStyle">normal</item>
-    <item name="android:textSize">57sp</item>
-    <item name="android:letterSpacing">-0.00438596</item>
+    <item name="android:letterSpacing">0.03125</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Display Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.DisplaySmall" parent="TextAppearance.AppCompat.Display1">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+  <!-- Body Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.BodyMedium" parent="TextAppearance.AppCompat.Body1">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">36sp</item>
-    <item name="android:letterSpacing">0</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:letterSpacing">0.01785714</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Display Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.DisplayMedium" parent="TextAppearance.AppCompat.Display2">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+  <!-- Body Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.BodySmall" parent="TextAppearance.AppCompat.Caption">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">45sp</item>
-    <item name="android:letterSpacing">0</item>
+    <item name="android:textSize">12sp</item>
+    <item name="android:letterSpacing">0.03333333</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Headline Large -->
-  <style name="TextAppearance.M3.Sys.Typescale.HeadlineLarge" parent="TextAppearance.AppCompat.Display1">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+  <!-- Label Large -->
+  <style name="TextAppearance.M3.Sys.Typescale.LabelLarge" parent="TextAppearance.AppCompat.Body1">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">32sp</item>
-    <item name="android:letterSpacing">0</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:letterSpacing">0.00714286</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Headline Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.HeadlineSmall" parent="TextAppearance.AppCompat.Title">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+  <!-- Label Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.LabelMedium" parent="TextAppearance.AppCompat.Caption">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">24sp</item>
-    <item name="android:letterSpacing">0</item>
+    <item name="android:textSize">12sp</item>
+    <item name="android:letterSpacing">0.04166667</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Headline Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.HeadlineMedium" parent="TextAppearance.AppCompat.Headline">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+  <!-- Label Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.LabelSmall" parent="TextAppearance.AppCompat.Caption">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">28sp</item>
-    <item name="android:letterSpacing">0</item>
+    <item name="android:textSize">11sp</item>
+    <item name="android:letterSpacing">0.04545455</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Generated from token set (md.ref.typeface) in context (audience=3p). -->
+  <!-- Deprecated tokens -->
+  <string name="m3_ref_typeface_brand_display_regular" translatable="false">sans-serif</string>
   <!-- Brand -->
-  <string name="m3_ref_typeface_brand_medium" translatable="false">sans-serif-medium</string>
   <string name="m3_ref_typeface_brand_regular" translatable="false">sans-serif</string>
+  <string name="m3_ref_typeface_brand_medium" translatable="false">sans-serif-medium</string>
   <!-- Plain -->
-  <string name="m3_ref_typeface_plain_medium" translatable="false">sans-serif-medium</string>
   <string name="m3_ref_typeface_plain_regular" translatable="false">sans-serif</string>
-  <!-- Deprecated tokens -->
-  <string name="m3_ref_typeface_brand_display_regular" translatable="false">sans-serif</string>
+  <string name="m3_ref_typeface_plain_medium" translatable="false">sans-serif-medium</string>
 </resources>
diff --git a/lib/java/com/google/android/material/typography/res/values/tokens.xml b/lib/java/com/google/android/material/typography/res/values/tokens.xml
index 73b2201d911..9c4a2f3aa0e 100644
--- a/lib/java/com/google/android/material/typography/res/values/tokens.xml
+++ b/lib/java/com/google/android/material/typography/res/values/tokens.xml
@@ -19,51 +19,58 @@
 
 <resources>
   <!-- Generated from token set (md.sys.typescale) in default context. -->
-  <!-- Body Large -->
-  <style name="TextAppearance.M3.Sys.Typescale.BodyLarge" parent="TextAppearance.AppCompat.Body2">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
+  <!-- Display Large -->
+  <style name="TextAppearance.M3.Sys.Typescale.DisplayLarge" parent="TextAppearance.AppCompat.Display3">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">16sp</item>
-    <item name="android:letterSpacing">0.03125</item>
+    <item name="android:textSize">57sp</item>
+    <item name="android:letterSpacing">-0.00438596</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Body Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.BodySmall" parent="TextAppearance.AppCompat.Caption">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
+  <!-- Display Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.DisplayMedium" parent="TextAppearance.AppCompat.Display2">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">12sp</item>
-    <item name="android:letterSpacing">0.03333333</item>
+    <item name="android:textSize">45sp</item>
+    <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Body Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.BodyMedium" parent="TextAppearance.AppCompat.Body1">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
+  <!-- Display Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.DisplaySmall" parent="TextAppearance.AppCompat.Display1">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">14sp</item>
-    <item name="android:letterSpacing">0.01785714</item>
+    <item name="android:textSize">36sp</item>
+    <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Label Large -->
-  <style name="TextAppearance.M3.Sys.Typescale.LabelLarge" parent="TextAppearance.AppCompat.Body1">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
-    <!-- Roboto Medium isn't available in pre-21. Setting text style to bold to achieve some level of bolding. -->
-    <item name="android:textStyle">bold</item>
-    <item name="android:textSize">14sp</item>
-    <item name="android:letterSpacing">0.00714286</item>
+  <!-- Headline Large -->
+  <style name="TextAppearance.M3.Sys.Typescale.HeadlineLarge" parent="TextAppearance.AppCompat.Display1">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:textStyle">normal</item>
+    <item name="android:textSize">32sp</item>
+    <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Label Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.LabelSmall" parent="TextAppearance.AppCompat.Caption">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
-    <!-- Roboto Medium isn't available in pre-21. Setting text style to bold to achieve some level of bolding. -->
-    <item name="android:textStyle">bold</item>
-    <item name="android:textSize">11sp</item>
-    <item name="android:letterSpacing">0.04545455</item>
+  <!-- Headline Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.HeadlineMedium" parent="TextAppearance.AppCompat.Headline">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:textStyle">normal</item>
+    <item name="android:textSize">28sp</item>
+    <item name="android:letterSpacing">0</item>
+    <item name="android:textAllCaps">false</item>
+  </style>
+  <!-- Headline Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.HeadlineSmall" parent="TextAppearance.AppCompat.Title">
+    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+    <item name="android:textStyle">normal</item>
+    <item name="android:textSize">24sp</item>
+    <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Title Large -->
@@ -75,97 +82,90 @@
     <item name="android:letterSpacing">0</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Title Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.TitleSmall" parent="TextAppearance.AppCompat.Subhead">
-    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
-    <!-- Roboto Medium isn't available in pre-21. Setting text style to bold to achieve some level of bolding. -->
-    <item name="android:textStyle">bold</item>
-    <item name="android:textSize">14sp</item>
-    <item name="android:letterSpacing">0.00714286</item>
-    <item name="android:textAllCaps">false</item>
-  </style>
-  <!-- Label Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.LabelMedium" parent="TextAppearance.AppCompat.Caption">
+  <!-- Title Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.TitleMedium" parent="TextAppearance.AppCompat.Subhead">
     <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <!-- Roboto Medium isn't available in pre-21. Setting text style to bold to achieve some level of bolding. -->
     <item name="android:textStyle">bold</item>
-    <item name="android:textSize">12sp</item>
-    <item name="android:letterSpacing">0.04166667</item>
+    <item name="android:textSize">16sp</item>
+    <item name="android:letterSpacing">0.009375</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Title Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.TitleMedium" parent="TextAppearance.AppCompat.Subhead">
+  <!-- Title Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.TitleSmall" parent="TextAppearance.AppCompat.Subhead">
     <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
     <!-- Roboto Medium isn't available in pre-21. Setting text style to bold to achieve some level of bolding. -->
     <item name="android:textStyle">bold</item>
-    <item name="android:textSize">16sp</item>
-    <item name="android:letterSpacing">0.009375</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:letterSpacing">0.00714286</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Display Large -->
-  <style name="TextAppearance.M3.Sys.Typescale.DisplayLarge" parent="TextAppearance.AppCompat.Display3">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+  <!-- Body Large -->
+  <style name="TextAppearance.M3.Sys.Typescale.BodyLarge" parent="TextAppearance.AppCompat.Body2">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">57sp</item>
-    <item name="android:letterSpacing">-0.00438596</item>
+    <item name="android:textSize">16sp</item>
+    <item name="android:letterSpacing">0.03125</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Display Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.DisplaySmall" parent="TextAppearance.AppCompat.Display1">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+  <!-- Body Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.BodyMedium" parent="TextAppearance.AppCompat.Body1">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">36sp</item>
-    <item name="android:letterSpacing">0</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:letterSpacing">0.01785714</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Display Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.DisplayMedium" parent="TextAppearance.AppCompat.Display2">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
+  <!-- Body Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.BodySmall" parent="TextAppearance.AppCompat.Caption">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>
     <item name="android:textStyle">normal</item>
-    <item name="android:textSize">45sp</item>
-    <item name="android:letterSpacing">0</item>
+    <item name="android:textSize">12sp</item>
+    <item name="android:letterSpacing">0.03333333</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Headline Large -->
-  <style name="TextAppearance.M3.Sys.Typescale.HeadlineLarge" parent="TextAppearance.AppCompat.Display1">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:textStyle">normal</item>
-    <item name="android:textSize">32sp</item>
-    <item name="android:letterSpacing">0</item>
+  <!-- Label Large -->
+  <style name="TextAppearance.M3.Sys.Typescale.LabelLarge" parent="TextAppearance.AppCompat.Body1">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
+    <!-- Roboto Medium isn't available in pre-21. Setting text style to bold to achieve some level of bolding. -->
+    <item name="android:textStyle">bold</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:letterSpacing">0.00714286</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Headline Small -->
-  <style name="TextAppearance.M3.Sys.Typescale.HeadlineSmall" parent="TextAppearance.AppCompat.Title">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:textStyle">normal</item>
-    <item name="android:textSize">24sp</item>
-    <item name="android:letterSpacing">0</item>
+  <!-- Label Medium -->
+  <style name="TextAppearance.M3.Sys.Typescale.LabelMedium" parent="TextAppearance.AppCompat.Caption">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
+    <!-- Roboto Medium isn't available in pre-21. Setting text style to bold to achieve some level of bolding. -->
+    <item name="android:textStyle">bold</item>
+    <item name="android:textSize">12sp</item>
+    <item name="android:letterSpacing">0.04166667</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Headline Medium -->
-  <style name="TextAppearance.M3.Sys.Typescale.HeadlineMedium" parent="TextAppearance.AppCompat.Headline">
-    <item name="fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:fontFamily">@string/m3_ref_typeface_brand_regular</item>
-    <item name="android:textStyle">normal</item>
-    <item name="android:textSize">28sp</item>
-    <item name="android:letterSpacing">0</item>
+  <!-- Label Small -->
+  <style name="TextAppearance.M3.Sys.Typescale.LabelSmall" parent="TextAppearance.AppCompat.Caption">
+    <item name="fontFamily">@string/m3_ref_typeface_plain_medium</item>
+    <item name="android:fontFamily">@string/m3_ref_typeface_plain_medium</item>
+    <!-- Roboto Medium isn't available in pre-21. Setting text style to bold to achieve some level of bolding. -->
+    <item name="android:textStyle">bold</item>
+    <item name="android:textSize">11sp</item>
+    <item name="android:letterSpacing">0.04545455</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Generated from token set (md.ref.typeface) in context (audience=3p). -->
+  <!-- Deprecated tokens -->
+  <string name="m3_ref_typeface_brand_display_regular" translatable="false">sans-serif</string>
   <!-- Brand -->
-  <string name="m3_ref_typeface_brand_medium" translatable="false">sans-serif-medium</string>
   <string name="m3_ref_typeface_brand_regular" translatable="false">sans-serif</string>
+  <string name="m3_ref_typeface_brand_medium" translatable="false">sans-serif-medium</string>
   <!-- Plain -->
-  <string name="m3_ref_typeface_plain_medium" translatable="false">sans-serif-medium</string>
   <string name="m3_ref_typeface_plain_regular" translatable="false">sans-serif</string>
-  <!-- Deprecated tokens -->
-  <string name="m3_ref_typeface_brand_display_regular" translatable="false">sans-serif</string>
+  <string name="m3_ref_typeface_plain_medium" translatable="false">sans-serif-medium</string>
 </resources>