diff --git a/dev/tools/gen_defaults/bin/gen_defaults.dart b/dev/tools/gen_defaults/bin/gen_defaults.dart
index 7228a0be5a..4c1b8d23d3 100644
--- a/dev/tools/gen_defaults/bin/gen_defaults.dart
+++ b/dev/tools/gen_defaults/bin/gen_defaults.dart
@@ -36,6 +36,7 @@ Future<void> main(List<String> args) async {
   const String materialLib = 'packages/flutter/lib/src/material';
   const List<String> tokenFiles = <String>[
     'banner.json',
+    'bottom_app_bar.json',
     'button_elevated.json',
     'button_filled.json',
     'button_filled_tonal.json',
@@ -44,13 +45,17 @@ Future<void> main(List<String> args) async {
     'card_elevated.json',
     'card_filled.json',
     'card_outlined.json',
+    'checkbox.json',
     'chip_assist.json',
     'chip_filter.json',
     'chip_input.json',
     'chip_suggestion.json',
     'color_dark.json',
     'color_light.json',
+    'date_picker_docked.json',
+    'date_picker_modal.json',
     'dialog.json',
+    'dialog_fullscreen.json',
     'elevation.json',
     'fab_extended_primary.json',
     'fab_large_primary.json',
@@ -59,14 +64,22 @@ Future<void> main(List<String> args) async {
     'icon_button.json',
     'icon_button_filled.json',
     'icon_button_filled_tonal.json',
+    'icon_button_outlined.json',
+    'menu.json',
     'motion.json',
     'navigation_bar.json',
+    'navigation_drawer.json',
     'navigation_rail.json',
     'palette.json',
+    'segmented_button_outlined.json',
     'shape.json',
     'slider.json',
     'state.json',
+    'switch.json',
+    'text_field_filled.json',
+    'text_field_outlined.json',
     'text_style.json',
+    'time_picker.json',
     'top_app_bar_large.json',
     'top_app_bar_medium.json',
     'top_app_bar_small.json',
diff --git a/dev/tools/gen_defaults/data/banner.json b/dev/tools/gen_defaults/data/banner.json
index 468aa86353..ae049ae0fa 100644
--- a/dev/tools/gen_defaults/data/banner.json
+++ b/dev/tools/gen_defaults/data/banner.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "md.comp.banner.action.focus.label-text.color": "primary",
   "md.comp.banner.action.focus.state-layer.color": "primary",
diff --git a/dev/tools/gen_defaults/data/bottom_app_bar.json b/dev/tools/gen_defaults/data/bottom_app_bar.json
new file mode 100644
index 0000000000..93d126edce
--- /dev/null
+++ b/dev/tools/gen_defaults/data/bottom_app_bar.json
@@ -0,0 +1,9 @@
+{
+  "version": "v0_99",
+
+  "md.comp.bottom-app-bar.container.color": "surface",
+  "md.comp.bottom-app-bar.container.elevation": "md.sys.elevation.level2",
+  "md.comp.bottom-app-bar.container.height": 80.0,
+  "md.comp.bottom-app-bar.container.shape": "md.sys.shape.corner.none",
+  "md.comp.bottom-app-bar.container.surface-tint-layer.color": "surfaceTint"
+}
diff --git a/dev/tools/gen_defaults/data/button_elevated.json b/dev/tools/gen_defaults/data/button_elevated.json
index 24bff499cf..dd3973ea00 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_98",
+  "version": "v0_99",
 
   "md.comp.elevated-button.container.color": "surface",
   "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 0271f2cf15..abc766adea 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_98",
+  "version": "v0_99",
 
   "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 644f8e5a06..bdd45ce879 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_98",
+  "version": "v0_99",
 
   "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 8f53ebcac7..a13b1b8554 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_98",
+  "version": "v0_99",
 
   "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 4b8afafedc..36e3c55a57 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_98",
+  "version": "v0_99",
 
   "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 b03c2d765b..b81f720ab7 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_98",
+  "version": "v0_99",
 
   "md.comp.elevated-card.container.color": "surface",
   "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 08df53998e..4df4d68156 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_98",
+  "version": "v0_99",
 
   "md.comp.filled-card.container.color": "surfaceVariant",
   "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 4b25627a83..9f971d5e2e 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_98",
+  "version": "v0_99",
 
   "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/checkbox.json b/dev/tools/gen_defaults/data/checkbox.json
new file mode 100644
index 0000000000..51fa330e54
--- /dev/null
+++ b/dev/tools/gen_defaults/data/checkbox.json
@@ -0,0 +1,71 @@
+{
+  "version": "v0_99",
+
+  "md.comp.checkbox.container.height": 18.0,
+  "md.comp.checkbox.container.width": 18.0,
+  "md.comp.checkbox.error.focus.state-layer.color": "error",
+  "md.comp.checkbox.error.hover.state-layer.color": "error",
+  "md.comp.checkbox.error.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.checkbox.error.pressed.state-layer.color": "error",
+  "md.comp.checkbox.error.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.checkbox.icon.size": 18.0,
+  "md.comp.checkbox.selected.container.color": "primary",
+  "md.comp.checkbox.selected.disabled.container.color": "onSurface",
+  "md.comp.checkbox.selected.disabled.container.opacity": 0.38,
+  "md.comp.checkbox.selected.disabled.container.outline.width": 0.0,
+  "md.comp.checkbox.selected.disabled.icon.color": "surface",
+  "md.comp.checkbox.selected.error.container.color": "error",
+  "md.comp.checkbox.selected.error.focus.container.color": "error",
+  "md.comp.checkbox.selected.error.focus.icon.color": "onError",
+  "md.comp.checkbox.selected.error.focus.outline.width": 0.0,
+  "md.comp.checkbox.selected.error.hover.container.color": "error",
+  "md.comp.checkbox.selected.error.hover.icon.color": "onError",
+  "md.comp.checkbox.selected.error.hover.outline.width": 0.0,
+  "md.comp.checkbox.selected.error.icon.color": "onError",
+  "md.comp.checkbox.selected.error.pressed.container.color": "error",
+  "md.comp.checkbox.selected.error.pressed.icon.color": "onError",
+  "md.comp.checkbox.selected.error.pressed.outline.width": 0.0,
+  "md.comp.checkbox.selected.focus.container.color": "primary",
+  "md.comp.checkbox.selected.focus.icon.color": "onPrimary",
+  "md.comp.checkbox.selected.focus.outline.width": 0.0,
+  "md.comp.checkbox.selected.focus.state-layer.color": "primary",
+  "md.comp.checkbox.selected.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.checkbox.selected.hover.container.color": "primary",
+  "md.comp.checkbox.selected.hover.icon.color": "onPrimary",
+  "md.comp.checkbox.selected.hover.outline.width": 0.0,
+  "md.comp.checkbox.selected.hover.state-layer.color": "primary",
+  "md.comp.checkbox.selected.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.checkbox.selected.icon.color": "onPrimary",
+  "md.comp.checkbox.selected.outline.width": 0.0,
+  "md.comp.checkbox.selected.pressed.container.color": "primary",
+  "md.comp.checkbox.selected.pressed.icon.color": "onPrimary",
+  "md.comp.checkbox.selected.pressed.outline.width": 0.0,
+  "md.comp.checkbox.selected.pressed.state-layer.color": "onSurface",
+  "md.comp.checkbox.selected.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.checkbox.state-layer.shape": "md.sys.shape.corner.full",
+  "md.comp.checkbox.state-layer.size": 40.0,
+  "md.comp.checkbox.unselected.disabled.container.opacity": 0.38,
+  "md.comp.checkbox.unselected.disabled.outline.color": "onSurface",
+  "md.comp.checkbox.unselected.disabled.outline.width": 2.0,
+  "md.comp.checkbox.unselected.error.focus.outline.color": "error",
+  "md.comp.checkbox.unselected.error.focus.outline.width": 2.0,
+  "md.comp.checkbox.unselected.error.hover.outline.color": "error",
+  "md.comp.checkbox.unselected.error.hover.outline.width": 2.0,
+  "md.comp.checkbox.unselected.error.outline.color": "error",
+  "md.comp.checkbox.unselected.error.pressed.outline.color": "error",
+  "md.comp.checkbox.unselected.error.pressed.outline.width": 2.0,
+  "md.comp.checkbox.unselected.focus.outline.color": "onSurface",
+  "md.comp.checkbox.unselected.focus.outline.width": 2.0,
+  "md.comp.checkbox.unselected.focus.state-layer.color": "onSurface",
+  "md.comp.checkbox.unselected.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.checkbox.unselected.hover.outline.color": "onSurface",
+  "md.comp.checkbox.unselected.hover.outline.width": 2.0,
+  "md.comp.checkbox.unselected.hover.state-layer.color": "onSurface",
+  "md.comp.checkbox.unselected.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.checkbox.unselected.outline.color": "onSurface",
+  "md.comp.checkbox.unselected.outline.width": 2.0,
+  "md.comp.checkbox.unselected.pressed.outline.color": "onSurface",
+  "md.comp.checkbox.unselected.pressed.outline.width": 2.0,
+  "md.comp.checkbox.unselected.pressed.state-layer.color": "primary",
+  "md.comp.checkbox.unselected.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity"
+}
diff --git a/dev/tools/gen_defaults/data/chip_assist.json b/dev/tools/gen_defaults/data/chip_assist.json
index acf7273a63..bc8b9128ee 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_98",
+  "version": "v0_99",
 
   "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 ef9727792b..200f3a10a8 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_98",
+  "version": "v0_99",
 
   "md.comp.filter-chip.container.height": 32.0,
   "md.comp.filter-chip.container.shadow-color": "shadow",
diff --git a/dev/tools/gen_defaults/data/chip_input.json b/dev/tools/gen_defaults/data/chip_input.json
index 5cd5b899b2..6c7f5f30bc 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_98",
+  "version": "v0_99",
 
   "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 b1871753eb..2292a79c00 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_98",
+  "version": "v0_99",
 
   "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 d4f3c2eca1..22b830dd09 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_98",
+  "version": "v0_99",
 
   "md.sys.color.background": "md.ref.palette.neutral10",
   "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 e8f93908c8..2e6e61b1fe 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_98",
+  "version": "v0_99",
 
   "md.sys.color.background": "md.ref.palette.neutral99",
   "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
new file mode 100644
index 0000000000..2f422fe756
--- /dev/null
+++ b/dev/tools/gen_defaults/data/date_picker_docked.json
@@ -0,0 +1,79 @@
+{
+  "version": "v0_99",
+
+  "md.comp.date-picker.docked.container.color": "surface",
+  "md.comp.date-picker.docked.container.elevation": "md.sys.elevation.level3",
+  "md.comp.date-picker.docked.container.height": 428.0,
+  "md.comp.date-picker.docked.container.shape": "md.sys.shape.corner.large",
+  "md.comp.date-picker.docked.container.surface-tint-layer.color": "surfaceTint",
+  "md.comp.date-picker.docked.container.width": 328.0,
+  "md.comp.date-picker.docked.date.container.height": 40.0,
+  "md.comp.date-picker.docked.date.container.shape": "md.sys.shape.corner.full",
+  "md.comp.date-picker.docked.date.container.width": 40.0,
+  "md.comp.date-picker.docked.date.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.date-picker.docked.date.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.date-picker.docked.date.label-text.text-style": "bodySmall",
+  "md.comp.date-picker.docked.date.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.date-picker.docked.date.selected.container.color": "primary",
+  "md.comp.date-picker.docked.date.selected.focus.state-layer.color": "onPrimary",
+  "md.comp.date-picker.docked.date.selected.hover.state-layer.color": "onPrimary",
+  "md.comp.date-picker.docked.date.selected.label-text.color": "onPrimary",
+  "md.comp.date-picker.docked.date.selected.pressed.state-layer.color": "onPrimary",
+  "md.comp.date-picker.docked.date.state-layer.height": 40.0,
+  "md.comp.date-picker.docked.date.state-layer.shape": "md.sys.shape.corner.full",
+  "md.comp.date-picker.docked.date.state-layer.width": 40.0,
+  "md.comp.date-picker.docked.date.today.container.outline.color": "primary",
+  "md.comp.date-picker.docked.date.today.container.outline.width": 1.0,
+  "md.comp.date-picker.docked.date.today.focus.state-layer.color": "primary",
+  "md.comp.date-picker.docked.date.today.hover.state-layer.color": "primary",
+  "md.comp.date-picker.docked.date.today.label-text.color": "primary",
+  "md.comp.date-picker.docked.date.today.pressed.state-layer.color": "primary",
+  "md.comp.date-picker.docked.date.unselected.focus.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.date.unselected.hover.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.date.unselected.label-text.color": "onSurface",
+  "md.comp.date-picker.docked.date.unselected.outside-month.label-text.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.date.unselected.pressed.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.header.height": 64.0,
+  "md.comp.date-picker.docked.menu-button.container.height": 40.0,
+  "md.comp.date-picker.docked.menu-button.container.shape": "md.sys.shape.corner.full",
+  "md.comp.date-picker.docked.menu-button.disabled.icon.color": "onSurface",
+  "md.comp.date-picker.docked.menu-button.disabled.icon.opacity": 0.38,
+  "md.comp.date-picker.docked.menu-button.disabled.label-text.color": "onSurface",
+  "md.comp.date-picker.docked.menu-button.disabled.label-text.opacity": 0.38,
+  "md.comp.date-picker.docked.menu-button.focus.icon.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.focus.label-text.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.focus.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.date-picker.docked.menu-button.hover.icon.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.hover.label-text.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.hover.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.date-picker.docked.menu-button.icon.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.icon.size": 18.0,
+  "md.comp.date-picker.docked.menu-button.label-text.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.label-text.text-style": "labelLarge",
+  "md.comp.date-picker.docked.menu-button.pressed.icon.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.pressed.label-text.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.pressed.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu-button.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.date-picker.docked.menu.list-item.container.height": 48.0,
+  "md.comp.date-picker.docked.menu.list-item.focus.label-text.color": "onSurface",
+  "md.comp.date-picker.docked.menu.list-item.focus.state-layer.color": "onSurface",
+  "md.comp.date-picker.docked.menu.list-item.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.date-picker.docked.menu.list-item.hover.label-text.color": "onSurface",
+  "md.comp.date-picker.docked.menu.list-item.hover.state-layer.color": "onSurface",
+  "md.comp.date-picker.docked.menu.list-item.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.date-picker.docked.menu.list-item.label-text.color": "onSurface",
+  "md.comp.date-picker.docked.menu.list-item.label-text.text-style": "bodyLarge",
+  "md.comp.date-picker.docked.menu.list-item.pressed.label-text.color": "onSurface",
+  "md.comp.date-picker.docked.menu.list-item.pressed.state-layer.color": "onSurface",
+  "md.comp.date-picker.docked.menu.list-item.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.date-picker.docked.menu.list-item.selected.container.color": "surfaceVariant",
+  "md.comp.date-picker.docked.menu.list-item.selected.focus.leading-icon.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu.list-item.selected.hover.leading-icon.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.menu.list-item.selected.leading-icon.color": "onSurface",
+  "md.comp.date-picker.docked.menu.list-item.selected.leading-icon.size": 24.0,
+  "md.comp.date-picker.docked.menu.list-item.selected.pressed.leading-icon.color": "onSurfaceVariant",
+  "md.comp.date-picker.docked.weekdays.label-text.color": "onSurface",
+  "md.comp.date-picker.docked.weekdays.label-text.text-style": "bodySmall"
+}
diff --git a/dev/tools/gen_defaults/data/date_picker_modal.json b/dev/tools/gen_defaults/data/date_picker_modal.json
new file mode 100644
index 0000000000..b314712117
--- /dev/null
+++ b/dev/tools/gen_defaults/data/date_picker_modal.json
@@ -0,0 +1,77 @@
+{
+  "version": "v0_99",
+
+  "md.comp.date-picker.modal.container.color": "surface",
+  "md.comp.date-picker.modal.container.elevation": "md.sys.elevation.level3",
+  "md.comp.date-picker.modal.container.height": 512.0,
+  "md.comp.date-picker.modal.container.shape": "md.sys.shape.corner.extra-large",
+  "md.comp.date-picker.modal.container.surface-tint-layer.color": "surfaceTint",
+  "md.comp.date-picker.modal.container.width": 328.0,
+  "md.comp.date-picker.modal.date.container.height": 40.0,
+  "md.comp.date-picker.modal.date.container.shape": "md.sys.shape.corner.full",
+  "md.comp.date-picker.modal.date.container.width": 40.0,
+  "md.comp.date-picker.modal.date.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.date-picker.modal.date.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.date-picker.modal.date.label-text.text-style": "bodySmall",
+  "md.comp.date-picker.modal.date.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.date-picker.modal.date.selected.container.color": "primary",
+  "md.comp.date-picker.modal.date.selected.focus.state-layer.color": "onPrimary",
+  "md.comp.date-picker.modal.date.selected.hover.state-layer.color": "onPrimary",
+  "md.comp.date-picker.modal.date.selected.label-text.color": "onPrimary",
+  "md.comp.date-picker.modal.date.selected.pressed.state-layer.color": "onPrimary",
+  "md.comp.date-picker.modal.date.state-layer.height": 40.0,
+  "md.comp.date-picker.modal.date.state-layer.shape": "md.sys.shape.corner.full",
+  "md.comp.date-picker.modal.date.state-layer.width": 40.0,
+  "md.comp.date-picker.modal.date.today.container.outline.color": "primary",
+  "md.comp.date-picker.modal.date.today.container.outline.width": 1.0,
+  "md.comp.date-picker.modal.date.today.focus.state-layer.color": "primary",
+  "md.comp.date-picker.modal.date.today.hover.state-layer.color": "primary",
+  "md.comp.date-picker.modal.date.today.label-text.color": "primary",
+  "md.comp.date-picker.modal.date.today.pressed.state-layer.color": "primary",
+  "md.comp.date-picker.modal.date.unselected.focus.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.modal.date.unselected.hover.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.modal.date.unselected.label-text.color": "onSurface",
+  "md.comp.date-picker.modal.date.unselected.pressed.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.modal.header.container.height": 120.0,
+  "md.comp.date-picker.modal.header.container.width": 328.0,
+  "md.comp.date-picker.modal.header.headline.color": "onSurfaceVariant",
+  "md.comp.date-picker.modal.header.headline.text-style": "headlineLarge",
+  "md.comp.date-picker.modal.header.supporting-text.color": "onSurfaceVariant",
+  "md.comp.date-picker.modal.header.supporting-text.text-style": "labelMedium",
+  "md.comp.date-picker.modal.range-selection.active-indicator.container.color": "primaryContainer",
+  "md.comp.date-picker.modal.range-selection.active-indicator.container.height": 40.0,
+  "md.comp.date-picker.modal.range-selection.active-indicator.container.shape": "md.sys.shape.corner.full",
+  "md.comp.date-picker.modal.range-selection.container.elevation": "md.sys.elevation.level0",
+  "md.comp.date-picker.modal.range-selection.container.shape": "md.sys.shape.corner.none",
+  "md.comp.date-picker.modal.range-selection.date.in-range.focus.state-layer.color": "onPrimaryContainer",
+  "md.comp.date-picker.modal.range-selection.date.in-range.focus.state-layer.opcaity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.date-picker.modal.range-selection.date.in-range.hover.state-layer.color": "onPrimaryContainer",
+  "md.comp.date-picker.modal.range-selection.date.in-range.hover.state-layer.opcaity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.date-picker.modal.range-selection.date.in-range.label-text.color": "onPrimaryContainer",
+  "md.comp.date-picker.modal.range-selection.date.in-range.pressed.state-layer.color": "onPrimaryContainer",
+  "md.comp.date-picker.modal.range-selection.date.in-range.pressed.state-layer.opcaity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.date-picker.modal.range-selection.header.container.height": 128.0,
+  "md.comp.date-picker.modal.range-selection.header.headline.text-style": "titleLarge",
+  "md.comp.date-picker.modal.range-selection.month.subhead.color": "onSurfaceVariant",
+  "md.comp.date-picker.modal.range-selection.month.subhead.text-style": "titleSmall",
+  "md.comp.date-picker.modal.weekdays.label-text.color": "onSurface",
+  "md.comp.date-picker.modal.weekdays.label-text.text-style": "bodySmall",
+  "md.comp.date-picker.modal.year-selection.year.container.height": 36.0,
+  "md.comp.date-picker.modal.year-selection.year.container.width": 72.0,
+  "md.comp.date-picker.modal.year-selection.year.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.date-picker.modal.year-selection.year.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.date-picker.modal.year-selection.year.label-text.text-style": "bodyLarge",
+  "md.comp.date-picker.modal.year-selection.year.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.date-picker.modal.year-selection.year.selected.container.color": "primary",
+  "md.comp.date-picker.modal.year-selection.year.selected.focus.state-layer.color": "onPrimary",
+  "md.comp.date-picker.modal.year-selection.year.selected.hover.state-layer.color": "onPrimary",
+  "md.comp.date-picker.modal.year-selection.year.selected.label-text.color": "onPrimary",
+  "md.comp.date-picker.modal.year-selection.year.selected.pressed.state-layer.color": "onPrimary",
+  "md.comp.date-picker.modal.year-selection.year.state-layer.height": 36.0,
+  "md.comp.date-picker.modal.year-selection.year.state-layer.shape": "md.sys.shape.corner.full",
+  "md.comp.date-picker.modal.year-selection.year.state-layer.width": 72.0,
+  "md.comp.date-picker.modal.year-selection.year.unselected.focus.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.modal.year-selection.year.unselected.hover.state-layer.color": "onSurfaceVariant",
+  "md.comp.date-picker.modal.year-selection.year.unselected.label-text.color": "onSurfaceVariant",
+  "md.comp.date-picker.modal.year-selection.year.unselected.pressed.state-layer.color": "onSurfaceVariant"
+}
diff --git a/dev/tools/gen_defaults/data/dialog.json b/dev/tools/gen_defaults/data/dialog.json
index f6c0eea225..94bca28e87 100644
--- a/dev/tools/gen_defaults/data/dialog.json
+++ b/dev/tools/gen_defaults/data/dialog.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "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
new file mode 100644
index 0000000000..59aef97fb7
--- /dev/null
+++ b/dev/tools/gen_defaults/data/dialog_fullscreen.json
@@ -0,0 +1,29 @@
+{
+  "version": "v0_99",
+
+  "md.comp.full-screen-dialog.container.color": "surface",
+  "md.comp.full-screen-dialog.container.elevation": "md.sys.elevation.level0",
+  "md.comp.full-screen-dialog.container.shape": "md.sys.shape.corner.none",
+  "md.comp.full-screen-dialog.header.action.focus.label-text.color": "primary",
+  "md.comp.full-screen-dialog.header.action.focus.state-layer.color": "primary",
+  "md.comp.full-screen-dialog.header.action.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.full-screen-dialog.header.action.hover.label-text.color": "primary",
+  "md.comp.full-screen-dialog.header.action.hover.state-layer.color": "primary",
+  "md.comp.full-screen-dialog.header.action.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.full-screen-dialog.header.action.label-text.color": "primary",
+  "md.comp.full-screen-dialog.header.action.label-text.text-style": "labelLarge",
+  "md.comp.full-screen-dialog.header.action.pressed.label-text.color": "primary",
+  "md.comp.full-screen-dialog.header.action.pressed.state-layer.color": "primary",
+  "md.comp.full-screen-dialog.header.action.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.full-screen-dialog.header.container.color": "surface",
+  "md.comp.full-screen-dialog.header.container.elevation": "md.sys.elevation.level0",
+  "md.comp.full-screen-dialog.header.container.height": 56.0,
+  "md.comp.full-screen-dialog.header.container.surface-tint-layer.color": "surfaceTint",
+  "md.comp.full-screen-dialog.header.headline.color": "onSurface",
+  "md.comp.full-screen-dialog.header.headline.text-style": "titleLarge",
+  "md.comp.full-screen-dialog.header.icon.color": "onSurface",
+  "md.comp.full-screen-dialog.header.icon.size": 24.0,
+  "md.comp.full-screen-dialog.header.on-scroll.container.elevation": "md.sys.elevation.level2",
+  "md.comp.full-screen-dialog.with-divider.divider.color": "surfaceVariant",
+  "md.comp.full-screen-dialog.with-divider.divider.height": 1.0
+}
diff --git a/dev/tools/gen_defaults/data/elevation.json b/dev/tools/gen_defaults/data/elevation.json
index 91a6ba96f1..700c71404e 100644
--- a/dev/tools/gen_defaults/data/elevation.json
+++ b/dev/tools/gen_defaults/data/elevation.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "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 f9c04d0dbe..ab0dcc9f8b 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_98",
+  "version": "v0_99",
 
   "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 775cb46de7..850ba23ef7 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_98",
+  "version": "v0_99",
 
   "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 802702c353..ba9d416079 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_98",
+  "version": "v0_99",
 
   "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 72f2d98814..dc04f55d96 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_98",
+  "version": "v0_99",
 
   "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 ee77bc9ede..728b635d61 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_98",
+  "version": "v0_99",
 
   "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 e1a9d0bfd1..2de4a8f15a 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_98",
+  "version": "v0_99",
 
   "md.comp.filled-icon-button.container.color": "primary",
   "md.comp.filled-icon-button.container.shape": "md.sys.shape.corner.full",
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 6949bee247..5370ca5587 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_98",
+  "version": "v0_99",
 
   "md.comp.filled-tonal-icon-button.container.color": "secondaryContainer",
   "md.comp.filled-tonal-icon-button.container.shape": "md.sys.shape.corner.full",
diff --git a/dev/tools/gen_defaults/data/icon_button_outlined.json b/dev/tools/gen_defaults/data/icon_button_outlined.json
new file mode 100644
index 0000000000..b43010f557
--- /dev/null
+++ b/dev/tools/gen_defaults/data/icon_button_outlined.json
@@ -0,0 +1,31 @@
+{
+  "version": "v0_99",
+
+  "md.comp.outlined-icon-button.container.shape": "md.sys.shape.corner.full",
+  "md.comp.outlined-icon-button.container.size": 40.0,
+  "md.comp.outlined-icon-button.disabled.icon.color": "onSurface",
+  "md.comp.outlined-icon-button.disabled.icon.opacity": 0.38,
+  "md.comp.outlined-icon-button.disabled.outline.color": "onSurface",
+  "md.comp.outlined-icon-button.disabled.outline.opacity": 0.12,
+  "md.comp.outlined-icon-button.focus.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.outlined-icon-button.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.outlined-icon-button.icon.size": 24.0,
+  "md.comp.outlined-icon-button.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.outlined-icon-button.selected.container.color": "inverseSurface",
+  "md.comp.outlined-icon-button.selected.focus.icon.color": "inverseOnSurface",
+  "md.comp.outlined-icon-button.selected.focus.state-layer.color": "inverseOnSurface",
+  "md.comp.outlined-icon-button.selected.hover.icon.color": "inverseOnSurface",
+  "md.comp.outlined-icon-button.selected.hover.state-layer.color": "inverseOnSurface",
+  "md.comp.outlined-icon-button.selected.icon.color": "inverseOnSurface",
+  "md.comp.outlined-icon-button.selected.pressed.icon.color": "inverseOnSurface",
+  "md.comp.outlined-icon-button.selected.pressed.state-layer.color": "inverseOnSurface",
+  "md.comp.outlined-icon-button.unselected.focus.icon.color": "onSurfaceVariant",
+  "md.comp.outlined-icon-button.unselected.focus.state-layer.color": "onSurfaceVariant",
+  "md.comp.outlined-icon-button.unselected.hover.icon.color": "onSurfaceVariant",
+  "md.comp.outlined-icon-button.unselected.hover.state-layer.color": "onSurfaceVariant",
+  "md.comp.outlined-icon-button.unselected.icon.color": "onSurfaceVariant",
+  "md.comp.outlined-icon-button.unselected.outline.color": "outline",
+  "md.comp.outlined-icon-button.unselected.outline.width": 1.0,
+  "md.comp.outlined-icon-button.unselected.pressed.icon.color": "onSurface",
+  "md.comp.outlined-icon-button.unselected.pressed.state-layer.color": "onSurface"
+}
diff --git a/dev/tools/gen_defaults/data/menu.json b/dev/tools/gen_defaults/data/menu.json
index 9a96ed8295..005a11d464 100644
--- a/dev/tools/gen_defaults/data/menu.json
+++ b/dev/tools/gen_defaults/data/menu.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "md.comp.menu.cascading-menu-indicator.icon.color": "onSurfaceVariant",
   "md.comp.menu.cascading-menu-indicator.icon.size": 24.0,
diff --git a/dev/tools/gen_defaults/data/motion.json b/dev/tools/gen_defaults/data/motion.json
index d3aaf9f21e..87d6dacabe 100644
--- a/dev/tools/gen_defaults/data/motion.json
+++ b/dev/tools/gen_defaults/data/motion.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "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 d391b83e3d..9dab6f7e4d 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_98",
+  "version": "v0_99",
 
   "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
new file mode 100644
index 0000000000..b371e59c4d
--- /dev/null
+++ b/dev/tools/gen_defaults/data/navigation_drawer.json
@@ -0,0 +1,50 @@
+{
+  "version": "v0_99",
+
+  "md.comp.navigation-drawer.active.focus.icon.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active.focus.label-text.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active.focus.state-layer.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active.hover.icon.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active.hover.label-text.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active.hover.state-layer.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active.icon.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active-indicator.color": "secondaryContainer",
+  "md.comp.navigation-drawer.active-indicator.height": 56.0,
+  "md.comp.navigation-drawer.active-indicator.shape": "md.sys.shape.corner.full",
+  "md.comp.navigation-drawer.active-indicator.width": 336.0,
+  "md.comp.navigation-drawer.active.label-text.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active.pressed.icon.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active.pressed.label-text.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.active.pressed.state-layer.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.bottom.container.shape": "md.sys.shape.corner.large.top",
+  "md.comp.navigation-drawer.container.color": "surface",
+  "md.comp.navigation-drawer.container.height": 100.0,
+  "md.comp.navigation-drawer.container.shape": "md.sys.shape.corner.large.end",
+  "md.comp.navigation-drawer.container.surface-tint-layer.color": "surfaceTint",
+  "md.comp.navigation-drawer.container.width": 360.0,
+  "md.comp.navigation-drawer.divider.color": "outline",
+  "md.comp.navigation-drawer.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.navigation-drawer.headline.color": "onSurfaceVariant",
+  "md.comp.navigation-drawer.headline.text-style": "titleSmall",
+  "md.comp.navigation-drawer.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.navigation-drawer.icon.size": 24.0,
+  "md.comp.navigation-drawer.inactive.focus.icon.color": "onSurface",
+  "md.comp.navigation-drawer.inactive.focus.label-text.color": "onSurface",
+  "md.comp.navigation-drawer.inactive.focus.state-layer.color": "onSurface",
+  "md.comp.navigation-drawer.inactive.hover.icon.color": "onSurface",
+  "md.comp.navigation-drawer.inactive.hover.label-text.color": "onSurface",
+  "md.comp.navigation-drawer.inactive.hover.state-layer.color": "onSurface",
+  "md.comp.navigation-drawer.inactive.icon.color": "onSurfaceVariant",
+  "md.comp.navigation-drawer.inactive.label-text.color": "onSurfaceVariant",
+  "md.comp.navigation-drawer.inactive.pressed.icon.color": "onSurface",
+  "md.comp.navigation-drawer.inactive.pressed.label-text.color": "onSurface",
+  "md.comp.navigation-drawer.inactive.pressed.state-layer.color": "onSecondaryContainer",
+  "md.comp.navigation-drawer.label-text.text-style": "labelLarge",
+  "md.comp.navigation-drawer.large-badge-label.color": "onSurfaceVariant",
+  "md.comp.navigation-drawer.large-badge-label.text-style": "labelLarge",
+  "md.comp.navigation-drawer.modal.container.elevation": "md.sys.elevation.level1",
+  "md.comp.navigation-drawer.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.navigation-drawer.scrim.color": "md.ref.palette.neutral-variant20",
+  "md.comp.navigation-drawer.scrim.opacity": 0.4,
+  "md.comp.navigation-drawer.standard.container.elevation": "md.sys.elevation.level0"
+}
diff --git a/dev/tools/gen_defaults/data/navigation_rail.json b/dev/tools/gen_defaults/data/navigation_rail.json
index b71e504e45..28a90c4778 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_98",
+  "version": "v0_99",
 
   "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/palette.json b/dev/tools/gen_defaults/data/palette.json
index 7cfcb226e6..0233c517dc 100644
--- a/dev/tools/gen_defaults/data/palette.json
+++ b/dev/tools/gen_defaults/data/palette.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "md.ref.palette.black": "0xFF000000",
   "md.ref.palette.error0": "0xFF000000",
diff --git a/dev/tools/gen_defaults/data/segmented_button_outlined.json b/dev/tools/gen_defaults/data/segmented_button_outlined.json
new file mode 100644
index 0000000000..36aeda3bb5
--- /dev/null
+++ b/dev/tools/gen_defaults/data/segmented_button_outlined.json
@@ -0,0 +1,42 @@
+{
+  "version": "v0_99",
+
+  "md.comp.outlined-segmented-button.container.height": 40.0,
+  "md.comp.outlined-segmented-button.disabled.icon.color": "onSurface",
+  "md.comp.outlined-segmented-button.disabled.icon.opacity": 0.38,
+  "md.comp.outlined-segmented-button.disabled.label-text.color": "onSurface",
+  "md.comp.outlined-segmented-button.disabled.label-text.opacity": 0.38,
+  "md.comp.outlined-segmented-button.disabled.outline.color": "onSurface",
+  "md.comp.outlined-segmented-button.disabled.outline.opacity": 0.12,
+  "md.comp.outlined-segmented-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.outlined-segmented-button.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.outlined-segmented-button.label-text.text-style": "labelLarge",
+  "md.comp.outlined-segmented-button.outline.color": "outline",
+  "md.comp.outlined-segmented-button.outline.width": 1.0,
+  "md.comp.outlined-segmented-button.pressed.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.outlined-segmented-button.selected.container.color": "secondaryContainer",
+  "md.comp.outlined-segmented-button.selected.focus.icon.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.focus.label-text.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.focus.state-layer.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.hover.icon.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.hover.label-text.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.hover.state-layer.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.label-text.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.pressed.icon.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.pressed.label-text.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.pressed.state-layer.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.selected.with-icon.icon.color": "onSecondaryContainer",
+  "md.comp.outlined-segmented-button.shape": "md.sys.shape.corner.full",
+  "md.comp.outlined-segmented-button.unselected.focus.icon.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.focus.label-text.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.focus.state-layer.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.hover.icon.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.hover.label-text.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.hover.state-layer.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.label-text.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.pressed.icon.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.pressed.label-text.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.pressed.state-layer.color": "onSurface",
+  "md.comp.outlined-segmented-button.unselected.with-icon.icon.color": "onSurface",
+  "md.comp.outlined-segmented-button.with-icon.icon.size": 18.0
+}
diff --git a/dev/tools/gen_defaults/data/shape.json b/dev/tools/gen_defaults/data/shape.json
index 3504e2b055..217c3f97f1 100644
--- a/dev/tools/gen_defaults/data/shape.json
+++ b/dev/tools/gen_defaults/data/shape.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "md.sys.shape.corner.extra-large": {
     "family": "SHAPE_FAMILY_ROUNDED_CORNERS",
diff --git a/dev/tools/gen_defaults/data/slider.json b/dev/tools/gen_defaults/data/slider.json
index 492bb1cf8e..655054f7b7 100644
--- a/dev/tools/gen_defaults/data/slider.json
+++ b/dev/tools/gen_defaults/data/slider.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "md.comp.slider.active.track.color": "primary",
   "md.comp.slider.active.track.height": 6.0,
diff --git a/dev/tools/gen_defaults/data/state.json b/dev/tools/gen_defaults/data/state.json
index c6e4930511..a3d7c62d09 100644
--- a/dev/tools/gen_defaults/data/state.json
+++ b/dev/tools/gen_defaults/data/state.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "md.sys.state.dragged.state-layer-opacity": 0.16,
   "md.sys.state.focus.state-layer-opacity": 0.12,
diff --git a/dev/tools/gen_defaults/data/switch.json b/dev/tools/gen_defaults/data/switch.json
new file mode 100644
index 0000000000..def71f3851
--- /dev/null
+++ b/dev/tools/gen_defaults/data/switch.json
@@ -0,0 +1,73 @@
+{
+  "version": "v0_99",
+
+  "md.comp.switch.disabled.selected.handle.color": "surface",
+  "md.comp.switch.disabled.selected.handle.opacity": 1.0,
+  "md.comp.switch.disabled.selected.icon.color": "onSurface",
+  "md.comp.switch.disabled.selected.icon.opacity": 0.38,
+  "md.comp.switch.disabled.selected.track.color": "onSurface",
+  "md.comp.switch.disabled.track.opacity": 0.12,
+  "md.comp.switch.disabled.unselected.handle.color": "onSurface",
+  "md.comp.switch.disabled.unselected.handle.opacity": 0.38,
+  "md.comp.switch.disabled.unselected.icon.color": "surfaceVariant",
+  "md.comp.switch.disabled.unselected.icon.opacity": 0.38,
+  "md.comp.switch.disabled.unselected.track.color": "surfaceVariant",
+  "md.comp.switch.disabled.unselected.track.outline.color": "onSurface",
+  "md.comp.switch.handle.shape": "md.sys.shape.corner.full",
+  "md.comp.switch.pressed.handle.height": 28.0,
+  "md.comp.switch.pressed.handle.width": 28.0,
+  "md.comp.switch.selected.focus.handle.color": "primaryContainer",
+  "md.comp.switch.selected.focus.icon.color": "onPrimaryContainer",
+  "md.comp.switch.selected.focus.state-layer.color": "primary",
+  "md.comp.switch.selected.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.switch.selected.focus.track.color": "primary",
+  "md.comp.switch.selected.handle.color": "onPrimary",
+  "md.comp.switch.selected.handle.height": 24.0,
+  "md.comp.switch.selected.handle.width": 24.0,
+  "md.comp.switch.selected.hover.handle.color": "primaryContainer",
+  "md.comp.switch.selected.hover.icon.color": "onPrimaryContainer",
+  "md.comp.switch.selected.hover.state-layer.color": "primary",
+  "md.comp.switch.selected.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.switch.selected.hover.track.color": "primary",
+  "md.comp.switch.selected.icon.color": "onPrimaryContainer",
+  "md.comp.switch.selected.icon.size": 16.0,
+  "md.comp.switch.selected.pressed.handle.color": "primaryContainer",
+  "md.comp.switch.selected.pressed.icon.color": "onPrimaryContainer",
+  "md.comp.switch.selected.pressed.state-layer.color": "primary",
+  "md.comp.switch.selected.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.switch.selected.pressed.track.color": "primary",
+  "md.comp.switch.selected.track.color": "primary",
+  "md.comp.switch.state-layer.shape": "md.sys.shape.corner.full",
+  "md.comp.switch.state-layer.size": 40.0,
+  "md.comp.switch.track.height": 32.0,
+  "md.comp.switch.track.outline.width": 2.0,
+  "md.comp.switch.track.shape": "md.sys.shape.corner.full",
+  "md.comp.switch.track.width": 52.0,
+  "md.comp.switch.unselected.focus.handle.color": "onSurfaceVariant",
+  "md.comp.switch.unselected.focus.icon.color": "surfaceVariant",
+  "md.comp.switch.unselected.focus.state-layer.color": "onSurface",
+  "md.comp.switch.unselected.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.switch.unselected.focus.track.color": "surfaceVariant",
+  "md.comp.switch.unselected.focus.track.outline.color": "outline",
+  "md.comp.switch.unselected.handle.color": "outline",
+  "md.comp.switch.unselected.handle.height": 16.0,
+  "md.comp.switch.unselected.handle.width": 16.0,
+  "md.comp.switch.unselected.hover.handle.color": "onSurfaceVariant",
+  "md.comp.switch.unselected.hover.icon.color": "surfaceVariant",
+  "md.comp.switch.unselected.hover.state-layer.color": "onSurface",
+  "md.comp.switch.unselected.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.switch.unselected.hover.track.color": "surfaceVariant",
+  "md.comp.switch.unselected.hover.track.outline.color": "outline",
+  "md.comp.switch.unselected.icon.color": "surfaceVariant",
+  "md.comp.switch.unselected.icon.size": 16.0,
+  "md.comp.switch.unselected.pressed.handle.color": "onSurfaceVariant",
+  "md.comp.switch.unselected.pressed.icon.color": "surfaceVariant",
+  "md.comp.switch.unselected.pressed.state-layer.color": "onSurface",
+  "md.comp.switch.unselected.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.switch.unselected.pressed.track.color": "surfaceVariant",
+  "md.comp.switch.unselected.pressed.track.outline.color": "outline",
+  "md.comp.switch.unselected.track.color": "surfaceVariant",
+  "md.comp.switch.unselected.track.outline.color": "outline",
+  "md.comp.switch.with-icon.handle.height": 24.0,
+  "md.comp.switch.with-icon.handle.width": 24.0
+}
diff --git a/dev/tools/gen_defaults/data/text_field_filled.json b/dev/tools/gen_defaults/data/text_field_filled.json
new file mode 100644
index 0000000000..77fbc7a746
--- /dev/null
+++ b/dev/tools/gen_defaults/data/text_field_filled.json
@@ -0,0 +1,75 @@
+{
+  "version": "v0_99",
+
+  "md.comp.filled-text-field.active-indicator.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.active-indicator.height": 1.0,
+  "md.comp.filled-text-field.caret.color": "primary",
+  "md.comp.filled-text-field.container.color": "surfaceVariant",
+  "md.comp.filled-text-field.container.height": 56.0,
+  "md.comp.filled-text-field.container.shape": "md.sys.shape.corner.extra-small.top",
+  "md.comp.filled-text-field.disabled.active-indicator.color": "onSurface",
+  "md.comp.filled-text-field.disabled.active-indicator.height": 1.0,
+  "md.comp.filled-text-field.disabled.active-indicator.opacity": 0.38,
+  "md.comp.filled-text-field.disabled.container.color": "onSurface",
+  "md.comp.filled-text-field.disabled.container.opacity": 0.04,
+  "md.comp.filled-text-field.disabled.input-text.color": "onSurface",
+  "md.comp.filled-text-field.disabled.input-text.opacity": 0.38,
+  "md.comp.filled-text-field.disabled.label-text.color": "onSurface",
+  "md.comp.filled-text-field.disabled.label-text.opacity": 0.38,
+  "md.comp.filled-text-field.disabled.leading-icon.color": "onSurface",
+  "md.comp.filled-text-field.disabled.leading-icon.opacity": 0.38,
+  "md.comp.filled-text-field.disabled.supporting-text.color": "onSurface",
+  "md.comp.filled-text-field.disabled.supporting-text.opacity": 0.38,
+  "md.comp.filled-text-field.disabled.trailing-icon.color": "onSurface",
+  "md.comp.filled-text-field.disabled.trailing-icon.opacity": 0.38,
+  "md.comp.filled-text-field.error.active-indicator.color": "error",
+  "md.comp.filled-text-field.error.focus.active-indicator.color": "error",
+  "md.comp.filled-text-field.error.focus.caret.color": "error",
+  "md.comp.filled-text-field.error.focus.input-text.color": "onSurface",
+  "md.comp.filled-text-field.error.focus.label-text.color": "error",
+  "md.comp.filled-text-field.error.focus.leading-icon.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.error.focus.supporting-text.color": "error",
+  "md.comp.filled-text-field.error.focus.trailing-icon.color": "error",
+  "md.comp.filled-text-field.error.hover.active-indicator.color": "onErrorContainer",
+  "md.comp.filled-text-field.error.hover.input-text.color": "onSurface",
+  "md.comp.filled-text-field.error.hover.label-text.color": "onErrorContainer",
+  "md.comp.filled-text-field.error.hover.leading-icon.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.error.hover.state-layer.color": "onSurface",
+  "md.comp.filled-text-field.error.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.filled-text-field.error.hover.supporting-text.color": "error",
+  "md.comp.filled-text-field.error.hover.trailing-icon.color": "onErrorContainer",
+  "md.comp.filled-text-field.error.input-text.color": "onSurface",
+  "md.comp.filled-text-field.error.label-text.color": "error",
+  "md.comp.filled-text-field.error.leading-icon.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.error.supporting-text.color": "error",
+  "md.comp.filled-text-field.error.trailing-icon.color": "error",
+  "md.comp.filled-text-field.focus.active-indicator.color": "primary",
+  "md.comp.filled-text-field.focus.active-indicator.height": 2.0,
+  "md.comp.filled-text-field.focus.input-text.color": "onSurface",
+  "md.comp.filled-text-field.focus.label-text.color": "primary",
+  "md.comp.filled-text-field.focus.leading-icon.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.focus.supporting-text.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.focus.trailing-icon.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.hover.active-indicator.color": "onSurface",
+  "md.comp.filled-text-field.hover.active-indicator.height": 1.0,
+  "md.comp.filled-text-field.hover.input-text.color": "onSurface",
+  "md.comp.filled-text-field.hover.label-text.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.hover.leading-icon.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.hover.state-layer.color": "onSurface",
+  "md.comp.filled-text-field.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.filled-text-field.hover.supporting-text.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.hover.trailing-icon.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.input-text.color": "onSurface",
+  "md.comp.filled-text-field.input-text.text-style": "bodyLarge",
+  "md.comp.filled-text-field.input-text.placeholder.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.input-text.prefix.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.input-text.suffix.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.label-text.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.label-text.text-style": "bodyLarge",
+  "md.comp.filled-text-field.leading-icon.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.leading-icon.size": 20.0,
+  "md.comp.filled-text-field.supporting-text.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.supporting-text.text-style": "bodySmall",
+  "md.comp.filled-text-field.trailing-icon.color": "onSurfaceVariant",
+  "md.comp.filled-text-field.trailing-icon.size": 24.0
+}
diff --git a/dev/tools/gen_defaults/data/text_field_outlined.json b/dev/tools/gen_defaults/data/text_field_outlined.json
new file mode 100644
index 0000000000..3103c9ed74
--- /dev/null
+++ b/dev/tools/gen_defaults/data/text_field_outlined.json
@@ -0,0 +1,68 @@
+{
+  "version": "v0_99",
+
+  "md.comp.outlined-text-field.caret.color": "primary",
+  "md.comp.outlined-text-field.container.height": 56.0,
+  "md.comp.outlined-text-field.container.shape": "md.sys.shape.corner.extra-small",
+  "md.comp.outlined-text-field.disabled.input-text.color": "onSurface",
+  "md.comp.outlined-text-field.disabled.input-text.opacity": 0.38,
+  "md.comp.outlined-text-field.disabled.label-text.color": "onSurface",
+  "md.comp.outlined-text-field.disabled.label-text.opacity": 0.38,
+  "md.comp.outlined-text-field.disabled.leading-icon.color": "onSurface",
+  "md.comp.outlined-text-field.disabled.leading-icon.opacity": 0.38,
+  "md.comp.outlined-text-field.disabled.outline.color": "onSurface",
+  "md.comp.outlined-text-field.disabled.outline.opacity": 0.12,
+  "md.comp.outlined-text-field.disabled.outline.width": 1.0,
+  "md.comp.outlined-text-field.disabled.supporting-text.color": "onSurface",
+  "md.comp.outlined-text-field.disabled.supporting-text.opacity": 0.38,
+  "md.comp.outlined-text-field.disabled.trailing-icon.color": "onSurface",
+  "md.comp.outlined-text-field.disabled.trailing-icon.opacity": 0.38,
+  "md.comp.outlined-text-field.error.focus.caret.color": "error",
+  "md.comp.outlined-text-field.error.focus.input-text.color": "onSurface",
+  "md.comp.outlined-text-field.error.focus.label-text.color": "error",
+  "md.comp.outlined-text-field.error.focus.leading-icon.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.error.focus.outline.color": "error",
+  "md.comp.outlined-text-field.error.focus.supporting-text.color": "error",
+  "md.comp.outlined-text-field.error.focus.trailing-icon.color": "error",
+  "md.comp.outlined-text-field.error.hover.input-text.color": "onSurface",
+  "md.comp.outlined-text-field.error.hover.label-text.color": "onErrorContainer",
+  "md.comp.outlined-text-field.error.hover.leading-icon.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.error.hover.outline.color": "onErrorContainer",
+  "md.comp.outlined-text-field.error.hover.supporting-text.color": "error",
+  "md.comp.outlined-text-field.error.hover.trailing-icon.color": "onErrorContainer",
+  "md.comp.outlined-text-field.error.input-text.color": "onSurface",
+  "md.comp.outlined-text-field.error.label-text.color": "error",
+  "md.comp.outlined-text-field.error.leading-icon.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.error.outline.color": "error",
+  "md.comp.outlined-text-field.error.supporting-text.color": "error",
+  "md.comp.outlined-text-field.error.trailing-icon.color": "error",
+  "md.comp.outlined-text-field.focus.input-text.color": "onSurface",
+  "md.comp.outlined-text-field.focus.label-text.color": "primary",
+  "md.comp.outlined-text-field.focus.leading-icon.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.focus.outline.color": "primary",
+  "md.comp.outlined-text-field.focus.outline.width": 2.0,
+  "md.comp.outlined-text-field.focus.supporting-text.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.focus.trailing-icon.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.hover.input-text.color": "onSurface",
+  "md.comp.outlined-text-field.hover.label-text.color": "onSurface",
+  "md.comp.outlined-text-field.hover.leading-icon.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.hover.outline.color": "onSurface",
+  "md.comp.outlined-text-field.hover.outline.width": 1.0,
+  "md.comp.outlined-text-field.hover.supporting-text.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.hover.trailing-icon.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.input-text.color": "onSurface",
+  "md.comp.outlined-text-field.input-text.text-style": "bodyLarge",
+  "md.comp.outlined-text-field.input-text.placeholder.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.input-text.prefix.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.input-text.suffix.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.label-text.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.label-text.text-style": "bodyLarge",
+  "md.comp.outlined-text-field.leading-icon.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.leading-icon.size": 24.0,
+  "md.comp.outlined-text-field.outline.color": "outline",
+  "md.comp.outlined-text-field.outline.width": 1.0,
+  "md.comp.outlined-text-field.supporting-text.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.supporting-text.text-style": "bodySmall",
+  "md.comp.outlined-text-field.trailing-icon.color": "onSurfaceVariant",
+  "md.comp.outlined-text-field.trailing-icon.size": 24.0
+}
diff --git a/dev/tools/gen_defaults/data/text_style.json b/dev/tools/gen_defaults/data/text_style.json
index 74432e1574..afab052db3 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_98",
+  "version": "v0_99",
 
   "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
new file mode 100644
index 0000000000..b016746124
--- /dev/null
+++ b/dev/tools/gen_defaults/data/time_picker.json
@@ -0,0 +1,76 @@
+{
+  "version": "v0_99",
+
+  "md.comp.time-picker.clock-dial.color.ignore": "onSurfaceVariant",
+  "md.comp.time-picker.clock-dial.container.size": 256.0,
+  "md.comp.time-picker.clock-dial.label-text.text-style": "bodyLarge",
+  "md.comp.time-picker.clock-dial.selected.label-text.color": "onSurface",
+  "md.comp.time-picker.clock-dial.selector.center.container.color": "primary",
+  "md.comp.time-picker.clock-dial.selector.center.container.shape": "md.sys.shape.corner.full",
+  "md.comp.time-picker.clock-dial.selector.center.container.size": 8.0,
+  "md.comp.time-picker.clock-dial.selector.handle.container.color": "primary",
+  "md.comp.time-picker.clock-dial.selector.handle.container.shape": "md.sys.shape.corner.full",
+  "md.comp.time-picker.clock-dial.selector.handle.container.size": 48.0,
+  "md.comp.time-picker.clock-dial.selector.track.container.color": "primary",
+  "md.comp.time-picker.clock-dial.selector.track.container.width": 2.0,
+  "md.comp.time-picker.clock-dial.shape.ignore": "md.sys.shape.corner.full",
+  "md.comp.time-picker.clock-dial.unselected.label-text.color": "onPrimary",
+  "md.comp.time-picker.container.color": "surface",
+  "md.comp.time-picker.container.elevation": "md.sys.elevation.level3",
+  "md.comp.time-picker.container.shape": "md.sys.shape.corner.extra-large",
+  "md.comp.time-picker.headline.color": "onSurfaceVariant",
+  "md.comp.time-picker.headline.text-style": "labelMedium",
+  "md.comp.time-picker.period-selector.container.shape": "md.sys.shape.corner.small",
+  "md.comp.time-picker.period-selector.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.time-picker.period-selector.horizontal.container.height": 38.0,
+  "md.comp.time-picker.period-selector.horizontal.container.width": 216.0,
+  "md.comp.time-picker.period-selector.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.time-picker.period-selector.label-text.text-style": "titleMedium",
+  "md.comp.time-picker.period-selector.outline.color": "outline",
+  "md.comp.time-picker.period-selector.outline.width": 1.0,
+  "md.comp.time-picker.period-selector.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.time-picker.period-selector.selected.container.color": "tertiaryContainer",
+  "md.comp.time-picker.period-selector.selected.focus.label-text.color": "onTertiaryContainer",
+  "md.comp.time-picker.period-selector.selected.focus.state-layer.color": "onTertiaryContainer",
+  "md.comp.time-picker.period-selector.selected.hover.label-text.color": "onTertiaryContainer",
+  "md.comp.time-picker.period-selector.selected.hover.state-layer.color": "onTertiaryContainer",
+  "md.comp.time-picker.period-selector.selected.label-text.color": "onTertiaryContainer",
+  "md.comp.time-picker.period-selector.selected.pressed.label-text.color": "onTertiaryContainer",
+  "md.comp.time-picker.period-selector.selected.pressed.state-layer.color": "onTertiaryContainer",
+  "md.comp.time-picker.period-selector.unselected.focus.label-text.color": "onSurfaceVariant",
+  "md.comp.time-picker.period-selector.unselected.focus.state-layer.color": "onSurfaceVariant",
+  "md.comp.time-picker.period-selector.unselected.hover.label-text.color": "onSurfaceVariant",
+  "md.comp.time-picker.period-selector.unselected.hover.state-layer.color": "onSurfaceVariant",
+  "md.comp.time-picker.period-selector.unselected.label-text.color": "onSurfaceVariant",
+  "md.comp.time-picker.period-selector.unselected.pressed.label-text.color": "onSurfaceVariant",
+  "md.comp.time-picker.period-selector.unselected.pressed.state-layer.color": "onSurfaceVariant",
+  "md.comp.time-picker.period-selector.vertical.container.height": 80.0,
+  "md.comp.time-picker.period-selector.vertical.container.width": 52.0,
+  "md.comp.time-picker.surface-tint-layer.color": "surfaceTint",
+  "md.comp.time-picker.time-selector.24h-vertical.container.width": 114.0,
+  "md.comp.time-picker.time-selector.container.height": 80.0,
+  "md.comp.time-picker.time-selector.container.shape": "md.sys.shape.corner.small",
+  "md.comp.time-picker.time-selector.container.width": 96.0,
+  "md.comp.time-picker.time-selector.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.time-picker.time-selector.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.time-picker.time-selector.label-text.text-style": "displayLarge",
+  "md.comp.time-picker.time-selector.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.time-picker.time-selector.selected.container.color": "primaryContainer",
+  "md.comp.time-picker.time-selector.selected.focus.label-text.color": "onPrimaryContainer",
+  "md.comp.time-picker.time-selector.selected.focus.state-layer.color": "onPrimaryContainer",
+  "md.comp.time-picker.time-selector.selected.hover.label-text.color": "onPrimaryContainer",
+  "md.comp.time-picker.time-selector.selected.hover.state-layer.color": "onPrimaryContainer",
+  "md.comp.time-picker.time-selector.selected.label-text.color": "onPrimaryContainer",
+  "md.comp.time-picker.time-selector.selected.pressed.label-text.color": "onPrimaryContainer",
+  "md.comp.time-picker.time-selector.selected.pressed.state-layer.color": "onPrimaryContainer",
+  "md.comp.time-picker.time-selector.separator.color": "onSurface",
+  "md.comp.time-picker.time-selector.separator.text-style": "displayLarge",
+  "md.comp.time-picker.time-selector.unselected.container.color": "surfaceVariant",
+  "md.comp.time-picker.time-selector.unselected.focus.label-text.color": "onSurface",
+  "md.comp.time-picker.time-selector.unselected.focus.state-layer.color": "onSurface",
+  "md.comp.time-picker.time-selector.unselected.hover.label-text.color": "onSurface",
+  "md.comp.time-picker.time-selector.unselected.hover.state-layer.color": "onSurface",
+  "md.comp.time-picker.time-selector.unselected.label-text.color": "onSurface",
+  "md.comp.time-picker.time-selector.unselected.pressed.label-text.color": "onSurface",
+  "md.comp.time-picker.time-selector.unselected.pressed.state-layer.color": "onSurface"
+}
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 d75bd9dc4d..56ecb1cc0c 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_98",
+  "version": "v0_99",
 
   "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 f78adb05df..45ac1668ea 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_98",
+  "version": "v0_99",
 
   "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 f3f66214e9..0ab201c001 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_98",
+  "version": "v0_99",
 
   "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 c5a1527f0b..9e0cb89023 100644
--- a/dev/tools/gen_defaults/data/typeface.json
+++ b/dev/tools/gen_defaults/data/typeface.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_98",
+  "version": "v0_99",
 
   "md.ref.typeface.brand": "Roboto",
   "md.ref.typeface.plain": "Roboto",
diff --git a/dev/tools/gen_defaults/lib/icon_button_template.dart b/dev/tools/gen_defaults/lib/icon_button_template.dart
index c521958c07..bb1d394e21 100644
--- a/dev/tools/gen_defaults/lib/icon_button_template.dart
+++ b/dev/tools/gen_defaults/lib/icon_button_template.dart
@@ -32,20 +32,24 @@ class _TokenDefaultsM3 extends ButtonStyle {
   @override
   MaterialStateProperty<Color?>? get foregroundColor =>
     MaterialStateProperty.resolveWith((Set<MaterialState> states) {
-      if (states.contains(MaterialState.disabled))
+      if (states.contains(MaterialState.disabled)) {
         return ${componentColor('md.comp.icon-button.disabled.icon')};
+      }
       return ${componentColor('md.comp.icon-button.unselected.icon')};
     });
 
  @override
   MaterialStateProperty<Color?>? get overlayColor =>
     MaterialStateProperty.resolveWith((Set<MaterialState> states) {
-      if (states.contains(MaterialState.hovered))
+      if (states.contains(MaterialState.hovered)) {
         return ${componentColor('md.comp.icon-button.unselected.hover.state-layer')};
-      if (states.contains(MaterialState.focused))
+      }
+      if (states.contains(MaterialState.focused)) {
         return ${componentColor('md.comp.icon-button.unselected.focus.state-layer')};
-      if (states.contains(MaterialState.pressed))
+      }
+      if (states.contains(MaterialState.pressed)) {
         return ${componentColor('md.comp.icon-button.unselected.pressed.state-layer')};
+      }
       return null;
     });
 
@@ -80,8 +84,9 @@ class _TokenDefaultsM3 extends ButtonStyle {
   @override
   MaterialStateProperty<MouseCursor?>? get mouseCursor =>
     MaterialStateProperty.resolveWith((Set<MaterialState> states) {
-      if (states.contains(MaterialState.disabled))
+      if (states.contains(MaterialState.disabled)) {
         return SystemMouseCursors.basic;
+      }
       return SystemMouseCursors.click;
     });
 
diff --git a/packages/flutter/lib/src/material/app_bar.dart b/packages/flutter/lib/src/material/app_bar.dart
index 26c8823943..195e0235de 100644
--- a/packages/flutter/lib/src/material/app_bar.dart
+++ b/packages/flutter/lib/src/material/app_bar.dart
@@ -2318,7 +2318,7 @@ class _DefaultsM2 extends AppBarTheme {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends AppBarTheme {
   _TokenDefaultsM3(this.context)
     : super(
diff --git a/packages/flutter/lib/src/material/card.dart b/packages/flutter/lib/src/material/card.dart
index 4d4891516b..f98847e2ff 100644
--- a/packages/flutter/lib/src/material/card.dart
+++ b/packages/flutter/lib/src/material/card.dart
@@ -211,7 +211,7 @@ class _DefaultsM2 extends CardTheme {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends CardTheme {
   const _TokenDefaultsM3(this.context)
     : super(
diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart
index 4986177e88..5fbbe9a18c 100644
--- a/packages/flutter/lib/src/material/dialog.dart
+++ b/packages/flutter/lib/src/material/dialog.dart
@@ -1211,7 +1211,7 @@ class _DefaultsM2 extends DialogTheme {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends DialogTheme {
   _TokenDefaultsM3(this.context)
     : super(
diff --git a/packages/flutter/lib/src/material/elevated_button.dart b/packages/flutter/lib/src/material/elevated_button.dart
index cb570834ce..819adf1926 100644
--- a/packages/flutter/lib/src/material/elevated_button.dart
+++ b/packages/flutter/lib/src/material/elevated_button.dart
@@ -505,7 +505,7 @@ class _ElevatedButtonWithIconChild extends StatelessWidget {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends ButtonStyle {
   _TokenDefaultsM3(this.context)
    : super(
diff --git a/packages/flutter/lib/src/material/elevation_overlay.dart b/packages/flutter/lib/src/material/elevation_overlay.dart
index f44dd97e96..dbe3cdbfba 100644
--- a/packages/flutter/lib/src/material/elevation_overlay.dart
+++ b/packages/flutter/lib/src/material/elevation_overlay.dart
@@ -157,7 +157,7 @@ class _ElevationOpacity {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 
 // Surface tint opacities based on elevations according to the
 // Material Design 3 specification:
diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
index ee97b6746f..599dee3da6 100644
--- a/packages/flutter/lib/src/material/floating_action_button.dart
+++ b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -782,7 +782,7 @@ class _M2Defaults extends FloatingActionButtonThemeData {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends FloatingActionButtonThemeData {
   _TokenDefaultsM3(this.context, this.type, this.hasChild)
     : super(
diff --git a/packages/flutter/lib/src/material/icon_button.dart b/packages/flutter/lib/src/material/icon_button.dart
index 3b571ece71..2e67fd182a 100644
--- a/packages/flutter/lib/src/material/icon_button.dart
+++ b/packages/flutter/lib/src/material/icon_button.dart
@@ -726,7 +726,7 @@ class _IconButtonDefaultMouseCursor extends MaterialStateProperty<MouseCursor> w
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends ButtonStyle {
   _TokenDefaultsM3(this.context)
     : super(
diff --git a/packages/flutter/lib/src/material/navigation_bar.dart b/packages/flutter/lib/src/material/navigation_bar.dart
index f695205573..2039eb735b 100644
--- a/packages/flutter/lib/src/material/navigation_bar.dart
+++ b/packages/flutter/lib/src/material/navigation_bar.dart
@@ -1211,7 +1211,7 @@ class _Defaults extends NavigationBarThemeData {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends NavigationBarThemeData {
   _TokenDefaultsM3(this.context)
       : super(
diff --git a/packages/flutter/lib/src/material/navigation_rail.dart b/packages/flutter/lib/src/material/navigation_rail.dart
index b83965b414..ba65683da1 100644
--- a/packages/flutter/lib/src/material/navigation_rail.dart
+++ b/packages/flutter/lib/src/material/navigation_rail.dart
@@ -956,7 +956,7 @@ class _DefaultsM2 extends NavigationRailThemeData {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends NavigationRailThemeData {
   _TokenDefaultsM3(this.context)
       : super(
diff --git a/packages/flutter/lib/src/material/outlined_button.dart b/packages/flutter/lib/src/material/outlined_button.dart
index 7e21de3a0b..f9bf0467fa 100644
--- a/packages/flutter/lib/src/material/outlined_button.dart
+++ b/packages/flutter/lib/src/material/outlined_button.dart
@@ -423,7 +423,7 @@ class _OutlinedButtonWithIconChild extends StatelessWidget {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends ButtonStyle {
   _TokenDefaultsM3(this.context)
    : super(
diff --git a/packages/flutter/lib/src/material/text_button.dart b/packages/flutter/lib/src/material/text_button.dart
index e1936d501f..a26e114b45 100644
--- a/packages/flutter/lib/src/material/text_button.dart
+++ b/packages/flutter/lib/src/material/text_button.dart
@@ -461,7 +461,7 @@ class _TextButtonWithIconChild extends StatelessWidget {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _TokenDefaultsM3 extends ButtonStyle {
   _TokenDefaultsM3(this.context)
    : super(
diff --git a/packages/flutter/lib/src/material/typography.dart b/packages/flutter/lib/src/material/typography.dart
index 9479b26104..d374e5024e 100644
--- a/packages/flutter/lib/src/material/typography.dart
+++ b/packages/flutter/lib/src/material/typography.dart
@@ -731,7 +731,7 @@ class Typography with Diagnosticable {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_98
+// Generated version v0_99
 class _M3Typography {
   _M3Typography._();