diff --git a/src/tokens/functional/color/light/app-light.json5 b/src/tokens/component/codeMirror.json5
similarity index 70%
rename from src/tokens/functional/color/light/app-light.json5
rename to src/tokens/component/codeMirror.json5
index bf438e8e1..80dcceed4 100644
--- a/src/tokens/functional/color/light/app-light.json5
+++ b/src/tokens/component/codeMirror.json5
@@ -9,6 +9,9 @@
           group: 'component',
           scopes: ['fgColor'],
         },
+        'org.primer.overrides': {
+          dark: '{fgColor.default}',
+        },
       },
     },
     bgColor: {
@@ -20,6 +23,9 @@
           group: 'component',
           scopes: ['bgColor'],
         },
+        'org.primer.overrides': {
+          dark: '{bgColor.default}',
+        },
       },
     },
     gutters: {
@@ -32,6 +38,9 @@
             group: 'component',
             scopes: ['bgColor'],
           },
+          'org.primer.overrides': {
+            dark: '{bgColor.default}',
+          },
         },
       },
     },
@@ -46,6 +55,9 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{bgColor.default}',
+            },
           },
         },
         muted: {
@@ -57,6 +69,9 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{fgColor.muted}',
+            },
           },
         },
       },
@@ -71,6 +86,9 @@
             group: 'component',
             scopes: ['fgColor'],
           },
+          'org.primer.overrides': {
+            dark: '{fgColor.muted}',
+          },
         },
       },
     },
@@ -84,6 +102,9 @@
             group: 'component',
             scopes: ['fgColor'],
           },
+          'org.primer.overrides': {
+            dark: '{fgColor.default}',
+          },
         },
       },
     },
@@ -97,6 +118,13 @@
             group: 'component',
             scopes: ['bgColor'],
           },
+          'org.primer.overrides': {
+            dark: '{borderColor.accent.muted}',
+            'dark-high-contrast': {
+              $value: '{base.color.blue.4}',
+              alpha: 0.4,
+            },
+          },
         },
       },
     },
@@ -110,6 +138,9 @@
             group: 'component',
             scopes: ['bgColor'],
           },
+          'org.primer.overrides': {
+            dark: '{bgColor.neutral.muted}',
+          },
         },
       },
     },
@@ -123,6 +154,9 @@
             group: 'component',
             scopes: ['fgColor'],
           },
+          'org.primer.overrides': {
+            dark: '{fgColor.default}',
+          },
         },
       },
     },
@@ -136,6 +170,9 @@
             group: 'component',
             scopes: ['bgColor'],
           },
+          'org.primer.overrides': {
+            dark: '{bgColor.default}',
+          },
         },
       },
     },
@@ -150,6 +187,9 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{base.color.neutral.8}',
+            },
           },
         },
         constant: {
@@ -161,6 +201,9 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{base.color.blue.2}',
+            },
           },
         },
         entity: {
@@ -172,6 +215,9 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{base.color.purple.2}',
+            },
           },
         },
         keyword: {
@@ -183,6 +229,11 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{base.color.red.3}',
+              'light-protanopia-deuteranopia': '{base.color.orange.5}',
+              "dark-protanopia-deuteranopia": '{base.color.orange.3}',
+            },
           },
         },
         storage: {
@@ -194,6 +245,11 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{base.color.red.3}',
+              'light-protanopia-deuteranopia': '{base.color.orange.5}',
+              "dark-protanopia-deuteranopia": '{base.color.orange.3}',
+            },
           },
         },
         string: {
@@ -205,6 +261,9 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{base.color.blue.1}',
+            },
           },
         },
         support: {
@@ -216,6 +275,9 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{base.color.blue.2}',
+            },
           },
         },
         variable: {
@@ -227,6 +289,11 @@
               group: 'component',
               scopes: ['fgColor'],
             },
+            'org.primer.overrides': {
+              dark: '{base.color.orange.2}',
+              'light-tritanopia': '{base.color.red.6}',
+              'dark-tritanopia': '{base.color.red.2}',
+            },
           },
         },
       },
diff --git a/src/tokens/functional/color/dark/app-dark.json5 b/src/tokens/functional/color/dark/app-dark.json5
deleted file mode 100644
index 192471e3e..000000000
--- a/src/tokens/functional/color/dark/app-dark.json5
+++ /dev/null
@@ -1,254 +0,0 @@
-{
-  codeMirror: {
-    fgColor: {
-      $value: '{fgColor.default}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-
-          group: 'component',
-          scopes: ['fgColor'],
-        },
-      },
-    },
-    bgColor: {
-      $value: '{bgColor.default}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-
-          group: 'component',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    gutters: {
-      bgColor: {
-        $value: '{bgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    gutterMarker: {
-      fgColor: {
-        default: {
-          $value: '{bgColor.default}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        muted: {
-          $value: '{fgColor.muted}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-      },
-    },
-    lineNumber: {
-      fgColor: {
-        $value: '{fgColor.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-    cursor: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-    selection: {
-      bgColor: {
-        $value: '{borderColor.accent.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    activeline: {
-      bgColor: {
-        $value: '{bgColor.neutral.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    matchingBracket: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-    lines: {
-      bgColor: {
-        $value: '{bgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    syntax: {
-      fgColor: {
-        comment: {
-          $value: '{base.color.neutral.8}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        constant: {
-          $value: '{base.color.blue.2}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        entity: {
-          $value: '{base.color.purple.2}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        keyword: {
-          $value: '{base.color.red.3}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        storage: {
-          $value: '{base.color.red.3}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        string: {
-          $value: '{base.color.blue.1}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        support: {
-          $value: '{base.color.blue.2}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        variable: {
-          $value: '{base.color.orange.2}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-      },
-    },
-  },
-}
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 9e903f420..0b0bb2733 100644
--- a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
@@ -292,15 +292,6 @@
       },
     },
   },
-  codeMirror: {
-    selection: {
-      bgColor: {
-        $value: '{base.color.blue.4}',
-        $type: 'color',
-        alpha: 0.4,
-      },
-    },
-  },
   display: {
     blue: {
       bgColor: {
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 7f7df3e6b..03ae5a966 100644
--- a/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5
@@ -14,20 +14,6 @@
       },
     },
   },
-  codeMirror: {
-    syntax: {
-      fgColor: {
-        keyword: {
-          $value: '{base.color.orange.3}',
-          $type: 'color',
-        },
-        storage: {
-          $value: '{base.color.orange.3}',
-          $type: 'color',
-        },
-      },
-    },
-  },
   button: {
     primary: {
       bgColor: {
diff --git a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5 b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
index ddd91fdeb..e853da103 100644
--- a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
@@ -4,16 +4,6 @@
  * @description All overwrites for functional color tokens for this theme are in this file
  */
 {
-  codeMirror: {
-    syntax: {
-      fgColor: {
-        variable: {
-          $value: '{base.color.red.2}',
-          $type: 'color',
-        },
-      },
-    },
-  },
   button: {
     primary: {
       bgColor: {
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 c5a8834b2..7bd42047b 100644
--- a/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
+++ b/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
@@ -4,20 +4,6 @@
  * @description All overwrites for functional color tokens for light protanopia and deuteranopia color mode are in this file
  */
 {
-  codeMirror: {
-    syntax: {
-      fgColor: {
-        keyword: {
-          $value: '{base.color.orange.5}',
-          $type: 'color',
-        },
-        storage: {
-          $value: '{base.color.orange.5}',
-          $type: 'color',
-        },
-      },
-    },
-  },
   button: {
     primary: {
       bgColor: {
diff --git a/src/tokens/functional/color/light/overrides/light.tritanopia.json5 b/src/tokens/functional/color/light/overrides/light.tritanopia.json5
index 30249ffa2..4c218015e 100644
--- a/src/tokens/functional/color/light/overrides/light.tritanopia.json5
+++ b/src/tokens/functional/color/light/overrides/light.tritanopia.json5
@@ -4,16 +4,6 @@
  * @description All overwrites for functional color tokens for this theme are in this file
  */
 {
-  codeMirror: {
-    syntax: {
-      fgColor: {
-        variable: {
-          $value: '{base.color.red.6}',
-          $type: 'color',
-        },
-      },
-    },
-  },
   button: {
     primary: {
       bgColor: {