diff --git a/src/common/QskBoxBorderColors.h b/src/common/QskBoxBorderColors.h
index 9cbad86a..46071309 100644
--- a/src/common/QskBoxBorderColors.h
+++ b/src/common/QskBoxBorderColors.h
@@ -70,7 +70,7 @@ class QSK_EXPORT QskBoxBorderColors
     bool isValid() const;
 
   private:
-    enum
+    enum : quint8
     {
         // in order of Qt::Edge
         Top    = 0,
diff --git a/src/common/QskBoxShapeMetrics.cpp b/src/common/QskBoxShapeMetrics.cpp
index 3441d0fa..51fc8509 100644
--- a/src/common/QskBoxShapeMetrics.cpp
+++ b/src/common/QskBoxShapeMetrics.cpp
@@ -154,7 +154,7 @@ QskBoxShapeMetrics QskBoxShapeMetrics::interpolated(
         qskInterpolatedSize( m_radii[ 1 ], to.m_radii[ 1 ], ratio ),
         qskInterpolatedSize( m_radii[ 2 ], to.m_radii[ 2 ], ratio ),
         qskInterpolatedSize( m_radii[ 3 ], to.m_radii[ 3 ], ratio ),
-        to.m_sizeMode, to.m_scalingMode );
+        to.sizeMode(), to.m_scalingMode );
 }
 
 QVariant QskBoxShapeMetrics::interpolate(
diff --git a/src/common/QskBoxShapeMetrics.h b/src/common/QskBoxShapeMetrics.h
index 2252be63..1e054882 100644
--- a/src/common/QskBoxShapeMetrics.h
+++ b/src/common/QskBoxShapeMetrics.h
@@ -52,7 +52,7 @@ class QSK_EXPORT QskBoxShapeMetrics
         The default setting is Symmetric.
      */
 
-    enum ScalingMode
+    enum ScalingMode : quint8
     {
         Symmetric,
         SymmetricByMaximum,
@@ -144,7 +144,7 @@ class QSK_EXPORT QskBoxShapeMetrics
     }
 
     QSizeF m_radii[ 4 ];
-    Qt::SizeMode m_sizeMode : 2;
+    unsigned int m_sizeMode : 2;
     ScalingMode m_scalingMode : 2;
 };
 
@@ -278,7 +278,7 @@ inline void QskBoxShapeMetrics::setSizeMode( Qt::SizeMode sizeMode ) noexcept
 
 inline constexpr Qt::SizeMode QskBoxShapeMetrics::sizeMode() const noexcept
 {
-    return m_sizeMode;
+    return static_cast< Qt::SizeMode >( m_sizeMode );
 }
 
 inline void QskBoxShapeMetrics::setScalingMode( ScalingMode scalingMode ) noexcept
@@ -312,7 +312,7 @@ inline constexpr QskBoxShapeMetrics QskBoxShapeMetrics::transposed() const noexc
     return QskBoxShapeMetrics(
         m_radii[ 0 ].transposed(), m_radii[ 1 ].transposed(),
         m_radii[ 2 ].transposed(), m_radii[ 3 ].transposed(),
-        m_sizeMode, m_scalingMode );
+        sizeMode(), m_scalingMode );
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/common/QskFontRole.h b/src/common/QskFontRole.h
index c0873686..3a1fb594 100644
--- a/src/common/QskFontRole.h
+++ b/src/common/QskFontRole.h
@@ -17,7 +17,7 @@ class QSK_EXPORT QskFontRole
     Q_PROPERTY( Emphasis emphasis READ emphasis WRITE setEmphasis )
 
   public:
-    enum Category
+    enum Category : quint8
     {
         Caption,
         Body,
@@ -28,7 +28,7 @@ class QSK_EXPORT QskFontRole
     };
     Q_ENUM( Category );
 
-    enum Emphasis
+    enum Emphasis : quint8
     {
         VeryLow,
         Low,
@@ -54,8 +54,8 @@ class QSK_EXPORT QskFontRole
     QskHashValue hash( QskHashValue seed = 0 ) const noexcept;
 
   private:
-    unsigned char m_category;
-    unsigned char m_emphasis;
+    Category m_category;
+    Emphasis m_emphasis;
 };
 
 inline constexpr QskFontRole::QskFontRole( Category category, Emphasis emphasis ) noexcept
@@ -81,7 +81,7 @@ inline void QskFontRole::setCategory( Category category ) noexcept
 
 inline constexpr QskFontRole::Category QskFontRole::category() const noexcept
 {
-    return static_cast< Category >( m_category );
+    return m_category;
 }
 
 inline void QskFontRole::setEmphasis( Emphasis emphasis ) noexcept
@@ -91,7 +91,7 @@ inline void QskFontRole::setEmphasis( Emphasis emphasis ) noexcept
 
 inline constexpr QskFontRole::Emphasis QskFontRole::emphasis() const noexcept
 {
-    return static_cast< Emphasis >( m_emphasis );
+    return m_emphasis;
 }
 
 inline QskHashValue qHash( const QskFontRole fontRole, QskHashValue seed = 0 ) noexcept
diff --git a/src/common/QskGradient.h b/src/common/QskGradient.h
index f6757902..f0359bcf 100644
--- a/src/common/QskGradient.h
+++ b/src/common/QskGradient.h
@@ -40,7 +40,7 @@ class QSK_EXPORT QskGradient
     Q_CLASSINFO( "DefaultProperty", "stops" )
 
   public:
-    enum Type
+    enum Type : quint8
     {
         Stops,
 
@@ -50,7 +50,7 @@ class QSK_EXPORT QskGradient
     };
     Q_ENUM( Type )
 
-    enum SpreadMode
+    enum SpreadMode : quint8
     {
         PadSpread,
         ReflectSpread,
@@ -58,7 +58,7 @@ class QSK_EXPORT QskGradient
     };
     Q_ENUM( SpreadMode )
 
-    enum StretchMode
+    enum StretchMode : quint8
     {
         NoStretch,
         StretchToSize
@@ -181,8 +181,8 @@ class QSK_EXPORT QskGradient
     qreal m_values[5] = {};
 
     unsigned int m_type : 3;
-    unsigned int m_spreadMode : 3;
-    unsigned int m_stretchMode : 3;
+    SpreadMode m_spreadMode : 3;
+    StretchMode m_stretchMode : 3;
 
     mutable bool m_isDirty : 1;
     mutable bool m_isValid : 1;
diff --git a/src/common/QskMetaInvokable.h b/src/common/QskMetaInvokable.h
index 8dca8b0d..b3544b17 100644
--- a/src/common/QskMetaInvokable.h
+++ b/src/common/QskMetaInvokable.h
@@ -21,7 +21,7 @@ class QByteArray;
 class QSK_EXPORT QskMetaInvokable
 {
   public:
-    enum Type
+    enum Type : quint8
     {
         Invalid = 0,
 
@@ -93,7 +93,7 @@ class QSK_EXPORT QskMetaInvokable
         MetaData m_metaData;
     };
 
-    int m_type : 3;
+    Type m_type;
 };
 
 inline QskMetaInvokable::QskMetaInvokable()
diff --git a/src/common/QskObjectCounter.h b/src/common/QskObjectCounter.h
index 57a8c233..29d8e5a7 100644
--- a/src/common/QskObjectCounter.h
+++ b/src/common/QskObjectCounter.h
@@ -14,7 +14,7 @@ class QObject;
 class QSK_EXPORT QskObjectCounter
 {
   public:
-    enum ObjectType
+    enum ObjectType : quint8
     {
         Objects,
         Items
diff --git a/src/common/QskPlacementPolicy.h b/src/common/QskPlacementPolicy.h
index 22b56ade..cb499bf3 100644
--- a/src/common/QskPlacementPolicy.h
+++ b/src/common/QskPlacementPolicy.h
@@ -19,7 +19,7 @@ class QSK_EXPORT QskPlacementPolicy
 
   public:
 
-    enum Policy
+    enum Policy : quint8
     {
         Ignore,
         Reserve,
diff --git a/src/common/QskShadowMetrics.h b/src/common/QskShadowMetrics.h
index 711e4cef..ea3916f0 100644
--- a/src/common/QskShadowMetrics.h
+++ b/src/common/QskShadowMetrics.h
@@ -26,7 +26,7 @@ class QSK_EXPORT QskShadowMetrics
     Q_PROPERTY( ShapeMode shapeMode READ shapeMode WRITE setShapeMode )
 
   public:
-    enum ShapeMode
+    enum ShapeMode : quint8
     {
         Aligned = 0, // The shape is related to some external definition
 
@@ -86,7 +86,7 @@ class QSK_EXPORT QskShadowMetrics
     qreal m_spreadRadius = 0.0;
     qreal m_blurRadius = 0.0;
     quint8 m_sizeMode = Qt::AbsoluteSize;
-    quint8 m_shapeMode = QskShadowMetrics::Aligned;
+    ShapeMode m_shapeMode = QskShadowMetrics::Aligned;
 };
 
 inline constexpr QskShadowMetrics::QskShadowMetrics( const QPointF& offset ) noexcept
@@ -170,7 +170,7 @@ inline void QskShadowMetrics::setShapeMode( ShapeMode shapeMode ) noexcept
     
 inline constexpr QskShadowMetrics::ShapeMode QskShadowMetrics::shapeMode() const noexcept
 {   
-    return static_cast< ShapeMode >( m_shapeMode );
+    return m_shapeMode;
 }
 
 inline void QskShadowMetrics::setOffsetX( qreal dx ) noexcept
diff --git a/src/common/QskStateCombination.h b/src/common/QskStateCombination.h
index 10fdf835..aee1823e 100644
--- a/src/common/QskStateCombination.h
+++ b/src/common/QskStateCombination.h
@@ -11,7 +11,7 @@
 class QSK_EXPORT QskStateCombination
 {
   public:
-    enum Type
+    enum Type : quint8
     {
         Combination,
         CombinationNoState
diff --git a/src/common/QskTextOptions.h b/src/common/QskTextOptions.h
index ff4c0e46..cac2a6fb 100644
--- a/src/common/QskTextOptions.h
+++ b/src/common/QskTextOptions.h
@@ -24,7 +24,7 @@ class QSK_EXPORT QskTextOptions
     Q_PROPERTY( int maximumLineCount READ maximumLineCount WRITE setMaximumLineCount )
 
   public:
-    enum FontSizeMode
+    enum FontSizeMode : quint8
     {
         FixedSize,
         HorizontalFit,
@@ -33,7 +33,7 @@ class QSK_EXPORT QskTextOptions
     };
     Q_ENUM( FontSizeMode )
 
-    enum WrapMode
+    enum WrapMode : quint8
     {
         NoWrap = QTextOption::NoWrap,
         WordWrap = QTextOption::WordWrap,
@@ -42,7 +42,7 @@ class QSK_EXPORT QskTextOptions
     };
     Q_ENUM( WrapMode )
 
-    enum TextFormat
+    enum TextFormat : quint8
     {
         PlainText = Qt::PlainText,
         RichText = Qt::RichText,
diff --git a/src/common/QskTickmarks.h b/src/common/QskTickmarks.h
index 953b7627..3ee19b38 100644
--- a/src/common/QskTickmarks.h
+++ b/src/common/QskTickmarks.h
@@ -18,7 +18,7 @@ class QSK_EXPORT QskTickmarks
     Q_PROPERTY( QVector< qreal > minorTicks READ minorTicks WRITE setMinorTicks )
 
   public:
-    enum TickType
+    enum TickType : quint8
     {
         MinorTick,
         MediumTick,
diff --git a/src/controls/QskAnimationHint.h b/src/controls/QskAnimationHint.h
index 56a5d5e6..356e61ca 100644
--- a/src/controls/QskAnimationHint.h
+++ b/src/controls/QskAnimationHint.h
@@ -14,7 +14,7 @@
 class QSK_EXPORT QskAnimationHint
 {
   public:
-    enum UpdateFlag
+    enum UpdateFlag : quint8
     {
         UpdateAuto = 0, // depending on the animated aspect