diff --git a/components/menu/dist/metadata.json b/components/menu/dist/metadata.json
index 3b4f63996b8..819a2b1b560 100644
--- a/components/menu/dist/metadata.json
+++ b/components/menu/dist/metadata.json
@@ -12,16 +12,17 @@
     ".spectrum-Menu .spectrum-Menu-item--collapsible.is-open.is-focused",
     ".spectrum-Menu .spectrum-Menu-item--collapsible.is-open:active",
     ".spectrum-Menu .spectrum-Menu-item--collapsible.is-open:focus",
-    ".spectrum-Menu .spectrum-Menu-item--collapsible.is-open:focus-within",
     ".spectrum-Menu .spectrum-Menu-item--collapsible.is-open:hover",
     ".spectrum-Menu .spectrum-Menu-item--drillIn.is-open",
     ".spectrum-Menu .spectrum-Menu-item:focus .spectrum-Menu-itemCheckbox",
     ".spectrum-Menu .spectrum-Menu-item:focus .spectrum-Menu-itemSwitch",
+    ".spectrum-Menu .spectrum-Menu-item:has(> .spectrum-Menu-itemIcon--workflowIcon) .spectrum-Menu-linkout",
     ".spectrum-Menu .spectrum-Menu-item:hover .spectrum-Menu-itemCheckbox",
     ".spectrum-Menu .spectrum-Menu-item:hover .spectrum-Menu-itemSwitch",
     ".spectrum-Menu .spectrum-Menu-itemIcon",
     ".spectrum-Menu .spectrum-Menu-itemIcon--workflowIcon",
-    ".spectrum-Menu .spectrum-Menu-itemIcon:not(.spectrum-Menu-chevron, .spectrum-Menu-checkmark)",
+    ".spectrum-Menu .spectrum-Menu-itemIcon:not(.spectrum-Menu-chevron, .spectrum-Menu-checkmark, .spectrum-Menu-linkout)",
+    ".spectrum-Menu .spectrum-Menu-linkout",
     ".spectrum-Menu li:not(.spectrum-Menu-item, .spectrum-Menu-divider)",
     ".spectrum-Menu-back",
     ".spectrum-Menu-back .spectrum-Menu-sectionHeading",
@@ -60,10 +61,10 @@
     ".spectrum-Menu-item--drillIn:active .spectrum-Menu-chevron",
     ".spectrum-Menu-item--drillIn:focus .spectrum-Menu-chevron",
     ".spectrum-Menu-item--drillIn:hover .spectrum-Menu-chevron",
-    ".spectrum-Menu-item.is-disabled",
     ".spectrum-Menu-item.is-disabled .spectrum-Menu-itemDescription",
     ".spectrum-Menu-item.is-disabled .spectrum-Menu-itemIcon",
     ".spectrum-Menu-item.is-disabled .spectrum-Menu-itemLabel",
+    ".spectrum-Menu-item.is-disabled .spectrum-Menu-itemThumbnail",
     ".spectrum-Menu-item.is-disabled .spectrum-Menu-itemValue",
     ".spectrum-Menu-item.is-disabled .spectrum-Menu-sectionHeading",
     ".spectrum-Menu-item.is-disabled:hover",
@@ -72,15 +73,17 @@
     ".spectrum-Menu-item.is-disabled:hover .spectrum-Menu-itemLabel",
     ".spectrum-Menu-item.is-disabled:hover .spectrum-Menu-itemValue",
     ".spectrum-Menu-item.is-disabled:hover .spectrum-Menu-sectionHeading",
-    ".spectrum-Menu-item.is-focused",
-    ".spectrum-Menu-item.is-focused > .spectrum-Menu-checkmark",
-    ".spectrum-Menu-item.is-focused > .spectrum-Menu-chevron",
-    ".spectrum-Menu-item.is-focused > .spectrum-Menu-itemDescription",
-    ".spectrum-Menu-item.is-focused > .spectrum-Menu-itemIcon:not(.spectrum-Menu-chevron, .spectrum-Menu-checkmark)",
-    ".spectrum-Menu-item.is-focused > .spectrum-Menu-itemLabel",
-    ".spectrum-Menu-item.is-focused > .spectrum-Menu-itemValue",
-    ".spectrum-Menu-item.is-focused > .spectrum-Menu-sectionHeading",
+    ".spectrum-Menu-item.is-focus-visible",
+    ".spectrum-Menu-item.is-focus-visible .spectrum-Menu-linkout",
+    ".spectrum-Menu-item.is-focus-visible > .spectrum-Menu-checkmark",
+    ".spectrum-Menu-item.is-focus-visible > .spectrum-Menu-chevron",
+    ".spectrum-Menu-item.is-focus-visible > .spectrum-Menu-itemDescription",
+    ".spectrum-Menu-item.is-focus-visible > .spectrum-Menu-itemIcon:not(.spectrum-Menu-chevron, .spectrum-Menu-checkmark)",
+    ".spectrum-Menu-item.is-focus-visible > .spectrum-Menu-itemLabel",
+    ".spectrum-Menu-item.is-focus-visible > .spectrum-Menu-itemValue",
+    ".spectrum-Menu-item.is-focus-visible > .spectrum-Menu-sectionHeading",
     ".spectrum-Menu-item:active",
+    ".spectrum-Menu-item:active .spectrum-Menu-linkout",
     ".spectrum-Menu-item:active > .spectrum-Menu-checkmark",
     ".spectrum-Menu-item:active > .spectrum-Menu-chevron",
     ".spectrum-Menu-item:active > .spectrum-Menu-itemDescription",
@@ -88,16 +91,26 @@
     ".spectrum-Menu-item:active > .spectrum-Menu-itemLabel",
     ".spectrum-Menu-item:active > .spectrum-Menu-itemValue",
     ".spectrum-Menu-item:active > .spectrum-Menu-sectionHeading",
-    ".spectrum-Menu-item:focus",
-    ".spectrum-Menu-item:focus > .spectrum-Menu-checkmark",
-    ".spectrum-Menu-item:focus > .spectrum-Menu-chevron",
-    ".spectrum-Menu-item:focus > .spectrum-Menu-itemDescription",
-    ".spectrum-Menu-item:focus > .spectrum-Menu-itemIcon:not(.spectrum-Menu-chevron, .spectrum-Menu-checkmark)",
-    ".spectrum-Menu-item:focus > .spectrum-Menu-itemLabel",
-    ".spectrum-Menu-item:focus > .spectrum-Menu-itemValue",
-    ".spectrum-Menu-item:focus > .spectrum-Menu-sectionHeading",
     ".spectrum-Menu-item:focus-visible",
+    ".spectrum-Menu-item:focus-visible .spectrum-Menu-linkout",
+    ".spectrum-Menu-item:focus-visible > .spectrum-Menu-checkmark",
+    ".spectrum-Menu-item:focus-visible > .spectrum-Menu-chevron",
+    ".spectrum-Menu-item:focus-visible > .spectrum-Menu-itemDescription",
+    ".spectrum-Menu-item:focus-visible > .spectrum-Menu-itemIcon:not(.spectrum-Menu-chevron, .spectrum-Menu-checkmark)",
+    ".spectrum-Menu-item:focus-visible > .spectrum-Menu-itemLabel",
+    ".spectrum-Menu-item:focus-visible > .spectrum-Menu-itemValue",
+    ".spectrum-Menu-item:focus-visible > .spectrum-Menu-sectionHeading",
+    ".spectrum-Menu-item:has(> .spectrum-Menu-itemThumbnail) > .spectrum-Menu-checkmark",
+    ".spectrum-Menu-item:has(> .spectrum-Menu-itemThumbnail) > .spectrum-Menu-itemActions",
+    ".spectrum-Menu-item:has(> .spectrum-Menu-itemThumbnail) > .spectrum-Menu-itemCheckbox",
+    ".spectrum-Menu-item:has(> .spectrum-Menu-itemThumbnail) > .spectrum-Menu-itemLabel",
+    ".spectrum-Menu-item:has(> .spectrum-Menu-itemThumbnail) > .spectrum-Menu-itemValue",
+    ".spectrum-Menu-item:has(> .spectrum-Menu-itemThumbnail):has(> .spectrum-Menu-itemDescription) .spectrum-Menu-itemThumbnail",
+    ".spectrum-Menu-item:has(> .spectrum-Menu-itemThumbnail):has(> .spectrum-Menu-itemDescription) > .spectrum-Menu-checkmark",
+    ".spectrum-Menu-item:has(> .spectrum-Menu-itemThumbnail):has(> .spectrum-Menu-itemDescription) > .spectrum-Menu-itemCheckbox",
+    ".spectrum-Menu-item:has(> .spectrum-Menu-itemThumbnail):has(> .spectrum-Menu-itemDescription) > .spectrum-Menu-itemDescription",
     ".spectrum-Menu-item:hover",
+    ".spectrum-Menu-item:hover .spectrum-Menu-linkout",
     ".spectrum-Menu-item:hover > .spectrum-Menu-checkmark",
     ".spectrum-Menu-item:hover > .spectrum-Menu-chevron",
     ".spectrum-Menu-item:hover > .spectrum-Menu-itemDescription",
@@ -110,11 +123,12 @@
     ".spectrum-Menu-itemLabel",
     ".spectrum-Menu-itemLabel--truncate",
     ".spectrum-Menu-itemSelection",
+    ".spectrum-Menu-itemThumbnail",
     ".spectrum-Menu-itemValue",
-    ".spectrum-Menu-item[aria-disabled=\"true\"]",
     ".spectrum-Menu-item[aria-disabled=\"true\"] .spectrum-Menu-itemDescription",
     ".spectrum-Menu-item[aria-disabled=\"true\"] .spectrum-Menu-itemIcon",
     ".spectrum-Menu-item[aria-disabled=\"true\"] .spectrum-Menu-itemLabel",
+    ".spectrum-Menu-item[aria-disabled=\"true\"] .spectrum-Menu-itemThumbnail",
     ".spectrum-Menu-item[aria-disabled=\"true\"] .spectrum-Menu-itemValue",
     ".spectrum-Menu-item[aria-disabled=\"true\"] .spectrum-Menu-sectionHeading",
     ".spectrum-Menu-item[aria-disabled=\"true\"]:hover",
@@ -123,6 +137,7 @@
     ".spectrum-Menu-item[aria-disabled=\"true\"]:hover .spectrum-Menu-itemLabel",
     ".spectrum-Menu-item[aria-disabled=\"true\"]:hover .spectrum-Menu-itemValue",
     ".spectrum-Menu-item[aria-disabled=\"true\"]:hover .spectrum-Menu-sectionHeading",
+    ".spectrum-Menu-sectionDescription",
     ".spectrum-Menu-sectionHeading",
     ".spectrum-Menu.is-selectable .spectrum-Menu-item",
     ".spectrum-Menu.is-selectable .spectrum-Menu-item.is-selected",
@@ -131,11 +146,9 @@
     ".spectrum-Menu.spectrum-Menu--sizeL",
     ".spectrum-Menu.spectrum-Menu--sizeS",
     ".spectrum-Menu.spectrum-Menu--sizeXL",
-    ".spectrum-Menu:dir(rtl)",
     ".spectrum-Menu:lang(ja)",
     ".spectrum-Menu:lang(ko)",
     ".spectrum-Menu:lang(zh)",
-    "[dir=\"rtl\"] .spectrum-Menu",
     "[dir=\"rtl\"] .spectrum-Menu .spectrum-Menu-chevron"
   ],
   "modifiers": [
@@ -166,6 +179,7 @@
     "--mod-menu-item-checkmark-height",
     "--mod-menu-item-checkmark-width",
     "--mod-menu-item-collapsible-no-icon-submenu-item-padding-x-start",
+    "--mod-menu-item-corner-radius",
     "--mod-menu-item-description-color-default",
     "--mod-menu-item-description-color-disabled",
     "--mod-menu-item-description-color-down",
@@ -195,17 +209,30 @@
     "--mod-menu-item-label-text-to-visual",
     "--mod-menu-item-label-to-description-spacing",
     "--mod-menu-item-label-to-value-area-min-spacing",
+    "--mod-menu-item-linkout-icon-height",
+    "--mod-menu-item-linkout-icon-width",
     "--mod-menu-item-min-height",
     "--mod-menu-item-selectable-edge-to-text-not-selected",
     "--mod-menu-item-text-to-control",
+    "--mod-menu-item-thumbnail-height",
+    "--mod-menu-item-thumbnail-opacity-disabled",
+    "--mod-menu-item-thumbnail-to-label",
+    "--mod-menu-item-thumbnail-width",
     "--mod-menu-item-top-edge-to-text",
     "--mod-menu-item-top-to-action",
     "--mod-menu-item-top-to-checkbox",
     "--mod-menu-item-top-to-checkmark",
+    "--mod-menu-item-top-to-thumbnail",
+    "--mod-menu-item-top-to-workflow-icon",
     "--mod-menu-item-value-color-default",
     "--mod-menu-item-value-color-down",
     "--mod-menu-item-value-color-focus",
     "--mod-menu-item-value-color-hover",
+    "--mod-menu-section-description-color",
+    "--mod-menu-section-description-font-size",
+    "--mod-menu-section-description-font-weight",
+    "--mod-menu-section-description-line-height",
+    "--mod-menu-section-description-line-height-cjk",
     "--mod-menu-section-divider-margin-block",
     "--mod-menu-section-header-bottom-edge-to-text",
     "--mod-menu-section-header-color",
@@ -214,6 +241,7 @@
     "--mod-menu-section-header-line-height",
     "--mod-menu-section-header-line-height-cjk",
     "--mod-menu-section-header-min-width",
+    "--mod-menu-section-header-to-description",
     "--mod-menu-section-header-top-edge-to-text"
   ],
   "component": [
@@ -234,18 +262,12 @@
     "--spectrum-menu-item-background-color-default",
     "--spectrum-menu-item-background-color-down",
     "--spectrum-menu-item-background-color-hover",
-    "--spectrum-menu-item-background-color-key-focus",
+    "--spectrum-menu-item-background-color-keyboard-focus",
     "--spectrum-menu-item-bottom-edge-to-text",
     "--spectrum-menu-item-checkmark-height",
-    "--spectrum-menu-item-checkmark-height-extra-large",
-    "--spectrum-menu-item-checkmark-height-large",
-    "--spectrum-menu-item-checkmark-height-medium",
-    "--spectrum-menu-item-checkmark-height-small",
     "--spectrum-menu-item-checkmark-width",
-    "--spectrum-menu-item-checkmark-width-extra-large",
-    "--spectrum-menu-item-checkmark-width-large",
-    "--spectrum-menu-item-checkmark-width-medium",
-    "--spectrum-menu-item-checkmark-width-small",
+    "--spectrum-menu-item-chevron-height",
+    "--spectrum-menu-item-chevron-width",
     "--spectrum-menu-item-collapsible-no-icon-submenu-item-padding-x-start",
     "--spectrum-menu-item-corner-radius",
     "--spectrum-menu-item-description-color-default",
@@ -256,14 +278,12 @@
     "--spectrum-menu-item-description-font-size",
     "--spectrum-menu-item-description-line-height",
     "--spectrum-menu-item-description-line-height-cjk",
-    "--spectrum-menu-item-focus-indicator-border-width",
     "--spectrum-menu-item-focus-indicator-color",
     "--spectrum-menu-item-focus-indicator-color-default",
-    "--spectrum-menu-item-focus-indicator-direction-scalar",
     "--spectrum-menu-item-focus-indicator-offset",
     "--spectrum-menu-item-focus-indicator-outline-style",
-    "--spectrum-menu-item-focus-indicator-shadow",
     "--spectrum-menu-item-focus-indicator-width",
+    "--spectrum-menu-item-focus-margin",
     "--spectrum-menu-item-icon-height",
     "--spectrum-menu-item-icon-width",
     "--spectrum-menu-item-label-content-color-default",
@@ -282,8 +302,13 @@
     "--spectrum-menu-item-label-line-height-cjk",
     "--spectrum-menu-item-label-text-to-visual",
     "--spectrum-menu-item-label-to-description",
-    "--spectrum-menu-item-label-to-description-spacing",
+    "--spectrum-menu-item-label-to-description-extra-large",
+    "--spectrum-menu-item-label-to-description-large",
+    "--spectrum-menu-item-label-to-description-medium",
+    "--spectrum-menu-item-label-to-description-small",
     "--spectrum-menu-item-label-to-value-area-min-spacing",
+    "--spectrum-menu-item-linkout-icon-height",
+    "--spectrum-menu-item-linkout-icon-width",
     "--spectrum-menu-item-min-height",
     "--spectrum-menu-item-section-divider-height",
     "--spectrum-menu-item-selectable-edge-to-text-not-selected",
@@ -291,8 +316,11 @@
     "--spectrum-menu-item-selectable-edge-to-text-not-selected-large",
     "--spectrum-menu-item-selectable-edge-to-text-not-selected-medium",
     "--spectrum-menu-item-selectable-edge-to-text-not-selected-small",
-    "--spectrum-menu-item-spacing-multiplier",
     "--spectrum-menu-item-text-to-control",
+    "--spectrum-menu-item-thumbnail-height",
+    "--spectrum-menu-item-thumbnail-opacity-disabled",
+    "--spectrum-menu-item-thumbnail-to-label",
+    "--spectrum-menu-item-thumbnail-width",
     "--spectrum-menu-item-top-edge-to-text",
     "--spectrum-menu-item-top-to-action",
     "--spectrum-menu-item-top-to-checkbox",
@@ -301,24 +329,46 @@
     "--spectrum-menu-item-top-to-selected-icon-large",
     "--spectrum-menu-item-top-to-selected-icon-medium",
     "--spectrum-menu-item-top-to-selected-icon-small",
+    "--spectrum-menu-item-top-to-thumbnail",
+    "--spectrum-menu-item-top-to-thumbnail-extra-large",
+    "--spectrum-menu-item-top-to-thumbnail-large",
+    "--spectrum-menu-item-top-to-thumbnail-medium",
+    "--spectrum-menu-item-top-to-thumbnail-small",
+    "--spectrum-menu-item-top-to-workflow-icon",
     "--spectrum-menu-item-value-color-default",
     "--spectrum-menu-item-value-color-down",
     "--spectrum-menu-item-value-color-focus",
     "--spectrum-menu-item-value-color-hover",
+    "--spectrum-menu-section-description-color",
+    "--spectrum-menu-section-description-font-size",
+    "--spectrum-menu-section-description-font-weight",
+    "--spectrum-menu-section-description-line-height",
+    "--spectrum-menu-section-description-line-height-cjk",
     "--spectrum-menu-section-header-color",
     "--spectrum-menu-section-header-font-size",
     "--spectrum-menu-section-header-font-weight",
     "--spectrum-menu-section-header-line-height",
     "--spectrum-menu-section-header-line-height-cjk",
-    "--spectrum-menu-section-header-min-width"
+    "--spectrum-menu-section-header-min-width",
+    "--spectrum-menu-section-header-to-description",
+    "--spectrum-menu-section-header-to-description-extra-large",
+    "--spectrum-menu-section-header-to-description-large",
+    "--spectrum-menu-section-header-to-description-medium",
+    "--spectrum-menu-section-header-to-description-small"
   ],
   "global": [
     "--spectrum-accent-color-1000",
     "--spectrum-accent-color-1100",
     "--spectrum-accent-color-900",
-    "--spectrum-blue-800",
     "--spectrum-bold-font-weight",
-    "--spectrum-border-width-200",
+    "--spectrum-checkmark-icon-size-100",
+    "--spectrum-checkmark-icon-size-200",
+    "--spectrum-checkmark-icon-size-300",
+    "--spectrum-checkmark-icon-size-75",
+    "--spectrum-chevron-icon-size-100",
+    "--spectrum-chevron-icon-size-200",
+    "--spectrum-chevron-icon-size-300",
+    "--spectrum-chevron-icon-size-75",
     "--spectrum-cjk-line-height-100",
     "--spectrum-component-bottom-to-text-100",
     "--spectrum-component-bottom-to-text-200",
@@ -332,24 +382,38 @@
     "--spectrum-component-height-200",
     "--spectrum-component-height-300",
     "--spectrum-component-height-75",
+    "--spectrum-component-size-difference-down",
+    "--spectrum-component-size-width-ratio-down",
     "--spectrum-component-top-to-text-100",
     "--spectrum-component-top-to-text-200",
     "--spectrum-component-top-to-text-300",
     "--spectrum-component-top-to-text-75",
-    "--spectrum-corner-radius-100",
+    "--spectrum-component-top-to-workflow-icon-100",
+    "--spectrum-component-top-to-workflow-icon-200",
+    "--spectrum-component-top-to-workflow-icon-300",
+    "--spectrum-component-top-to-workflow-icon-75",
+    "--spectrum-corner-radius-400",
+    "--spectrum-corner-radius-500",
+    "--spectrum-corner-radius-600",
+    "--spectrum-corner-radius-700",
     "--spectrum-disabled-content-color",
     "--spectrum-divider-thickness-medium",
     "--spectrum-divider-thickness-small",
+    "--spectrum-downstate-height",
+    "--spectrum-downstate-width",
     "--spectrum-focus-indicator-color",
+    "--spectrum-focus-indicator-gap",
     "--spectrum-focus-indicator-thickness",
     "--spectrum-font-size-100",
     "--spectrum-font-size-200",
     "--spectrum-font-size-300",
     "--spectrum-font-size-50",
     "--spectrum-font-size-75",
-    "--spectrum-gray-1000-rgb",
     "--spectrum-gray-900",
     "--spectrum-line-height-100",
+    "--spectrum-link-out-icon-size-100",
+    "--spectrum-link-out-icon-size-200",
+    "--spectrum-link-out-icon-size-75",
     "--spectrum-navigational-indicator-top-to-back-icon-extra-large",
     "--spectrum-navigational-indicator-top-to-back-icon-large",
     "--spectrum-navigational-indicator-top-to-back-icon-medium",
@@ -362,6 +426,7 @@
     "--spectrum-neutral-subdued-content-color-down",
     "--spectrum-neutral-subdued-content-color-hover",
     "--spectrum-neutral-subdued-content-color-key-focus",
+    "--spectrum-regular-font-weight",
     "--spectrum-spacing-100",
     "--spectrum-spacing-50",
     "--spectrum-text-to-control-100",
@@ -371,8 +436,12 @@
     "--spectrum-text-to-visual-100",
     "--spectrum-text-to-visual-200",
     "--spectrum-text-to-visual-300",
+    "--spectrum-text-to-visual-400",
     "--spectrum-text-to-visual-75",
-    "--spectrum-transparent-black-200-opacity",
+    "--spectrum-thumbnail-size-500",
+    "--spectrum-thumbnail-size-700",
+    "--spectrum-thumbnail-size-800",
+    "--spectrum-thumbnail-size-900",
     "--spectrum-workflow-icon-size-100",
     "--spectrum-workflow-icon-size-200",
     "--spectrum-workflow-icon-size-300",
diff --git a/components/swatch/dist/metadata.json b/components/swatch/dist/metadata.json
index e3affcc83cb..5b40e74c96e 100644
--- a/components/swatch/dist/metadata.json
+++ b/components/swatch/dist/metadata.json
@@ -4,8 +4,6 @@
     ".spectrum-Swatch",
     ".spectrum-Swatch .spectrum-Swatch-disabledIcon",
     ".spectrum-Swatch .spectrum-Swatch-fill",
-    ".spectrum-Swatch--lightBorder .spectrum-Swatch-fill:before",
-    ".spectrum-Swatch--noBorder .spectrum-Swatch-fill:before",
     ".spectrum-Swatch--rectangle",
     ".spectrum-Swatch--roundingFull.is-selected:not(.spectrum-Swatch--rectangle) .spectrum-Swatch-fill",
     ".spectrum-Swatch--roundingFull.is-selected:not(.spectrum-Swatch--rectangle) .spectrum-Swatch-fill:before",
@@ -22,69 +20,86 @@
     ".spectrum-Swatch--roundingNone:after",
     ".spectrum-Swatch--roundingNone:before",
     ".spectrum-Swatch--sizeL",
-    ".spectrum-Swatch--sizeM",
+    ".spectrum-Swatch--sizeS",
     ".spectrum-Swatch--sizeXS",
     ".spectrum-Swatch-disabledIcon",
     ".spectrum-Swatch-disabledIcon path:first-child",
     ".spectrum-Swatch-disabledIcon path:last-child",
     ".spectrum-Swatch-fill",
     ".spectrum-Swatch-fill:before",
+    ".spectrum-Swatch-icon",
     ".spectrum-Swatch-image",
-    ".spectrum-Swatch-mixedValueIcon",
+    ".spectrum-Swatch.is-addSwatch",
+    ".spectrum-Swatch.is-addSwatch .spectrum-Swatch-fill",
+    ".spectrum-Swatch.is-addSwatch .spectrum-Swatch-icon",
+    ".spectrum-Swatch.is-addSwatch.is-keyboardFocused",
+    ".spectrum-Swatch.is-addSwatch:active",
+    ".spectrum-Swatch.is-addSwatch:focus-visible",
+    ".spectrum-Swatch.is-addSwatch:hover",
     ".spectrum-Swatch.is-disabled",
     ".spectrum-Swatch.is-disabled .spectrum-Swatch-disabledIcon",
     ".spectrum-Swatch.is-image .spectrum-Swatch-fill:before",
+    ".spectrum-Swatch.is-keyboardFocused",
+    ".spectrum-Swatch.is-mixedValue",
     ".spectrum-Swatch.is-mixedValue .spectrum-Swatch-fill",
-    ".spectrum-Swatch.is-mixedValue .spectrum-Swatch-mixedValueIcon",
-    ".spectrum-Swatch.is-nothing .spectrum-Swatch-fill",
-    ".spectrum-Swatch.is-nothing .spectrum-Swatch-fill:after",
-    ".spectrum-Swatch.is-nothing.spectrum-Swatch--rectangle .spectrum-Swatch-fill:after",
+    ".spectrum-Swatch.is-mixedValue .spectrum-Swatch-icon",
+    ".spectrum-Swatch.is-nothing.spectrum-Swatch--rectangle:not(.spectrum-Swatch.is-mixedValue, .spectrum-Swatch.is-addSwatch) .spectrum-Swatch-fill:after",
+    ".spectrum-Swatch.is-nothing:not(.spectrum-Swatch.is-mixedValue, .spectrum-Swatch.is-addSwatch) .spectrum-Swatch-fill",
+    ".spectrum-Swatch.is-nothing:not(.spectrum-Swatch.is-mixedValue, .spectrum-Swatch.is-addSwatch) .spectrum-Swatch-fill:after",
     ".spectrum-Swatch.is-selected",
     ".spectrum-Swatch.is-selected .spectrum-Swatch-fill",
     ".spectrum-Swatch.is-selected .spectrum-Swatch-fill:before",
     ".spectrum-Swatch.is-selected:before",
-    ".spectrum-Swatch:after",
     ".spectrum-Swatch:before",
-    ".spectrum-Swatch:focus-visible:after",
+    ".spectrum-Swatch:focus-visible",
     ".spectrum-Swatch[disabled]",
     ".spectrum-Swatch[disabled] .spectrum-Swatch-disabledIcon"
   ],
   "modifiers": [
+    "--mod-add-button-background",
+    "--mod-add-button-background-down",
+    "--mod-add-button-background-hover",
+    "--mod-add-button-background-keyboard-focus",
     "--mod-animation-duration-100",
+    "--mod-corner-radius-full",
+    "--mod-mixed-button-background",
+    "--mod-swatch-border",
     "--mod-swatch-border-color",
-    "--mod-swatch-border-color-light",
     "--mod-swatch-border-color-selected",
+    "--mod-swatch-border-opacity",
     "--mod-swatch-border-radius",
     "--mod-swatch-border-thickness",
     "--mod-swatch-border-thickness-selected",
     "--mod-swatch-disabled-icon-color",
     "--mod-swatch-disabled-icon-size",
-    "--mod-swatch-focus-indicator-border-radius",
     "--mod-swatch-focus-indicator-color",
     "--mod-swatch-focus-indicator-gap",
     "--mod-swatch-focus-indicator-thickness",
     "--mod-swatch-icon-border-color",
+    "--mod-swatch-icon-color",
     "--mod-swatch-inner-border-color-selected",
     "--mod-swatch-size",
     "--mod-swatch-slash-icon-color",
     "--mod-swatch-slash-thickness"
   ],
   "component": [
+    "--spectrum-swatch-border",
     "--spectrum-swatch-border-color",
-    "--spectrum-swatch-border-color-light",
     "--spectrum-swatch-border-color-selected",
+    "--spectrum-swatch-border-opacity",
     "--spectrum-swatch-border-radius",
     "--spectrum-swatch-border-thickness",
     "--spectrum-swatch-border-thickness-selected",
-    "--spectrum-swatch-dash-icon-color",
+    "--spectrum-swatch-disabled-icon-border-opacity",
     "--spectrum-swatch-disabled-icon-color",
     "--spectrum-swatch-disabled-icon-size",
-    "--spectrum-swatch-focus-indicator-border-radius",
     "--spectrum-swatch-focus-indicator-color",
     "--spectrum-swatch-focus-indicator-gap",
     "--spectrum-swatch-focus-indicator-thickness",
     "--spectrum-swatch-icon-border-color",
+    "--spectrum-swatch-icon-color",
     "--spectrum-swatch-inner-border-color-selected",
+    "--spectrum-swatch-rectangle-width-multiplier",
     "--spectrum-swatch-size",
     "--spectrum-swatch-size-extra-small",
     "--spectrum-swatch-size-large",
@@ -98,20 +113,28 @@
     "--spectrum-swatch-slash-thickness-small"
   ],
   "global": [
+    "--spectrum-add-button-background",
+    "--spectrum-add-button-background-down",
+    "--spectrum-add-button-background-hover",
+    "--spectrum-add-button-background-keyboard-focus",
     "--spectrum-animation-duration-100",
     "--spectrum-border-width-100",
     "--spectrum-border-width-200",
     "--spectrum-corner-radius-100",
+    "--spectrum-corner-radius-full",
+    "--spectrum-corner-radius-none",
     "--spectrum-focus-indicator-color",
     "--spectrum-focus-indicator-gap",
     "--spectrum-focus-indicator-thickness",
+    "--spectrum-gray-100",
+    "--spectrum-gray-1000",
+    "--spectrum-gray-200",
     "--spectrum-gray-25",
-    "--spectrum-gray-800",
-    "--spectrum-gray-900",
+    "--spectrum-mixed-button-background",
+    "--spectrum-negative-visual-color",
+    "--spectrum-neutral-content-color-default",
     "--spectrum-picked-color",
-    "--spectrum-red-900",
     "--spectrum-white",
-    "--spectrum-workflow-icon-size-100",
     "--spectrum-workflow-icon-size-200",
     "--spectrum-workflow-icon-size-50",
     "--spectrum-workflow-icon-size-75"
@@ -123,6 +146,7 @@
     "--highcontrast-swatch-border-color-selected",
     "--highcontrast-swatch-disabled-icon-color",
     "--highcontrast-swatch-fill-foreground-color",
-    "--highcontrast-swatch-focus-indicator-color"
+    "--highcontrast-swatch-focus-indicator-color",
+    "--highcontrast-swatch-icon-color"
   ]
 }
diff --git a/components/swatchgroup/dist/metadata.json b/components/swatchgroup/dist/metadata.json
index 24e3423ca5d..73ac1e248a6 100644
--- a/components/swatchgroup/dist/metadata.json
+++ b/components/swatchgroup/dist/metadata.json
@@ -3,19 +3,19 @@
   "selectors": [
     ".spectrum-SwatchGroup",
     ".spectrum-SwatchGroup--compact",
-    ".spectrum-SwatchGroup--spacious"
+    ".spectrum-SwatchGroup--spacious:has(.spectrum-Swatch--sizeM, .spectrum-Swatch--sizeL)",
+    ".spectrum-SwatchGroup--spacious:has(.spectrum-Swatch--sizeXS, .spectrum-Swatch--sizeS)"
   ],
-  "modifiers": [
-    "--mod-swatchgroup-spacing-compact",
-    "--mod-swatchgroup-spacing-regular",
-    "--mod-swatchgroup-spacing-spacious"
+  "modifiers": ["--mod-swatchgroup-spacing"],
+  "component": [
+    "--spectrum-swatch-group-spacing-spacious",
+    "--spectrum-swatchgroup-spacing"
   ],
-  "component": ["--spectrum-swatchgroup-spacing"],
   "global": [
     "--spectrum-spacing-100",
     "--spectrum-spacing-50",
     "--spectrum-spacing-75"
   ],
-  "passthroughs": [],
+  "passthroughs": ["--mod-swatch-border-opacity"],
   "high-contrast": []
 }