diff --git a/src/tokens/functional/color/bgColor.json5 b/src/tokens/functional/color/bgColor.json5
index 8e385b0b9..3f7441484 100644
--- a/src/tokens/functional/color/bgColor.json5
+++ b/src/tokens/functional/color/bgColor.json5
@@ -546,7 +546,7 @@
             },
           },
           'org.primer.overrides': {
-            'dark-high-contrast': '{base.color.purple.9}',
+            'dark-high-contrast': '{base.color.purple.1}',
           },
         },
       },
diff --git a/src/tokens/functional/color/fgColor.json5 b/src/tokens/functional/color/fgColor.json5
index a3078f872..eba065dfa 100644
--- a/src/tokens/functional/color/fgColor.json5
+++ b/src/tokens/functional/color/fgColor.json5
@@ -14,8 +14,8 @@
         },
         'org.primer.overrides': {
           dark: '{base.color.neutral.12}',
-          "dark-high-contrast": '{base.color.neutral.13}',
-          "dark-dimmed": '{base.color.neutral.11}',
+          'dark-high-contrast': '{base.color.neutral.7}',
+          'dark-dimmed': '{base.color.neutral.11}',
         },
       },
     },
@@ -51,7 +51,7 @@
         },
         'org.primer.overrides': {
           dark: '{base.color.neutral.13}',
-          "dark-dimmed": '{base.color.neutral.12}',
+          'dark-dimmed': '{base.color.neutral.12}',
         },
       },
     },
@@ -108,7 +108,7 @@
             $value: '{base.color.neutral.8}',
             alpha: 0.6,
           },
-          "dark-dimmed": '{base.color.neutral.8}',
+          'dark-dimmed': '{base.color.neutral.8}',
           'light-high-contrast': '{base.color.neutral.9}',
           'dark-high-contrast': '{base.color.neutral.8}',
         },
@@ -157,7 +157,7 @@
         },
         'org.primer.overrides': {
           dark: '#4493F8',
-          "dark-dimmed": '#478be6',
+          'dark-dimmed': '#478be6',
           'dark-high-contrast': '#74B9FF',
           'light-high-contrast': '{base.color.blue.6}',
         },
@@ -179,10 +179,10 @@
           dark: '{base.color.green.3}',
           'dark-high-contrast': '#2BD853',
           'light-high-contrast': '{base.color.green.6}',
-          "dark-protanopia-deuteranopia": '{base.color.blue.3}',
+          'dark-protanopia-deuteranopia': '{base.color.blue.3}',
           'light-protanopia-deuteranopia': '{base.color.blue.5}',
-          "dark-tritanopia": '{base.color.blue.3}',
-          "light-tritanopia": '{base.color.blue.5}',
+          'dark-tritanopia': '{base.color.blue.3}',
+          'light-tritanopia': '{base.color.blue.5}',
         },
       },
     },
@@ -199,10 +199,10 @@
           },
         },
         'org.primer.overrides': {
-          "dark-protanopia-deuteranopia": '{base.color.orange.4}',
+          'dark-protanopia-deuteranopia': '{base.color.orange.4}',
           'light-protanopia-deuteranopia': '{base.color.orange.5}',
-          "dark-tritanopia": '{base.color.red.4}',
-          "light-tritanopia": '{base.color.red.5}',
+          'dark-tritanopia': '{base.color.red.4}',
+          'light-tritanopia': '{base.color.red.5}',
         },
       },
     },
@@ -240,8 +240,8 @@
           dark: '{base.color.orange.4}',
           'dark-high-contrast': '{base.color.orange.3}',
           'light-high-contrast': '{base.color.orange.6}',
-          "dark-tritanopia": '{base.color.red.4}',
-          "light-tritanopia": '{base.color.red.5}',
+          'dark-tritanopia': '{base.color.red.4}',
+          'light-tritanopia': '{base.color.red.5}',
         },
       },
     },
@@ -259,7 +259,7 @@
         },
         'org.primer.overrides': {
           dark: '{base.color.red.4}',
-          "dark-protanopia-deuteranopia": '{base.color.orange.3}',
+          'dark-protanopia-deuteranopia': '{base.color.orange.3}',
           'light-protanopia-deuteranopia': '{base.color.orange.5}',
           'dark-high-contrast': '{base.color.red.3}',
           'light-high-contrast': '{base.color.red.6}',
@@ -279,10 +279,10 @@
           },
         },
         'org.primer.overrides': {
-          "dark-protanopia-deuteranopia": '{fgColor.muted}',
+          'dark-protanopia-deuteranopia': '{fgColor.muted}',
           'light-protanopia-deuteranopia': '{fgColor.muted}',
-          "dark-tritanopia": '{fgColor.muted}',
-          "light-tritanopia": '{fgColor.muted}',
+          'dark-tritanopia': '{fgColor.muted}',
+          'light-tritanopia': '{fgColor.muted}',
         },
       },
     },