diff --git a/SessionUIKit/Style Guide/Themes/Theme+Colors.swift b/SessionUIKit/Style Guide/Themes/Theme+Colors.swift
index fee2e8025..85cfc72c2 100644
--- a/SessionUIKit/Style Guide/Themes/Theme+Colors.swift	
+++ b/SessionUIKit/Style Guide/Themes/Theme+Colors.swift	
@@ -46,15 +46,30 @@ public extension Theme {
             }
         }
         
+        // FIXME: Clean it when Xcode can show the color panel in "return Color(#colorLiteral())"
         public var swiftUIColor: Color {
             switch self {
-                case .green: return Color(#colorLiteral(red: 0.1921568627, green: 0.9450980392, blue: 0.5882352941, alpha: 1))          // #31F196
-                case .blue: return Color(#colorLiteral(red: 0.3411764706, green: 0.7882352941, blue: 0.9803921569, alpha: 1))         // #57C9FA
-                case .purple: return Color(#colorLiteral(red: 0.7882352941, green: 0.5764705882, blue: 1, alpha: 1))         // #C993FF
-                case .pink: return Color(#colorLiteral(red: 1, green: 0.5843137255, blue: 0.937254902, alpha: 1))        // #FF95EF
-                case .red: return Color(#colorLiteral(red: 1, green: 0.6117647059, blue: 0.5568627451, alpha: 1))            // #FF9C8E
-                case .orange: return Color(#colorLiteral(red: 0.9882352941, green: 0.6941176471, blue: 0.3490196078, alpha: 1))        // #FCB159
-                case .yellow: return Color(#colorLiteral(red: 0.9803921569, green: 0.8392156863, blue: 0.3411764706, alpha: 1))         // #FAD657
+                case .green:
+                    let color: Color = Color(#colorLiteral(red: 0.1921568627, green: 0.9450980392, blue: 0.5882352941, alpha: 1))         // #31F196
+                    return color
+                case .blue:
+                    let color: Color = Color(#colorLiteral(red: 0.3411764706, green: 0.7882352941, blue: 0.9803921569, alpha: 1))         // #57C9FA
+                    return color
+                case .purple:
+                    let color: Color = Color(#colorLiteral(red: 0.7882352941, green: 0.5764705882, blue: 1, alpha: 1))         // #C993FF
+                    return color
+                case .pink:
+                    let color: Color = Color(#colorLiteral(red: 1, green: 0.5843137255, blue: 0.937254902, alpha: 1))         // #FF95EF
+                    return color
+                case .red:
+                    let color: Color = Color(#colorLiteral(red: 1, green: 0.6117647059, blue: 0.5568627451, alpha: 1))         // #FF9C8E
+                    return color
+                case .orange:
+                    let color: Color = Color(#colorLiteral(red: 0.9882352941, green: 0.6941176471, blue: 0.3490196078, alpha: 1))         // #FCB159
+                    return color
+                case .yellow:
+                    let color: Color = Color(#colorLiteral(red: 0.9803921569, green: 0.8392156863, blue: 0.3411764706, alpha: 1))         // #FAD657
+                    return color
             }
         }
     }