diff --git a/src/tokens/component/diffBlob.json5 b/src/tokens/component/diffBlob.json5
new file mode 100644
index 000000000..411945056
--- /dev/null
+++ b/src/tokens/component/diffBlob.json5
@@ -0,0 +1,403 @@
+{
+  diffBlob: {
+    additionLine: {
+      fgColor: {
+        $value: '{fgColor.default}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['fgColor'],
+          },
+        },
+      },
+      bgColor: {
+        $value: '{bgColor.success.muted}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['bgColor'],
+          },
+          'org.primer.overrides': {
+            'dark-high-contrast': {
+              $value: '{bgColor.success.muted}',
+              alpha: 0.2,
+            },
+            dark: {
+              alpha: 0.15,
+            },
+          },
+        },
+      },
+    },
+    additionWord: {
+      fgColor: {
+        $value: '{fgColor.default}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['fgColor'],
+          },
+          'org.primer.overrides': {
+            'dark-high-contrast': '{fgColor.onEmphasis}',
+            'light-high-contrast': '{fgColor.onEmphasis}',
+          },
+        },
+      },
+      bgColor: {
+        $value: '{base.color.green.1}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['bgColor'],
+          },
+          'org.primer.overrides': {
+            'light-protanopia-deuteranopia': '{base.color.blue.1}',
+            'light-tritanopia': '{base.color.blue.1}',
+            'light-high-contrast': '{base.color.green.5}',
+            'dark-high-contrast': '{bgColor.success.emphasis}',
+            'dark-protanopia-deuteranopia': {
+              $value: '{base.color.blue.4}',
+              alpha: 0.4,
+            },
+            'dark-tritanopia': {
+              $value: '{base.color.blue.4}',
+              alpha: 0.4,
+            },
+            dark: {
+              $value: '{base.color.green.4}',
+              alpha: 0.4,
+            },
+          },
+        },
+      },
+    },
+    additionNum: {
+      fgColor: {
+        $value: '{fgColor.default}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['fgColor'],
+          },
+        },
+      },
+      bgColor: {
+        $value: '{base.color.green.1}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['bgColor'],
+          },
+          'org.primer.overrides': {
+            'light-protanopia-deuteranopia': '{base.color.blue.1}',
+            'light-tritanopia': '{base.color.blue.1}',
+            'dark-high-contrast': '{base.color.green.3}',
+            'dark-protanopia-deuteranopia': {
+              $value: '{base.color.blue.3}',
+              alpha: 0.3,
+            },
+            'dark-tritanopia': {
+              $value: '{base.color.blue.3}',
+              alpha: 0.3,
+            },
+            dark: {
+              $value: '{base.color.green.3}',
+              alpha: 0.3,
+            },
+            'dark-high-contrast': {
+              $value: '{base.color.green.3}',
+              alpha: 0.3,
+            },
+          },
+        },
+      },
+    },
+    deletionLine: {
+      fgColor: {
+        $value: '{fgColor.default}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['fgColor'],
+          },
+        },
+      },
+      bgColor: {
+        $value: '{bgColor.danger.muted}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['bgColor'],
+          },
+          'org.primer.overrides': {
+            'dark-high-contrast': {
+              $value: '{bgColor.danger.muted}',
+              alpha: 0.2,
+            },
+            'dark-protanopia-deuteranopia': {
+              $value: '{base.color.orange.4}',
+              alpha: 0.15,
+            },
+          },
+        },
+      },
+    },
+    deletionWord: {
+      fgColor: {
+        $value: '{fgColor.default}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['fgColor'],
+          },
+          'org.primer.overrides': {
+            'light-high-contrast': '{fgColor.onEmphasis}',
+            'dark-high-contrast': '{fgColor.onEmphasis}',
+            'dark-protanopia-deuteranopia': '{base.color.neutral.12}',
+            'dark-tritanopia': '{base.color.neutral.12}',
+          },
+        },
+      },
+      bgColor: {
+        $value: '{base.color.red.1}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['bgColor'],
+          },
+          'org.primer.overrides': {
+            'light-protanopia-deuteranopia': '{base.color.orange.1}',
+            'light-tritanopia': '{base.color.red.1}',
+            'light-high-contrast': '{base.color.red.5}',
+            'dark-protanopia-deuteranopia': {
+              $value: '{base.color.orange.4}',
+              alpha: 0.4,
+            },
+            'dark-high-contrast': '{bgColor.danger.emphasis}',
+            'dark-tritanopia': {
+              $value: '{base.color.red.4}',
+              alpha: 0.4,
+            },
+            dark: {
+              $value: '{base.color.red.4}',
+              alpha: 0.4,
+            },
+          },
+        },
+      },
+    },
+    deletionNum: {
+      fgColor: {
+        $value: '{fgColor.default}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['fgColor'],
+          },
+        },
+      },
+      bgColor: {
+        $value: '{base.color.red.1}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['bgColor'],
+          },
+          'org.primer.overrides': {
+            'light-protanopia-deuteranopia': '{base.color.orange.1}',
+            'light-tritanopia': '{base.color.red.1}',
+            'dark-high-contrast': {
+              $value: '{bgColor.danger.muted}',
+              alpha: 0.3,
+            },
+            'dark-protanopia-deuteranopia': {
+              $value: '{base.color.orange.4}',
+              alpha: 0.3,
+            },
+            'dark-tritanopia': {
+              $value: '{base.color.red.4}',
+              alpha: 0.3,
+            },
+            dark: {
+              $value: '{base.color.red.4}',
+              alpha: 0.3,
+            },
+          },
+        },
+      },
+    },
+    hunkLine: {
+      fgColor: {
+        $value: '{fgColor.muted}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['fgColor'],
+          },
+        },
+      },
+      bgColor: {
+        $value: '{bgColor.accent.muted}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['bgColor'],
+          },
+          'org.primer.overrides': {
+            'dark-protanopia-deuteranopia': '{base.color.neutral.3}',
+            'light-protanopia-deuteranopia': '{base.color.neutral.1}',
+            'light-tritanopia': '{base.color.neutral.1}',
+            'dark-tritanopia': '{base.color.neutral.3}',
+            'dark-high-contrast': {
+              $value: '{bgColor.accent.muted}',
+              alpha: 0.2,
+            },
+          },
+        },
+      },
+    },
+    hunkNum: {
+      fgColor: {
+        rest: {
+          $value: '{fgColor.default}',
+          $type: 'color',
+          $extensions: {
+            'org.primer.figma': {
+              collection: 'mode',
+              group: 'component',
+              scopes: ['fgColor'],
+            },
+          },
+        },
+        hover: {
+          $value: '{fgColor.onEmphasis}',
+          $type: 'color',
+          $extensions: {
+            'org.primer.figma': {
+              collection: 'mode',
+              group: 'component',
+              scopes: ['fgColor'],
+            },
+            'org.primer.overrides': {
+              'light-protanopia-deuteranopia': '{base.color.black}',
+              'light-tritanopia': '{base.color.black}',
+            },
+          },
+        },
+      },
+      bgColor: {
+        rest: {
+          $value: '{base.color.blue.1}',
+          $type: 'color',
+          $extensions: {
+            'org.primer.figma': {
+              collection: 'mode',
+              group: 'component',
+              scopes: ['bgColor'],
+            },
+            'org.primer.overrides': {
+              dark: '{base.color.blue.8}',
+              'dark-tritanopia': '{base.color.neutral.6}',
+              'dark-high-contrast': {
+                $value: '{base.color.blue.4}',
+                alpha: 0.4,
+              },
+              'dark-protanopia-deuteranopia': '{base.color.neutral.6}',
+              'light-high-contrast': '{base.color.blue.1}',
+              'light-tritanopia': '{base.color.neutral.3}',
+              'light-protanopia-deuteranopia': '{base.color.neutral.3}',
+            },
+          },
+        },
+        hover: {
+          $value: '{bgColor.accent.emphasis}',
+          $type: 'color',
+          $extensions: {
+            'org.primer.figma': {
+              collection: 'mode',
+              group: 'component',
+              scopes: ['bgColor'],
+            },
+            'org.primer.overrides': {
+              'dark-protanopia-deuteranopia': '{base.color.neutral.8}',
+              'light-protanopia-deuteranopia': '{base.color.neutral.7}',
+              'dark-tritanopia': '{base.color.neutral.8}',
+              'light-tritanopia': '{base.color.neutral.7}',
+            },
+          },
+        },
+      },
+    },
+    emptyNum: {
+      bgColor: {
+        $value: '{bgColor.muted}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['bgColor'],
+          },
+        },
+      },
+    },
+    emptyLine: {
+      bgColor: {
+        $value: '{bgColor.muted}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['bgColor'],
+          },
+        },
+      },
+    },
+    expander: {
+      iconColor: {
+        $value: '{fgColor.muted}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            group: 'component',
+            scopes: ['fgColor'],
+          },
+          'org.primer.overrides': {
+            'light-high-contrast': '{fgColor.default}',
+            'dark-high-contrast': '{fgColor.default}',
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/src/tokens/functional/color/dark/app-dark.json5 b/src/tokens/functional/color/dark/app-dark.json5
index 3a74c2594..cb067abad 100644
--- a/src/tokens/functional/color/dark/app-dark.json5
+++ b/src/tokens/functional/color/dark/app-dark.json5
@@ -32,291 +32,6 @@
       },
     },
   },
-  diffBlob: {
-    additionLine: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{bgColor.success.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-        alpha: 0.15,
-      },
-    },
-    additionWord: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{base.color.green.4}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-        alpha: 0.4,
-      },
-    },
-    additionNum: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{base.color.green.3}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-        alpha: 0.3,
-      },
-    },
-    deletionLine: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{bgColor.danger.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    deletionWord: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{base.color.red.4}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-        alpha: 0.4,
-      },
-    },
-    deletionNum: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{base.color.red.4}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-        alpha: 0.3,
-      },
-    },
-    hunkLine: {
-      fgColor: {
-        $value: '{fgColor.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{bgColor.accent.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    hunkNum: {
-      fgColor: {
-        rest: {
-          $value: '{fgColor.default}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        hover: {
-          $value: '{fgColor.onEmphasis}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-      },
-      bgColor: {
-        rest: {
-          $value: '{base.color.blue.8}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-        hover: {
-          $value: '{bgColor.accent.emphasis}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-
-              group: 'component',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-      },
-    },
-    emptyNum: {
-      bgColor: {
-        $value: '{bgColor.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    emptyLine: {
-      bgColor: {
-        $value: '{bgColor.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    expander: {
-      iconColor: {
-        $value: '{fgColor.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-  },
   codeMirror: {
     fgColor: {
       $value: '{fgColor.default}',
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 2fff404b7..188535bb2 100644
--- a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
@@ -508,66 +508,6 @@
       },
     },
   },
-  diffBlob: {
-    additionLine: {
-      fgColor: {
-        $value: '{fgColor.onEmphasis}',
-        $type: 'color',
-      },
-      bgColor: {
-        $value: '{bgColor.success.muted}',
-        $type: 'color',
-        alpha: 0.2,
-      },
-    },
-    additionWord: {
-      bgColor: {
-        $value: '{bgColor.success.emphasis}',
-        $type: 'color',
-        alpha: 1,
-      },
-    },
-    deletionLine: {
-      fgColor: {
-        $value: '{fgColor.onEmphasis}',
-        $type: 'color',
-      },
-      bgColor: {
-        $value: '{bgColor.danger.muted}',
-        $type: 'color',
-        alpha: 0.2,
-      },
-    },
-    deletionWord: {
-      bgColor: {
-        $value: '{bgColor.danger.emphasis}',
-        $type: 'color',
-        alpha: 1,
-      },
-    },
-    hunkNum: {
-      bgColor: {
-        rest: {
-          $value: '{base.color.blue.4}',
-          $type: 'color',
-          alpha: 0.4,
-        },
-      },
-    },
-    hunkLine: {
-      bgColor: {
-        $value: '{bgColor.accent.muted}',
-        $type: 'color',
-        alpha: 0.2,
-      },
-    },
-    expander: {
-      iconColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-      },
-    },
-  },
   codeMirror: {
     selection: {
       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 acc30d816..8dc692f6d 100644
--- a/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5
@@ -186,64 +186,6 @@
       },
     },
   },
-  diffBlob: {
-    additionNum: {
-      bgColor: {
-        $value: '{base.color.blue.3}',
-        $type: 'color',
-        alpha: 0.3,
-      },
-    },
-    additionWord: {
-      bgColor: {
-        $value: '{base.color.blue.4}',
-        $type: 'color',
-        alpha: 0.4,
-      },
-    },
-    deletionNum: {
-      bgColor: {
-        $value: '{base.color.orange.4}',
-        $type: 'color',
-        alpha: 0.3,
-      },
-    },
-    deletionLine: {
-      bgColor: {
-        $value: '{base.color.orange.4}',
-        $type: 'color',
-        alpha: 0.15,
-      },
-    },
-    deletionWord: {
-      bgColor: {
-        $value: '{base.color.orange.4}',
-        $type: 'color',
-        alpha: 0.4,
-      },
-    },
-    hunkNum: {
-      bgColor: {
-        rest: {
-          $value: '{base.color.neutral.6}',
-          $type: 'color',
-          alpha: 1,
-        },
-        hover: {
-          $value: '{base.color.neutral.8}',
-          $type: 'color',
-          alpha: 1,
-        },
-      },
-    },
-    hunkLine: {
-      bgColor: {
-        $value: '{base.color.neutral.3}',
-        $type: 'color',
-        alpha: 1,
-      },
-    },
-  },
   color: {
     ansi: {
       green: {
diff --git a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5 b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
index c6e05ef75..2feaed7d1 100644
--- a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
@@ -121,43 +121,6 @@
       },
     },
   },
-  diffBlob: {
-    additionNum: {
-      bgColor: {
-        $value: '{base.color.blue.3}',
-        $type: 'color',
-        alpha: 0.3,
-      },
-    },
-    additionWord: {
-      bgColor: {
-        $value: '{base.color.blue.4}',
-        $type: 'color',
-        alpha: 0.4,
-      },
-    },
-    hunkNum: {
-      bgColor: {
-        rest: {
-          $value: '{base.color.neutral.6}',
-          $type: 'color',
-          alpha: 1,
-        },
-        hover: {
-          $value: '{base.color.neutral.8}',
-          $type: 'color',
-          alpha: 1,
-        },
-      },
-    },
-    hunkLine: {
-      bgColor: {
-        $value: '{base.color.neutral.3}',
-        $type: 'color',
-        alpha: 1,
-      },
-    },
-  },
   codeMirror: {
     syntax: {
       fgColor: {
diff --git a/src/tokens/functional/color/light/app-light.json5 b/src/tokens/functional/color/light/app-light.json5
index 108cb4a26..425cc1d37 100644
--- a/src/tokens/functional/color/light/app-light.json5
+++ b/src/tokens/functional/color/light/app-light.json5
@@ -29,265 +29,6 @@
       },
     },
   },
-  diffBlob: {
-    additionLine: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{bgColor.success.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    additionWord: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{base.color.green.1}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    additionNum: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{base.color.green.1}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    deletionLine: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{bgColor.danger.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    deletionWord: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{base.color.red.1}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    deletionNum: {
-      fgColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-      bgColor: {
-        $value: '{base.color.red.1}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    hunkLine: {
-      bgColor: {
-        $value: '{bgColor.accent.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-      fgColor: {
-        $value: '{fgColor.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-    hunkNum: {
-      fgColor: {
-        rest: {
-          $value: '{fgColor.default}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-        hover: {
-          $value: '{fgColor.onEmphasis}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component',
-              scopes: ['fgColor'],
-            },
-          },
-        },
-      },
-      bgColor: {
-        rest: {
-          $value: '{base.color.blue.1}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-        hover: {
-          $value: '{bgColor.accent.emphasis}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-      },
-    },
-    emptyNum: {
-      bgColor: {
-        $value: '{bgColor.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    emptyLine: {
-      bgColor: {
-        $value: '{bgColor.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    expander: {
-      iconColor: {
-        $value: '{fgColor.muted}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['fgColor'],
-          },
-        },
-      },
-    },
-  },
   codeMirror: {
     fgColor: {
       $value: '{fgColor.default}',
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 695dc9c76..e04234d9b 100644
--- a/src/tokens/functional/color/light/overrides/light.high-contrast.json5
+++ b/src/tokens/functional/color/light/overrides/light.high-contrast.json5
@@ -440,45 +440,6 @@
       },
     },
   },
-  diffBlob: {
-    additionWord: {
-      fgColor: {
-        $value: '{fgColor.onEmphasis}',
-        $type: 'color',
-      },
-      bgColor: {
-        $value: '{base.color.green.5}',
-        $type: 'color',
-        alpha: 1,
-      },
-    },
-    deletionWord: {
-      fgColor: {
-        $value: '{fgColor.onEmphasis}',
-        $type: 'color',
-      },
-      bgColor: {
-        $value: '{base.color.red.5}',
-        $type: 'color',
-        alpha: 1,
-      },
-    },
-    hunkNum: {
-      bgColor: {
-        rest: {
-          $value: '{base.color.blue.1}',
-          $type: 'color',
-          alpha: 1,
-        },
-      },
-    },
-    expander: {
-      iconColor: {
-        $value: '{fgColor.default}',
-        $type: 'color',
-      },
-    },
-  },
   header: {
     borderColor: {
       divider: {
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 1c30bba3d..899000d92 100644
--- a/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
+++ b/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
@@ -110,77 +110,6 @@
       },
     },
   },
-  diffBlob: {
-    additionNum: {
-      bgColor: {
-        $value: '{base.color.blue.1}',
-        $type: 'color',
-      },
-    },
-    additionWord: {
-      bgColor: {
-        $value: '{base.color.blue.1}',
-        $type: 'color',
-      },
-    },
-    deletionNum: {
-      bgColor: {
-        $value: '{base.color.orange.1}',
-        $type: 'color',
-      },
-    },
-    deletionWord: {
-      bgColor: {
-        $value: '{base.color.orange.1}',
-        $type: 'color',
-      },
-    },
-    hunkLine: {
-      bgColor: {
-        $value: '{base.color.neutral.1}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    hunkNum: {
-      bgColor: {
-        rest: {
-          $value: '{base.color.neutral.3}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-        hover: {
-          $value: '{base.color.neutral.7}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-      },
-      fgColor: {
-        hover: {
-          $value: '{fgColor.default}',
-          $type: 'color',
-        },
-      },
-    },
-  },
   codeMirror: {
     syntax: {
       fgColor: {
diff --git a/src/tokens/functional/color/light/overrides/light.tritanopia.json5 b/src/tokens/functional/color/light/overrides/light.tritanopia.json5
index 48c49f1ad..0740fa55c 100644
--- a/src/tokens/functional/color/light/overrides/light.tritanopia.json5
+++ b/src/tokens/functional/color/light/overrides/light.tritanopia.json5
@@ -110,77 +110,6 @@
       },
     },
   },
-  diffBlob: {
-    additionNum: {
-      bgColor: {
-        $value: '{base.color.blue.1}',
-        $type: 'color',
-      },
-    },
-    additionWord: {
-      bgColor: {
-        $value: '{base.color.blue.1}',
-        $type: 'color',
-      },
-    },
-    deletionNum: {
-      bgColor: {
-        $value: '{base.color.red.1}',
-        $type: 'color',
-      },
-    },
-    deletionWord: {
-      bgColor: {
-        $value: '{base.color.red.1}',
-        $type: 'color',
-      },
-    },
-    hunkLine: {
-      bgColor: {
-        $value: '{base.color.neutral.1}',
-        $type: 'color',
-        $extensions: {
-          'org.primer.figma': {
-            collection: 'mode',
-            group: 'component',
-            scopes: ['bgColor'],
-          },
-        },
-      },
-    },
-    hunkNum: {
-      bgColor: {
-        rest: {
-          $value: '{base.color.neutral.3}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-        hover: {
-          $value: '{base.color.neutral.7}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-      },
-      fgColor: {
-        hover: {
-          $value: '{fgColor.default}',
-          $type: 'color',
-        },
-      },
-    },
-  },
   codeMirror: {
     syntax: {
       fgColor: {