diff --git a/src/preprocessors/themeOverrides.ts b/src/preprocessors/themeOverrides.ts
index 897fbef0a..80019741e 100644
--- a/src/preprocessors/themeOverrides.ts
+++ b/src/preprocessors/themeOverrides.ts
@@ -21,6 +21,7 @@ export const themeOverrides: Preprocessor = {
       // get override
       const override =
         token.$extensions?.[extensionProp][currentTheme] || token.$extensions?.[extensionProp][fallbackTheme]
+
       // token an theme value exist
       return {
         ...token,
diff --git a/src/tokens/component/header.json5 b/src/tokens/component/header.json5
new file mode 100644
index 000000000..b4898c566
--- /dev/null
+++ b/src/tokens/component/header.json5
@@ -0,0 +1,65 @@
+{
+  header: {
+    bgColor: {
+      $value: '{base.color.neutral.12}',
+      $type: 'color',
+      $extensions: {
+        'org.primer.figma': {
+          collection: 'mode',
+          group: 'component (internal)',
+          scopes: ['bgColor'],
+        },
+        'org.primer.overrides': {
+          dark: {
+            $value: '{base.color.neutral.2}',
+            alpha: 0.95,
+          },
+        },
+      },
+    },
+    fgColor: {
+      default: {
+        $value: '{base.color.neutral.0}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component (internal)',
+            scopes: ['fgColor'],
+          },
+          'org.primer.overrides': {
+            dark: '{base.color.neutral.13}',
+          },
+        },
+        alpha: 0.7,
+      },
+      logo: {
+        $value: '{base.color.neutral.0}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component (internal)',
+            scopes: ['fgColor'],
+          },
+          'org.primer.overrides': {
+            dark: '{base.color.neutral.12}',
+          },
+        },
+      },
+    },
+    borderColor: {
+      divider: {
+        $value: '{base.color.neutral.8}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component (internal)',
+            scopes: ['borderColor'],
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/src/tokens/component/headerSerach.json5 b/src/tokens/component/headerSerach.json5
new file mode 100644
index 000000000..1b1e1fa73
--- /dev/null
+++ b/src/tokens/component/headerSerach.json5
@@ -0,0 +1,32 @@
+{
+  headerSearch: {
+    bgColor: {
+      $value: '{base.color.neutral.12}',
+      $type: 'color',
+      $extensions: {
+        'org.primer.figma': {
+          collection: 'mode',
+          group: 'component (internal)',
+          scopes: ['bgColor'],
+        },
+        'org.primer.overrides': {
+          dark: '{base.color.neutral.1}',
+        },
+      },
+    },
+    borderColor: {
+      $value: '{base.color.neutral.8}',
+      $type: 'color',
+      $extensions: {
+        'org.primer.figma': {
+          collection: 'mode',
+          group: 'component (internal)',
+          scopes: ['borderColor'],
+        },
+        'org.primer.overrides': {
+          dark: '{base.color.neutral.5}',
+        },
+      },
+    },
+  },
+}
diff --git a/src/tokens/component/overlay.json5 b/src/tokens/component/overlay.json5
new file mode 100644
index 000000000..c8d7b830c
--- /dev/null
+++ b/src/tokens/component/overlay.json5
@@ -0,0 +1,68 @@
+{
+  overlay: {
+    bgColor: {
+      $value: '{base.color.neutral.0}',
+      $type: 'color',
+      $extensions: {
+        'org.primer.figma': {
+          collection: 'mode',
+          group: 'component (internal)',
+          scopes: ['bgColor'],
+        },
+        'org.primer.overrides': {
+          dark: '{bgColor.muted}',
+          'dark-dimmed': '{base.color.neutral.5}',
+        },
+      },
+    },
+    borderColor: {
+      $value: '{borderColor.muted}',
+      $type: 'color',
+      $extensions: {
+        'org.primer.figma': {
+          collection: 'mode',
+          group: 'component (internal)',
+        },
+        'org.primer.overrides': {
+          dark: {
+            alpha: 1,
+            $value: '{borderColor.muted}',
+          },
+          'dark-dimmed': {
+            $value: '{base.color.neutral.7}',
+            alpha: 0.7,
+          },
+          'light-high-contrast': {
+            alpha: 1,
+            $value: '{borderColor.default}',
+          },
+          'dark-high-contrast': {
+            $value: '{borderColor.default}',
+            alpha: 1,
+          },
+        },
+      },
+      alpha: 0.5,
+    },
+    backdrop: {
+      bgColor: {
+        $value: '{base.color.neutral.7}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component (internal)',
+            scopes: ['bgColor'],
+          },
+          'org.primer.overrides': {
+            dark: '{base.color.neutral.3}',
+            'dark-dimmed': '{base.color.neutral.4}',
+            'light-high-contrast': '{base.color.neutral.11}',
+            'dark-high-contrast': '{base.color.neutral.11}',
+          },
+        },
+        alpha: 0.4,
+      },
+    },
+  },
+}
diff --git a/src/tokens/component/skeletonLoader.json5 b/src/tokens/component/skeletonLoader.json5
new file mode 100644
index 000000000..7a2733063
--- /dev/null
+++ b/src/tokens/component/skeletonLoader.json5
@@ -0,0 +1,29 @@
+{
+  skeletonLoader: {
+    bgColor: {
+      $value: '{base.color.neutral.8}',
+      $type: 'color',
+      $extensions: {
+        'org.primer.figma': {
+          collection: 'mode',
+          group: 'component',
+          scopes: ['bgColor'],
+        },
+        'org.primer.overrides': {
+          dark: {
+            alpha: 0.2,
+          },
+          'light-high-contrast': {
+            $value: '{base.color.neutral.5}',
+            alpha: 1,
+          },
+          'dark-high-contrast': {
+            $value: '{base.color.neutral.5}',
+            alpha: 1,
+          },
+        },
+      },
+      alpha: 0.1,
+    },
+  },
+}
diff --git a/src/tokens/functional/color/dark/app-dark.json5 b/src/tokens/functional/color/dark/app-dark.json5
index 302cf5618..192471e3e 100644
--- a/src/tokens/functional/color/dark/app-dark.json5
+++ b/src/tokens/functional/color/dark/app-dark.json5
@@ -251,85 +251,4 @@
       },
     },
   },
-  header: {
-    fgColor: {
-      default: {
-        $value: '{fgColor.onEmphasis}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-        alpha: 0.7,
-      },
-      logo: {
-        $value: '{fgColor.onEmphasis}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-    bgColor: {
-      $value: '{base.color.neutral.10}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-
-          group: 'component',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    borderColor: {
-      divider: {
-        $value: '{base.color.neutral.4}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['borderColor'],
-          },
-        },
-      },
-    },
-  },
-  headerSearch: {
-    bgColor: {
-      $value: '{base.color.neutral.10}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-
-          group: 'component',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    borderColor: {
-      $value: '{base.color.neutral.7}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-
-          group: 'component',
-          scopes: ['borderColor'],
-        },
-      },
-    },
-  },
 }
diff --git a/src/tokens/functional/color/dark/overrides/dark.dimmed.json5 b/src/tokens/functional/color/dark/overrides/dark.dimmed.json5
index 4671596f0..406ba2c21 100644
--- a/src/tokens/functional/color/dark/overrides/dark.dimmed.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.dimmed.json5
@@ -176,24 +176,6 @@
       },
     },
   },
-  overlay: {
-    backdrop: {
-      bgColor: {
-        $value: '{base.color.neutral.4}',
-        $type: 'color',
-        alpha: 0.4,
-      },
-    },
-    bgColor: {
-      $value: '{base.color.neutral.5}',
-      $type: 'color',
-    },
-    borderColor: {
-      $value: '{base.color.neutral.7}',
-      $type: 'color',
-      alpha: 0.7,
-    },
-  },
   button: {
     primary: {
       bgColor: {
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 246e6108a..d24aac89e 100644
--- a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
@@ -517,20 +517,6 @@
       },
     },
   },
-  overlay: {
-    borderColor: {
-      $value: '{borderColor.default}',
-      $type: 'color',
-      alpha: null,
-    },
-    backdrop: {
-      bgColor: {
-        $value: '{base.color.neutral.11}',
-        $type: 'color',
-        alpha: 0.4,
-      },
-    },
-  },
   display: {
     blue: {
       bgColor: {
@@ -885,11 +871,4 @@
       $type: 'color',
     },
   },
-  skeletonLoader: {
-    bgColor: {
-      $value: '{base.color.neutral.5}',
-      $type: 'color',
-      alpha: 1,
-    },
-  },
 }
diff --git a/src/tokens/functional/color/dark/patterns-dark.json5 b/src/tokens/functional/color/dark/patterns-dark.json5
index bb4b6dc74..4cb669408 100644
--- a/src/tokens/functional/color/dark/patterns-dark.json5
+++ b/src/tokens/functional/color/dark/patterns-dark.json5
@@ -1649,82 +1649,6 @@
       },
     },
   },
-  header: {
-    bgColor: {
-      $value: '{base.color.neutral.2}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['bgColor'],
-        },
-      },
-      alpha: 0.95,
-    },
-    fgColor: {
-      default: {
-        $value: '{base.color.neutral.13}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component (internal)',
-            scopes: ['fgColor'],
-          },
-        },
-        alpha: 0.7,
-      },
-      logo: {
-        $value: '{base.color.neutral.12}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component (internal)',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-    borderColor: {
-      divider: {
-        $value: '{base.color.neutral.8}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component (internal)',
-            scopes: ['borderColor'],
-          },
-        },
-      },
-    },
-  },
-  headerSearch: {
-    bgColor: {
-      $value: '{base.color.neutral.1}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    borderColor: {
-      $value: '{base.color.neutral.5}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['borderColor'],
-        },
-      },
-    },
-  },
   menu: {
     bgColor: {
       active: {
@@ -1740,43 +1664,6 @@
       },
     },
   },
-  overlay: {
-    bgColor: {
-      $value: '{bgColor.muted}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    borderColor: {
-      $value: '{borderColor.muted}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-        },
-      },
-    },
-    backdrop: {
-      bgColor: {
-        $value: '{base.color.neutral.3}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component (internal)',
-            scopes: ['bgColor'],
-          },
-        },
-        alpha: 0.4,
-      },
-    },
-  },
   selectMenu: {
     borderColor: {
       $value: '{borderColor.default}',
@@ -1818,20 +1705,6 @@
       },
     },
   },
-  skeletonLoader: {
-    bgColor: {
-      $value: '{base.color.neutral.8}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component',
-          scopes: ['bgColor'],
-        },
-      },
-      alpha: 0.2,
-    },
-  },
   treeViewItem: {
     leadingVisual: {
       iconColor: {
diff --git a/src/tokens/functional/color/light/app-light.json5 b/src/tokens/functional/color/light/app-light.json5
index df3e0fcc9..bf438e8e1 100644
--- a/src/tokens/functional/color/light/app-light.json5
+++ b/src/tokens/functional/color/light/app-light.json5
@@ -232,79 +232,4 @@
       },
     },
   },
-  header: {
-    fgColor: {
-      default: {
-        $value: '{fgColor.onEmphasis}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-        alpha: 0.7,
-      },
-      logo: {
-        $value: '{fgColor.onEmphasis}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-    bgColor: {
-      $value: '{base.color.neutral.13}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    borderColor: {
-      divider: {
-        $value: '{base.color.neutral.10}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['borderColor'],
-          },
-        },
-      },
-    },
-  },
-  headerSearch: {
-    bgColor: {
-      $value: '{base.color.neutral.13}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    borderColor: {
-      $value: '{base.color.neutral.10}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component',
-          scopes: ['borderColor'],
-        },
-      },
-    },
-  },
 }
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 52389e334..66b99fbb5 100644
--- a/src/tokens/functional/color/light/overrides/light.high-contrast.json5
+++ b/src/tokens/functional/color/light/overrides/light.high-contrast.json5
@@ -448,20 +448,6 @@
       },
     },
   },
-  overlay: {
-    borderColor: {
-      $value: '{borderColor.default}',
-      $type: 'color',
-      alpha: null,
-    },
-    backdrop: {
-      bgColor: {
-        $value: '{base.color.neutral.11}',
-        $type: 'color',
-        alpha: 0.4,
-      },
-    },
-  },
   display: {
     blue: {
       bgColor: {
@@ -806,11 +792,4 @@
       },
     },
   },
-  skeletonLoader: {
-    bgColor: {
-      $value: '{base.color.neutral.5}',
-      $type: 'color',
-      alpha: 1,
-    },
-  },
 }
diff --git a/src/tokens/functional/color/light/patterns-light.json5 b/src/tokens/functional/color/light/patterns-light.json5
index bd5148414..6ceb59bd2 100644
--- a/src/tokens/functional/color/light/patterns-light.json5
+++ b/src/tokens/functional/color/light/patterns-light.json5
@@ -1643,81 +1643,6 @@
       },
     },
   },
-  header: {
-    bgColor: {
-      $value: '{base.color.neutral.12}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    fgColor: {
-      default: {
-        $value: '{base.color.neutral.0}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component (internal)',
-            scopes: ['fgColor'],
-          },
-        },
-        alpha: 0.7,
-      },
-      logo: {
-        $value: '{base.color.neutral.0}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component (internal)',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-    borderColor: {
-      divider: {
-        $value: '{base.color.neutral.8}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component (internal)',
-            scopes: ['borderColor'],
-          },
-        },
-      },
-    },
-  },
-  headerSearch: {
-    bgColor: {
-      $value: '{base.color.neutral.12}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    borderColor: {
-      $value: '{base.color.neutral.8}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['borderColor'],
-        },
-      },
-    },
-  },
   menu: {
     bgColor: {
       active: {
@@ -1733,44 +1658,6 @@
       },
     },
   },
-  overlay: {
-    bgColor: {
-      $value: '{base.color.neutral.0}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    borderColor: {
-      $value: '{borderColor.muted}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-        },
-      },
-      alpha: 0.5,
-    },
-    backdrop: {
-      bgColor: {
-        $value: '{base.color.neutral.7}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component (internal)',
-            scopes: ['bgColor'],
-          },
-        },
-        alpha: 0.4,
-      },
-    },
-  },
   selectMenu: {
     borderColor: {
       $value: '{base.color.transparent}',
@@ -1812,20 +1699,6 @@
       },
     },
   },
-  skeletonLoader: {
-    bgColor: {
-      $value: '{base.color.neutral.8}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component',
-          scopes: ['bgColor'],
-        },
-      },
-      alpha: 0.1,
-    },
-  },
   treeViewItem: {
     leadingVisual: {
       iconColor: {
diff --git a/src/transformers/colorToHex.ts b/src/transformers/colorToHex.ts
index bd39c5c61..74a651b2b 100644
--- a/src/transformers/colorToHex.ts
+++ b/src/transformers/colorToHex.ts
@@ -16,7 +16,7 @@ export const colorToHex: Transform = {
   filter: isColor,
   transform: (token: TransformedToken, config: PlatformConfig) => {
     const alphaValue = token.alpha
-    if (alphaValue === null || alphaValue === undefined) {
+    if (alphaValue === null || alphaValue === undefined || alphaValue === 1) {
       return toHex(getTokenValue(token))
     }
     return toHex(alpha(getTokenValue(token), alphaValue, token, config))