diff --git a/scripts/themes.config.ts b/scripts/themes.config.ts
index 21a67802f..d0a4f52e3 100644
--- a/scripts/themes.config.ts
+++ b/scripts/themes.config.ts
@@ -8,7 +8,7 @@ export const themes: TokenBuildInput[] = [
       `src/tokens/functional/color/light/*.json5`,
       `src/tokens/functional/shadow/light.json5`,
       `src/tokens/functional/border/*.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
     ],
     include: [
       `src/tokens/functional/size/border.json5`,
@@ -23,7 +23,7 @@ export const themes: TokenBuildInput[] = [
       `src/tokens/functional/color/light/*.json5`,
       `src/tokens/functional/shadow/light.json5`,
       `src/tokens/functional/border/*.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
       `src/tokens/functional/color/light/overrides/light.tritanopia.json5`,
     ],
     include: [
@@ -39,7 +39,7 @@ export const themes: TokenBuildInput[] = [
       `src/tokens/functional/color/light/*.json5`,
       `src/tokens/functional/shadow/light.json5`,
       `src/tokens/functional/border/*.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
       `src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5`,
     ],
     include: [
@@ -55,7 +55,7 @@ export const themes: TokenBuildInput[] = [
       `src/tokens/functional/color/light/*.json5`,
       `src/tokens/functional/shadow/light.json5`,
       `src/tokens/functional/border/*.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
       `src/tokens/functional/color/light/overrides/light.high-contrast.json5`,
     ],
     include: [
@@ -72,7 +72,7 @@ export const themes: TokenBuildInput[] = [
       `src/tokens/functional/color/dark/*.json5`,
       `src/tokens/functional/shadow/dark.json5`,
       `src/tokens/functional/border/*.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
     ],
     include: [
       `src/tokens/functional/size/border.json5`,
@@ -88,14 +88,14 @@ export const themes: TokenBuildInput[] = [
       `src/tokens/functional/color/dark/overrides/dark.dimmed.json5`,
       `src/tokens/functional/shadow/dark.json5`,
       `src/tokens/functional/border/*.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
     ],
     include: [
       `src/tokens/functional/size/border.json5`,
       `src/tokens/base/color/dark/dark.json5`,
       `src/tokens/base/color/dark/dark.dimmed.json5`,
       `src/tokens/base/color/dark/display-dark.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
     ],
   },
   {
@@ -105,7 +105,7 @@ export const themes: TokenBuildInput[] = [
       `src/tokens/functional/color/dark/*.json5`,
       `src/tokens/functional/shadow/dark.json5`,
       `src/tokens/functional/border/*.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
       `src/tokens/functional/color/dark/overrides/dark.tritanopia.json5`,
     ],
     include: [
@@ -121,7 +121,7 @@ export const themes: TokenBuildInput[] = [
       `src/tokens/functional/color/dark/*.json5`,
       `src/tokens/functional/shadow/dark.json5`,
       `src/tokens/functional/border/*.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
       `src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5`,
     ],
     include: [
@@ -137,7 +137,7 @@ export const themes: TokenBuildInput[] = [
       `src/tokens/functional/color/dark/*.json5`,
       `src/tokens/functional/shadow/dark.json5`,
       `src/tokens/functional/border/*.json5`,
-      `src/tokens/functional/color/components/*.json5`,
+      `src/tokens/component/*.json5`,
       `src/tokens/functional/color/dark/overrides/dark.high-contrast.json5`,
     ],
     include: [
diff --git a/src/tokens/component/topicTag.json5 b/src/tokens/component/topicTag.json5
new file mode 100644
index 000000000..58f7cea6a
--- /dev/null
+++ b/src/tokens/component/topicTag.json5
@@ -0,0 +1,19 @@
+{
+  topicTag: {
+    borderColor: {
+      $value: '{base.color.transparent}',
+      $type: 'color',
+      $extensions: {
+        'org.primer.figma': {
+          collection: 'mode',
+          group: 'component',
+          scopes: ['borderColor'],
+        },
+        'org.primer.overrides': {
+          'light-high-contrast': '{borderColor.accent.emphasis}',
+          'dark-high-contrast': '{borderColor.accent.emphasis}',
+        },
+      },
+    },
+  },
+}
diff --git a/src/tokens/functional/color/dark/app-dark.json5 b/src/tokens/functional/color/dark/app-dark.json5
index c4047aa8b..3a74c2594 100644
--- a/src/tokens/functional/color/dark/app-dark.json5
+++ b/src/tokens/functional/color/dark/app-dark.json5
@@ -1,18 +1,4 @@
 {
-  topicTag: {
-    borderColor: {
-      $value: '{base.color.transparent}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-
-          group: 'component',
-          scopes: ['borderColor'],
-        },
-      },
-    },
-  },
   highlight: {
     neutral: {
       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 c75a17645..2fff404b7 100644
--- a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
@@ -220,12 +220,6 @@
       alpha: 0.9,
     },
   },
-  topicTag: {
-    borderColor: {
-      $value: '{borderColor.accent.emphasis}',
-      $type: 'color',
-    },
-  },
   counter: {
     borderColor: {
       $value: '{borderColor.default}',
diff --git a/src/tokens/functional/color/light/app-light.json5 b/src/tokens/functional/color/light/app-light.json5
index caf51b7fa..108cb4a26 100644
--- a/src/tokens/functional/color/light/app-light.json5
+++ b/src/tokens/functional/color/light/app-light.json5
@@ -1,17 +1,4 @@
 {
-  topicTag: {
-    borderColor: {
-      $value: '{base.color.transparent}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component',
-          scopes: ['borderColor'],
-        },
-      },
-    },
-  },
   highlight: {
     neutral: {
       bgColor: {
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 62ac2b611..695dc9c76 100644
--- a/src/tokens/functional/color/light/overrides/light.high-contrast.json5
+++ b/src/tokens/functional/color/light/overrides/light.high-contrast.json5
@@ -198,12 +198,6 @@
       alpha: 0.9,
     },
   },
-  topicTag: {
-    borderColor: {
-      $value: '{borderColor.accent.emphasis}',
-      $type: 'color',
-    },
-  },
   counter: {
     borderColor: {
       $value: '{borderColor.default}',