diff --git a/VDS/Components/Buttons/TextLink/TextLink.swift b/VDS/Components/Buttons/TextLink/TextLink.swift
index f90f160f..4c61bc2a 100644
--- a/VDS/Components/Buttons/TextLink/TextLink.swift
+++ b/VDS/Components/Buttons/TextLink/TextLink.swift
@@ -36,7 +36,7 @@ open class TextLink: ButtonBase {
         
     private var textColorConfiguration = ControlColorConfiguration().with {
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
-        $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forState: .disabled)
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
         $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
     }
             
diff --git a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
index 2fb1cd67..a7dd808e 100644
--- a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
+++ b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
@@ -52,7 +52,7 @@ open class TextLinkCaret: ButtonBase {
     
     private var textColorConfiguration = ControlColorConfiguration().with {
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
-        $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forState: .disabled)
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
         $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
     }
     
diff --git a/VDS/Components/Label/Label.swift b/VDS/Components/Label/Label.swift
index 2bab6ec6..baa0c33a 100644
--- a/VDS/Components/Label/Label.swift
+++ b/VDS/Components/Label/Label.swift
@@ -61,7 +61,7 @@ open class Label: UILabel, Handlerable, ViewProtocol, Resettable, UserInfoable {
     // MARK: - Configuration Properties
     //--------------------------------------------------
     public var textColorConfiguration: AnyColorable = ViewColorConfiguration().with {
-        $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forDisabled: true)
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forDisabled: true)
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forDisabled: false)
     }.eraseToAnyColorable()
     
diff --git a/VDS/Components/Tooltip/TooltipLaunchable.swift b/VDS/Components/Tooltip/TooltipLaunchable.swift
index 6a79e987..5f8219b7 100644
--- a/VDS/Components/Tooltip/TooltipLaunchable.swift
+++ b/VDS/Components/Tooltip/TooltipLaunchable.swift
@@ -8,7 +8,9 @@
 import Foundation
 import UIKit
 
-public protocol TooltipLaunchable { }
+public protocol TooltipLaunchable {
+    func presentTooltip(surface: Surface, title: String, content: String, closeButtonText: String)
+}
 
 extension TooltipLaunchable {
     public func presentTooltip(surface: Surface, title: String, content: String, closeButtonText: String = "Close") {