diff --git a/src/tokens/component/diffBlob.json5 b/src/tokens/component/diffBlob.json5
index e9409e14c..7135da823 100644
--- a/src/tokens/component/diffBlob.json5
+++ b/src/tokens/component/diffBlob.json5
@@ -65,11 +65,14 @@
           },
           'org.primer.overrides': {
             'light-protanopia-deuteranopia': {},
-            'light-tritanopia': {},
+            'light-tritanopia': '{base.color.blue.1}',
             'light-high-contrast': '{base.color.green.5}',
             'dark-high-contrast': '{bgColor.success.emphasis}',
             'dark-protanopia-deuteranopia': {},
-            'dark-tritanopia': {},
+            'dark-tritanopia': {
+              $value: '{base.color.blue.4}',
+              alpha: 0.4,
+            },
             dark: {
               $value: '{base.color.green.4}',
               alpha: 0.4,
@@ -101,11 +104,12 @@
           },
           'org.primer.overrides': {
             'light-protanopia-deuteranopia': {},
-            'light-tritanopia': {},
-            'light-high-contrast': {},
-            'dark-high-contrast': {},
+            'light-tritanopia': '{base.color.blue.1}',
             'dark-protanopia-deuteranopia': {},
-            'dark-tritanopia': {},
+            'dark-tritanopia': {
+              $value: '{base.color.blue.3}',
+              alpha: 0.3,
+            },
             dark: {
               $value: '{base.color.green.3}',
               alpha: 0.3,
@@ -171,11 +175,10 @@
           },
           'org.primer.overrides': {
             'light-protanopia-deuteranopia': {},
-            'light-tritanopia': {},
+            'light-tritanopia': '{base.color.red.1}',
             'light-high-contrast': '{base.color.red.5}',
             'dark-high-contrast': '{bgColor.danger.emphasis}',
             'dark-protanopia-deuteranopia': {},
-            'dark-tritanopia': {},
             dark: {
               $value: '{base.color.red.4}',
               alpha: 0.4,
@@ -207,11 +210,10 @@
           },
           'org.primer.overrides': {
             'light-protanopia-deuteranopia': {},
-            'light-tritanopia': {},
+            'light-tritanopia': '{base.color.red.1}',
             'light-high-contrast': {},
             'dark-high-contrast': {},
             'dark-protanopia-deuteranopia': {},
-            'dark-tritanopia': {},
             dark: {
               $value: '{base.color.red.4}',
               alpha: 0.3,
@@ -242,6 +244,8 @@
             scopes: ['bgColor'],
           },
           'org.primer.overrides': {
+            'light-tritanopia': '{base.color.neutral.1}',
+            'dark-tritanopia': '{base.color.neutral.3}',
             'dark-high-contrast': {
               $value: '{bgColor.accent.muted}',
               alpha: 0.2,
@@ -287,6 +291,7 @@
             },
             '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,
@@ -304,6 +309,9 @@
               group: 'component',
               scopes: ['bgColor'],
             },
+            'org.primer.overrides': {
+              'dark-tritanopia': '{base.color.neutral.8}',
+            },
           },
         },
       },
@@ -353,4 +361,32 @@
     },
   },
   '----------': '----------',
+  'light-tritanopia': {
+    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'],
+            },
+          },
+        },
+      },
+    },
+  },
 }
diff --git a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5 b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
index 8b0c8579c..c1ea8f0ef 100644
--- a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
@@ -122,56 +122,6 @@
       },
     },
   },
-  diffBlob: {
-    additionNum: {
-      bgColor: {
-        $value: '{base.color.blue.3}',
-        $type: 'color',
-        $extensions: {
-          alpha: 0.3,
-        },
-      },
-    },
-    additionWord: {
-      bgColor: {
-        $value: '{base.color.blue.4}',
-        $type: 'color',
-        $extensions: {
-          alpha: 0.4,
-        },
-      },
-    },
-    hunkNum: {
-      bgColor: {
-        rest: {
-          $value: '{base.color.neutral.6}',
-          $type: 'color',
-          mix: null,
-          $extensions: {
-            alpha: 1,
-          },
-        },
-        hover: {
-          $value: '{base.color.neutral.8}',
-          $type: 'color',
-          mix: null,
-          $extensions: {
-            alpha: 1,
-          },
-        },
-      },
-    },
-    hunkLine: {
-      bgColor: {
-        $value: '{base.color.neutral.3}',
-        $type: 'color',
-        mix: null,
-        $extensions: {
-          alpha: 1,
-        },
-      },
-    },
-  },
   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 51a8a2b9c..146b92164 100644
--- a/src/tokens/functional/color/light/overrides/light.tritanopia.json5
+++ b/src/tokens/functional/color/light/overrides/light.tritanopia.json5
@@ -113,77 +113,7 @@
       },
     },
   },
-  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: {