diff --git a/private/actionwidgetinterface_p.h b/private/actionwidgetinterface_p.h
index ba8943315..59ce0671d 100644
--- a/private/actionwidgetinterface_p.h
+++ b/private/actionwidgetinterface_p.h
@@ -34,7 +34,7 @@ public:
     QAction *action;
 
     ActionWidgetInterface(T *parent)
-        : ThemedWidgetInterface(parent)
+        : ThemedWidgetInterface<T>(parent),
           action(0)
     {
     }
@@ -57,20 +57,20 @@ public:
     void syncToAction()
     {
         if (!action) {
-            q->setIcon(QIcon());
-            q->setText(QString());
-            q->setEnabled(false);
+            ThemedWidgetInterface<T>::q->setIcon(QIcon());
+            ThemedWidgetInterface<T>::q->setText(QString());
+            ThemedWidgetInterface<T>::q->setEnabled(false);
             return;
         }
         //we don't get told *what* changed, just that something changed
         //so we update everything we care about
-        q->setIcon(action->icon());
-        q->setText(action->iconText());
-        q->setEnabled(action->isEnabled());
-        q->setVisible(action->isVisible());
+        ThemedWidgetInterface<T>::q->setIcon(action->icon());
+        ThemedWidgetInterface<T>::q->setText(action->iconText());
+        ThemedWidgetInterface<T>::q->setEnabled(action->isEnabled());
+        ThemedWidgetInterface<T>::q->setVisible(action->isVisible());
 
-        if (!q->toolTip().isEmpty()) {
-            q->setToolTip(action->text());
+        if (!ThemedWidgetInterface<T>::q->toolTip().isEmpty()) {
+            ThemedWidgetInterface<T>::q->setToolTip(action->text());
         }
 
         changed();
@@ -79,16 +79,16 @@ public:
     void setAction(QAction *a)
     {
         if (action) {
-            QObject::disconnect(action, 0, t, 0);
-            QObject::disconnect(t, 0, action, 0);
+            QObject::disconnect(action, 0, ThemedWidgetInterface<T>::q, 0);
+            QObject::disconnect(ThemedWidgetInterface<T>::q, 0, action, 0);
         }
 
         action = a;
 
         if (action) {
-            QObject::connect(action, SIGNAL(changed()), t, SLOT(syncToAction()));
-            QObject::connect(action, SIGNAL(destroyed(QObject*)), t, SLOT(clearAction()));
-            QObject::connect(t, SIGNAL(clicked()), action, SLOT(trigger()));
+            QObject::connect(action, SIGNAL(changed()), ThemedWidgetInterface<T>::q, SLOT(syncToAction()));
+            QObject::connect(action, SIGNAL(destroyed(QObject*)), ThemedWidgetInterface<T>::q, SLOT(clearAction()));
+            QObject::connect(ThemedWidgetInterface<T>::q, SIGNAL(clicked()), action, SLOT(trigger()));
             syncToAction();
         }
     }
diff --git a/private/storage.cpp b/private/storage.cpp
index 654b94ca8..0e732ce11 100644
--- a/private/storage.cpp
+++ b/private/storage.cpp
@@ -2,6 +2,7 @@
 // storage.cpp                                                         //
 //                                                                     //
 // Copyright (C)  2010  Brian Pritchett <batenkaitos@gmail.com>        //
+// Copyright (C)  2010  Marco Martin <mart@kde.org>                    //
 //                                                                     //
 // This library is free software; you can redistribute it and/or       //
 // modify it under the terms of the GNU Lesser General Public          //
diff --git a/private/storage_p.h b/private/storage_p.h
index c4ca5d395..3aa50509b 100644
--- a/private/storage_p.h
+++ b/private/storage_p.h
@@ -2,6 +2,7 @@
 // storage.h                                                           //
 //                                                                     //
 // Copyright (C)  2010  Brian Pritchett <batenkaitos@gmail.com>        //
+// Copyright (C)  2010  Marco Martin <mart@kde.org>                    //
 //                                                                     //
 // This library is free software; you can redistribute it and/or       //
 // modify it under the terms of the GNU Lesser General Public          //
diff --git a/private/themedwidgetinterface_p.h b/private/themedwidgetinterface_p.h
index 2731f246f..20d308dc5 100644
--- a/private/themedwidgetinterface_p.h
+++ b/private/themedwidgetinterface_p.h
@@ -17,8 +17,8 @@
 *   Boston, MA 02110-1301, USA.                                               *
 *******************************************************************************/
 
-#ifndef ACTIONWIDGETINTERFACE_P_H
-#define ACTIONWIDGETINTERFACE_P_H
+#ifndef THEMEDWIDGETINTERFACE_P_H
+#define THEMEDWIDGETINTERFACE_P_H
 
 #include "kglobalsettings.h"
 #include <QApplication>
@@ -88,7 +88,7 @@ public:
                 break;
 
             case QEvent::PaletteChange:
-                customPalette = true;
+             //   customPalette = true;
                 break;
 
             default:
diff --git a/widgets/frame.cpp b/widgets/frame.cpp
index 0345f63ca..6d1dd391b 100644
--- a/widgets/frame.cpp
+++ b/widgets/frame.cpp
@@ -36,10 +36,10 @@
 namespace Plasma
 {
 
-class FramePrivate
+class FramePrivate : public ThemedWidgetInterface<Frame>
 {
 public:
-    FramePrivate(Frame *parent) : ThemedWidgetInterface<Frame>
+    FramePrivate(Frame *parent)
         : ThemedWidgetInterface(parent),
           svg(0),
           image(0),
diff --git a/widgets/groupbox.cpp b/widgets/groupbox.cpp
index d4fe80dec..171ad5f14 100644
--- a/widgets/groupbox.cpp
+++ b/widgets/groupbox.cpp
@@ -32,7 +32,7 @@
 namespace Plasma
 {
 
-class GroupBoxPrivate : ThemedWidgetInterface<GroupBox>
+class GroupBoxPrivate : public ThemedWidgetInterface<GroupBox>
 {
 public:
     GroupBoxPrivate(GroupBox *groupBox)
diff --git a/widgets/iconwidget.cpp b/widgets/iconwidget.cpp
index 82707388b..859fd4bc9 100644
--- a/widgets/iconwidget.cpp
+++ b/widgets/iconwidget.cpp
@@ -116,7 +116,7 @@ IconWidgetPrivate::IconWidgetPrivate(IconWidget *i)
       drawBg(false),
       textBgCustomized(false)
 {
-    d->initTheming();
+    initTheming();
 }
 
 IconWidgetPrivate::~IconWidgetPrivate()
diff --git a/widgets/iconwidget_p.h b/widgets/iconwidget_p.h
index ded51c039..369ec613a 100644
--- a/widgets/iconwidget_p.h
+++ b/widgets/iconwidget_p.h
@@ -30,6 +30,7 @@
 #include <QtGui/QTextLayout>
 #include <QtGui/QTextOption>
 
+#include <plasma/plasma.h>
 #include <plasma/plasma_export.h>
 #include <plasma/framesvg.h>
 #include <plasma/theme.h>
@@ -216,13 +217,11 @@ public:
     void readColors();
     void colorConfigChanged();
     void iconConfigChanged();
-    QFont widgetFont() const;
     void hoverAnimationFinished();
     void init();
     void layoutIcons(const QStyleOptionGraphicsItem *option);
     void animateMainIcon(bool, const IconWidgetStates state);
 
-    IconWidget *q;
     QString text;
     QString infoText;
     Svg *iconSvg;
@@ -280,7 +279,7 @@ void IconWidgetPrivate::setLayoutOptions(QTextLayout &layout,
 
     textoption.setWrapMode(QTextOption::WordWrap);  // NOTE: assumption as well
 
-    layout.setFont(widgetFont());
+    layout.setFont(q->font());
     layout.setTextOption(textoption);
 }
 
diff --git a/widgets/lineedit.cpp b/widgets/lineedit.cpp
index 0c917710a..0179999dc 100644
--- a/widgets/lineedit.cpp
+++ b/widgets/lineedit.cpp
@@ -36,10 +36,10 @@
 namespace Plasma
 {
 
-class LineEditPrivate
+class LineEditPrivate : public ThemedWidgetInterface<LineEdit>
 {
 public:
-    LineEditPrivate(LineEdit *lineEdit) : ThemedWidgetInterface<Label>
+    LineEditPrivate(LineEdit *lineEdit)
         : ThemedWidgetInterface(lineEdit)
     {
     }
@@ -160,7 +160,7 @@ void LineEdit::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 
 void LineEdit::changeEvent(QEvent *event)
 {
-    d->changEvent();
+    d->changeEvent(event);
     QGraphicsProxyWidget::changeEvent(event);
 }
 
diff --git a/widgets/pushbutton.cpp b/widgets/pushbutton.cpp
index 54b23c71b..930846f3e 100644
--- a/widgets/pushbutton.cpp
+++ b/widgets/pushbutton.cpp
@@ -114,8 +114,6 @@ public:
     void syncActiveRect();
     void syncBorders();
 
-    PushButton *q;
-
     FrameSvg *background;
     bool fadeIn;
     qreal opacity;
diff --git a/widgets/toolbutton.cpp b/widgets/toolbutton.cpp
index 080f68ad1..afcf1eb80 100644
--- a/widgets/toolbutton.cpp
+++ b/widgets/toolbutton.cpp
@@ -102,8 +102,6 @@ public:
     void syncBorders();
     void animationUpdate(qreal progress);
 
-    ToolButton *q;
-
     FrameSvg *background;
     QPropertyAnimation *animation;
     qreal opacity;