diff --git a/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5 b/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5
index f1fa69215..616d828fe 100644
--- a/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5
@@ -27,32 +27,31 @@
       muted: {
         $value: '{base.color.blue.4}',
         $type: 'color',
-        alpha: 0.15,
+        alpha: 0.2,
       },
       emphasis: {
         $value: '{base.color.blue.5}',
         $type: 'color',
       },
     },
-    danger: {
+    open: {
       muted: {
-        $value: '{base.color.orange.4}',
+        $value: '{bgColore.success.muted}',
         $type: 'color',
-        alpha: 0.1,
       },
       emphasis: {
-        $value: '{base.color.orange.5}',
+        $value: '{bgColore.success.emphasis}',
         $type: 'color',
       },
     },
-    open: {
+    danger: {
       muted: {
-        $value: '{base.color.blue.4}',
+        $value: '{base.color.orange.4}',
         $type: 'color',
-        alpha: 0.2,
+        alpha: 0.1,
       },
       emphasis: {
-        $value: '{base.color.blue.5}',
+        $value: '{base.color.orange.5}',
         $type: 'color',
       },
     },
@@ -69,36 +68,35 @@
     },
   },
   borderColor: {
-    open: {
+    success: {
       muted: {
         $value: '{base.color.blue.4}',
         $type: 'color',
         alpha: 0.4,
       },
       emphasis: {
-        $value: '{base.color.blue.4}',
+        $value: '{base.color.blue.5}',
         $type: 'color',
       },
     },
-    closed: {
+    open: {
       muted: {
-        $value: '{borderColor.muted}',
+        $value: '{borderColor.success.muted}',
         $type: 'color',
-        alpha: 0.4,
       },
       emphasis: {
-        $value: '{borderColor.emphasis}',
+        $value: '{borderColor.success.emphasis}',
         $type: 'color',
       },
     },
-    success: {
+    closed: {
       muted: {
-        $value: '{base.color.blue.4}',
+        $value: '{bgColor.neutral.muted}',
         $type: 'color',
         alpha: 0.4,
       },
       emphasis: {
-        $value: '{base.color.blue.5}',
+        $value: '{bgColor.neutral.emphasis}',
         $type: 'color',
       },
     },
diff --git a/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5 b/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
index f15cfc505..27d0ffb21 100644
--- a/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
+++ b/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
@@ -45,11 +45,11 @@
     },
     open: {
       muted: {
-        $value: '{base.color.blue.0}',
+        $value: '{bgColor.success.muted}',
         $type: 'color',
       },
       emphasis: {
-        $value: '{base.color.blue.5}',
+        $value: '{bgColor.success.emphasis}',
         $type: 'color',
       },
     },
@@ -75,44 +75,41 @@
     },
   },
   borderColor: {
-    open: {
+    success: {
       muted: {
-        $value: '{base.color.blue.3}',
+        $value: '{base.color.blue.0}',
         $type: 'color',
-        alpha: 0.4,
       },
       emphasis: {
-        $value: '{base.color.blue.4}',
+        $value: '{base.color.blue.5}',
         $type: 'color',
       },
     },
-    closed: {
+    open: {
       muted: {
-        $value: '{borderColor.default}',
+        $value: '{borderColor.success.muted}',
         $type: 'color',
-        alpha: 0.4,
       },
       emphasis: {
-        $value: '{borderColor.emphasis}',
+        $value: '{borderColor.success.emphasis}',
         $type: 'color',
       },
     },
-    success: {
+    closed: {
       muted: {
-        $value: '{base.color.blue.3}',
+        $value: '{borderColor.default}',
         $type: 'color',
         alpha: 0.4,
       },
       emphasis: {
-        $value: '{base.color.blue.5}',
+        $value: '{borderColor.emphasis}',
         $type: 'color',
       },
     },
     danger: {
       muted: {
-        $value: '{base.color.orange.3}',
+        $value: '{base.color.orange.0}',
         $type: 'color',
-        alpha: 0.4,
       },
       emphasis: {
         $value: '{base.color.orange.5}',