diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0d5b6e5cd50..49b26d9dd4f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ executors:
 parameters:
     current_golden_images_hash:
         type: string
-        default: 8eda90e60eb073d6b78741e5b3457324ca155d59
+        default: 31192df5022fe2dfc067ca7b4c8d72b0d2d98510
     wireit_cache_name:
         type: string
         default: wireit
diff --git a/tools/theme/src/express/theme-dark.css b/tools/theme/src/express/theme-dark.css
index 2c9ab5fa871..6f719e4c468 100644
--- a/tools/theme/src/express/theme-dark.css
+++ b/tools/theme/src/express/theme-dark.css
@@ -12,3 +12,4 @@ governing permissions and limitations under the License.
 
 @import '@spectrum-web-components/styles/express/theme-dark.css';
 @import '@spectrum-web-components/styles/tokens/dark-vars.css';
+@import '@spectrum-web-components/styles/tokens/express/custom-dark-vars.css';
diff --git a/tools/theme/src/express/theme-light.css b/tools/theme/src/express/theme-light.css
index 55388fc87a6..c1ed90a559f 100644
--- a/tools/theme/src/express/theme-light.css
+++ b/tools/theme/src/express/theme-light.css
@@ -12,3 +12,4 @@ governing permissions and limitations under the License.
 
 @import '@spectrum-web-components/styles/express/theme-light.css';
 @import '@spectrum-web-components/styles/tokens/light-vars.css';
+@import '@spectrum-web-components/styles/tokens/express/custom-light-vars.css';
diff --git a/tools/theme/src/theme-dark.css b/tools/theme/src/theme-dark.css
index 98a9c3e74ba..44dbdd25285 100644
--- a/tools/theme/src/theme-dark.css
+++ b/tools/theme/src/theme-dark.css
@@ -12,3 +12,4 @@ governing permissions and limitations under the License.
 
 @import '@spectrum-web-components/styles/theme-dark.css';
 @import '@spectrum-web-components/styles/tokens/dark-vars.css';
+@import '@spectrum-web-components/styles/tokens/spectrum/custom-dark-vars.css';
diff --git a/tools/theme/src/theme-darkest.css b/tools/theme/src/theme-darkest.css
index d972b2ae108..7c8ccbd3881 100644
--- a/tools/theme/src/theme-darkest.css
+++ b/tools/theme/src/theme-darkest.css
@@ -12,3 +12,4 @@ governing permissions and limitations under the License.
 
 @import '@spectrum-web-components/styles/theme-darkest.css';
 @import '@spectrum-web-components/styles/tokens/darkest-vars.css';
+@import '@spectrum-web-components/styles/tokens/spectrum/custom-darkest-vars.css';
diff --git a/tools/theme/src/theme-light.css b/tools/theme/src/theme-light.css
index caebbadb738..1a66368621a 100644
--- a/tools/theme/src/theme-light.css
+++ b/tools/theme/src/theme-light.css
@@ -12,3 +12,4 @@ governing permissions and limitations under the License.
 
 @import '@spectrum-web-components/styles/theme-light.css';
 @import '@spectrum-web-components/styles/tokens/light-vars.css';
+@import '@spectrum-web-components/styles/tokens/spectrum/custom-light-vars.css';
diff --git a/tools/theme/src/theme-lightest.css b/tools/theme/src/theme-lightest.css
index 966e4d8ca19..49ef58e8542 100644
--- a/tools/theme/src/theme-lightest.css
+++ b/tools/theme/src/theme-lightest.css
@@ -12,3 +12,4 @@ governing permissions and limitations under the License.
 
 @import '@spectrum-web-components/styles/theme-lightest.css';
 @import '@spectrum-web-components/styles/tokens/light-vars.css';
+@import '@spectrum-web-components/styles/tokens/spectrum/custom-light-vars.css';