Merge lp:~aacid/unity8/scope_settings_keyboard_scroll into lp:unity8

[Albert Astals Cid]

Make the scope settings list scroll to text visible area

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2005
http://jenkins.qa.ubuntu.com/job/unity8-ci/6487/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4700
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1095
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/726
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/727
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4697
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4697/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24334
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/869
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/869/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24335

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6487/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

We talked a while on IRC about some nitpicks I had with the code you moved. But you disagreed and it's code you are merely moving, so I won't press the issue.

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 Yup, works great.

 * Did CI run pass? If not, please explain why.
 No, for unrelated reasons.

 * Did you make sure that the branch does not contain spurious tags?
 Yes

review: Approve

[lp:~aacid/unity8/scope_settings_keyboard_scroll]

2006. By Albert Astals Cid on 2015-10-26

Merge wide-preview-zoomable-videoplayback

2007. By Albert Astals Cid on 2015-10-26

Move to 2.4

2008. By Albert Astals Cid on 2015-10-27

Merge wide-preview-zoomable-videoplayback

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2015-10-21 11:51:11 +0000
+++ debian/control	2015-10-26 15:26:58 +0000
@@ -50,7 +50,11 @@
                qtdeclarative5-private-dev (>= 5.2.1),
                qtdeclarative5-qtmultimedia-plugin,
                qtdeclarative5-ubuntu-settings-components (>= 0.6),
+<<<<<<< TREE
                qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
+=======
+               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
+>>>>>>> MERGE-SOURCE
                qtdeclarative5-ubuntu-web-plugin,
                ttf-ubuntu-font-family,
 Standards-Version: 3.9.4

=== modified file 'plugins/Dash/CardAttributes.qml'
--- plugins/Dash/CardAttributes.qml	2015-02-12 16:28:36 +0000
+++ plugins/Dash/CardAttributes.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 GridLayout {
     id: grid
@@ -27,7 +27,7 @@
     columns: 2 + repeater.count % 2
     rowSpacing: units.gu(.5)
     property alias model: repeater.model
-    property color color: Theme.palette.normal.baseText
+    property color color: theme.palette.normal.baseText
     property real fontScale: 1.0
 
     Repeater {

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2015-08-31 13:29:42 +0000
+++ plugins/Dash/CardCreator.js	2015-10-26 15:26:58 +0000
@@ -28,11 +28,12 @@
                                 sourceComponent: UbuntuShape { \n\
                                     objectName: "background"; \n\
                                     radius: "medium"; \n\
-                                    color: getColor(0) || "white"; \n\
-                                    gradientColor: getColor(1) || color; \n\
+                                    backgroundColor: getColor(0) || "white"; \n\
+                                    secondaryBackgroundColor: getColor(1) || backgroundColor; \n\
+                                    backgroundMode: UbuntuShape.VerticalGradient; \n\
                                     anchors.fill: parent; \n\
-                                    image: backgroundImage.source ? backgroundImage : null; \n\
-                                    property real luminance: Style.luminance(color); \n\
+                                    source: backgroundImage.source ? backgroundImage : null; \n\
+                                    property real luminance: Style.luminance(backgroundColor); \n\
                                     property Image backgroundImage: Image { \n\
                                         objectName: "backgroundImage"; \n\
                                         source: { \n\
@@ -52,7 +53,7 @@
 // %1 is used as anchors of artShapeHolder
 // %2 is used as image width
 // %3 is used as image height
-var kArtShapeHolderCode = 'Item  { \n\
+var kArtShapeHolderCode = 'Item { \n\
                             id: artShapeHolder; \n\
                             height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\
                             width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width; \n\
@@ -66,10 +67,9 @@
                                 sourceComponent: Item { \n\
                                     id: artShape; \n\
                                     objectName: "artShape"; \n\
-                                    property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\
+                                    readonly property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\
                                     visible: image.status == Image.Ready; \n\
                                     readonly property alias image: artImage; \n\
-                                    property alias borderSource: artShapeShape.borderSource; \n\
                                     ShaderEffectSource { \n\
                                         id: artShapeSource; \n\
                                         sourceItem: artImage; \n\
@@ -78,16 +78,17 @@
                                         height: 1; \n\
                                         hideSource: doShapeItem; \n\
                                     } \n\
-                                    Shape { \n\
+                                    UbuntuShape { \n\
                                         id: artShapeShape; \n\
-                                        image: artShapeSource; \n\
+                                        source: artShapeSource; \n\
                                         anchors.fill: parent; \n\
                                         visible: doShapeItem; \n\
                                         radius: "medium"; \n\
+                                        aspect: root.artShapeStyle === "inset" ? UbuntuShape.Inset : UbuntuShape.Flat; \n\
                                     } \n\
                                     readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1; \n\
                                     readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1; \n\
-                                    Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; } \n\
+                                    Component.onCompleted: { updateWidthHeightBindings(); } \n\
                                     Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\
                                     function updateWidthHeightBindings() { \n\
                                         if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\
@@ -112,44 +113,18 @@
 
 var kOverlayLoaderCode = 'Loader { \n\
                             id: overlayLoader; \n\
-                            anchors { \n\
-                                left: artShapeHolder.left; \n\
-                                right: artShapeHolder.right; \n\
-                                bottom: artShapeHolder.bottom; \n\
-                            } \n\
+                            readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
+                            anchors.fill: artShapeHolder; \n\
                             active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
                             asynchronous: root.asynchronous; \n\
                             visible: showHeader && status == Loader.Ready; \n\
-                            sourceComponent: ShaderEffect { \n\
+                            sourceComponent: UbuntuShapeOverlay { \n\
                                 id: overlay; \n\
-                                height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
                                 property real luminance: Style.luminance(overlayColor); \n\
-                                property color overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
-                                property var source: ShaderEffectSource { \n\
-                                    id: shaderSource; \n\
-                                    sourceItem: artShapeLoader.item; \n\
-                                    onVisibleChanged: if (visible) scheduleUpdate(); \n\
-                                    live: false; \n\
-                                    sourceRect: Qt.rect(0, artShapeLoader.height - overlay.height, artShapeLoader.width, overlay.height); \n\
-                                } \n\
-                                vertexShader: " \n\
-                                    uniform highp mat4 qt_Matrix; \n\
-                                    attribute highp vec4 qt_Vertex; \n\
-                                    attribute highp vec2 qt_MultiTexCoord0; \n\
-                                    varying highp vec2 coord; \n\
-                                    void main() { \n\
-                                        coord = qt_MultiTexCoord0; \n\
-                                        gl_Position = qt_Matrix * qt_Vertex; \n\
-                                    }"; \n\
-                                fragmentShader: " \n\
-                                    varying highp vec2 coord; \n\
-                                    uniform sampler2D source; \n\
-                                    uniform lowp float qt_Opacity; \n\
-                                    uniform highp vec4 overlayColor; \n\
-                                    void main() { \n\
-                                        lowp vec4 tex = texture2D(source, coord); \n\
-                                        gl_FragColor = vec4(overlayColor.r, overlayColor.g, overlayColor.b, 1) * qt_Opacity * overlayColor.a * tex.a; \n\
-                                    }"; \n\
+                                aspect: UbuntuShape.Flat; \n\
+                                radius: "medium"; \n\
+                                overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
+                                overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\
                             } \n\
                         }\n';
 
@@ -325,7 +300,7 @@
                 id: root; \n\
                 property var components; \n\
                 property var cardData; \n\
-                property var artShapeBorderSource: undefined; \n\
+                property string artShapeStyle: "inset"; \n\
                 property real fontScale: 1.0; \n\
                 property var scopeStyle: null; \n\
                 property int titleAlignment: Text.AlignLeft; \n\
@@ -368,7 +343,6 @@
     }
 
     if (hasArt) {
-        code += 'onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } \n';
         code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
 
         var widthCode, heightCode;
@@ -480,20 +454,20 @@
         }
     }
 
-    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
+    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
 
     var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
     var titleSubtitleCode = '';
     if (hasTitle) {
         var titleColor;
         if (headerAsOverlay) {
-            titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
+            titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
         } else if (hasSummary) {
             titleColor = 'summary.color';
         } else if (hasBackground) {
             titleColor = summaryColorWithBackground;
         } else {
-            titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
+            titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
         }
 
         var titleAnchors;
@@ -555,7 +529,7 @@
                 titleAnchors += 'left: parent.left; \n\
                                  leftMargin: units.gu(1); \n\
                                  top: overlayLoader.top; \n\
-                                 topMargin: units.gu(1);\n';
+                                 topMargin: units.gu(1) + overlayLoader.height - overlayLoader.overlayHeight; \n';
             } else {
                 // Using anchors to the mascot/parent
                 titleAnchors = titleRightAnchor;
@@ -649,7 +623,7 @@
         if (hasBackground) {
             summaryColor = summaryColorWithBackground;
         } else {
-            summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
+            summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
         }
 
         var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
@@ -698,7 +672,7 @@
 
 function createCardComponent(parent, template, components) {
     var imports = 'import QtQuick 2.2; \n\
-                   import Ubuntu.Components 1.1; \n\
+                   import Ubuntu.Components 1.3; \n\
                    import Ubuntu.Settings.Components 0.1; \n\
                    import Dash 0.1;\n\
                    import Utils 0.1;\n';

=== modified file 'plugins/Dash/ScopeStyle.qml'
--- plugins/Dash/ScopeStyle.qml	2014-11-20 11:44:44 +0000
+++ plugins/Dash/ScopeStyle.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import Utils 0.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 /*! \brief Helper for processing scope customization options.
 

=== modified file 'qml/Components/Background.qml'
--- qml/Components/Background.qml	2014-08-29 08:47:21 +0000
+++ qml/Components/Background.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1 as Utils
 
 Loader {

=== modified file 'qml/Components/BaseCarouselDelegate.qml'
--- qml/Components/BaseCarouselDelegate.qml	2014-07-08 17:49:18 +0000
+++ qml/Components/BaseCarouselDelegate.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*!
  \brief Base delegate for use with the Carousel component

=== modified file 'qml/Components/Carousel.qml'
--- qml/Components/Carousel.qml	2015-08-28 12:39:43 +0000
+++ qml/Components/Carousel.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "carousel.js" as CarouselJS
 
 /*! The Carousel component presents the items of a model in a carousel view. It's similar to a

=== modified file 'qml/Components/DelayedLockscreen.qml'
--- qml/Components/DelayedLockscreen.qml	2015-02-12 14:48:06 +0000
+++ qml/Components/DelayedLockscreen.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2015-10-09 12:36:14 +0000
+++ qml/Components/Dialogs.qml	2015-10-26 15:26:58 +0000
@@ -18,9 +18,12 @@
 
 import Unity.Application 0.1
 import Unity.Session 0.1
-import Ubuntu.Components 1.1
 import GlobalShortcut 1.0
+<<<<<<< TREE
 import Unity.Platform 1.0
+=======
+import Ubuntu.Components 1.3
+>>>>>>> MERGE-SOURCE
 import "../Greeter"
 
 Item {

=== modified file 'qml/Components/DragHandle.qml'
--- qml/Components/DragHandle.qml	2015-04-10 21:16:37 +0000
+++ qml/Components/DragHandle.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 /*

=== modified file 'qml/Components/DraggingArea.qml'
--- qml/Components/DraggingArea.qml	2014-07-11 09:22:59 +0000
+++ qml/Components/DraggingArea.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 MouseArea {
     id: draggingArea

=== modified file 'qml/Components/EdgeDragEvaluator.qml'
--- qml/Components/EdgeDragEvaluator.qml	2015-04-27 15:30:18 +0000
+++ qml/Components/EdgeDragEvaluator.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 /*

=== modified file 'qml/Components/Header.qml'
--- qml/Components/Header.qml	2014-08-01 16:13:53 +0000
+++ qml/Components/Header.qml	2015-10-26 15:26:58 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.Ambiance 1.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes.Ambiance 1.3
 
 PageHeadStyle {
     id: root

=== modified file 'qml/Components/InputMethod.qml'
--- qml/Components/InputMethod.qml	2015-08-06 12:47:28 +0000
+++ qml/Components/InputMethod.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Unity.Application 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 Item {

=== modified file 'qml/Components/LazyImage.qml'
--- qml/Components/LazyImage.qml	2014-09-29 20:55:54 +0000
+++ qml/Components/LazyImage.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root
@@ -31,13 +31,12 @@
     property real initialHeight: scaleTo == "height" || scaleTo == "fit" ? height : units.gu(10)
 
     property alias sourceSize: image.sourceSize
-    property alias fillMode: image.fillMode
     property alias asynchronous: image.asynchronous
     property alias cache: image.cache
-    property alias horizontalAlignment: image.horizontalAlignment
-    property alias verticalAlignment: image.verticalAlignment
     property alias sourceImage: image
-    property alias borderSource: shape.borderSource
+
+    property bool useUbuntuShape: true
+    property bool pressed: false
 
     state: "default"
 
@@ -53,7 +52,7 @@
     UbuntuShape {
         id: placeholder
         objectName: "placeholder"
-        color: "#22FFFFFF"
+        backgroundColor: "#22FFFFFF"
         anchors.fill: shape
         visible: opacity != 0
 
@@ -78,28 +77,37 @@
         }
     }
 
-    UbuntuShape {
+    Loader {
         id: shape
         objectName: "shape"
         height: root.initialHeight
         width: root.initialWidth
         anchors.centerIn: root.scaleTo == "fit" ? parent : undefined
-
+        active: useUbuntuShape
         opacity: 0
         visible: opacity != 0
+        sourceComponent: UbuntuShapeOverlay {
+            property bool pressed: false
+            overlayColor: Qt.rgba(0, 0, 0, pressed ? 0.1 : 0)
+            overlayRect: Qt.rect(0.0, 0.0, 1.0, 1.0)
+        }
+        onLoaded: {
+            item.source = image;
+            item.pressed = Qt.binding(function() { return root.pressed; });
+        }
 
-        image: Image {
+        Image {
             id: image
             objectName: "image"
 
             property url nextSource
             property string format: image.implicitWidth > image.implicitHeight ? "landscape" : "portrait"
 
+            anchors.fill: parent
+            visible: !useUbuntuShape
             fillMode: Image.PreserveAspectFit
             asynchronous: true
             cache: false
-            horizontalAlignment: Image.AlignHCenter
-            verticalAlignment: Image.AlignVCenter
             sourceSize.width: root.scaleTo == "width" ? root.width
                                 : root.scaleTo == "fit" && root.width <= root.height ? root.width
                                 : 0

=== modified file 'qml/Components/ListItems/Header.qml'
--- qml/Components/ListItems/Header.qml	2014-07-16 16:30:15 +0000
+++ qml/Components/ListItems/Header.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     property alias text: label.text

=== added file 'qml/Components/ListViewOSKScroller.qml'
--- qml/Components/ListViewOSKScroller.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/ListViewOSKScroller.qml	2015-10-26 15:26:58 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import "../Components"
+
+Item {
+    id: root
+
+    property ListView list
+
+    Binding {
+        target: list
+        property: "bottomMargin"
+        value: d.bottomMargin
+    }
+
+    function setMakeSureVisibleItem(item) {
+        d.previousVisibleHeight = d.visibleHeight;
+        d.makeSureVisibleItem = item;
+    }
+
+    QtObject {
+        id: d
+        property var makeSureVisibleItem
+        property real previousVisibleHeight: 0
+        readonly property real visibleHeight: list.height - list.bottomMargin
+        readonly property real bottomMargin: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+
+        onVisibleHeightChanged: {
+            if (makeSureVisibleItem && makeSureVisibleItem.activeFocus && previousVisibleHeight > visibleHeight) {
+                var textAreaPos = makeSureVisibleItem.mapToItem(list, 0, 0);
+                if (textAreaPos.y + makeSureVisibleItem.height > visibleHeight) {
+                    list.contentY += textAreaPos.y + makeSureVisibleItem.height - visibleHeight
+                }
+            }
+            previousVisibleHeight = visibleHeight;
+        }
+    }
+}

=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2015-03-18 17:27:30 +0000
+++ qml/Components/Lockscreen.qml	2015-10-26 15:26:58 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Telephony 0.1 as Telephony
 
 Showable {

=== modified file 'qml/Components/PassphraseLockscreen.qml'
--- qml/Components/PassphraseLockscreen.qml	2015-03-18 17:27:30 +0000
+++ qml/Components/PassphraseLockscreen.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Components/PinLockscreen.qml'
--- qml/Components/PinLockscreen.qml	2015-05-28 07:42:09 +0000
+++ qml/Components/PinLockscreen.qml	2015-10-26 15:26:58 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Components/PinPadButton.qml'
--- qml/Components/PinPadButton.qml	2015-03-18 17:27:30 +0000
+++ qml/Components/PinPadButton.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: root

=== modified file 'qml/Components/Rating.qml'
--- qml/Components/Rating.qml	2014-02-13 17:00:06 +0000
+++ qml/Components/Rating.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*! Rating widget bar. */
 

=== modified file 'qml/Components/RatingStyle.qml'
--- qml/Components/RatingStyle.qml	2014-02-13 17:00:06 +0000
+++ qml/Components/RatingStyle.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Row {
     anchors.fill: parent

=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2014-10-23 11:59:22 +0000
+++ qml/Components/ResponsiveGridView.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*
    Essentially a GridView where you can specify the maximum number of columns it can have.

=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
--- qml/Components/ResponsiveVerticalJournal.qml	2015-05-12 10:05:52 +0000
+++ qml/Components/ResponsiveVerticalJournal.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 import Dash 0.1
 

=== modified file 'qml/Components/ScrollCalculator.qml'
--- qml/Components/ScrollCalculator.qml	2014-10-13 15:09:46 +0000
+++ qml/Components/ScrollCalculator.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: scrollArea

=== modified file 'qml/Components/ShellDialog.qml'
--- qml/Components/ShellDialog.qml	2015-08-24 15:39:53 +0000
+++ qml/Components/ShellDialog.qml	2015-10-26 15:26:58 +0000
@@ -16,8 +16,8 @@
 
 import QtQuick 2.0
 
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 
 /*
     A Dialog configured for use as a proper in-scene Dialog

=== modified file 'qml/Components/UbuntuShapeForItem.qml'
--- qml/Components/UbuntuShapeForItem.qml	2014-10-06 07:39:42 +0000
+++ qml/Components/UbuntuShapeForItem.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
  * general (Item-based) components. This ability should be incorporated into the SDK's

=== modified file 'qml/Components/UnityInputInfo/UnityInputInfo.qml'
--- qml/Components/UnityInputInfo/UnityInputInfo.qml	2015-08-11 11:23:32 +0000
+++ qml/Components/UnityInputInfo/UnityInputInfo.qml	2015-10-26 15:26:58 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.3
 import Unity.InputInfo 0.1
 // Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Components/WindowControlButtons.qml'
--- qml/Components/WindowControlButtons.qml	2014-11-24 11:21:38 +0000
+++ qml/Components/WindowControlButtons.qml	2015-10-26 15:26:58 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Row {
     id: root

=== modified file 'qml/Components/ZoomableImage.qml'
--- qml/Components/ZoomableImage.qml	2015-05-06 15:05:06 +0000
+++ qml/Components/ZoomableImage.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 /*! \brief Zoomable for image.

=== modified file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	2015-08-31 07:46:52 +0000
+++ qml/Dash/CardCarousel.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 DashRenderer {
@@ -68,7 +68,7 @@
                 item.fontScale = Qt.binding(function() { return carousel.fontScale; });
                 item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });
                 item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
-                item.artShapeBorderSource = "none";
+                item.artShapeStyle = "flat";
                 item.scopeStyle = cardCarousel.scopeStyle;
             }
 

=== modified file 'qml/Dash/CardHorizontalList.qml'
--- qml/Dash/CardHorizontalList.qml	2015-05-13 10:21:18 +0000
+++ qml/Dash/CardHorizontalList.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 DashRenderer {

=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	2015-05-13 10:21:18 +0000
+++ qml/Dash/CardVerticalJournal.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 DashRenderer {

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2015-08-31 10:24:42 +0000
+++ qml/Dash/Dash.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity 0.2
 import Utils 0.1

=== modified file 'qml/Dash/DashApplication.qml'
--- qml/Dash/DashApplication.qml	2015-05-12 14:39:11 +0000
+++ qml/Dash/DashApplication.qml	2015-10-26 15:26:58 +0000
@@ -15,14 +15,15 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.3
 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
 
 MainView {
     implicitWidth: units.gu(40)
     implicitHeight: units.gu(68)
 
-    useDeprecatedToolbar: false
+    // Workaround bug #1475643
+    headerColor: Qt.rgba(0, 0, 0, 0)
 
     Dash {
         anchors.fill: parent

=== modified file 'qml/Dash/DashCategoryBase.qml'
--- qml/Dash/DashCategoryBase.qml	2014-10-09 17:41:49 +0000
+++ qml/Dash/DashCategoryBase.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     width: parent.width

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2015-04-29 07:39:58 +0000
+++ qml/Dash/DashContent.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity 0.2
 import Utils 0.1
 import "../Components"

=== modified file 'qml/Dash/DashContentTabBarStyle.qml'
--- qml/Dash/DashContentTabBarStyle.qml	2014-02-19 13:30:38 +0000
+++ qml/Dash/DashContentTabBarStyle.qml	2015-10-26 15:26:58 +0000
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components.Themes.Ambiance 0.1
+import Ubuntu.Components.Themes.Ambiance 1.3
 
 TabBarStyle {
     indicatorImageSource: "graphics/tabbarchevron.png"

=== modified file 'qml/Dash/DashNavigation.qml'
--- qml/Dash/DashNavigation.qml	2015-01-05 15:08:04 +0000
+++ qml/Dash/DashNavigation.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Dash 0.1
 import "../Components"
 
@@ -48,7 +48,7 @@
         id: d
         readonly property color foregroundColor: root.scopeStyle
                                                  ? root.scopeStyle.getTextColor(backgroundItem.luminance)
-                                                 : Theme.palette.normal.baseText
+                                                 : theme.palette.normal.baseText
         readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
         readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
         readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)

=== modified file 'qml/Dash/DashNavigationButton.qml'
--- qml/Dash/DashNavigationButton.qml	2015-01-05 15:08:04 +0000
+++ qml/Dash/DashNavigationButton.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: root
@@ -24,7 +24,7 @@
     // Set by parent
     property var scope: null
     property var scopeStyle: null
-    property color foregroundColor: Theme.palette.normal.baseText
+    property color foregroundColor: theme.palette.normal.baseText
     property bool isAltNavigation: false
     property bool showDivider: false
 

=== modified file 'qml/Dash/DashNavigationList.qml'
--- qml/Dash/DashNavigationList.qml	2015-07-06 04:41:44 +0000
+++ qml/Dash/DashNavigationList.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import "../Components"
 
 Item {
@@ -24,7 +24,7 @@
     property var navigation: null
     property var currentNavigation: null
     property var scopeStyle: null
-    property color foregroundColor: Theme.palette.normal.baseText
+    property color foregroundColor: theme.palette.normal.baseText
     signal enterNavigation(var newNavigationId, bool hasChildren)
     signal goBackToParentClicked()
     signal allNavigationClicked()

=== renamed file 'qml/Dash/PageHeader.qml' => 'qml/Dash/DashPageHeader.qml'
--- qml/Dash/PageHeader.qml	2015-03-13 10:07:57 +0000
+++ qml/Dash/DashPageHeader.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * 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
@@ -15,10 +15,10 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.Ambiance 1.1
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes.Ambiance 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3
 import "../Components"
 import "../Components/SearchHistoryModel"
 
@@ -136,7 +136,7 @@
         objectName: "headerContainer"
         clip: contentY < height
         anchors { left: parent.left; top: parent.top; right: parent.right }
-        height: units.gu(7)
+        height: header.contentHeight
         contentHeight: headersColumn.height
         interactive: false
         contentY: showSearch ? 0 : height
@@ -171,18 +171,15 @@
             PageHeadStyle {
                 id: searchHeader
                 anchors { left: parent.left; right: parent.right }
-                height: headerContainer.height
-                contentHeight: height
                 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
                 __separator_visible: false
                 // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
                 property var styledItem: searchHeader
-                property string title
                 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
                 property color panelColor: background.topColor
                 panelForegroundColor: config.foregroundColor
-                property var config: PageHeadConfiguration {
-                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
+                config: PageHeadConfiguration {
+                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
                     backAction: Action {
                         iconName: "back"
                         onTriggered: {
@@ -247,16 +244,15 @@
                 objectName: "innerPageHeader"
                 anchors { left: parent.left; right: parent.right }
                 height: headerContainer.height
-                contentHeight: height
                 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
                 __separator_visible: false
                 property var styledItem: header
-                property string title: root.title
                 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
                 property color panelColor: background.topColor
                 panelForegroundColor: config.foregroundColor
-                property var config: PageHeadConfiguration {
-                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
+                config: PageHeadConfiguration {
+                    title: root.title
+                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
                     backAction: Action {
                         iconName: backIsClose ? "close" : "back"
                         visible: root.showBackButton

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2015-08-17 11:57:13 +0000
+++ qml/Dash/GenericScopeView.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1
 import Unity 0.2
 import Dash 0.1
@@ -573,7 +573,7 @@
                     }
                     fontSize: "small"
                     font.weight: Font.Bold
-                    color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                    color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                 }
             }
 
@@ -610,7 +610,7 @@
             width: categoryView.width
             height: section != "" ? units.gu(5) : 0
             text: section
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
             iconName: delegate && delegate.headerLink ? "go-next" : ""
             onClicked: {
                 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
@@ -624,7 +624,7 @@
             sourceComponent: scopeView.showPageHeader ? pageHeaderComponent : undefined
             Component {
                 id: pageHeaderComponent
-                PageHeader {
+                DashPageHeader {
                     objectName: "scopePageHeader"
                     width: parent.width
                     title: scopeView.scope ? scopeView.scope.name : ""
@@ -731,7 +731,7 @@
             }
             fontSize: "small"
             font.weight: Font.Bold
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
         Connections {

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2015-09-14 11:07:25 +0000
+++ qml/Dash/PreviewListView.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity 0.2
 import "../Components"
 import "Previews" as Previews
@@ -43,7 +43,7 @@
 
     signal backClicked()
 
-    PageHeader {
+    DashPageHeader {
         id: header
         objectName: "pageHeader"
         width: parent.width

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2015-08-24 11:20:41 +0000
+++ qml/Dash/Previews/Preview.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
+import "../../Components"
 
 /*! \brief This component constructs the Preview UI.
  *
@@ -72,18 +73,10 @@
                 }
                 width: row.columnWidth
                 spacing: row.spacing
-                bottomMargin: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
-                property var makeSureVisibleItem
-                property real previousVisibleHeight: 0
-                property real visibleHeight: height - bottomMargin
-                onVisibleHeightChanged: {
-                    if (makeSureVisibleItem && makeSureVisibleItem.activeFocus && previousVisibleHeight > visibleHeight) {
-                        var textAreaPos = makeSureVisibleItem.mapToItem(column, 0, 0);
-                        if (textAreaPos.y + makeSureVisibleItem.height > column.visibleHeight) {
-                            column.contentY += textAreaPos.y + makeSureVisibleItem.height - column.visibleHeight
-                        }
-                    }
-                    previousVisibleHeight = visibleHeight;
+
+                ListViewOSKScroller {
+                    id: oskScroller
+                    list: column
                 }
 
                 model: columnModel
@@ -100,17 +93,17 @@
                     anchors {
                         left: parent.left
                         right: parent.right
-                        leftMargin: units.gu(1)
-                        rightMargin: units.gu(1)
+                        leftMargin: widgetMargins
+                        rightMargin: widgetMargins
                     }
 
                     onTriggered: {
                         previewModel.triggered(widgetId, actionId, data);
                     }
-                     onMakeSureVisible: {
-                         column.previousVisibleHeight=column.visibleHeight
-                         column.makeSureVisibleItem=item
-                     }
+
+                    onMakeSureVisible: {
+                        oskScroller.setMakeSureVisibleItem(item);
+                    }
 
                     onFocusChanged: if (focus) column.positionViewAtIndex(index, ListView.Contain)
 

=== modified file 'qml/Dash/Previews/PreviewActionButton.qml'
--- qml/Dash/Previews/PreviewActionButton.qml	2014-08-14 12:01:03 +0000
+++ qml/Dash/Previews/PreviewActionButton.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Button {
     signal triggeredAction(var actionData)

=== modified file 'qml/Dash/Previews/PreviewActionCombo.qml'
--- qml/Dash/Previews/PreviewActionCombo.qml	2014-08-15 08:40:36 +0000
+++ qml/Dash/Previews/PreviewActionCombo.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root
@@ -33,7 +33,7 @@
 
         objectName: "moreLessButton"
         text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
-        strokeColor: Theme.palette.normal.baseText
+        strokeColor: theme.palette.normal.baseText
         onClicked: expanded = !expanded
         width: parent.width
     }

=== modified file 'qml/Dash/Previews/PreviewActions.qml'
--- qml/Dash/Previews/PreviewActions.qml	2015-08-04 13:53:55 +0000
+++ qml/Dash/Previews/PreviewActions.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 /*! This preview widget shows either one button, two buttons or one button
  *  and a combo button depending on the number of items in widgetData["actions"].
@@ -50,7 +50,7 @@
             Binding {
                 target: loader.item
                 property: "strokeColor"
-                value: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+                value: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             }
             Connections {
                 target: loader.item

=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2015-08-03 14:27:48 +0000
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtMultimedia 5.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*! \brief Preview widget for audio tracks.
 
@@ -139,7 +139,7 @@
                             objectName: "trackTitleLabel"
                             anchors { top: parent.top; left: parent.left; right: parent.right }
                             opacity: 0.9
-                            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                             fontSize: "small"
                             horizontalAlignment: Text.AlignLeft
                             text: modelData["title"]
@@ -152,7 +152,7 @@
                             anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
                             visible: text !== ""
                             opacity: 0.9
-                            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                             font.weight: Font.Light
                             fontSize: "small"
                             horizontalAlignment: Text.AlignLeft
@@ -175,7 +175,7 @@
                             }
                             height: units.dp(2)
                             visible: progressBarImage.visible
-                            color: UbuntuColors.orange
+                            backgroundColor: UbuntuColors.orange
                         }
 
                         Image {
@@ -193,7 +193,7 @@
                         anchors.verticalCenter: parent.verticalCenter
                         width: parent.column3Width
                         opacity: 0.9
-                        color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                        color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                         fontSize: "small"
                         horizontalAlignment: Text.AlignRight
                         text: audio.lengthToString(modelData["length"])

=== modified file 'qml/Dash/Previews/PreviewComment.qml'
--- qml/Dash/Previews/PreviewComment.qml	2015-07-06 15:33:11 +0000
+++ qml/Dash/Previews/PreviewComment.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*! \brief Preview widget for comments.
 

=== modified file 'qml/Dash/Previews/PreviewCommentInput.qml'
--- qml/Dash/Previews/PreviewCommentInput.qml	2015-08-24 03:46:15 +0000
+++ qml/Dash/Previews/PreviewCommentInput.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for commenting.

=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
--- qml/Dash/Previews/PreviewExpandable.qml	2015-09-15 12:05:09 +0000
+++ qml/Dash/Previews/PreviewExpandable.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for expandable widgets.
@@ -41,7 +41,7 @@
             right: expandButton.left
         }
         fontSize: "large"
-        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         visible: text !== ""
         opacity: .8
         text: widgetData["title"] || ""
@@ -62,7 +62,7 @@
             width: units.gu(3)
             height: units.gu(3)
             name: root.expanded ? "view-collapse" : "view-expand"
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         }
     }
 

=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
--- qml/Dash/Previews/PreviewHeader.qml	2015-08-04 13:53:55 +0000
+++ qml/Dash/Previews/PreviewHeader.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Dash 0.1
 import "../"
 
@@ -40,10 +40,10 @@
         readonly property string title: root.widgetData["title"] || ""
         readonly property string subtitle: root.widgetData["subtitle"] || ""
         readonly property var attributes: root.widgetData["attributes"] || null
-        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
 
         // Rewire the source since we may have unwired it on onStatusChanged
-        onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.image.source = mascot;
+        onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.source.source = mascot;
 
         implicitHeight: row.height + row.margins * 2
         width: parent.width
@@ -77,16 +77,16 @@
 
                 sourceComponent: UbuntuShape {
                     objectName: "mascotShape"
-                    visible: image.status === Image.Ready
-                    image: Image {
+                    visible: source.status === Image.Ready
+                    sourceFillMode: UbuntuShape.PreserveAspectCrop
+                    sourceHorizontalAlignment: UbuntuShape.AlignHCenter
+                    sourceVerticalAlignment: UbuntuShape.AlignVCenter
+                    source: Image {
                         source: headerRoot.mascot
                         width: source ? mascotShapeLoader.width : 0
                         height: mascotShapeLoader.height
 
                         sourceSize { width: mascotShapeLoader.maxSize; height: mascotShapeLoader.maxSize }
-                        fillMode: Image.PreserveAspectCrop
-                        horizontalAlignment: Image.AlignHCenter
-                        verticalAlignment: Image.AlignVCenter
                         onStatusChanged: if (status === Image.Error) source = headerRoot.fallback;
                     }
                 }

=== modified file 'qml/Dash/Previews/PreviewIconActions.qml'
--- qml/Dash/Previews/PreviewIconActions.qml	2015-07-08 10:55:38 +0000
+++ qml/Dash/Previews/PreviewIconActions.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 /*! This preview widget icons+label for number of items in widgetData["actions"].
  *  For each of the items we recognize the fields "label", "icon", "temporaryIcon" and "id".

=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
--- qml/Dash/Previews/PreviewImageGallery.qml	2015-05-06 15:05:06 +0000
+++ qml/Dash/Previews/PreviewImageGallery.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! This preview widget shows a horizontal list of images.
@@ -62,7 +62,7 @@
             source: modelData ? modelData : ""
             scaleTo: "height"
             initialWidth: units.gu(13)
-            borderSource: mouseArea.pressed ? "radius_pressed.sci" : "radius_idle.sci"
+            pressed: mouseArea.pressed
 
             MouseArea {
                 id: mouseArea

=== modified file 'qml/Dash/Previews/PreviewOverlay.qml'
--- qml/Dash/Previews/PreviewOverlay.qml	2015-03-10 12:23:46 +0000
+++ qml/Dash/Previews/PreviewOverlay.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 Rectangle {
@@ -158,7 +158,7 @@
                 anchors.centerIn: parent
                 width: units.gu(2.5)
                 height: width
-                color: Theme.palette.normal.foregroundText
+                color: theme.palette.normal.foregroundText
                 name: "close"
             }
         }

=== modified file 'qml/Dash/Previews/PreviewPayments.qml'
--- qml/Dash/Previews/PreviewPayments.qml	2014-11-20 11:44:44 +0000
+++ qml/Dash/Previews/PreviewPayments.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Payments 0.1
 
 /*! \brief Preview widget for a purchase button.

=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
--- qml/Dash/Previews/PreviewProgress.qml	2014-04-30 10:51:30 +0000
+++ qml/Dash/Previews/PreviewProgress.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.DownloadDaemonListener 0.1
 
 /*! \brief Preview widget for a progress bar.

=== modified file 'qml/Dash/Previews/PreviewRatingDisplay.qml'
--- qml/Dash/Previews/PreviewRatingDisplay.qml	2015-08-04 13:53:55 +0000
+++ qml/Dash/Previews/PreviewRatingDisplay.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for rating display.
@@ -60,7 +60,7 @@
                 urlIconEmpty: widgetData["rating-icon-empty"]
                 urlIconFull: widgetData["rating-icon-full"]
                 urlIconHalf: widgetData["rating-icon-half"]
-                labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
             }
         }
     }

=== modified file 'qml/Dash/Previews/PreviewRatingEdit.qml'
--- qml/Dash/Previews/PreviewRatingEdit.qml	2015-05-08 13:12:02 +0000
+++ qml/Dash/Previews/PreviewRatingEdit.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for editable rating.
@@ -56,7 +56,7 @@
         urlIconEmpty: widgetData["rating-icon-empty"]
         urlIconFull: widgetData["rating-icon-full"]
         urlIconHalf: widgetData["rating-icon-half"]
-        labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+        labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
     }
 
     PreviewRatingInput {

=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
--- qml/Dash/Previews/PreviewRatingInput.qml	2015-08-31 10:40:59 +0000
+++ qml/Dash/Previews/PreviewRatingInput.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for rating.
@@ -79,7 +79,7 @@
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             opacity: .8
             text: widgetData["rating-label"] || i18n.tr("Rate this")
         }
@@ -124,7 +124,7 @@
                 left: parent.left
                 right: parent.right
             }
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             opacity: .8
             text: widgetData["review-label"] || i18n.tr("Add a review")
         }
@@ -170,7 +170,7 @@
                     top: parent.top
                     right: parent.right
                 }
-                color: readyToSubmit ? Theme.palette.selected.base : Theme.palette.normal.base
+                color: readyToSubmit ? theme.palette.selected.base : theme.palette.normal.base
                 text: widgetData["submit-label"] || i18n.tr("Send")
                 onClicked: {
                     if (readyToSubmit) root.submit()

=== modified file 'qml/Dash/Previews/PreviewRatingSingleDisplay.qml'
--- qml/Dash/Previews/PreviewRatingSingleDisplay.qml	2015-05-08 13:12:02 +0000
+++ qml/Dash/Previews/PreviewRatingSingleDisplay.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 Column {

=== modified file 'qml/Dash/Previews/PreviewTable.qml'
--- qml/Dash/Previews/PreviewTable.qml	2015-04-13 10:37:41 +0000
+++ qml/Dash/Previews/PreviewTable.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for table.
@@ -48,7 +48,7 @@
             }
             height: visible ? implicitHeight : 0
             fontSize: "large"
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             visible: text !== ""
             opacity: .8
             text: widgetData["title"] || ""
@@ -72,7 +72,7 @@
                         fontSize: "small"
                         text: perRowRepeater.model[index]
                         visible: root.expanded || rowIndex < maximumCollapsedRowCount
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
                         font.bold: index == 0
                         wrapMode: Text.Wrap
                         Layout.alignment: Qt.AlignTop

=== modified file 'qml/Dash/Previews/PreviewTextSummary.qml'
--- qml/Dash/Previews/PreviewTextSummary.qml	2014-10-10 10:37:03 +0000
+++ qml/Dash/Previews/PreviewTextSummary.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for text.
@@ -39,7 +39,7 @@
         }
         height: visible ? implicitHeight : 0
         fontSize: "large"
-        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         visible: text !== ""
         opacity: .8
         text: widgetData["title"] || ""
@@ -61,7 +61,7 @@
         clip: true
         fontSize: "small"
         lineHeight: 1.2
-        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         opacity: .8
         text: widgetData["text"] || ""
         wrapMode: Text.Wrap

=== modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
--- qml/Dash/Previews/PreviewVideoPlayback.qml	2014-03-31 13:06:36 +0000
+++ qml/Dash/Previews/PreviewVideoPlayback.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Thumbnailer 0.1
 import "../../Components"
 
@@ -30,6 +30,8 @@
     implicitWidth: units.gu(35)
     implicitHeight: childrenRect.height
 
+    widgetMargins: -units.gu(1)
+
     LazyImage {
         objectName: "screenshot"
         anchors {
@@ -51,6 +53,7 @@
             return "";
         }
         initialHeight: width * 10 / 16
+        useUbuntuShape: false
 
         Image {
             objectName: "playButton"

=== modified file 'qml/Dash/Previews/PreviewWidget.qml'
--- qml/Dash/Previews/PreviewWidget.qml	2015-08-31 10:40:59 +0000
+++ qml/Dash/Previews/PreviewWidget.qml	2015-10-26 15:26:58 +0000
@@ -34,6 +34,9 @@
     //! Should the widget show in expanded mode (For those that support it)
     property bool expanded: true
 
+    //! Set margins width.
+    property real widgetMargins: units.gu(1)
+
     /*! \brief This signal should be emitted when a preview action was triggered.
      *
      *  \param widgetId, actionId Respective identifiers from widgetData.

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2015-09-15 12:05:09 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2015-10-26 15:26:58 +0000
@@ -40,6 +40,9 @@
     //! Set to true if the parent preview is displayed.
     property bool isCurrentPreview: false
 
+    //! Set margins width.
+    property real widgetMargins: status === Loader.Ready ? item.widgetMargins : units.gu(1)
+
     //! Triggered signal forwarded from the widgets.
     signal triggered(string widgetId, string actionId, var data)
 

=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
--- qml/Dash/Previews/PreviewZoomableImage.qml	2015-05-06 15:05:06 +0000
+++ qml/Dash/Previews/PreviewZoomableImage.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for image.
@@ -27,7 +27,10 @@
 
 PreviewWidget {
     id: root
-    implicitHeight: units.gu(22)
+    implicitWidth: units.gu(35)
+    implicitHeight: lazyImage.height
+
+    widgetMargins: -units.gu(1)
 
     property Item rootItem: QuickUtils.rootItem(root)
 
@@ -35,15 +38,14 @@
         id: lazyImage
         objectName: "lazyImage"
         anchors {
-            top: parent.top
-            bottom: parent.bottom
-            horizontalCenter: parent.horizontalCenter
+            left: parent.left
+            right: parent.right
         }
-        scaleTo: "height"
+        scaleTo: "width"
         source: widgetData["source"]
         asynchronous: true
-
-        borderSource: mouseArea.pressed ? "radius_pressed.sci" : "radius_idle.sci"
+        useUbuntuShape: false
+        pressed: mouseArea.pressed
 
         MouseArea {
             id: mouseArea

=== modified file 'qml/Dash/PullToRefreshScopeStyle.qml'
--- qml/Dash/PullToRefreshScopeStyle.qml	2014-09-30 14:22:22 +0000
+++ qml/Dash/PullToRefreshScopeStyle.qml	2015-10-26 15:26:58 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Styles 1.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Styles 1.3
 
 /**
  * TODO: Once the SDK version of PullToRefreshStyle doesn't have bug 1375799

=== modified file 'qml/Dash/ScopeSettings/ScopeSetting.qml'
--- qml/Dash/ScopeSettings/ScopeSetting.qml	2014-08-26 12:27:36 +0000
+++ qml/Dash/ScopeSettings/ScopeSetting.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 /*! Interface for settings widgets. */
 
@@ -32,6 +32,15 @@
      */
     signal updated(var value)
 
+    /*! \brief This signal should be emitted when widget gains the focus
+     *  and input method popups.
+     *  And preview widget should reposition in visible area to avoid
+     *  keyboard appears over the widget.
+     *
+     *  \param item, id of specified item which is needed to reposition.
+     */
+    signal makeSureVisible(var item)
+
     //! \internal
     readonly property real settingMargins: units.gu(2)
 }

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingBoolean.qml'
--- qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-02-10 11:35:11 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2015 Canonical, Ltd.
  *
  * 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
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ScopeSetting {
     id: root
@@ -44,7 +44,7 @@
             elide: Text.ElideMiddle
             maximumLineCount: 2
             wrapMode: Text.Wrap
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
         CheckBox {

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingList.qml'
--- qml/Dash/ScopeSettings/ScopeSettingList.qml	2014-08-26 12:33:32 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingList.qml	2015-10-26 15:26:58 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ScopeSetting {
     id: root

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingString.qml'
--- qml/Dash/ScopeSettings/ScopeSettingString.qml	2014-08-26 12:27:36 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingString.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2015 Canonical, Ltd.
  *
  * 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
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ScopeSetting {
     id: root
@@ -44,7 +44,7 @@
             elide: Text.ElideMiddle
             maximumLineCount: 2
             wrapMode: Text.Wrap
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
         TextField {
@@ -57,7 +57,7 @@
             }
             width: root.mode == "number" ? units.gu(8) : units.gu(12)
             text: widgetData.value
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.fieldText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.fieldText
             validator: root.mode == "number" ? doubleValidator : null
             hasClearButton: root.mode == "number" ? false : true
 
@@ -78,6 +78,12 @@
                     updateText();
                 }
             }
+
+            readonly property bool inputMethodVisible: Qt.inputMethod.visible
+            onInputMethodVisibleChanged: {
+                if(inputMethodVisible && activeFocus)
+                    root.makeSureVisible(control);
+            }
         }
     }
 }

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml'
--- qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml	2014-08-26 12:33:32 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml	2015-10-26 15:26:58 +0000
@@ -30,6 +30,9 @@
     //! Triggered signal forwarded from the widgets.
     signal updated(var value)
 
+    //! makeSureVisible signal forwarded from the widgets.
+    signal makeSureVisible(var item)
+
     source: widgetSource
 
     //! \cond private
@@ -53,5 +56,6 @@
     Connections {
         target: root.item
         onUpdated: if (value !== widgetData.value) root.updated(value)
+        onMakeSureVisible: root.makeSureVisible(item)
     }
 }

=== modified file 'qml/Dash/ScopeSettingsPage.qml'
--- qml/Dash/ScopeSettingsPage.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/ScopeSettingsPage.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity 0.2
 import "../Components"
 import "ScopeSettings"
@@ -28,7 +28,7 @@
 
     signal backClicked()
 
-    PageHeader {
+    DashPageHeader {
         id: header
         objectName: "pageHeader"
         width: parent.width
@@ -51,6 +51,11 @@
         model: root.scope ? root.scope.settings : null
         clip: true
 
+        ListViewOSKScroller {
+            id: oskScroller
+            list: scopeSettings
+        }
+
         delegate: ScopeSettingsWidgetFactory {
             objectName: "scopeSettingItem" + index
             width: root.width
@@ -58,6 +63,10 @@
             scopeStyle: root.scopeStyle
 
             onUpdated: model.value = value;
+
+            onMakeSureVisible: { // var item
+                oskScroller.setMakeSureVisibleItem(item);
+            }
         }
     }
 }

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2015-07-08 09:55:58 +0000
+++ qml/Dash/ScopesList.qml	2015-10-26 15:26:58 +0000
@@ -61,7 +61,7 @@
         value: root.scope ? root.scope.searchQuery : ""
     }
 
-    PageHeader {
+    DashPageHeader {
         id: header
         objectName: "pageHeader"
         title: i18n.tr("Manage")

=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2015-04-24 07:33:59 +0000
+++ qml/Dash/ScopesListCategory.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Dash 0.1
 import "../Components/ListItems" as ListItems
 
@@ -43,7 +43,7 @@
         id: header
         width: root.width
         height: units.gu(5)
-        color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+        color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
     }
 
     readonly property double listItemHeight: units.gu(6)

=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
--- qml/Dash/ScopesListCategoryItem.qml	2015-02-13 12:03:32 +0000
+++ qml/Dash/ScopesListCategoryItem.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.3
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 MouseArea {
     id: root
@@ -49,10 +49,10 @@
             width: units.gu(5)
             height: units.gu(5)
             visible: !hideChildren
-            image: Image {
+            sourceFillMode: UbuntuShape.PreserveAspectCrop
+            source: Image {
                 id: shapeImage
                 cache: true
-                fillMode: Image.PreserveAspectCrop
                 sourceSize { width: shape.width; height: shape.height }
             }
         }

=== modified file 'qml/Greeter/Clock.qml'
--- qml/Greeter/Clock.qml	2014-12-11 14:10:18 +0000
+++ qml/Greeter/Clock.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Panel/Indicators"
 import Unity.Indicators 0.1 as Indicators
 

=== modified file 'qml/Greeter/CoverPage.qml'
--- qml/Greeter/CoverPage.qml	2015-05-11 14:36:03 +0000
+++ qml/Greeter/CoverPage.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import "../Components"
 

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-09-29 12:48:46 +0000
+++ qml/Greeter/Greeter.qml	2015-10-26 15:26:58 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.3
 import AccountsService 0.1
 import GSettings 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemImage 0.1
 import Unity.Launcher 0.1
 import "../Components"

=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2015-09-16 14:34:56 +0000
+++ qml/Greeter/Infographics.qml	2015-10-26 15:26:58 +0000
@@ -17,7 +17,7 @@
 import "../Components"
 import "Gradient.js" as Gradient
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: infographic

=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2015-02-01 19:53:29 +0000
+++ qml/Greeter/LoginList.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2015-07-17 08:11:51 +0000
+++ qml/Greeter/NarrowView.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 FocusScope {

=== modified file 'qml/Greeter/ObjectPositioner.qml'
--- qml/Greeter/ObjectPositioner.qml	2013-06-05 22:03:08 +0000
+++ qml/Greeter/ObjectPositioner.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     property int count

=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2015-03-04 13:23:34 +0000
+++ qml/Greeter/WideView.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 FocusScope {
     id: root

=== modified file 'qml/Launcher/FoldingLauncherDelegate.qml'
--- qml/Launcher/FoldingLauncherDelegate.qml	2013-08-27 18:30:55 +0000
+++ qml/Launcher/FoldingLauncherDelegate.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 LauncherDelegate {
     id: root

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2015-09-29 12:48:46 +0000
+++ qml/Launcher/Launcher.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "../Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Launcher 0.1
 

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2015-07-29 03:31:09 +0000
+++ qml/Launcher/LauncherDelegate.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root
@@ -130,13 +130,12 @@
             anchors.fill: parent
             anchors.margins: units.gu(1)
             radius: "medium"
-            borderSource: "none"
-
-            image: Image {
+            aspect: UbuntuShape.Flat
+            sourceFillMode: UbuntuShape.PreserveAspectCrop
+            source: Image {
                 id: iconImage
                 sourceSize.width: iconShape.width
                 sourceSize.height: iconShape.height
-                fillMode: Image.PreserveAspectCrop
                 source: root.iconName
             }
         }
@@ -159,9 +158,9 @@
             }
             width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
             height: units.gu(2)
-            color: UbuntuColors.orange
+            backgroundColor: UbuntuColors.orange
             visible: root.countVisible
-            borderSource: "none"
+            aspect: UbuntuShape.Flat
 
             Label {
                 id: countLabel

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-08-24 10:18:58 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-10-26 15:26:58 +0000
@@ -15,10 +15,10 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItems
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
 import Unity.Launcher 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import "../Components/ListItems"
 import "../Components/"
 
@@ -61,8 +61,8 @@
                     fill: parent
                     topMargin: -units.gu(2)
                 }
-                borderSource: "none"
-                color: UbuntuColors.orange
+                aspect: UbuntuShape.Flat
+                backgroundColor: UbuntuColors.orange
             }
 
             Image {

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2015-10-21 11:51:02 +0000
+++ qml/Notifications/Notification.qml	2015-10-26 15:26:58 +0000
@@ -17,11 +17,11 @@
 import QtQuick 2.0
 import QtMultimedia 5.0
 import Powerd 0.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Unity.Notifications 1.0
 import QMenuModel 0.1
 import Utils 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Item {
     id: notification
@@ -153,10 +153,10 @@
             rightMargin: notification.margins
             topMargin: type === Notification.Confirmation ? units.gu(.5) : 0
         }
-        color: parent.color
+        backgroundColor: parent.color
         opacity: parent.opacity
         radius: "medium"
-        borderSource: "none"
+        aspect: UbuntuShape.Flat
     }
 
     Rectangle {
@@ -282,7 +282,7 @@
                         }
                         visible: type !== Notification.Confirmation
                         fontSize: "medium"
-                        color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
+                        color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
                         elide: Text.ElideRight
                         textFormat: Text.PlainText
                     }
@@ -297,7 +297,7 @@
                         }
                         visible: body != "" && type !== Notification.Confirmation
                         fontSize: "small"
-                        color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
+                        color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
                         wrapMode: Text.WordWrap
                         maximumLineCount: type == Notification.SnapDecision ? 12 : 2
                         elide: Text.ElideRight
@@ -338,7 +338,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 visible: type === Notification.Confirmation && body !== ""
                 fontSize: "medium"
-                color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
+                color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
                 wrapMode: Text.WordWrap
                 maximumLineCount: 1
                 elide: Text.ElideRight
@@ -358,8 +358,8 @@
                 }
 
                 height: units.gu(1)
-                color: darkOnBright ? UbuntuColors.darkGrey : UbuntuColors.lightGrey
-                borderSource: "none"
+                backgroundColor: darkOnBright ? UbuntuColors.darkGrey : UbuntuColors.lightGrey
+                aspect: UbuntuShape.Flat
                 radius: "small"
 
                 UbuntuShape {
@@ -367,8 +367,8 @@
                     objectName: "innerBar"
                     width: valueIndicator.width * valueIndicator.value / 100
                     height: units.gu(1)
-                    color: notification.hints["x-canonical-value-bar-tint"] === "true" ? UbuntuColors.orange : darkOnBright ? UbuntuColors.lightGrey : "white"
-                    borderSource: "none"
+                    backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? UbuntuColors.orange : darkOnBright ? UbuntuColors.lightGrey : "white"
+                    aspect: UbuntuShape.Flat
                     radius: "small"
                 }
             }

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2015-10-15 14:33:48 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import QMenuModel 0.1
 import "../Components"
 

=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2015-10-15 14:33:48 +0000
+++ qml/Notifications/Notifications.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Notifications 1.0 as UnityNotifications
 import Utils 0.1
 import "../Components"

=== modified file 'qml/Notifications/OptionToggle.qml'
--- qml/Notifications/OptionToggle.qml	2014-11-07 10:55:22 +0000
+++ qml/Notifications/OptionToggle.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,9 +15,9 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 UbuntuShape {
     id: optionToggle
@@ -29,8 +29,8 @@
 
     signal triggered(string id)
 
-    color: Theme.palette.normal.base
-    borderSource: "none"
+    backgroundColor: theme.palette.normal.base
+    aspect: UbuntuShape.Flat
     height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
     width: parent.width
     radius: "medium"

=== modified file 'qml/Notifications/ShapedIcon.qml'
--- qml/Notifications/ShapedIcon.qml	2015-05-08 14:09:26 +0000
+++ qml/Notifications/ShapedIcon.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     property string fileSource

=== modified file 'qml/Notifications/SwipeToAct.qml'
--- qml/Notifications/SwipeToAct.qml	2015-09-22 14:39:02 +0000
+++ qml/Notifications/SwipeToAct.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: swipeToAct
@@ -98,8 +98,8 @@
         id: row
         width: parent.width
         height: priv.sliderHeight
-        color: priv.sliderBGColor
-        borderSource: "none"
+        backgroundColor: priv.sliderBGColor
+        aspect: UbuntuShape.Flat
         visible: !clickToAct
 
         UbuntuShape {
@@ -108,8 +108,8 @@
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.margins: priv.gap
-            color: UbuntuColors.red
-            borderSource: "none"
+            backgroundColor: UbuntuColors.red
+            aspect: UbuntuShape.Flat
 
             state: "normal"
             height: units.gu(6)
@@ -187,10 +187,10 @@
             }
 
             z: 1
-            color: priv.sliderMainColor
+            backgroundColor: priv.sliderMainColor
             height: units.gu(6)
             width: units.gu(6)
-            borderSource: "none"
+            aspect: UbuntuShape.Flat
             radius: "medium"
             Icon {
                 anchors.fill: parent
@@ -226,8 +226,8 @@
             anchors.top: parent.top
             anchors.right: parent.right
             anchors.margins: priv.gap
-            color: UbuntuColors.green
-            borderSource: "none"
+            backgroundColor: UbuntuColors.green
+            aspect: UbuntuShape.Flat
 
             state: "normal"
             height: units.gu(6)

=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2015-10-05 19:15:03 +0000
+++ qml/OrientedShell.qml	2015-10-26 15:26:58 +0000
@@ -23,7 +23,7 @@
 import "Rotation"
 // Backup Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
 // in case we remove the UnityInputInfo import
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: root

=== modified file 'qml/Panel/ActiveCallHint.qml'
--- qml/Panel/ActiveCallHint.qml	2014-10-08 21:05:50 +0000
+++ qml/Panel/ActiveCallHint.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Telephony 0.1 as Telephony
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../Components"
 

=== modified file 'qml/Panel/Handle.qml'
--- qml/Panel/Handle.qml	2014-10-09 12:01:57 +0000
+++ qml/Panel/Handle.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: handle

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2015-09-15 22:50:16 +0000
+++ qml/Panel/IndicatorItem.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import "Indicators"
 

=== modified file 'qml/Panel/IndicatorItemRow.qml'
--- qml/Panel/IndicatorItemRow.qml	2015-08-04 07:02:08 +0000
+++ qml/Panel/IndicatorItemRow.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Panel/IndicatorPage.qml'
--- qml/Panel/IndicatorPage.qml	2015-09-15 22:50:16 +0000
+++ qml/Panel/IndicatorPage.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Components
+import Ubuntu.Components 1.3 as Components
 import Unity.Indicators 0.1 as Indicators
 import "Indicators"
 

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2015-09-29 14:46:24 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2015-10-26 15:26:58 +0000
@@ -19,8 +19,13 @@
 import Ubuntu.Settings.Components 0.1
 import QMenuModel 0.1
 import Utils 0.1 as Utils
+<<<<<<< TREE
 import Ubuntu.Components.ListItems 0.1 as ListItems
 import Ubuntu.Components 1.3
+=======
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Components 1.3
+>>>>>>> MERGE-SOURCE
 import Unity.Session 0.1
 
 Item {
@@ -249,7 +254,7 @@
                     name: "settings"
                     height: units.gu(3)
                     width: height
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
                 }
             }
         }
@@ -281,7 +286,7 @@
                     source: menuData.icon
                     height: units.gu(3)
                     width: height
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
                 }
             }
         }
@@ -928,7 +933,7 @@
             enabled: menuData && menuData.sensitive || false
             highlightWhenPressed: false
             text: menuData && menuData.label || ""
-            foregroundColor: Theme.palette.normal.backgroundText
+            foregroundColor: theme.palette.normal.backgroundText
 
             onMenuModelChanged: {
                 loadAttributes();

=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
=== modified file 'qml/Panel/Indicators/ModemInfoItem.qml'
--- qml/Panel/Indicators/ModemInfoItem.qml	2014-07-31 13:31:32 +0000
+++ qml/Panel/Indicators/ModemInfoItem.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -16,8 +16,8 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Empty {
     id: menu
@@ -65,7 +65,7 @@
                 height: parent.height
                 Icon {
                     id: statusIcon
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
 
                     Layout.preferredHeight: parent.height
                     Layout.preferredWidth: Layout.preferredHeight
@@ -75,7 +75,7 @@
 
                 Icon {
                     id: iconConnectivity
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
 
                     Layout.preferredHeight: parent.height
                     Layout.preferredWidth: Layout.preferredHeight

=== modified file 'qml/Panel/Indicators/RoamingIndication.qml'
--- qml/Panel/Indicators/RoamingIndication.qml	2014-07-31 13:31:32 +0000
+++ qml/Panel/Indicators/RoamingIndication.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 RowLayout {
     spacing: units.gu(0.5)
@@ -30,7 +30,7 @@
 
     Icon {
         id: iconRoaming
-        color: Theme.palette.selected.backgroundText
+        color: theme.palette.selected.backgroundText
 
         Layout.preferredHeight: parent.height
         Layout.preferredWidth: Layout.preferredHeight

=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
--- qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-09-22 10:57:15 +0000
+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-10-26 15:26:58 +0000
@@ -19,8 +19,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import "../.."
 
 Page {

=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
--- qml/Panel/Indicators/client/IndicatorsClient.qml	2014-07-25 17:52:39 +0000
+++ qml/Panel/Indicators/client/IndicatorsClient.qml	2015-10-26 15:26:58 +0000
@@ -18,15 +18,15 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Rectangle {
     color: "black"
     id: root
 
     Component.onCompleted: {
-        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+        theme.name = "Ubuntu.Components.Themes.SuruGradient"
     }
 
     PageStack {

=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
--- qml/Panel/Indicators/client/IndicatorsList.qml	2015-03-11 08:07:31 +0000
+++ qml/Panel/Indicators/client/IndicatorsList.qml	2015-10-26 15:26:58 +0000
@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Unity.Indicators 0.1 as Indicators
 import "../.."
 

=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
--- qml/Panel/Indicators/client/IndicatorsTree.qml	2014-11-11 15:28:13 +0000
+++ qml/Panel/Indicators/client/IndicatorsTree.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Indicators 0.1 as Indicators
 import ".."
 

=== modified file 'qml/Panel/IndicatorsBar.qml'
--- qml/Panel/IndicatorsBar.qml	2015-08-20 14:07:45 +0000
+++ qml/Panel/IndicatorsBar.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2015-08-20 14:07:45 +0000
+++ qml/Panel/IndicatorsMenu.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import "../Components"
 import "Indicators"

=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2014-11-17 23:04:48 +0000
+++ qml/Panel/MenuContent.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Indicators 0.1 as Indicators
 import Utils 0.1
 import "../Components"

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-09-29 12:48:46 +0000
+++ qml/Panel/Panel.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../Components"
 import "../Components/PanelState"

=== modified file 'qml/Rotation/RotationStates.qml'
--- qml/Rotation/RotationStates.qml	2015-10-05 19:15:03 +0000
+++ qml/Rotation/RotationStates.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Powerd 0.1
 
 // Why the state machine is done that way:

=== modified file 'qml/ScopeTool.qml'
--- qml/ScopeTool.qml	2014-08-07 15:29:12 +0000
+++ qml/ScopeTool.qml	2015-10-26 15:26:58 +0000
@@ -15,8 +15,8 @@
 */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
 import Utils 0.1
 import Unity 0.2

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-10-16 17:11:54 +0000
+++ qml/Shell.qml	2015-10-26 15:26:58 +0000
@@ -18,8 +18,8 @@
 import QtQuick.Window 2.0
 import AccountsService 0.1
 import Unity.Application 0.1
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Gestures 0.1
 import Ubuntu.Telephony 0.1 as Telephony
 import Unity.Connectivity 0.1
@@ -139,7 +139,7 @@
     }
 
     Component.onCompleted: {
-        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+        theme.name = "Ubuntu.Components.Themes.SuruGradient"
         if (ApplicationManager.count > 0) {
             ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
         }

=== modified file 'qml/Stages/Animations/SwipeFromBottomAnimation.qml'
--- qml/Stages/Animations/SwipeFromBottomAnimation.qml	2014-09-01 12:46:31 +0000
+++ qml/Stages/Animations/SwipeFromBottomAnimation.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 BaseSessionAnimation {
     id: animation

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2015-09-29 22:54:19 +0000
+++ qml/Stages/ApplicationWindow.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 FocusScope {

=== modified file 'qml/Stages/DecoratedWindow.qml'
--- qml/Stages/DecoratedWindow.qml	2015-09-29 23:09:06 +0000
+++ qml/Stages/DecoratedWindow.qml	2015-10-26 15:26:58 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 FocusScope {

=== modified file 'qml/Stages/DesktopSpread.qml'
--- qml/Stages/DesktopSpread.qml	2015-09-21 12:22:29 +0000
+++ qml/Stages/DesktopSpread.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 

=== modified file 'qml/Stages/DesktopSpreadDelegate.qml'
--- qml/Stages/DesktopSpreadDelegate.qml	2015-09-18 11:03:48 +0000
+++ qml/Stages/DesktopSpreadDelegate.qml	2015-10-26 15:26:58 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 Item {

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2015-10-19 14:27:57 +0000
+++ qml/Stages/DesktopStage.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../Components"
 import "../Components/PanelState"

=== modified file 'qml/Stages/MainViewStyle.qml'
--- qml/Stages/MainViewStyle.qml	2014-09-12 20:16:54 +0000
+++ qml/Stages/MainViewStyle.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2012 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -13,51 +13,60 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 // FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
 Item {
-    // styling properties
     anchors.fill: parent
     z: -1
     id: mainViewStyle
 
-    /*!
-      The background texture of the main view. The image will be drawn over the background color,
-      so if it has (semi-)transparent pixels, in those pixels the background color will be visible.
-     */
-    property url backgroundSource: "graphics/background_paper.png"
-    property var theme
+   property var theme
+
+    /*!
+      Color of the header's background.
+
+      \sa backgroundColor, footerColor
+    */
+    property color headerColor: styledItem.headerColor
+
+    /*!
+      Color of the background.
+
+      The background is usually a single color. However if \l headerColor
+      or \l footerColor are set then a gradient of colors will be drawn.
+
+      \sa footerColor, headerColor
+    */
+    property color backgroundColor: styledItem.backgroundColor
+
+    /*!
+      Color of the footer's background.
+
+      \sa backgroundColor, headerColor
+    */
+    property color footerColor: styledItem.footerColor
 
     Gradient {
         id: backgroundGradient
-        GradientStop { position: 0.0; color: styledItem.headerColor }
-        GradientStop { position: 0.83; color: styledItem.backgroundColor }
-        GradientStop { position: 1.0; color: styledItem.footerColor }
+        GradientStop { position: 0.0; color: mainViewStyle.headerColor }
+        GradientStop { position: 0.83; color: mainViewStyle.backgroundColor }
+        GradientStop { position: 1.0; color: mainViewStyle.footerColor }
     }
 
     Rectangle {
         id: backgroundColor
         anchors.fill: parent
-        color: styledItem.backgroundColor
+        color: mainViewStyle.backgroundColor
         gradient: internals.isGradient ? backgroundGradient : null
     }
 
-    Image {
-        id: backgroundTexture
-        anchors.fill: parent
-        source: mainViewStyle.theme.name === "Ambiance" ? mainViewStyle.backgroundSource : ""
-        fillMode: Image.Tile
-        asynchronous: true
-        cache: false
-        visible: status === Image.Ready
-    }
-
     QtObject {
         id: internals
-        property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||
-                                  styledItem.backgroundColor != styledItem.footerColor
+        property bool isGradient: mainViewStyle.backgroundColor != mainViewStyle.headerColor ||
+                                  mainViewStyle.backgroundColor != mainViewStyle.footerColor
+
         /*
           As we don't know the order the property bindings and onXXXChanged signals are evaluated
           we should rely only on one property when changing the theme to avoid intermediate
@@ -65,8 +74,7 @@
 
           Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
           */
-        property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" :
-                                (isGradient ? "SuruGradient" : "SuruDark")
+        property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" : "SuruDark"
     }
 
     // automatically select the appropriate theme depending on the background colors

=== modified file 'qml/Stages/PageHeadStyle.qml'
--- qml/Stages/PageHeadStyle.qml	2014-08-27 18:50:43 +0000
+++ qml/Stages/PageHeadStyle.qml	2015-10-26 15:26:58 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Styles 1.1 as Style
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Styles 1.3 as Style
 
 // FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme
 Style.PageHeadStyle {

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-09-21 13:37:47 +0000
+++ qml/Stages/PhoneStage.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 import Unity.Session 0.1

=== modified file 'qml/Stages/ShimStage.qml'
--- qml/Stages/ShimStage.qml	2015-04-21 19:43:25 +0000
+++ qml/Stages/ShimStage.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: shimStage

=== modified file 'qml/Stages/Splash.qml'
--- qml/Stages/Splash.qml	2015-07-10 15:55:50 +0000
+++ qml/Stages/Splash.qml	2015-10-26 15:26:58 +0000
@@ -15,11 +15,11 @@
 */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes 1.3
 import "../Components"
 
-import Ubuntu.Components.Themes.Ambiance 1.1 as Ambiance
+import Ubuntu.Components.Themes.Ambiance 1.3 as Ambiance
 
 Item {
     id: root
@@ -62,17 +62,17 @@
                                                                                       : root.footerColor
 
         // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
-        property var theme: QtObject {
+        readonly property var fakeTheme: QtObject {
             property string name
             property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
-                                                          import Ubuntu.Components.Themes.%1 1.1;\
-                                                          Palette {}".arg(styledItem.theme.name),
+                                                          import Ubuntu.Components.Themes.%1 1.3;\
+                                                          Palette {}".arg(styledItem.fakeTheme.name),
                                                          styledItem, "dynamicPalette");
         }
 
         // FIXME: should instead use future toolkit API:
         // style: theme.createStyleComponent("MainViewStyle.qml", styledItem)
-        style: Component { MainViewStyle {theme: styledItem.theme} }
+        style: Component { MainViewStyle {theme: styledItem.fakeTheme} }
     }
 
     StyledItem {
@@ -89,13 +89,13 @@
         property string title
         property var tabsModel
         property var config: QtObject {
-            property color foregroundColor: styledItem.theme.palette.selected.backgroundText
+            property color foregroundColor: styledItem.fakeTheme.palette.selected.backgroundText
             property var sections: QtObject {}
         }
 
         // FIXME: should instead use future toolkit API:
         // style: theme.createStyleComponent("PageHeadStyle.qml", header)
-        style: Component { PageHeadStyle {theme: styledItem.theme} }
+        style: Component { PageHeadStyle {theme: styledItem.fakeTheme} }
     }
 
     Image {
@@ -121,14 +121,13 @@
         visible: d.showIcon
 
         radius: "medium"
-        borderSource: "none"
-
-        image: Image {
+        aspect: UbuntuShape.Flat
+        sourceFillMode: Image.PreserveAspectCrop
+        source: Image {
             id: iconImage
             sourceSize.width: iconShape.width
             sourceSize.height: iconShape.height
             source: d.showIcon ? root.icon : ""
-            fillMode: Image.PreserveAspectCrop
         }
     }
 
@@ -139,7 +138,7 @@
         anchors.topMargin: units.gu(2)
         fontSize: "large"
 
-        color: styledItem.theme.palette.selected.backgroundText
+        color: styledItem.fakeTheme.palette.selected.backgroundText
         visible: d.showIcon
     }
 

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2015-09-21 13:10:02 +0000
+++ qml/Stages/SpreadDelegate.qml	2015-10-26 15:26:58 +0000
@@ -19,7 +19,7 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 FocusScope {

=== modified file 'qml/Stages/SpreadMaths.qml'
--- qml/Stages/SpreadMaths.qml	2015-07-14 16:16:42 +0000
+++ qml/Stages/SpreadMaths.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1
 
 Item {

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-09-30 14:25:00 +0000
+++ qml/Stages/SurfaceContainer.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
 */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1 // For TouchGate
 import Utils 0.1 // for InputWatcher
 import Unity.Application 0.1 // for MirSurfaceItem

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2015-08-03 13:47:44 +0000
+++ qml/Stages/TabletStage.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 import Utils 0.1

=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
--- qml/Stages/TransformedSpreadDelegate.qml	2015-04-28 20:20:23 +0000
+++ qml/Stages/TransformedSpreadDelegate.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.0
 import Utils 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 SpreadDelegate {
     id: root

=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
--- qml/Stages/TransformedTabletSpreadDelegate.qml	2015-03-06 04:44:11 +0000
+++ qml/Stages/TransformedTabletSpreadDelegate.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.0
 import Utils 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 SpreadDelegate {

=== modified file 'qml/Stages/WindowDecoration.qml'
--- qml/Stages/WindowDecoration.qml	2015-10-19 19:05:23 +0000
+++ qml/Stages/WindowDecoration.qml	2015-10-26 15:26:58 +0000
@@ -15,8 +15,12 @@
  */
 
 import QtQuick 2.3
+<<<<<<< TREE
 import Unity.Application 0.1 // For Mir singleton
 import Ubuntu.Components 1.1
+=======
+import Ubuntu.Components 1.3
+>>>>>>> MERGE-SOURCE
 import "../Components"
 
 MouseArea {

=== modified file 'qml/Stages/WindowResizeArea.qml'
--- qml/Stages/WindowResizeArea.qml	2015-09-29 12:48:46 +0000
+++ qml/Stages/WindowResizeArea.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1
 import Unity.Application 0.1 // for Mir.cursorName
 

=== removed file 'qml/Stages/graphics/[e-mail]'
Binary files qml/Stages/graphics/[e-mail]	2014-08-06 20:38:48 +0000 and qml/Stages/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'qml/Tutorial/Arrow.qml'
--- qml/Tutorial/Arrow.qml	2014-12-18 23:32:42 +0000
+++ qml/Tutorial/Arrow.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/Slider.qml'
--- qml/Tutorial/Slider.qml	2015-01-09 21:51:24 +0000
+++ qml/Tutorial/Slider.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/Tick.qml'
--- qml/Tutorial/Tick.qml	2015-01-06 14:46:52 +0000
+++ qml/Tutorial/Tick.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 MouseArea {
     implicitHeight: tick.height

=== modified file 'qml/Tutorial/Tutorial.qml'
--- qml/Tutorial/Tutorial.qml	2015-08-20 15:05:39 +0000
+++ qml/Tutorial/Tutorial.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/TutorialBottom.qml'
--- qml/Tutorial/TutorialBottom.qml	2015-04-10 21:16:37 +0000
+++ qml/Tutorial/TutorialBottom.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import "../Components"
 import "." as LocalComponents

=== modified file 'qml/Tutorial/TutorialBottomFinish.qml'
--- qml/Tutorial/TutorialBottomFinish.qml	2015-01-06 14:46:52 +0000
+++ qml/Tutorial/TutorialBottomFinish.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "." as LocalComponents
 
 TutorialPage {

=== modified file 'qml/Tutorial/TutorialContent.qml'
--- qml/Tutorial/TutorialContent.qml	2015-08-20 15:05:39 +0000
+++ qml/Tutorial/TutorialContent.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/TutorialLeft.qml'
--- qml/Tutorial/TutorialLeft.qml	2015-06-16 22:25:29 +0000
+++ qml/Tutorial/TutorialLeft.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "." as LocalComponents
 
 TutorialPage {

=== modified file 'qml/Tutorial/TutorialLeftFinish.qml'
--- qml/Tutorial/TutorialLeftFinish.qml	2015-01-06 14:46:52 +0000
+++ qml/Tutorial/TutorialLeftFinish.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "." as LocalComponents
 
 TutorialPage {

=== modified file 'qml/Tutorial/TutorialPage.qml'
--- qml/Tutorial/TutorialPage.qml	2015-01-09 21:51:24 +0000
+++ qml/Tutorial/TutorialPage.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Showable {

=== modified file 'qml/Tutorial/TutorialRight.qml'
--- qml/Tutorial/TutorialRight.qml	2015-02-18 21:31:54 +0000
+++ qml/Tutorial/TutorialRight.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 import "../Components"

=== modified file 'qml/Wizard/CheckableSetting.qml'
--- qml/Wizard/CheckableSetting.qml	2014-11-14 17:47:00 +0000
+++ qml/Wizard/CheckableSetting.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Empty {
     id: listItem
@@ -77,7 +77,7 @@
                 rightMargin: listItem.rightMargin
             }
             wrapMode: Text.Wrap
-            linkColor: Theme.palette.normal.foregroundText
+            linkColor: theme.palette.normal.foregroundText
             onLinkActivated: listItem.linkActivated(link)
         }
     }

=== modified file 'qml/Wizard/Page.qml'
--- qml/Wizard/Page.qml	2015-03-13 10:07:57 +0000
+++ qml/Wizard/Page.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     readonly property real buttonMargin: units.gu(2)
@@ -57,7 +57,7 @@
         }
         wrapMode: Text.Wrap
         text: title
-        color: Theme.palette.normal.baseText
+        color: theme.palette.normal.baseText
         font.pixelSize: units.gu(4)
     }
 

=== modified file 'qml/Wizard/Pages.qml'
--- qml/Wizard/Pages.qml	2015-03-03 14:42:10 +0000
+++ qml/Wizard/Pages.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import Wizard 0.1
 import "../Components"

=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- qml/Wizard/Pages/10-welcome.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2015-10-26 15:26:58 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 import Ubuntu.SystemSettings.LanguagePlugin 1.0
 import Wizard 0.1
 import ".." as LocalComponents

=== modified file 'qml/Wizard/Pages/20-sim.qml'
--- qml/Wizard/Pages/20-sim.qml	2015-05-19 18:56:17 +0000
+++ qml/Wizard/Pages/20-sim.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import MeeGo.QOfono 0.2
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {

=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
--- qml/Wizard/Pages/30-passwd-type.qml	2015-03-13 10:07:57 +0000
+++ qml/Wizard/Pages/30-passwd-type.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents
 
@@ -111,13 +111,13 @@
 
             Component.onCompleted: {
                 // A visible selected background looks bad in ListItem widgets with our theme
-                originalBackground = Theme.palette.selected.background
-                Theme.palette.selected.background = "transparent"
+                originalBackground = theme.palette.selected.background
+                theme.palette.selected.background = "transparent"
             }
 
             Component.onDestruction: {
                 // Restore original theme background
-                Theme.palette.selected.background = originalBackground
+                theme.palette.selected.background = originalBackground
             }
         }
     }

=== modified file 'qml/Wizard/Pages/40-wifi.qml'
--- qml/Wizard/Pages/40-wifi.qml	2015-02-03 15:00:26 +0000
+++ qml/Wizard/Pages/40-wifi.qml	2015-10-26 15:26:58 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.0
 import QMenuModel 0.1 as QMenuModel
 import QtSystemInfo 5.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Settings.Menus 0.1 as Menus
 import ".." as LocalComponents
 

=== modified file 'qml/Wizard/Pages/50-location.qml'
--- qml/Wizard/Pages/50-location.qml	2015-07-21 09:08:49 +0000
+++ qml/Wizard/Pages/50-location.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * 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
@@ -18,7 +18,7 @@
 import AccountsService 0.1
 import QMenuModel 0.1 as QMenuModel
 import Qt.labs.folderlistmodel 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {
@@ -98,7 +98,7 @@
                 anchors.leftMargin: hereCheck.labelOffset
                 anchors.right: parent.right
                 wrapMode: Text.Wrap
-                linkColor: Theme.palette.normal.foregroundText
+                linkColor: theme.palette.normal.foregroundText
                 // Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
                 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
                 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))

=== modified file 'qml/Wizard/Pages/60-reporting.qml'
--- qml/Wizard/Pages/60-reporting.qml	2015-10-05 02:14:13 +0000
+++ qml/Wizard/Pages/60-reporting.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.Diagnostics 1.0
 import ".." as LocalComponents
 

=== modified file 'qml/Wizard/Pages/80-finished.qml'
--- qml/Wizard/Pages/80-finished.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/80-finished.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {

=== modified file 'qml/Wizard/Pages/here-terms.qml'
--- qml/Wizard/Pages/here-terms.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/here-terms.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -17,7 +17,7 @@
 import QtQuick 2.3
 import AccountsService 0.1
 import Qt.labs.folderlistmodel 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Web 0.2
 import ".." as LocalComponents
 
@@ -102,7 +102,7 @@
             anchors.left: parent.left
             anchors.right: parent.right
             wrapMode: Text.Wrap
-            linkColor: Theme.palette.normal.foregroundText
+            linkColor: theme.palette.normal.foregroundText
             onLinkActivated: {
                 webview.url = link
                 termsLabel.visible = false

=== modified file 'qml/Wizard/Pages/passwd-confirm.qml'
--- qml/Wizard/Pages/passwd-confirm.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/passwd-confirm.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents
 import "../../Components" as UnityComponents

=== modified file 'qml/Wizard/Pages/passwd-set.qml'
--- qml/Wizard/Pages/passwd-set.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/passwd-set.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents
 import "../../Components" as UnityComponents

=== modified file 'qml/Wizard/StackButton.qml'
--- qml/Wizard/StackButton.qml	2014-11-14 17:47:00 +0000
+++ qml/Wizard/StackButton.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: stackButton
@@ -32,7 +32,7 @@
         anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
         anchors.right: parent.right
-        color: enabled ? Theme.palette.selected.backgroundText : Qt.darker(Theme.palette.selected.backgroundText, 1.5)
+        color: enabled ? theme.palette.selected.backgroundText : Qt.darker(theme.palette.selected.backgroundText, 1.5)
         text: {
             if (backArrow) {
                 // Translators: This is the arrow for "Back" buttons

=== modified file 'qml/Wizard/Wizard.qml'
--- qml/Wizard/Wizard.qml	2015-03-11 14:48:45 +0000
+++ qml/Wizard/Wizard.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Wizard 0.1
 import "../Components"
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-09-21 09:42:30 +0000
+++ tests/CMakeLists.txt	2015-10-26 15:26:58 +0000
@@ -132,3 +132,4 @@
 add_subdirectory(plugins)
 add_subdirectory(qmltests)
 add_subdirectory(whitespace)
+add_subdirectory(sdk)

=== modified file 'tests/autopilot/unity8/dash.py'
--- tests/autopilot/unity8/dash.py	2015-09-03 07:44:51 +0000
+++ tests/autopilot/unity8/dash.py	2015-10-26 15:26:58 +0000
@@ -158,7 +158,7 @@
     def enter_search_query(self, query, keyboard):
         current_header = self._get_current_page_header()
         search_button = \
-            current_header.select_single(objectName="search_header_button")
+            current_header.select_single(objectName="search_action_button")
         self.pointing_device.move(
             search_button.globalRect.x + search_button.width / 2,
             search_button.globalRect.y + search_button.height / 2)
@@ -224,7 +224,7 @@
         """
         category_element = self._get_category_element(category)
         icon = category_element.wait_select_single(
-            'AbstractButton', title=title)
+            'UCAbstractButton', title=title)
         list_view = self.select_single(
             ListViewWithPageHeader, objectName='categoryListView')
         list_view.swipe_child_into_view(icon)
@@ -247,7 +247,7 @@
         """
         category_element = self._get_category_element(category)
         see_all = category_element.select_single(objectName='seeAll')
-        application_cards = category_element.select_many('AbstractButton')
+        application_cards = category_element.select_many('UCAbstractButton')
 
         application_cards = sorted(
             (card for card in application_cards

=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/cardcreator/1.res	2015-10-26 15:26:58 +0000
@@ -2,7 +2,7 @@
                 id: root; 
                 property var components; 
                 property var cardData; 
-                property var artShapeBorderSource: undefined; 
+                property string artShapeStyle: "inset"; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
                 property int titleAlignment: Text.AlignLeft; 
@@ -14,7 +14,6 @@
                 implicitWidth: childrenRect.width; 
                 enabled: true;
 
-onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
 Item  { 
                             id: artShapeHolder; 
@@ -30,10 +29,9 @@
                                 sourceComponent: Item {
                                     id: artShape;
                                     objectName: "artShape";
-                                    property bool doShapeItem: components["art"]["conciergeMode"] !== true;
+                                    readonly property bool doShapeItem: components["art"]["conciergeMode"] !== true;
                                     visible: image.status == Image.Ready;
                                     readonly property alias image: artImage;
-                                    property alias borderSource: artShapeShape.borderSource;
                                     ShaderEffectSource {
                                         id: artShapeSource;
                                         sourceItem: artImage;
@@ -42,16 +40,17 @@
                                         height: 1;
                                         hideSource: doShapeItem;
                                     }
-                                    Shape {
+                                    UbuntuShape {
                                         id: artShapeShape;
-                                        image: artShapeSource;
+                                        source: artShapeSource;
                                         anchors.fill: parent;
                                         visible: doShapeItem;
                                         radius: "medium";
+                                        aspect: root.artShapeStyle === "inset" ? UbuntuShape.Inset : UbuntuShape.Flat;
                                     }
                                     readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
                                     readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1; 
-                                    Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
+                                    Component.onCompleted: { updateWidthHeightBindings(); }
                                     Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } 
                                     function updateWidthHeightBindings() { 
                                         if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { 
@@ -87,7 +86,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 

=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2015-10-26 15:26:58 +0000
@@ -2,7 +2,7 @@
                 id: root; 
                 property var components; 
                 property var cardData; 
-                property var artShapeBorderSource: undefined; 
+                property string artShapeStyle: "inset"; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
                 property int titleAlignment: Text.AlignLeft; 
@@ -23,11 +23,12 @@
                                 sourceComponent: UbuntuShape { 
                                     objectName: "background"; 
                                     radius: "medium"; 
-                                    color: getColor(0) || "white"; 
-                                    gradientColor: getColor(1) || color; 
-                                    anchors.fill: parent; 
-                                    image: backgroundImage.source ? backgroundImage : null; 
-                                    property real luminance: Style.luminance(color); 
+                                    backgroundColor: getColor(0) || "white"; 
+                                    secondaryBackgroundColor: getColor(1) || backgroundColor; 
+                                    backgroundMode: UbuntuShape.VerticalGradient;
+                                    anchors.fill: parent;
+                                    source: backgroundImage.source ? backgroundImage : null; 
+                                    property real luminance: Style.luminance(backgroundColor); 
                                     property Image backgroundImage: Image { 
                                         objectName: "backgroundImage"; 
                                         source: { 
@@ -88,7 +89,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -108,7 +109,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2015-10-26 15:26:58 +0000
@@ -2,7 +2,7 @@
                 id: root; 
                 property var components; 
                 property var cardData; 
-                property var artShapeBorderSource: undefined; 
+                property string artShapeStyle: "inset"; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
                 property int titleAlignment: Text.AlignLeft; 
@@ -14,7 +14,6 @@
                 implicitWidth: childrenRect.width; 
                 enabled: true;
 
-onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
 Item  { 
                             id: artShapeHolder; 
@@ -30,10 +29,9 @@
                                 sourceComponent: Item {
                                     id: artShape;
                                     objectName: "artShape";
-                                    property bool doShapeItem: components["art"]["conciergeMode"] !== true;
+                                    readonly property bool doShapeItem: components["art"]["conciergeMode"] !== true;
                                     visible: image.status == Image.Ready;
                                     readonly property alias image: artImage;
-                                    property alias borderSource: artShapeShape.borderSource;
                                     ShaderEffectSource {
                                         id: artShapeSource;
                                         sourceItem: artImage;
@@ -42,16 +40,17 @@
                                         height: 1;
                                         hideSource: doShapeItem;
                                     }
-                                    Shape {
+                                    UbuntuShape {
                                         id: artShapeShape;
-                                        image: artShapeSource;
+                                        source: artShapeSource;
                                         anchors.fill: parent;
                                         visible: doShapeItem;
                                         radius: "medium";
+                                        aspect: root.artShapeStyle === "inset" ? UbuntuShape.Inset : UbuntuShape.Flat;
                                     }
                                     readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
                                     readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;
-                                    Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
+                                    Component.onCompleted: { updateWidthHeightBindings(); }
                                     Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }
                                     function updateWidthHeightBindings() {
                                         if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {
@@ -87,7 +86,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -107,7 +106,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/cardcreator/4.res	2015-10-26 15:26:58 +0000
@@ -2,7 +2,7 @@
                 id: root; 
                 property var components; 
                 property var cardData; 
-                property var artShapeBorderSource: undefined; 
+                property string artShapeStyle: "inset"; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null;
                 property int titleAlignment: Text.AlignLeft;
@@ -72,7 +72,7 @@
                     wrapMode: Text.Wrap; 
                     maximumLineCount: 2; 
                     font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                    color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                    color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                     visible: showHeader ; 
                     width: undefined;
                     text: root.title; 
@@ -92,7 +92,7 @@
                         maximumLineCount: 1; 
                         fontSize: "x-small"; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                         visible: titleLabel.visible && titleLabel.text; 
                         text: cardData && cardData["subtitle"] || ""; 
                         font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2015-10-26 15:26:58 +0000
@@ -2,7 +2,7 @@
                 id: root; 
                 property var components; 
                 property var cardData; 
-                property var artShapeBorderSource: undefined; 
+                property string artShapeStyle: "inset"; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
                 property int titleAlignment: Text.AlignLeft; 
@@ -14,7 +14,6 @@
                 implicitWidth: childrenRect.width; 
                 enabled: false;
 
-onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
 Item  { 
                             id: artShapeHolder; 
@@ -30,10 +29,9 @@
                                 sourceComponent: Item {
                                     id: artShape;
                                     objectName: "artShape";
-                                    property bool doShapeItem: components["art"]["conciergeMode"] !== true;
+                                    readonly property bool doShapeItem: components["art"]["conciergeMode"] !== true;
                                     visible: image.status == Image.Ready;
                                     readonly property alias image: artImage;
-                                    property alias borderSource: artShapeShape.borderSource;
                                     ShaderEffectSource {
                                         id: artShapeSource;
                                         sourceItem: artImage;
@@ -42,16 +40,17 @@
                                         height: 1;
                                         hideSource: doShapeItem;
                                     }
-                                    Shape {
+                                    UbuntuShape {
                                         id: artShapeShape;
-                                        image: artShapeSource;
+                                        source: artShapeSource;
                                         anchors.fill: parent;
                                         visible: doShapeItem;
                                         radius: "medium";
+                                        aspect: root.artShapeStyle === "inset" ? UbuntuShape.Inset : UbuntuShape.Flat;
                                     }
                                     readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
                                     readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;
-                                    Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
+                                    Component.onCompleted: { updateWidthHeightBindings(); }
                                     Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }
                                     function updateWidthHeightBindings() {
                                         if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {
@@ -75,44 +74,18 @@
                         }
 Loader { 
                             id: overlayLoader; 
-                            anchors { 
-                                left: artShapeHolder.left; 
-                                right: artShapeHolder.right; 
-                                bottom: artShapeHolder.bottom; 
-                            } 
-                            active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;
+                            readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); 
+                            anchors.fill: artShapeHolder; 
+                            active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; 
                             asynchronous: root.asynchronous; 
                             visible: showHeader && status == Loader.Ready; 
-                            sourceComponent: ShaderEffect { 
+                            sourceComponent: UbuntuShapeOverlay { 
                                 id: overlay; 
-                                height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
-                                property real luminance: Style.luminance(overlayColor);
-                                property color overlayColor: cardData && cardData["overlayColor"] || "#99000000";
-                                property var source: ShaderEffectSource { 
-                                    id: shaderSource; 
-                                    sourceItem: artShapeLoader.item; 
-                                    onVisibleChanged: if (visible) scheduleUpdate(); 
-                                    live: false; 
-                                    sourceRect: Qt.rect(0, artShapeLoader.height - overlay.height, artShapeLoader.width, overlay.height); 
-                                } 
-                                vertexShader: " 
-                                    uniform highp mat4 qt_Matrix; 
-                                    attribute highp vec4 qt_Vertex; 
-                                    attribute highp vec2 qt_MultiTexCoord0; 
-                                    varying highp vec2 coord; 
-                                    void main() { 
-                                        coord = qt_MultiTexCoord0; 
-                                        gl_Position = qt_Matrix * qt_Vertex; 
-                                    }"; 
-                                fragmentShader: " 
-                                    varying highp vec2 coord; 
-                                    uniform sampler2D source; 
-                                    uniform lowp float qt_Opacity; 
-                                    uniform highp vec4 overlayColor;
-                                    void main() { 
-                                        lowp vec4 tex = texture2D(source, coord); 
-                                        gl_FragColor = vec4(overlayColor.r, overlayColor.g, overlayColor.b, 1) * qt_Opacity * overlayColor.a * tex.a; 
-                                    }"; 
+                                property real luminance: Style.luminance(overlayColor); 
+                                aspect: UbuntuShape.Flat; 
+                                radius: "medium"; 
+                                overlayColor: cardData && cardData["overlayColor"] || "#99000000"; 
+                                overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); 
                             } 
                         }
 readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
@@ -124,14 +97,14 @@
                         left: parent.left; 
                         leftMargin: units.gu(1); 
                         top: overlayLoader.top; 
-                        topMargin: units.gu(1);
+                        topMargin: units.gu(1) + overlayLoader.height - overlayLoader.overlayHeight; 
                         } 
                         elide: Text.ElideRight; 
                         fontSize: "small"; 
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader && overlayLoader.active; 
                         width: undefined;
                         text: root.title; 
@@ -152,7 +125,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/6.res	2015-10-26 15:26:58 +0000
@@ -2,7 +2,7 @@
                 id: root;
                 property var components;
                 property var cardData;
-                property var artShapeBorderSource: undefined;
+                property string artShapeStyle: "inset"; 
                 property real fontScale: 1.0;
                 property var scopeStyle: null;
                 property int titleAlignment: Text.AlignLeft;
@@ -23,11 +23,12 @@
                                 sourceComponent: UbuntuShape { 
                                     objectName: "background"; 
                                     radius: "medium"; 
-                                    color: getColor(0) || "white"; 
-                                    gradientColor: getColor(1) || color; 
-                                    anchors.fill: parent; 
-                                    image: backgroundImage.source ? backgroundImage : null; 
-                                    property real luminance: Style.luminance(color); 
+                                    backgroundColor: getColor(0) || "white"; 
+                                    secondaryBackgroundColor: getColor(1) || backgroundColor; 
+                                    backgroundMode: UbuntuShape.VerticalGradient;
+                                    anchors.fill: parent;
+                                    source: backgroundImage.source ? backgroundImage : null; 
+                                    property real luminance: Style.luminance(backgroundColor); 
                                     property Image backgroundImage: Image { 
                                         objectName: "backgroundImage"; 
                                         source: { 
@@ -67,7 +68,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -87,7 +88,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
@@ -101,7 +102,7 @@
                             rightMargin: units.gu(1); 
                             } 
                             source: cardData && cardData["emblem"] || ""; 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             height: source != "" ? titleLabel.font.pixelSize : 0; 
                             width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
                         }

=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2015-10-26 15:26:58 +0000
@@ -2,7 +2,7 @@
                 id: root; 
                 property var components; 
                 property var cardData; 
-                property var artShapeBorderSource: undefined; 
+                property string artShapeStyle: "inset"; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
                 property int titleAlignment: Text.AlignLeft; 
@@ -23,11 +23,12 @@
                                 sourceComponent: UbuntuShape { 
                                     objectName: "background"; 
                                     radius: "medium"; 
-                                    color: getColor(0) || "white"; 
-                                    gradientColor: getColor(1) || color; 
-                                    anchors.fill: parent; 
-                                    image: backgroundImage.source ? backgroundImage : null; 
-                                    property real luminance: Style.luminance(color); 
+                                    backgroundColor: getColor(0) || "white"; 
+                                    secondaryBackgroundColor: getColor(1) || backgroundColor; 
+                                    backgroundMode: UbuntuShape.VerticalGradient;
+                                    anchors.fill: parent;
+                                    source: backgroundImage.source ? backgroundImage : null; 
+                                    property real luminance: Style.luminance(backgroundColor); 
                                     property Image backgroundImage: Image { 
                                         objectName: "backgroundImage"; 
                                         source: { 
@@ -89,7 +90,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -109,7 +110,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
@@ -122,7 +123,7 @@
                             rightMargin: units.gu(1);
                             top: subtitleLabel.bottom; 
                             } 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             fontScale: root.fontScale; 
                             model: cardData && cardData["attributes"]; 
                           }

=== modified file 'tests/plugins/Dash/cardcreator/8.res'
--- tests/plugins/Dash/cardcreator/8.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/8.res	2015-10-26 15:26:58 +0000
@@ -2,7 +2,7 @@
                 id: root; 
                 property var components; 
                 property var cardData; 
-                property var artShapeBorderSource: undefined; 
+                property string artShapeStyle: "inset"; 
                 property real fontScale: 1.0; 
                 property var scopeStyle: null; 
                 property int titleAlignment: Text.AlignLeft; 
@@ -23,11 +23,12 @@
                                 sourceComponent: UbuntuShape { 
                                     objectName: "background"; 
                                     radius: "medium"; 
-                                    color: getColor(0) || "white"; 
-                                    gradientColor: getColor(1) || color; 
+                                    backgroundColor: getColor(0) || "white"; 
+                                    secondaryBackgroundColor: getColor(1) || backgroundColor; 
+                                    backgroundMode: UbuntuShape.VerticalGradient;
                                     anchors.fill: parent; 
-                                    image: backgroundImage.source ? backgroundImage : null; 
-                                    property real luminance: Style.luminance(color); 
+                                    source: backgroundImage.source ? backgroundImage : null; 
+                                    property real luminance: Style.luminance(backgroundColor); 
                                     property Image backgroundImage: Image { 
                                         objectName: "backgroundImage"; 
                                         source: { 
@@ -80,7 +81,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white"); 
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white"); 
                         visible: showHeader ; 
                         width: parent.width - x; 
                         text: root.title; 

=== modified file 'tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml'
--- tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.3
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Dash 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Dash/tst_ScopeStyle.qml'
--- tests/plugins/Dash/tst_ScopeStyle.qml	2014-11-20 11:44:44 +0000
+++ tests/plugins/Dash/tst_ScopeStyle.qml	2015-10-26 15:26:58 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import Dash 0.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
 

=== modified file 'tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     objectName: "rightwardsLauncher"

=== modified file 'tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml'
--- tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-05-27 09:37:34 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Test 0.1
 

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml'
--- tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2013-11-22 13:43:40 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 /*

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-10-20 08:10:03 +0000
+++ tests/qmltests/CMakeLists.txt	2015-10-26 15:26:58 +0000
@@ -26,7 +26,7 @@
 add_unity8_qmlbenchmark(Dash CardBenchmark 1000)
 add_unity8_qmltest(Dash CardTool)
 add_unity8_qmltest(Dash GenericScopeView)
-add_unity8_qmltest(Dash PageHeader)
+add_unity8_qmltest(Dash DashPageHeader)
 add_unity8_qmltest(Dash PreviewListView)
 add_unity8_qmltest(Dash/Previews Preview)
 add_unity8_qmltest(Dash/Previews PreviewActions)

=== modified file 'tests/qmltests/Components/tst_Dialogs.qml'
--- tests/qmltests/Components/tst_Dialogs.qml	2015-08-24 15:39:53 +0000
+++ tests/qmltests/Components/tst_Dialogs.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 
 import "../../../qml/Components"
@@ -105,7 +105,7 @@
             var dialogsPrivate = findInvisibleChild(dialogs, "dialogsPrivate");
             dialogsPrivate.showPowerDialog();
             var dialogLoader = findInvisibleChild(dialogs, "dialogLoader");
-            tryCompare(dialogLoader.item, "focus", true);
+            tryCompare(dialogLoader.item.__foreground, "focus", true);
         }
     }
 }

=== modified file 'tests/qmltests/Components/tst_DragHandle.qml'
--- tests/qmltests/Components/tst_DragHandle.qml	2015-04-10 21:16:37 +0000
+++ tests/qmltests/Components/tst_DragHandle.qml	2015-10-26 15:26:58 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import "../../../qml/Components"
 import "tst_DragHandle"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Test 0.1
 

=== modified file 'tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml'
--- tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml	2015-04-10 21:16:37 +0000
+++ tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "../../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 Item {

=== modified file 'tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml'
--- tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2015-04-10 21:16:37 +0000
+++ tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "../../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 Showable {

=== modified file 'tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml'
--- tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2015-04-10 21:16:37 +0000
+++ tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "../../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 Showable {

=== modified file 'tests/qmltests/Components/tst_LazyImage.qml'
--- tests/qmltests/Components/tst_LazyImage.qml	2014-08-13 10:29:21 +0000
+++ tests/qmltests/Components/tst_LazyImage.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,2015 Canonical Ltd.
  *
  * 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
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import "../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import "tst_LazyImage"
 
@@ -32,7 +32,7 @@
             rightMargin: 2 * parent.width / 3
         }
 
-        color: Theme.palette.normal.baseText
+        color: theme.palette.normal.baseText
 
         Column {
             anchors { fill: parent; margins: units.gu(5) }

=== modified file 'tests/qmltests/Components/tst_LazyImage/ImageControls.qml'
--- tests/qmltests/Components/tst_LazyImage/ImageControls.qml	2013-12-17 16:04:47 +0000
+++ tests/qmltests/Components/tst_LazyImage/ImageControls.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Components"
 
 Row {

=== modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
--- tests/qmltests/Components/tst_Lockscreen.qml	2015-03-18 12:32:08 +0000
+++ tests/qmltests/Components/tst_Lockscreen.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Rectangle {

=== modified file 'tests/qmltests/Components/tst_Rating.qml'
--- tests/qmltests/Components/tst_Rating.qml	2014-02-13 17:00:06 +0000
+++ tests/qmltests/Components/tst_Rating.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,2015 Canonical Ltd.
  *
  * 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
@@ -17,14 +17,14 @@
 import QtQuick 2.0
 import QtTest 1.0
 import "../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Rectangle {
     id: root
     width: units.gu(40)
     height: units.gu(10)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     Rating {
         id: rating

=== modified file 'tests/qmltests/Components/tst_ResponsiveGridView.qml'
--- tests/qmltests/Components/tst_ResponsiveGridView.qml	2014-01-27 18:03:45 +0000
+++ tests/qmltests/Components/tst_ResponsiveGridView.qml	2015-10-26 15:26:58 +0000
@@ -18,8 +18,8 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Components"
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Item {

=== modified file 'tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml'
--- tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	2014-12-19 14:51:35 +0000
+++ tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	2015-10-26 15:26:58 +0000
@@ -18,8 +18,8 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Components"
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components 1.3
 import Utils 0.1
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Components/tst_Showable.qml'
--- tests/qmltests/Components/tst_Showable.qml	2015-04-10 15:10:51 +0000
+++ tests/qmltests/Components/tst_Showable.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import ".."
 import "../../../qml/Components"

=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
--- tests/qmltests/Dash/Previews/tst_Preview.qml	2015-03-12 16:08:14 +0000
+++ tests/qmltests/Dash/Previews/tst_Preview.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * 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
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(60)
     height: units.gu(60)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     Item {
         id: shell

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewActions.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 
 Rectangle {

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 import QtMultimedia 5.0
@@ -25,7 +25,7 @@
     id: root
     width: units.gu(60)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var tracksModel0: {
         "tracks": [ ]

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewComment.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewComment.qml	2015-07-01 15:48:29 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewComment.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml	2015-07-06 11:15:25 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml	2015-10-26 15:26:58 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-09-08 05:15:59 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property string longText: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh."
     property string longText2: "This is a very very very long text. 1 This is a very very very long text. 2 This is a very very very long text. 3 This is a very very very long text. 4 This is a very very very long text. 5 This is a very very very long text. 6 This is a very very very long text. 7 This is a very very very long text. 8 This is a very very very long text. 9 This is a very very very long text. 10 This is a very very very long text. 11 This is a very very very long text."
@@ -319,9 +319,9 @@
                 previewWidgetFactory.widgetType = allWidgetsModel.get(i).type;
                 previewWidgetFactory.active = true;
 
-                // Wait for the height ot settle by waiting twice the time of the
+                // Wait for the height ot settle by waiting four times the time of the
                 // longest of the height behaviour animations
-                wait(UbuntuAnimation.SnapDuration * 2);
+                wait(UbuntuAnimation.SnapDuration * 4);
 
                 // Check the item inside the expandable has the same height
                 // as the one straight from the factory

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewHeader.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2015-05-06 15:05:06 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2015-10-26 15:26:58 +0000
@@ -149,7 +149,7 @@
             tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
             var mascot = findChild(previewHeader, "mascotShape");
             tryCompare(mascot, "visible", true);
-            tryCompare(mascot.image, "status", Image.Ready);
+            tryCompare(mascot.source, "status", Image.Ready);
         }
     }
 }

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml	2015-07-08 12:52:51 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 
 Rectangle {
@@ -104,7 +104,7 @@
 
             var button = findChild(root, "button" + buttonId);
             var image = findChildsByType(button, "QQuickImage")[0];
-            var label = findChildsByType(button, "Label")[0];
+            var label = findChildsByType(button, "UCLabel")[0];
 
             compare(image.source, buttonIcon);
             compare(label.text, buttonLabel);

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewPayments.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewPayments.qml	2015-01-09 09:40:52 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewPayments.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: root

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewProgress.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2014-02-12 16:28:08 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2015-10-26 15:26:58 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: root

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var reviewsModel0: {
         "reviews": [ ]

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-05-08 13:12:02 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var widgetData0: { "visible": "both", "required": "both", author: "Some dude", rating: 4.5, review: "Very cool app" }
 

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2015-02-17 15:06:33 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property real validInputRating: 1
     property real invalidInputRating: -1

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2015-04-13 11:08:53 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var widgetDataComplete: {
         "title": "Title here longa long long long long long long long long long long",

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2014-08-01 09:55:04 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var widgetDataComplete: {
         "title": "Title here",

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-07-21 07:22:23 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * 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
@@ -23,7 +23,7 @@
     id: root
     width: units.gu(60)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     PreviewWidgetFactory {
         id: factory

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2015-05-06 15:05:06 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2015-10-26 15:26:58 +0000
@@ -41,7 +41,7 @@
 
     Loader {
         id: loader
-        anchors.centerIn: parent
+        width: parent.width
         sourceComponent: PreviewZoomableImage {
             widgetData: widgetData0
         }

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	2014-08-27 08:07:33 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	2014-08-26 14:21:29 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	2015-10-26 15:26:58 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2015-09-18 10:33:09 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2015-10-26 15:26:58 +0000
@@ -1,5 +1,5 @@