diff --git a/kcms/qtquicksettings/kcmqtquicksettings.cpp b/kcms/qtquicksettings/kcmqtquicksettings.cpp
index 1b8766ba1..5f09234da 100644
--- a/kcms/qtquicksettings/kcmqtquicksettings.cpp
+++ b/kcms/qtquicksettings/kcmqtquicksettings.cpp
@@ -1,85 +1,52 @@
 /*  This file is part of the KDE's Plasma desktop
  *  Copyright 2017 David Edmundson <davidedmundson@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 as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  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 "kcmqtquicksettings.h"
 
 #include <KPluginFactory>
 #include <KAboutData>
 #include <QDebug>
 
 #include "ui_kcmqtquicksettingswidget.h"
 #include "renderersettings.h"
 
 K_PLUGIN_FACTORY(KCMQtQuickSettingsFactory, registerPlugin<KCMQtQuickSettingsModule>();)
 
 KCMQtQuickSettingsModule::KCMQtQuickSettingsModule(QWidget *parent, const QVariantList &args)
     : KCModule(parent, args),
       m_ui(new Ui::KCMQtQuickSettingsWidget),
       m_settings(new PlasmaQtQuickSettings::RendererSettings(KSharedConfig::openConfig(QStringLiteral("kdeglobals"))))
 {
     KAboutData *about = new KAboutData(QStringLiteral("Plasma QtQuick Settings"),
                                        i18n("Plasma QtQuick Settings"),
                                        QString(),
                                        i18n("Configure Plasma QtQuick Settings"),
                                        KAboutLicense::GPL);
     about->addAuthor(i18n("David Edmundson"), i18n("Maintainer"), QStringLiteral("davidedmundson@kde.org"));
     setAboutData(about);
 
     m_ui->setupUi(this);
-    m_ui->backendCombo->addItem(i18n("Automatic"), QVariant(QStringLiteral()));//so data matches empty config
-    m_ui->backendCombo->addItem(i18n("Open GL"), QVariant(QStringLiteral("opengl")));
-    m_ui->backendCombo->addItem(i18n("Software"), QVariant(QStringLiteral("software")));
-
-    m_ui->renderLoopCombo->addItem(i18n("Automatic"), QVariant(QStringLiteral()));
-    m_ui->renderLoopCombo->addItem(i18n("Basic"), QVariant(QStringLiteral("basic")));
-    m_ui->renderLoopCombo->addItem(i18n("Threaded"), QVariant(QStringLiteral("threaded")));
-
-    connect(m_ui->backendCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, static_cast<void (KCMQtQuickSettingsModule::*)()>(&KCMQtQuickSettingsModule::changed));
-    connect(m_ui->renderLoopCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, static_cast<void (KCMQtQuickSettingsModule::*)()>(&KCMQtQuickSettingsModule::changed));
-
-    connect(m_ui->glCoreProfileCheckbox, &QCheckBox::stateChanged, this, static_cast<void (KCMQtQuickSettingsModule::*)()>(&KCMQtQuickSettingsModule::changed));
+    addConfig(m_settings.get(), this);
 }
 
 KCMQtQuickSettingsModule::~KCMQtQuickSettingsModule()
 {
 }
 
-void KCMQtQuickSettingsModule::load()
-{
-    m_ui->backendCombo->setCurrentIndex(m_ui->backendCombo->findData(m_settings->sceneGraphBackend()));
-    m_ui->renderLoopCombo->setCurrentIndex(m_ui->renderLoopCombo->findData(m_settings->renderLoop()));
-    m_ui->glCoreProfileCheckbox->setChecked(m_settings->forceGlCoreProfile());
-}
-
-void KCMQtQuickSettingsModule::save()
-{
-    m_settings->setSceneGraphBackend(m_ui->backendCombo->currentData().toString());
-    m_settings->setRenderLoop(m_ui->renderLoopCombo->currentData().toString());
-    m_settings->setForceGlCoreProfile(m_ui->glCoreProfileCheckbox->isChecked());
-    m_settings->save();
-}
-
-void KCMQtQuickSettingsModule::defaults()
-{
-    m_ui->backendCombo->setCurrentIndex(0);
-    m_ui->renderLoopCombo->setCurrentIndex(0);
-    m_ui->glCoreProfileCheckbox->setChecked(false);
-}
-
 #include "kcmqtquicksettings.moc"
diff --git a/kcms/qtquicksettings/kcmqtquicksettings.h b/kcms/qtquicksettings/kcmqtquicksettings.h
index 5a4d31160..69160caa5 100644
--- a/kcms/qtquicksettings/kcmqtquicksettings.h
+++ b/kcms/qtquicksettings/kcmqtquicksettings.h
@@ -1,55 +1,51 @@
 /*  This file is part of the KDE's Plasma desktop
  *  Copyright 2017 David Edmundson <davidedmundson@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 as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  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.
  */
 
 #pragma once
 
 #include <KCModule>
 #include <KSharedConfig>
 #include <KConfigGroup>
 
 namespace Ui
 {
 class KCMQtQuickSettingsWidget;
 }
 
 namespace PlasmaQtQuickSettings
 {
 class RendererSettings;
 }
 
 /**
  * @short A KCM to configure Plasma QtQuick settings
  */
 class KCMQtQuickSettingsModule : public KCModule
 {
     Q_OBJECT
 
 public:
     explicit KCMQtQuickSettingsModule(QWidget *parent, const QVariantList &);
     ~KCMQtQuickSettingsModule() override;
 
-    void load() override;
-    void save() override;
-    void defaults() override;
-
 private:
     QScopedPointer<Ui::KCMQtQuickSettingsWidget> m_ui;
     QScopedPointer<PlasmaQtQuickSettings::RendererSettings> m_settings;
 };
 
diff --git a/kcms/qtquicksettings/kcmqtquicksettingswidget.ui b/kcms/qtquicksettings/kcmqtquicksettingswidget.ui
index df67ae742..cf0264abd 100644
--- a/kcms/qtquicksettings/kcmqtquicksettingswidget.ui
+++ b/kcms/qtquicksettings/kcmqtquicksettingswidget.ui
@@ -1,95 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KCMQtQuickSettingsWidget</class>
  <widget class="QWidget" name="KCMQtQuickSettingsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>687</width>
     <height>333</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="KMessageWidget" name="kmessagewidget">
      <property name="text">
       <string>These settings adjust the QtQuick settings used by Plasma. Only adjust if you know what you are doing.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
      <property name="messageType">
       <enum>KMessageWidget::Information</enum>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Rendering Backend:</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QComboBox" name="backendCombo"/>
+      <widget class="QComboBox" name="kcfg_SceneGraphBackend">
+       <item>
+        <property name="text">
+         <string>Automatic</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Open GL</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Software</string>
+        </property>
+       </item>
+      </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>GL Core Profile:</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Render Loop:</string>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QComboBox" name="renderLoopCombo"/>
+      <widget class="QComboBox" name="kcfg_RenderLoop">
+       <item>
+        <property name="text">
+         <string>Automatic</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Basic</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Threaded</string>
+        </property>
+       </item>
+      </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QCheckBox" name="glCoreProfileCheckbox">
+      <widget class="QCheckBox" name="kcfg_ForceGlCoreProfile">
        <property name="text">
         <string>Force</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>143</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
    <header>kmessagewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/kcms/qtquicksettings/renderer.kcfg b/kcms/qtquicksettings/renderer.kcfg
index c3179611c..faedb0c30 100644
--- a/kcms/qtquicksettings/renderer.kcfg
+++ b/kcms/qtquicksettings/renderer.kcfg
@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
     <kcfgfile arg="true" />
     <group name="QtQuickRendererSettings">
-        <entry name="RenderLoop" type="String">
-            <default></default>
+        <entry name="RenderLoop" type="Enum">
+            <choices name="RenderLoopType">
+                <choice name="automaticloop" />
+                <choice name="basic" />
+                <choice name="threaded" />
+            </choices>
+            <default>automaticloop</default>
         </entry>
-        <entry name="SceneGraphBackend" type="String">
-            <default></default>
+        <entry name="SceneGraphBackend" type="Enum">
+            <choices name="SceneGraphBackendType">
+                <choice name="automaticbackend" />
+                <choice name="opengl" />
+                <choice name="software" />
+            </choices>
+            <default>automaticbackend</default>
         </entry>
         <entry name="ForceGlCoreProfile" type="Bool">
             <default>false</default>
         </entry>
     </group>
 </kcfg>