diff --git a/src/tokens/functional/color/control.json5 b/src/tokens/functional/color/control.json5
index b2b80d1d4..bc21a850b 100644
--- a/src/tokens/functional/color/control.json5
+++ b/src/tokens/functional/color/control.json5
@@ -20,6 +20,9 @@
             'dark-dimmed': {
               $value: '{base.color.neutral.5}',
             },
+            'light-high-contrast': {
+              $value: '{base.color.neutral.4}',
+            },
           },
         },
       },
@@ -42,6 +45,9 @@
             'dark-dimmed': {
               $value: '{base.color.neutral.6}',
             },
+            'light-high-contrast': {
+              $value: '{base.color.neutral.5}',
+            },
           },
         },
       },
@@ -64,6 +70,9 @@
             'dark-dimmed': {
               $value: '{base.color.neutral.7}',
             },
+            'light-high-contrast': {
+              $value: '{base.color.neutral.6}',
+            },
           },
         },
       },
@@ -133,6 +142,9 @@
             'dark-high-contrast': {
               $value: '{base.color.neutral.10}',
             },
+            'light-high-contrast': {
+              $value: '{base.color.neutral.10}',
+            },
           },
         },
       },
@@ -337,6 +349,10 @@
                 $value: '{base.color.neutral.8}',
                 alpha: 0.15,
               },
+              'light-high-contrast': {
+                $value: '{base.color.neutral.5}',
+                alpha: 1,
+              },
             },
           },
           alpha: 0.1,
@@ -365,6 +381,10 @@
                 $value: '{base.color.neutral.8}',
                 alpha: 0.2,
               },
+              'light-high-contrast': {
+                $value: '{base.color.neutral.6}',
+                alpha: 1,
+              },
             },
           },
           alpha: 0.15,
@@ -409,6 +429,10 @@
                 $value: '{base.color.neutral.8}',
                 alpha: 0.1,
               },
+              'light-high-contrast': {
+                $value: '{base.color.neutral.5}',
+                alpha: 1,
+              },
             },
           },
           alpha: 0.15,
@@ -447,6 +471,9 @@
               'dark-high-contrast': {
                 $value: '{borderColor.default}',
               },
+              'light-high-contrast': {
+                $value: '{borderColor.default}',
+              },
             },
           },
         },
@@ -466,6 +493,9 @@
               'dark-high-contrast': {
                 $value: '{borderColor.default}',
               },
+              'light-high-contrast': {
+                $value: '{borderColor.default}',
+              },
             },
           },
         },
@@ -503,6 +533,9 @@
             'org.primer.overrides': {
               dark: '{base.color.red.3}',
               'dark-protanopia-deuteranopia': '{base.color.orange.3}',
+              'light-high-contrast': {
+                $value: '{fgColor.onEmphasis}',
+              },
             },
           },
         },
@@ -524,6 +557,10 @@
               'dark-high-contrast': {
                 $value: '{bgColor.danger.emphasis}',
               },
+              'light-high-contrast': {
+                $value: '{bgColor.danger.emphasis}',
+                alpha: null,
+              },
             },
           },
         },
@@ -551,6 +588,9 @@
                 $value: '#c51120',
                 alpha: 1,
               },
+              'light-high-contrast': {
+                $value: '#8c0b1d',
+              },
             },
           },
         },
@@ -593,6 +633,9 @@
               'dark-dimmed': {
                 $value: '#3876d3',
               },
+              'light-high-contrast': {
+                $value: '#0344a8',
+              },
             },
           },
         },
@@ -615,6 +658,9 @@
               'dark-dimmed': {
                 $value: '#3f7fdb',
               },
+              'light-high-contrast': {
+                $value: '#033f9d',
+              },
             },
           },
         },
@@ -708,6 +754,9 @@
               'dark-dimmed': {
                 $value: '#3876d3',
               },
+              'light-high-contrast': {
+                $value: '#0344a8',
+              },
             },
           },
         },
@@ -730,6 +779,9 @@
               'dark-dimmed': {
                 $value: '#3f7fdb',
               },
+              'light-high-contrast': {
+                $value: '#033f9d',
+              },
             },
           },
         },
@@ -773,6 +825,9 @@
             'dark-dimmed': {
               $value: '{base.color.neutral.5}',
             },
+            'light-high-contrast': {
+              $value: '{base.color.neutral.5}',
+            },
           },
         },
       },
@@ -795,6 +850,9 @@
             'dark-dimmed': {
               $value: '{base.color.neutral.6}',
             },
+            'light-high-contrast': {
+              $value: '{base.color.neutral.6}',
+            },
           },
         },
       },
@@ -817,6 +875,9 @@
             'dark-dimmed': {
               $value: '{base.color.neutral.7}',
             },
+            'light-high-contrast': {
+              $value: '{base.color.neutral.7}',
+            },
           },
         },
       },
@@ -894,6 +955,9 @@
             'dark-dimmed': {
               $value: '{base.color.neutral.7}',
             },
+            'light-high-contrast': {
+              $value: '{borderColor.emphasis}',
+            },
           },
         },
       },
diff --git a/src/tokens/functional/color/light/overrides/light.high-contrast.json5 b/src/tokens/functional/color/light/overrides/light.high-contrast.json5
index c0245f643..17274e168 100644
--- a/src/tokens/functional/color/light/overrides/light.high-contrast.json5
+++ b/src/tokens/functional/color/light/overrides/light.high-contrast.json5
@@ -4,120 +4,6 @@
  * @description All overwrites for functional color tokens for light high contrast color mode are in this file
  */
 {
-  control: {
-    fgColor: {
-      placeholder: {
-        $value: '{base.color.neutral.10}',
-        $type: 'color',
-      },
-    },
-    bgColor: {
-      rest: {
-        $value: '{base.color.neutral.4}',
-        $type: 'color',
-      },
-      hover: {
-        $value: '{base.color.neutral.5}',
-        $type: 'color',
-      },
-      active: {
-        $value: '{base.color.neutral.6}',
-        $type: 'color',
-      },
-    },
-    transparent: {
-      bgColor: {
-        hover: {
-          $value: '{base.color.neutral.5}',
-          $type: 'color',
-          alpha: 1,
-        },
-        active: {
-          $value: '{base.color.neutral.6}',
-          $type: 'color',
-          alpha: 1,
-        },
-        selected: {
-          $value: '{base.color.neutral.5}',
-          $type: 'color',
-          alpha: 1,
-        },
-      },
-      borderColor: {
-        hover: {
-          $value: '{borderColor.default}',
-          $type: 'color',
-        },
-        active: {
-          $value: '{borderColor.default}',
-          $type: 'color',
-        },
-      },
-    },
-    danger: {
-      fgColor: {
-        hover: {
-          $value: '{fgColor.onEmphasis}',
-          $type: 'color',
-        },
-      },
-      bgColor: {
-        hover: {
-          $value: '{bgColor.danger.emphasis}',
-          $type: 'color',
-          alpha: null,
-        },
-        active: {
-          $value: '#8c0b1d',
-          $type: 'color',
-        },
-      },
-    },
-    checked: {
-      bgColor: {
-        hover: {
-          $value: '#0344a8',
-          $type: 'color',
-        },
-        active: {
-          $value: '#033f9d',
-          $type: 'color',
-        },
-      },
-      borderColor: {
-        hover: {
-          $value: '#0344a8',
-          $type: 'color',
-        },
-        active: {
-          $value: '#033f9d',
-          $type: 'color',
-        },
-      },
-    },
-  },
-  controlTrack: {
-    bgColor: {
-      rest: {
-        $value: '{base.color.neutral.5}',
-        $type: 'color',
-      },
-      hover: {
-        $value: '{base.color.neutral.6}',
-        $type: 'color',
-      },
-      active: {
-        $value: '{base.color.neutral.7}',
-        $type: 'color',
-      },
-    },
-    borderColor: {
-      rest: {
-        $value: '{borderColor.emphasis}',
-        $type: 'color',
-      },
-    },
-  },
   button: {
     primary: {
       bgColor: {