diff --git a/packages/tokens/figma/dark.json b/packages/tokens/figma/dark.json
index 28a178b6..e117b132 100644
--- a/packages/tokens/figma/dark.json
+++ b/packages/tokens/figma/dark.json
@@ -1,20 +1,8 @@
 {
-  "button-primary-background-on-dark": {
-    "$value": "{semantic-test-on-dark}",
-    "$type": "color"
-  },
   "color-link-default-hover": {
     "$value": "rgba({uswds-system-color-gray-100}, {color-link-default-hover.alpha})",
     "$type": "color"
   },
-  "semantic-test-2-on-dark": {
-    "$value": "{vads-color-base}",
-    "$type": "color"
-  },
-  "semantic-test-on-dark": {
-    "$value": "{uswds-system-color-blue-vivid-60}",
-    "$type": "color"
-  },
   "uswds-system-color-blue-10": {
     "$value": "#d9e8f6",
     "$type": "color"
@@ -535,6 +523,10 @@
     "$value": "{uswds-system-color-red-warm-10}",
     "$type": "color"
   },
+  "vads-color-fg-default-on-dark": {
+    "$value": "{vads-color-base-lightest}",
+    "$type": "color"
+  },
   "vads-color-gibill-accent": {
     "$value": "{uswds-system-color-gold-vivid-5}",
     "$type": "color"
@@ -739,6 +731,10 @@
     "$value": "{uswds-system-color-green-cool-5}",
     "$type": "color"
   },
+  "vads-color-surface-secondary-on-dark": {
+    "$value": "{vads-color-base-darker}",
+    "$type": "color"
+  },
   "vads-color-va-accent": {
     "$value": "{uswds-system-color-yellow-50}",
     "$type": "color"
@@ -766,5 +762,9 @@
   "vads-color-white": {
     "$value": "#ffffff",
     "$type": "color"
+  },
+  "vads-segmented-control-color-surface-selected-on-dark": {
+    "$value": "{vads-color-base-dark}",
+    "$type": "color"
   }
 }
diff --git a/packages/tokens/figma/light.json b/packages/tokens/figma/light.json
index 5dcb55c7..773e5613 100644
--- a/packages/tokens/figma/light.json
+++ b/packages/tokens/figma/light.json
@@ -1,20 +1,8 @@
 {
-  "button-primary-background-on-light": {
-    "$value": "{semantic-test-on-light}",
-    "$type": "color"
-  },
   "color-link-default-hover": {
     "$value": "rgba({uswds-system-color-gray-100}, {color-link-default-hover.alpha})",
     "$type": "color"
   },
-  "semantic-test-2-on-light": {
-    "$value": "{vads-color-base}",
-    "$type": "color"
-  },
-  "semantic-test-on-light": {
-    "$value": "{uswds-system-color-blue-vivid-60}",
-    "$type": "color"
-  },
   "uswds-system-color-blue-10": {
     "$value": "#d9e8f6",
     "$type": "color"
@@ -555,6 +543,10 @@
     "$value": "{uswds-system-color-red-warm-10}",
     "$type": "color"
   },
+  "vads-color-fg-default-on-light": {
+    "$value": "{vads-color-base}",
+    "$type": "color"
+  },
   "vads-color-gibill-accent": {
     "$value": "{uswds-system-color-gold-vivid-5}",
     "$type": "color"
@@ -759,6 +751,10 @@
     "$value": "{uswds-system-color-green-cool-5}",
     "$type": "color"
   },
+  "vads-color-surface-secondary-on-light": {
+    "$value": "{vads-color-base-lighter}",
+    "$type": "color"
+  },
   "vads-color-va-accent": {
     "$value": "{uswds-system-color-yellow-50}",
     "$type": "color"
@@ -798,5 +794,9 @@
   "vads-process-list-color-text-pending-on-light": {
     "$value": "{uswds-system-color-gray-50}",
     "$type": "color"
+  },
+  "vads-segmented-control-color-surface-selected-on-light": {
+    "$value": "{vads-color-white}",
+    "$type": "color"
   }
 }
diff --git a/packages/tokens/src/tokens/color/component-dark.json b/packages/tokens/src/tokens/color/component-dark.json
index 407adc50..46db8b17 100644
--- a/packages/tokens/src/tokens/color/component-dark.json
+++ b/packages/tokens/src/tokens/color/component-dark.json
@@ -1,7 +1,7 @@
 {
-  "button-primary-background-on-dark": {
-    "name": "button-primary-background-on-dark",
-    "value": "{semantic-test-on-dark}",
+  "vads-segmented-control-color-surface-selected-on-dark": {
+    "name": "vads-segmented-control-color-surface-selected-on-dark",
+    "value": "{vads-color-base-dark.*.value}",
     "attributes": {
       "category": "color"
     }
diff --git a/packages/tokens/src/tokens/color/component-light.json b/packages/tokens/src/tokens/color/component-light.json
index d4b39c47..ad735d03 100644
--- a/packages/tokens/src/tokens/color/component-light.json
+++ b/packages/tokens/src/tokens/color/component-light.json
@@ -1,7 +1,7 @@
 {
-  "button-primary-background-on-light": {
-    "name": "button-primary-background-on-light",
-    "value": "{semantic-test-on-light}",
+  "vads-segmented-control-color-surface-selected-on-light": {
+    "name": "vads-segmented-control-color-surface-selected-on-light",
+    "value": "{vads-color-white.*.value}",
     "attributes": {
       "category": "color"
     }
diff --git a/packages/tokens/src/tokens/color/semantic-dark.json b/packages/tokens/src/tokens/color/semantic-dark.json
index 369a1551..493c32e3 100644
--- a/packages/tokens/src/tokens/color/semantic-dark.json
+++ b/packages/tokens/src/tokens/color/semantic-dark.json
@@ -1,14 +1,14 @@
 {
-  "semantic-test-on-dark": {
-    "name": "semantic-test-on-dark",
-    "value": "{uswds-system-color-blue-vivid-60}",
+  "vads-color-fg-default-on-dark": {
+    "name": "vads-color-fg-default-on-dark",
+    "value": "{vads-color-base-lightest.*.value}",
     "attributes": {
       "category": "color"
     }
   },
-  "semantic-test-2-on-dark": {
-    "name": "semantic-test-2-on-dark",
-    "value": "{vads-color-base.*.value}",
+  "vads-color-surface-secondary-on-dark": {
+    "name": "vads-color-surface-secondary-on-dark",
+    "value": "{vads-color-base-darker.*.value}",
     "attributes": {
       "category": "color"
     }
diff --git a/packages/tokens/src/tokens/color/semantic-light.json b/packages/tokens/src/tokens/color/semantic-light.json
index 9d0060a7..289d7a4c 100644
--- a/packages/tokens/src/tokens/color/semantic-light.json
+++ b/packages/tokens/src/tokens/color/semantic-light.json
@@ -1,14 +1,14 @@
 {
-  "semantic-test-on-light": {
-    "name": "semantic-test-on-light",
-    "value": "{uswds-system-color-blue-vivid-60}",
+  "vads-color-fg-default-on-light": {
+    "name": "vads-color-fg-default-on-light",
+    "value": "{vads-color-base.*.value}",
     "attributes": {
       "category": "color"
     }
   },
-  "semantic-test-2-on-light": {
-    "name": "semantic-test-2-on-light",
-    "value": "{vads-color-base.*.value}",
+  "vads-color-surface-secondary-on-light": {
+    "name": "vads-color-surface-secondary-on-light",
+    "value": "{vads-color-base-lighter.*.value}",
     "attributes": {
       "category": "color"
     }