diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,16 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 2.8.12)
 project ( kcoloredit )
 
-find_package ( KDE4 REQUIRED )
-include ( KDE4Defaults )
-include ( MacroLibrary )
+set(QT_MIN_VERSION "5.7.0")
+find_package(ECM 1.6.0 REQUIRED CONFIG)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+include(KDEInstallDirs)
+include(KDECMakeSettings NO_POLICY_SCOPE)
+include(KDECompilerSettings NO_POLICY_SCOPE)
+include(ECMInstallIcons)
+
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Gui Widgets)
+find_package(KF5 REQUIRED COMPONENTS I18n Config DocTools KDELibs4Support)
 
 ADD_SUBDIRECTORY ( src )
 ADD_SUBDIRECTORY ( desktop )
diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt
--- a/desktop/CMakeLists.txt
+++ b/desktop/CMakeLists.txt
@@ -1,5 +1,5 @@
-install ( PROGRAMS kcoloredit.desktop DESTINATION  ${XDG_APPS_INSTALL_DIR} )
-install ( FILES kcoloreditui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kcoloredit )
-install ( FILES text-input.png controls-input.png DESTINATION  ${DATA_INSTALL_DIR}/kcoloredit/pics )
+install ( FILES kcoloredit.desktop DESTINATION  ${KDE_INSTALL_APPDIR} )
+install ( FILES kcoloreditui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/kcoloredit )
+install ( FILES text-input.png controls-input.png DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/kcoloredit/pics )
 
-kde4_install_icons( ${ICON_INSTALL_DIR} )
+ecm_install_icons( ${ICON_INSTALL_DIR} )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
 ########### install files ###############
 #
 #
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcoloredit)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcoloredit)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,17 +45,27 @@
   app/main.cpp
 )
 
-kde4_add_ui_files (
+ki18n_wrap_ui(
   kcoloredit_SRCS
 
   widgets/colorselectors/builderselector/builderwidget.ui
   settings/builderconfiguration.ui
 )
 
-kde4_add_kcfg_files ( kcoloredit_SRCS settings/kcoloredit_settings.kcfgc)
+set(kcoloredit_LIBS
+  Qt5::Core
+  Qt5::Gui
+  Qt5::Widgets
+  KF5::I18n
+  KF5::ConfigCore
+  KF5::CoreAddons
+  KF5::KDELibs4Support
+)
+
+kconfig_add_kcfg_files ( kcoloredit_SRCS settings/kcoloredit_settings.kcfgc)
 
-kde4_add_executable ( kcoloredit ${kcoloredit_SRCS} )
+add_executable ( kcoloredit ${kcoloredit_SRCS} )
 
-target_link_libraries ( kcoloredit ${KDE4_KFILE_LIBS} ${X11_LIBRARIES})
+target_link_libraries ( kcoloredit ${kcoloredit_LIBS})
 
-install (TARGETS kcoloredit  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install (TARGETS kcoloredit DESTINATION ${KDE_INSTALL_BINDIR} )
diff --git a/src/app/kcoloredit.h b/src/app/kcoloredit.h
--- a/src/app/kcoloredit.h
+++ b/src/app/kcoloredit.h
@@ -20,7 +20,8 @@
 #ifndef KCOLOREDIT_H
 #define KCOLOREDIT_H
 
-#include <KUrl>
+#include <QUrl>
+
 #include <KXmlGuiWindow>
 
 #include "ui_builderconfiguration.h"
@@ -45,7 +46,7 @@
         virtual ~KColorEditMainWnd();
 
     public slots:
-        void openFile(const KUrl & url = KUrl());
+        void openFile(const QUrl & url = QUrl());
 
     protected:
         bool queryClose();
diff --git a/src/app/kcoloredit.cpp b/src/app/kcoloredit.cpp
--- a/src/app/kcoloredit.cpp
+++ b/src/app/kcoloredit.cpp
@@ -19,7 +19,7 @@
 
 #include "kcoloredit.h"
 
-#include <QtGui/QDockWidget>
+#include <QDockWidget>
 
 #include <KLocalizedString>
 #include <KIO/NetAccess>
@@ -56,14 +56,14 @@
 
 KColorEditMainWnd::~KColorEditMainWnd()
 {
-    m_recentFilesAction->saveEntries(KConfigGroup(KGlobal::config(), "Recent Files"));
+    m_recentFilesAction->saveEntries(KConfigGroup(KSharedConfig::openConfig(), "Recent Files"));
 
-    KGlobal::config()->sync();
+    KSharedConfig::openConfig()->sync();
 }
 
-void KColorEditMainWnd::openFile(const KUrl & url)
+void KColorEditMainWnd::openFile(const QUrl & url)
 {
-    KUrl paletteUrl = url;
+    KUrl paletteUrl(url);
 
     if (url.isEmpty())
         paletteUrl = PaletteDialog::getOpenUrl();
@@ -174,7 +174,7 @@
         if (KMessageBox::questionYesNo(this
             , i18n("This action will delete all items (colors and comments) of the current palette.")
             , QString()
-            , KGuiItem(i18n("Clean Palette"), KIcon("edit-clear"))
+            , KGuiItem(i18n("Clean Palette"), QIcon::fromTheme("edit-clear"))
             , KStandardGuiItem::cancel())
             == KMessageBox::Yes)
             m_paletteDocument->model()->removeRows(0, m_paletteDocument->model()->rowCount());
@@ -186,7 +186,7 @@
         if (KMessageBox::questionYesNo(this
         , i18n("This action will replace the name of all color items with names in this format #RRGGBB.")
         , QString()
-        , KGuiItem(i18n("Generate Color Names"), KIcon("format-stroke-color"))
+        , KGuiItem(i18n("Generate Color Names"), QIcon::fromTheme("format-stroke-color"))
         , KStandardGuiItem::cancel())
         == KMessageBox::Yes)
             m_paletteDocument->model()->generateColorNames();
@@ -317,8 +317,8 @@
     KStandardAction::preferences(this, SLOT(configureApp()), actionCollection());
     KStandardAction::quit   (this, SLOT( close()      ), actionCollection());
 
-    m_recentFilesAction = KStandardAction::openRecent(this, SLOT( openFile(KUrl) ), actionCollection());
-    m_recentFilesAction->loadEntries(KGlobal::config()->group("Recent Files"));
+    m_recentFilesAction = KStandardAction::openRecent(this, SLOT( openFile(QUrl) ), actionCollection());
+    m_recentFilesAction->loadEntries(KConfigGroup(KSharedConfig::openConfig(), "Recent Files"));
 
     // NOTE
     // Actions for docks
@@ -329,22 +329,20 @@
     // NOTE
     // Actions for palette menu
 
-    KAction * cleanPaletteAction = actionCollection()->addAction("clean-palette");
-    cleanPaletteAction->setIcon(KIcon("edit-clear"));
+    QAction * cleanPaletteAction = actionCollection()->addAction("clean-palette");
+    cleanPaletteAction->setIcon(QIcon::fromTheme("edit-clear"));
     cleanPaletteAction->setText(i18n("Clean Palette"));
 
-    KAction * generateColorNamesAction = actionCollection()->addAction("generate-color-names");
-    generateColorNamesAction->setIcon(KIcon("format-stroke-color"));
+    QAction * generateColorNamesAction = actionCollection()->addAction("generate-color-names");
+    generateColorNamesAction->setIcon(QIcon::fromTheme("format-stroke-color"));
     generateColorNamesAction->setText(i18n("Generate Color Names"));
 
-    KAction * completeColorNamesAction = actionCollection()->addAction("complete-color-names");
-    completeColorNamesAction->setIcon(KIcon("format-stroke-color"));
+    QAction * completeColorNamesAction = actionCollection()->addAction("complete-color-names");
+    completeColorNamesAction->setIcon(QIcon::fromTheme("format-stroke-color"));
     completeColorNamesAction->setText(i18nc("Complete is a verb here, this is an action that fills missing color names in a palette", "Complete Color Names"));
 
     connect(cleanPaletteAction, SIGNAL( triggered(bool) ), this, SLOT( cleanPalette() ));
 
     connect(generateColorNamesAction, SIGNAL( triggered(bool) ), this, SLOT( generateColorNames() ));
     connect(completeColorNamesAction, SIGNAL( triggered(bool) ), this, SLOT( completeColorNames() ));
 }
-
-#include "kcoloredit.moc"
diff --git a/src/app/main.cpp b/src/app/main.cpp
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -23,33 +23,42 @@
 #include <KApplication>
 #include <KCmdLineArgs>
 #include <KAboutData>
-#include <KIcon>
+#include <QCommandLineParser>
 
 int main(int argc, char * argv[])
 {
-    KAboutData about("kcoloredit", 0, ki18n(I18N_NOOP("KColorEdit")), "2.09.99 (KColorEdit 2.1 RC 2)",
-        ki18n(I18N_NOOP("KColorEdit, a tool for editing color palettes.")),
-        KAboutData::License_GPL, ki18n("(C) 2009, Percy Camilo Triveño Aucahuasi\n" "(C) 2000, Artur Rataj"));
-    about.addAuthor(ki18n("Percy Camilo Triveño Aucahuasi"), ki18n("Current maintainer - Upgraded and developed the new version."), "percy.camilo.ta@gmail.com");
-    about.addAuthor(ki18n("Artur Rataj"), ki18n("Former maintainer - Created KColorEdit"), "art@zeus.polsl.gliwice.pl");
+    QApplication app(argc, argv);
 
-    KCmdLineArgs::init(argc, argv, &about);
+    KAboutData about(QLatin1Literal("kcoloredit"),
+                     i18n("KColorEdit"),
+                     "2.09.99 (KColorEdit 2.1 RC 2)",
+                     i18n("KColorEdit, a tool for editing color palettes."),
+                     KAboutLicense::GPL_V2,
+                     i18n("(C) 2009, Percy Camilo Triveño Aucahuasi\n" "(C) 2000, Artur Rataj"),
+                     QLatin1String(""),
+                     QLatin1String("https://userbase.kde.org/KColorEdit")
+                     );
 
-    KCmdLineOptions options;
-    options.add("+[URL]", ki18n("File to open (Text file with colors and comments items)"));
-    KCmdLineArgs::addCmdLineOptions(options);
+    about.addAuthor(i18n("Percy Camilo Triveño Aucahuasi"), i18n("Current maintainer - Upgraded and developed the new version."), "percy.camilo.ta@gmail.com");
+    about.addAuthor(i18n("Artur Rataj"), i18n("Former maintainer - Created KColorEdit"), "art@zeus.polsl.gliwice.pl");
 
-    KApplication app;
-    QApplication::setWindowIcon(KIcon("kcoloredit"));
+    QCommandLineParser parser;
 
-    KCmdLineArgs * args = KCmdLineArgs::parsedArgs();
+    KAboutData::setApplicationData(about);
+    about.setupCommandLine(&parser);
 
-    KColorEditMainWnd * kceMainWnd = new KColorEditMainWnd;
+    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("+[URL]"), i18n("File to open (Text file with colors and comments items)")));
+
+    parser.process(app);
+    about.processCommandLine(&parser);
 
-    if (args->count())
-        kceMainWnd->openFile(args->url(0));
+    QApplication::setWindowIcon(QIcon::fromTheme("kcoloredit"));
+
+    KColorEditMainWnd * kceMainWnd = new KColorEditMainWnd;
 
-    args->clear();
+    const QStringList urls = parser.positionalArguments();
+    if (urls.count())
+        kceMainWnd->openFile(QUrl::fromUserInput(urls.at(0)));
 
     kceMainWnd->show();
 
diff --git a/src/core/palettedocument.cpp b/src/core/palettedocument.cpp
--- a/src/core/palettedocument.cpp
+++ b/src/core/palettedocument.cpp
@@ -339,5 +339,3 @@
     if (commentsToRemove > 0)
         m_model->removeRows(0, commentsToRemove);
 }
-
-#include "palettedocument.moc"
diff --git a/src/core/paletteitem.h b/src/core/paletteitem.h
--- a/src/core/paletteitem.h
+++ b/src/core/paletteitem.h
@@ -20,8 +20,8 @@
 #ifndef PALETTE_ITEM_H
 #define PALETTE_ITEM_H
 
-#include <QtCore/QString>
-#include <QtGui/QColor>
+#include <QString>
+#include <QColor>
 
 class PaletteItem
 {
diff --git a/src/core/palettemodel.cpp b/src/core/palettemodel.cpp
--- a/src/core/palettemodel.cpp
+++ b/src/core/palettemodel.cpp
@@ -19,8 +19,8 @@
 
 #include "palettemodel.h"
 
-#include <QtCore/QString>
-#include <QtGui/QColor>
+#include <QString>
+#include <QColor>
 
 #include <KLocalizedString>
 
@@ -300,5 +300,3 @@
 }
 
 //END public methods
-
-#include "palettemodel.moc"
diff --git a/src/dialog/palettedialog.h b/src/dialog/palettedialog.h
--- a/src/dialog/palettedialog.h
+++ b/src/dialog/palettedialog.h
@@ -21,12 +21,13 @@
 #define PALETTE_DIALOG_H
 
 #include <KColorDialog>
+#include <KUrl>
 
 class QLabel;
 class QStringList;
+class QTabWidget;
 
 class KFileWidget;
-class KTabWidget;
 
 class CollectionGrid : public KColorCells
 {
@@ -87,7 +88,7 @@
         void selectUrl();
 
     private:
-        KTabWidget * m_mainWidget;
+        QTabWidget * m_mainWidget;
 
         CollectionsWidget * m_collectionsWidget;
         KFileWidget * m_fileWidget;
diff --git a/src/dialog/palettedialog.cpp b/src/dialog/palettedialog.cpp
--- a/src/dialog/palettedialog.cpp
+++ b/src/dialog/palettedialog.cpp
@@ -19,17 +19,16 @@
 
 #include "palettedialog.h"
 
-#include <QtCore/QStringList>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QLabel>
+#include <QStringList>
+#include <QMouseEvent>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QTabWidget>
 
 #include <KLocalizedString>
 #include <KStandardDirs>
 #include <KColorCollection>
-#include <KCursor>
-#include <KTabWidget>
 #include <kfilewidget.h> // no sale en el include de KDE
 
 //BEGIN public class CollectionGrid
@@ -39,7 +38,7 @@
     , m_collection(collection)
     , m_isEmpty(true)
 {
-    setCursor(KCursor("hand2"));
+    setCursor(QCursor(Qt::CursorShape::DragMoveCursor));
 
     KColorCollection colorCollection(collection);
 
@@ -171,17 +170,17 @@
     setModal( true );
     resize(700, 400);
 
-    m_mainWidget = new KTabWidget(this);
+    m_mainWidget = new QTabWidget(this);
 
     m_collectionsWidget = new CollectionsWidget(m_mainWidget);
 
     m_fileWidget = new KFileWidget(KUrl(QDir::homePath()), m_mainWidget);
     //m_fileWidget->setMode(KFile::ExistingOnly | KFile::LocalOnly); // WARNING bug here
     m_fileWidget->setOperationMode(KFileWidget::Opening);
     m_fileWidget->setFilter(PaletteDialog::filter());
 
-    m_mainWidget->addTab(m_collectionsWidget, KIcon("kde"), i18n("KDE Palettes"));
-    m_mainWidget->addTab(m_fileWidget, KIcon("edit-find"), i18n("Search Palettes"));
+    m_mainWidget->addTab(m_collectionsWidget, QIcon::fromTheme("kde"), i18n("KDE Palettes"));
+    m_mainWidget->addTab(m_fileWidget, QIcon::fromTheme("edit-find"), i18n("Search Palettes"));
 
     setMainWidget(m_mainWidget);
 
@@ -250,5 +249,3 @@
 //END public slots
 
 //END public class PaletteDialog
-
-#include "palettedialog.moc"
diff --git a/src/itemviews/palettebriefview.h b/src/itemviews/palettebriefview.h
--- a/src/itemviews/palettebriefview.h
+++ b/src/itemviews/palettebriefview.h
@@ -20,12 +20,12 @@
 #ifndef PALETTE_BRIEF_VIEW_H
 #define PALETTE_BRIEF_VIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class QSlider;
 class QCheckBox;
+class QPushButton;
 
-class KPushButton;
 class KColorCells;
 
 class PaletteModel;
@@ -66,8 +66,8 @@
         KColorCells * m_colorCells;
 
         QSlider * m_setColumnSlider;
-        KPushButton * m_zoomOutButton;
-        KPushButton * m_zoomInButton;
+        QPushButton * m_zoomOutButton;
+        QPushButton * m_zoomInButton;
         QCheckBox * m_quickNavigationCheckBox;
         QCheckBox * m_showCommentsCheckBox;
 };
diff --git a/src/itemviews/palettebriefview.cpp b/src/itemviews/palettebriefview.cpp
--- a/src/itemviews/palettebriefview.cpp
+++ b/src/itemviews/palettebriefview.cpp
@@ -19,13 +19,13 @@
 
 #include "palettebriefview.h"
 
-#include <QtGui/QLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QSlider>
-#include <QtGui/QCheckBox>
+#include <QLayout>
+#include <QHeaderView>
+#include <QSlider>
+#include <QCheckBox>
+#include <QPushButton>
 
 #include <KLocalizedString>
-#include <KPushButton>
 #include <KColorCells>
 
 #include "colorutil.h"
@@ -50,9 +50,9 @@
     m_setColumnSlider->setPageStep(1);
     m_setColumnSlider->setTickInterval(1);
 
-    m_zoomOutButton = new KPushButton(KIcon("zoom-out"), QString(), this);
+    m_zoomOutButton = new QPushButton(QIcon::fromTheme("zoom-out"), QString(), this);
 
-    m_zoomInButton = new KPushButton(KIcon("zoom-in"), QString(), this);
+    m_zoomInButton = new QPushButton(QIcon::fromTheme("zoom-in"), QString(), this);
 
     m_colorCells = new KColorCells(this, 0, 1);
     m_colorCells->setAcceptDrops(false);
@@ -354,5 +354,3 @@
     m_setColumnSlider->setRange(Palette::MIN_PREFERRED_COLUMNS, finalColumns);
     m_setColumnSlider->setValue(finalValue);
 }
-
-#include "palettebriefview.moc"
diff --git a/src/itemviews/palettedelegate.h b/src/itemviews/palettedelegate.h
--- a/src/itemviews/palettedelegate.h
+++ b/src/itemviews/palettedelegate.h
@@ -20,7 +20,7 @@
 #ifndef PALETTE_DELEGATE_H
 #define PALETTE_DELEGATE_H
 
-#include <QtGui/QItemDelegate>
+#include <QItemDelegate>
 
 class PaletteDelegate : public QItemDelegate
 {
diff --git a/src/itemviews/palettedelegate.cpp b/src/itemviews/palettedelegate.cpp
--- a/src/itemviews/palettedelegate.cpp
+++ b/src/itemviews/palettedelegate.cpp
@@ -19,7 +19,7 @@
 
 #include "palettedelegate.h"
 
-#include <QtGui/QPainter>
+#include <QPainter>
 
 #include "colorutil.h"
 #include "palettemodel.h"
@@ -130,5 +130,3 @@
         painter->drawText(option.rect, Qt::AlignCenter, index.model()->data(index).toMap().value("comment").toString());
     }
 }
-
-#include "palettedelegate.moc"
diff --git a/src/itemviews/palettedetailview.h b/src/itemviews/palettedetailview.h
--- a/src/itemviews/palettedetailview.h
+++ b/src/itemviews/palettedetailview.h
@@ -20,7 +20,7 @@
 #ifndef PALETTE_DETAIL_VIEW_H
 #define PALETTE_DETAIL_VIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "palette.h"
 
diff --git a/src/itemviews/palettedetailview.cpp b/src/itemviews/palettedetailview.cpp
--- a/src/itemviews/palettedetailview.cpp
+++ b/src/itemviews/palettedetailview.cpp
@@ -19,14 +19,14 @@
 
 #include "palettedetailview.h"
 
-#include <QtGui/QLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QTableView>
-#include <QtGui/QToolButton>
+#include <QLayout>
+#include <QHeaderView>
+#include <QTableView>
+#include <QToolButton>
+#include <QIcon>
 
 #include <KLocalizedString>
 #include <KLineEdit>
-#include <KPushButton>
 #include <KUrlLabel>
 
 #include "colorutil.h"
@@ -41,33 +41,33 @@
     , m_paletteDetailView(paletteDetailView)
 {
     QToolButton *moveItemToFirstPositionButton = new QToolButton(this);
-    moveItemToFirstPositionButton->setIcon(KIcon("go-top"));
+    moveItemToFirstPositionButton->setIcon(QIcon::fromTheme("go-top"));
     moveItemToFirstPositionButton->setToolTip(i18n("First position"));
 
     QToolButton *moveItemToPrevPositionButton = new QToolButton(this);
-    moveItemToPrevPositionButton->setIcon(KIcon("go-up"));
+    moveItemToPrevPositionButton->setIcon(QIcon::fromTheme("go-up"));
     moveItemToPrevPositionButton->setToolTip(i18n("Previous position"));
     moveItemToPrevPositionButton->setAutoRepeat(true);
 
     QToolButton *insertColorItemButton = new QToolButton(this);
-    insertColorItemButton->setIcon(KIcon("insert-horizontal-rule"));
+    insertColorItemButton->setIcon(QIcon::fromTheme("insert-horizontal-rule"));
     insertColorItemButton->setToolTip(i18n("Insert color"));
 
     QToolButton *insertCommentItemButton = new QToolButton(this);
-    insertCommentItemButton->setIcon(KIcon("list-add-font"));
+    insertCommentItemButton->setIcon(QIcon::fromTheme("list-add-font"));
     insertCommentItemButton->setToolTip(i18n("Insert comment"));
 
     QToolButton *removeItemButton = new QToolButton(this);
-    removeItemButton->setIcon(KIcon("list-remove"));
+    removeItemButton->setIcon(QIcon::fromTheme("list-remove"));
     removeItemButton->setToolTip(i18n("Remove item"));
 
     QToolButton *moveItemToNextPositionButton = new QToolButton(this);
-    moveItemToNextPositionButton->setIcon(KIcon("go-down"));
+    moveItemToNextPositionButton->setIcon(QIcon::fromTheme("go-down"));
     moveItemToNextPositionButton->setToolTip(i18n("Next position"));
     moveItemToNextPositionButton->setAutoRepeat(true);
 
     QToolButton *moveItemToLastPositionButton = new QToolButton(this);
-    moveItemToLastPositionButton->setIcon(KIcon("go-bottom"));
+    moveItemToLastPositionButton->setIcon(QIcon::fromTheme("go-bottom"));
     moveItemToLastPositionButton->setToolTip(i18n("Last position"));
 
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
@@ -334,5 +334,3 @@
 }
 
 //END Public class PaletteDetailView
-
-#include "palettedetailview.moc"
diff --git a/src/widgets/colorinfo/colorinfotext.h b/src/widgets/colorinfo/colorinfotext.h
--- a/src/widgets/colorinfo/colorinfotext.h
+++ b/src/widgets/colorinfo/colorinfotext.h
@@ -20,12 +20,12 @@
 #ifndef COLOR_INFO_TEXT_H
 #define COLOR_INFO_TEXT_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class QLabel;
 
 class KLineEdit;
-class KPushButton;
+class QPushButton;
 
 class ColorInfoText : public QWidget
 {
@@ -52,7 +52,7 @@
         KLineEdit * m_componentValue2;
         KLineEdit * m_componentValue3;
 
-        KPushButton * m_buttonToClipboard;
+        QPushButton * m_buttonToClipboard;
 };
 
 class ColorInfoTextRGB : public ColorInfoText
@@ -113,8 +113,8 @@
         KLineEdit * m_componentValue1;
         KLineEdit * m_componentValue2;
 
-        KPushButton * m_buttonValue1ToClipboard;
-        KPushButton * m_buttonValue2ToClipboard;
+        QPushButton * m_buttonValue1ToClipboard;
+        QPushButton * m_buttonValue2ToClipboard;
 };
 
 #endif // COLOR_INFO_TEXT_H
diff --git a/src/widgets/colorinfo/colorinfotext.cpp b/src/widgets/colorinfo/colorinfotext.cpp
--- a/src/widgets/colorinfo/colorinfotext.cpp
+++ b/src/widgets/colorinfo/colorinfotext.cpp
@@ -19,14 +19,14 @@
 
 #include "colorinfotext.h"
 
-#include <QtGui/QClipboard>
-#include <QtGui/QLayout>
-#include <QtGui/QLabel>
+#include <QClipboard>
+#include <QLayout>
+#include <QLabel>
+#include <QPushButton>
 
 #include <KLocalizedString>
 #include <KApplication>
 #include <KLineEdit>
-#include <KPushButton>
 
 //BEGIN ColorInfoText
 
@@ -46,9 +46,9 @@
     m_componentValue3 = new KLineEdit(this);
     m_componentValue3->setReadOnly(true);
 
-    m_buttonToClipboard = new KPushButton(this);
+    m_buttonToClipboard = new QPushButton(this);
     m_buttonToClipboard->setMaximumWidth(36);
-    m_buttonToClipboard->setIcon(KIcon("edit-copy"));
+    m_buttonToClipboard->setIcon(QIcon::fromTheme("edit-copy"));
     m_buttonToClipboard->setToolTip(i18n("Copy color values to clipboard"));
 
     QGridLayout * layout = new QGridLayout(this);
@@ -162,7 +162,7 @@
     : QWidget(parent)
 {
     setWindowTitle(i18n("Textual"));
-    setWindowIcon(KIcon("format-text-color"));
+    setWindowIcon(QIcon::fromTheme("format-text-color"));
 
     m_componentName1 = new QLabel(this);
     m_componentName2 = new QLabel(this);
@@ -176,14 +176,14 @@
     m_componentName1->setText(i18n("HTML"));
     m_componentName2->setText(i18n("Hexadecimal"));
 
-    m_buttonValue1ToClipboard = new KPushButton(this);
+    m_buttonValue1ToClipboard = new QPushButton(this);
     m_buttonValue1ToClipboard->setMaximumWidth(36);
-    m_buttonValue1ToClipboard->setIcon(KIcon("edit-copy"));
+    m_buttonValue1ToClipboard->setIcon(QIcon::fromTheme("edit-copy"));
     m_buttonValue1ToClipboard->setToolTip(i18n("Copy HTML value to clipboard"));
 
-    m_buttonValue2ToClipboard  = new KPushButton(this);
+    m_buttonValue2ToClipboard  = new QPushButton(this);
     m_buttonValue2ToClipboard->setMaximumWidth(36);
-    m_buttonValue2ToClipboard->setIcon(KIcon("edit-copy"));
+    m_buttonValue2ToClipboard->setIcon(QIcon::fromTheme("edit-copy"));
     m_buttonValue2ToClipboard->setToolTip(i18n("Copy color hexadecimal value to clipboard"));
 
     QGridLayout * layout = new QGridLayout(this);
@@ -225,5 +225,3 @@
 }
 
 //END ColorInfoTextHTML
-
-#include "colorinfotext.moc"
diff --git a/src/widgets/colorinfo/colorinfovisual.h b/src/widgets/colorinfo/colorinfovisual.h
--- a/src/widgets/colorinfo/colorinfovisual.h
+++ b/src/widgets/colorinfo/colorinfovisual.h
@@ -20,7 +20,7 @@
 #ifndef COLOR_INFO_VISUAL_H
 #define COLOR_INFO_VISUAL_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class ColorWidget;
 
diff --git a/src/widgets/colorinfo/colorinfovisual.cpp b/src/widgets/colorinfo/colorinfovisual.cpp
--- a/src/widgets/colorinfo/colorinfovisual.cpp
+++ b/src/widgets/colorinfo/colorinfovisual.cpp
@@ -19,7 +19,7 @@
 
 #include "colorinfovisual.h"
 
-#include <QtGui/QLayout>
+#include <QLayout>
 
 #include <KLocalizedString>
 
@@ -192,5 +192,3 @@
 }
 
 //END public class ColorInfoVisualAnalogous
-
-#include "colorinfovisual.moc"
diff --git a/src/widgets/colorselectors/blenderselector/blendercolorselector.cpp b/src/widgets/colorselectors/blenderselector/blendercolorselector.cpp
--- a/src/widgets/colorselectors/blenderselector/blendercolorselector.cpp
+++ b/src/widgets/colorselectors/blenderselector/blendercolorselector.cpp
@@ -19,11 +19,11 @@
 
 #include "blendercolorselector.h"
 
-#include <QtGui/QMouseEvent>
-#include <QtGui/QLayout>
-#include <QtGui/QToolButton>
+#include <QMouseEvent>
+#include <QLayout>
+#include <QToolButton>
+#include <QAction>
 
-#include <KAction>
 #include <KColorUtils>
 #include <KColorButton>
 
@@ -170,13 +170,13 @@
 //     buttonAppendSecondRegion->setAutoRaise(true);
 //     buttonAppendEntireRegion->setAutoRaise(true);
 
-    buttonAppendFirstQuarterRegion->setDefaultAction(new KAction(KIcon("list-add"), QString(), this));
-    buttonAppendSecondQuarterRegion->setDefaultAction(new KAction(KIcon("list-add"), QString(), this));
-    buttonAppendThirdQuarterRegion->setDefaultAction(new KAction(KIcon("list-add"), QString(), this));
-    buttonAppendFourthQuarterRegion->setDefaultAction(new KAction(KIcon("list-add"), QString(), this));
-    buttonAppendFirstRegion->setDefaultAction(new KAction(KIcon("list-add"), QString(), this));
-    buttonAppendSecondRegion->setDefaultAction(new KAction(KIcon("list-add"), QString(), this));
-    buttonAppendEntireRegion->setDefaultAction(new KAction(KIcon("list-add"), QString(), this));
+    buttonAppendFirstQuarterRegion->setDefaultAction(new QAction(QIcon::fromTheme("list-add"), QString(), this));
+    buttonAppendSecondQuarterRegion->setDefaultAction(new QAction(QIcon::fromTheme("list-add"), QString(), this));
+    buttonAppendThirdQuarterRegion->setDefaultAction(new QAction(QIcon::fromTheme("list-add"), QString(), this));
+    buttonAppendFourthQuarterRegion->setDefaultAction(new QAction(QIcon::fromTheme("list-add"), QString(), this));
+    buttonAppendFirstRegion->setDefaultAction(new QAction(QIcon::fromTheme("list-add"), QString(), this));
+    buttonAppendSecondRegion->setDefaultAction(new QAction(QIcon::fromTheme("list-add"), QString(), this));
+    buttonAppendEntireRegion->setDefaultAction(new QAction(QIcon::fromTheme("list-add"), QString(), this));
 
     QHBoxLayout * quartersLayout = new QHBoxLayout();
     quartersLayout->addWidget(buttonAppendFirstQuarterRegion);
@@ -375,5 +375,3 @@
 
     emit colorsAdded(tmpColorRange);
 }
-
-#include "blendercolorselector.moc"
diff --git a/src/widgets/colorselectors/builderselector/buildercolorselector.cpp b/src/widgets/colorselectors/builderselector/buildercolorselector.cpp
--- a/src/widgets/colorselectors/builderselector/buildercolorselector.cpp
+++ b/src/widgets/colorselectors/builderselector/buildercolorselector.cpp
@@ -19,15 +19,14 @@
 
 #include "buildercolorselector.h"
 
-#include <QtGui/QMouseEvent>
-#include <QtGui/QLayout>
-#include <QtGui/QRadioButton>
-#include <QtGui/QStackedWidget>
+#include <QMouseEvent>
+#include <QLayout>
+#include <QRadioButton>
+#include <QStackedWidget>
+#include <QTabWidget>
 
-#include <KAction>
 #include <KColorUtils>
 #include <KColorButton>
-#include <KTabWidget>
 
 #include "colorutil.h"
 
@@ -46,23 +45,23 @@
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->addWidget(builderWidget);
 
-    connect(m_uiBuilderForm.buildColorKPushButton, SIGNAL(pressed()), SLOT(buildColor()));
-    connect(m_uiBuilderForm.controlsInputKTabWidget, SIGNAL(currentChanged(int)), SLOT(setCurrentSource(int)));
+    connect(m_uiBuilderForm.buildColorPushButton, SIGNAL(pressed()), SLOT(buildColor()));
+    connect(m_uiBuilderForm.controlsInputTabWidget, SIGNAL(currentChanged(int)), SLOT(setCurrentSource(int)));
 
-    connect(m_uiBuilderForm.controlsInputKTabWidget, SIGNAL(currentChanged(int)), SLOT(setCurrentSource(int)));
+    connect(m_uiBuilderForm.controlsInputTabWidget, SIGNAL(currentChanged(int)), SLOT(setCurrentSource(int)));
 //     valueChanged ( int i )
 }
 
 void BuilderColorSelector::setInputType(bool textInput)
 {
     if (textInput)
     {
-        m_uiBuilderForm.controlsInputKTabWidget->setVisible(false);
+        m_uiBuilderForm.controlsInputTabWidget->setVisible(false);
         m_uiBuilderForm.textInputWidget->setVisible(true);
     }
     else
     {
-        m_uiBuilderForm.controlsInputKTabWidget->setVisible(true);
+        m_uiBuilderForm.controlsInputTabWidget->setVisible(true);
         m_uiBuilderForm.textInputWidget->setVisible(false);
     }
 }
@@ -85,5 +84,3 @@
 }
 
 //
-
-#include "buildercolorselector.moc"
diff --git a/src/widgets/colorselectors/builderselector/builderwidget.ui b/src/widgets/colorselectors/builderselector/builderwidget.ui
--- a/src/widgets/colorselectors/builderselector/builderwidget.ui
+++ b/src/widgets/colorselectors/builderselector/builderwidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>251</width>
-    <height>188</height>
+    <width>270</width>
+    <height>219</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,7 +18,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="KTabWidget" name="controlsInputKTabWidget">
+    <widget class="QTabWidget" name="controlsInputTabWidget">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -468,7 +468,7 @@
       </widget>
      </item>
      <item>
-      <widget class="KPushButton" name="buildColorKPushButton">
+      <widget class="QPushButton" name="buildColorPushButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -485,20 +485,15 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>knuminput.h</header>
-  </customwidget>
   <customwidget>
    <class>KColorPatch</class>
    <extends>QFrame</extends>
    <header>kcolordialog.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
+   <class>KIntSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>knuminput.h</header>
   </customwidget>
   <customwidget>
    <class>KLineEdit</class>
@@ -510,12 +505,6 @@
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
-  <customwidget>
-   <class>KTabWidget</class>
-   <extends>QTabWidget</extends>
-   <header>ktabwidget.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/widgets/colorselectors/colorselector.h b/src/widgets/colorselectors/colorselector.h
--- a/src/widgets/colorselectors/colorselector.h
+++ b/src/widgets/colorselectors/colorselector.h
@@ -20,7 +20,7 @@
 #ifndef COLOR_SELECTOR_H
 #define COLOR_SELECTOR_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class ColorSelector : public QWidget
 {
diff --git a/src/widgets/colorselectors/colorselector.cpp b/src/widgets/colorselectors/colorselector.cpp
--- a/src/widgets/colorselectors/colorselector.cpp
+++ b/src/widgets/colorselectors/colorselector.cpp
@@ -28,5 +28,3 @@
 {
     Q_UNUSED(color);
 }
-
-#include "colorselector.moc"
diff --git a/src/widgets/colorselectors/gtkselector/gtkcolorselector.cpp b/src/widgets/colorselectors/gtkselector/gtkcolorselector.cpp
--- a/src/widgets/colorselectors/gtkselector/gtkcolorselector.cpp
+++ b/src/widgets/colorselectors/gtkselector/gtkcolorselector.cpp
@@ -19,10 +19,9 @@
 
 #include "gtkcolorselector.h"
 
-#include <QtGui/QLayout>
-#include <QtGui/QToolButton>
+#include <QLayout>
+#include <QToolButton>
 
-#include <KIcon>
 #include <KLocalizedString>
 
 #include "trianglecolorwidget.h"
@@ -33,7 +32,7 @@
 
     QToolButton * generateRandomColorButton = new QToolButton(m_triangleColorWidget);
     generateRandomColorButton->setMinimumSize(42, 42);
-    generateRandomColorButton->setIcon(KIcon("roll"));
+    generateRandomColorButton->setIcon(QIcon::fromTheme("roll"));
     generateRandomColorButton->setToolTip(i18n("Generate a random color"));
 
     QVBoxLayout * mainLayout = new QVBoxLayout(this);
@@ -61,5 +60,3 @@
     m_triangleColorWidget->setColor(randColor);
     updateColor(randColor);
 }
-
-#include "gtkcolorselector.moc"
diff --git a/src/widgets/colorselectors/gtkselector/trianglecolorwidget.h b/src/widgets/colorselectors/gtkselector/trianglecolorwidget.h
--- a/src/widgets/colorselectors/gtkselector/trianglecolorwidget.h
+++ b/src/widgets/colorselectors/gtkselector/trianglecolorwidget.h
@@ -20,7 +20,7 @@
 #ifndef TRIANGLE_COLOR_WIDGET_H
 #define TRIANGLE_COLOR_WIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class TriangleColorWidget : public QWidget
 {
diff --git a/src/widgets/colorselectors/gtkselector/trianglecolorwidget.cpp b/src/widgets/colorselectors/gtkselector/trianglecolorwidget.cpp
--- a/src/widgets/colorselectors/gtkselector/trianglecolorwidget.cpp
+++ b/src/widgets/colorselectors/gtkselector/trianglecolorwidget.cpp
@@ -21,8 +21,8 @@
 
 #include <math.h>
 
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
+#include <QMouseEvent>
+#include <QPainter>
 
 void rgb_to_hsv(int R, int G, int B, int *H, int *S, int *V)
 {
@@ -356,5 +356,3 @@
         update();
     }
 }
-
-#include "trianglecolorwidget.moc"
diff --git a/src/widgets/colorselectors/kdeselector/kdecolorselector.cpp b/src/widgets/colorselectors/kdeselector/kdecolorselector.cpp
--- a/src/widgets/colorselectors/kdeselector/kdecolorselector.cpp
+++ b/src/widgets/colorselectors/kdeselector/kdecolorselector.cpp
@@ -19,11 +19,10 @@
 
 #include "kdecolorselector.h"
 
-#include <QtGui/QLayout>
-#include <QtGui/QLabel>
+#include <QLayout>
+#include <QLabel>
 
 #include <KLocalizedString>
-#include <KIcon>
 #include <KComboBox>
 
 #include "rectanglecolorwidget.h"
@@ -33,12 +32,12 @@
     m_rectangleColorWidget = new RectangleColorWidget(this);
 
     KComboBox * chooserModeComboBox = new KComboBox(this);
-    chooserModeComboBox->addItem(KIcon("view-filter"), i18n("Hue"));
-    chooserModeComboBox->addItem(KIcon("view-filter"), i18n("Saturation"));
-    chooserModeComboBox->addItem(KIcon("view-filter"), i18n("Value"));
-    chooserModeComboBox->addItem(KIcon("view-filter"), i18n("Red"));
-    chooserModeComboBox->addItem(KIcon("view-filter"), i18n("Green"));
-    chooserModeComboBox->addItem(KIcon("view-filter"), i18n("Blue"));
+    chooserModeComboBox->addItem(QIcon::fromTheme("view-filter"), i18n("Hue"));
+    chooserModeComboBox->addItem(QIcon::fromTheme("view-filter"), i18n("Saturation"));
+    chooserModeComboBox->addItem(QIcon::fromTheme("view-filter"), i18n("Value"));
+    chooserModeComboBox->addItem(QIcon::fromTheme("view-filter"), i18n("Red"));
+    chooserModeComboBox->addItem(QIcon::fromTheme("view-filter"), i18n("Green"));
+    chooserModeComboBox->addItem(QIcon::fromTheme("view-filter"), i18n("Blue"));
     chooserModeComboBox->setCurrentIndex(2);
 
     QHBoxLayout * chooserModeLayout = new QHBoxLayout();
@@ -85,5 +84,3 @@
 
     m_rectangleColorWidget->setColor(m_lastSelectedColor);
 }
-
-#include "kdecolorselector.moc"
diff --git a/src/widgets/colorselectors/kdeselector/rectanglecolorwidget.h b/src/widgets/colorselectors/kdeselector/rectanglecolorwidget.h
--- a/src/widgets/colorselectors/kdeselector/rectanglecolorwidget.h
+++ b/src/widgets/colorselectors/kdeselector/rectanglecolorwidget.h
@@ -22,7 +22,7 @@
 #ifndef RECTANGLE_COLOR_WIDGET_H
 #define RECTANGLE_COLOR_WIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include <kcolorchoosermode.h>
 
diff --git a/src/widgets/colorselectors/kdeselector/rectanglecolorwidget.cpp b/src/widgets/colorselectors/kdeselector/rectanglecolorwidget.cpp
--- a/src/widgets/colorselectors/kdeselector/rectanglecolorwidget.cpp
+++ b/src/widgets/colorselectors/kdeselector/rectanglecolorwidget.cpp
@@ -22,7 +22,7 @@
 
 #include "rectanglecolorwidget.h"
 
-#include <QtGui/QLayout>
+#include <QLayout>
 
 #include <KColorValueSelector>
 #include <khuesaturationselect.h>
@@ -238,5 +238,3 @@
     m_hsSelector->blockSignals(blocked);
     m_hsSelector->repaint();
 }
-
-#include "rectanglecolorwidget.moc"
diff --git a/src/widgets/colortoolwidget.h b/src/widgets/colortoolwidget.h
--- a/src/widgets/colortoolwidget.h
+++ b/src/widgets/colortoolwidget.h
@@ -23,7 +23,7 @@
 #ifndef COLOR_TOOL_WIDGET_H
 #define COLOR_TOOL_WIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class QLabel;
 class QCheckBox;
diff --git a/src/widgets/colortoolwidget.cpp b/src/widgets/colortoolwidget.cpp
--- a/src/widgets/colortoolwidget.cpp
+++ b/src/widgets/colortoolwidget.cpp
@@ -22,17 +22,16 @@
 
 #include "colortoolwidget.h"
 
-#include <QtGui/QMouseEvent>
-#include <QtGui/QLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QSlider>
-#include <QtGui/QGroupBox>
-#include <QtGui/QDesktopWidget>
-
-#include <KIcon>
+#include <QMouseEvent>
+#include <QLayout>
+#include <QLabel>
+#include <QSlider>
+#include <QGroupBox>
+#include <QDesktopWidget>
+#include <QPushButton>
+
 #include <KApplication>
 #include <KLocalizedString>
-#include <KPushButton>
 #include <KColorPatch>
 
 #ifdef Q_WS_X11
@@ -42,7 +41,7 @@
 #include <QX11Info>
 #include <fixx11h.h>
 
-#include <QtGui/QCheckBox>
+#include <QCheckBox>
 
 #include <KWindowSystem>
 
@@ -82,7 +81,8 @@
     m_brightnessSlider->setOrientation(Qt::Horizontal);
     m_brightnessSlider->setRange(0, 255);
 
-    KPushButton *defaultBrightnessButton = new KPushButton(KGuiItem("", "edit-undo"), this);
+    QPushButton *defaultBrightnessButton = new QPushButton(this);
+    KGuiItem::assign(defaultBrightnessButton, KGuiItem("", "edit-undo"));
     defaultBrightnessButton->setToolTip(i18nc("color context: brightness", "Restore original brightness"));
 
     QHBoxLayout * brightnessLayout = new QHBoxLayout();
@@ -104,7 +104,8 @@
     m_saturationSlider->setOrientation(Qt::Horizontal);
     m_saturationSlider->setRange(0, 255);
 
-    KPushButton *defaultSaturationButton = new KPushButton(KGuiItem("", "edit-undo"), this);
+    QPushButton *defaultSaturationButton = new QPushButton(this);
+    KGuiItem::assign(defaultSaturationButton, KGuiItem("", "edit-undo"));
     defaultSaturationButton->setToolTip(i18nc("color context: saturation of the color", "Restore original saturation"));
 
     QHBoxLayout * saturationLayout = new QHBoxLayout();
@@ -122,7 +123,7 @@
 
     QGroupBox * extraSelectorsBox = new QGroupBox(i18n("Color Selectors"), this);
 
-    KPushButton * pickColorButton = new KPushButton(KIcon("color-picker"), i18n("Pick a Color"), extraSelectorsBox);
+    QPushButton * pickColorButton = new QPushButton(QIcon::fromTheme("color-picker"), i18n("Pick a Color"), extraSelectorsBox);
 
     QHBoxLayout * pickColorLayout = new QHBoxLayout();
     pickColorLayout->addWidget(pickColorButton);
@@ -384,5 +385,3 @@
 
 #endif
 }
-
-#include "colortoolwidget.moc"
diff --git a/src/widgets/colorwidget.h b/src/widgets/colorwidget.h
--- a/src/widgets/colorwidget.h
+++ b/src/widgets/colorwidget.h
@@ -20,7 +20,7 @@
 #ifndef COLOR_WIDGET_H
 #define COLOR_WIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class QToolButton;
 
diff --git a/src/widgets/colorwidget.cpp b/src/widgets/colorwidget.cpp
--- a/src/widgets/colorwidget.cpp
+++ b/src/widgets/colorwidget.cpp
@@ -19,10 +19,10 @@
 
 #include "colorwidget.h"
 
-#include <QtCore/QMimeData>
-#include <QtGui/QClipboard>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QToolButton>
+#include <QMimeData>
+#include <QClipboard>
+#include <QVBoxLayout>
+#include <QToolButton>
 
 #include <KLocalizedString>
 #include <KApplication>
@@ -43,13 +43,13 @@
     if (mode == ColorWidget::WithActions)
     {
         m_buttonAdd = new QToolButton(m_colorPatch);
-        m_buttonAdd->setIcon(KIcon("list-add"));
+        m_buttonAdd->setIcon(QIcon::fromTheme("list-add"));
         //m_buttonAdd->setAutoRaise(true);
         m_buttonAdd->setToolTip(i18n("Append color"));
 
         m_buttonToClipboard = new QToolButton(m_colorPatch);
         //m_buttonToClipboard->setAutoRaise(true);
-        m_buttonToClipboard->setIcon(KIcon("edit-copy"));
+        m_buttonToClipboard->setIcon(QIcon::fromTheme("edit-copy"));
         m_buttonToClipboard->setToolTip(i18n("Copy color to clipboard"));
 
         QVBoxLayout * vlayout = new QVBoxLayout(m_colorPatch);
@@ -97,5 +97,3 @@
 
     QApplication::clipboard()->setMimeData(mime, QClipboard::Clipboard);
 }
-
-#include "colorwidget.moc"
diff --git a/src/widgets/kcoloreditwidget.h b/src/widgets/kcoloreditwidget.h
--- a/src/widgets/kcoloreditwidget.h
+++ b/src/widgets/kcoloreditwidget.h
@@ -20,7 +20,7 @@
 #ifndef KCOLOREDIT_WIDGET_H
 #define KCOLOREDIT_WIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class PaletteModel;
 
diff --git a/src/widgets/kcoloreditwidget.cpp b/src/widgets/kcoloreditwidget.cpp
--- a/src/widgets/kcoloreditwidget.cpp
+++ b/src/widgets/kcoloreditwidget.cpp
@@ -19,10 +19,9 @@
 
 #include "kcoloreditwidget.h"
 
-#include <QtGui/QLayout>
+#include <QLayout>
 
 #include <KLocalizedString>
-#include <KIcon>
 
 #include "palettemodel.h"
 #include "multipagewidget.h"
@@ -44,23 +43,23 @@
 
     m_kdeColorSelector = new KdeColorSelector(colorTools);
     m_kdeColorSelector->setWindowTitle(i18n("KDE Selector"));
-    m_kdeColorSelector->setWindowIcon(KIcon("kde"));
+    m_kdeColorSelector->setWindowIcon(QIcon::fromTheme("kde"));
 
     m_gtkColorSelector = new GtkColorSelector(colorTools);
     m_gtkColorSelector->setWindowTitle(i18n("GTK Selector"));
-    m_gtkColorSelector->setWindowIcon(KIcon("fill-color"));
+    m_gtkColorSelector->setWindowIcon(QIcon::fromTheme("fill-color"));
 
     m_blenderColorSelector = new BlenderColorSelector(colorTools);
     m_blenderColorSelector->setWindowTitle(i18n("Gradient Selector"));
-    m_blenderColorSelector->setWindowIcon(KIcon("fill-color"));
+    m_blenderColorSelector->setWindowIcon(QIcon::fromTheme("fill-color"));
 
     m_builderColorSelector = new BuilderColorSelector(colorTools);
     m_builderColorSelector->setWindowTitle(i18n("Color Builder"));
-    m_builderColorSelector->setWindowIcon(KIcon("format-stroke-color"));
+    m_builderColorSelector->setWindowIcon(QIcon::fromTheme("format-stroke-color"));
 
     m_colorToolWidget = new ColorToolWidget(colorTools);
     m_colorToolWidget->setWindowTitle(i18nc("Set of extra tools apart of color selectors", "Extras"));
-    m_colorToolWidget->setWindowIcon(KIcon("fill-color"));
+    m_colorToolWidget->setWindowIcon(QIcon::fromTheme("fill-color"));
 
     colorTools->addPage(m_kdeColorSelector);
     colorTools->addPage(m_gtkColorSelector);
@@ -171,5 +170,3 @@
 {
     m_model->appendColorItem(color);
 }
-
-#include "kcoloreditwidget.moc"
diff --git a/src/widgets/multipagewidget.h b/src/widgets/multipagewidget.h
--- a/src/widgets/multipagewidget.h
+++ b/src/widgets/multipagewidget.h
@@ -44,7 +44,7 @@
 #ifndef MULTIPAGEWIDGET_H
 #define MULTIPAGEWIDGET_H
 
-#include <QtGui/QGroupBox>
+#include <QGroupBox>
 
 QT_BEGIN_NAMESPACE
 class KComboBox;
diff --git a/src/widgets/multipagewidget.cpp b/src/widgets/multipagewidget.cpp
--- a/src/widgets/multipagewidget.cpp
+++ b/src/widgets/multipagewidget.cpp
@@ -48,9 +48,9 @@
 
 #include "multipagewidget.h"
 
-#include <QtGui/QLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QStackedWidget>
+#include <QLayout>
+#include <QLabel>
+#include <QStackedWidget>
 
 #include <KComboBox>
 
@@ -147,5 +147,3 @@
         currentWidget->setWindowTitle(newTitle);
     emit pageTitleChanged(newTitle);
 }
-
-#include "multipagewidget.moc"
diff --git a/src/widgets/palettedelegateeditors.h b/src/widgets/palettedelegateeditors.h
--- a/src/widgets/palettedelegateeditors.h
+++ b/src/widgets/palettedelegateeditors.h
@@ -20,7 +20,7 @@
 #ifndef PALETTE_DELEGATE_EDITORS_H
 #define PALETTE_DELEGATE_EDITORS_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class KColorButton;
 class KLineEdit;
diff --git a/src/widgets/palettedelegateeditors.cpp b/src/widgets/palettedelegateeditors.cpp
--- a/src/widgets/palettedelegateeditors.cpp
+++ b/src/widgets/palettedelegateeditors.cpp
@@ -19,7 +19,7 @@
 
 #include "palettedelegateeditors.h"
 
-#include <QtGui/QLayout>
+#include <QLayout>
 
 #include <KColorButton>
 #include <KLineEdit>
diff --git a/src/widgets/palettedescriptionwidget.h b/src/widgets/palettedescriptionwidget.h
--- a/src/widgets/palettedescriptionwidget.h
+++ b/src/widgets/palettedescriptionwidget.h
@@ -17,10 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef _PALETTE_DESCRIPTION_WIDGET_H_
-#define _PALETTE_DESCRIPTION_WIDGET_H_
+#ifndef PALETTE_DESCRIPTION_WIDGET_H
+#define PALETTE_DESCRIPTION_WIDGET_H
 
-#include <QtGui/QFrame>
+#include <QFrame>
 
 class QResizeEvent;
 class QMouseEvent;
@@ -46,17 +46,18 @@
 
     bool eventFilter( QObject* watched, QEvent* event );
 
+private slots:
+    void saveClicked();
+    void cancelClicked();
+
 private:
     void updateButtons();
     void resizeEvent( QResizeEvent* );
     void mousePressEvent( QMouseEvent* e );
     void hideEvent( QHideEvent* e );
 
     class Private;
     Private* const d;
-
-    Q_PRIVATE_SLOT( d, void _k_saveClicked() )
-    Q_PRIVATE_SLOT( d, void _k_cancelClicked() )
 };
 
 #endif
diff --git a/src/widgets/palettedescriptionwidget.cpp b/src/widgets/palettedescriptionwidget.cpp
--- a/src/widgets/palettedescriptionwidget.cpp
+++ b/src/widgets/palettedescriptionwidget.cpp
@@ -19,26 +19,24 @@
 
 #include "palettedescriptionwidget.h"
 
-#include <QtGui/QLayout>
-#include <QtGui/QToolButton>
-#include <QtCore/QEventLoop>
-#include <QtCore/QPointer>
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QFont>
-
-#include <KIcon>
+#include <QLayout>
+#include <QToolButton>
+#include <QEventLoop>
+#include <QPointer>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QMouseEvent>
+#include <QFont>
+
 #include <KDialog>
 #include <KLocale>
-//#include <KDebug>
 #include <KTextEdit>
 
 class PaletteDescriptionWidget::Private
 {
 public:
     Private( PaletteDescriptionWidget* parent )
-        : eventLoop( 0 ),
+        : eventLoop( nullptr ),
           q( parent ) {
     }
 
@@ -123,8 +121,8 @@
     d->buttonCancel->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
     d->buttonSave->setAutoRaise( true );
     d->buttonCancel->setAutoRaise( true );
-    d->buttonSave->setIcon( KIcon( "document-save" ) );
-    d->buttonCancel->setIcon( KIcon( "edit-delete" ) );
+    d->buttonSave->setIcon(QIcon::fromTheme("document-save"));
+    d->buttonCancel->setIcon(QIcon::fromTheme("edit-delete"));
     d->buttonSave->setText( i18nc( "@action:button", "Save" ) );
     d->buttonCancel->setText( i18nc( "@action:button", "Cancel" ) );
 
@@ -172,7 +170,7 @@
     QPointer<QObject> guard = this;
     (void) eventLoop.exec();
     if ( !guard.isNull() )
-        d->eventLoop = 0;
+        d->eventLoop = nullptr;
     return d->success;
 }
 
@@ -238,4 +236,12 @@
     return QFrame::eventFilter( watched, event );
 }
 
-#include "palettedescriptionwidget.moc"
+void PaletteDescriptionWidget::saveClicked()
+{
+    d->_k_saveClicked();
+}
+
+void PaletteDescriptionWidget::cancelClicked()
+{
+    d->_k_cancelClicked();
+}