diff --git a/GliaWidgets/Sources/Theme/Theme+Gva.swift b/GliaWidgets/Sources/Theme/Theme+Gva.swift
index fad3481ca..6f7fd7e70 100644
--- a/GliaWidgets/Sources/Theme/Theme+Gva.swift
+++ b/GliaWidgets/Sources/Theme/Theme+Gva.swift
@@ -26,7 +26,7 @@ extension Theme {
             borderColor: .clear,
             button: .init(
                 textFont: font.caption,
-                textColor: .black,
+                textColor: color.baseDark,
                 backgroundColor: .fill(color: color.baseLight),
                 cornerRadius: 5,
                 borderColor: .clear,
@@ -40,7 +40,7 @@ extension Theme {
             textColor: color.primary,
             backgroundColor: .fill(color: color.baseLight),
             cornerRadius: 10,
-            borderColor: Color.primary,
+            borderColor: color.primary,
             borderWidth: 1
         )
 
@@ -59,18 +59,18 @@ extension Theme {
             ),
             title: .init(
                 font: font.mediumSubtitle1,
-                textColor: .black,
+                textColor: color.baseDark,
                 textStyle: .body
             ),
             subtitle: .init(
                 font: font.caption,
-                textColor: .black,
+                textColor: color.baseDark,
                 textStyle: .caption1
             ),
             button: .init(
                 title: .init(
                     font: font.caption,
-                    textColor: .black,
+                    textColor: color.baseDark,
                     textStyle: .caption1
                 ),
                 background: .init(