diff --git a/doc/classes/QskQuickItem.dox b/doc/classes/QskQuickItem.dox
index a7fcbf82..d7e46616 100644
--- a/doc/classes/QskQuickItem.dox
+++ b/doc/classes/QskQuickItem.dox
@@ -639,22 +639,13 @@
 
         - QEvent::StyleChange
         - QEvent::ContentsRectChange
-        - QEvent::FontChange
-        - QEvent::PaletteChange
         - QEvent::ReadOnlyChange
         - QEvent::EnabledChange
         - QEvent::LocaleChange
         - QEvent::ParentChange
         - QEvent::LayoutDirectionChange
 
-    
-
     \param event Qt event
-
-    \note QEvent::PaletteChange, QEvent::FontChange are handled, but both event types
-          do not fit to the themeing concept of QSkinny and are not posted. However
-          it is possible to post them if an application has a concept, where they
-          make sense.
 */
 
 /*!
diff --git a/src/controls/QskQuickItem.cpp b/src/controls/QskQuickItem.cpp
index 75e7b8ae..36c71d77 100644
--- a/src/controls/QskQuickItem.cpp
+++ b/src/controls/QskQuickItem.cpp
@@ -624,33 +624,6 @@ bool QskQuickItem::event( QEvent* event )
             changeEvent( event );
             return true;
         }
-#if 1
-        /*
-            Font/Palette changes do not fit conceptually into the themeing
-            system of qskinny. Nevertheless we are handling the corresponding
-            events - whatever it is good for.
-         */
-        case QEvent::FontChange:
-        {
-            resetImplicitSize();
-            polish();
-
-            if ( hasContents )
-                update();
-
-            changeEvent( event );
-            return true;
-        }
-        case QEvent::PaletteChange:
-        {
-            if ( hasContents )
-                update();
-
-            changeEvent( event );
-            return true;
-        }
-#endif
-
         case QEvent::ReadOnlyChange:
         case QEvent::EnabledChange:
         case QEvent::LocaleChange:
diff --git a/src/controls/QskSetup.cpp b/src/controls/QskSetup.cpp
index 9ba906d6..4df5ae3d 100644
--- a/src/controls/QskSetup.cpp
+++ b/src/controls/QskSetup.cpp
@@ -5,11 +5,9 @@
 
 #include "QskSetup.h"
 #include "QskControl.h"
-#include "QskControlPrivate.h"
 #include "QskGraphicProviderMap.h"
 #include "QskSkinManager.h"
 #include "QskSkin.h"
-#include "QskWindow.h"
 
 #include <qguiapplication.h>
 #include <qstylehints.h>
diff --git a/src/dialogs/QskMessageSubWindow.cpp b/src/dialogs/QskMessageSubWindow.cpp
index ad9fde29..394f956e 100644
--- a/src/dialogs/QskMessageSubWindow.cpp
+++ b/src/dialogs/QskMessageSubWindow.cpp
@@ -45,15 +45,6 @@ namespace
             updatePreferredSize();
         }
 
-      protected:
-        void changeEvent( QEvent* event ) override
-        {
-            if ( event->type() == QEvent::FontChange )
-                updatePreferredSize();
-
-            QskGraphicLabel::changeEvent( event );
-        }
-
       private:
         void updatePreferredSize()
         {
diff --git a/src/dialogs/QskMessageWindow.cpp b/src/dialogs/QskMessageWindow.cpp
index e22d3e55..6359fd6b 100644
--- a/src/dialogs/QskMessageWindow.cpp
+++ b/src/dialogs/QskMessageWindow.cpp
@@ -46,15 +46,6 @@ namespace
             updatePreferredSize();
         }
 
-      protected:
-        void changeEvent( QEvent* event ) override
-        {
-            if ( event->type() == QEvent::FontChange )
-                updatePreferredSize();
-
-            QskGraphicLabel::changeEvent( event );
-        }
-
       private:
         void updatePreferredSize()
         {