diff --git a/designsystems/fluent2/QskFluent2Skin.cpp b/designsystems/fluent2/QskFluent2Skin.cpp
index dcfd97ba..2787cb99 100644
--- a/designsystems/fluent2/QskFluent2Skin.cpp
+++ b/designsystems/fluent2/QskFluent2Skin.cpp
@@ -455,13 +455,7 @@ void Editor::setupCheckBoxColors(
         {
             const auto states = state1 | state2;
 
-            if ( states == A::NoState )
-            {
-                fillColor = pal.fillColor.controlAlt.secondary;
-                borderColor = pal.strokeColor.controlStrong.defaultColor;
-                textColor = pal.fillColor.text.primary;
-            }
-            else if ( states == Q::Hovered )
+            if ( states == Q::Hovered )
             {
                 fillColor = pal.fillColor.controlAlt.tertiary;
                 borderColor = pal.strokeColor.controlStrong.defaultColor;
@@ -505,6 +499,12 @@ void Editor::setupCheckBoxColors(
                 borderColor = pal.fillColor.accent.disabled;
                 textColor = pal.fillColor.text.disabled;
             }
+            else // A::NoState
+            {
+                fillColor = pal.fillColor.controlAlt.secondary;
+                borderColor = pal.strokeColor.controlStrong.defaultColor;
+                textColor = pal.fillColor.text.primary;
+            }
 
             /*
                 Support for QskCheckBox::Error is not properly defined.
@@ -582,15 +582,7 @@ void Editor::setupComboBoxColors(
     {
         QRgb panelColor, borderColor1, borderColor2, textColor;
 
-        if ( state == QskAspect::NoState )
-        {
-            panelColor = pal.fillColor.control.defaultColor;
-            borderColor1 = pal.elevation.control.border[0];
-            borderColor2 = pal.elevation.control.border[1];
-            textColor = pal.fillColor.text.primary;
-
-        }
-        else if ( state == Q::Hovered )
+        if ( state == Q::Hovered )
         {
             panelColor = pal.fillColor.control.secondary;
             borderColor1 = pal.elevation.textControl.border[0];
@@ -617,6 +609,13 @@ void Editor::setupComboBoxColors(
             borderColor2 = borderColor1 = pal.strokeColor.control.defaultColor;
             textColor = pal.fillColor.text.disabled;
         }
+        else // QskAspect::NoState
+        {
+            panelColor = pal.fillColor.control.defaultColor;
+            borderColor1 = pal.elevation.control.border[0];
+            borderColor2 = pal.elevation.control.border[1];
+            textColor = pal.fillColor.text.primary;
+        }
 
         const auto panel = Q::Panel | section | state;
         const auto text = Q::Text | section | state;
@@ -1367,16 +1366,7 @@ void Editor::setupSegmentedBarColors(
             QRgb segmentColor, borderColor1, borderColor2, textColor;
             int graphicRole;
 
-            if ( states == A::NoState )
-            {
-                segmentColor = pal.fillColor.control.defaultColor;
-                borderColor1 = pal.elevation.control.border[0];
-                borderColor2 = pal.elevation.control.border[1];
-                textColor = pal.fillColor.text.primary;
-
-                graphicRole = W::GraphicRoleFillColorTextPrimary;
-            }
-            else if ( states == Q::Hovered )
+            if ( states == Q::Hovered )
             {
                 segmentColor = pal.fillColor.control.secondary;
                 borderColor1 = pal.elevation.control.border[0];
@@ -1409,6 +1399,15 @@ void Editor::setupSegmentedBarColors(
                 textColor = pal.fillColor.text.disabled;
                 graphicRole = W::GraphicRoleFillColorTextDisabled;
             }
+            else // A::NoState
+            {
+                segmentColor = pal.fillColor.control.defaultColor;
+                borderColor1 = pal.elevation.control.border[0];
+                borderColor2 = pal.elevation.control.border[1];
+                textColor = pal.fillColor.text.primary;
+
+                graphicRole = W::GraphicRoleFillColorTextPrimary;
+            }
 
             const auto segment = Q::Segment | section | states;
             const auto text = Q::Text | section | states;
@@ -1514,23 +1513,18 @@ void Editor::setupSliderColors(
     {
         QRgb grooveColor, fillColor, handleColor;
 
-        if ( state == A::NoState || state == Q::Hovered )
+        if ( state == Q::Disabled )
         {
-            grooveColor = pal.fillColor.controlStrong.defaultColor;
-            fillColor = pal.fillColor.accent.defaultColor;
-            handleColor = pal.fillColor.accent.defaultColor;
-        }
-        else if ( state == Q::Pressed )
-        {
-            grooveColor = pal.fillColor.controlStrong.defaultColor;
-            handleColor = pal.fillColor.accent.tertiary;
-            fillColor = pal.fillColor.accent.defaultColor;
-        }
-        else if ( state == Q::Disabled )
-        {
-            grooveColor = pal.fillColor.controlStrong.disabled;
+            grooveColor = handleColor = pal.fillColor.controlStrong.disabled;
             fillColor = pal.fillColor.accent.disabled;
-            handleColor = grooveColor;
+        }
+        else
+        {
+            grooveColor = pal.fillColor.controlStrong.defaultColor;
+            handleColor = pal.fillColor.accent.defaultColor;
+
+            fillColor == ( state == Q::Pressed )
+                ? pal.fillColor.accent.tertiary : pal.fillColor.accent.defaultColor;
         }
 
         grooveColor = rgbSolid( grooveColor, pal.background.solid.base );
@@ -1593,13 +1587,7 @@ void Editor::setupSpinBoxColors(
     {
         QRgb panelColor, borderColor1, borderColor2;
 
-        if ( state == A::NoState )
-        {
-            panelColor = pal.fillColor.control.defaultColor;
-            borderColor1 = pal.elevation.control.border[0];
-            borderColor2 = pal.elevation.control.border[1];
-        }
-        else if ( state == Q::Hovered )
+        if ( state == Q::Hovered )
         {
             panelColor = pal.fillColor.control.secondary;
             borderColor1 = pal.elevation.textControl.border[0];
@@ -1618,6 +1606,12 @@ void Editor::setupSpinBoxColors(
             panelColor = pal.fillColor.control.disabled;
             borderColor1 = borderColor2 = pal.strokeColor.control.defaultColor;
         }
+        else // A::NoState )
+        {
+            panelColor = pal.fillColor.control.defaultColor;
+            borderColor1 = pal.elevation.control.border[0];
+            borderColor2 = pal.elevation.control.border[1];
+        }
 
         QRgb textColor;
         int graphicRole;
@@ -1849,13 +1843,7 @@ void Editor::setupTextAreaColors(
     {
         QRgb panelColor, borderColor1, borderColor2;
 
-        if ( state == A::NoState )
-        {
-            panelColor = pal.fillColor.control.defaultColor;
-            borderColor1 = pal.elevation.textControl.border[0];
-            borderColor2 = pal.elevation.textControl.border[1];
-        }
-        else if ( state == Q::Hovered )
+        if ( state == Q::Hovered )
         {
             panelColor = pal.fillColor.control.secondary;
             borderColor1 = pal.elevation.textControl.border[0];
@@ -1872,6 +1860,12 @@ void Editor::setupTextAreaColors(
             panelColor = pal.fillColor.control.disabled;
             borderColor1 = borderColor2 = pal.strokeColor.control.defaultColor;
         }
+        else // A::NoState
+        {
+            panelColor = pal.fillColor.control.defaultColor;
+            borderColor1 = pal.elevation.textControl.border[0];
+            borderColor2 = pal.elevation.textControl.border[1];
+        }
 
         const auto panel = Q::TextPanel | section | state;
 
@@ -1915,13 +1909,7 @@ void Editor::setupTextFieldColors(
     {
         QRgb panelColor, borderColor1, borderColor2;
 
-        if ( state == A::NoState )
-        {
-            panelColor = pal.fillColor.control.defaultColor;
-            borderColor1 = pal.elevation.textControl.border[0];
-            borderColor2 = pal.elevation.textControl.border[1];
-        }
-        else if ( state == Q::Hovered )
+        if ( state == Q::Hovered )
         {
             panelColor = pal.fillColor.control.secondary;
             borderColor1 = pal.elevation.textControl.border[0];
@@ -1938,6 +1926,12 @@ void Editor::setupTextFieldColors(
             panelColor = pal.fillColor.control.disabled;
             borderColor1 = borderColor2 = pal.strokeColor.control.defaultColor;
         }
+        else // A::NoState
+        {
+            panelColor = pal.fillColor.control.defaultColor;
+            borderColor1 = pal.elevation.textControl.border[0];
+            borderColor2 = pal.elevation.textControl.border[1];
+        }
 
         const auto panel = Q::TextPanel | section | state;
 
@@ -2004,13 +1998,7 @@ void Editor::setupSwitchButtonColors(
 
             QRgb grooveColor, grooveBorderColor, handleColor;
 
-            if ( states == A::NoState )
-            {
-                grooveColor = pal.fillColor.controlAlt.secondary;
-                grooveBorderColor = pal.strokeColor.controlStrong.defaultColor;
-                handleColor = pal.strokeColor.controlStrong.defaultColor;
-            }
-            else if ( states == Q::Checked )
+            if ( states == Q::Checked )
             {
                 grooveColor = pal.fillColor.accent.defaultColor;
                 grooveBorderColor = pal.strokeColor.controlStrong.defaultColor;
@@ -2053,6 +2041,12 @@ void Editor::setupSwitchButtonColors(
                 grooveBorderColor = pal.fillColor.accent.disabled;
                 handleColor = pal.fillColor.textOnAccent.disabled;
             }
+            else // A::NoState
+            {
+                grooveColor = pal.fillColor.controlAlt.secondary;
+                grooveBorderColor = pal.strokeColor.controlStrong.defaultColor;
+                handleColor = pal.strokeColor.controlStrong.defaultColor;
+            }
 
             const auto groove = Q::Groove | section | states;
             const auto handle = Q::Handle | section | states;