diff --git a/src/controls/QskBoxSkinlet.h b/src/controls/QskBoxSkinlet.h
index d56638fe..8152d728 100644
--- a/src/controls/QskBoxSkinlet.h
+++ b/src/controls/QskBoxSkinlet.h
@@ -18,6 +18,7 @@ class QSK_EXPORT QskBoxSkinlet : public QskSkinlet
     enum NodeRole
     {
         PanelRole,
+        RoleCount
     };
 
     Q_INVOKABLE QskBoxSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskCheckBoxSkinlet.h b/src/controls/QskCheckBoxSkinlet.h
index 094c5807..9164deb9 100644
--- a/src/controls/QskCheckBoxSkinlet.h
+++ b/src/controls/QskCheckBoxSkinlet.h
@@ -21,6 +21,8 @@ class QSK_EXPORT QskCheckBoxSkinlet : public QskSkinlet
     {
         PanelRole,
         IndicatorRole,
+
+        RoleCount
     };
 
     Q_INVOKABLE QskCheckBoxSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskFocusIndicatorSkinlet.h b/src/controls/QskFocusIndicatorSkinlet.h
index 7c3bf29d..6c9663a3 100644
--- a/src/controls/QskFocusIndicatorSkinlet.h
+++ b/src/controls/QskFocusIndicatorSkinlet.h
@@ -19,7 +19,8 @@ class QSK_EXPORT QskFocusIndicatorSkinlet : public QskSkinlet
   public:
     enum NodeRole
     {
-        FrameRole
+        FrameRole,
+        RoleCount
     };
 
     Q_INVOKABLE QskFocusIndicatorSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskGraphicLabelSkinlet.h b/src/controls/QskGraphicLabelSkinlet.h
index 393c8647..6a83767d 100644
--- a/src/controls/QskGraphicLabelSkinlet.h
+++ b/src/controls/QskGraphicLabelSkinlet.h
@@ -19,7 +19,10 @@ class QSK_EXPORT QskGraphicLabelSkinlet : public QskSkinlet
   public:
     enum NodeRole
     {
-        PanelRole, GraphicRole
+        PanelRole,
+        GraphicRole,
+
+        RoleCount
     };
 
     Q_INVOKABLE QskGraphicLabelSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskListViewSkinlet.h b/src/controls/QskListViewSkinlet.h
index 95b875d1..f92c2388 100644
--- a/src/controls/QskListViewSkinlet.h
+++ b/src/controls/QskListViewSkinlet.h
@@ -23,6 +23,14 @@ class QSK_EXPORT QskListViewSkinlet : public QskScrollViewSkinlet
     using Inherited = QskScrollViewSkinlet;
 
   public:
+    enum NodeRole
+    {
+        TextRole,
+        GraphicRole,
+
+        RoleCount
+    };
+
     Q_INVOKABLE QskListViewSkinlet( QskSkin* = nullptr );
     ~QskListViewSkinlet() override;
 
@@ -30,12 +38,6 @@ class QSK_EXPORT QskListViewSkinlet : public QskScrollViewSkinlet
         Qt::SizeHint, const QSizeF& ) const override;
 
   protected:
-    enum NodeRole
-    {
-        TextRole,
-        GraphicRole
-    };
-
     QSGNode* updateContentsNode(
         const QskScrollView*, QSGNode* ) const override;
 
diff --git a/src/controls/QskPageIndicatorSkinlet.h b/src/controls/QskPageIndicatorSkinlet.h
index 9cdd91ae..e625fdae 100644
--- a/src/controls/QskPageIndicatorSkinlet.h
+++ b/src/controls/QskPageIndicatorSkinlet.h
@@ -18,7 +18,9 @@ class QSK_EXPORT QskPageIndicatorSkinlet : public QskSkinlet
     enum NodeRole
     {
         PanelRole,
-        BulletsRole
+        BulletsRole,
+
+        RoleCount
     };
 
     Q_INVOKABLE QskPageIndicatorSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskProgressBarSkinlet.h b/src/controls/QskProgressBarSkinlet.h
index c7eebdd2..ee7816f9 100644
--- a/src/controls/QskProgressBarSkinlet.h
+++ b/src/controls/QskProgressBarSkinlet.h
@@ -22,7 +22,7 @@ class QSK_EXPORT QskProgressBarSkinlet : public QskSkinlet
         GrooveRole,
         BarRole,
 
-        RoleCount,
+        RoleCount
     };
 
     Q_INVOKABLE QskProgressBarSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskPushButtonSkinlet.h b/src/controls/QskPushButtonSkinlet.h
index 088b4a70..faafb4da 100644
--- a/src/controls/QskPushButtonSkinlet.h
+++ b/src/controls/QskPushButtonSkinlet.h
@@ -21,7 +21,9 @@ class QSK_EXPORT QskPushButtonSkinlet : public QskSkinlet
     {
         PanelRole,
         TextRole,
-        GraphicRole
+        GraphicRole,
+
+        RoleCount
     };
 
     Q_INVOKABLE QskPushButtonSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskSeparatorSkinlet.h b/src/controls/QskSeparatorSkinlet.h
index 012552a6..3ed3c2be 100644
--- a/src/controls/QskSeparatorSkinlet.h
+++ b/src/controls/QskSeparatorSkinlet.h
@@ -20,6 +20,7 @@ class QSK_EXPORT QskSeparatorSkinlet : public QskSkinlet
     enum NodeRole
     {
         PanelRole,
+        RoleCount
     };
 
     Q_INVOKABLE QskSeparatorSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskSliderSkinlet.h b/src/controls/QskSliderSkinlet.h
index b77460bb..1b49bb29 100644
--- a/src/controls/QskSliderSkinlet.h
+++ b/src/controls/QskSliderSkinlet.h
@@ -22,7 +22,9 @@ class QSK_EXPORT QskSliderSkinlet : public QskSkinlet
         PanelRole,
         GrooveRole,
         FillRole,
-        HandleRole
+        HandleRole,
+
+        RoleCount
     };
 
     Q_INVOKABLE QskSliderSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskStatusIndicatorSkinlet.h b/src/controls/QskStatusIndicatorSkinlet.h
index 6984f947..20f81b32 100644
--- a/src/controls/QskStatusIndicatorSkinlet.h
+++ b/src/controls/QskStatusIndicatorSkinlet.h
@@ -19,7 +19,8 @@ class QSK_EXPORT QskStatusIndicatorSkinlet : public QskSkinlet
   public:
     enum NodeRole
     {
-        GraphicRole
+        GraphicRole,
+        RoleCount
     };
 
     Q_INVOKABLE QskStatusIndicatorSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskSubWindowAreaSkinlet.h b/src/controls/QskSubWindowAreaSkinlet.h
index 0e6034b4..ef977fd1 100644
--- a/src/controls/QskSubWindowAreaSkinlet.h
+++ b/src/controls/QskSubWindowAreaSkinlet.h
@@ -19,7 +19,8 @@ class QSK_EXPORT QskSubWindowAreaSkinlet : public QskSkinlet
   public:
     enum NodeRole
     {
-        PanelRole
+        PanelRole,
+        RoleCount
     };
 
     Q_INVOKABLE QskSubWindowAreaSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskSubWindowSkinlet.h b/src/controls/QskSubWindowSkinlet.h
index a40a5ec6..d29325d4 100644
--- a/src/controls/QskSubWindowSkinlet.h
+++ b/src/controls/QskSubWindowSkinlet.h
@@ -22,7 +22,9 @@ class QSK_EXPORT QskSubWindowSkinlet : public QskPopupSkinlet
         PanelRole = QskPopupSkinlet::RoleCount,
         TitleBarRole,
         SymbolRole,
-        TitleRole
+        TitleRole,
+
+        RoleCount
     };
 
     Q_INVOKABLE QskSubWindowSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskSwitchButtonSkinlet.h b/src/controls/QskSwitchButtonSkinlet.h
index 188ad763..40c85795 100644
--- a/src/controls/QskSwitchButtonSkinlet.h
+++ b/src/controls/QskSwitchButtonSkinlet.h
@@ -20,6 +20,8 @@ class QSK_EXPORT QskSwitchButtonSkinlet : public QskSkinlet
         GrooveRole,
         HandleRole,
         RippleRole,
+
+        RoleCount
     };
 
     Q_INVOKABLE QskSwitchButtonSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskTabButtonSkinlet.h b/src/controls/QskTabButtonSkinlet.h
index e7daaa51..25913805 100644
--- a/src/controls/QskTabButtonSkinlet.h
+++ b/src/controls/QskTabButtonSkinlet.h
@@ -18,7 +18,9 @@ class QSK_EXPORT QskTabButtonSkinlet : public QskSkinlet
     enum NodeRole
     {
         PanelRole,
-        TextRole
+        TextRole,
+
+        RoleCount
     };
 
     Q_INVOKABLE QskTabButtonSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskTabViewSkinlet.h b/src/controls/QskTabViewSkinlet.h
index e18f058c..b07d5da4 100644
--- a/src/controls/QskTabViewSkinlet.h
+++ b/src/controls/QskTabViewSkinlet.h
@@ -19,7 +19,8 @@ class QSK_EXPORT QskTabViewSkinlet : public QskSkinlet
   public:
     enum NodeRole
     {
-        PageRole
+        PageRole,
+        RoleCount
     };
 
     Q_INVOKABLE QskTabViewSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskTextInputSkinlet.h b/src/controls/QskTextInputSkinlet.h
index 8d4655dd..84af0f32 100644
--- a/src/controls/QskTextInputSkinlet.h
+++ b/src/controls/QskTextInputSkinlet.h
@@ -17,7 +17,8 @@ class QSK_EXPORT QskTextInputSkinlet : public QskSkinlet
   public:
     enum NodeRole
     {
-        PanelRole
+        PanelRole,
+        RoleCount
     };
 
     Q_INVOKABLE QskTextInputSkinlet( QskSkin* = nullptr );
diff --git a/src/controls/QskTextLabelSkinlet.h b/src/controls/QskTextLabelSkinlet.h
index 499dc857..1cfe3fbd 100644
--- a/src/controls/QskTextLabelSkinlet.h
+++ b/src/controls/QskTextLabelSkinlet.h
@@ -17,7 +17,10 @@ class QSK_EXPORT QskTextLabelSkinlet : public QskSkinlet
   public:
     enum NodeRole
     {
-        PanelRole, TextRole
+        PanelRole,
+        TextRole,
+
+        RoleCount
     };
 
     Q_INVOKABLE QskTextLabelSkinlet( QskSkin* = nullptr );