diff --git a/packages/sketch/src/sharedStyles/colors.js b/packages/sketch/src/sharedStyles/colors.js
index 6459bca7f4c5..5f01103a65a7 100644
--- a/packages/sketch/src/sharedStyles/colors.js
+++ b/packages/sketch/src/sharedStyles/colors.js
@@ -35,7 +35,7 @@ export function syncColorStyles(document) {
     ['black', black['100']],
     ['white', white['0']],
     ['orange', orange['40']],
-    ['yellow', yellow['20']],
+    ['yellow', yellow['30']],
   ].map(([name, value]) => {
     return syncColorStyle(document, formatSharedStyleName(name), value);
   });
diff --git a/packages/sketch/src/sharedStyles/themes.js b/packages/sketch/src/sharedStyles/themes.js
index df5a722c2df2..bfdd6015d291 100644
--- a/packages/sketch/src/sharedStyles/themes.js
+++ b/packages/sketch/src/sharedStyles/themes.js
@@ -11,10 +11,13 @@ import {
   g90,
   g100,
   formatTokenName,
+  tokens,
   unstable__meta as meta,
 } from '@carbon/themes';
 import { syncColorStyle } from '../tools/sharedStyles';
 
+const { colors } = tokens;
+
 /**
  * Sync theme color shared styles to the given document and return the result
  * @param {Document} document
@@ -31,7 +34,7 @@ export function syncThemeColorStyles(document) {
   const sharedStyles = Object.keys(themes).flatMap(theme => {
     return Object.keys(themes[theme])
       .filter(token => {
-        return !meta.deprecated.includes(token);
+        return colors.includes(token) && !meta.deprecated.includes(token);
       })
       .map(token => {
         const { type } = meta.colors.find(group => {