5 files changed, 19 insertions, 16 deletions

diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml
index bc8b3f2d..ab04dbed 100644
--- a/components/package/contents/ui/FocusComposer.qml
+++ b/components/package/contents/ui/FocusComposer.qml
@@ -55,7 +55,7 @@ Rectangle {
 
             anchors {
                 fill: parent
-                margins: unit.size * 3
+                margins: Unit.size * 3
             }
 
             Composer {
diff --git a/components/package/contents/ui/FolderListView.qml b/components/package/contents/ui/FolderListView.qml
index d78531a2..fafc1623 100644
--- a/components/package/contents/ui/FolderListView.qml
+++ b/components/package/contents/ui/FolderListView.qml
@@ -24,6 +24,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kube.framework.domain 1.0 as KubeFramework
+import org.kube.framework.theme 1.0
 
 Item {
     id: root
@@ -34,7 +35,7 @@ Item {
         id: searchBox
 
         width: root.width
-        height: unit.size * 10
+        height: Unit.size * 10
 
         TextField {
             anchors. centerIn: parent
@@ -68,7 +69,7 @@ Item {
         style: TreeViewStyle {
             activateItemOnSingleClick: true
             rowDelegate: Rectangle {
-                height: unit.size * 10
+                height: Unit.size * 10
                 color: "transparent"
             }
             itemDelegate: Rectangle {
@@ -81,7 +82,7 @@ Item {
                     anchors {
                         verticalCenter: parent.verticalCenter
                         left: parent.left
-                        leftMargin: unit.size * 3
+                        leftMargin: Unit.size * 3
                     }
                     source: model.icon
                 }
@@ -89,7 +90,7 @@ Item {
                     anchors {
                         verticalCenter: parent.verticalCenter
                         left: iconItem.right
-                        leftMargin: unit.size * 3
+                        leftMargin: Unit.size * 3
                     }
                     renderType: Text.NativeRendering
                     text: styleData.value
diff --git a/components/package/contents/ui/ListItem.qml b/components/package/contents/ui/ListItem.qml
index 5396645d..bea3c11b 100644
--- a/components/package/contents/ui/ListItem.qml
+++ b/components/package/contents/ui/ListItem.qml
@@ -16,13 +16,14 @@
  */
 
 import QtQuick 2.4
+import org.kube.framework.theme 1.0
 
 Item {
     id: delegateRoot
 
     readonly property bool isCurrentItem: ListView.isCurrentItem
 
-    height: unit.width * 25
+    height: Unit.width * 25
     width: parent.width
 
     MouseArea {
@@ -60,4 +61,4 @@ Item {
             opacity: 0.2
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index bf5185dc..e7fc634f 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -24,6 +24,7 @@ import QtQml 2.2
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kube.framework.domain 1.0 as KubeFramework
+import org.kube.framework.theme 1.0
 
 ScrollView {
     id: root
@@ -47,7 +48,7 @@ ScrollView {
 
         delegate: PlasmaComponents.ListItem {
             width: listView.width
-            height: unit.size * 12
+            height: Unit.size * 12
 
             enabled: true
             checked: listView.currentIndex == index
@@ -84,10 +85,10 @@ ScrollView {
                 anchors {
                     verticalCenter: parent.verticalCenter
                     left: parent.left
-                    leftMargin: unit.size * 2
+                    leftMargin: Unit.size * 2
                 }
 
-                height: unit.size * 9
+                height: Unit.size * 9
                 width: height
 
                 name: model.senderName
@@ -99,7 +100,7 @@ ScrollView {
                 anchors {
                     top: avatar.top
                     left: avatar.right
-                    leftMargin: unit.size * 3
+                    leftMargin: Unit.size * 3
                 }
 
                 text: model.senderName
@@ -114,9 +115,9 @@ ScrollView {
             //     anchors {
             //         top: avatar.top
             //         left: senderName.right
-            //         leftMargin: unit.size
+            //         leftMargin: Unit.size
             //         right: date.left
-            //         rightMargin: unit.size
+            //         rightMargin: Unit.size
             //     }
             //
             //     text: "(" + model.sender +")"
@@ -130,7 +131,7 @@ ScrollView {
                 anchors {
                     top: avatar.top
                     right: parent.right
-                    rightMargin: unit.size * 2
+                    rightMargin: Unit.size * 2
                 }
 
                 text: Qt.formatDateTime(model.date)
@@ -144,7 +145,7 @@ ScrollView {
                 anchors {
                     bottom: avatar.bottom
                     left: avatar.right
-                    leftMargin: unit.size * 3
+                    leftMargin: Unit.size * 3
                 }
 
                 text: model.subject
diff --git a/components/package/contents/ui/Settings.qml b/components/package/contents/ui/Settings.qml
index fa886f2b..bada1140 100644
--- a/components/package/contents/ui/Settings.qml
+++ b/components/package/contents/ui/Settings.qml
@@ -75,7 +75,7 @@ Rectangle {
                         anchors {
                             verticalCenter: parent.verticalCenter
                             left: parent.left
-                            // leftMargin: unit.size * 3
+                            // leftMargin: Unit.size * 3
                         }
                         source: accountFactory.icon
                     }