diff --git a/applets/systemmonitor/common/contents/ui/ConfigGeneral.qml b/applets/systemmonitor/common/contents/ui/ConfigGeneral.qml
index e39d59976..dafe0045c 100644
--- a/applets/systemmonitor/common/contents/ui/ConfigGeneral.qml
+++ b/applets/systemmonitor/common/contents/ui/ConfigGeneral.qml
@@ -1,153 +1,169 @@
 /*
  *  Copyright 2013 Bhushan Shah <bhush94@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  2.010-1301, USA.
  */
 
-import QtQuick 2.0
-import QtQuick.Controls 1.1 as Controls
-import QtQuick.Layouts 1.1 as Layouts
+import QtQuick 2.5
+import QtQuick.Controls 1.4 as QQC1
+import QtQuick.Controls 2.5 as QQC2
+import QtQuick.Layouts 1.3
 
+import org.kde.kirigami 2.5 as Kirigami
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 
 Item {
     id: iconsPage
     width: childrenRect.width
     height: childrenRect.height
-    implicitWidth: mainColumn.implicitWidth
-    implicitHeight: mainColumn.implicitHeight
+    implicitWidth: formLayout.implicitWidth
+    implicitHeight: formLayout.implicitHeight
 
     property var cfg_sources: []
 
     function sourcesChanged() {
         if (! cfg_sources) { cfg_sources = [] }
         if (cfg_sources.length == 0) {
-            for (var i in mainColumn.children) {
-                var child = mainColumn.children[i];
+            for (var i in dataSourcesColumn.children) {
+                var child = dataSourcesColumn.children[i];
                 if (child.checked !== undefined) {
                     child.checked = true;
                 }
             }
         } else {
-            for (var i in mainColumn.children) {
-                var child = mainColumn.children[i];
+            for (var i in dataSourcesColumn.children) {
+                var child = dataSourcesColumn.children[i];
                 if (child.checked !== undefined) {
                     child.checked = cfg_sources.indexOf(child.source) !== -1;
                 }
             }
         }
     }
 
     onCfg_sourcesChanged: {
         sourcesChanged();
     }
 
     property int cfg_updateInterval
 
     signal sourceAdded(string source)
 
     function addSource(source, friendlyName) {
         var found = false;
         for (var i = 0; i < sourcesModel.count; ++i) {
             var obj = sourcesModel.get(i);
             if (obj.source === source) {
                 found = true;
                 break;
             }
         }
         if (found) {
             return;
         }
 
         sourcesModel.append(
                 {"source": encodeURIComponent(source),
                  "friendlyName": friendlyName});
     }
 
     PlasmaCore.DataSource {
         id: smSource
 
         engine: "systemmonitor"
 
         onSourceAdded: {
             iconsPage.sourceAdded(source);
         }
         onSourceRemoved: {
             for (var i = sourcesModel.count - 1; i >= 0; --i) {
                 var obj = sourcesModel.get(i);
                 if (obj.source === source) {
                     sourcesModel.remove(i);
                 }
             }
         }
     }
 
     Component.onCompleted: {
         for (var i in smSource.sources) {
             var source = smSource.sources[i];
             iconsPage.sourceAdded(source);
         }
         sourcesChanged();
     }
 
     ListModel {
         id: sourcesModel
     }
 
-    Layouts.ColumnLayout {
-        id: mainColumn
+    Kirigami.FormLayout {
+        id: formLayout
+
         anchors.left: parent.left
+        anchors.right: parent.right
+
+        // QQC2 SpinBox doesn't cleanly support non-integer values, which can be
+        // worked around, but the code is messy and the user experience is
+        // somewhat poor. So for now, we stick with the QQC1 SpinBox
+        QQC1.SpinBox {
+            id: updateIntervalSpinBox
+
+            Kirigami.FormData.label: i18n("Update interval:")
+            decimals: 1
+            suffix: i18ncp("Suffix for spinbox (seconds)", " second", 
+            " seconds")
+            maximumValue: 1000
+            stepSize: 0.1
+            onValueChanged: cfg_updateInterval = value * 1000
+            Component.onCompleted: value = cfg_updateInterval / 1000
+        }
 
-        Layouts.RowLayout {
-            Controls.Label {
-                text: i18n("Update Interval:")
-            }
 
-            Controls.SpinBox {
-                id: updateIntervalSpinBox
-                decimals: 2
-                suffix: i18nc("Suffix for spinbox (seconds)", " sec")
-                maximumValue: 1000
-                stepSize: 0.5
-                onValueChanged: cfg_updateInterval = value * 1000
-                Component.onCompleted: value = cfg_updateInterval / 1000
-            }
+        Item {
+            Kirigami.FormData.isSection: true
         }
 
-        Repeater {
-            id: repeater
-            model: sourcesModel
-            Controls.CheckBox {
-                id: checkBox
-                text: model.friendlyName
-                property string source: model.source
-                onCheckedChanged: {
-                    if (checked) {
-                        if (cfg_sources.indexOf(model.source) == -1) {
-                            cfg_sources.push(model.source);
-                        }
-                    } else {
-                        var idx = cfg_sources.indexOf(model.source);
-                        if (idx !== -1) {
-                            cfg_sources.splice(idx, 1);
+
+        ColumnLayout {
+            id: dataSourcesColumn
+            Kirigami.FormData.label: i18n("Show:")
+            Kirigami.FormData.buddyFor: children[1] // 0 is the Repeater
+
+            Repeater {
+                id: repeater
+                model: sourcesModel
+                QQC2.CheckBox {
+                    id: checkBox
+                    text: model.friendlyName
+                    property string source: model.source
+                    onCheckedChanged: {
+                        if (checked) {
+                            if (cfg_sources.indexOf(model.source) == -1) {
+                                cfg_sources.push(model.source);
+                            }
+                        } else {
+                            var idx = cfg_sources.indexOf(model.source);
+                            if (idx !== -1) {
+                                cfg_sources.splice(idx, 1);
+                            }
                         }
+                        cfg_sourcesChanged();
                     }
-                    cfg_sourcesChanged();
                 }
             }
         }
     }
 }