diff --git a/kcm/package/contents/ui/Output.qml b/kcm/package/contents/ui/Output.qml
--- a/kcm/package/contents/ui/Output.qml
+++ b/kcm/package/contents/ui/Output.qml
@@ -19,6 +19,7 @@
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.3 as Controls
 import QtGraphicalEffects 1.0
+import org.kde.kirigami 2.4 as Kirigami
 
 Rectangle {
     id: output
@@ -80,7 +81,7 @@
 
             Controls.Label {
                 Layout.fillWidth: true
-                Layout.margins: units.smallSpacing
+                Layout.margins: Kirigami.Units.smallSpacing
 
                 text: model.display
                 wrapMode: Text.Wrap
@@ -90,7 +91,7 @@
 
             Controls.Label {
                 Layout.fillWidth: true
-                Layout.bottomMargin: units.smallSpacing
+                Layout.bottomMargin: Kirigami.Units.smallSpacing
 
                 text: "(" + model.size.width + "x" + model.size.height + ")"
                 horizontalAlignment: Text.AlignHCenter
diff --git a/kcm/package/contents/ui/Screen.qml b/kcm/package/contents/ui/Screen.qml
--- a/kcm/package/contents/ui/Screen.qml
+++ b/kcm/package/contents/ui/Screen.qml
@@ -45,7 +45,7 @@
     property int xOffset: (width - totalSize.width / relativeFactor) / 2;
     property int yOffset: (height - totalSize.height / relativeFactor) / 2;
 
-    implicitHeight: Math.max(root.height * 0.4, units.gridUnit * 13)
+    implicitHeight: Math.max(root.height * 0.4, Kirigami.Units.gridUnit * 13)
 
     Component.onCompleted: background.visible = true;
 
@@ -55,7 +55,7 @@
             top: parent.top
             left: parent.left
             right: parent.right
-            margins: units.smallSpacing
+            margins: Kirigami.Units.smallSpacing
         }
         level: 4
         opacity: 0.6
@@ -68,7 +68,7 @@
         anchors {
             bottom: parent.bottom
             horizontalCenter: parent.horizontalCenter
-            margins: units.smallSpacing
+            margins: Kirigami.Units.smallSpacing
         }
         z: 90
 
diff --git a/kcm/package/contents/ui/main.qml b/kcm/package/contents/ui/main.qml
--- a/kcm/package/contents/ui/main.qml
+++ b/kcm/package/contents/ui/main.qml
@@ -24,8 +24,8 @@
 KCM.SimpleKCM {
     id: root
 
-    implicitWidth: units.gridUnit * 32
-    implicitHeight: units.gridUnit * 38
+    implicitWidth: Kirigami.Units.gridUnit * 32
+    implicitHeight: Kirigami.Units.gridUnit * 38
 
     property int selectedOutput: 0
 
@@ -113,7 +113,7 @@
             id: screen
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: Math.max(root.width * 0.8, units.gridUnit * 26)
+            Layout.preferredWidth: Math.max(root.width * 0.8, Kirigami.Units.gridUnit * 26)
             Layout.topMargin: Kirigami.Units.smallSpacing
             Layout.bottomMargin: Kirigami.Units.largeSpacing * 2