5 files changed, 12 insertions, 17 deletions

diff --git a/framework/qml/ConversationView.qml b/framework/qml/ConversationView.qml
index 5fed1810..453ee3a0 100644
--- a/framework/qml/ConversationView.qml
+++ b/framework/qml/ConversationView.qml
@@ -20,7 +20,6 @@ import QtQuick 2.7
 import QtQuick.Controls 1.3 as Controls1
 import QtQuick.Controls 2
 import QtQuick.Layouts 1.1
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 import QtQml 2.2 as QtQml
diff --git a/framework/qml/EditAccountDialog.qml b/framework/qml/EditAccountDialog.qml
index ab256839..70b999c0 100644
--- a/framework/qml/EditAccountDialog.qml
+++ b/framework/qml/EditAccountDialog.qml
@@ -19,7 +19,6 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 
diff --git a/framework/qml/NotificationPopup.qml b/framework/qml/NotificationPopup.qml
index 2d04575b..e5865881 100644
--- a/framework/qml/NotificationPopup.qml
+++ b/framework/qml/NotificationPopup.qml
@@ -1,7 +1,6 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.0
 
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 
@@ -38,8 +37,8 @@ MouseArea {
         onTriggered: popup.hide()
     }
 
-    width: Math.max(300, message.contentWidth + (Kirigami.Units.largeSpacing * 2))
-    height: Math.max(50, message.contentHeight + (Kirigami.Units.largeSpacing * 2))
+    width: Math.max(300, message.contentWidth + (Kube.Units.largeSpacing * 2))
+    height: Math.max(50, message.contentHeight + (Kube.Units.largeSpacing * 2))
 
     visible: opacity > 0
     opacity: 0.0
@@ -66,9 +65,9 @@ MouseArea {
         anchors {
             verticalCenter: popup.verticalCenter
             left: parent.left
-            leftMargin: Kirigami.Units.largeSpacing
+            leftMargin: Kube.Units.largeSpacing
             right: parent.right
-            rightMargin: Kirigami.Units.largeSpacing
+            rightMargin: Kube.Units.largeSpacing
         }
 
         font.pixelSize: 16
diff --git a/framework/qml/Outbox.qml b/framework/qml/Outbox.qml
index 46368294..0be1768a 100644
--- a/framework/qml/Outbox.qml
+++ b/framework/qml/Outbox.qml
@@ -21,7 +21,6 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0
 import QtQuick.Controls 1.3 as Controls
 
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 
@@ -63,8 +62,8 @@ Controls.ToolButton {
     Kube.Popup {
         id: dialog
 
-        height: content.height + Kirigami.Units.smallSpacing * 2
-        width: content.width + Kirigami.Units.smallSpacing * 2
+        height: content.height + Kube.Units.smallSpacing * 2
+        width: content.width + Kube.Units.smallSpacing * 2
 
         y: - dialog.height + root.height
         x: root.width
@@ -74,21 +73,21 @@ Controls.ToolButton {
 
             anchors.centerIn: parent
 
-            width: Kirigami.Units.gridUnit * 17
-            height: listView.count * Kirigami.Units.gridUnit * 3 + sendNowButton.height + Kirigami.Units.smallSpacing
+            width: Kube.Units.gridUnit * 17
+            height: listView.count * Kube.Units.gridUnit * 3 + sendNowButton.height + Kube.Units.smallSpacing
 
             ListView {
                 id: listView
 
                 width: parent.width
-                height: count * Kirigami.Units.gridUnit * 3
+                height: count * Kube.Units.gridUnit * 3
 
                 model: outboxModel
 
                 delegate: Rectangle {
                     id: delegateRoot
 
-                    height: Kirigami.Units.gridUnit * 3
+                    height: Kube.Units.gridUnit * 3
                     width: listView.width
 
                     color: Kube.Colors.viewBackgroundColor
@@ -100,7 +99,7 @@ Controls.ToolButton {
                         anchors {
                             verticalCenter: parent.verticalCenter
                             left: parent.left
-                            leftMargin: Kirigami.Units.largeSpacing
+                            leftMargin: Kube.Units.largeSpacing
                         }
                         text: model.subject
 
@@ -155,7 +154,7 @@ Controls.ToolButton {
 
                 anchors {
                     top: listView.bottom
-                    topMargin: Kirigami.Units.smallSpacing
+                    topMargin: Kube.Units.smallSpacing
                     horizontalCenter: parent.horizontalCenter
                 }
 
diff --git a/framework/qml/OverlayDialog.qml b/framework/qml/OverlayDialog.qml
index 5bf35653..4334754f 100644
--- a/framework/qml/OverlayDialog.qml
+++ b/framework/qml/OverlayDialog.qml
@@ -20,7 +20,6 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube