diff --git a/.changeset/modern-items-notice.md b/.changeset/modern-items-notice.md
new file mode 100644
index 000000000..929d0ef83
--- /dev/null
+++ b/.changeset/modern-items-notice.md
@@ -0,0 +1,5 @@
+---
+'@primer/primitives': patch
+---
+
+Changes open colors to blue for tritanopia and colorblind themes. Also changed draft to gray for all themes and added a bit more contrast to colorblind modes.
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-bgColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-bgColor-closed-emphasis-linux.png
index 339b654a2..7c3a0a4fd 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-bgColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-bgColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-bgColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-bgColor-open-emphasis-linux.png
index 83f476057..c54e94ee6 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-bgColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-bgColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-closed-emphasis-linux.png
index 85ec3960f..1c56fac18 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-open-emphasis-linux.png
index 03e2baeeb..c3f481627 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-open-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-open-muted-linux.png
index e894577ab..e9d9ef90c 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-open-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-borderColor-open-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-fgColor-closed-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-fgColor-closed-linux.png
index a3e498b0d..bfb567ff8 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-fgColor-closed-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-fgColor-closed-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-fgColor-open-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-fgColor-open-linux.png
index e56e72364..157c5d1fb 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-fgColor-open-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-fgColor-open-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-bgColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-bgColor-closed-emphasis-linux.png
index d954994cb..1c5cca05f 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-bgColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-bgColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-bgColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-bgColor-open-emphasis-linux.png
index 5fc653030..61b5413a6 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-bgColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-bgColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-closed-emphasis-linux.png
index a22260938..41d57ec3f 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-closed-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-closed-muted-linux.png
index a22260938..a1698feec 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-closed-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-closed-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-danger-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-danger-emphasis-linux.png
index 75b6ff587..41d57ec3f 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-danger-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-danger-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-open-emphasis-linux.png
index 75b6ff587..e630605f7 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-open-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-open-muted-linux.png
index 899db901b..a20898288 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-open-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-borderColor-open-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-control-borderColor-danger-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-control-borderColor-danger-linux.png
index 75b6ff587..41d57ec3f 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-control-borderColor-danger-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-control-borderColor-danger-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-fgColor-closed-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-fgColor-closed-linux.png
index 88a20688c..960618126 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-fgColor-closed-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-fgColor-closed-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-fgColor-open-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-fgColor-open-linux.png
index 290f8b833..40edd7c63 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-fgColor-open-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-fgColor-open-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-progressBar-bgColor-danger-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-progressBar-bgColor-danger-linux.png
index a7bf2a2cb..1c5cca05f 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-progressBar-bgColor-danger-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-colorblind-high-contrast-progressBar-bgColor-danger-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-bgColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-bgColor-closed-emphasis-linux.png
index fa154cac4..7c3a0a4fd 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-bgColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-bgColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-bgColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-bgColor-open-emphasis-linux.png
index 6f8122e8e..c54e94ee6 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-bgColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-bgColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-closed-emphasis-linux.png
index 4f67575fa..1c56fac18 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-closed-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-closed-muted-linux.png
index 2ef3a2b4c..d84faf006 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-closed-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-closed-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-open-emphasis-linux.png
index ec3535fac..c3f481627 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-open-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-open-muted-linux.png
index eefd4f416..e9d9ef90c 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-open-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-borderColor-open-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-fgColor-closed-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-fgColor-closed-linux.png
index 339b654a2..bfb567ff8 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-fgColor-closed-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-fgColor-closed-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-fgColor-open-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-fgColor-open-linux.png
index 849e2e362..157c5d1fb 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-fgColor-open-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-fgColor-open-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-bgColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-bgColor-closed-emphasis-linux.png
index d954994cb..a7bf2a2cb 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-bgColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-bgColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-bgColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-bgColor-open-emphasis-linux.png
index a7bf2a2cb..61b5413a6 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-bgColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-bgColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-closed-emphasis-linux.png
index a22260938..704126f03 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-closed-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-closed-muted-linux.png
index a22260938..a1698feec 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-closed-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-closed-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-open-emphasis-linux.png
index 704126f03..e630605f7 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-open-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-open-muted-linux.png
index a1698feec..a20898288 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-open-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-borderColor-open-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-fgColor-closed-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-fgColor-closed-linux.png
index 88a20688c..960618126 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-fgColor-closed-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-fgColor-closed-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-fgColor-open-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-fgColor-open-linux.png
index aba0e4e27..40edd7c63 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-fgColor-open-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-tritanopia-high-contrast-fgColor-open-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-bgColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-bgColor-closed-emphasis-linux.png
index fba4af9f8..df5ded992 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-bgColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-bgColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-bgColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-bgColor-open-emphasis-linux.png
index 1ab9dea7e..b54c1e841 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-bgColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-bgColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-closed-emphasis-linux.png
index b8af213e1..b378fc582 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-done-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-done-muted-linux.png
index 7a5751cd4..f3a49f6aa 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-done-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-done-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-open-emphasis-linux.png
index 7e5b58162..a681a2bfb 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-borderColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-fgColor-closed-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-fgColor-closed-linux.png
index fba4af9f8..4e2308faa 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-fgColor-closed-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-fgColor-closed-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-fgColor-open-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-fgColor-open-linux.png
index 1ab9dea7e..b54c1e841 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-fgColor-open-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-fgColor-open-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-bgColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-bgColor-closed-emphasis-linux.png
index 9eeff27ad..1ecb04f18 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-bgColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-bgColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-bgColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-bgColor-open-emphasis-linux.png
index 0b6f9056e..9da65055e 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-bgColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-bgColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-closed-emphasis-linux.png
index 5bf0ad262..888b57d6f 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-closed-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-closed-muted-linux.png
index 5bf0ad262..3de917452 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-closed-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-closed-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-done-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-done-muted-linux.png
index b4c2599aa..5713c7dbf 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-done-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-done-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-open-emphasis-linux.png
index cbe788b6a..0d14be197 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-open-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-open-muted-linux.png
index 73b7887d4..ccef00764 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-open-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-open-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-severe-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-severe-muted-linux.png
index b1b4d8646..3004b4847 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-severe-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-borderColor-severe-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-fgColor-closed-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-fgColor-closed-linux.png
index f5a4112be..9f112128e 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-fgColor-closed-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-fgColor-closed-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-fgColor-open-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-fgColor-open-linux.png
index 2a6ac0914..27e2fab78 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-fgColor-open-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-colorblind-high-contrast-fgColor-open-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-bgColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-bgColor-closed-emphasis-linux.png
index fba4af9f8..df5ded992 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-bgColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-bgColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-bgColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-bgColor-open-emphasis-linux.png
index dbb48d037..b54c1e841 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-bgColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-bgColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-closed-emphasis-linux.png
index b8af213e1..b378fc582 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-done-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-done-muted-linux.png
index a6f6821cb..f3a49f6aa 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-done-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-done-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-open-emphasis-linux.png
index c03df760b..a681a2bfb 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-borderColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-fgColor-closed-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-fgColor-closed-linux.png
index fba4af9f8..4e2308faa 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-fgColor-closed-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-fgColor-closed-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-fgColor-open-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-fgColor-open-linux.png
index dbb48d037..b54c1e841 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-fgColor-open-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-fgColor-open-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-bgColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-bgColor-closed-emphasis-linux.png
index 9eeff27ad..1ecb04f18 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-bgColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-bgColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-bgColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-bgColor-open-emphasis-linux.png
index 1ecb04f18..9da65055e 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-bgColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-bgColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-closed-emphasis-linux.png
index 5bf0ad262..888b57d6f 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-closed-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-closed-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-closed-muted-linux.png
index 5bf0ad262..176f7e789 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-closed-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-closed-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-done-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-done-muted-linux.png
index b4c2599aa..5713c7dbf 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-done-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-done-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-open-emphasis-linux.png
index 888b57d6f..0d14be197 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-open-emphasis-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-open-muted-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-open-muted-linux.png
index 176f7e789..ccef00764 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-open-muted-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-borderColor-open-muted-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-fgColor-closed-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-fgColor-closed-linux.png
index f5a4112be..9f112128e 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-fgColor-closed-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-fgColor-closed-linux.png differ
diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-fgColor-open-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-fgColor-open-linux.png
index 9f112128e..27e2fab78 100644
Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-fgColor-open-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-light-tritanopia-high-contrast-fgColor-open-linux.png differ
diff --git a/src/tokens/component/button.json5 b/src/tokens/component/button.json5
index 80329521b..a7aff5521 100644
--- a/src/tokens/component/button.json5
+++ b/src/tokens/component/button.json5
@@ -1148,17 +1148,17 @@
               'dark-dimmed-high-contrast': {
                 $value: '{base.color.red.1}',
               },
-              'dark-protanopia-deuteranopia': {
-                $value: '{fgColor.danger}',
-              },
               'dark-high-contrast': {
                 $value: '{base.color.red.2}',
               },
+              'dark-protanopia-deuteranopia': {
+                $value: '{base.color.yellow.3}',
+              },
               'dark-tritanopia-high-contrast': {
                 $value: '{base.color.red.2}',
               },
               'dark-protanopia-deuteranopia-high-contrast': {
-                $value: '{base.color.orange.2}',
+                $value: '{base.color.yellow.2}',
               },
             },
           },
diff --git a/src/tokens/functional/color/bgColor.json5 b/src/tokens/functional/color/bgColor.json5
index 2b8bef591..367efeaa1 100644
--- a/src/tokens/functional/color/bgColor.json5
+++ b/src/tokens/functional/color/bgColor.json5
@@ -250,10 +250,16 @@
           },
           'org.primer.overrides': {
             dark: '{base.color.blue.5}',
+            'dark-protanopia-deuteranopia': '{base.color.blue.7}',
+            'dark-tritanopia': '{base.color.blue.7}',
             'dark-high-contrast': '{base.color.blue.9}',
             'dark-dimmed-high-contrast': '{base.color.blue.7}',
             'dark-tritanopia-high-contrast': '{base.color.blue.9}',
             'dark-protanopia-deuteranopia-high-contrast': '{base.color.blue.9}',
+            'light-tritanopia': '{base.color.blue.7}',
+            'light-protanopia-deuteranopia': '{base.color.blue.7}',
+            'light-tritanopia-high-contrast': '{base.color.blue.7}',
+            'light-protanopia-deuteranopia-high-contrast': '{base.color.blue.7}',
           },
         },
       },
@@ -276,26 +282,14 @@
               $value: '{base.color.green.4}',
               alpha: 0.15,
             },
-            'light-tritanopia': '{base.color.blue.0}',
-            'light-tritanopia-high-contrast': '{base.color.blue.0}',
-            'dark-tritanopia': {
-              $value: '{base.color.blue.4}',
-              alpha: 0.15,
-            },
-            'dark-tritanopia-high-contrast': {
-              $value: '{base.color.blue.4}',
-              alpha: 0.15,
-            },
-            'light-protanopia-deuteranopia': '{base.color.blue.0}',
-            'light-protanopia-deuteranopia-high-contrast': '{base.color.blue.0}',
-            'dark-protanopia-deuteranopia': {
-              $value: '{base.color.blue.4}',
-              alpha: 0.2,
-            },
-            'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.blue.4}',
-              alpha: 0.2,
-            },
+            'light-tritanopia': '{bgColor.accent.muted}',
+            'light-tritanopia-high-contrast': '{bgColor.accent.muted}',
+            'dark-tritanopia': '{bgColor.accent.muted}',
+            'dark-tritanopia-high-contrast': '{bgColor.accent.muted}',
+            'light-protanopia-deuteranopia': '{bgColor.accent.muted}',
+            'light-protanopia-deuteranopia-high-contrast': '{bgColor.accent.muted}',
+            'dark-protanopia-deuteranopia': '{bgColor.accent.muted}',
+            'dark-protanopia-deuteranopia-high-contrast': '{bgColor.accent.muted}',
           },
         },
       },
@@ -313,14 +307,14 @@
           },
           'org.primer.overrides': {
             dark: '{base.color.green.5}',
-            'light-tritanopia': '{base.color.blue.5}',
-            'light-tritanopia-high-contrast': '{base.color.blue.5}',
-            'dark-tritanopia': '{base.color.blue.5}',
-            'dark-tritanopia-high-contrast': '{base.color.blue.9}',
-            'light-protanopia-deuteranopia': '{base.color.blue.5}',
-            'light-protanopia-deuteranopia-high-contrast': '{base.color.blue.5}',
-            'dark-protanopia-deuteranopia': '{base.color.blue.5}',
-            'dark-protanopia-deuteranopia-high-contrast': '{base.color.blue.9}',
+            'light-tritanopia': '{bgColor.accent.emphasis}',
+            'light-tritanopia-high-contrast': '{bgColor.accent.emphasis}',
+            'dark-tritanopia': '{bgColor.accent.emphasis}',
+            'dark-tritanopia-high-contrast': '{bgColor.accent.emphasis}',
+            'light-protanopia-deuteranopia': '{bgColor.accent.emphasis}',
+            'light-protanopia-deuteranopia-high-contrast': '{bgColor.accent.emphasis}',
+            'dark-protanopia-deuteranopia': '{bgColor.accent.emphasis}',
+            'dark-protanopia-deuteranopia-high-contrast': '{bgColor.accent.emphasis}',
             'light-high-contrast': '{base.color.green.5}',
             'dark-high-contrast': '{base.color.green.9}',
             'dark-dimmed-high-contrast': '{base.color.green.7}',
@@ -341,28 +335,6 @@
               web: 'var(--bgColor-success-muted) /* utility class: .color-bg-success */',
             },
           },
-          'org.primer.overrides': {
-            'light-tritanopia-high-contrast': '{base.color.red.0}',
-            'light-tritanopia': '{base.color.red.0}',
-            'dark-tritanopia': {
-              $value: '{base.color.red.4}',
-              alpha: 0.1,
-            },
-            'dark-tritanopia-high-contrast': {
-              $value: '{base.color.red.4}',
-              alpha: 0.1,
-            },
-            'light-protanopia-deuteranopia': '{base.color.orange.0}',
-            'light-protanopia-deuteranopia-high-contrast': '{base.color.orange.0}',
-            'dark-protanopia-deuteranopia': {
-              $value: '{base.color.orange.4}',
-              alpha: 0.1,
-            },
-            'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.orange.4}',
-              alpha: 0.1,
-            },
-          },
         },
       },
       emphasis: {
@@ -377,16 +349,6 @@
               web: 'var(--bgColor-success-emphasis) /* utility class: .color-bg-success-emphasis */',
             },
           },
-          'org.primer.overrides': {
-            'light-tritanopia': '{base.color.red.5}',
-            'light-tritanopia-high-contrast': '{base.color.red.5}',
-            'dark-tritanopia': '{base.color.red.5}',
-            'dark-tritanopia-high-contrast': '{base.color.red.9}',
-            'light-protanopia-deuteranopia': '{base.color.orange.5}',
-            'light-protanopia-deuteranopia-high-contrast': '{base.color.orange.5}',
-            'dark-protanopia-deuteranopia': '{base.color.orange.5}',
-            'dark-protanopia-deuteranopia-high-contrast': '{base.color.orange.9}',
-          },
         },
       },
     },
@@ -501,12 +463,20 @@
               $value: '{base.color.red.4}',
               alpha: 0.1,
             },
-            'light-protanopia-deuteranopia': '{base.color.orange.0}',
-            'light-protanopia-deuteranopia-high-contrast': '{base.color.orange.0}',
             'dark-protanopia-deuteranopia': {
-              $value: '{base.color.orange.4}',
+              $value: '{base.color.yellow.4}',
+              alpha: 0.1,
+            },
+            'light-protanopia-deuteranopia': {
+              $value: '{base.color.yellow.0}',
+            },
+            'dark-protanopia-deuteranopia-high-contrast': {
+              $value: '{base.color.yellow.4}',
               alpha: 0.1,
             },
+            'light-protanopia-deuteranopia-high-contrast': {
+              $value: '{base.color.yellow.0}',
+            },
           },
         },
       },
@@ -523,10 +493,10 @@
             },
           },
           'org.primer.overrides': {
-            'light-protanopia-deuteranopia': '{base.color.orange.5}',
-            'light-protanopia-deuteranopia-high-contrast': '{base.color.orange.5}',
-            'dark-protanopia-deuteranopia': '{base.color.orange.5}',
-            'dark-protanopia-deuteranopia-high-contrast': '{base.color.orange.9}',
+            'light-protanopia-deuteranopia': '{base.color.yellow.5}',
+            'light-protanopia-deuteranopia-high-contrast': '{base.color.yellow.5}',
+            'dark-protanopia-deuteranopia': '{base.color.yellow.5}',
+            'dark-protanopia-deuteranopia-high-contrast': '{base.color.yellow.9}',
             'dark-high-contrast': '{base.color.red.9}',
             'dark-dimmed-high-contrast': '{base.color.red.7}',
             'dark-tritanopia-high-contrast': '{base.color.red.9}',
@@ -547,24 +517,6 @@
               web: 'var(--bgColor-closed-muted) /* utility class: .color-bg-closed */',
             },
           },
-          'org.primer.overrides': {
-            'light-tritanopia': '{bgColor.neutral.muted}',
-            'light-tritanopia-high-contrast': '{bgColor.neutral.muted}',
-            'dark-tritanopia': {
-              $value: '{bgColor.neutral.muted}',
-              alpha: 0.1,
-            },
-            'light-protanopia-deuteranopia': '{bgColor.neutral.muted}',
-            'light-protanopia-deuteranopia-high-contrast': '{bgColor.neutral.muted}',
-            'dark-protanopia-deuteranopia': {
-              $value: '{bgColor.neutral.muted}',
-              alpha: 0.1,
-            },
-            'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{bgColor.neutral.muted}',
-              alpha: 0.1,
-            },
-          },
         },
       },
       emphasis: {
@@ -579,16 +531,6 @@
               web: 'var(--bgColor-closed-emphasis) /* utility class: .color-bg-closed-emphasis */',
             },
           },
-          'org.primer.overrides': {
-            'light-tritanopia': '{bgColor.neutral.emphasis}',
-            'light-tritanopia-high-contrast': '{bgColor.neutral.emphasis}',
-            'dark-tritanopia': '{bgColor.neutral.emphasis}',
-            'dark-tritanopia-high-contrast': '{bgColor.neutral.emphasis}',
-            'light-protanopia-deuteranopia': '{bgColor.neutral.emphasis}',
-            'light-protanopia-deuteranopia-high-contrast': '{bgColor.neutral.emphasis}',
-            'dark-protanopia-deuteranopia': '{bgColor.neutral.emphasis}',
-            'dark-protanopia-deuteranopia-high-contrast': '{bgColor.neutral.emphasis}',
-          },
         },
       },
     },
@@ -605,24 +547,6 @@
               web: 'var(--bgColor-draft-muted)',
             },
           },
-          'org.primer.overrides': {
-            'light-tritanopia': '{bgColor.neutral.muted}',
-            'light-tritanopia-high-contrast': '{bgColor.neutral.muted}',
-            'dark-tritanopia': {
-              $value: '{bgColor.neutral.muted}',
-              alpha: 0.1,
-            },
-            'light-protanopia-deuteranopia': '{bgColor.neutral.muted}',
-            'light-protanopia-deuteranopia-high-contrast': '{bgColor.neutral.muted}',
-            'dark-protanopia-deuteranopia': {
-              $value: '{bgColor.neutral.muted}',
-              alpha: 0.1,
-            },
-            'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{bgColor.neutral.muted}',
-              alpha: 0.1,
-            },
-          },
         },
       },
       emphasis: {
@@ -642,7 +566,7 @@
     },
     done: {
       muted: {
-        $value: '{base.color.purple.0}',
+        $value: '{bgColor.upsell.muted}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -653,16 +577,10 @@
               web: 'var(--bgColor-done-muted) /* utility class: .color-bg-done */',
             },
           },
-          'org.primer.overrides': {
-            dark: {
-              $value: '{base.color.purple.4}',
-              alpha: 0.15,
-            },
-          },
         },
       },
       emphasis: {
-        $value: '{base.color.purple.5}',
+        $value: '{bgColor.upsell.emphasis}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -673,18 +591,12 @@
               web: 'var(--bgColor-done-emphasis) /* utility class: .color-bg-done-emphasis */',
             },
           },
-          'org.primer.overrides': {
-            'dark-high-contrast': '{base.color.purple.9}',
-            'dark-dimmed-high-contrast': '{base.color.purple.7}',
-            'dark-tritanopia-high-contrast': '{base.color.purple.9}',
-            'dark-protanopia-deuteranopia-high-contrast': '{base.color.purple.9}',
-          },
         },
       },
     },
     upsell: {
       muted: {
-        $value: '{bgColor.done.muted}',
+        $value: '{base.color.purple.0}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -695,10 +607,36 @@
               web: 'var(--bgColor-upsell-muted)',
             },
           },
+          'org.primer.overrides': {
+            'light-protanopia-deuteranopia': '{base.color.purple.0}',
+            'light-protanopia-deuteranopia-high-contrast': '{base.color.purple.0}',
+            'dark': {
+              $value: '{base.color.purple.4}',
+              alpha: 0.15,
+            },
+            'dark-protanopia-deuteranopia': {
+              $value: '{base.color.purple.4}',
+              alpha: 0.15,
+            },
+            'dark-protanopia-deuteranopia-high-contrast': {
+              $value: '{base.color.purple.4}',
+              alpha: 0.15,
+            },
+            'dark-tritanopia-high-contrast': {
+              $value: '{base.color.purple.4}',
+              alpha: 0.15,
+            },
+            'dark-tritanopia': {
+              $value: '{base.color.purple.4}',
+              alpha: 0.15,
+            },
+            'light-tritanopia': '{base.color.purple.0}',
+            'light-tritanopia-high-contrast': '{base.color.purple.0}',
+          },
         },
       },
       emphasis: {
-        $value: '{bgColor.done.emphasis}',
+        $value: '{base.color.purple.5}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -709,6 +647,18 @@
               web: 'var(--bgColor-upsell-emphasis)',
             },
           },
+          'org.primer.overrides': {
+            'light-protanopia-deuteranopia': '{base.color.purple.5}',
+            'light-protanopia-deuteranopia-high-contrast': '{base.color.purple.5}',
+            'dark-protanopia-deuteranopia': '{base.color.purple.5}',
+            'dark-tritanopia': '{base.color.purple.5}',
+            'light-tritanopia': '{base.color.purple.5}',
+            'light-tritanopia-high-contrast': '{base.color.purple.5}',
+            'dark-protanopia-deuteranopia-high-contrast': '{base.color.purple.9}',
+            'dark-tritanopia-high-contrast': '{base.color.purple.9}',
+            'dark-high-contrast': '{base.color.purple.9}',
+            'dark-dimmed-high-contrast': '{base.color.purple.9}',
+          },
         },
       },
     },
diff --git a/src/tokens/functional/color/borderColor.json5 b/src/tokens/functional/color/borderColor.json5
index c37f3edbf..edf5303c8 100644
--- a/src/tokens/functional/color/borderColor.json5
+++ b/src/tokens/functional/color/borderColor.json5
@@ -40,7 +40,7 @@
         'org.primer.overrides': {
           'dark-dimmed': {
             $value: '{base.color.neutral.7}',
-            alpha: 0.7,
+            alpha: 0.8,
           },
           'dark-dimmed-high-contrast': {
             $value: '{borderColor.default}',
@@ -54,15 +54,15 @@
             $value: '{borderColor.default}',
             alpha: 1,
           },
-          'light-protanopia-deuteranopia-high-contrast': {
+          'dark-high-contrast': {
             $value: '{borderColor.default}',
             alpha: 1,
           },
-          'dark-high-contrast': {
+          'dark-tritanopia-high-contrast': {
             $value: '{borderColor.default}',
             alpha: 1,
           },
-          'dark-tritanopia-high-contrast': {
+          'light-protanopia-deuteranopia-high-contrast': {
             $value: '{borderColor.default}',
             alpha: 1,
           },
@@ -72,7 +72,7 @@
           },
         },
       },
-      alpha: 0.7,
+      alpha: 0.8,
     },
     emphasis: {
       $value: '{base.color.neutral.8}',
@@ -86,11 +86,17 @@
         'org.primer.overrides': {
           'light-high-contrast': '{borderColor.default}',
           'light-tritanopia-high-contrast': '{borderColor.default}',
-          'light-protanopia-deuteranopia-high-contrast': '{borderColor.default}',
           'dark-high-contrast': '{borderColor.default}',
           'dark-dimmed-high-contrast': '{borderColor.default}',
           'dark-tritanopia-high-contrast': '{borderColor.default}',
-          'dark-protanopia-deuteranopia-high-contrast': '{borderColor.default}',
+          'light-protanopia-deuteranopia-high-contrast': {
+            $value: '{borderColor.default}',
+            alpha: 1,
+          },
+          'dark-protanopia-deuteranopia-high-contrast': {
+            $value: '{borderColor.default}',
+            alpha: 1,
+          },
         },
       },
     },
@@ -241,10 +247,6 @@
               $value: '{base.color.blue.3}',
               alpha: 1,
             },
-            'light-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.blue.3}',
-              alpha: 1,
-            },
             'dark-high-contrast': {
               $value: '{base.color.blue.4}',
               alpha: 1,
@@ -257,6 +259,10 @@
               $value: '{base.color.blue.4}',
               alpha: 1,
             },
+            'light-protanopia-deuteranopia-high-contrast': {
+              $value: '{base.color.blue.3}',
+              alpha: 1,
+            },
             'dark-protanopia-deuteranopia-high-contrast': {
               $value: '{base.color.blue.4}',
               alpha: 1,
@@ -327,18 +333,18 @@
               alpha: 1,
             },
             'dark-protanopia-deuteranopia': {
-              $value: '{base.color.blue.4}',
+              $value: '{borderColor.accent.muted}',
             },
             'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.blue.4}',
+              $value: '{borderColor.accent.muted}',
               alpha: 1,
             },
             'light-protanopia-deuteranopia': {
-              $value: '{base.color.blue.0}',
+              $value: '{borderColor.accent.muted}',
               alpha: 1,
             },
             'light-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.blue.3}',
+              $value: '{borderColor.accent.muted}',
               alpha: 1,
             },
           },
@@ -384,40 +390,6 @@
               web: 'var(--borderColor-open-muted) /* utility class: .color-border-open */',
             },
           },
-          'org.primer.overrides': {
-            'dark-tritanopia': {
-              $value: '{base.color.red.4}',
-              alpha: 0.4,
-            },
-            'dark-tritanopia-high-contrast': {
-              $value: '{base.color.red.4}',
-              alpha: 1,
-            },
-            'light-tritanopia': {
-              $value: '{base.color.red.3}',
-              alpha: 0.4,
-            },
-            'light-tritanopia-high-contrast': {
-              $value: '{base.color.red.3}',
-              alpha: 1,
-            },
-            'dark-protanopia-deuteranopia': {
-              $value: '{base.color.orange.4}',
-              alpha: 0.4,
-            },
-            'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.orange.4}',
-              alpha: 1,
-            },
-            'light-protanopia-deuteranopia': {
-              $value: '{base.color.orange.3}',
-              alpha: 0.4,
-            },
-            'light-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.orange.3}',
-              alpha: 1,
-            },
-          },
         },
       },
       emphasis: {
@@ -432,16 +404,7 @@
               web: 'var(--borderColor-open-emphasis) /* utility class: .color-border-open-emphasis */',
             },
           },
-          'org.primer.overrides': {
-            'dark-tritanopia': '{base.color.red.5}',
-            'dark-tritanopia-high-contrast': '{base.color.red.5}',
-            'light-tritanopia-high-contrast': '{base.color.red.5}',
-            'light-tritanopia': '{base.color.red.5}',
-            'dark-protanopia-deuteranopia': '{base.color.orange.5}',
-            'dark-protanopia-deuteranopia-high-contrast': '{base.color.orange.5}',
-            'light-protanopia-deuteranopia': '{base.color.orange.5}',
-            'light-protanopia-deuteranopia-high-contrast': '{base.color.orange.5}',
-          },
+          'org.primer.overrides': {},
         },
       },
     },
@@ -537,6 +500,10 @@
               $value: '{base.color.orange.2}',
               alpha: 1,
             },
+            'light-protanopia-deuteranopia-high-contrast': {
+              $value: '{base.color.orange.4}',
+              alpha: 1,
+            },
             'dark-protanopia-deuteranopia-high-contrast': {
               $value: '{base.color.orange.5}',
               alpha: 1,
@@ -599,6 +566,10 @@
               $value: '{base.color.red.3}',
               alpha: 1,
             },
+            'light-protanopia-deuteranopia': {
+              $value: '{base.color.yellow.3}',
+              alpha: 0.4,
+            },
             'dark-high-contrast': {
               $value: '{base.color.red.4}',
               alpha: 1,
@@ -611,19 +582,16 @@
               $value: '{base.color.red.4}',
               alpha: 1,
             },
-            'dark-protanopia-deuteranopia': {
-              $value: '{base.color.orange.4}',
-            },
             'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.orange.4}',
+              $value: '{base.color.yellow.4}',
               alpha: 1,
             },
-            'light-protanopia-deuteranopia': {
-              $value: '{base.color.orange.0}',
-              alpha: 1,
+            'dark-protanopia-deuteranopia': {
+              $value: '{base.color.yellow.4}',
+              alpha: 0.4,
             },
             'light-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.orange.4}',
+              $value: '{base.color.yellow.4}',
               alpha: 1,
             },
           },
@@ -643,19 +611,10 @@
             },
           },
           'org.primer.overrides': {
-            'dark-protanopia-deuteranopia': {
-              $value: '{base.color.orange.5}',
-            },
-            'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.orange.5}',
-            },
-            'light-protanopia-deuteranopia': {
-              $value: '{base.color.orange.5}',
-            },
-            'light-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.orange.5}',
-            },
             'dark-dimmed-high-contrast': '{base.color.red.2}',
+            'light-protanopia-deuteranopia': '{base.color.yellow.5}',
+            'dark-protanopia-deuteranopia': '{base.color.yellow.5}',
+            'dark-protanopia-deuteranopia-high-contrast': '{base.color.yellow.2}',
           },
         },
       },
@@ -673,40 +632,6 @@
               web: 'var(--borderColor-closed-muted) /* utility class: .color-border-closed */',
             },
           },
-          'org.primer.overrides': {
-            'dark-tritanopia': {
-              $value: '{borderColor.default}',
-              alpha: 0.4,
-            },
-            'dark-tritanopia-high-contrast': {
-              $value: '{borderColor.default}',
-              alpha: 1,
-            },
-            'light-tritanopia': {
-              $value: '{borderColor.default}',
-              alpha: 0.4,
-            },
-            'light-tritanopia-high-contrast': {
-              $value: '{borderColor.default}',
-              alpha: 1,
-            },
-            'dark-protanopia-deuteranopia': {
-              $value: '{borderColor.default}',
-              alpha: 0.4,
-            },
-            'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{borderColor.default}',
-              alpha: 1,
-            },
-            'light-protanopia-deuteranopia': {
-              $value: '{borderColor.default}',
-              alpha: 0.4,
-            },
-            'light-protanopia-deuteranopia-high-contrast': {
-              $value: '{borderColor.default}',
-              alpha: 1,
-            },
-          },
         },
       },
       emphasis: {
@@ -721,16 +646,6 @@
               web: 'var(--borderColor-closed-emphasis) /* utility class: .color-border-closed-emphasis */',
             },
           },
-          'org.primer.overrides': {
-            'light-protanopia-deuteranopia': '{borderColor.emphasis}',
-            'light-protanopia-deuteranopia-high-contrast': '{borderColor.emphasis}',
-            'dark-protanopia-deuteranopia': '{borderColor.emphasis}',
-            'dark-protanopia-deuteranopia-high-contrast': '{borderColor.emphasis}',
-            'dark-tritanopia': '{borderColor.emphasis}',
-            'dark-tritanopia-high-contrast': '{borderColor.emphasis}',
-            'light-tritanopia': '{borderColor.emphasis}',
-            'light-tritanopia-high-contrast': '{borderColor.emphasis}',
-          },
         },
       },
     },
@@ -747,40 +662,6 @@
               web: 'var(--borderColor-draft-muted)',
             },
           },
-          'org.primer.overrides': {
-            'dark-tritanopia': {
-              $value: '{borderColor.default}',
-              alpha: 0.4,
-            },
-            'dark-tritanopia-high-contrast': {
-              $value: '{borderColor.default}',
-              alpha: 1,
-            },
-            'light-tritanopia': {
-              $value: '{borderColor.default}',
-              alpha: 0.4,
-            },
-            'light-tritanopia-high-contrast': {
-              $value: '{borderColor.default}',
-              alpha: 1,
-            },
-            'dark-protanopia-deuteranopia': {
-              $value: '{borderColor.default}',
-              alpha: 0.4,
-            },
-            'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{borderColor.default}',
-              alpha: 1,
-            },
-            'light-protanopia-deuteranopia': {
-              $value: '{borderColor.default}',
-              alpha: 0.4,
-            },
-            'light-protanopia-deuteranopia-high-contrast': {
-              $value: '{borderColor.default}',
-              alpha: 1,
-            },
-          },
         },
       },
       emphasis: {
@@ -800,7 +681,7 @@
     },
     done: {
       muted: {
-        $value: '{base.color.purple.3}',
+        $value: '{borderColor.upsell.muted}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -811,42 +692,10 @@
               web: 'var(--borderColor-done-muted) /* utility class: .color-border-done */',
             },
           },
-          'org.primer.overrides': {
-            dark: '{base.color.purple.4}',
-            'light-high-contrast': {
-              $value: '{base.color.purple.3}',
-              alpha: 1,
-            },
-            'light-tritanopia-high-contrast': {
-              $value: '{base.color.purple.3}',
-              alpha: 1,
-            },
-            'light-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.purple.3}',
-              alpha: 1,
-            },
-            'dark-high-contrast': {
-              $value: '{base.color.purple.4}',
-              alpha: 1,
-            },
-            'dark-dimmed-high-contrast': {
-              $value: '{base.color.purple.2}',
-              alpha: 1,
-            },
-            'dark-tritanopia-high-contrast': {
-              $value: '{base.color.purple.4}',
-              alpha: 1,
-            },
-            'dark-protanopia-deuteranopia-high-contrast': {
-              $value: '{base.color.purple.4}',
-              alpha: 1,
-            },
-          },
-        },
-        alpha: 0.4,
+        }
       },
       emphasis: {
-        $value: '{base.color.purple.5}',
+        $value: '{borderColor.upsell.emphasis}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -857,15 +706,12 @@
               web: 'var(--borderColor-done-emphasis)',
             },
           },
-          'org.primer.overrides': {
-            'dark-dimmed-high-contrast': '{base.color.purple.2}',
-          },
         },
       },
     },
     upsell: {
       muted: {
-        $value: '{borderColor.done.muted}',
+        $value: '{base.color.purple.3}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -876,10 +722,56 @@
               web: 'var(--borderColor-upsell-muted)',
             },
           },
+          'org.primer.overrides': {
+            'light-protanopia-deuteranopia': {
+              $value: '{base.color.purple.3}',
+              alpha: 1,
+            },
+            dark: {
+              $value: '{base.color.purple.4}',
+              alpha: 0.4,
+            },
+            'dark-protanopia-deuteranopia': {
+              $value: '{base.color.purple.4}',
+              alpha: 0.4,
+            },
+            'light-protanopia-deuteranopia-high-contrast': {
+              $value: '{base.color.purple.3}',
+              alpha: 1,
+            },
+            'dark-protanopia-deuteranopia-high-contrast': {
+              $value: '{base.color.purple.4}',
+              alpha: 1,
+            },
+            'dark-dimmed-high-contrast': {
+              $value: '{base.color.purple.4}',
+              alpha: 1,
+            },
+            'light-tritanopia': {
+              $value: '{base.color.purple.3}',
+              alpha: 1,
+            },
+            'dark-tritanopia': {
+              $value: '{base.color.purple.4}',
+              alpha: 0.4,
+            },
+            'light-tritanopia-high-contrast': {
+              $value: '{base.color.purple.3}',
+              alpha: 1,
+            },
+            'dark-tritanopia-high-contrast': {
+              $value: '{base.color.purple.4}',
+              alpha: 1,
+            },
+            'dark-high-contrast': {
+              $value: '{base.color.purple.4}',
+              alpha: 1,
+            },
+          },
         },
       },
       emphasis: {
-        $value: '{borderColor.done.emphasis}',
+        $value: '{base.color.purple.5}',
         $type: 'color',
         $extensions: {
           'org.primer.figma': {
@@ -890,6 +782,35 @@
               web: 'var(--borderColor-upsell-emphasis)',
             },
           },
+          'org.primer.overrides': {
+            'light-protanopia-deuteranopia': {
+              $value: '{base.color.purple.5}',
+            },
+            'dark-protanopia-deuteranopia': {
+              $value: '{base.color.purple.5}',
+            },
+            'light-protanopia-deuteranopia-high-contrast': {
+              $value: '{base.color.purple.5}',
+            },
+            'dark-protanopia-deuteranopia-high-contrast': {
+              $value: '{base.color.purple.5}',
+            },
+            'dark-dimmed-high-contrast': {
+              $value: '{base.color.purple.5}',
+            },
+            'light-tritanopia': {
+              $value: '{base.color.purple.5}',
+            },
+            'dark-tritanopia': {
+              $value: '{base.color.purple.5}',
+            },
+            'light-tritanopia-high-contrast': {
+              $value: '{base.color.purple.5}',
+            },
+            'dark-tritanopia-high-contrast': {
+              $value: '{base.color.purple.5}',
+            },
+          },
         },
       },
     },
diff --git a/src/tokens/functional/color/fgColor.json5 b/src/tokens/functional/color/fgColor.json5
index 1b7591d27..7411a5fe8 100644
--- a/src/tokens/functional/color/fgColor.json5
+++ b/src/tokens/functional/color/fgColor.json5
@@ -203,14 +203,14 @@
           'dark-high-contrast': '#2BD853',
           'dark-dimmed-high-contrast': '{base.color.green.0}',
           'light-high-contrast': '{base.color.green.6}',
-          'dark-protanopia-deuteranopia': '{base.color.blue.3}',
-          'dark-protanopia-deuteranopia-high-contrast': '{base.color.blue.1}',
-          'light-protanopia-deuteranopia': '{base.color.blue.5}',
-          'light-protanopia-deuteranopia-high-contrast': '{base.color.blue.6}',
-          'dark-tritanopia': '{base.color.blue.3}',
-          'dark-tritanopia-high-contrast': '{base.color.blue.2}',
-          'light-tritanopia': '{base.color.blue.5}',
-          'light-tritanopia-high-contrast': '{base.color.blue.6}',
+          'dark-protanopia-deuteranopia': '{fgColor.accent}',
+          'dark-protanopia-deuteranopia-high-contrast': '{fgColor.accent}',
+          'light-protanopia-deuteranopia': '{fgColor.accent}',
+          'light-protanopia-deuteranopia-high-contrast': '{fgColor.accent}',
+          'dark-tritanopia': '{fgColor.accent}',
+          'dark-tritanopia-high-contrast': '{fgColor.accent}',
+          'light-tritanopia': '{fgColor.accent}',
+          'light-tritanopia-high-contrast': '{fgColor.accent}',
         },
       },
     },
@@ -226,16 +226,6 @@
             web: 'var(--fgColor-open) /* utility class: .color-fg-open */',
           },
         },
-        'org.primer.overrides': {
-          'dark-protanopia-deuteranopia': '{base.color.orange.4}',
-          'dark-protanopia-deuteranopia-high-contrast': '{base.color.orange.2}',
-          'light-protanopia-deuteranopia': '{base.color.orange.5}',
-          'light-protanopia-deuteranopia-high-contrast': '{base.color.orange.6}',
-          'dark-tritanopia': '{base.color.red.4}',
-          'dark-tritanopia-high-contrast': '{base.color.red.2}',
-          'light-tritanopia': '{base.color.red.5}',
-          'light-tritanopia-high-contrast': '{base.color.red.6}',
-        },
       },
     },
     attention: {
@@ -299,15 +289,15 @@
         },
         'org.primer.overrides': {
           dark: '{base.color.red.4}',
-          'dark-protanopia-deuteranopia': '{base.color.orange.3}',
-          'dark-protanopia-deuteranopia-high-contrast': '{base.color.orange.2}',
-          'light-protanopia-deuteranopia': '{base.color.orange.5}',
-          'light-protanopia-deuteranopia-high-contrast': '{base.color.orange.6}',
           'dark-high-contrast': '{base.color.red.3}',
           'dark-dimmed-high-contrast': '{base.color.red.1}',
           'dark-tritanopia-high-contrast': '{base.color.red.3}',
+          'dark-protanopia-deuteranopia-high-contrast': '{base.color.yellow.3}',
+          'dark-protanopia-deuteranopia': '{base.color.yellow.3}',
           'light-high-contrast': '{base.color.red.6}',
           'light-tritanopia-high-contrast': '{base.color.red.6}',
+          'light-protanopia-deuteranopia-high-contrast': '{base.color.yellow.6}',
+          'light-protanopia-deuteranopia': '{base.color.yellow.5}',
         },
       },
     },
@@ -323,16 +313,6 @@
             web: 'var(--fgColor-closed) /* utility class: .color-fg-closed */',
           },
         },
-        'org.primer.overrides': {
-          'dark-protanopia-deuteranopia': '{fgColor.muted}',
-          'dark-protanopia-deuteranopia-high-contrast': '{fgColor.muted}',
-          'light-protanopia-deuteranopia': '{fgColor.muted}',
-          'light-protanopia-deuteranopia-high-contrast': '{fgColor.muted}',
-          'dark-tritanopia': '{fgColor.muted}',
-          'dark-tritanopia-high-contrast': '{fgColor.muted}',
-          'light-tritanopia': '{fgColor.muted}',
-          'light-tritanopia-high-contrast': '{fgColor.muted}',
-        },
       },
     },
     draft: {
@@ -350,7 +330,7 @@
       },
     },
     done: {
-      $value: '{base.color.purple.5}',
+      $value: '{fgColor.upsell}',
       $type: 'color',
       $extensions: {
         'org.primer.figma': {
@@ -361,20 +341,10 @@
             web: 'var(--fgColor-done) /* utility class: .color-fg-done */',
           },
         },
-        'org.primer.overrides': {
-          dark: '{base.color.purple.4}',
-          'dark-high-contrast': '#D3ABFF',
-          'dark-dimmed-high-contrast': '{base.color.purple.1}',
-          'dark-protanopia-deuteranopia-high-contrast': '#D3ABFF',
-          'dark-tritanopia-high-contrast': '#D3ABFF',
-          'light-high-contrast': '{base.color.purple.6}',
-          'light-protanopia-deuteranopia-high-contrast': '{base.color.purple.6}',
-          'light-tritanopia-high-contrast': '{base.color.purple.6}',
-        },
       },
     },
     upsell: {
-      $value: '{fgColor.done}',
+      $value: '{base.color.purple.5}',
       $type: 'color',
       $extensions: {
         'org.primer.figma': {
@@ -385,6 +355,20 @@
             web: 'var(--fgColor-upsell)',
           },
         },
+        'org.primer.overrides': {
+          'dark': '{base.color.purple.4}',
+          'light-protanopia-deuteranopia': '{base.color.purple.5}',
+          'dark-protanopia-deuteranopia': '{base.color.purple.4}',
+          'dark-protanopia-deuteranopia-high-contrast': '{base.color.purple.1}',
+          'dark-dimmed-high-contrast': '{base.color.purple.1}',
+          'light-protanopia-deuteranopia-high-contrast': '{base.color.purple.6}',
+          'light-tritanopia': '{base.color.purple.5}',
+          'dark-tritanopia': '{base.color.purple.4}',
+          'dark-tritanopia-high-contrast': '{base.color.purple.1}',
+          'light-tritanopia-high-contrast': '{base.color.purple.6}',
+          'dark-high-contrast': '{base.color.purple.1}',
+          'light-high-contrast': '{base.color.purple.6}',
+        },
       },
     },
     sponsors: {