2 files changed, 11 insertions, 9 deletions

diff --git a/components/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml
index aef6913b..1558ba0a 100644
--- a/components/package/contents/ui/Composer.qml
+++ b/components/package/contents/ui/Composer.qml
@@ -20,6 +20,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0
 
+import org.kde.kirigami 1.0 as Kirigami
+
 import org.kube.framework.domain 1.0 as KubeFramework
 
 
@@ -54,7 +56,7 @@ Item {
 
             columns: 2
 
-            Label {
+            Kirigami.Label {
                 text: "From"
             }
 
@@ -70,7 +72,7 @@ Item {
                 }
             }
 
-            Label {
+            Kirigami.Label {
                 text: "To"
             }
 
@@ -112,7 +114,7 @@ Item {
                 }
             }
 
-            Label {
+            Kirigami.Label {
                 text: "Cc"
 
                 visible: cc.visible
@@ -132,7 +134,7 @@ Item {
                 }
             }
 
-            Label {
+            Kirigami.Label {
                 text: "Bcc"
 
                 visible: bcc.visible
@@ -209,7 +211,7 @@ Item {
 
                 model: composer.attachments
 
-                delegate: Label {
+                delegate: Kirigami.Label {
                     id: name
 
                     text: modelData
diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml
index ea410338..b3c0d4a6 100644
--- a/components/package/contents/ui/FocusComposer.qml
+++ b/components/package/contents/ui/FocusComposer.qml
@@ -19,7 +19,7 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
-import org.kube.framework.theme 1.0
+import org.kde.kirigami 1.0 as Kirigami
 
 Rectangle {
     id: root
@@ -28,7 +28,7 @@ Rectangle {
         composer.loadMessage(message, loadAsDraft);
     }
 
-    color: ColorPalette.border
+    color: Kirigami.Theme.textColor
 
     opacity: 0.9
 
@@ -46,7 +46,7 @@ Rectangle {
         height: root.height * 0.8
         width: root.width * 0.8
 
-        color: ColorPalette.background
+        color: Kirigami.Theme.backgroundColor
 
         MouseArea {
             anchors.fill: parent
@@ -56,7 +56,7 @@ Rectangle {
 
             anchors {
                 fill: parent
-                margins: Unit.size * 3
+                margins: Kirigami.Units.largeSpacing
             }
 
             Composer {