diff --git a/src/ktitlewidget.cpp b/src/ktitlewidget.cpp
index 7a34bc2..d8b0517 100644
--- a/src/ktitlewidget.cpp
+++ b/src/ktitlewidget.cpp
@@ -1,360 +1,331 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2007 Urs Wolfer <uwolfer @ kde.org>
    Copyright (C) 2007 Michaël Larouche <larouche@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB. If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "ktitlewidget.h"
 
 #include <QApplication>
 #include <QTimer>
 #include <QMouseEvent>
 #include <QFrame>
 #include <QLabel>
 #include <QLayout>
 #include <QTextDocument>
 #include <QIcon>
 #include <QStyle>
 
 class Q_DECL_HIDDEN KTitleWidget::Private
 {
 public:
     Private(KTitleWidget *parent)
         : q(parent),
           autoHideTimeout(0),
           messageType(InfoMessage)
     {
     }
 
     QString textStyleSheet() const
     {
         qreal factor;
         switch (level) {
         case 1:
             factor = 1.80;
             break;
         case 2:
             factor = 1.30;
             break;
         case 3:
             factor = 1.20;
             break;
         case 4:
             factor = 1.10;
             break;
         default:
             factor = 1;
         }
         const int fontSize = qRound(QApplication::font().pointSize() * factor);
         return QStringLiteral("QLabel { font-size: %1pt; color: %2 }").arg(QString::number(fontSize), q->palette().color(QPalette::WindowText).name());
     }
 
     QString commentStyleSheet() const
     {
         QString styleSheet;
         switch (messageType) {
         //FIXME: we need the usability color styles to implement different
         //       yet palette appropriate colours for the different use cases!
         //       also .. should we include an icon here,
         //       perhaps using the imageLabel?
         case InfoMessage:
         case WarningMessage:
         case ErrorMessage:
             styleSheet = QStringLiteral("QLabel { color: palette(%1); background: palette(%2); }").arg(q->palette().color(QPalette::HighlightedText).name(), q->palette().color(QPalette::Highlight).name());
             break;
         case PlainMessage:
         default:
             break;
         }
         return styleSheet;
     }
 
     int level = 1;
     KTitleWidget *q;
     QGridLayout *headerLayout;
     QLabel *imageLabel;
     QLabel *textLabel;
     QLabel *commentLabel;
     int autoHideTimeout;
     MessageType messageType;
 
     /**
      * @brief Get the icon name from the icon type
      * @param type icon type from the enum
      * @return named icon as QString
      */
     QString iconTypeToIconName(KTitleWidget::MessageType type);
 
     void _k_timeoutFinished()
     {
         q->setVisible(false);
     }
 };
 
 QString KTitleWidget::Private::iconTypeToIconName(KTitleWidget::MessageType type)
 {
     switch (type) {
     case KTitleWidget::InfoMessage:
         return QStringLiteral("dialog-information");
     case KTitleWidget::ErrorMessage:
         return QStringLiteral("dialog-error");
     case KTitleWidget::WarningMessage:
         return QStringLiteral("dialog-warning");
     case KTitleWidget::PlainMessage:
         break;
     }
 
     return QString();
 }
 
 KTitleWidget::KTitleWidget(QWidget *parent)
     : QWidget(parent),
       d(new Private(this))
 {
     QFrame *titleFrame = new QFrame(this);
     titleFrame->setAutoFillBackground(true);
     titleFrame->setFrameShape(QFrame::StyledPanel);
     titleFrame->setFrameShadow(QFrame::Plain);
     titleFrame->setBackgroundRole(QPalette::Base);
     titleFrame->setContentsMargins(0, 0, 0, 0);
 
     // default image / text part start
     d->headerLayout = new QGridLayout(titleFrame);
     d->headerLayout->setColumnStretch(0, 1);
     d->headerLayout->setMargin(6);
     d->headerLayout->setContentsMargins(0, 0, 0, 0);
 
     d->textLabel = new QLabel(titleFrame);
     d->textLabel->setVisible(false);
     d->textLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
 
     d->imageLabel = new QLabel(titleFrame);
     d->imageLabel->setVisible(false);
 
     d->headerLayout->addWidget(d->textLabel, 0, 0);
     d->headerLayout->addWidget(d->imageLabel, 0, 1, 1, 2);
 
     d->commentLabel = new QLabel(titleFrame);
     d->commentLabel->setVisible(false);
     d->commentLabel->setOpenExternalLinks(true);
     d->commentLabel->setWordWrap(true);
     d->commentLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
     d->headerLayout->addWidget(d->commentLabel, 1, 0);
 
     // default image / text part end
 
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->addWidget(titleFrame);
     mainLayout->setMargin(0);
     setLayout(mainLayout);
 }
 
 KTitleWidget::~KTitleWidget()
 {
     delete d;
 }
 
 bool KTitleWidget::eventFilter(QObject *object, QEvent *event)
 {
     // Hide message label on click
     if (d->autoHideTimeout > 0 &&
             event->type() == QEvent::MouseButtonPress) {
         QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
         if (mouseEvent && mouseEvent->button() == Qt::LeftButton) {
             setVisible(false);
             return true;
         }
     }
 
     return QWidget::eventFilter(object, event);
 }
 
 void KTitleWidget::setWidget(QWidget *widget)
 {
     d->headerLayout->addWidget(widget, 2, 0, 1, 2);
 }
 
 QString KTitleWidget::text() const
 {
     return d->textLabel->text();
 }
 
 QString KTitleWidget::comment() const
 {
     return d->commentLabel->text();
 }
 
 const QPixmap *KTitleWidget::pixmap() const
 {
     return d->imageLabel->pixmap();
 }
 
 void KTitleWidget::setBuddy(QWidget *buddy)
 {
     d->textLabel->setBuddy(buddy);
 }
 
 void KTitleWidget::changeEvent(QEvent *e)
 {
     QWidget::changeEvent(e);
     if (e->type() == QEvent::PaletteChange || e->type() == QEvent::FontChange
                                            || e->type() == QEvent::ApplicationFontChange) {
         d->textLabel->setStyleSheet(d->textStyleSheet());
-        //Qt stylesheet doesn't support lighter font-weight
-        QFont font(d->textLabel->font());
-        if (d->level <= 4) {
-            font.setWeight(QFont::Light);
-            font.setStyleName(QStringLiteral("Light"));
-        } else {
-            font.setWeight(QFont::Normal);
-            font.setStyleName(QStringLiteral("Regular"));
-        }
-        d->textLabel->setFont(font);
         d->commentLabel->setStyleSheet(d->commentStyleSheet());
     }
 }
 
 void KTitleWidget::setText(const QString &text, Qt::Alignment alignment)
 {
     d->textLabel->setVisible(!text.isNull());
 
     if (!Qt::mightBeRichText(text)) {
         d->textLabel->setStyleSheet(d->textStyleSheet());
-        //Qt stylesheet doesn't support lighter font-weight
-        QFont font(d->textLabel->font());
-        if (d->level <= 4) {
-            font.setWeight(QFont::Light);
-            font.setStyleName(QStringLiteral("Light"));
-        } else {
-            font.setWeight(QFont::Normal);
-            font.setStyleName(QStringLiteral("Regular"));
-        }
-        d->textLabel->setFont(font);
     }
 
     d->textLabel->setText(text);
     d->textLabel->setAlignment(alignment);
     show();
 }
 
 void KTitleWidget::setLevel(int level)
 {
     if (d->level == level) {
         return;
     }
 
     d->level = level;
 
     d->textLabel->setStyleSheet(d->textStyleSheet());
-    //Qt stylesheet doesn't support lighter font-weight
-    QFont font(d->textLabel->font());
-    if (d->level <= 4) {
-        font.setWeight(QFont::Light);
-        font.setStyleName(QStringLiteral("Light"));
-    } else {
-        font.setWeight(QFont::Normal);
-        font.setStyleName(QStringLiteral("Regular"));
-    }
 }
 
 int KTitleWidget::level()
 {
     return d->level;
 }
 
 void KTitleWidget::setText(const QString &text, MessageType type)
 {
     setPixmap(type);
     setText(text);
 }
 
 void KTitleWidget::setComment(const QString &comment, MessageType type)
 {
     d->commentLabel->setVisible(!comment.isNull());
 
     //TODO: should we override the current icon with the corresponding MessageType icon?
     d->messageType = type;
     d->commentLabel->setStyleSheet(d->commentStyleSheet());
     d->commentLabel->setText(comment);
     show();
 }
 
 void KTitleWidget::setPixmap(const QPixmap &pixmap, ImageAlignment alignment)
 {
     d->imageLabel->setVisible(!pixmap.isNull());
 
     d->headerLayout->removeWidget(d->textLabel);
     d->headerLayout->removeWidget(d->commentLabel);
     d->headerLayout->removeWidget(d->imageLabel);
 
     if (alignment == ImageLeft) {
         // swap the text and image labels around
         d->headerLayout->addWidget(d->imageLabel, 0, 0, 2, 1);
         d->headerLayout->addWidget(d->textLabel, 0, 1);
         d->headerLayout->addWidget(d->commentLabel, 1, 1);
         d->headerLayout->setColumnStretch(0, 0);
         d->headerLayout->setColumnStretch(1, 1);
     } else {
         d->headerLayout->addWidget(d->textLabel, 0, 0);
         d->headerLayout->addWidget(d->commentLabel, 1, 0);
         d->headerLayout->addWidget(d->imageLabel, 0, 1, 2, 1);
         d->headerLayout->setColumnStretch(1, 0);
         d->headerLayout->setColumnStretch(0, 1);
     }
 
     d->imageLabel->setPixmap(pixmap);
 }
 
 void KTitleWidget::setPixmap(const QString &icon, ImageAlignment alignment)
 {
     setPixmap(QIcon::fromTheme(icon), alignment);
 }
 
 void KTitleWidget::setPixmap(const QIcon &icon, ImageAlignment alignment)
 {
     setPixmap(icon.pixmap(style()->pixelMetric(QStyle::PM_MessageBoxIconSize)), alignment);
 }
 
 void KTitleWidget::setPixmap(MessageType type, ImageAlignment alignment)
 {
     setPixmap(QIcon::fromTheme(d->iconTypeToIconName(type)), alignment);
 }
 
 int KTitleWidget::autoHideTimeout() const
 {
     return d->autoHideTimeout;
 }
 
 void KTitleWidget::setAutoHideTimeout(int msecs)
 {
     d->autoHideTimeout = msecs;
 
     if (msecs > 0) {
         installEventFilter(this);
     } else {
         removeEventFilter(this);
     }
 }
 
 void KTitleWidget::showEvent(QShowEvent *event)
 {
     Q_UNUSED(event)
     if (d->autoHideTimeout > 0) {
         QTimer::singleShot(d->autoHideTimeout, this, [this] { d->_k_timeoutFinished(); });
     }
 }
 
 #include "moc_ktitlewidget.cpp"