diff --git a/VDS/Components/Buttons/TextLink/TextLink.swift b/VDS/Components/Buttons/TextLink/TextLink.swift
index 872374aa..4f543ac5 100644
--- a/VDS/Components/Buttons/TextLink/TextLink.swift
+++ b/VDS/Components/Buttons/TextLink/TextLink.swift
@@ -32,10 +32,14 @@ open class TextLink: ButtonBase {
     }
         
     open override var textColor: UIColor {
-        textColors.getColor(self)
+        textColorConfiguration.getColor(self)
     }
         
-    private var textColors = ControlColorConfiguration()
+    private var textColorConfiguration = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
+        $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forState: .disabled)
+        $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
+    }
             
     private var height: CGFloat {
         switch size {
@@ -70,11 +74,7 @@ open class TextLink: ButtonBase {
     //--------------------------------------------------
     open override func setup() {
         super.setup()
-        
-        textColors.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
-        textColors.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forState: .disabled)
-        textColors.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
-        
+                
         if let titleLabel {
             addSubview(line)
             line.pinLeading(titleLabel.leadingAnchor)
diff --git a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
index ee702981..0013c77a 100644
--- a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
+++ b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
@@ -65,14 +65,10 @@ open class TextLinkCaret: ButtonBase {
         textColorConfiguration.getColor(self)
     }
 
-    private var textColorConfiguration = HighlightDisabledSurfaceColorConfiguration().with {
-        $0.disabled.lightColor = VDSColor.elementsSecondaryOnlight
-        $0.disabled.darkColor = VDSColor.elementsSecondaryOndark
-        $0.enabled.lightColor = VDSColor.elementsPrimaryOnlight
-        $0.enabled.darkColor = VDSColor.elementsPrimaryOndark
-        
-        $0.highlighted.lightColor = VDSColor.interactiveActiveOnlight
-        $0.highlighted.darkColor = VDSColor.interactiveActiveOndark
+    private var textColorConfiguration = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
+        $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forState: .disabled)
+        $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
     }
     
     //--------------------------------------------------