diff --git a/dev/tools/gen_defaults/data/badge.json b/dev/tools/gen_defaults/data/badge.json
index 06ca3ef707..3207fd9b09 100644
--- a/dev/tools/gen_defaults/data/badge.json
+++ b/dev/tools/gen_defaults/data/badge.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.badge.color": "error",
   "md.comp.badge.large.color": "error",
diff --git a/dev/tools/gen_defaults/data/banner.json b/dev/tools/gen_defaults/data/banner.json
index 34077c6eae..93fda14671 100644
--- a/dev/tools/gen_defaults/data/banner.json
+++ b/dev/tools/gen_defaults/data/banner.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.banner.container.color": "surfaceContainerLow",
   "md.comp.banner.container.elevation": "md.sys.elevation.level1",
diff --git a/dev/tools/gen_defaults/data/bottom_app_bar.json b/dev/tools/gen_defaults/data/bottom_app_bar.json
index 7270ab747e..70b7237566 100644
--- a/dev/tools/gen_defaults/data/bottom_app_bar.json
+++ b/dev/tools/gen_defaults/data/bottom_app_bar.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.bottom-app-bar.container.color": "surfaceContainer",
   "md.comp.bottom-app-bar.container.elevation": "md.sys.elevation.level2",
diff --git a/dev/tools/gen_defaults/data/button_elevated.json b/dev/tools/gen_defaults/data/button_elevated.json
index 88a9708a9f..030784a6e3 100644
--- a/dev/tools/gen_defaults/data/button_elevated.json
+++ b/dev/tools/gen_defaults/data/button_elevated.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.elevated-button.container.color": "surfaceContainerLow",
   "md.comp.elevated-button.container.elevation": "md.sys.elevation.level1",
diff --git a/dev/tools/gen_defaults/data/button_filled.json b/dev/tools/gen_defaults/data/button_filled.json
index b0e5b01d4d..67826b8461 100644
--- a/dev/tools/gen_defaults/data/button_filled.json
+++ b/dev/tools/gen_defaults/data/button_filled.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.filled-button.container.color": "primary",
   "md.comp.filled-button.container.elevation": "md.sys.elevation.level0",
diff --git a/dev/tools/gen_defaults/data/button_filled_tonal.json b/dev/tools/gen_defaults/data/button_filled_tonal.json
index a084860e3e..092c68c3a3 100644
--- a/dev/tools/gen_defaults/data/button_filled_tonal.json
+++ b/dev/tools/gen_defaults/data/button_filled_tonal.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.filled-tonal-button.container.color": "secondaryContainer",
   "md.comp.filled-tonal-button.container.elevation": "md.sys.elevation.level0",
diff --git a/dev/tools/gen_defaults/data/button_outlined.json b/dev/tools/gen_defaults/data/button_outlined.json
index ffe6b2b05e..a7cf4f5f67 100644
--- a/dev/tools/gen_defaults/data/button_outlined.json
+++ b/dev/tools/gen_defaults/data/button_outlined.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.outlined-button.container.height": 40.0,
   "md.comp.outlined-button.container.shape": "md.sys.shape.corner.full",
diff --git a/dev/tools/gen_defaults/data/button_text.json b/dev/tools/gen_defaults/data/button_text.json
index 24d527cb37..ca199d7067 100644
--- a/dev/tools/gen_defaults/data/button_text.json
+++ b/dev/tools/gen_defaults/data/button_text.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.text-button.container.height": 40.0,
   "md.comp.text-button.container.shape": "md.sys.shape.corner.full",
diff --git a/dev/tools/gen_defaults/data/card_elevated.json b/dev/tools/gen_defaults/data/card_elevated.json
index 7178e188dd..198853d630 100644
--- a/dev/tools/gen_defaults/data/card_elevated.json
+++ b/dev/tools/gen_defaults/data/card_elevated.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.elevated-card.container.color": "surfaceContainerLow",
   "md.comp.elevated-card.container.elevation": "md.sys.elevation.level1",
diff --git a/dev/tools/gen_defaults/data/card_filled.json b/dev/tools/gen_defaults/data/card_filled.json
index aaba4abc25..297bf7f43f 100644
--- a/dev/tools/gen_defaults/data/card_filled.json
+++ b/dev/tools/gen_defaults/data/card_filled.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.filled-card.container.color": "surfaceContainerHighest",
   "md.comp.filled-card.container.elevation": "md.sys.elevation.level0",
diff --git a/dev/tools/gen_defaults/data/card_outlined.json b/dev/tools/gen_defaults/data/card_outlined.json
index e257d4759d..6c2697ca7d 100644
--- a/dev/tools/gen_defaults/data/card_outlined.json
+++ b/dev/tools/gen_defaults/data/card_outlined.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.outlined-card.container.color": "surface",
   "md.comp.outlined-card.container.elevation": "md.sys.elevation.level0",
diff --git a/dev/tools/gen_defaults/data/carousel_item.json b/dev/tools/gen_defaults/data/carousel_item.json
index 397356ee7a..7a48e0dd52 100644
--- a/dev/tools/gen_defaults/data/carousel_item.json
+++ b/dev/tools/gen_defaults/data/carousel_item.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.carousel-item.container.color": "surface",
   "md.comp.carousel-item.container.elevation": "md.sys.elevation.level0",
diff --git a/dev/tools/gen_defaults/data/checkbox.json b/dev/tools/gen_defaults/data/checkbox.json
index a6432de2fc..fcf0ea588f 100644
--- a/dev/tools/gen_defaults/data/checkbox.json
+++ b/dev/tools/gen_defaults/data/checkbox.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.checkbox.container.size": 18.0,
   "md.comp.checkbox.error.focus.state-layer.color": "error",
diff --git a/dev/tools/gen_defaults/data/chip_assist.json b/dev/tools/gen_defaults/data/chip_assist.json
index b8ecc620f9..5e9fab3db4 100644
--- a/dev/tools/gen_defaults/data/chip_assist.json
+++ b/dev/tools/gen_defaults/data/chip_assist.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.assist-chip.container.height": 32.0,
   "md.comp.assist-chip.container.shape": "md.sys.shape.corner.small",
diff --git a/dev/tools/gen_defaults/data/chip_filter.json b/dev/tools/gen_defaults/data/chip_filter.json
index 7d351069ee..99129066a1 100644
--- a/dev/tools/gen_defaults/data/chip_filter.json
+++ b/dev/tools/gen_defaults/data/chip_filter.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.filter-chip.container.height": 32.0,
   "md.comp.filter-chip.container.shape": "md.sys.shape.corner.small",
diff --git a/dev/tools/gen_defaults/data/chip_input.json b/dev/tools/gen_defaults/data/chip_input.json
index 80b42b47dd..b87f3aa40d 100644
--- a/dev/tools/gen_defaults/data/chip_input.json
+++ b/dev/tools/gen_defaults/data/chip_input.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.input-chip.container.elevation": "md.sys.elevation.level0",
   "md.comp.input-chip.container.height": 32.0,
diff --git a/dev/tools/gen_defaults/data/chip_suggestion.json b/dev/tools/gen_defaults/data/chip_suggestion.json
index e9c1ecb139..4972a4a359 100644
--- a/dev/tools/gen_defaults/data/chip_suggestion.json
+++ b/dev/tools/gen_defaults/data/chip_suggestion.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.suggestion-chip.container.height": 32.0,
   "md.comp.suggestion-chip.container.shape": "md.sys.shape.corner.small",
diff --git a/dev/tools/gen_defaults/data/color_dark.json b/dev/tools/gen_defaults/data/color_dark.json
index bed87ae9cb..5994b26e1e 100644
--- a/dev/tools/gen_defaults/data/color_dark.json
+++ b/dev/tools/gen_defaults/data/color_dark.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.sys.color.background": "md.ref.palette.neutral6",
   "md.sys.color.error": "md.ref.palette.error80",
diff --git a/dev/tools/gen_defaults/data/color_light.json b/dev/tools/gen_defaults/data/color_light.json
index 5ca7bdcb2a..ce24e5d2bc 100644
--- a/dev/tools/gen_defaults/data/color_light.json
+++ b/dev/tools/gen_defaults/data/color_light.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.sys.color.background": "md.ref.palette.neutral98",
   "md.sys.color.error": "md.ref.palette.error40",
diff --git a/dev/tools/gen_defaults/data/date_picker_docked.json b/dev/tools/gen_defaults/data/date_picker_docked.json
index a8812e7587..1b7615d186 100644
--- a/dev/tools/gen_defaults/data/date_picker_docked.json
+++ b/dev/tools/gen_defaults/data/date_picker_docked.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.date-picker.docked.container.color": "surfaceContainerHigh",
   "md.comp.date-picker.docked.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/date_picker_input_modal.json b/dev/tools/gen_defaults/data/date_picker_input_modal.json
index 96c9bf21fe..932487c1e4 100644
--- a/dev/tools/gen_defaults/data/date_picker_input_modal.json
+++ b/dev/tools/gen_defaults/data/date_picker_input_modal.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.date-input.modal.container.color": "surfaceContainerHigh",
   "md.comp.date-input.modal.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/date_picker_modal.json b/dev/tools/gen_defaults/data/date_picker_modal.json
index 259bd8fad3..9bcfc0cc8d 100644
--- a/dev/tools/gen_defaults/data/date_picker_modal.json
+++ b/dev/tools/gen_defaults/data/date_picker_modal.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.date-picker.modal.container.color": "surfaceContainerHigh",
   "md.comp.date-picker.modal.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/dialog.json b/dev/tools/gen_defaults/data/dialog.json
index 579f2b5379..73dffb6d71 100644
--- a/dev/tools/gen_defaults/data/dialog.json
+++ b/dev/tools/gen_defaults/data/dialog.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.dialog.action.focus.label-text.color": "primary",
   "md.comp.dialog.action.focus.state-layer.color": "primary",
diff --git a/dev/tools/gen_defaults/data/dialog_fullscreen.json b/dev/tools/gen_defaults/data/dialog_fullscreen.json
index 66d898d757..937ef818fe 100644
--- a/dev/tools/gen_defaults/data/dialog_fullscreen.json
+++ b/dev/tools/gen_defaults/data/dialog_fullscreen.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.full-screen-dialog.container.color": "surface",
   "md.comp.full-screen-dialog.container.elevation": "md.sys.elevation.level0",
diff --git a/dev/tools/gen_defaults/data/divider.json b/dev/tools/gen_defaults/data/divider.json
index 58fc139146..d710ec7db9 100644
--- a/dev/tools/gen_defaults/data/divider.json
+++ b/dev/tools/gen_defaults/data/divider.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.divider.color": "outlineVariant",
   "md.comp.divider.thickness": 1.0
diff --git a/dev/tools/gen_defaults/data/elevation.json b/dev/tools/gen_defaults/data/elevation.json
index 365b6a18e7..36eaa83ce0 100644
--- a/dev/tools/gen_defaults/data/elevation.json
+++ b/dev/tools/gen_defaults/data/elevation.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.sys.elevation.level0": 0.0,
   "md.sys.elevation.level1": 1.0,
diff --git a/dev/tools/gen_defaults/data/fab_extended_primary.json b/dev/tools/gen_defaults/data/fab_extended_primary.json
index 3214de7620..f292cb4e2a 100644
--- a/dev/tools/gen_defaults/data/fab_extended_primary.json
+++ b/dev/tools/gen_defaults/data/fab_extended_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.extended-fab.primary.container.color": "primaryContainer",
   "md.comp.extended-fab.primary.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/fab_large_primary.json b/dev/tools/gen_defaults/data/fab_large_primary.json
index aadbb96d1d..dff62d37c0 100644
--- a/dev/tools/gen_defaults/data/fab_large_primary.json
+++ b/dev/tools/gen_defaults/data/fab_large_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.fab.primary.large.container.color": "primaryContainer",
   "md.comp.fab.primary.large.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/fab_primary.json b/dev/tools/gen_defaults/data/fab_primary.json
index 82da7e3b76..514aa72dad 100644
--- a/dev/tools/gen_defaults/data/fab_primary.json
+++ b/dev/tools/gen_defaults/data/fab_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.fab.primary.container.color": "primaryContainer",
   "md.comp.fab.primary.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/fab_small_primary.json b/dev/tools/gen_defaults/data/fab_small_primary.json
index 03aa08f2ff..ceedc57c3b 100644
--- a/dev/tools/gen_defaults/data/fab_small_primary.json
+++ b/dev/tools/gen_defaults/data/fab_small_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.fab.primary.small.container.color": "primaryContainer",
   "md.comp.fab.primary.small.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/icon_button.json b/dev/tools/gen_defaults/data/icon_button.json
index 187f534a32..1d7ffcebf8 100644
--- a/dev/tools/gen_defaults/data/icon_button.json
+++ b/dev/tools/gen_defaults/data/icon_button.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.icon-button.disabled.icon.color": "onSurface",
   "md.comp.icon-button.disabled.icon.opacity": 0.38,
diff --git a/dev/tools/gen_defaults/data/icon_button_filled.json b/dev/tools/gen_defaults/data/icon_button_filled.json
index 8d827d7592..a2f694432d 100644
--- a/dev/tools/gen_defaults/data/icon_button_filled.json
+++ b/dev/tools/gen_defaults/data/icon_button_filled.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.filled-icon-button.container.color": "primary",
   "md.comp.filled-icon-button.container.height": 40.0,
diff --git a/dev/tools/gen_defaults/data/icon_button_filled_tonal.json b/dev/tools/gen_defaults/data/icon_button_filled_tonal.json
index 9b02d06135..8bb53c805d 100644
--- a/dev/tools/gen_defaults/data/icon_button_filled_tonal.json
+++ b/dev/tools/gen_defaults/data/icon_button_filled_tonal.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.filled-tonal-icon-button.container.color": "secondaryContainer",
   "md.comp.filled-tonal-icon-button.container.height": 40.0,
diff --git a/dev/tools/gen_defaults/data/icon_button_outlined.json b/dev/tools/gen_defaults/data/icon_button_outlined.json
index 2edf60d22e..1a5a468efa 100644
--- a/dev/tools/gen_defaults/data/icon_button_outlined.json
+++ b/dev/tools/gen_defaults/data/icon_button_outlined.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.outlined-icon-button.container.height": 40.0,
   "md.comp.outlined-icon-button.container.shape": "md.sys.shape.corner.full",
diff --git a/dev/tools/gen_defaults/data/list.json b/dev/tools/gen_defaults/data/list.json
index 442b203d52..391869ecb0 100644
--- a/dev/tools/gen_defaults/data/list.json
+++ b/dev/tools/gen_defaults/data/list.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.list.divider.leading-space": 16.0,
   "md.comp.list.divider.trailing-space": 16.0,
diff --git a/dev/tools/gen_defaults/data/menu.json b/dev/tools/gen_defaults/data/menu.json
index 76cb65cd0e..608dde4514 100644
--- a/dev/tools/gen_defaults/data/menu.json
+++ b/dev/tools/gen_defaults/data/menu.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.menu.container.color": "surfaceContainer",
   "md.comp.menu.container.elevation": "md.sys.elevation.level2",
diff --git a/dev/tools/gen_defaults/data/motion.json b/dev/tools/gen_defaults/data/motion.json
index 4b708de7ea..158b2d0627 100644
--- a/dev/tools/gen_defaults/data/motion.json
+++ b/dev/tools/gen_defaults/data/motion.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.sys.motion.duration.extra-long1Ms": 700.0,
   "md.sys.motion.duration.extra-long2Ms": 800.0,
diff --git a/dev/tools/gen_defaults/data/navigation_bar.json b/dev/tools/gen_defaults/data/navigation_bar.json
index 7803d9fdf4..487e4bfc06 100644
--- a/dev/tools/gen_defaults/data/navigation_bar.json
+++ b/dev/tools/gen_defaults/data/navigation_bar.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.navigation-bar.active.focus.icon.color": "onSecondaryContainer",
   "md.comp.navigation-bar.active.focus.label-text.color": "onSurface",
diff --git a/dev/tools/gen_defaults/data/navigation_drawer.json b/dev/tools/gen_defaults/data/navigation_drawer.json
index 6eda37d009..c3405a1fda 100644
--- a/dev/tools/gen_defaults/data/navigation_drawer.json
+++ b/dev/tools/gen_defaults/data/navigation_drawer.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.navigation-drawer.active.focus.icon.color": "onSecondaryContainer",
   "md.comp.navigation-drawer.active.focus.label-text.color": "onSecondaryContainer",
diff --git a/dev/tools/gen_defaults/data/navigation_rail.json b/dev/tools/gen_defaults/data/navigation_rail.json
index f58bd1ae5b..b3f3e08a48 100644
--- a/dev/tools/gen_defaults/data/navigation_rail.json
+++ b/dev/tools/gen_defaults/data/navigation_rail.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.navigation-rail.active.focus.icon.color": "onSecondaryContainer",
   "md.comp.navigation-rail.active.focus.label-text.color": "onSurface",
diff --git a/dev/tools/gen_defaults/data/navigation_tab_primary.json b/dev/tools/gen_defaults/data/navigation_tab_primary.json
index d3873d1773..44f4d67c04 100644
--- a/dev/tools/gen_defaults/data/navigation_tab_primary.json
+++ b/dev/tools/gen_defaults/data/navigation_tab_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.primary-navigation-tab.active.focus.state-layer.color": "primary",
   "md.comp.primary-navigation-tab.active.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
diff --git a/dev/tools/gen_defaults/data/navigation_tab_secondary.json b/dev/tools/gen_defaults/data/navigation_tab_secondary.json
index 3b172c5728..e52e8636e8 100644
--- a/dev/tools/gen_defaults/data/navigation_tab_secondary.json
+++ b/dev/tools/gen_defaults/data/navigation_tab_secondary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.secondary-navigation-tab.active-indicator.color": "primary",
   "md.comp.secondary-navigation-tab.active-indicator.height": 2.0,
diff --git a/dev/tools/gen_defaults/data/palette.json b/dev/tools/gen_defaults/data/palette.json
index 89fe3ef8ad..b43a47159d 100644
--- a/dev/tools/gen_defaults/data/palette.json
+++ b/dev/tools/gen_defaults/data/palette.json
@@ -1,7 +1,46 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.ref.palette.black": "0xFF000000",
+  "md.ref.palette.blue0": "0xFF000000",
+  "md.ref.palette.blue10": "0xFF001944",
+  "md.ref.palette.blue100": "0xFFFFFFFF",
+  "md.ref.palette.blue20": "0xFF012C6F",
+  "md.ref.palette.blue30": "0xFF04409F",
+  "md.ref.palette.blue40": "0xFF1157CE",
+  "md.ref.palette.blue50": "0xFF3271EA",
+  "md.ref.palette.blue60": "0xFF4E8FF8",
+  "md.ref.palette.blue70": "0xFF76ACFF",
+  "md.ref.palette.blue80": "0xFFA1C9FF",
+  "md.ref.palette.blue90": "0xFFD0E4FF",
+  "md.ref.palette.blue95": "0xFFE7F2FF",
+  "md.ref.palette.blue98": "0xFFF5FAFF",
+  "md.ref.palette.blue-variant0": "0xFF000000",
+  "md.ref.palette.blue-variant10": "0xFF001F2D",
+  "md.ref.palette.blue-variant100": "0xFFFFFFFF",
+  "md.ref.palette.blue-variant20": "0xFF003549",
+  "md.ref.palette.blue-variant30": "0xFF004D68",
+  "md.ref.palette.blue-variant40": "0xFF006788",
+  "md.ref.palette.blue-variant50": "0xFF0081A8",
+  "md.ref.palette.blue-variant60": "0xFF009DC9",
+  "md.ref.palette.blue-variant70": "0xFF00BBEA",
+  "md.ref.palette.blue-variant80": "0xFF67D4FF",
+  "md.ref.palette.blue-variant90": "0xFFBDE9FF",
+  "md.ref.palette.blue-variant95": "0xFFE0F4FF",
+  "md.ref.palette.blue-variant98": "0xFFF4FAFF",
+  "md.ref.palette.cyan0": "0xFF000000",
+  "md.ref.palette.cyan10": "0xFF001F26",
+  "md.ref.palette.cyan100": "0xFFFFFFFF",
+  "md.ref.palette.cyan20": "0xFF003641",
+  "md.ref.palette.cyan30": "0xFF004E5D",
+  "md.ref.palette.cyan40": "0xFF00687C",
+  "md.ref.palette.cyan50": "0xFF00839B",
+  "md.ref.palette.cyan60": "0xFF009EBB",
+  "md.ref.palette.cyan70": "0xFF00BBDF",
+  "md.ref.palette.cyan80": "0xFF60D5F3",
+  "md.ref.palette.cyan90": "0xFFACEDFF",
+  "md.ref.palette.cyan95": "0xFFD8F6FF",
+  "md.ref.palette.cyan98": "0xFFF0FBFF",
   "md.ref.palette.error0": "0xFF000000",
   "md.ref.palette.error10": "0xFF410E0B",
   "md.ref.palette.error100": "0xFFFFFFFF",
@@ -15,6 +54,45 @@
   "md.ref.palette.error90": "0xFFF9DEDC",
   "md.ref.palette.error95": "0xFFFCEEEE",
   "md.ref.palette.error99": "0xFFFFFBF9",
+  "md.ref.palette.green0": "0xFF000000",
+  "md.ref.palette.green10": "0xFF002110",
+  "md.ref.palette.green100": "0xFFFFFFFF",
+  "md.ref.palette.green20": "0xFF00381F",
+  "md.ref.palette.green30": "0xFF00522C",
+  "md.ref.palette.green40": "0xFF006C35",
+  "md.ref.palette.green50": "0xFF128937",
+  "md.ref.palette.green60": "0xFF1AA64A",
+  "md.ref.palette.green70": "0xFF44C265",
+  "md.ref.palette.green80": "0xFF80DA88",
+  "md.ref.palette.green90": "0xFFBEEFBB",
+  "md.ref.palette.green95": "0xFFDDF8D8",
+  "md.ref.palette.green98": "0xFFF2FCEF",
+  "md.ref.palette.grey0": "0xFF000000",
+  "md.ref.palette.grey10": "0xFF1B1B1C",
+  "md.ref.palette.grey100": "0xFFFFFFFF",
+  "md.ref.palette.grey20": "0xFF303030",
+  "md.ref.palette.grey30": "0xFF474747",
+  "md.ref.palette.grey40": "0xFF5E5E5E",
+  "md.ref.palette.grey50": "0xFF777777",
+  "md.ref.palette.grey60": "0xFF919191",
+  "md.ref.palette.grey70": "0xFFABABAB",
+  "md.ref.palette.grey80": "0xFFC7C7C7",
+  "md.ref.palette.grey90": "0xFFE3E3E3",
+  "md.ref.palette.grey95": "0xFFF2F2F2",
+  "md.ref.palette.grey98": "0xFFF9F9F9",
+  "md.ref.palette.grey-variant0": "0xFF000000",
+  "md.ref.palette.grey-variant10": "0xFF191D1C",
+  "md.ref.palette.grey-variant100": "0xFFFFFFFF",
+  "md.ref.palette.grey-variant20": "0xFF2D312F",
+  "md.ref.palette.grey-variant30": "0xFF444746",
+  "md.ref.palette.grey-variant40": "0xFF5C5F5E",
+  "md.ref.palette.grey-variant50": "0xFF747775",
+  "md.ref.palette.grey-variant60": "0xFF8E918F",
+  "md.ref.palette.grey-variant70": "0xFFA9ACAA",
+  "md.ref.palette.grey-variant80": "0xFFC4C7C5",
+  "md.ref.palette.grey-variant90": "0xFFE1E3E1",
+  "md.ref.palette.grey-variant95": "0xFFEFF2EF",
+  "md.ref.palette.grey-variant98": "0xFFF7FAF7",
   "md.ref.palette.neutral0": "0xFF000000",
   "md.ref.palette.neutral10": "0xFF1D1B20",
   "md.ref.palette.neutral100": "0xFFFFFFFF",
@@ -52,6 +130,32 @@
   "md.ref.palette.neutral-variant90": "0xFFE7E0EC",
   "md.ref.palette.neutral-variant95": "0xFFF5EEFA",
   "md.ref.palette.neutral-variant99": "0xFFFFFBFE",
+  "md.ref.palette.orange0": "0xFF000000",
+  "md.ref.palette.orange10": "0xFF321200",
+  "md.ref.palette.orange100": "0xFFFFFFFF",
+  "md.ref.palette.orange20": "0xFF522302",
+  "md.ref.palette.orange30": "0xFF753403",
+  "md.ref.palette.orange40": "0xFF9A4600",
+  "md.ref.palette.orange50": "0xFFC05A01",
+  "md.ref.palette.orange60": "0xFFE86E00",
+  "md.ref.palette.orange70": "0xFFFF8D41",
+  "md.ref.palette.orange80": "0xFFFFB683",
+  "md.ref.palette.orange90": "0xFFFFDCC3",
+  "md.ref.palette.orange95": "0xFFFFEDE1",
+  "md.ref.palette.orange98": "0xFFFFF8F4",
+  "md.ref.palette.pink0": "0xFF000000",
+  "md.ref.palette.pink10": "0xFF3D0023",
+  "md.ref.palette.pink100": "0xFFFFFFFF",
+  "md.ref.palette.pink20": "0xFF620438",
+  "md.ref.palette.pink30": "0xFF8D0053",
+  "md.ref.palette.pink40": "0xFFB60D6E",
+  "md.ref.palette.pink50": "0xFFDC258D",
+  "md.ref.palette.pink60": "0xFFF94AAB",
+  "md.ref.palette.pink70": "0xFFFF7DD2",
+  "md.ref.palette.pink80": "0xFFFFAEE4",
+  "md.ref.palette.pink90": "0xFFFFD8EF",
+  "md.ref.palette.pink95": "0xFFFFECF6",
+  "md.ref.palette.pink98": "0xFFFFF7FC",
   "md.ref.palette.primary0": "0xFF000000",
   "md.ref.palette.primary10": "0xFF21005D",
   "md.ref.palette.primary100": "0xFFFFFFFF",
@@ -65,6 +169,32 @@
   "md.ref.palette.primary90": "0xFFEADDFF",
   "md.ref.palette.primary95": "0xFFF6EDFF",
   "md.ref.palette.primary99": "0xFFFFFBFE",
+  "md.ref.palette.purple0": "0xFF000000",
+  "md.ref.palette.purple10": "0xFF280255",
+  "md.ref.palette.purple100": "0xFFFFFFFF",
+  "md.ref.palette.purple20": "0xFF400B84",
+  "md.ref.palette.purple30": "0xFF5629A4",
+  "md.ref.palette.purple40": "0xFF7438D2",
+  "md.ref.palette.purple50": "0xFF9254EA",
+  "md.ref.palette.purple60": "0xFFAD72FF",
+  "md.ref.palette.purple70": "0xFFC597FF",
+  "md.ref.palette.purple80": "0xFFD9BAFD",
+  "md.ref.palette.purple90": "0xFFEEDCFE",
+  "md.ref.palette.purple95": "0xFFF7ECFE",
+  "md.ref.palette.purple98": "0xFFFDF8FF",
+  "md.ref.palette.red0": "0xFF000000",
+  "md.ref.palette.red10": "0xFF3A0907",
+  "md.ref.palette.red100": "0xFFFFFFFF",
+  "md.ref.palette.red20": "0xFF60150F",
+  "md.ref.palette.red30": "0xFF8A1A16",
+  "md.ref.palette.red40": "0xFFB3251E",
+  "md.ref.palette.red50": "0xFFDB372D",
+  "md.ref.palette.red60": "0xFFF55E57",
+  "md.ref.palette.red70": "0xFFFF8983",
+  "md.ref.palette.red80": "0xFFFFB3AE",
+  "md.ref.palette.red90": "0xFFFFDADC",
+  "md.ref.palette.red95": "0xFFFFECEE",
+  "md.ref.palette.red98": "0xFFFFF8F8",
   "md.ref.palette.secondary0": "0xFF000000",
   "md.ref.palette.secondary10": "0xFF1D192B",
   "md.ref.palette.secondary100": "0xFFFFFFFF",
@@ -91,5 +221,18 @@
   "md.ref.palette.tertiary90": "0xFFFFD8E4",
   "md.ref.palette.tertiary95": "0xFFFFECF1",
   "md.ref.palette.tertiary99": "0xFFFFFBFA",
-  "md.ref.palette.white": "0xFFFFFFFF"
+  "md.ref.palette.white": "0xFFFFFFFF",
+  "md.ref.palette.yellow0": "0xFF000000",
+  "md.ref.palette.yellow10": "0xFF2F1400",
+  "md.ref.palette.yellow100": "0xFFFFFFFF",
+  "md.ref.palette.yellow20": "0xFF4D2600",
+  "md.ref.palette.yellow30": "0xFF6D3A01",
+  "md.ref.palette.yellow40": "0xFF8F4E06",
+  "md.ref.palette.yellow50": "0xFFB16300",
+  "md.ref.palette.yellow60": "0xFFD37B00",
+  "md.ref.palette.yellow70": "0xFFEF9800",
+  "md.ref.palette.yellow80": "0xFFFCBD00",
+  "md.ref.palette.yellow90": "0xFFFFE07C",
+  "md.ref.palette.yellow95": "0xFFFFF2B4",
+  "md.ref.palette.yellow98": "0xFFFFFADE"
 }
diff --git a/dev/tools/gen_defaults/data/progress_indicator.json b/dev/tools/gen_defaults/data/progress_indicator.json
new file mode 100644
index 0000000000..c0b3a2dfac
--- /dev/null
+++ b/dev/tools/gen_defaults/data/progress_indicator.json
@@ -0,0 +1,14 @@
+{
+  "version": "v2_3_5",
+
+  "md.comp.progress-indicator.active-indicator.color": "primary",
+  "md.comp.progress-indicator.active-indicator.shape": "md.sys.shape.corner.full",
+  "md.comp.progress-indicator.active-indicator.thickness": 4.0,
+  "md.comp.progress-indicator.active-indicator-track-space": 4.0,
+  "md.comp.progress-indicator.stop-indicator.color": "primary",
+  "md.comp.progress-indicator.stop-indicator.shape": 4.0,
+  "md.comp.progress-indicator.stop-indicator.size": 4.0,
+  "md.comp.progress-indicator.track.color": "secondaryContainer",
+  "md.comp.progress-indicator.track.shape": "md.sys.shape.corner.full",
+  "md.comp.progress-indicator.track.thickness": 4.0
+}
diff --git a/dev/tools/gen_defaults/data/progress_indicator_circular.json b/dev/tools/gen_defaults/data/progress_indicator_circular.json
deleted file mode 100644
index 8af3fbfc9f..0000000000
--- a/dev/tools/gen_defaults/data/progress_indicator_circular.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "version": "v0_206",
-
-  "md.comp.circular-progress-indicator.active-indicator.color": "primary",
-  "md.comp.circular-progress-indicator.active-indicator.shape": "md.sys.shape.corner.none",
-  "md.comp.circular-progress-indicator.active-indicator.width": 4.0,
-  "md.comp.circular-progress-indicator.four-color.active-indicator.four.color": "tertiaryContainer",
-  "md.comp.circular-progress-indicator.four-color.active-indicator.one.color": "primary",
-  "md.comp.circular-progress-indicator.four-color.active-indicator.three.color": "tertiary",
-  "md.comp.circular-progress-indicator.four-color.active-indicator.two.color": "primaryContainer",
-  "md.comp.circular-progress-indicator.size": 48.0
-}
diff --git a/dev/tools/gen_defaults/data/progress_indicator_linear.json b/dev/tools/gen_defaults/data/progress_indicator_linear.json
deleted file mode 100644
index 1f80069d47..0000000000
--- a/dev/tools/gen_defaults/data/progress_indicator_linear.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": "v0_206",
-
-  "md.comp.linear-progress-indicator.active-indicator.color": "primary",
-  "md.comp.linear-progress-indicator.active-indicator.height": 4.0,
-  "md.comp.linear-progress-indicator.active-indicator.shape": "md.sys.shape.corner.none",
-  "md.comp.linear-progress-indicator.four-color.active-indicator.four.color": "tertiaryContainer",
-  "md.comp.linear-progress-indicator.four-color.active-indicator.one.color": "primary",
-  "md.comp.linear-progress-indicator.four-color.active-indicator.three.color": "tertiary",
-  "md.comp.linear-progress-indicator.four-color.active-indicator.two.color": "primaryContainer",
-  "md.comp.linear-progress-indicator.track.color": "surfaceContainerHighest",
-  "md.comp.linear-progress-indicator.track.height": 4.0,
-  "md.comp.linear-progress-indicator.track.shape": "md.sys.shape.corner.none"
-}
diff --git a/dev/tools/gen_defaults/data/radio_button.json b/dev/tools/gen_defaults/data/radio_button.json
index df8cafa024..4abf823de2 100644
--- a/dev/tools/gen_defaults/data/radio_button.json
+++ b/dev/tools/gen_defaults/data/radio_button.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.radio-button.disabled.selected.icon.color": "onSurface",
   "md.comp.radio-button.disabled.selected.icon.opacity": 0.38,
diff --git a/dev/tools/gen_defaults/data/search_bar.json b/dev/tools/gen_defaults/data/search_bar.json
index f329a9c1f4..64c468f3c1 100644
--- a/dev/tools/gen_defaults/data/search_bar.json
+++ b/dev/tools/gen_defaults/data/search_bar.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.search-bar.avatar.shape": "md.sys.shape.corner.full",
   "md.comp.search-bar.avatar.size": 30.0,
diff --git a/dev/tools/gen_defaults/data/search_view.json b/dev/tools/gen_defaults/data/search_view.json
index a53dd32deb..4fc737152a 100644
--- a/dev/tools/gen_defaults/data/search_view.json
+++ b/dev/tools/gen_defaults/data/search_view.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.search-view.container.color": "surfaceContainerHigh",
   "md.comp.search-view.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/segmented_button_outlined.json b/dev/tools/gen_defaults/data/segmented_button_outlined.json
index 8d3488bac5..68d22f83cf 100644
--- a/dev/tools/gen_defaults/data/segmented_button_outlined.json
+++ b/dev/tools/gen_defaults/data/segmented_button_outlined.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.outlined-segmented-button.container.height": 40.0,
   "md.comp.outlined-segmented-button.disabled.icon.color": "onSurface",
diff --git a/dev/tools/gen_defaults/data/shape.json b/dev/tools/gen_defaults/data/shape.json
index 0176c0b06a..6c3a1b6977 100644
--- a/dev/tools/gen_defaults/data/shape.json
+++ b/dev/tools/gen_defaults/data/shape.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.sys.shape.corner.extra-large": {
     "family": "SHAPE_FAMILY_ROUNDED_CORNERS",
diff --git a/dev/tools/gen_defaults/data/sheet_bottom.json b/dev/tools/gen_defaults/data/sheet_bottom.json
index e137916a0e..5b8b3417c3 100644
--- a/dev/tools/gen_defaults/data/sheet_bottom.json
+++ b/dev/tools/gen_defaults/data/sheet_bottom.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.sheet.bottom.docked.container.color": "surfaceContainerLow",
   "md.comp.sheet.bottom.docked.container.shape": "md.sys.shape.corner.extra-large.top",
diff --git a/dev/tools/gen_defaults/data/snackbar.json b/dev/tools/gen_defaults/data/snackbar.json
index e2cfbd2be4..d2eb724542 100644
--- a/dev/tools/gen_defaults/data/snackbar.json
+++ b/dev/tools/gen_defaults/data/snackbar.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.snackbar.action.focus.label-text.color": "inversePrimary",
   "md.comp.snackbar.action.focus.state-layer.color": "inversePrimary",
diff --git a/dev/tools/gen_defaults/data/state.json b/dev/tools/gen_defaults/data/state.json
index 6556e10b77..53274883b4 100644
--- a/dev/tools/gen_defaults/data/state.json
+++ b/dev/tools/gen_defaults/data/state.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.sys.state.dragged.state-layer-opacity": 0.16,
   "md.sys.state.focus.state-layer-opacity": 0.1,
diff --git a/dev/tools/gen_defaults/data/switch.json b/dev/tools/gen_defaults/data/switch.json
index dd45bed57c..cf018bd80c 100644
--- a/dev/tools/gen_defaults/data/switch.json
+++ b/dev/tools/gen_defaults/data/switch.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.switch.disabled.selected.handle.color": "surface",
   "md.comp.switch.disabled.selected.handle.opacity": 1.0,
diff --git a/dev/tools/gen_defaults/data/text_field_filled.json b/dev/tools/gen_defaults/data/text_field_filled.json
index d1eb675662..25a144850d 100644
--- a/dev/tools/gen_defaults/data/text_field_filled.json
+++ b/dev/tools/gen_defaults/data/text_field_filled.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.filled-text-field.active-indicator.color": "onSurfaceVariant",
   "md.comp.filled-text-field.active-indicator.height": 1.0,
diff --git a/dev/tools/gen_defaults/data/text_field_outlined.json b/dev/tools/gen_defaults/data/text_field_outlined.json
index 44d5ae6ad6..3b6ba76fb2 100644
--- a/dev/tools/gen_defaults/data/text_field_outlined.json
+++ b/dev/tools/gen_defaults/data/text_field_outlined.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.outlined-text-field.caret.color": "primary",
   "md.comp.outlined-text-field.container.shape": "md.sys.shape.corner.extra-small",
diff --git a/dev/tools/gen_defaults/data/text_style.json b/dev/tools/gen_defaults/data/text_style.json
index 0eeb1fcb9a..42aaa93b50 100644
--- a/dev/tools/gen_defaults/data/text_style.json
+++ b/dev/tools/gen_defaults/data/text_style.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.sys.typescale.body-large.font": "md.ref.typeface.plain",
   "md.sys.typescale.body-large.line-height": 24.0,
diff --git a/dev/tools/gen_defaults/data/time_picker.json b/dev/tools/gen_defaults/data/time_picker.json
index e2e1468168..94be3c4a66 100644
--- a/dev/tools/gen_defaults/data/time_picker.json
+++ b/dev/tools/gen_defaults/data/time_picker.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.time-picker.clock-dial.color": "surfaceContainerHighest",
   "md.comp.time-picker.clock-dial.container.size": 256.0,
diff --git a/dev/tools/gen_defaults/data/top_app_bar_large.json b/dev/tools/gen_defaults/data/top_app_bar_large.json
index 9da1d8c0fc..a863f97672 100644
--- a/dev/tools/gen_defaults/data/top_app_bar_large.json
+++ b/dev/tools/gen_defaults/data/top_app_bar_large.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.top-app-bar.large.container.color": "surface",
   "md.comp.top-app-bar.large.container.elevation": "md.sys.elevation.level0",
diff --git a/dev/tools/gen_defaults/data/top_app_bar_medium.json b/dev/tools/gen_defaults/data/top_app_bar_medium.json
index 9a5e6d941c..edd86180c0 100644
--- a/dev/tools/gen_defaults/data/top_app_bar_medium.json
+++ b/dev/tools/gen_defaults/data/top_app_bar_medium.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.top-app-bar.medium.container.color": "surface",
   "md.comp.top-app-bar.medium.container.elevation": "md.sys.elevation.level0",
diff --git a/dev/tools/gen_defaults/data/top_app_bar_small.json b/dev/tools/gen_defaults/data/top_app_bar_small.json
index 24f5affa6c..c4f27af4f6 100644
--- a/dev/tools/gen_defaults/data/top_app_bar_small.json
+++ b/dev/tools/gen_defaults/data/top_app_bar_small.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.comp.top-app-bar.small.container.color": "surface",
   "md.comp.top-app-bar.small.container.elevation": "md.sys.elevation.level0",
diff --git a/dev/tools/gen_defaults/data/typeface.json b/dev/tools/gen_defaults/data/typeface.json
index 02dbc65448..c9e57078a3 100644
--- a/dev/tools/gen_defaults/data/typeface.json
+++ b/dev/tools/gen_defaults/data/typeface.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_206",
+  "version": "v2_3_5",
 
   "md.ref.typeface.brand": "Roboto",
   "md.ref.typeface.plain": "Roboto",
diff --git a/dev/tools/gen_defaults/generated/used_tokens.csv b/dev/tools/gen_defaults/generated/used_tokens.csv
index 260505f687..3e9c744667 100644
--- a/dev/tools/gen_defaults/generated/used_tokens.csv
+++ b/dev/tools/gen_defaults/generated/used_tokens.csv
@@ -1,5 +1,7 @@
-Versions used, v0_206
+Versions used, v2_3_5, v0_206
 md.comp.assist-chip.container.shape,
+md.comp.assist-chip.disabled.label-text.color,
+md.comp.assist-chip.elevated.container.color,
 md.comp.assist-chip.elevated.container.elevation,
 md.comp.assist-chip.elevated.container.shadow-color,
 md.comp.assist-chip.elevated.disabled.container.color,
@@ -67,7 +69,6 @@ md.comp.checkbox.unselected.pressed.outline.color,
 md.comp.checkbox.unselected.pressed.outline.width,
 md.comp.checkbox.unselected.pressed.state-layer.color,
 md.comp.checkbox.unselected.pressed.state-layer.opacity,
-md.comp.circular-progress-indicator.active-indicator.color,
 md.comp.date-picker.modal.container.color,
 md.comp.date-picker.modal.container.elevation,
 md.comp.date-picker.modal.container.shape,
@@ -319,6 +320,7 @@ md.comp.filled-tonal-icon-button.toggle.unselected.icon.color,
 md.comp.filled-tonal-icon-button.toggle.unselected.pressed.state-layer.color,
 md.comp.filled-tonal-icon-button.unselected.container.color,
 md.comp.filter-chip.container.shape,
+md.comp.filter-chip.disabled.label-text.color,
 md.comp.filter-chip.elevated.container.elevation,
 md.comp.filter-chip.elevated.container.shadow-color,
 md.comp.filter-chip.elevated.disabled.container.color,
@@ -326,6 +328,7 @@ md.comp.filter-chip.elevated.disabled.container.elevation,
 md.comp.filter-chip.elevated.disabled.container.opacity,
 md.comp.filter-chip.elevated.pressed.container.elevation,
 md.comp.filter-chip.elevated.selected.container.color,
+md.comp.filter-chip.elevated.unselected.container.color,
 md.comp.filter-chip.flat.container.elevation,
 md.comp.filter-chip.flat.disabled.selected.container.color,
 md.comp.filter-chip.flat.disabled.selected.container.opacity,
@@ -383,9 +386,6 @@ md.comp.input-chip.with-leading-icon.unselected.leading-icon.color,
 md.comp.input-chip.with-trailing-icon.disabled.trailing-icon.color,
 md.comp.input-chip.with-trailing-icon.selected.trailing-icon.color,
 md.comp.input-chip.with-trailing-icon.unselected.trailing-icon.color,
-md.comp.linear-progress-indicator.active-indicator.color,
-md.comp.linear-progress-indicator.track.color,
-md.comp.linear-progress-indicator.track.height,
 md.comp.list.list-item.container.shape,
 md.comp.list.list-item.disabled.label-text.color,
 md.comp.list.list-item.disabled.label-text.opacity,
@@ -553,6 +553,9 @@ md.comp.primary-navigation-tab.inactive.pressed.state-layer.opacity,
 md.comp.primary-navigation-tab.with-label-text.active.label-text.color,
 md.comp.primary-navigation-tab.with-label-text.inactive.label-text.color,
 md.comp.primary-navigation-tab.with-label-text.label-text.text-style,
+md.comp.progress-indicator.active-indicator.color,
+md.comp.progress-indicator.track.color,
+md.comp.progress-indicator.track.thickness,
 md.comp.radio-button.disabled.selected.icon.color,
 md.comp.radio-button.disabled.selected.icon.opacity,
 md.comp.radio-button.disabled.unselected.icon.color,
diff --git a/dev/tools/gen_defaults/lib/fab_template.dart b/dev/tools/gen_defaults/lib/fab_template.dart
index 63f42c7e74..6914611953 100644
--- a/dev/tools/gen_defaults/lib/fab_template.dart
+++ b/dev/tools/gen_defaults/lib/fab_template.dart
@@ -54,26 +54,22 @@ class _${blockName}DefaultsM3 extends FloatingActionButtonThemeData {
 
   @override
   ShapeBorder? get shape {
-    switch (type) {
-      case _FloatingActionButtonType.regular:
-       return ${shape("md.comp.fab.primary.container")};
-      case _FloatingActionButtonType.small:
-       return ${shape("md.comp.fab.primary.small.container")};
-      case _FloatingActionButtonType.large:
-       return ${shape("md.comp.fab.primary.large.container")};
-      case _FloatingActionButtonType.extended:
-       return ${shape("md.comp.extended-fab.primary.container")};
-     }
+    return switch (type) {
+      _FloatingActionButtonType.regular  => ${shape("md.comp.fab.primary.container")},
+      _FloatingActionButtonType.small    => ${shape("md.comp.fab.primary.small.container")},
+      _FloatingActionButtonType.large    => ${shape("md.comp.fab.primary.large.container")},
+      _FloatingActionButtonType.extended => ${shape("md.comp.extended-fab.primary.container")},
+    };
   }
 
   @override
   double? get iconSize {
-    switch (type) {
-      case _FloatingActionButtonType.regular: return ${getToken("md.comp.fab.primary.icon.size")};
-      case _FloatingActionButtonType.small: return  ${getToken("md.comp.fab.primary.small.icon.size")};
-      case _FloatingActionButtonType.large: return ${getToken("md.comp.fab.primary.large.icon.size")};
-      case _FloatingActionButtonType.extended: return ${getToken("md.comp.extended-fab.primary.icon.size")};
-    }
+    return switch (type) {
+      _FloatingActionButtonType.regular  => ${getToken("md.comp.fab.primary.icon.size")},
+      _FloatingActionButtonType.small    => ${getToken("md.comp.fab.primary.small.icon.size")},
+      _FloatingActionButtonType.large    => ${getToken("md.comp.fab.primary.large.icon.size")},
+      _FloatingActionButtonType.extended => ${getToken("md.comp.extended-fab.primary.icon.size")},
+    };
   }
 
   @override EdgeInsetsGeometry? get extendedPadding => EdgeInsetsDirectional.only(start: hasChild && _isExtended ? 16.0 : 20.0, end: 20.0);
diff --git a/dev/tools/gen_defaults/lib/popup_menu_template.dart b/dev/tools/gen_defaults/lib/popup_menu_template.dart
index a29828adb1..61076c3dd3 100644
--- a/dev/tools/gen_defaults/lib/popup_menu_template.dart
+++ b/dev/tools/gen_defaults/lib/popup_menu_template.dart
@@ -23,6 +23,7 @@ class _${blockName}DefaultsM3 extends PopupMenuThemeData {
 
   @override MaterialStateProperty<TextStyle?>? get labelTextStyle {
     return MaterialStateProperty.resolveWith((Set<MaterialState> states) {
+    // TODO(quncheng): Update this hard-coded value to use the latest tokens.
     final TextStyle style = _textTheme.labelLarge!;
       if (states.contains(MaterialState.disabled)) {
         return style.apply(color: ${componentColor('md.comp.list.list-item.disabled.label-text')});
diff --git a/dev/tools/gen_defaults/lib/progress_indicator_template.dart b/dev/tools/gen_defaults/lib/progress_indicator_template.dart
index 6e4d889791..de7ba774f4 100644
--- a/dev/tools/gen_defaults/lib/progress_indicator_template.dart
+++ b/dev/tools/gen_defaults/lib/progress_indicator_template.dart
@@ -18,7 +18,10 @@ class _Circular${blockName}DefaultsM3 extends ProgressIndicatorThemeData {
   late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
-  Color get color => ${componentColor('md.comp.circular-progress-indicator.active-indicator')};
+  Color get color => ${componentColor('md.comp.progress-indicator.active-indicator')};
+
+  @override
+  Color get circularTrackColor => ${componentColor('md.comp.progress-indicator.track')};
 }
 
 class _Linear${blockName}DefaultsM3 extends ProgressIndicatorThemeData {
@@ -28,13 +31,13 @@ class _Linear${blockName}DefaultsM3 extends ProgressIndicatorThemeData {
   late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
-  Color get color => ${componentColor('md.comp.linear-progress-indicator.active-indicator')};
+  Color get color => ${componentColor('md.comp.progress-indicator.active-indicator')};
 
   @override
-  Color get linearTrackColor => ${componentColor('md.comp.linear-progress-indicator.track')};
+  Color get linearTrackColor => ${componentColor('md.comp.progress-indicator.track')};
 
   @override
-  double get linearMinHeight => ${getToken('md.comp.linear-progress-indicator.track.height')};
+  double get linearMinHeight => ${getToken('md.comp.progress-indicator.track.thickness')};
 }
 ''';
 }
diff --git a/packages/flutter/lib/src/material/progress_indicator.dart b/packages/flutter/lib/src/material/progress_indicator.dart
index 8b4cf3f724..a2ca5fb04b 100644
--- a/packages/flutter/lib/src/material/progress_indicator.dart
+++ b/packages/flutter/lib/src/material/progress_indicator.dart
@@ -1074,6 +1074,9 @@ class _CircularProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData {
 
   @override
   Color get color => _colors.primary;
+
+  @override
+  Color get circularTrackColor => _colors.secondaryContainer;
 }
 
 class _LinearProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData {
@@ -1086,7 +1089,7 @@ class _LinearProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData {
   Color get color => _colors.primary;
 
   @override
-  Color get linearTrackColor => _colors.surfaceContainerHighest;
+  Color get linearTrackColor => _colors.secondaryContainer;
 
   @override
   double get linearMinHeight => 4.0;
diff --git a/packages/flutter/lib/src/material/slider.dart b/packages/flutter/lib/src/material/slider.dart
index 923eb131f1..24e522224b 100644
--- a/packages/flutter/lib/src/material/slider.dart
+++ b/packages/flutter/lib/src/material/slider.dart
@@ -1952,6 +1952,7 @@ class _SliderDefaultsM2 extends SliderThemeData {
   SliderComponentShape? get valueIndicatorShape => const RectangularSliderValueIndicatorShape();
 }
 
+// TODO(quncheng): Update M3 defaults to match the latest specs.
 // BEGIN GENERATED TOKEN PROPERTIES - Slider
 
 // Do not edit by hand. The code between the "BEGIN GENERATED" and
diff --git a/packages/flutter/test/material/progress_indicator_test.dart b/packages/flutter/test/material/progress_indicator_test.dart
index 2d06e7b3af..2b3d480f86 100644
--- a/packages/flutter/test/material/progress_indicator_test.dart
+++ b/packages/flutter/test/material/progress_indicator_test.dart
@@ -228,6 +228,27 @@ void main() {
   });
 
   testWidgets('LinearProgressIndicator with colors', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const MaterialApp(
+        home: Center(
+          child: SizedBox(
+            width: 200.0,
+            child: LinearProgressIndicator(
+              value: 0.25,
+            ),
+          ),
+        ),
+      ),
+    );
+
+    // Defaults.
+    expect(
+      find.byType(LinearProgressIndicator),
+      paints
+        ..rect(rect: const Rect.fromLTRB(0.0, 0.0, 200.0, 4.0), color: theme.colorScheme.secondaryContainer)
+        ..rect(rect: const Rect.fromLTRB(0.0, 0.0, 50.0, 4.0), color: theme.colorScheme.primary),
+    );
+
     // With valueColor & color provided
     await tester.pumpWidget(
       Theme(