diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
index 3e6e2a84..728a295b 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
@@ -131,7 +131,7 @@ import VDS
         }
         
         //properties
-        isEnabled = viewModel.enabled && !viewModel.readOnly
+        isEnabled = viewModel.isEnabled
         isAnimated = viewModel.animated
 
         //call super here to go around the didSet
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
index 0ecd920b..fdb98deb 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
@@ -101,7 +101,7 @@ import VDS
         }
 
         isSelected = viewModel.state
-        isEnabled = viewModel.enabled && !viewModel.readOnly
+        isEnabled = viewModel.isEnabled
         RadioButtonSelectionHelper.setupForRadioButtonGroup(viewModel, self, delegateObject: delegateObject)
     }
 
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtons.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtons.swift
index 3e1d9204..683d28b3 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtons.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtons.swift
@@ -29,7 +29,7 @@ open class RadioButtons: VDS.RadioButtonGroup, VDSMoleculeViewProtocol {
     // MARK: - MoleculeViewProtocol
     public func viewModelDidUpdate() {
         showError = viewModel.showError
-        isEnabled = viewModel.enabled && !viewModel.readOnly
+        isEnabled = viewModel.isEnabled
         surface = viewModel.surface
 
         radioButtons = viewModel.radioButtons
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Selectors/Toggle.swift
index b229d12e..feaf3399 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/Toggle.swift
@@ -108,7 +108,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
         isOn = viewModel.selected
         surface = viewModel.surface
         isAnimated = viewModel.animated
-        isEnabled = viewModel.enabled && !viewModel.readOnly
+        isEnabled = viewModel.isEnabled
         showText = viewModel.showText
         if let onText = viewModel.onText {
             self.onText = onText
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift
index b4825ee6..919cd953 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift
@@ -64,7 +64,7 @@ import VDS
         
         //properties
         isAnimated = viewModel.checkbox.animated
-        isEnabled = viewModel.checkbox.enabled && !viewModel.checkbox.readOnly
+        isEnabled = viewModel.checkbox.isEnabled
         
         //call super here to go around the didSet
         //in this class
@@ -78,7 +78,7 @@ import VDS
                 //TODO: Fix issue with default state
                 //showError = !isValid
                 errorText = viewModel.checkbox.errorMessage
-                isEnabled = viewModel.checkbox.enabled
+                isEnabled = viewModel.checkbox.isEnabled
             })
         }