diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js
index 59ec1bf5..14da4f80 100644
--- a/src/components/style_switcher/style_switcher.js
+++ b/src/components/style_switcher/style_switcher.js
@@ -590,7 +590,7 @@ export default {
       const shadows = input.shadows || {}
       const fonts = input.fonts || {}
       const colors = !input.themeEngineVersion
-        ? colors2to3(input.colors)
+        ? colors2to3(input.colors || input)
         : input.colors || input
 
       if (version === 0) {
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 7f9f17be..533145d4 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -111,7 +111,7 @@ const getCssShadowFilter = (input) => {
 
 export const generateColors = (themeData) => {
   const sourceColors = !themeData.themeEngineVersion
-    ? colors2to3(themeData.colors)
+    ? colors2to3(themeData.colors || themeData)
     : themeData.colors || themeData
 
   const isLightOnDark = convert(sourceColors.bg).hsl.l < convert(sourceColors.text).hsl.l
@@ -285,7 +285,7 @@ export const DEFAULT_SHADOWS = {
   }]
 }
 export const generateShadows = (input, colors, mod) => {
-  const inputShadows = !input.themeEngineVersion
+  const inputShadows = input.shadows && !input.themeEngineVersion
     ? shadows2to3(input.shadows)
     : input.shadows || {}
   const shadows = Object.entries({