diff --git a/MVMCoreUI/CustomPrimitives/Color.swift b/MVMCoreUI/CustomPrimitives/Color.swift
index 9245153d..678b845c 100644
--- a/MVMCoreUI/CustomPrimitives/Color.swift
+++ b/MVMCoreUI/CustomPrimitives/Color.swift
@@ -86,11 +86,14 @@ public final class Color: Codable {
         let colorString = try container.decode(String.self)
         
         if let vdsColor = UIColor.VDSColor(rawValue: colorString) {
-            self.uiColor = vdsColor.uiColor
+            uiColor = vdsColor.uiColor
             hex = uiColor.hexString ?? ""
+        } else if let color = Color(name: colorString) {
+            uiColor = color.uiColor
+            hex = color.hex
         } else {
             let components = try Color.getColorComponents(for: colorString)
-            self.uiColor = components.color
+            uiColor = components.color
             hex = components.hex
             name = components.name ?? ""
         }