diff --git a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5 b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
index bc3014ddb..167f503bf 100644
--- a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
@@ -72,6 +72,13 @@
         alpha: 1,
       },
     },
+    open: {
+      muted: {
+        $value: '{borderColor.success.muted}',
+        $type: 'color',
+        alpha: 1,
+      },
+    },
     attention: {
       muted: {
         $value: '{base.color.yellow.4}',
diff --git a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5 b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
index 22747b40c..631feb055 100644
--- a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
@@ -27,6 +27,7 @@
       muted: {
         $value: '{base.color.blue.4}',
         $type: 'color',
+        alpha: 0.15,
       },
       emphasis: {
         $value: '{base.color.blue.5}',
@@ -37,6 +38,7 @@
       muted: {
         $value: '{base.color.red.4}',
         $type: 'color',
+        alpha: 0.1,
       },
       emphasis: {
         $value: '{base.color.red.5}',
@@ -47,6 +49,7 @@
       muted: {
         $value: '{base.color.red.4}',
         $type: 'color',
+        alpha: 0.15,
       },
       emphasis: {
         $value: '{base.color.red.5}',
@@ -57,6 +60,7 @@
       muted: {
         $value: '{base.color.neutral.4}',
         $type: 'color',
+        alpha: 0.1,
       },
       emphasis: {
         $value: '{base.color.neutral.5}',
diff --git a/src/tokens/functional/color/dark/primitives-dark.json5 b/src/tokens/functional/color/dark/primitives-dark.json5
index 9b57a9483..45fc71f79 100644
--- a/src/tokens/functional/color/dark/primitives-dark.json5
+++ b/src/tokens/functional/color/dark/primitives-dark.json5
@@ -150,8 +150,8 @@
         },
       },
     },
-    attention: {
-      $value: '{base.color.yellow.3}',
+    open: {
+      $value: '{fgColor.success}',
       $type: 'color',
       $extensions: {
         'org.primer.figma': {
@@ -160,13 +160,13 @@
           group: 'semantic',
           scopes: ['fgColor'],
           codeSyntax: {
-            web: 'var(--fgColor-attention) /* utility class: .color-fg-attention */',
+            web: 'var(--fgColor-open) /* utility class: .color-fg-open */',
           },
         },
       },
     },
-    severe: {
-      $value: '{base.color.orange.4}',
+    attention: {
+      $value: '{base.color.yellow.3}',
       $type: 'color',
       $extensions: {
         'org.primer.figma': {
@@ -175,13 +175,13 @@
           group: 'semantic',
           scopes: ['fgColor'],
           codeSyntax: {
-            web: 'var(--fgColor-severe) /* utility class: .color-fg-severe */',
+            web: 'var(--fgColor-attention) /* utility class: .color-fg-attention */',
           },
         },
       },
     },
-    danger: {
-      $value: '{base.color.red.4}',
+    severe: {
+      $value: '{base.color.orange.4}',
       $type: 'color',
       $extensions: {
         'org.primer.figma': {
@@ -190,13 +190,13 @@
           group: 'semantic',
           scopes: ['fgColor'],
           codeSyntax: {
-            web: 'var(--fgColor-danger) /* utility class: .color-fg-danger */',
+            web: 'var(--fgColor-severe) /* utility class: .color-fg-severe */',
           },
         },
       },
     },
-    open: {
-      $value: '{fgColor.success}',
+    danger: {
+      $value: '{base.color.red.4}',
       $type: 'color',
       $extensions: {
         'org.primer.figma': {
@@ -205,13 +205,13 @@
           group: 'semantic',
           scopes: ['fgColor'],
           codeSyntax: {
-            web: 'var(--fgColor-open) /* utility class: .color-fg-open */',
+            web: 'var(--fgColor-danger) /* utility class: .color-fg-danger */',
           },
         },
       },
     },
     closed: {
-      $value: '{base.color.red.4}',
+      $value: '{fgColor.danger}',
       $type: 'color',
       $extensions: {
         'org.primer.figma': {
@@ -241,7 +241,7 @@
       },
     },
     upsell: {
-      $value: '{base.color.purple.4}',
+      $value: '{fgColor.done}',
       $type: 'color',
       $extensions: {
         'org.primer.figma': {
@@ -489,9 +489,9 @@
         },
       },
     },
-    attention: {
+    open: {
       muted: {
-        $value: '{base.color.yellow.4}',
+        $value: '{bgColor.success.muted}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -500,14 +500,14 @@
             group: 'semantic',
             scopes: ['bgColor'],
             codeSyntax: {
-              web: 'var(--bgColor-attention-muted) /* utility class: .color-bg-attention */',
+              web: 'var(--bgColor-success-muted) /* utility class: .color-bg-success */',
             },
           },
         },
         alpha: 0.15,
       },
       emphasis: {
-        $value: '{base.color.yellow.5}',
+        $value: '{bgColor.success.emphasis}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -516,15 +516,15 @@
             group: 'semantic',
             scopes: ['bgColor'],
             codeSyntax: {
-              web: 'var(--bgColor-attention-emphasis) /* utility class: .color-bg-attention-emphasis */',
+              web: 'var(--bgColor-success-emphasis) /* utility class: .color-bg-success-emphasis */',
             },
           },
         },
       },
     },
-    severe: {
+    attention: {
       muted: {
-        $value: '{base.color.orange.4}',
+        $value: '{base.color.yellow.4}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -533,14 +533,14 @@
             group: 'semantic',
             scopes: ['bgColor'],
             codeSyntax: {
-              web: 'var(--bgColor-severe-muted) /* utility class: .color-bg-severe */',
+              web: 'var(--bgColor-attention-muted) /* utility class: .color-bg-attention */',
             },
           },
         },
-        alpha: 0.1,
+        alpha: 0.15,
       },
       emphasis: {
-        $value: '{base.color.orange.5}',
+        $value: '{base.color.yellow.5}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -549,15 +549,15 @@
             group: 'semantic',
             scopes: ['bgColor'],
             codeSyntax: {
-              web: 'var(--bgColor-severe-emphasis) /* utility class: .color-bg-severe-emphasis */',
+              web: 'var(--bgColor-attention-emphasis) /* utility class: .color-bg-attention-emphasis */',
             },
           },
         },
       },
     },
-    danger: {
+    severe: {
       muted: {
-        $value: '{base.color.red.4}',
+        $value: '{base.color.orange.4}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -566,14 +566,14 @@
             group: 'semantic',
             scopes: ['bgColor'],
             codeSyntax: {
-              web: 'var(--bgColor-danger-muted) /* utility class: .color-bg-danger */',
+              web: 'var(--bgColor-severe-muted) /* utility class: .color-bg-severe */',
             },
           },
         },
         alpha: 0.1,
       },
       emphasis: {
-        $value: '{base.color.red.5}',
+        $value: '{base.color.orange.5}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -582,15 +582,15 @@
             group: 'semantic',
             scopes: ['bgColor'],
             codeSyntax: {
-              web: 'var(--bgColor-danger-emphasis) /* utility class: .color-bg-danger-emphasis */',
+              web: 'var(--bgColor-severe-emphasis) /* utility class: .color-bg-severe-emphasis */',
             },
           },
         },
       },
     },
-    open: {
+    danger: {
       muted: {
-        $value: '{bgColor.success.muted}',
+        $value: '{base.color.red.4}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -599,14 +599,14 @@
             group: 'semantic',
             scopes: ['bgColor'],
             codeSyntax: {
-              web: 'var(--bgColor-success-muted) /* utility class: .color-bg-success */',
+              web: 'var(--bgColor-danger-muted) /* utility class: .color-bg-danger */',
             },
           },
         },
         alpha: 0.1,
       },
       emphasis: {
-        $value: '{bgColor.success.emphasis}',
+        $value: '{base.color.red.5}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -615,7 +615,7 @@
             group: 'semantic',
             scopes: ['bgColor'],
             codeSyntax: {
-              web: 'var(--bgColor-success-emphasis) /* utility class: .color-bg-success-emphasis */',
+              web: 'var(--bgColor-danger-emphasis) /* utility class: .color-bg-danger-emphasis */',
             },
           },
         },
@@ -623,7 +623,7 @@
     },
     closed: {
       muted: {
-        $value: '{base.color.red.4}',
+        $value: '{bgColor.danger.muted}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -636,7 +636,7 @@
             },
           },
         },
-        alpha: 0.15,
+        alpha: 0.1,
       },
       emphasis: {
         $value: '{base.color.red.5}',
@@ -928,9 +928,9 @@
         },
       },
     },
-    attention: {
+    open: {
       muted: {
-        $value: '{base.color.yellow.4}',
+        $value: '{borderColor.success.muted}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -939,14 +939,14 @@
             group: 'semantic',
             scopes: ['borderColor'],
             codeSyntax: {
-              web: 'var(--borderColor-attention-muted) /* utility class: .color-border-attention */',
+              web: 'var(--borderColor-open-muted) /* utility class: .color-border-open */',
             },
           },
         },
         alpha: 0.4,
       },
       emphasis: {
-        $value: '{base.color.yellow.5}',
+        $value: '{borderColor.success.emphasis}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -955,15 +955,15 @@
             group: 'semantic',
             scopes: ['borderColor'],
             codeSyntax: {
-              web: 'var(--borderColor-attention-emphasis) /* utility class: .color-border-attention-emphasis */',
+              web: 'var(--borderColor-open-emphasis) /* utility class: .color-border-open-emphasis */',
             },
           },
         },
       },
     },
-    severe: {
+    attention: {
       muted: {
-        $value: '{base.color.orange.4}',
+        $value: '{base.color.yellow.4}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -972,14 +972,14 @@
             group: 'semantic',
             scopes: ['borderColor'],
             codeSyntax: {
-              web: 'var(--borderColor-severe-muted) /* utility class: .color-border-severe */',
+              web: 'var(--borderColor-attention-muted) /* utility class: .color-border-attention */',
             },
           },
         },
         alpha: 0.4,
       },
       emphasis: {
-        $value: '{base.color.orange.5}',
+        $value: '{base.color.yellow.5}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -988,15 +988,15 @@
             group: 'semantic',
             scopes: ['borderColor'],
             codeSyntax: {
-              web: 'var(--borderColor-severe-emphasis) /* utility class: .color-border-severe-emphasis */',
+              web: 'var(--borderColor-attention-emphasis) /* utility class: .color-border-attention-emphasis */',
             },
           },
         },
       },
     },
-    danger: {
+    severe: {
       muted: {
-        $value: '{base.color.red.4}',
+        $value: '{base.color.orange.4}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -1005,14 +1005,14 @@
             group: 'semantic',
             scopes: ['borderColor'],
             codeSyntax: {
-              web: 'var(--borderColor-danger-muted) /* utility class: .color-border-danger */',
+              web: 'var(--borderColor-severe-muted) /* utility class: .color-border-severe */',
             },
           },
         },
         alpha: 0.4,
       },
       emphasis: {
-        $value: '{base.color.red.5}',
+        $value: '{base.color.orange.5}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -1021,15 +1021,15 @@
             group: 'semantic',
             scopes: ['borderColor'],
             codeSyntax: {
-              web: 'var(--borderColor-danger-emphasis) /* utility class: .color-border-danger-emphasis */',
+              web: 'var(--borderColor-severe-emphasis) /* utility class: .color-border-severe-emphasis */',
             },
           },
         },
       },
     },
-    open: {
+    danger: {
       muted: {
-        $value: '{borderColor.success.muted}',
+        $value: '{base.color.red.4}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -1038,13 +1038,14 @@
             group: 'semantic',
             scopes: ['borderColor'],
             codeSyntax: {
-              web: 'var(--borderColor-open-muted) /* utility class: .color-border-open */',
+              web: 'var(--borderColor-danger-muted) /* utility class: .color-border-danger */',
             },
           },
         },
+        alpha: 0.4,
       },
       emphasis: {
-        $value: '{borderColor.success.emphasis}',
+        $value: '{base.color.red.5}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -1053,7 +1054,7 @@
             group: 'semantic',
             scopes: ['borderColor'],
             codeSyntax: {
-              web: 'var(--borderColor-open-emphasis) /* utility class: .color-border-open-emphasis */',
+              web: 'var(--borderColor-danger-emphasis) /* utility class: .color-border-danger-emphasis */',
             },
           },
         },
@@ -1061,7 +1062,7 @@
     },
     closed: {
       muted: {
-        $value: '{base.color.red.4}',
+        $value: '{borderColor.danger.muted}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -1077,7 +1078,7 @@
         alpha: 0.4,
       },
       emphasis: {
-        $value: '{base.color.red.5}',
+        $value: '{borderColor.danger.emphasis}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -1127,7 +1128,7 @@
     },
     upsell: {
       muted: {
-        $value: '{base.color.purple.4}',
+        $value: '{borderColor.done.muted}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -1143,7 +1144,7 @@
         alpha: 0.4,
       },
       emphasis: {
-        $value: '{base.color.purple.5}',
+        $value: '{borderColor.done.emphasis}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {