diff --git a/webapp_themeDesigner.py b/webapp_themeDesigner.py
index a17db7edb..14b0a1f2d 100644
--- a/webapp_themeDesigner.py
+++ b/webapp_themeDesigner.py
@@ -231,14 +231,14 @@ def htmlThemeDesigner(cssCache: {}, baseDir: str,
     themeForm += '      <tbody>\n'
 
     for variableName, value in themeJson.items():
-        # only use colors defined as hex
-        if not value.startswith('#'):
-            if color_to_hex.get(value):
-                value = color_to_hex[value]
-            else:
-                continue
         if variableName.endswith('-color') or \
            variableName.endswith('-text'):
+            # only use colors defined as hex
+            if not value.startswith('#'):
+                if color_to_hex.get(value):
+                    value = color_to_hex[value]
+                else:
+                    continue
             variableNameStr = variableName.replace('-', ' ')
             if variableNameStr.endswith(' color'):
                 variableNameStr = variableNameStr.replace(' color', '')