diff --git a/dev/tools/gen_defaults/data/badge.json b/dev/tools/gen_defaults/data/badge.json
index 75f4d11e666..eaada6f38e2 100644
--- a/dev/tools/gen_defaults/data/badge.json
+++ b/dev/tools/gen_defaults/data/badge.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 89b9f0c369c..47721e9b7b5 100644
--- a/dev/tools/gen_defaults/data/banner.json
+++ b/dev/tools/gen_defaults/data/banner.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 a81c288951a..27893b31d76 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 e1160c22a40..e8dc5d82bae 100644
--- a/dev/tools/gen_defaults/data/button_elevated.json
+++ b/dev/tools/gen_defaults/data/button_elevated.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 8682eab411b..58b43bf3af2 100644
--- a/dev/tools/gen_defaults/data/button_filled.json
+++ b/dev/tools/gen_defaults/data/button_filled.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 d9e59ac3955..a702b58ee1d 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 5452ad53889..86e76bb2fdb 100644
--- a/dev/tools/gen_defaults/data/button_outlined.json
+++ b/dev/tools/gen_defaults/data/button_outlined.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 2671b56f11e..97e6a91d415 100644
--- a/dev/tools/gen_defaults/data/button_text.json
+++ b/dev/tools/gen_defaults/data/button_text.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 37191355334..8783ef9055d 100644
--- a/dev/tools/gen_defaults/data/card_elevated.json
+++ b/dev/tools/gen_defaults/data/card_elevated.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 6ae53de7b9a..d0f810ff3cf 100644
--- a/dev/tools/gen_defaults/data/card_filled.json
+++ b/dev/tools/gen_defaults/data/card_filled.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 ca20936deb8..b0eae4b6c98 100644
--- a/dev/tools/gen_defaults/data/card_outlined.json
+++ b/dev/tools/gen_defaults/data/card_outlined.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 2eeedfe34d0..81dbb979274 100644
--- a/dev/tools/gen_defaults/data/carousel_item.json
+++ b/dev/tools/gen_defaults/data/carousel_item.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 84071e5f49b..d9f358c22e8 100644
--- a/dev/tools/gen_defaults/data/checkbox.json
+++ b/dev/tools/gen_defaults/data/checkbox.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 698046ce883..d5487abad84 100644
--- a/dev/tools/gen_defaults/data/chip_assist.json
+++ b/dev/tools/gen_defaults/data/chip_assist.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "md.comp.assist-chip.container.height": 32.0,
   "md.comp.assist-chip.container.shape": "md.sys.shape.corner.small",
@@ -22,7 +22,7 @@
   "md.comp.assist-chip.flat.disabled.outline.color": "onSurface",
   "md.comp.assist-chip.flat.disabled.outline.opacity": 0.12,
   "md.comp.assist-chip.flat.focus.outline.color": "onSurface",
-  "md.comp.assist-chip.flat.outline.color": "outline",
+  "md.comp.assist-chip.flat.outline.color": "outlineVariant",
   "md.comp.assist-chip.flat.outline.width": 1.0,
   "md.comp.assist-chip.focus.indicator.color": "secondary",
   "md.comp.assist-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
diff --git a/dev/tools/gen_defaults/data/chip_filter.json b/dev/tools/gen_defaults/data/chip_filter.json
index 394358b931e..47f70563cf8 100644
--- a/dev/tools/gen_defaults/data/chip_filter.json
+++ b/dev/tools/gen_defaults/data/chip_filter.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "md.comp.filter-chip.container.height": 32.0,
   "md.comp.filter-chip.container.shape": "md.sys.shape.corner.small",
@@ -29,7 +29,7 @@
   "md.comp.filter-chip.flat.unselected.focus.container.elevation": "md.sys.elevation.level0",
   "md.comp.filter-chip.flat.unselected.focus.outline.color": "onSurfaceVariant",
   "md.comp.filter-chip.flat.unselected.hover.container.elevation": "md.sys.elevation.level0",
-  "md.comp.filter-chip.flat.unselected.outline.color": "outline",
+  "md.comp.filter-chip.flat.unselected.outline.color": "outlineVariant",
   "md.comp.filter-chip.flat.unselected.outline.width": 1.0,
   "md.comp.filter-chip.flat.unselected.pressed.container.elevation": "md.sys.elevation.level0",
   "md.comp.filter-chip.focus.indicator.color": "secondary",
diff --git a/dev/tools/gen_defaults/data/chip_input.json b/dev/tools/gen_defaults/data/chip_input.json
index c69edda6c65..7211e550c12 100644
--- a/dev/tools/gen_defaults/data/chip_input.json
+++ b/dev/tools/gen_defaults/data/chip_input.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "md.comp.input-chip.container.elevation": "md.sys.elevation.level0",
   "md.comp.input-chip.container.height": 32.0,
@@ -41,7 +41,7 @@
   "md.comp.input-chip.unselected.hover.state-layer.color": "onSurfaceVariant",
   "md.comp.input-chip.unselected.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
   "md.comp.input-chip.unselected.label-text.color": "onSurfaceVariant",
-  "md.comp.input-chip.unselected.outline.color": "outline",
+  "md.comp.input-chip.unselected.outline.color": "outlineVariant",
   "md.comp.input-chip.unselected.outline.width": 1.0,
   "md.comp.input-chip.unselected.pressed.label-text.color": "onSurfaceVariant",
   "md.comp.input-chip.unselected.pressed.state-layer.color": "onSurfaceVariant",
diff --git a/dev/tools/gen_defaults/data/chip_suggestion.json b/dev/tools/gen_defaults/data/chip_suggestion.json
index 630455b22fc..fa1576116d7 100644
--- a/dev/tools/gen_defaults/data/chip_suggestion.json
+++ b/dev/tools/gen_defaults/data/chip_suggestion.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "md.comp.suggestion-chip.container.height": 32.0,
   "md.comp.suggestion-chip.container.shape": "md.sys.shape.corner.small",
@@ -22,7 +22,7 @@
   "md.comp.suggestion-chip.flat.disabled.outline.color": "onSurface",
   "md.comp.suggestion-chip.flat.disabled.outline.opacity": 0.12,
   "md.comp.suggestion-chip.flat.focus.outline.color": "onSurfaceVariant",
-  "md.comp.suggestion-chip.flat.outline.color": "outline",
+  "md.comp.suggestion-chip.flat.outline.color": "outlineVariant",
   "md.comp.suggestion-chip.flat.outline.width": 1.0,
   "md.comp.suggestion-chip.focus.indicator.color": "secondary",
   "md.comp.suggestion-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
diff --git a/dev/tools/gen_defaults/data/color_dark.json b/dev/tools/gen_defaults/data/color_dark.json
index 039c15ef525..cc9742b14ae 100644
--- a/dev/tools/gen_defaults/data/color_dark.json
+++ b/dev/tools/gen_defaults/data/color_dark.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 1897c6484a3..c5da83532e7 100644
--- a/dev/tools/gen_defaults/data/color_light.json
+++ b/dev/tools/gen_defaults/data/color_light.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 f9a42c808b0..a48b605dc60 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 d45502680aa..847ba9521b3 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 0f413a82715..2ca47928d01 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 6fd221a5159..2b080d3dd67 100644
--- a/dev/tools/gen_defaults/data/dialog.json
+++ b/dev/tools/gen_defaults/data/dialog.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 3a350b57eb5..97a35c4a0a2 100644
--- a/dev/tools/gen_defaults/data/dialog_fullscreen.json
+++ b/dev/tools/gen_defaults/data/dialog_fullscreen.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 68433127307..c82e66599ca 100644
--- a/dev/tools/gen_defaults/data/divider.json
+++ b/dev/tools/gen_defaults/data/divider.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 cd3800cad0b..ebaacc92c28 100644
--- a/dev/tools/gen_defaults/data/elevation.json
+++ b/dev/tools/gen_defaults/data/elevation.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 f0ffeb7d18e..85408f4a73a 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 0fce9ad1faa..2c46ab3c51d 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 8e9f84bc393..5de1c2feb62 100644
--- a/dev/tools/gen_defaults/data/fab_primary.json
+++ b/dev/tools/gen_defaults/data/fab_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 3fc0d53f43d..b3a4fa899c0 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 58ce58e2d22..85fd1a1cdc8 100644
--- a/dev/tools/gen_defaults/data/icon_button.json
+++ b/dev/tools/gen_defaults/data/icon_button.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 f8751eb509d..4dca09885ae 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 6ac2f463be6..1bc5b748ac5 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 c2757573cff..85bb630f099 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 d58cf875303..419dfb51f61 100644
--- a/dev/tools/gen_defaults/data/list.json
+++ b/dev/tools/gen_defaults/data/list.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 41d9f13f2ba..8042d9b7404 100644
--- a/dev/tools/gen_defaults/data/menu.json
+++ b/dev/tools/gen_defaults/data/menu.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 8ea27b6234b..dbfecbe0f85 100644
--- a/dev/tools/gen_defaults/data/motion.json
+++ b/dev/tools/gen_defaults/data/motion.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 1fdfeb82787..087057aa759 100644
--- a/dev/tools/gen_defaults/data/navigation_bar.json
+++ b/dev/tools/gen_defaults/data/navigation_bar.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 94a706879bb..d1f4a1a6194 100644
--- a/dev/tools/gen_defaults/data/navigation_drawer.json
+++ b/dev/tools/gen_defaults/data/navigation_drawer.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 de818445429..b3a0e9152c6 100644
--- a/dev/tools/gen_defaults/data/navigation_rail.json
+++ b/dev/tools/gen_defaults/data/navigation_rail.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 400719833a2..c23bcf62f96 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 d69e6315bbe..031ae17c356 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 7fed7bca75f..5f2702699a1 100644
--- a/dev/tools/gen_defaults/data/palette.json
+++ b/dev/tools/gen_defaults/data/palette.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "md.ref.palette.black": "0xFF000000",
   "md.ref.palette.blue0": "0xFF000000",
diff --git a/dev/tools/gen_defaults/data/progress_indicator.json b/dev/tools/gen_defaults/data/progress_indicator.json
index 98e25bae64a..ca645371248 100644
--- a/dev/tools/gen_defaults/data/progress_indicator.json
+++ b/dev/tools/gen_defaults/data/progress_indicator.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "md.comp.progress-indicator.active-indicator.color": "primary",
   "md.comp.progress-indicator.active-indicator.shape": "md.sys.shape.corner.full",
diff --git a/dev/tools/gen_defaults/data/radio_button.json b/dev/tools/gen_defaults/data/radio_button.json
index 024d43a79d3..c80cc08b674 100644
--- a/dev/tools/gen_defaults/data/radio_button.json
+++ b/dev/tools/gen_defaults/data/radio_button.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 2feb74074f0..21f8ea33d03 100644
--- a/dev/tools/gen_defaults/data/search_bar.json
+++ b/dev/tools/gen_defaults/data/search_bar.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 f08363fc12e..6a64c68e52b 100644
--- a/dev/tools/gen_defaults/data/search_view.json
+++ b/dev/tools/gen_defaults/data/search_view.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 85ed082be4f..4cc46652e95 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 d1a76303072..7ba6d42d800 100644
--- a/dev/tools/gen_defaults/data/shape.json
+++ b/dev/tools/gen_defaults/data/shape.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 0b889ae7ec2..b6f1c3b5356 100644
--- a/dev/tools/gen_defaults/data/sheet_bottom.json
+++ b/dev/tools/gen_defaults/data/sheet_bottom.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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/slider.json b/dev/tools/gen_defaults/data/slider.json
index 5fdb2f013bb..8027a6ca981 100644
--- a/dev/tools/gen_defaults/data/slider.json
+++ b/dev/tools/gen_defaults/data/slider.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "md.comp.slider.active.handle.height": 44.0,
   "md.comp.slider.active.handle.leading-space": 6.0,
@@ -7,19 +7,21 @@
   "md.comp.slider.active.handle.shape": "md.sys.shape.corner.full",
   "md.comp.slider.active.handle.trailing-space": 6.0,
   "md.comp.slider.active.handle.width": 4.0,
+  "md.comp.slider.active.stop-indicator.container.color": "onPrimary",
+  "md.comp.slider.active.stop-indicator.container.opacity": 1.0,
   "md.comp.slider.active.track.color": "primary",
   "md.comp.slider.active.track.height": 16.0,
   "md.comp.slider.active.track.shape": "md.sys.shape.corner.full",
   "md.comp.slider.active.track.shape.leading": "md.sys.shape.corner.full",
+  "md.comp.slider.disabled.active.stop-indicator.container.color": "onInverseSurface",
   "md.comp.slider.disabled.active.track.color": "onSurface",
   "md.comp.slider.disabled.active.track.opacity": 0.38,
   "md.comp.slider.disabled.handle.color": "onSurface",
   "md.comp.slider.disabled.handle.opacity": 0.38,
   "md.comp.slider.disabled.handle.width": 4.0,
+  "md.comp.slider.disabled.inactive.stop-indicator.container.color": "onSurface",
   "md.comp.slider.disabled.inactive.track.color": "onSurface",
   "md.comp.slider.disabled.inactive.track.opacity": 0.12,
-  "md.comp.slider.disabled.stop-indicator.color": "onSurface",
-  "md.comp.slider.disabled.stop-indicator.color-selected": "onInverseSurface",
   "md.comp.slider.focus.active.track.color": "primary",
   "md.comp.slider.focus.handle.width": 2.0,
   "md.comp.slider.focus.inactive.track.color": "secondaryContainer",
@@ -28,6 +30,8 @@
   "md.comp.slider.handle.shape": "md.sys.shape.corner.full",
   "md.comp.slider.handle.width": 4.0,
   "md.comp.slider.hover.handle.width": 4.0,
+  "md.comp.slider.inactive.stop-indicator.container.color": "onSecondaryContainer",
+  "md.comp.slider.inactive.stop-indicator.container.opacity": 1.0,
   "md.comp.slider.inactive.track.color": "secondaryContainer",
   "md.comp.slider.inactive.track.height": 16.0,
   "md.comp.slider.inactive.track.shape": "md.sys.shape.corner.full",
@@ -36,8 +40,8 @@
   "md.comp.slider.pressed.handle.width": 2.0,
   "md.comp.slider.pressed.inactive.track.color": "secondaryContainer",
   "md.comp.slider.slider-active-handle-color": "primary",
-  "md.comp.slider.stop-indicator.color": "secondaryContainer",
-  "md.comp.slider.stop-indicator.color-selected": "secondaryContainer",
+  "md.comp.slider.stop-indicator.color": "onSecondaryContainer",
+  "md.comp.slider.stop-indicator.color-selected": "onPrimary",
   "md.comp.slider.stop-indicator.shape": "md.sys.shape.corner.full",
   "md.comp.slider.stop-indicator.size": 4.0,
   "md.comp.slider.stop-indicator.trailing-space": 6.0,
diff --git a/dev/tools/gen_defaults/data/snackbar.json b/dev/tools/gen_defaults/data/snackbar.json
index 2aef5e0d33f..7b3553f9d2d 100644
--- a/dev/tools/gen_defaults/data/snackbar.json
+++ b/dev/tools/gen_defaults/data/snackbar.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 40f9186a858..c69f16683dd 100644
--- a/dev/tools/gen_defaults/data/state.json
+++ b/dev/tools/gen_defaults/data/state.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 084ffe7cbbb..566ae177bf0 100644
--- a/dev/tools/gen_defaults/data/switch.json
+++ b/dev/tools/gen_defaults/data/switch.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 66af318bbc0..8301c7ae077 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 e3d3a666b81..0bbf62cbd67 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 38ab4784db7..a00552d6a59 100644
--- a/dev/tools/gen_defaults/data/text_style.json
+++ b/dev/tools/gen_defaults/data/text_style.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 6e7999dd1ba..f0f278bd37d 100644
--- a/dev/tools/gen_defaults/data/time_picker.json
+++ b/dev/tools/gen_defaults/data/time_picker.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 17cb6dd9da1..dbd16010dbe 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 64b333f05ff..7ac949c103e 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 441fb2dedac..37412544ee8 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": "5_0_0",
+  "version": "6_1_0",
 
   "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 f3e07539c90..ce44796e33f 100644
--- a/dev/tools/gen_defaults/data/typeface.json
+++ b/dev/tools/gen_defaults/data/typeface.json
@@ -1,5 +1,5 @@
 {
-  "version": "5_0_0",
+  "version": "6_1_0",
 
   "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 19db288b8e5..b7929b4c4a4 100644
--- a/dev/tools/gen_defaults/generated/used_tokens.csv
+++ b/dev/tools/gen_defaults/generated/used_tokens.csv
@@ -1,4 +1,4 @@
-Versions used, 5_0_0
+Versions used, 6_1_0
 md.comp.assist-chip.container.shape,
 md.comp.assist-chip.disabled.label-text.color,
 md.comp.assist-chip.elevated.container.color,
diff --git a/examples/api/test/material/material_state/material_state_border_side.0_test.dart b/examples/api/test/material/material_state/material_state_border_side.0_test.dart
index e03837e4376..737a6397079 100644
--- a/examples/api/test/material/material_state/material_state_border_side.0_test.dart
+++ b/examples/api/test/material/material_state/material_state_border_side.0_test.dart
@@ -50,7 +50,7 @@ void main() {
       await tester.tap(find.byType(FilterChip));
       await tester.pumpAndSettle();
 
-      expect(findBorderColor(const Color(0xff79747e)), findsOne);
+      expect(findBorderColor(const Color(0xffcac4d0)), findsOne);
     },
   );
 }
diff --git a/packages/flutter/lib/src/material/action_chip.dart b/packages/flutter/lib/src/material/action_chip.dart
index 7fecc69f6d1..5d58e0a3eba 100644
--- a/packages/flutter/lib/src/material/action_chip.dart
+++ b/packages/flutter/lib/src/material/action_chip.dart
@@ -316,7 +316,7 @@ class _ActionChipDefaultsM3 extends ChipThemeData {
   @override
   BorderSide? get side => _chipVariant == _ChipVariant.flat
     ? isEnabled
-        ? BorderSide(color: _colors.outline)
+        ? BorderSide(color: _colors.outlineVariant)
         : BorderSide(color: _colors.onSurface.withOpacity(0.12))
     : const BorderSide(color: Colors.transparent);
 
diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index 2538f8bec1a..2392098ed62 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -2441,7 +2441,7 @@ class _ChipDefaultsM3 extends ChipThemeData {
 
   @override
   BorderSide? get side => isEnabled
-    ? BorderSide(color: _colors.outline)
+    ? BorderSide(color: _colors.outlineVariant)
     : BorderSide(color: _colors.onSurface.withOpacity(0.12));
 
   @override
diff --git a/packages/flutter/lib/src/material/choice_chip.dart b/packages/flutter/lib/src/material/choice_chip.dart
index cde63057fc0..c6729d6717d 100644
--- a/packages/flutter/lib/src/material/choice_chip.dart
+++ b/packages/flutter/lib/src/material/choice_chip.dart
@@ -347,7 +347,7 @@ class _ChoiceChipDefaultsM3 extends ChipThemeData {
   @override
   BorderSide? get side => _chipVariant == _ChipVariant.flat && !isSelected
     ? isEnabled
-      ? BorderSide(color: _colors.outline)
+      ? BorderSide(color: _colors.outlineVariant)
       : BorderSide(color: _colors.onSurface.withOpacity(0.12))
     : const BorderSide(color: Colors.transparent);
 
diff --git a/packages/flutter/lib/src/material/filter_chip.dart b/packages/flutter/lib/src/material/filter_chip.dart
index 68e2f4f19be..7fa508a64f3 100644
--- a/packages/flutter/lib/src/material/filter_chip.dart
+++ b/packages/flutter/lib/src/material/filter_chip.dart
@@ -380,7 +380,7 @@ class _FilterChipDefaultsM3 extends ChipThemeData {
   @override
   BorderSide? get side => _chipVariant == _ChipVariant.flat && !isSelected
     ? isEnabled
-      ? BorderSide(color: _colors.outline)
+      ? BorderSide(color: _colors.outlineVariant)
       : BorderSide(color: _colors.onSurface.withOpacity(0.12))
     : const BorderSide(color: Colors.transparent);
 
diff --git a/packages/flutter/lib/src/material/input_chip.dart b/packages/flutter/lib/src/material/input_chip.dart
index 54986a27042..28a819b6aad 100644
--- a/packages/flutter/lib/src/material/input_chip.dart
+++ b/packages/flutter/lib/src/material/input_chip.dart
@@ -329,7 +329,7 @@ class _InputChipDefaultsM3 extends ChipThemeData {
   @override
   BorderSide? get side => !isSelected
     ? isEnabled
-      ? BorderSide(color: _colors.outline)
+      ? BorderSide(color: _colors.outlineVariant)
       : BorderSide(color: _colors.onSurface.withOpacity(0.12))
     : const BorderSide(color: Colors.transparent);
 
diff --git a/packages/flutter/test/material/action_chip_test.dart b/packages/flutter/test/material/action_chip_test.dart
index 92732d47cee..dc974a36709 100644
--- a/packages/flutter/test/material/action_chip_test.dart
+++ b/packages/flutter/test/material/action_chip_test.dart
@@ -166,7 +166,7 @@ void main() {
       chipMaterial.shape,
       RoundedRectangleBorder(
         borderRadius: const BorderRadius.all(Radius.circular(8.0)),
-        side: BorderSide(color: theme.colorScheme.outline),
+        side: BorderSide(color: theme.colorScheme.outlineVariant),
       ),
     );
 
diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index 87493946688..ace23b44b7f 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -260,7 +260,7 @@ void main() {
     expect(getMaterial(tester).color, null);
     expect(getMaterial(tester).elevation, 0);
     expect(getMaterial(tester).shape, RoundedRectangleBorder(
-      side: BorderSide(color: lightTheme.colorScheme.outline),
+      side: BorderSide(color: lightTheme.colorScheme.outlineVariant),
       borderRadius: BorderRadius.circular(8.0),
     ));
     expect(getIconData(tester).color, lightTheme.colorScheme.primary);
@@ -288,7 +288,7 @@ void main() {
     expect(getMaterial(tester).color, null);
     expect(getMaterial(tester).elevation, 0);
     expect(getMaterial(tester).shape, RoundedRectangleBorder(
-      side: BorderSide(color: darkTheme.colorScheme.outline),
+      side: BorderSide(color: darkTheme.colorScheme.outlineVariant),
       borderRadius: BorderRadius.circular(8.0),
     ));
     expect(getIconData(tester).color, darkTheme.colorScheme.primary);
@@ -4722,7 +4722,7 @@ void main() {
     ));
     final ShapeDecoration decoration = ink.decoration! as ShapeDecoration;
     expect(decoration.color, backgroundColor);
-    expect(decoration.shape, shape.copyWith(side: BorderSide(color: theme.colorScheme.outline)));
+    expect(decoration.shape, shape.copyWith(side: BorderSide(color: theme.colorScheme.outlineVariant)));
   });
 
   testWidgets('Chip highlight color is drawn on top of the backgroundColor', (WidgetTester tester) async {
@@ -4910,7 +4910,7 @@ void main() {
     // Chip should have the default side.
     expect(
       getMaterial(tester).shape,
-      StadiumBorder(side: BorderSide(color: theme.colorScheme.outline)),
+      StadiumBorder(side: BorderSide(color: theme.colorScheme.outlineVariant)),
     );
   });
 
diff --git a/packages/flutter/test/material/chip_theme_test.dart b/packages/flutter/test/material/chip_theme_test.dart
index cf1e14fd423..c72ed1b198e 100644
--- a/packages/flutter/test/material/chip_theme_test.dart
+++ b/packages/flutter/test/material/chip_theme_test.dart
@@ -198,7 +198,7 @@ void main() {
     expect(tester.getSize(find.byType(RawChip)), const Size(402, 252)); // label + padding + labelPadding
     expect(
       getMaterial(tester).shape,
-      chipTheme.shape?.copyWith(side: BorderSide(color: theme.colorScheme.outline)),
+      chipTheme.shape?.copyWith(side: BorderSide(color: theme.colorScheme.outlineVariant)),
     );
     expect(getLabelStyle(tester).style.fontSize, 32);
     expect(getIconData(tester).color, chipTheme.iconTheme!.color);
@@ -285,7 +285,7 @@ void main() {
     expect(getMaterial(tester).elevation, chipTheme.elevation);
     expect(
       getMaterial(tester).shape,
-      chipTheme.shape?.copyWith(side: BorderSide(color: theme.colorScheme.outline)),
+      chipTheme.shape?.copyWith(side: BorderSide(color: theme.colorScheme.outlineVariant)),
     );
     expect(getLabelStyle(tester).style.fontSize, 32);
     expect(getIconData(tester).color, chipTheme.iconTheme!.color);
diff --git a/packages/flutter/test/material/choice_chip_test.dart b/packages/flutter/test/material/choice_chip_test.dart
index 553aaeeba01..76ae42cfd12 100644
--- a/packages/flutter/test/material/choice_chip_test.dart
+++ b/packages/flutter/test/material/choice_chip_test.dart
@@ -215,7 +215,7 @@ void main() {
       chipMaterial.shape,
       RoundedRectangleBorder(
         borderRadius: const BorderRadius.all(Radius.circular(8.0)),
-        side: BorderSide(color: theme.colorScheme.outline),
+        side: BorderSide(color: theme.colorScheme.outlineVariant),
       ),
     );
 
diff --git a/packages/flutter/test/material/filter_chip_test.dart b/packages/flutter/test/material/filter_chip_test.dart
index 459df5f154f..926e4683b6e 100644
--- a/packages/flutter/test/material/filter_chip_test.dart
+++ b/packages/flutter/test/material/filter_chip_test.dart
@@ -280,7 +280,7 @@ void main() {
       chipMaterial.shape,
       RoundedRectangleBorder(
         borderRadius: const BorderRadius.all(Radius.circular(8.0)),
-        side: BorderSide(color: theme.colorScheme.outline),
+        side: BorderSide(color: theme.colorScheme.outlineVariant),
       ),
     );