diff --git a/kgreeter/kcm/kgreeterconfig.cpp b/kgreeter/kcm/kgreeterconfig.cpp
index b3dc6531..d79777e2 100644
--- a/kgreeter/kcm/kgreeterconfig.cpp
+++ b/kgreeter/kcm/kgreeterconfig.cpp
@@ -60,10 +60,11 @@ KCMGreeter::KCMGreeter(QWidget* parent, const QVariantList& args)
     stylesbox->addItems(QStyleFactory::keys());
     connect(stylesbox, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotStyleChanged(QString)));
 
-    // TODO: load name from General/Name
     const QStringList kcolorschemes = KGlobal::dirs()->findAllResources("data", "color-schemes/*.colors", KStandardDirs::NoDuplicates);
     foreach (const QString &kcolorscheme, kcolorschemes) {
-        colorsbox->addItem(QFileInfo(kcolorscheme).baseName());
+        const QString kcolorschemename = QSettings(kcolorscheme, QSettings::IniFormat).value("General/Name").toString();
+        const QString kcolorschemebasename = QFileInfo(kcolorscheme).baseName();
+        colorsbox->addItem(kcolorschemename, QVariant(kcolorschemebasename));
     }
     connect(colorsbox, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotColorChanged(QString)));
 
@@ -102,7 +103,7 @@ void KCMGreeter::load()
     const QString kgreetercolor = kgreetersettings.value("greeter/colorscheme").toString();
     if (!kgreetercolor.isEmpty()) {
         for (int i = 0; i < colorsbox->count(); i++) {
-            if (colorsbox->itemText(i) == kgreetercolor) {
+            if (colorsbox->itemData(i).toString() == kgreetercolor) {
                 colorsbox->setCurrentIndex(i);
                 break;
             }
@@ -123,7 +124,7 @@ void KCMGreeter::save()
     KAuth::Action kgreeteraction("org.kde.kcontrol.kcmkgreeter.save");
     kgreeteraction.setHelperID("org.kde.kcontrol.kcmkgreeter");
     kgreeteraction.addArgument("style", stylesbox->currentText());
-    kgreeteraction.addArgument("colorscheme", colorsbox->currentText());
+    kgreeteraction.addArgument("colorscheme", colorsbox->itemData(colorsbox->currentIndex()).toString());
     kgreeteraction.addArgument("background", backgroundrequester->url().path());
     kgreeteraction.addArgument("rectangle", rectanglerequester->url().path());
     KAuth::ActionReply kgreeterreply = kgreeteraction.execute();
@@ -142,9 +143,9 @@ void KCMGreeter::slotStyleChanged(const QString &style)
     emit changed(true);
 }
 
-void KCMGreeter::slotColorChanged(const QString &style)
+void KCMGreeter::slotColorChanged(const QString &color)
 {
-    Q_UNUSED(style);
+    Q_UNUSED(color);
     emit changed(true);
 }
 
diff --git a/kgreeter/kcm/kgreeterconfig.h b/kgreeter/kcm/kgreeterconfig.h
index 4c556c32..060fd90e 100644
--- a/kgreeter/kcm/kgreeterconfig.h
+++ b/kgreeter/kcm/kgreeterconfig.h
@@ -41,7 +41,7 @@ public:
 
 private Q_SLOTS:
     void slotStyleChanged(const QString &style);
-    void slotColorChanged(const QString &style);
+    void slotColorChanged(const QString &color);
     void slotURLChanged(const QString &url);
     void slotURLChanged(const KUrl &url);
 
diff --git a/kgreeter/kgreeter.cpp b/kgreeter/kgreeter.cpp
index 9b7cc7b9..c7b27b29 100644
--- a/kgreeter/kgreeter.cpp
+++ b/kgreeter/kgreeter.cpp
@@ -24,7 +24,7 @@ class KGreeter : public QMainWindow
 {
     Q_OBJECT
 public:
-    explicit KGreeter(QWidget *parent = 0);
+    explicit KGreeter(QWidget *parent = nullptr);
 
     QByteArray getUser() const;
     QByteArray getPass() const;
@@ -36,8 +36,9 @@ public:
     static void authenticationCompleteCb(LightDMGreeter *ldmgreeter, gpointer ldmptr);
     static void showMessageCb(LightDMGreeter *ldmgreeter, const gchar *ldmtext, LightDMMessageType ldmtype, gpointer ldmptr);
 
+    // QMainWindow reimplementations
 protected:
-    void paintEvent(QPaintEvent *event);
+    void paintEvent(QPaintEvent *event) final;
 
 private Q_SLOTS:
     void slotSuspend();