diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift
index 70a93588..e27a2829 100644
--- a/VDS/Components/Checkbox/Checkbox.swift
+++ b/VDS/Components/Checkbox/Checkbox.swift
@@ -325,33 +325,27 @@ open class CheckboxBase: Control, Accessable, DataTrackable, BinaryColorable, Er
     //--------------------------------------------------
     public let checkboxSize = CGSize(width: 20, height: 20)
     
-    private var checkboxBackgroundColorConfig: ControlColorConfiguration = {
-        var config = ControlColorConfiguration()
-        config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected])
-        config.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
-        config.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: [.error])
-        return config
-    }()
+    private var backgroundColorConfig = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected])
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
+        $0.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: [.error])
+    }
 
-    private var checkboxBorderColorConfig: ControlColorConfiguration = {
-        var config = ControlColorConfiguration()
-        config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected])
-        config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.highlighted])
-        config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.error, .highlighted])
-        config.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: [.normal])
-        config.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
-        config.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.normal, .disabled])
-        config.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.error, .disabled])
-        config.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: [.error])
-        return config
-    }()
+    private var borderColorConfig = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected])
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.highlighted])
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.error, .highlighted])
+        $0.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: [.normal])
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.normal, .disabled])
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.error, .disabled])
+        $0.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: [.error])
+    }
 
-    private var checkboxCheckColorConfig: ControlColorConfiguration = {
-        var config = ControlColorConfiguration()
-        config.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight, forState: .selected)
-        config.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight, forState: [.selected, .disabled])
-        return config
-    }()
+    private var checkColorConfig = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight, forState: .selected)
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight, forState: [.selected, .disabled])
+    }
 
     //--------------------------------------------------
     // MARK: - Checkbox View
@@ -365,9 +359,9 @@ open class CheckboxBase: Control, Accessable, DataTrackable, BinaryColorable, Er
     
     open func updateSelector() {
         //get the colors
-        let backgroundColor = checkboxBackgroundColorConfig.getColor(self)
-        let borderColor = checkboxBorderColorConfig.getColor(self)
-        let checkColor = checkboxCheckColorConfig.getColor(self)
+        let backgroundColor = backgroundColorConfig.getColor(self)
+        let borderColor = borderColorConfig.getColor(self)
+        let checkColor = checkColorConfig.getColor(self)
 
         if let shapeLayer = shapeLayer, let sublayers = layer.sublayers, sublayers.contains(shapeLayer) {
             shapeLayer.removeFromSuperlayer()
diff --git a/VDS/Components/RadioButton/RadioButton.swift b/VDS/Components/RadioButton/RadioButton.swift
index fe367b27..fed9b6fb 100644
--- a/VDS/Components/RadioButton/RadioButton.swift
+++ b/VDS/Components/RadioButton/RadioButton.swift
@@ -328,31 +328,25 @@ open class RadioButtonBase: Control, Accessable, DataTrackable, BinaryColorable,
     public let radioButtonSize = CGSize(width: 20, height: 20)
     public let radioButtonSelectedSize = CGSize(width: 10, height: 10)
 
-    private var radioButtonBackgroundColorConfiguration: ControlColorConfiguration = {
-        var config = ControlColorConfiguration()
-        config.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: [.error])
-        return config
-    }()
+    private var backgroundColorConfiguration = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: [.error])
+    }
 
-    private var radioButtonBorderColorConfiguration: ControlColorConfiguration = {
-        var config = ControlColorConfiguration()
-        config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected])
-        config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.highlighted])
-        config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.error, .highlighted])
-        config.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: [.normal])
-        config.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
-        config.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.normal, .disabled])
-        config.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.error, .disabled])
-        config.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: [.error])
-        return config
-    }()
+    private var borderColorConfiguration = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected])
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.highlighted])
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.error, .highlighted])
+        $0.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: [.normal])
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.normal, .disabled])
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.error, .disabled])
+        $0.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: [.error])
+    }
     
-    private var radioButtonCheckColorConfiguration: ControlColorConfiguration = {
-        var config = ControlColorConfiguration()
-        config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
-        config.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
-        return config
-    }()
+    private var checkColorConfiguration = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
+    }
 
     //--------------------------------------------------
     // MARK: - RadioButton View
@@ -375,9 +369,9 @@ open class RadioButtonBase: Control, Accessable, DataTrackable, BinaryColorable,
         guard length > 0.0, shapeLayer == nil else { return }
         
         //get the colors
-        let backgroundColor = radioButtonBackgroundColorConfiguration.getColor(self)
-        let borderColor = radioButtonBorderColorConfiguration.getColor(self)
-        let radioSelectedColor = radioButtonCheckColorConfiguration.getColor(self)
+        let backgroundColor = backgroundColorConfiguration.getColor(self)
+        let borderColor = borderColorConfiguration.getColor(self)
+        let radioSelectedColor = checkColorConfiguration.getColor(self)
         
         selectorView.backgroundColor = backgroundColor
         selectorView.layer.borderColor = borderColor.cgColor
diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift
index 9f5e17e0..fbb0e04a 100644
--- a/VDS/Components/Toggle/Toggle.swift
+++ b/VDS/Components/Toggle/Toggle.swift
@@ -88,27 +88,20 @@ open class ToggleBase: Control, Accessable, DataTrackable, BinaryColorable {
     public let toggleSize = CGSize(width: 52, height: 24)
     public let toggleContainerSize = CGSize(width: 52, height: 44)
     public let knobSize = CGSize(width: 20, height: 20)
-    
-    private var toggleColorConfiguration = BinaryDisabledSurfaceColorConfiguration().with {
-        $0.forTrue.enabled.lightColor = VDSColor.paletteGreen26
-        $0.forTrue.enabled.darkColor = VDSColor.paletteGreen34
-        $0.forTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight
-        $0.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark
-        $0.forFalse.enabled.lightColor = VDSColor.elementsSecondaryOnlight
-        $0.forFalse.enabled.darkColor = VDSColor.paletteGray44
-        $0.forFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight
-        $0.forFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark
+
+    private var toggleColorConfiguration = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.paletteGray44, forState: .normal)
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
+        $0.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen34, forState: .selected)
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
     }
     
-    private var knobColorConfiguration = BinaryDisabledSurfaceColorConfiguration().with {
-        $0.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOndark
-        $0.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark
-        $0.forTrue.disabled.lightColor = VDSColor.paletteGray95
-        $0.forTrue.disabled.darkColor = VDSColor.paletteGray44
-        $0.forFalse.enabled.lightColor = VDSColor.elementsPrimaryOndark
-        $0.forFalse.enabled.darkColor = VDSColor.elementsPrimaryOndark
-        $0.forFalse.disabled.lightColor = VDSColor.paletteGray95
-        $0.forFalse.disabled.darkColor = VDSColor.paletteGray44
+    private var knobColorConfiguration = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOndark, forState: .normal)
+        $0.setSurfaceColors(VDSColor.paletteGray95, VDSColor.paletteGray44, forState: .disabled)
+        
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOndark, forState: .selected)
+        $0.setSurfaceColors(VDSColor.paletteGray95, VDSColor.paletteGray44, forState: [.selected, .disabled])
     }
     
     private var typograpicalStyle: TypographicalStyle {