diff --git a/applets/batterymonitor/package/contents/ui/ConfigGeneral.qml b/applets/batterymonitor/package/contents/ui/ConfigGeneral.qml
index 369fb8a73..cb739309a 100644
--- a/applets/batterymonitor/package/contents/ui/ConfigGeneral.qml
+++ b/applets/batterymonitor/package/contents/ui/ConfigGeneral.qml
@@ -1,42 +1,41 @@
 /*
  *  Copyright 2016 Marco Martin <mart@kde.org>
  *
  *  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.0 as QtControls
-import QtQuick.Layouts 1.0 as QtLayouts
-
-import org.kde.plasma.core 2.0 as PlasmaCore
+import QtQuick.Controls 2.5
+import org.kde.kirigami 2.4 as Kirigami
 
 Item {
     id: root
 
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
+    width: pageColumn.width
+    height: pageColumn.height
 
     property alias cfg_showPercentage: showPercentage.checked
 
-    QtLayouts.ColumnLayout {
+    Kirigami.FormLayout {
         id: pageColumn
         anchors.left: parent.left
+        anchors.right: parent.right
 
-        QtControls.CheckBox {
+        CheckBox {
             id: showPercentage
             text: i18n("Show percentage")
         }
     }
 }