Merge lp:~zsombi/ubuntu-ui-toolkit/palette into lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test

[Zsombor Egri]

Test for Palette fixes MR.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1775
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/34/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/98/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/34/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1775
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/36/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/99/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/36/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

wowzee, really cool!

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1775
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/35/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/101/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/35/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1775
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/37/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/102/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/37/rebuild

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-12-19 10:06:24 +0000
+++ components.api	2016-01-15 07:23:58 +0000
@@ -498,6 +498,11 @@
     property string name
 Ubuntu.Components.Icon 1.1: Icon
     property url source
+Ubuntu.Components.Icon 1.3: Item
+    property color color
+    property color keyColor
+    property string name
+    property url source
 Ubuntu.Components.InverseMouse 1.0 0.1 UCInverseMouse: Mouse
 Ubuntu.Components.InverseMouseArea 1.0 0.1 InverseMouseAreaType: MouseArea
     function bool contains(QPointF point)
@@ -715,6 +720,7 @@
 Ubuntu.Components.Page 1.1 Page11: Page10
     readonly property PageHeadConfiguration head
 Ubuntu.Components.Page 1.3: PageTreeNode
+    readonly property ActionContext actionContext
     property Flickable flickable
     readonly property PageHeadConfiguration head
     property Item header
@@ -830,8 +836,10 @@
     property PaletteValues normal
     property PaletteValues selected
 Ubuntu.Components.Themes.Palette 1.3: QtObject
+    property PaletteValues inactive
     property PaletteValues normal
     property PaletteValues selected
+    property PaletteValues selectedInactive
 Ubuntu.Components.Themes.PaletteValues 0.1: QtObject
     property color background
     property color backgroundText
@@ -845,7 +853,11 @@
     property color overlayText
     property color selection
 Ubuntu.Components.Themes.PaletteValues 1.3: QtObject
+    property color activity
+    property color activityText
     property color background
+    property color backgroundSecondaryText
+    property color backgroundTertiaryText
     property color backgroundText
     property color base
     property color baseText
@@ -853,9 +865,18 @@
     property color fieldText
     property color foreground
     property color foregroundText
+    property color negative
+    property color negativeText
     property color overlay
+    property color overlaySecondaryText
     property color overlayText
+    property color positive
+    property color positiveText
+    property color raised
+    property color raisedSecondaryText
+    property color raisedText
     property color selection
+    property color selectionText
 Ubuntu.Components.Panel 1.0 0.1: Item
     property int align
     property bool animate
@@ -947,6 +968,7 @@
     property bool grabDismissAreaEvents
     function var show()
     function var hide()
+Ubuntu.Components.PopupContext 1.3 UCPopupContext: ActionContext
 Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3
 Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem
     property bool indeterminate
@@ -963,7 +985,10 @@
     property bool onScreen
     property bool showProgressPercentage
     property double value
-Ubuntu.Components.ProgressionSlot 1.3: Icon
+Ubuntu.Components.ProgressionSlot 1.3: Item
+    property color color
+    property color keyColor
+    property string name
     property url source
 Ubuntu.Components.ProportionalShape 1.3 UCProportionalShape: UbuntuShape
 Ubuntu.Components.PullToRefresh 1.1: StyledItem
@@ -1491,6 +1516,7 @@
     property Item pageStack
 Ubuntu.Components.Styles.ToolbarStyle 1.3: Item
     property Component defaultDelegate
+UCActionContextAttached: QtObject
 Ubuntu.Components.UCApplication 1.0 0.1: QtObject
     property string applicationName
     property QtObject inputMethod
@@ -1558,6 +1584,28 @@
     readonly property color purple
     readonly property color red
     readonly property color warmGrey
+Ubuntu.Components.UbuntuColors 1.3: QtObject singleton
+    readonly property color ash
+    readonly property color blue
+    readonly property color coolGrey
+    readonly property color darkAubergine
+    readonly property color darkGrey
+    readonly property color graphite
+    readonly property color green
+    property Gradient greyGradient
+    readonly property color inkstone
+    readonly property color jet
+    readonly property color lightAubergine
+    readonly property color lightGrey
+    readonly property color midAubergine
+    readonly property color orange
+    property Gradient orangeGradient
+    readonly property color porcelain
+    readonly property color purple
+    readonly property color red
+    readonly property color silk
+    readonly property color slate
+    readonly property color warmGrey
 Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
     property int expandedIndex
 Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-21 21:09:04 +0000
+++ debian/changelog	2016-01-15 07:23:58 +0000
@@ -1,3 +1,43 @@
+ubuntu-ui-toolkit (1.3.1795+16.04.20160106-0ubuntu1) xenial; urgency=medium
+
+  [ Christian Dywan ]
+  * Fix typo in runtest.sh: $? is the error code, not $*.
+  * Document use of RegExpValidator for password/ PIN input.
+  * Include filename derived QML class name in .api. Fixes LP: #1527138
+  * Use edit-clear for clear button instead of the invalid clear search.
+  * No transparency in focus outline.
+  * Give the original Toolbar its name back.
+  * Fix typo in runtest.sh: $? is the error code, not $*.
+  * Use resolved filename but add fragment. Fixes LP: #1401920 
+
+  [ Zoltán Balogh ]
+  * Use build root for the Gestures library instead of relative path.
+  * Fix the tests for the gallery change
+  
+  [ Zsombor Egri ]
+  * Add mnemonics support to Action. Fixes LP: #1527527
+  * Use original Image.source in image extension when no scaling is needed in 
+    order to keep the formatting which would be otherwise removed from a 
+    resolved file URL. Fixes LP: #1401920
+  * Move UbuntuListView 1.3 code into one single file. Fixes LP: #1523815
+ 
+  [ Albert Astals Cid ]
+  * Add UCTestExtras::removeTimeConstraintsFromSwipeArea
+    For that needed to move ucswipearea.cpp from UbuntuComponents to 
+    UbuntuGestures but made it in a private header so we don't have to care much
+    for the API/ABI stability for now.
+  
+  [ Andrea Bernabei ]
+  * make scrollbars tests more robust.
+
+  [ Tim Peeters ]
+  * Update font sizes. Fixes LP: #1528263  
+
+  [ CI Train Bot ]
+  * No-change rebuild.
+
+ -- Zoltan Balogh <[e-mail]>  Wed, 06 Jan 2016 04:27:02 +0000
+
 ubuntu-ui-toolkit (1.3.1778+16.04.20151221-0ubuntu1) xenial; urgency=medium
 
   [ Tim Peeters ]

=== modified file 'documentation/ubuntu-theming.qdoc'
--- documentation/ubuntu-theming.qdoc	2015-08-11 10:01:34 +0000
+++ documentation/ubuntu-theming.qdoc	2016-01-15 07:23:58 +0000
@@ -270,17 +270,11 @@
  * The extended (or even overridden) style component documents must follow the naming
  * convention, and must have the names implied by the components styled.
  *
- * SuruDark theme overrides the Ambiance theme's ListItemStyle, therefore declares the
- * ListItemStyle.qml document, with the following content:
- * \snippet Themes/SuruDark/1.3/ListItemStyle.qml 0
- *
  * The style imports the Ambiance theme module, and extends the Ambiance ListItemStyle
  * component. The same is done in the other style components. However, Palette defines
  * own values, and does not re-use Ambiance palette values.
  * \snippet Themes/SuruDark/1.3/Palette.qml 0
  *
- * The same is done with TabBarStyle and OptionSelectorStyle components.
- *
  * \note If a theme derived from SuruDark wants to override style components not present
  * in SuruDark, they must import the SuruDark's parent theme in the style component.
  * As example, if FancyTheme would want to override the SwitchStyle, it would need to

=== modified file 'examples/ubuntu-ui-toolkit-gallery/About.qml'
--- examples/ubuntu-ui-toolkit-gallery/About.qml	2015-10-23 14:46:16 +0000
+++ examples/ubuntu-ui-toolkit-gallery/About.qml	2016-01-15 07:23:58 +0000
@@ -23,7 +23,7 @@
     theme: ThemeSettings {
         name: "Ubuntu.Components.Themes.SuruDark"
         palette: Palette {
-            normal.background: UbuntuColors.darkGrey
+            normal.background: UbuntuColors.slate
         }
     }
     style: Rectangle {

=== modified file 'examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml'
--- examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2015-12-02 08:23:14 +0000
+++ examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2016-01-15 07:23:58 +0000
@@ -132,7 +132,7 @@
                 objectName: "CustomRegion1"
                 enabled: regionConfig.model >= 1
                 to: 0.3
-                property color baseColor: UbuntuColors.lightGrey
+                property color baseColor: UbuntuColors.silk
             },
             BottomEdgeRegion {
                 objectName: "CustomRegion2"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2015-07-22 13:14:43 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2016-01-15 07:23:58 +0000
@@ -33,15 +33,45 @@
             }
         }
         TemplateRow {
-            title: i18n.tr("Light grey")
-            UbuntuShape {
-                backgroundColor: UbuntuColors.lightGrey
-            }
-        }
-        TemplateRow {
-            title: i18n.tr("Dark grey")
-            UbuntuShape {
-                backgroundColor: UbuntuColors.darkGrey
+            title: i18n.tr("Porcelain")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.porcelain
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Silk")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.silk
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Ash")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.ash
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Graphite")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.graphite
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Slate")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.slate
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Inkstone")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.inkstone
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Jet")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.jet
             }
         }
         TemplateRow {

=== modified file 'examples/ubuntu-ui-toolkit-gallery/NewListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-09-28 12:26:13 +0000
+++ examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2016-01-15 07:23:58 +0000
@@ -163,7 +163,7 @@
             model: [ i18n.tr("Basic"), i18n.tr("Colored divider"), i18n.tr("Immutable"), i18n.tr("No divider") ]
             delegate: ListItemWithLabel {
                 title.text: modelData
-                color: dragging ? "lightblue" : "transparent"
+                color: dragging ? theme.palette.selected.base : "transparent"
                 divider {
                     colorFrom: modelData == i18n.tr("Colored divider") ? UbuntuColors.red : Qt.rgba(0.0, 0.0, 0.0, 0.0)
                     colorTo: modelData == i18n.tr("Colored divider") ? UbuntuColors.green : Qt.rgba(0.0, 0.0, 0.0, 0.0)

=== modified file 'examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml'
--- examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml	2015-12-15 15:08:49 +0000
+++ examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml	2016-01-15 07:23:58 +0000
@@ -81,7 +81,7 @@
                 width: label.width + units.gu(4)
                 height: parent.height
                 Rectangle {
-                    color: UbuntuColors.darkGrey
+                    color: UbuntuColors.slate
                     opacity: 0.1
                     anchors.fill: parent
                     visible: button.pressed

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Popover.qml'
--- examples/ubuntu-ui-toolkit-gallery/Popover.qml	2015-06-24 16:16:51 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Popover.qml	2016-01-15 07:23:58 +0000
@@ -21,7 +21,7 @@
 Template {
     objectName: "popoversTemplate"
 
-    head.actions: [
+    trailingActions: [
         Action {
             text: "Actions"
             iconSource: "call_icon.png"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Template.qml'
--- examples/ubuntu-ui-toolkit-gallery/Template.qml	2015-12-16 15:02:33 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Template.qml	2016-01-15 07:23:58 +0000
@@ -23,12 +23,14 @@
     default property alias content: column.children
     property alias spacing: column.spacing
     property alias scrollable: templateFlickable.interactive
+    property list<Action> trailingActions
     flickable: templateFlickable
 
     header: PageHeader {
         title: template.title
         flickable: layout.columns === 1 ? templateFlickable : null
         onFlickableChanged: exposed = true;
+        trailingActionBar.actions: trailingActions
     }
 
     ScrollView {

=== modified file 'examples/ubuntu-ui-toolkit-gallery/gallery-logging.config'
--- examples/ubuntu-ui-toolkit-gallery/gallery-logging.config	2015-12-11 10:24:51 +0000
+++ examples/ubuntu-ui-toolkit-gallery/gallery-logging.config	2016-01-15 07:23:58 +0000
@@ -4,3 +4,6 @@
 ubuntu.components.SwipeArea.ActiveTouchInfo.debug=false
 ubuntu.components.BottomEdge.debug=false
 ubuntu.components.PageTreeNode.debug=false
+ubuntu.components.Action.debug=false
+ubuntu.components.ActionContext.debug=false
+ubuntu.components.ActionProxy.debug=false

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-01-06 11:24:54 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-01-15 07:23:58 +0000
@@ -810,7 +810,7 @@
                     rightMargin: dividerThickness
                 }
                 width: (column == (d.columns - 1)) || !pageWrapper ? 0 : units.dp(1)
-                color: theme.palette.selected.background
+                color: theme.palette.normal.base
                 MouseArea {
                     id: resizerSensing
                     objectName: "Divider"
@@ -835,7 +835,7 @@
                     when: resizerSensing.pressed
                     PropertyChanges {
                         target: verticalDivider
-                        color: Qt.darker(theme.palette.normal.background, 1.5)
+                        color: Qt.darker(theme.palette.normal.background, 1.7)
                     }
                 }
                 transitions: Transition {

=== removed file 'src/Ubuntu/Components/1.3/Icon.qdoc'
--- src/Ubuntu/Components/1.3/Icon.qdoc	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/Icon.qdoc	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2014 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/>.
- */
-
-/*!
-    \qmltype Icon
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief The Icon component displays an icon from the icon theme.
-
-    The icon theme contains a set of standard icons referred to by their name.
-    Using icons whenever possible enhances consistency accross applications.
-    Each icon has a name and can have different visual representations depending
-    on the size requested.
-
-    Icons can also be colorized. Setting the \l color property will make all pixels
-    with the \l keyColor (by default #808080) colored.
-
-    Example:
-    \qml
-    Icon {
-        width: 64
-        height: 64
-        name: "search"
-    }
-    \endqml
-
-    Example of colorization:
-    \qml
-    Icon {
-        width: 64
-        height: 64
-        name: "search"
-        color: UbuntuColors.warmGrey
-    }
-    \endqml
-
-    Icon themes are created following the
-    \l{http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}{Freedesktop Icon Theme Specification}.
-*/
-
-/*!
-   The name of the icon to display.
-   \qmlproperty string Icon::name
-
-   If both name and source are set, name will be ignored.
-
-   \note The complete list of icons available in Ubuntu is not published yet.
-       For now please refer to the folders where the icon themes are installed:
-       \list
-         \li Ubuntu Touch: \l file:/usr/share/icons/suru
-         \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
-       \endlist
-       These 2 separate icon themes will be merged soon.
-*/
-
-/*!
-   The source url of the icon to display. It has precedence over name.
-
-   If both name and source are set, name will be ignored.
-
-   \since Ubuntu.Components 1.1
-   \qmlproperty url Icon::source
-*/
-
-/*!
-   The color that all pixels that originally are of color \l keyColor should take.
-   \qmlproperty color Icon::color
-*/
-
-/*!
-   The color of the pixels that should be colorized.
-   By default it is set to #808080.
-   \qmlproperty color Icon::keyColor
-*/

=== added file 'src/Ubuntu/Components/1.3/Icon.qml'
--- src/Ubuntu/Components/1.3/Icon.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/1.3/Icon.qml	2016-01-15 07:23:58 +0000
@@ -0,0 +1,150 @@
+/*
+ * 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/>.
+ *
+ * Authors: Zsombor Egri <[e-mail]>
+ *          Loic Molinari <[e-mail]>
+ */
+
+import QtQuick 2.4
+
+/*!
+    \qmltype Icon
+    \inqmlmodule Ubuntu.Components 1.3
+    \inherits Item
+    \ingroup ubuntu
+    \brief The Icon component displays an icon from the icon theme.
+
+    The icon theme contains a set of standard icons referred to by their name.
+    Using icons whenever possible enhances consistency accross applications.
+    Each icon has a name and can have different visual representations depending
+    on the size requested.
+
+    Icons can also be colorized. Setting the \l color property will make all pixels
+    with the \l keyColor (by default #808080) colored.
+
+    Example:
+    \qml
+    Icon {
+        width: 64
+        height: 64
+        name: "search"
+    }
+    \endqml
+
+    Example of colorization:
+    \qml
+    Icon {
+        width: 64
+        height: 64
+        name: "search"
+        color: UbuntuColors.warmGrey
+    }
+    \endqml
+
+    Icon themes are created following the
+    \l{http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}{Freedesktop Icon Theme Specification}.
+*/
+
+Item {
+    id: icon
+
+    /*!
+       The name of the icon to display.
+       \qmlproperty string Icon::name
+
+       If both name and source are set, name will be ignored.
+
+       \note The complete list of icons available in Ubuntu is not published yet.
+           For now please refer to the folders where the icon themes are installed:
+           \list
+             \li Ubuntu Touch: \l file:/usr/share/icons/suru
+             \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
+           \endlist
+           These 2 separate icon themes will be merged soon.
+    */
+    property string name
+
+    /*!
+       The color that all pixels that originally are of color \l keyColor should take.
+       \qmlproperty color Icon::color
+    */
+
+    property alias color: colorizedImage.keyColorOut
+
+    /*!
+       The color of the pixels that should be colorized.
+       By default it is set to #808080.
+       \qmlproperty color Icon::keyColor
+    */
+    property alias keyColor: colorizedImage.keyColorIn
+
+    /*!
+       The source url of the icon to display. It has precedence over name.
+
+       If both name and source are set, name will be ignored.
+
+       \since Ubuntu.Components 1.1
+       \qmlproperty url Icon::source
+    */
+
+    property alias source: image.source
+
+    implicitWidth: image.implicitWidth
+    implicitHeight: image.implicitHeight
+
+    Image {
+        id: image
+        objectName: "image"
+        anchors.fill: parent
+        fillMode: Image.PreserveAspectFit
+
+        sourceSize {
+            width: icon.width
+            height: icon.height
+        }
+
+        source: icon.name ? "image://theme/%1".arg(icon.name) : ""
+
+        cache: true
+        visible: !colorizedImage.visible
+    }
+
+    ShaderEffect {
+        id: colorizedImage
+        objectName: "shader"
+
+        anchors.fill: parent
+
+        // Whether or not a color has been set.
+        visible: image.status == Image.Ready && keyColorOut != Qt.rgba(0.0, 0.0, 0.0, 0.0)
+
+        property Image source: image
+        property color keyColorOut: Qt.rgba(0.0, 0.0, 0.0, 0.0)
+        property color keyColorIn: "#808080"
+        property real threshold: 0.1
+
+        fragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            uniform sampler2D source;
+            uniform highp vec4 keyColorOut;
+            uniform highp vec4 keyColorIn;
+            uniform lowp float threshold;
+            uniform lowp float qt_Opacity;
+            void main() {
+                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
+                gl_FragColor = mix(keyColorOut * vec4(sourceColor.a), sourceColor, step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity;
+            }"
+    }
+}

=== modified file 'src/Ubuntu/Components/1.3/MainView.qml'
--- src/Ubuntu/Components/1.3/MainView.qml	2016-01-06 11:24:54 +0000
+++ src/Ubuntu/Components/1.3/MainView.qml	2016-01-15 07:23:58 +0000
@@ -162,7 +162,8 @@
             // don't show the application header if the page has its own header.
             visible: !(internal.activePage &&
                        internal.activePage.hasOwnProperty("header") &&
-                       internal.activePage.header)
+                       internal.activePage.header) &&
+                     internal.activePage
 
             height: visible ? implicitHeight : 0
 

=== modified file 'src/Ubuntu/Components/1.3/MainViewBase.qml'
--- src/Ubuntu/Components/1.3/MainViewBase.qml	2015-12-08 18:34:40 +0000
+++ src/Ubuntu/Components/1.3/MainViewBase.qml	2016-01-15 07:23:58 +0000
@@ -159,6 +159,19 @@
         }
     }
 
+    /*!
+      \qmlproperty ActrionContext MainView::actionContext
+      \readonly
+      \since Ubuntu.Components 1.3
+      The action context of the MainView.
+      */
+    readonly property alias actionContext: localContext
+    Toolkit.PopupContext {
+        id: localContext
+        objectName: "RootContext"
+        active: true
+    }
+
     onApplicationNameChanged: {
         if (applicationName !== "") {
             i18n.domain = applicationName;

=== modified file 'src/Ubuntu/Components/1.3/Page.qml'
--- src/Ubuntu/Components/1.3/Page.qml	2015-12-08 18:34:40 +0000
+++ src/Ubuntu/Components/1.3/Page.qml	2016-01-15 07:23:58 +0000
@@ -15,12 +15,13 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.3 as Toolkit13
+import Ubuntu.Components 1.3
 import "pageUtils.js" as Utils
 
 /*!
     \qmltype Page
     \inqmlmodule Ubuntu.Components 1.1
+    \inherits StyledItem
     \ingroup ubuntu
     \brief A page is the basic Item that must be used inside the \l MainView,
         \l PageStack and \l Tabs.
@@ -69,7 +70,7 @@
     use a Page inside a Loader, but in that case do not set the anchors or size of the Loader
     so that the Page can control its width and height.
 */
-Toolkit13.PageTreeNode {
+PageTreeNode {
     id: page
     anchors {
         left: parent ? parent.left : undefined
@@ -81,6 +82,20 @@
     height: parentNode ? page.flickable ? parentNode.height : parentNode.height - internal.headerHeight : undefined
 
     /*!
+      \qmlproperty ActrionContext Page::actionContext
+      \readonly
+      \since Ubuntu.Components 1.3
+      The action context of the page.
+      */
+    readonly property alias actionContext: localContext
+    ActionContext {
+        id: localContext
+        active: page.active
+        objectName: page.objectName + "Context"
+    }
+
+    /*!
+      \since Ubuntu.Components 1.3
       The header property for this page. Setting this property will reparent the
       header to the page and disable the \l MainView's application header.
       \qml
@@ -157,13 +172,13 @@
       Deprecated: This configuration will be replaced by setting the \l header property.
      */
     readonly property alias head: headerConfig
-    Toolkit13.PageHeadConfiguration {
+    PageHeadConfiguration {
         id: headerConfig
         title: page.title
         flickable: page.flickable
     }
 
-    Toolkit13.Object {
+    Object {
         id: internal
 
         property Item previousHeader: null

=== modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
--- src/Ubuntu/Components/1.3/PageHeader.qml	2015-12-15 14:20:33 +0000
+++ src/Ubuntu/Components/1.3/PageHeader.qml	2016-01-15 07:23:58 +0000
@@ -32,7 +32,7 @@
             StyleHints {
                 foregroundColor: UbuntuColors.orange
                 backgroundColor: "black"
-                dividerColor: UbuntuColors.darkGrey
+                dividerColor: UbuntuColors.slate
             }
         }
     \endqml

=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2015-12-14 15:15:46 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2016-01-15 07:23:58 +0000
@@ -757,7 +757,6 @@
 
     //internals
 
-    opacity: enabled ? 1.0 : 0.3
     activeFocusOnPress: true
     activeFocusOnTab: true
 
@@ -827,7 +826,7 @@
         }
         // hint is shown till user types something in the field
         visible: (editor.text == "") && !editor.inputMethodComposing
-        color: theme.palette.normal.backgroundText
+        color: theme.palette.normal.base
         font: editor.font
         elide: Text.ElideRight
         wrapMode: Text.WordWrap

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-12-22 09:56:19 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2016-01-15 07:23:58 +0000
@@ -833,7 +833,6 @@
 
     // internals
 
-    opacity: enabled ? 1.0 : 0.3
     activeFocusOnPress: true
     activeFocusOnTab: true
 
@@ -977,7 +976,7 @@
         }
         // hint is shown till user types something in the field
         visible: (editor.text == "") && !editor.inputMethodComposing
-        color: theme.palette.normal.backgroundText
+        color: theme.palette.normal.base
         font: editor.font
         elide: Text.ElideRight
     }

=== modified file 'src/Ubuntu/Components/1.3/Toolbar.qml'
--- src/Ubuntu/Components/1.3/Toolbar.qml	2015-12-15 15:08:49 +0000
+++ src/Ubuntu/Components/1.3/Toolbar.qml	2016-01-15 07:23:58 +0000
@@ -35,7 +35,7 @@
                 width: label.width + units.gu(4)
                 height: parent.height
                 Rectangle {
-                    color: UbuntuColors.darkGrey
+                    color: UbuntuColors.slate
                     opacity: 0.1
                     anchors.fill: parent
                     visible: button.pressed

=== modified file 'src/Ubuntu/Components/1.3/UbuntuColors.qml'
--- src/Ubuntu/Components/1.3/UbuntuColors.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/UbuntuColors.qml	2016-01-15 07:23:58 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype UbuntuColors
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components 1.3
     \ingroup ubuntu
     \brief Singleton defining the Ubuntu color palette.
 
@@ -37,13 +37,10 @@
     \endqml
 */
 QtObject {
-    // old colors from UbuntuColors 1.0:
 
-    /*!
-      Orange. Recommended for branded elements, display progress
-      and intensity, textual links on light backgrounds.
-    */
-    readonly property color orange: "#DD4814"
+    /*---------------------------------------------------------------
+      Deprecated colors
+      ---------------------------------------------------------------*/
     /*!
       \deprecated
       Ubuntu supporting color: light aubergine
@@ -72,7 +69,7 @@
 
     /*!
       Ubuntu orange gradient
-
+      \deprecated
       \sa Button::gradient
     */
     property Gradient orangeGradient: Gradient {
@@ -81,7 +78,7 @@
     }
     /*!
       Ubuntu grey gradient
-
+      \deprecated
       \sa Button::gradient
     */
     property Gradient greyGradient: Gradient {
@@ -89,39 +86,61 @@
         GradientStop { position: 1.0; color: "#BBBBBB" }
     }
 
-    // New colors introduced in UbuntuColors 1.1:
+    /*---------------------------------------------------------------
+      Supported colors
+      ---------------------------------------------------------------*/
+    /*!
+      Orange. Recommended for branded elements, display progress
+      and intensity, textual links on light backgrounds.
+    */
+    readonly property color orange: "#E95420"
 
     /*!
+      \deprecated
       Light grey. Recommended for neutral action buttons and
       secondary text.
       \since Ubuntu.Components 1.1
      */
-    readonly property color lightGrey: "#929292"
-
-    /*!
+    readonly property color lightGrey: "#cdcdcd"
+
+    /*!
+      Silk. Recommended for neutral action buttons and
+      secondary text.
+      \since Ubuntu.Components 1.3
+     */
+    readonly property color silk: "#cdcdcd"
+
+    /*!
+      \deprecated
       Dark grey. Recommended for text and action icons.
       \since Ubuntu.Components 1.1
      */
     readonly property color darkGrey: "#5d5d5d"
 
     /*!
+      Slate. Recommended for text and action icons.
+      \since Ubuntu.Components 1.3
+     */
+    readonly property color slate: "#5d5d5d"
+
+    /*!
       Red. Recommended for negative and irreversible action
       buttons, errors and alerts.
       \since Ubuntu.Components 1.1
      */
-    readonly property color red: "#f32c36"
+    readonly property color red: "#ed3146"
 
     /*!
       Green. Recommended for positive action buttons.
       \since Ubuntu.Components 1.1
      */
-    readonly property color green: "#00a132"
+    readonly property color green: "#3eb34f"
 
     /*!
       Blue. Recommended for text selection and text cursor.
       \since Ubuntu.Components 1.1
      */
-    readonly property color blue: "#12a3d8"
+    readonly property color blue: "#19b6ee"
 
     /*!
       Purple. Recommended for proper nouns in
@@ -129,4 +148,34 @@
       \since Ubuntu.Components 1.1
      */
     readonly property color purple: "#762572"
+
+    /*!
+      Porcelain. Recommended for foregrounds.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color porcelain: "#f7f7f7"
+
+    /*!
+      Ash. Recommended for subtitles and other tertiary content.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color ash: "#888888"
+
+    /*!
+      Graphite. Recommended for coloring dark themes' background.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color graphite: "#666666"
+
+    /*!
+      Inkstone. Recommended for foreground colors in dark themes.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color inkstone: "#3b3b3b"
+
+    /*!
+      Jet. Recommended for content coloring.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color jet: "#292929"
 }

=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-12-17 13:48:23 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2016-01-15 07:23:58 +0000
@@ -131,7 +131,8 @@
              1.3/PageColumnsLayout.qml \
              1.3/ProgressionSlot.qml \
              1.3/ScrollView.qml \
-             1.3/PageHeader.qml
+             1.3/PageHeader.qml \
+             1.3/Icon.qml
 
 OTHER_FILES+= qmldir \
              1.3/CrossFadeImage.qdoc \

=== modified file 'src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml'
--- src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml	2016-01-15 07:23:58 +0000
@@ -31,7 +31,14 @@
     }
 
     elide: Text.ElideRight
-    color: selected ? UbuntuColors.orange : secondary ? overlay ? theme.palette.normal.overlayText : theme.palette.normal.backgroundText
-                                                      : overlay ? theme.palette.selected.overlayText : theme.palette.selected.backgroundText
+    color: selected
+           ? UbuntuColors.orange
+           : (secondary
+              ? (overlay
+                 ? theme.palette.normal.overlayText
+                 : theme.palette.normal.backgroundText)
+              : (overlay
+                 ? theme.palette.normal.overlayText
+                 : theme.palette.normal.backgroundText))
     opacity: label.enabled ? 1.0 : 0.5
 }

=== modified file 'src/Ubuntu/Components/Popups/1.3/Dialog.qml'
--- src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-12-14 08:27:39 +0000
+++ src/Ubuntu/Components/Popups/1.3/Dialog.qml	2016-01-15 07:23:58 +0000
@@ -180,6 +180,13 @@
                 height: childrenRect.height + foreground.margins
                 onWidthChanged: updateChildrenWidths();
 
+                // put the context into this component to save ActionContext lookup
+                PopupContext {
+                    id: localContext
+                    objectName: dialog.objectName + "DialogContext"
+                    active: foreground.visible
+                }
+
                 Label {
                     horizontalAlignment: Text.AlignHCenter
                     text: dialog.title
@@ -187,14 +194,14 @@
                     maximumLineCount: 2
                     elide: Text.ElideRight
                     textSize: Label.Large
-                    color: UbuntuColors.darkGrey
+                    color: UbuntuColors.slate
                     visible: (text !== "")
                 }
 
                 Label {
                     horizontalAlignment: Text.AlignHCenter
                     text: dialog.text
-                    color: UbuntuColors.darkGrey
+                    color: UbuntuColors.slate
                     wrapMode: Text.Wrap
                     visible: (text !== "")
                 }

=== modified file 'src/Ubuntu/Components/Popups/1.3/Popover.qml'
--- src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-12-09 12:34:18 +0000
+++ src/Ubuntu/Components/Popups/1.3/Popover.qml	2016-01-15 07:23:58 +0000
@@ -227,6 +227,14 @@
                 right: parent.right
             }
             height: childrenRect.height
+
+            // put the PopupContext inside the container to save one step
+            // in the context lookup
+            PopupContext {
+                id: popupContext
+                objectName: popover.objectName + "PopupContext"
+                active: foreground.visible
+            }
         }
 
         onWidthChanged: internal.updatePosition()

=== modified file 'src/Ubuntu/Components/Themes/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/1.3/Palette.qml	2015-04-24 14:34:39 +0000
+++ src/Ubuntu/Components/Themes/1.3/Palette.qml	2016-01-15 07:23:58 +0000
@@ -48,12 +48,24 @@
 */
 QtObject {
     /*!
-       Color palette to use when the widget is not in any particular state.
+       Color palette to use when the widget is in the default state.
     */
     property PaletteValues normal: PaletteValues{}
+
+    /*!
+       Color palette to use when the widget is in the inactive (disabled) state.
+    */
+    property PaletteValues inactive: PaletteValues{}
+
     /*!
        Color palette to use when the widget is selected, for example when
        a tab is the current one.
     */
     property PaletteValues selected: PaletteValues{}
+
+    /*!
+      Color palette values to use when the widget is selected and inactive.
+      \since Ubuntu.Components.Themes 1.3
+      */
+    property PaletteValues selectedInactive: PaletteValues{}
 }

=== modified file 'src/Ubuntu/Components/Themes/1.3/PaletteValues.qml'
--- src/Ubuntu/Components/Themes/1.3/PaletteValues.qml	2015-04-24 14:34:39 +0000
+++ src/Ubuntu/Components/Themes/1.3/PaletteValues.qml	2016-01-15 07:23:58 +0000
@@ -33,6 +33,17 @@
     */
     property color backgroundText
     /*!
+       Color applied to secondary content on the \l background color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color backgroundSecondaryText
+    /*!
+       Color applied to tertiary content on the \l background color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color backgroundTertiaryText
+
+    /*!
        Color applied to the background of widgets.
     */
     property color base
@@ -41,6 +52,7 @@
        Typically used for labels and images.
     */
     property color baseText
+
     /*!
        Color applied to widgets on top of the base colour.
     */
@@ -50,9 +62,26 @@
        Typically used for labels and images.
     */
     property color foregroundText
+
+    /*!
+       Color applied to widgets on top of any layer, background or base.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color raised
+    /*!
+       Color applied to elements placed on top of the \l raised color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color raisedText
+    /*!
+       Color applied to seconday elements placed on top of the \l raised color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color raisedSecondaryText
+
     /*!
        Color applied to the background of widgets floating over other widgets.
-       For example: popovers, Toolbar.
+       For example popovers, menus, dialogs.
     */
     property color overlay
     /*!
@@ -61,7 +90,13 @@
     */
     property color overlayText
     /*!
-       Colour applied to the backgrouhnd of text input fields.
+       Color applied to secondary elements placed on top of the \l overlay color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color overlaySecondaryText
+
+    /*!
+       Colour applied to the background of text input fields.
     */
     property color field
     /*!
@@ -69,8 +104,48 @@
        Typically used for labels and images.
     */
     property color fieldText
+
+    /*!
+       Colour applied to the positive actions.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color positive
+    /*!
+       Color applied to elements placed on top of the \l positive color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color positiveText
+
+    /*!
+       Colour applied to the negative actions.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color negative
+    /*!
+       Color applied to elements placed on top of the \l negative color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color negativeText
+
+    /*!
+       Colour applied to the activity colors. Typical example is progress indication,
+       activity indication.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color activity
+    /*!
+       Color applied to elements placed on top of the \l activity color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color activityText
+
     /*!
        Color applied to selected text in editable components.
     */
     property color selection
+    /*!
+       Color applied to elements placed on top of the \l selection color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color selectionText
 }

=== added file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml	2016-01-15 07:23:58 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright 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
+ * 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 Lesser General Public License for more details.
+ *
+ * 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes 1.3
+
+PaletteValues {
+    background: "#FFFFFF"
+    backgroundText: UbuntuColors.jet
+    backgroundSecondaryText: UbuntuColors.slate
+    backgroundTertiaryText: UbuntuColors.ash
+    base: UbuntuColors.silk
+    baseText: UbuntuColors.slate
+    foreground: UbuntuColors.porcelain
+    foregroundText: UbuntuColors.jet
+    raised: "#FFFFFF"
+    raisedText: UbuntuColors.slate
+    raisedSecondaryText: UbuntuColors.silk
+    overlay: "#FFFFFF"
+    overlayText: UbuntuColors.slate
+    overlaySecondaryText: UbuntuColors.silk
+    field: "#FFFFFF"
+    fieldText: UbuntuColors.jet
+    selection: Qt.rgba(UbuntuColors.orange.r, UbuntuColors.orange.g, UbuntuColors.orange.b, 0.2)
+    selectionText: UbuntuColors.jet
+    positive: UbuntuColors.green
+    positiveText: "#FFFFFF"
+    negative: UbuntuColors.red
+    negativeText: "#FFFFFF"
+    activity: UbuntuColors.blue
+    activityText: "#FFFFFF"
+}
+

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	2015-11-06 06:29:11 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	2016-01-15 07:23:58 +0000
@@ -102,7 +102,8 @@
             centerIn: parent
             topMargin: styledItem.height
         }
-        name: "up"
+        name: "toolkit_bottom-edge-hint"
+        color: theme.palette.normal.overlayText
     }
 
     Rectangle {

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2015-12-10 16:39:45 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2016-01-15 07:23:58 +0000
@@ -27,7 +27,9 @@
     revealThreshold: bottomEdge.hint.height + units.gu(2)
 
     // own styling properties
-    property color backgroundColor: Qt.rgba(0, 0, 0, Math.min(0.25, (height - revealThreshold - panelItem.y) / (height - revealThreshold)))
+    property color backgroundColor: !panelItem.collapsing
+                                    ? Qt.rgba(0, 0, 0, Math.min(0.25, (height - revealThreshold - panelItem.y) / (height - revealThreshold)))
+                                    : "transparent"
     property color panelColor: theme.palette.normal.overlay
     property color shadowColor: "#000000"
 
@@ -43,6 +45,7 @@
     Rectangle {
         id: panelItem
         objectName: "bottomedge_panel"
+        property bool collapsing: false
         anchors {
             left: parent.left
             right: parent.right
@@ -57,6 +60,12 @@
 
         Behavior on anchors.topMargin { UbuntuNumberAnimation { id: panelBehavior } }
 
+        Connections {
+            target: bottomEdge
+            onCollapseStarted: panelItem.collapsing = true
+            onCollapseCompleted: panelItem.collapsing = false
+        }
+
         state: bottomEdge.status > BottomEdge.Hidden ? "drop-hint" : ""
         states: [
             State {

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml	2015-07-22 13:14:43 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml	2016-01-15 07:23:58 +0000
@@ -28,7 +28,7 @@
     /*!
       The background color of the bubble.
      */
-    property color color: square ? theme.palette.normal.background : theme.palette.normal.overlay
+    property color color: square ? theme.palette.normal.background : theme.palette.normal.raised
 
     property point target
     property string direction: "down"
@@ -111,7 +111,7 @@
     UbuntuShape {
         anchors.fill: parent
         aspect: UbuntuShape.Flat
-        backgroundColor: theme.palette.normal.overlay
+        backgroundColor: theme.palette.normal.raised
         source: bubbleShape.clipContent ? shapeSource : null
         visible: !square
     }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml	2015-12-09 14:45:54 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml	2016-01-15 07:23:58 +0000
@@ -23,19 +23,19 @@
     /*!
       The padding between the background shape and the outside border of the checkbox.
      */
-    property real backgroundPadding: units.gu(0.33)
+    property real backgroundPadding: 0
 
     /*!
       The background color when the checkbox is not checked.
      */
-    property color uncheckedBackgroundColor: Qt.rgba(theme.palette.normal.foreground.r,
-                                                     theme.palette.normal.foreground.g,
-                                                     theme.palette.normal.foreground.b, 0.2)
+    property color uncheckedBackgroundColor: styledItem.enabled
+                                                ? theme.palette.normal.foreground
+                                                : theme.palette.inactive.foreground
 
     /*!
       The background color when the checkbox is checked.
      */
-    property color checkedBackgroundColor: UbuntuColors.green
+    property color checkedBackgroundColor: styledItem.enabled ? theme.palette.normal.positive : theme.palette.inactive.raised
 
     /*!
       The image to show inside the checkbox when it is checked.
@@ -45,17 +45,15 @@
     /*!
       The color of the icon.
      */
-    property color iconColor: theme.palette.normal.foregroundText
+    property color iconColor: styledItem.enabled ? theme.palette.normal.positiveText : theme.palette.inactive.raisedText
 
     /*!
       The padding between the icon and the border of the thumb.
      */
-    property real iconPadding: backgroundPadding
-
-    opacity: enabled ? 1.0 : 0.5
-
-    implicitWidth: units.gu(3)
-    implicitHeight: units.gu(3)
+    property real iconPadding: units.gu(0.4)
+
+    implicitWidth: units.gu(2)
+    implicitHeight: units.gu(2)
 
     FocusShape {
     }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml	2015-12-14 15:49:19 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml	2016-01-15 07:23:58 +0000
@@ -26,7 +26,9 @@
     /*!
       The color of the icons.
      */
-    property color foregroundColor: "#808080"
+    property color foregroundColor: styledItem.enabled
+                                    ? theme.palette.normal.backgroundText
+                                    : theme.palette.inactive.backgroundText
 
     /*!
       The background color of the button.
@@ -59,7 +61,6 @@
         height: iconButtonStyle.iconHeight
         source: styledItem.iconSource
         color: iconButtonStyle.foregroundColor
-        opacity: styledItem.enabled ? 1.0 : 0.3
     }
 
     Component {
@@ -67,7 +68,6 @@
         Label {
             objectName: styledItem.objectName + "_label"
             color: iconButtonStyle.foregroundColor
-            opacity: styledItem.enabled ? 1.0 : 0.3
             text: styledItem.text
             textSize: Label.XxSmall
         }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2015-11-16 16:24:42 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2016-01-15 07:23:58 +0000
@@ -25,10 +25,10 @@
     /*
      * Coloring properties
      */
-    property color leadingPanelColor: UbuntuColors.red
-    property color trailingPanelColor: "white"
-    property color leadingForegroundColor: "white"
-    property color trailingForegroundColor: theme.palette.normal.foreground
+    property color leadingPanelColor: theme.palette.normal.foreground
+    property color trailingPanelColor: theme.palette.normal.foreground
+    property color leadingForegroundColor: theme.palette.normal.negative
+    property color trailingForegroundColor: theme.palette.normal.foregroundText
 
     // anchoring
     anchors {
@@ -189,6 +189,7 @@
                 name: "view-grid-symbolic"
                 opacity: 0.0
                 scale: 0.5
+                color: theme.palette.normal.base
             }
             Binding {
                 target: listItemStyle

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml	2015-09-30 19:03:51 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml	2016-01-15 07:23:58 +0000
@@ -42,7 +42,7 @@
     /*!
       The foreground color (icon and text) of actions in the panel.
      */
-    property color foregroundColor: theme.palette.selected.backgroundText
+    property color foregroundColor: theme.palette.normal.backgroundText
 
     property bool square: true
     callerMargin: -units.gu(1) + units.dp(4)

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2015-12-15 15:39:31 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-01-15 07:23:58 +0000
@@ -21,9 +21,9 @@
 Style.PageHeaderStyle {
     id: pageHeaderStyle
 
-    foregroundColor: theme.palette.selected.backgroundText
+    foregroundColor: theme.palette.normal.backgroundText
     backgroundColor: theme.palette.normal.background
-    dividerColor: Qt.rgba(0, 0, 0, 0.1)
+    dividerColor: theme.palette.normal.base
     property int fontWeight: Font.Light
     property int textSize: Label.Large
 
@@ -44,6 +44,7 @@
         height: parent ? parent.height : undefined
         action: modelData
         StyleHints {
+            // FIXME: introduce inactiveForegroundColor to PageHeaderStyle
             foregroundColor: pageHeaderStyle.foregroundColor
         }
     }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2015-08-06 22:32:02 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-01-15 07:23:58 +0000
@@ -19,25 +19,33 @@
 import Ubuntu.Components.Themes 1.3
 
 Palette {
-    normal {
-        background: "#FFFFFF"
-        backgroundText: "#81888888"
-        base: Qt.rgba(0, 0, 0, 0.1)
-        baseText: UbuntuColors.lightGrey
-        foreground: UbuntuColors.lightGrey
-        foregroundText: "#FFFFFF"
-        overlay: "#FDFDFD"
-        overlayText: UbuntuColors.lightGrey
-        field: "lightgray"
-        fieldText: UbuntuColors.darkGrey
-    }
-    selected {
-        background: Qt.rgba(0, 0, 0, 0.05)
-        backgroundText: UbuntuColors.darkGrey
-        selection: selected.foreground
-        foreground: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
-        foregroundText: UbuntuColors.darkGrey
-        field: "#FFFFFF"
-        fieldText: UbuntuColors.darkGrey
+    normal: AmbianceNormal {}
+    inactive: AmbianceNormal {
+        field: UbuntuColors.porcelain;
+        // inactive is 30% transparent normal
+        Component.onCompleted: {
+            for (var p in normal) {
+                // skip objectName and all change signals
+                if (p == "objectName" || p == "field" || p.indexOf("Changed") > 0) continue;
+                inactive[p] = Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3);
+            }
+        }
+    }
+
+    // selected differs from normal in background, base, foreground
+    selected: AmbianceNormal {
+        background: UbuntuColors.porcelain
+        backgroundText: UbuntuColors.blue
+        base: UbuntuColors.ash
+        baseText: UbuntuColors.blue
+        foreground: UbuntuColors.silk
+        foregroundText: UbuntuColors.blue
+    }
+
+    // selected differs from normal in background, base, foreground
+    selectedInactive: AmbianceNormal {
+        background: UbuntuColors.porcelain
+        base: UbuntuColors.porcelain
+        foreground: UbuntuColors.porcelain
     }
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml	2015-09-23 08:39:29 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml	2016-01-15 07:23:58 +0000
@@ -24,7 +24,9 @@
     /*!
       Specifies the background color
       */
-    property color backgroundColor: "#0A000000"
+    property color backgroundColor: styledItem.enabled
+                                        ? theme.palette.normal.foreground
+                                        : theme.palette.inactive.foreground
     /*!
       Background color for highlight.
       */

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml	2016-01-15 07:23:58 +0000
@@ -20,8 +20,8 @@
 Item {
     id: progressBarStyle
 
-    property color foregroundColor: UbuntuColors.orange
-    property color foregroundTextColor: '#FFFFFF'
+    property color foregroundColor: theme.palette.normal.activity
+    property color foregroundTextColor: theme.palette.normal.activityText
     property color backgroundColor: theme.palette.normal.base
     property color backgroundTextColor: theme.palette.normal.baseText
 

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2015-09-22 14:39:47 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2016-01-15 07:23:58 +0000
@@ -28,7 +28,7 @@
     /*!
       The foreground color of unselected sections.
      */
-    property color sectionColor: theme.palette.selected.backgroundText
+    property color sectionColor: theme.palette.normal.backgroundText
 
     /*!
       The foreground color of the selected section.

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml	2015-09-21 14:44:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml	2016-01-15 07:23:58 +0000
@@ -26,7 +26,7 @@
 Item {
     id: sliderStyle
 
-    property color foregroundColor: UbuntuColors.orange
+    property color foregroundColor: theme.palette.normal.activity
     property color backgroundColor: theme.palette.normal.base
 
     property real thumbSpacing: units.gu(0)
@@ -43,8 +43,9 @@
             right: parent.right
             left: parent.left
         }
-        height: units.dp(4)
+        height: units.dp(2)
         backgroundColor: sliderStyle.backgroundColor
+        aspect: UbuntuShape.Flat
         overlayColor: sliderStyle.foregroundColor
         overlayRect: Qt.application.layoutDirection == Qt.LeftToRight ?
             Qt.rect(0.0, 0.0, thumb.x / thumb.barMinusThumbWidth, 1.0) :
@@ -80,18 +81,17 @@
         }
         width: units.gu(2)
         height: units.gu(2)
-        opacity: 0.97
-        backgroundColor: theme.palette.normal.overlay
+        backgroundColor: theme.palette.normal.raised
     }
 
     BubbleShape {
         id: bubbleShape
 
-        property real minimumWidth: units.gu(8)
+        property real minimumWidth: units.gu(6)
         property real horizontalPadding: units.gu(1)
 
-        width: Math.max(minimumWidth, label.implicitWidth + 2*horizontalPadding)
-        height: units.gu(6)
+        width: label.implicitWidth + 2*horizontalPadding
+        height: label.implicitHeight + 2*horizontalPadding
 
         // FIXME: very temporary implementation
         property real minX: 0.0
@@ -117,7 +117,7 @@
             anchors.centerIn: parent
             text: styledItem.formatValue(SliderUtils.liveValue(styledItem))
             textSize: Label.Large
-            color: theme.palette.normal.overlayText
+            color: theme.palette.normal.raisedText
         }
     }
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml	2015-12-09 14:45:54 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml	2016-01-15 07:23:58 +0000
@@ -23,53 +23,26 @@
     /*!
       The padding between the thumb and the outside border of the switch.
      */
-    property real thumbPadding: units.gu(0.33)
-
-    /*!
-      The padding between the icon and the border of the thumb.
-     */
-    property real iconPadding: thumbPadding
-
-    implicitWidth: units.gu(6)
-    implicitHeight: units.gu(3)
-    opacity: styledItem.enabled ? 1.0 : 0.5
+    property real thumbPadding: 0
+
+    implicitWidth: units.gu(5)
+    implicitHeight: units.gu(2.5)
     LayoutMirroring.enabled: false
     LayoutMirroring.childrenInherit: true
 
     /*!
       The background color of the switch.
      */
-    property color backgroundColor: theme.palette.normal.base
-
-    /*!
-      The background color of the thumb when the switch is checked.
-     */
-    property color checkedThumbColor: UbuntuColors.green
-
-    /*!
-      The background color of the thumb when the switch is not checked.
-     */
-    property color uncheckedThumbColor: Qt.rgba(0, 0, 0, 0.2)
-
-    /*!
-      The foreground color of the icon that is currently selected.
-     */
-    property color selectedIconColor: theme.palette.normal.foregroundText
-
-   /*!
-     The color of the icon that is not currently selected.
-    */
-    property color unselectedIconColor: theme.palette.normal.backgroundText
-
-    /*!
-      The source of the selected icon when the switch is checked.
-     */
-    property url checkedIconSource: "image://theme/tick"
-
-    /*!
-      The source of the selected icon when the switch is not checked.
-     */
-    property url uncheckedIconSource: "image://theme/close"
+    property color backgroundColor: styledItem.enabled ? theme.palette.normal.base : theme.palette.inactive.base
+
+    /*!
+      The background color of the checked switch.
+      */
+    property color checkedBackgroundColor: styledItem.enabled ? theme.palette.normal.positive : theme.palette.inactive.base
+    /*!
+      The background color of the thumb.
+     */
+    property color thumbColor: styledItem.enabled ? theme.palette.normal.raised : theme.palette.inactive.raised
 
     FocusShape {
     }
@@ -86,19 +59,14 @@
                 State {
                     name: "checked"
                     when: styledItem.checked
-                    PropertyChanges {
+                    AnchorChanges {
                         target: thumb
-                        x: rightThumbPosition.x
-                        backgroundColor: switchStyle.checkedThumbColor
+                        anchors.left: undefined
+                        anchors.right: parent.right
                     }
-                },
-                State {
-                    name: "unchecked"
-                    when: !styledItem.checked
                     PropertyChanges {
-                        target: thumb
-                        x: leftThumbPosition.x
-                        backgroundColor: switchStyle.uncheckedThumbColor
+                        target: background
+                        backgroundColor: switchStyle.checkedBackgroundColor
                     }
                 }
             ]
@@ -107,27 +75,12 @@
                 // Avoid animations on width changes (during initialization)
                 // by explicitly setting from and to for the Transitions.
                 Transition {
-                    from: "unchecked"
+                    from: "*"
                     to: "checked"
-                    UbuntuNumberAnimation {
-                        target: thumb
-                        properties: "x"
-                        duration: UbuntuAnimation.FastDuration
-                        easing: UbuntuAnimation.StandardEasing
-                    }
-                    ColorAnimation {
-                        target: thumb
-                        properties: "backgroundColor"
-                        duration: UbuntuAnimation.FastDuration
-                        easing: UbuntuAnimation.StandardEasing
-                    }
-                },
-                Transition {
-                    from: "checked"
-                    to: "unchecked"
-                    UbuntuNumberAnimation {
-                        target: thumb
-                        properties: "x"
+                    reversible: true
+                    enabled: animated
+                    AnchorAnimation {
+                        targets: thumb
                         duration: UbuntuAnimation.FastDuration
                         easing: UbuntuAnimation.StandardEasing
                     }
@@ -140,99 +93,16 @@
                 }
             ]
 
+            backgroundColor: switchStyle.thumbColor
             width: (background.width - switchStyle.thumbPadding * 3.0) / 2.0
             anchors {
                 top: parent.top
                 bottom: parent.bottom
+                left: parent.left
                 topMargin: switchStyle.thumbPadding
                 bottomMargin: switchStyle.thumbPadding
             }
 
-            property real iconSize: Math.min(width, height) - 2*switchStyle.iconPadding
-
-            PartialColorize {
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    right: parent.left
-                    rightMargin: switchStyle.iconPadding + switchStyle.thumbPadding
-                }
-                rightColor: switchStyle.unselectedIconColor
-                source: Image {
-                    source: switchStyle.uncheckedIconSource
-                    sourceSize {
-                        width: thumb.iconSize
-                        height: thumb.iconSize
-                    }
-                }
-            }
-
-            PartialColorize {
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.right
-                    leftMargin: switchStyle.iconPadding + switchStyle.thumbPadding
-                }
-                rightColor: switchStyle.unselectedIconColor
-                source: Image {
-                    source: switchStyle.checkedIconSource
-                    sourceSize {
-                        width: thumb.iconSize
-                        height: thumb.iconSize
-                    }
-                }
-            }
-        }
-
-        Item {
-            id: leftThumbPosition
-            anchors {
-                left: parent.left
-                top: parent.top
-                leftMargin: switchStyle.thumbPadding
-                topMargin: switchStyle.thumbPadding
-            }
-            height: thumb.height
-            width: thumb.width
-
-            PartialColorize {
-                anchors.centerIn: parent
-                source: Image {
-                    source: switchStyle.uncheckedIconSource
-                    sourceSize {
-                        width: thumb.iconSize
-                        height: thumb.iconSize
-                    }
-                }
-                progress: MathUtils.clamp((thumb.x - parent.x - x) / width, 0.0, 1.0)
-                leftColor: "transparent"
-                rightColor: switchStyle.selectedIconColor
-            }
-        }
-
-        Item {
-            id: rightThumbPosition
-            anchors {
-                right: parent.right
-                top: parent.top
-                rightMargin: switchStyle.thumbPadding
-                topMargin: switchStyle.thumbPadding
-            }
-            height: thumb.height
-            width: thumb.width
-
-            PartialColorize {
-                anchors.centerIn: parent
-                source: Image {
-                    source: switchStyle.checkedIconSource
-                    sourceSize {
-                        width: thumb.iconSize
-                        height: thumb.iconSize
-                    }
-                }
-                progress: MathUtils.clamp((thumb.x + thumb.width - parent.x - x) / width, 0.0, 1.0)
-                leftColor: switchStyle.selectedIconColor
-                rightColor: "transparent"
-            }
         }
     }
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2015-07-22 13:14:43 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2016-01-15 07:23:58 +0000
@@ -25,14 +25,22 @@
     // FIXME: needs type checking in themes to define the proper type to be used
     // if color type is used, alpha value gets lost
 
-    property color color: (styledItem.activeFocus || styledItem.highlighted) ? theme.palette.selected.fieldText : theme.palette.normal.fieldText
-    property color selectedTextColor: theme.palette.selected.foregroundText
-    property color selectionColor: theme.palette.selected.foreground
+    property color color: styledItem.enabled
+                          ? ((styledItem.activeFocus || styledItem.highlighted)
+                            ? theme.palette.selected.fieldText
+                            : theme.palette.normal.fieldText)
+                          : theme.palette.inactive.fieldText
+    property color selectedTextColor: styledItem.enabled ? theme.palette.selected.selectionText : theme.palette.inactive.selectionText
+    property color selectionColor: styledItem.enabled ? theme.palette.selected.selection : theme.palette.inactive.selection
     /*!
       Background fill color
       */
-    property color backgroundColor: (styledItem.activeFocus || styledItem.highlighted) ? theme.palette.selected.field : theme.palette.normal.field
-    property color errorColor: UbuntuColors.orange
+    property color backgroundColor: styledItem.enabled
+                                        ? ((styledItem.activeFocus || styledItem.highlighted)
+                                            ? theme.palette.selected.field
+                                            : theme.palette.normal.field)
+                                        : theme.palette.inactive.field
+    property color errorColor: styledItem.enabled ? theme.palette.normal.negative : theme.palette.inactive.negative
 
     /*!
       Spacing between the frame and the text editor area

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml	2015-09-21 14:44:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml	2016-01-15 07:23:58 +0000
@@ -31,6 +31,8 @@
         height: icon.height + label.height + label.anchors.topMargin
         opacity: styledItem.enabled ? 1.0 : 0.3
 
+        // FIXME: is there a reason we are still using styledItem.iconSource instead of iconName
+        // so we coudl use the Icon?
         Image {
             id: icon
             anchors {
@@ -53,6 +55,9 @@
             width: paintedWidth
             text: styledItem.text
             textSize: Label.XSmall
+            color: styledItem.enabled
+                   ? theme.palette.normal.raisedText
+                   : theme.palette.inactive.raisedText
         }
     }
 

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
--- src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-12-16 10:01:07 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2016-01-15 07:23:58 +0000
@@ -73,6 +73,7 @@
              1.2/TextFieldStyle.qml \
              1.2/ToolbarButtonStyle.qml \
              1.2/DeprecatedToolbarStyle.qml \
+             1.3/AmbianceNormal.qml \
              1.3/ActionBarStyle.qml \
              1.3/ActivityIndicatorStyle.qml \
              1.3/BubbleShape.qml \

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/qmldir'
--- src/Ubuntu/Components/Themes/Ambiance/qmldir	2015-12-16 10:01:07 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/qmldir	2016-01-15 07:23:58 +0000
@@ -57,6 +57,7 @@
 
 #################################################
 #version 1.3
+AmbianceNormal 1.3 ./1.3/AmbianceNormal.qml
 ActionBarStyle 1.3 ./1.3/ActionBarStyle.qml
 MainViewStyle 1.3 ./1.3/MainViewStyle.qml
 ListItemOptionSelector 1.3 ./1.3/ListItemOptionSelector.qml

=== removed file 'src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml	2015-07-13 22:16:37 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.2/ListItemStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * Copyright 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
- * 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 Lesser General Public License for more details.
- *
- * 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.4
-import Ubuntu.Components.Themes.Ambiance 1.2 as Ambiance
-
-Ambiance.ListItemStyle {
-    // 20% lighter that background color
-    trailingPanelColor: Qt.lighter(theme.palette.normal.background, 1.2)
-    // 40% lighter than foreground color
-    trailingForegroundColor: Qt.lighter(theme.palette.normal.foreground, 1.4)
-}

=== removed file 'src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml	2015-08-11 10:01:34 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-/*
- * Copyright 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
- * 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 Lesser General Public License for more details.
- *
- * 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/>.
- */
-//![0]
-import QtQuick 2.4
-import Ubuntu.Components.Themes.Ambiance 1.3 as Ambiance
-
-Ambiance.ListItemStyle {
-    // 20% lighter that background color
-    trailingPanelColor: Qt.lighter(theme.palette.normal.background, 1.2)
-    // 40% lighter than foreground color
-    trailingForegroundColor: Qt.lighter(theme.palette.normal.foreground, 1.4)
-}
-//![0]

=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2015-06-02 16:20:13 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2016-01-15 07:23:58 +0000
@@ -20,26 +20,34 @@
 import Ubuntu.Components.Themes 1.3
 
 Palette {
-    normal {
-        background: "#221E1C"
-        backgroundText: "#5D5D5D78"
-        base: "#19000000"
-        baseText: "#FFFFFF"
-        foreground: "#888888"
-        foregroundText: "#FFFFFF"
-        overlay: "#F2F2F2"
-        overlayText: "#888888"
-        field: "#19000000"
-        fieldText: "#7F7F7F7F"
-    }
-    selected {
-        background: "#88D6D6D6"
-        backgroundText: "#FFFFFF"
-        selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
-        foreground: UbuntuColors.orange
-        foregroundText: UbuntuColors.darkGrey
-        field: "#FFFFFF"
-        fieldText: "#888888"
+    normal: SuruDarkNormal {}
+    inactive: SuruDarkNormal {
+        field: UbuntuColors.inkstone
+        // inactive is 30% transparent normal
+        Component.onCompleted: {
+            for (var p in normal) {
+                // skip objectName and all change signals
+                if (p == "objectName" || p == "field" || p.indexOf("Changed") > 0) continue;
+                inactive[p] = Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3);
+            }
+        }
+    }
+
+    // selected differs from normal in background, base, foreground
+    selected: SuruDarkNormal {
+        background: UbuntuColors.inkstone
+        backgroundText: UbuntuColors.blue
+        base: UbuntuColors.ash
+        baseText:UbuntuColors.blue
+        foreground: UbuntuColors.slate
+        foregroundText: UbuntuColors.blue
+    }
+
+    // selected differs from normal in background, base, foreground
+    selectedInactive: SuruDarkNormal {
+        background: UbuntuColors.inkstone
+        base: UbuntuColors.inkstone
+        foreground: UbuntuColors.inkstone
     }
 }
 //![0]

=== added file 'src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml	2016-01-15 07:23:58 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright 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
+ * 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 Lesser General Public License for more details.
+ *
+ * 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes 1.3
+
+PaletteValues {
+    background: UbuntuColors.jet
+    backgroundText: "#FFFFFF"
+    backgroundSecondaryText: UbuntuColors.silk
+    backgroundTertiaryText: UbuntuColors.ash
+    base: UbuntuColors.graphite
+    baseText: UbuntuColors.silk
+    foreground: UbuntuColors.inkstone
+    foregroundText: "#FFFFFF"
+    raised: "#FFFFFF"
+    raisedText: UbuntuColors.slate
+    raisedSecondaryText: UbuntuColors.silk
+    overlay: UbuntuColors.inkstone
+    overlayText: "#FFFFFF"
+    overlaySecondaryText: UbuntuColors.slate
+    field: UbuntuColors.jet
+    fieldText: "#FFFFFF"
+    selection: Qt.rgba(UbuntuColors.orange.r, UbuntuColors.orange.g, UbuntuColors.orange.b, 0.4)
+    selectionText: "#FFFFFF"
+    positive: UbuntuColors.green
+    positiveText: "#FFFFFF"
+    negative: UbuntuColors.red
+    negativeText: "#FFFFFF"
+    activity: UbuntuColors.blue
+    activityText: "#FFFFFF"
+}
+

=== modified file 'src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro'
--- src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2015-08-06 22:47:38 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2016-01-15 07:23:58 +0000
@@ -7,11 +7,10 @@
              1.2/OptionSelectorStyle.qml \
              1.2/Palette.qml \
              1.2/TabBarStyle.qml \
-             1.2/ListItemStyle.qml \
              1.3/OptionSelectorStyle.qml \
+             1.3/SuruDarkNormal.qml \
              1.3/Palette.qml \
              1.3/TabBarStyle.qml \
-             1.3/ListItemStyle.qml \
              $$ARTWORK_FILES \
              $$PARENT_THEME_FILE
 

=== modified file 'src/Ubuntu/Components/Themes/SuruDark/qmldir'
--- src/Ubuntu/Components/Themes/SuruDark/qmldir	2015-04-24 14:48:00 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/qmldir	2016-01-15 07:23:58 +0000
@@ -5,3 +5,4 @@
 
 #version 1.3
 Palette 1.3 ./1.3/Palette.qml
+SuruDarkNormal 1.3 ./1.3/SuruDarkNormal.qml

=== modified file 'src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp'
--- src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp	2015-09-01 10:49:47 +0000
+++ src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp	2016-01-15 07:23:58 +0000
@@ -19,29 +19,23 @@
 
 #include <QDebug>
 
+Q_LOGGING_CATEGORY(ucActionProxy, "ubuntu.components.ActionProxy", QtMsgType::QtWarningMsg)
+
+#define AP_TRACE(params) qCDebug(ucActionProxy) << params
+
 ActionProxy::ActionProxy()
-    : QObject(0)
-    , globalContext(new UCActionContext)
+    : globalContext(new UCActionContext)
 {
     // for testing purposes
     globalContext->setObjectName("GlobalActionContext");
 }
 ActionProxy::~ActionProxy()
 {
-    // if there is still an active context clear it
-    if (!m_activeContext.isNull()) {
-        m_activeContext->setActive(false);
-    }
     // clear context explicitly, as global context is not connected to
     clearContextActions(globalContext);
     delete globalContext;
 }
 
-UCActionContext *ActionProxy::currentContext()
-{
-    return instance().m_activeContext;
-}
-
 const QSet<UCActionContext*> &ActionProxy::localContexts()
 {
     return instance().m_localContexts;
@@ -67,8 +61,7 @@
         return;
     }
     instance().m_localContexts.insert(context);
-    // watch context activation changes
-    instance().watchContextActivation(context, true);
+    AP_TRACE("ADD CONTEXT" << context);
 }
 // Remove a local context. If the context was active, removes the actions from the system.
 void ActionProxy::removeContext(UCActionContext *context)
@@ -78,60 +71,77 @@
     }
     // make sure the context is deactivated
     context->setActive(false);
-    instance().watchContextActivation(context, false);
     instance().m_localContexts.remove(context);
-}
-
-// toggles context activation watching for a given context
-void ActionProxy::watchContextActivation(UCActionContext *context, bool watch)
-{
-    if (!context) {
-        return;
-    }
-    if (watch) {
-        // connect to action proxy
-        QObject::connect(context, SIGNAL(activeChanged()),
-                         this, SLOT(handleContextActivation()),
-                         Qt::DirectConnection);
-    } else {
-        // disconnect
-        QObject::disconnect(context, SIGNAL(activeChanged()),
-                         this, SLOT(handleContextActivation()));
-    }
-}
-
-// handles the local context activation
-void ActionProxy::handleContextActivation()
-{
-    // sender is the context changing activation
-    UCActionContext *context = qobject_cast<UCActionContext*>(sender());
-    if (!context) {
-        return;
-    }
-    // deactivate the previous context if any
-    if (!m_activeContext.isNull()) {
-        if (!context->active()) {
-            // the slot has been called due to the previous active deactivation,
-            // so perform system cleanup
-            clearContextActions(m_activeContext);
-            m_activeContext->markActionsPublished(false);
-            // finally clear the context and leave
-            m_activeContext.clear();
-            return;
-        } else {
-            // deactivate previous actiev context, this will cause the slot to
-            // be called with active = false within this call context
-            m_activeContext->setActive(false);
-        }
-    }
+    AP_TRACE("REMOVE CONTEXT FROM REGISTRY" << context);
+}
+
+// publishes/removes context actions on activation/deactivation
+void ActionProxy::activateContext(UCActionContext *context)
+{
+    if (!context) {
+        return;
+    }
+
+    // if a context to be activated is a popup one, we must deactivate all other ones
+    // and then activate this
     if (context->active()) {
         // publish the context's actions to the system
-        publishContextActions(context);
+        instance().publishContextActions(context);
         context->markActionsPublished(true);
-        // and finally set it as active
-        m_activeContext = context;
-    }
-}
+
+        if (context->isPopup()) {
+            instance().addPopupContext(static_cast<UCPopupContext*>(context));
+        } else {
+            AP_TRACE("ACTIVATE CONTEXT" << context);
+        }
+    } else {
+        // remove actions from the system
+        instance().clearContextActions(context);
+        context->markActionsPublished(false);
+
+        if (context->isPopup()) {
+            instance().removePopupContext(static_cast<UCPopupContext*>(context));
+        } else {
+            AP_TRACE("DEACTIVATE CONTEXT" << context);
+        }
+    }
+}
+
+void ActionProxy::addPopupContext(UCPopupContext *context)
+{
+    // deactivate last context and append
+    UCPopupContext *lastActive = m_popupContexts.isEmpty() ?
+                Q_NULLPTR : m_popupContexts.top();
+    if (lastActive) {
+        lastActive->setEffectiveActive(false);
+        AP_TRACE("DEACTIVATE POPUPCONTEXT" << lastActive);
+    }
+    m_popupContexts.push(context);
+    AP_TRACE("ACTIVATE POPUPCONTEXT" << context);
+}
+
+void ActionProxy::removePopupContext(UCPopupContext *context)
+{
+    UCPopupContext *last = m_popupContexts.isEmpty() ?
+                Q_NULLPTR : m_popupContexts.top();
+
+    if (last == context) {
+        // we are about to remove the last one
+        AP_TRACE("DEACTIVATE POPUPCONTEXT" << last);
+        m_popupContexts.pop();
+        // and then re-activate the second last one
+        last = m_popupContexts.isEmpty() ? Q_NULLPTR : m_popupContexts.top();
+        if (last) {
+            AP_TRACE("REACTIVATE POPUPCONTEXT" << last);
+            last->setEffectiveActive(true);
+        }
+    } else {
+        // we simply remove the context and leave
+        AP_TRACE("REMOVE POPUPCONTEXT" << context);
+        m_popupContexts.removeAll(context);
+    }
+}
+
 // empty functions for context activation/deactivation, connect to HUD
 void ActionProxy::clearContextActions(UCActionContext *context)
 {

=== modified file 'src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h'
--- src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h	2015-09-01 10:49:47 +0000
+++ src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h	2016-01-15 07:23:58 +0000
@@ -23,9 +23,9 @@
 #include "ucaction.h"
 
 class UCActionContext;
-class ActionProxy : public QObject
+class UCPopupContext;
+class ActionProxy
 {
-    Q_OBJECT
 public:
 
     ~ActionProxy();
@@ -37,24 +37,25 @@
 
     UCActionContext *globalContext;
 
-    static UCActionContext *currentContext();
     static const QSet<UCActionContext*> &localContexts();
     static void publishGlobalContext();
     static void addContext(UCActionContext *context);
     static void removeContext(UCActionContext *context);
+    static void activateContext(UCActionContext *context);
 
 protected:
     ActionProxy();
 
-protected Q_SLOTS:
-    void watchContextActivation(UCActionContext *context, bool watch);
-    void handleContextActivation();
+protected:
     virtual void clearContextActions(UCActionContext *context);
     virtual void publishContextActions(UCActionContext *context);
 
 private:
     QSet<UCActionContext*> m_localContexts;
-    QPointer<UCActionContext> m_activeContext;
+    QStack<UCPopupContext*> m_popupContexts;
+
+    void addPopupContext(UCPopupContext *context);
+    void removePopupContext(UCPopupContext *context);
 };
 
 #endif // ACTIONSPROXY_P_H

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-12-17 15:23:26 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -263,6 +263,7 @@
     qmlRegisterType<UCBottomEdge>(uri, 1, 3, "BottomEdge");
     qmlRegisterType<UCBottomEdgeRegion>(uri, 1, 3, "BottomEdgeRegion");
     qmlRegisterType<UCPageTreeNode>(uri, 1, 3, "PageTreeNode");
+    qmlRegisterType<UCPopupContext>(uri, 1, 3, "PopupContext");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -283,12 +284,9 @@
     // that can be accessed from any object
     context->setContextProperty("QuickUtils", &QuickUtils::instance());
 
-    // register theme context property
-    UCTheme::registerToContext(context);
-
-    UCDeprecatedTheme::instance().registerToContext(context);
-
-    HapticsProxy::instance().setEngine(context->engine());
+    UCDeprecatedTheme::registerToContext(context);
+
+    HapticsProxy::instance().setEngine(engine);
 
     context->setContextProperty("i18n", &UbuntuI18n::instance());
     ContextPropertyChangeListener *i18nChangeListener =

=== modified file 'src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp'
--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp	2015-11-08 21:39:34 +0000
+++ src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp	2016-01-15 07:23:58 +0000
@@ -38,7 +38,10 @@
 void UCThreeLabelsSlotPrivate::setTitleProperties()
 {
     if (m_title != Q_NULLPTR) {
-        m_title->setWrapMode(UCLabel::WordWrap);
+        //Using WrapAnywhere because ElideRight elides too early when used
+        //together with WrapWord, and that produces an unexpected result.
+        //This will cover most of the usecases.
+        m_title->setWrapMode(UCLabel::WrapAnywhere);
         m_title->setElideMode(UCLabel::ElideRight);
         m_title->setMaximumLineCount(1);
         m_title->setTextSize(UCLabel::Medium);
@@ -48,7 +51,7 @@
 void UCThreeLabelsSlotPrivate::setSubtitleProperties()
 {
     if (m_subtitle != Q_NULLPTR) {
-        m_subtitle->setWrapMode(UCLabel::WordWrap);
+        m_subtitle->setWrapMode(UCLabel::WrapAnywhere);
         m_subtitle->setElideMode(UCLabel::ElideRight);
         m_subtitle->setMaximumLineCount(1);
         m_subtitle->setTextSize(UCLabel::Small);
@@ -58,7 +61,7 @@
 void UCThreeLabelsSlotPrivate::setSummaryProperties()
 {
     if (m_summary != Q_NULLPTR) {
-        m_summary->setWrapMode(UCLabel::WordWrap);
+        m_summary->setWrapMode(UCLabel::WrapAnywhere);
         m_summary->setElideMode(UCLabel::ElideRight);
         m_summary->setMaximumLineCount(2);
         m_summary->setTextSize(UCLabel::Small);
@@ -99,19 +102,19 @@
         QQuickAnchors *subtitleAnchors = QQuickItemPrivate::get(m_subtitle)->anchors();
         subtitleAnchors->setTop(skipTitle
                                 ? top()
-                                : QQuickItemPrivate::get(m_title)->baseline());
+                                : QQuickItemPrivate::get(m_title)->bottom());
         subtitleAnchors->setTopMargin(skipTitle
                                       ? 0
-                                      : UCUnits::instance().dp(LABELSBLOCK_SPACING_DP));
+                                      : UCUnits::instance().dp(TITLE_SPACING_DP));
     }
 
     if (!skipSummary) {
         QQuickAnchors *summaryAnchors = QQuickItemPrivate::get(m_summary)->anchors();
         summaryAnchors->setTop(skipSubtitle
-                               ? (skipTitle ? top() : QQuickItemPrivate::get(m_title)->baseline())
+                               ? (skipTitle ? top() : QQuickItemPrivate::get(m_title)->bottom())
                                : QQuickItemPrivate::get(m_subtitle)->bottom());
         summaryAnchors->setTopMargin(skipSubtitle
-                                     ? (skipTitle ? 0 : UCUnits::instance().dp(LABELSBLOCK_SPACING_DP))
+                                     ? (skipTitle ? 0 : UCUnits::instance().dp(TITLE_SPACING_DP))
                                      : 0);
     }
     //Update height of the labels box

=== modified file 'src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h'
--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h	2015-10-01 08:47:31 +0000
+++ src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h	2016-01-15 07:23:58 +0000
@@ -20,7 +20,9 @@
 #include <QQuickItem>
 #include <private/qquickitem_p.h>
 
-#define LABELSBLOCK_SPACING_DP                       4
+//The padding between title and the string below it (i.e. subtitle, or
+//summary, when subtitle is empty)
+#define TITLE_SPACING_DP                       2
 
 class UCLabel;
 class UCThreeLabelsSlotPrivate;

=== modified file 'src/Ubuntu/Components/plugin/ucaction.cpp'
--- src/Ubuntu/Components/plugin/ucaction.cpp	2015-12-18 15:20:48 +0000
+++ src/Ubuntu/Components/plugin/ucaction.cpp	2016-01-15 07:23:58 +0000
@@ -16,6 +16,7 @@
 
 #include "ucaction.h"
 #include "quickutils.h"
+#include "ucactioncontext.h"
 
 #include <QtDebug>
 #include <QtQml/QQmlInfo>
@@ -23,12 +24,16 @@
 #include <QtQuick/qquickwindow.h>
 #include <private/qguiapplication_p.h>
 
+Q_LOGGING_CATEGORY(ucAction, "ubuntu.components.Action", QtMsgType::QtWarningMsg)
+
+#define ACT_TRACE(params) qCDebug(ucAction) << params
+
 bool shortcutContextMatcher(QObject* object, Qt::ShortcutContext context)
 {
     UCAction* action = static_cast<UCAction*>(object);
-    // Can't access member here because it's not public
-    if (!action->property("enabled").toBool())
+    if (!action->isEnabled()) {
         return false;
+    }
 
     switch (context) {
     case Qt::ApplicationShortcut:
@@ -37,10 +42,39 @@
         QObject* window = object;
         while (window && !window->isWindowType()) {
             window = window->parent();
-            if (QQuickItem* item = qobject_cast<QQuickItem*>(window))
+            if (QQuickItem* item = qobject_cast<QQuickItem*>(window)) {
                 window = item->window();
-        }
-        return window && window == QGuiApplication::focusWindow();
+            }
+        }
+        bool activatable = window && window == QGuiApplication::focusWindow();
+
+        if (activatable) {
+            // is the last action owner item in an active context?
+            QQuickItem *pl = action->lastOwningItem();
+            activatable = false;
+            while (pl) {
+                UCActionContextAttached *attached = static_cast<UCActionContextAttached*>(
+                            qmlAttachedPropertiesObject<UCActionContext>(pl, false));
+                if (attached) {
+                    activatable = attached->context()->active();
+                    if (!activatable) {
+                        ACT_TRACE(action << "Inactive context found" << attached->context());
+                        break;
+                    }
+                }
+                pl = pl->parentItem();
+            }
+            if (!activatable) {
+                // check if the action is in an active context
+                UCActionContext *context = qobject_cast<UCActionContext*>(action->parent());
+                activatable = context && context->active();
+            }
+        }
+        if (activatable) {
+            ACT_TRACE("SELECTED ACTION" << action);
+        }
+
+        return activatable;
     }
     default: break;
     }
@@ -152,6 +186,7 @@
             mnemonic = mnemonic.toLower();
             mnemonicIndex = m_text.indexOf(mnemonic);
         }
+        ACT_TRACE("MNEM" << mnemonic);
         QString displayText(m_text);
         // FIXME: we need QInputDeviceInfo to detect the keyboard attechment
         // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
@@ -192,6 +227,7 @@
     m_mnemonic = sequence;
 
     if (!m_mnemonic.isEmpty()) {
+        ACT_TRACE("MNEMONIC SET" << m_mnemonic.toString());
         Qt::ShortcutContext context = Qt::WindowShortcut;
         QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(this, m_mnemonic, context, shortcutContextMatcher);
     }
@@ -356,10 +392,12 @@
 }
 
 QKeySequence sequenceFromVariant(const QVariant& variant) {
-    if (variant.type() == QVariant::Int)
+    if (variant.type() == QVariant::Int) {
         return static_cast<QKeySequence::StandardKey>(variant.toInt());
-    if (variant.type() == QVariant::String)
+    }
+    if (variant.type() == QVariant::String) {
         return QKeySequence::fromString(variant.toString());
+    }
     return QKeySequence();
 }
 
@@ -376,10 +414,12 @@
         QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(0, this, sequenceFromVariant(m_shortcut));
 
     QKeySequence sequence(sequenceFromVariant(shortcut));
-    if (!sequence.toString().isEmpty())
+    if (!sequence.isEmpty()) {
+        ACT_TRACE("ADD SHORTCUT" << sequence.toString());
         QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(this, sequence, Qt::WindowShortcut, shortcutContextMatcher);
-    else
+    } else {
         qmlInfo(this) << "Invalid shortcut: " << shortcut.toString();
+    }
 
     m_shortcut = shortcut;
     Q_EMIT shortcutChanged();
@@ -399,6 +439,8 @@
     if (event->type() != QEvent::Shortcut)
         return false;
 
+    // when we reach this point, we can be sure the Action is used
+    // by a component belonging to an active ActionContext.
     QShortcutEvent *shortcut_event(static_cast<QShortcutEvent*>(event));
     if (shortcut_event->isAmbiguous()) {
         qmlInfo(this) << "Ambiguous shortcut: " << shortcut_event->key().toString();
@@ -437,3 +479,17 @@
         Q_EMIT triggered(value);
     }
 }
+
+void UCAction::addOwningItem(QQuickItem *item)
+{
+    if (!m_owningItems.contains(item)) {
+        m_owningItems.append(item);
+        ACT_TRACE("ADD ACTION OWNER" << item->objectName() << "TO" << this);
+    }
+}
+
+void UCAction::removeOwningItem(QQuickItem *item)
+{
+    m_owningItems.removeOne(item);
+    ACT_TRACE("REMOVE ACTION OWNER" << item->objectName() << "FROM" << this);
+}

=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
--- src/Ubuntu/Components/plugin/ucaction.h	2015-12-18 12:42:58 +0000
+++ src/Ubuntu/Components/plugin/ucaction.h	2016-01-15 07:23:58 +0000
@@ -21,6 +21,9 @@
 #include <QtCore/QVariant>
 #include <QtCore/QUrl>
 #include <QtGui/QKeySequence>
+#include <QtQml>
+#include <QtQml/QQmlListProperty>
+#include <QtQml/private/qpodvector_p.h>
 
 // the function detects whether QML has an overridden trigger() slot available
 // and invokes the one with the appropriate signature
@@ -45,6 +48,8 @@
 }
 
 class QQmlComponent;
+class QQuickItem;
+class UCActionAttached;
 class UCAction : public QObject
 {
     Q_OBJECT
@@ -83,6 +88,17 @@
     {
         return m_published;
     }
+    inline bool isEnabled() const
+    {
+        return m_enabled;
+    }
+    inline QQuickItem *lastOwningItem() const
+    {
+        return m_owningItems.count() > 0 ?
+                    m_owningItems.at(m_owningItems.count() - 1) : Q_NULLPTR;
+    }
+    void addOwningItem(QQuickItem *item);
+    void removeOwningItem(QQuickItem *item);
 
     void setName(const QString &name);
     QString text();
@@ -111,6 +127,7 @@
     void trigger(const QVariant &value = QVariant());
 
 private:
+    QPODVector<QQuickItem*, 4> m_owningItems;
     QString m_name;
     QString m_text;
     QString m_iconName;
@@ -139,5 +156,6 @@
     bool event(QEvent *event);
     void onKeyboardAttached();
 };
+QML_DECLARE_TYPE(UCAction)
 
 #endif // UCACTION_H

=== modified file 'src/Ubuntu/Components/plugin/ucactioncontext.cpp'
--- src/Ubuntu/Components/plugin/ucactioncontext.cpp	2015-09-01 10:49:47 +0000
+++ src/Ubuntu/Components/plugin/ucactioncontext.cpp	2016-01-15 07:23:58 +0000
@@ -17,6 +17,18 @@
 #include "ucactioncontext.h"
 #include "ucaction.h"
 #include "adapters/actionsproxy_p.h"
+#include <QtQuick/QQuickItem>
+
+Q_LOGGING_CATEGORY(ucActionContext, "ubuntu.components.ActionContext", QtMsgType::QtWarningMsg)
+
+#define CONTEXT_TRACE(params) qCDebug(ucActionContext) << params
+
+UCActionContextAttached::UCActionContextAttached(QObject *owner)
+    : QObject(owner)
+    , m_owner(qobject_cast<QQuickItem*>(owner))
+    , m_context(Q_NULLPTR)
+{
+}
 
 /*!
  * \qmltype ActionContext
@@ -26,10 +38,72 @@
  * \brief ActionContext groups actions together and by providing multiple contexts
  * the developer is able to control the visibility of the actions. The \l ActionManager
  * then exposes the actions from these different contexts.
+ *
+ * ActionContext drives the state of its \l actions. Shortcuts and mnemonics are
+ * only registered if the context is active or if the action is assigned to an
+ * \l ActionItem all of whose parent contexts are active. In the following
+ * example the ActionContext drives the underlaying \c action1 and \c action2
+ * shortcuts, and \c orphanAction will never trigger as it is neither enclosed
+ * in an active context nor assigned to an ActionItem.
+ * \qml
+ * import QtQuick 2.4
+ * import ubuntu.Componenst 1.3
+ *
+ * Rectangle {
+ *     id: root
+ *     width: units.gu(40)
+ *     height: units.gu(71)
+ *     ActionContext {
+ *         id: rootContext
+ *         active: true
+ *         actions: Action {
+ *             shortcut: 'Ctrl+A'
+ *             text: rootContext.active ? "Deactivate" : "Activate"
+ *             onTriggered: rootContext.active = !rootContext.active
+ *         }
+ *     }
+ *
+ *     Action {
+ *         id: orphanAction
+ *         text: "Orphan"
+ *         shortcut: 'Ctrl+O'
+ *         onTriggered: console.log("This will not be called")
+ *     }
+ *
+ *     Column {
+ *         Button {
+ *             text: rootContext.active ? "Deactivate" : "Activate"
+ *             onClicked: rootContext.active = !rootContext.active
+ *         }
+ *         Button {
+ *             action: Action {
+ *                 id: action1
+ *                 text: "F&irst Button"
+ *                 onTriggered: console.log("First Button triggered")
+ *             }
+ *         }
+ *         Button {
+ *             action: Action {
+ *                 id: action2
+ *                 text: "S&econd Button"
+ *                 shortcut: 'Ctrl+Alt+2'
+ *                 onTriggered: console.log("Second Button triggered")
+ *             }
+ *         }
+ *     }
+ * }
+ * \endqml
+ *
+ * The toolkit assigns an ActionContext to each Page component, which is
+ * activated/deactivated together with the Page itself, driving the shortcut
+ * activations on the components and actions declared in the Page.
+ * \sa PopupContext
  */
 UCActionContext::UCActionContext(QObject *parent)
     : QObject(parent)
     , m_active(false)
+    , m_effectiveActive(true)
+    , m_popup(false)
 {
 }
 UCActionContext::~UCActionContext()
@@ -37,10 +111,23 @@
     ActionProxy::removeContext(this);
 }
 
-void UCActionContext::componentComplete()
+UCActionContextAttached *UCActionContext::qmlAttachedProperties(QObject *owner)
+{
+    return new UCActionContextAttached(owner);
+}
+
+void UCActionContext::classBegin()
 {
     // add the context to the management
     ActionProxy::addContext(this);
+    // make sure we attach to the parent
+    UCActionContextAttached *attached = static_cast<UCActionContextAttached*>(
+            qmlAttachedPropertiesObject<UCActionContext>(parent(), true));
+    attached->m_context = this;
+}
+
+void UCActionContext::componentComplete()
+{
 }
 
 /*
@@ -97,18 +184,16 @@
  * whether or not the actions in a context are available to external components.
  *
  * The \l ActionManager monitors the active property of each of the local contexts
- * that has been added to it. There can be only one active local context at a time.
- * When one of the local contexts sets itself active the manager will notice this,
- * export the actions from that given context and set the previously active local
- * context as inactive. This way setting active to true on a local context is
- * sufficient to manage the active local context of the manager and no additional
- * calls are necessary to manually inactivate the other contexts.
+ * that has been added to it. There can be more than one local context active at a.
+ * time. When a local context is set active the manager will notice this and will
+ * export the actions from the context.
+ * \note An Action declared to a component falling under an item that is a child of
+ * an inactive ActiveContext can be triggered manually using the mouse or connections.
  */
 bool UCActionContext::active()
 {
-    return m_active;
+    return m_active && m_effectiveActive;
 }
-
 void UCActionContext::setActive(bool active)
 {
     if (m_active == active) {
@@ -118,7 +203,26 @@
     if (!active && (ActionProxy::instance().globalContext == this)) {
         return;
     }
+    CONTEXT_TRACE("ACTIVATE CONTEXT" << this << active);
+
     m_active = active;
+    ActionProxy::activateContext(this);
+    Q_EMIT activeChanged();
+}
+
+// similar to setActive() but does not alter the actions from the proxy
+void UCActionContext::setEffectiveActive(bool active)
+{
+    if (m_effectiveActive == active) {
+        return;
+    }
+    // skip deactivation for global context
+    if (!active && (ActionProxy::instance().globalContext == this)) {
+        return;
+    }
+    CONTEXT_TRACE("EFECTIVE ACTIVATE CONTEXT" << this << active);
+
+    m_effectiveActive = active;
     Q_EMIT activeChanged();
 }
 
@@ -147,3 +251,28 @@
     }
     m_actions.remove(action);
 }
+
+
+/*!
+ * \qmltype PopupContext
+ * \instantiates UCPopupContext
+ * \inqmlmodule Ubuntu.Components 1.3
+ * \since Ubuntu.Components 1.3
+ * \inherits ActionContext
+ * \ingroup ubuntu
+ * \brief A special ActionContext used in Dialogs and Popups.
+ *
+ * A PopupContext is similar to the ActionContext, with the only difference being
+ * that there can be only one PopupContext active at a time in an application.
+ * A PopupContext can have several active ActionContext children declared, however
+ * when deactivated all child contexts will be deactivated as well, and no Action
+ * declared in these contexts will be available through shortcuts.
+ *
+ * The toolkit provides this kind of contexts in MainView, Popup and Dialog. It is
+ * highly recommended for applications to have a PopupContext defined in their rootItem.
+ */
+UCPopupContext::UCPopupContext(QObject *parent)
+    : UCActionContext(parent)
+{
+    m_popup = true;
+}

=== modified file 'src/Ubuntu/Components/plugin/ucactioncontext.h'
--- src/Ubuntu/Components/plugin/ucactioncontext.h	2015-09-01 10:49:47 +0000
+++ src/Ubuntu/Components/plugin/ucactioncontext.h	2016-01-15 07:23:58 +0000
@@ -24,6 +24,7 @@
 #include <QtQml>
 
 class UCAction;
+class UCActionContextAttached;
 class UCActionContext : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
@@ -35,14 +36,21 @@
     explicit UCActionContext(QObject *parent = 0);
     ~UCActionContext();
 
-    void classBegin(){}
+    static UCActionContextAttached *qmlAttachedProperties(QObject *owner);
+
+    void classBegin();
     void componentComplete();
     void markActionsPublished(bool mark);
+    bool isPopup() const
+    {
+        return m_popup;
+    }
 
     QQmlListProperty<UCAction> actions();
 
     bool active();
     void setActive(bool active);
+    void setEffectiveActive(bool active);
 
 Q_SIGNALS:
     void activeChanged();
@@ -51,9 +59,13 @@
     void addAction(UCAction *action);
     void removeAction(UCAction *action);
 
-private:
-    bool m_active;
+protected:
     QSet<UCAction*> m_actions;
+    bool m_active:1;
+    bool m_effectiveActive:1;
+    // declare popup flag within ActionContext to avoid unnecessary object-casting
+    // to detect whether a context is a popup or normal context.
+    bool m_popup:1;
     friend class UCActionManager;
 
     static void append(QQmlListProperty<UCAction> *list, UCAction *action);
@@ -61,6 +73,36 @@
     static int count(QQmlListProperty<UCAction> *list);
 };
 
+class UCPopupContext : public UCActionContext
+{
+    Q_OBJECT
+public:
+    explicit UCPopupContext(QObject *parent = 0);
+};
+
+class QQuickItem;
+class UCActionContextAttached : public QObject
+{
+    Q_OBJECT
+public:
+    explicit UCActionContextAttached(QObject *owner);
+
+    inline QQuickItem *owner() const
+    {
+        return m_owner;
+    }
+    inline UCActionContext *context() const
+    {
+        return m_context;
+    }
+
+private:
+    QQuickItem *m_owner;
+    UCActionContext *m_context;
+    friend class UCActionContext;
+};
+
 QML_DECLARE_TYPE(UCActionContext)
+QML_DECLARE_TYPEINFO(UCActionContext, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // UCACTIONCONTEXT_H

=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-12-18 12:42:58 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2016-01-15 07:23:58 +0000
@@ -139,6 +139,7 @@
 {
     Q_Q(UCActionItem);
     if (attach) {
+        action->addOwningItem(q);
         QObject::connect(q, SIGNAL(triggered(QVariant)),
                 q, SLOT(_q_invokeActionTrigger(QVariant)), Qt::DirectConnection);
         if (!(flags & CustomVisible)) {
@@ -162,6 +163,7 @@
                     q, &UCActionItem::iconNameChanged, Qt::DirectConnection);
         }
     } else {
+        action->removeOwningItem(q);
         QObject::disconnect(q, SIGNAL(triggered(QVariant)),
                    q, SLOT(_q_invokeActionTrigger(QVariant)));
         if (!(flags & CustomVisible)) {
@@ -228,7 +230,7 @@
     if (d->flags & UCActionItemPrivate::CustomText) {
         return d->text;
     }
-    return d->action ? d->action->m_text : QString();
+    return d->action ? d->action->text() : QString();
 }
 void UCActionItem::setText(const QString &text)
 {

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedge.cpp	2015-12-17 15:23:26 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -62,7 +62,6 @@
     Q_Q(UCBottomEdge);
     // initialize hint
     QQml_setParent_noEvent(hint, q);
-    hint->setParentItem(q);
 
     // create default regions
     createDefaultRegions();
@@ -589,7 +588,7 @@
  *                 BottomEdgeRegion {
  *                     from: 0.6
  *                     to: 1.0
- *                     property color color: UbuntuColors.lightGrey
+ *                     property color color: UbuntuColors.silk
  *                 }
  *             ]
  *         }
@@ -706,6 +705,7 @@
 {
     Q_D(UCBottomEdge);
     // initialize hint
+    d->hint->setParentItem(this);
     d->hint->init();
 
     // hint click() always commits

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge_p.h'
--- src/Ubuntu/Components/plugin/ucbottomedge_p.h	2015-12-11 12:10:54 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge_p.h	2016-01-15 07:23:58 +0000
@@ -109,6 +109,5 @@
     UCCollapseAction(QObject *parent = 0);
     void activate();
 };
-Q_DECLARE_METATYPE(QQmlListProperty<UCAction>)
 
 #endif // UCBOTTOMEDGE_P_H

=== modified file 'src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
--- src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-09-28 07:00:37 +0000
+++ src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -64,14 +64,21 @@
 
     \sa {StyledItem}
 */
-UCDeprecatedTheme::UCDeprecatedTheme(QObject *parent)
-    : QObject(parent)
+UCDeprecatedTheme::UCDeprecatedTheme(UCTheme *theme)
+    : QObject(theme)
 {
     m_notes = QHash<QString, bool>();
-    connect(&UCTheme::defaultTheme(), &UCTheme::nameChanged,
-            this, &UCDeprecatedTheme::nameChanged);
-    connect(&UCTheme::defaultTheme(), &UCTheme::paletteChanged,
-            this, &UCDeprecatedTheme::paletteChanged);
+    connect(theme, SIGNAL(nameChanged()),
+            this, SIGNAL(nameChanged()));
+    connect(theme, SIGNAL(paletteChanged()),
+            this, SIGNAL(paletteChanged()));
+}
+
+UCTheme *UCDeprecatedTheme::defaultTheme()
+{
+    QQmlEngine *engine = qmlEngine(this);
+    Q_ASSERT(engine);
+    return UCTheme::defaultTheme(engine);
 }
 
 void UCDeprecatedTheme::showDeprecatedNote(QObject *onItem, const char *note)
@@ -103,17 +110,17 @@
 QString UCDeprecatedTheme::name()
 {
     showDeprecatedNote(this, "Theme.name is deprecated. Use ThemeSettings instead.");
-    return UCTheme::defaultTheme().name();
+    return defaultTheme()->name();
 }
 void UCDeprecatedTheme::setName(const QString& name)
 {
     showDeprecatedNote(this, "Theme.name is deprecated. Use ThemeSettings instead.");
-    UCTheme::defaultTheme().setName(name);
+    defaultTheme()->setName(name);
 }
 void UCDeprecatedTheme::resetName()
 {
     showDeprecatedNote(this, "Theme.name is deprecated. Use ThemeSettings instead.");
-    UCTheme::defaultTheme().resetName();
+    defaultTheme()->resetName();
 }
 
 /*!
@@ -124,7 +131,7 @@
 QObject* UCDeprecatedTheme::palette()
 {
     showDeprecatedNote(this, "Theme.palette is deprecated. Use ThemeSettings instead.");
-    return UCTheme::defaultTheme().palette();
+    return defaultTheme()->palette();
 }
 
 /*!
@@ -135,18 +142,24 @@
 QQmlComponent* UCDeprecatedTheme::createStyleComponent(const QString& styleName, QObject* parent)
 {
     showDeprecatedNote(parent, "Theme.createStyleComponent() is deprecated. Use ThemeSettings instead.");
-    return UCTheme::defaultTheme().createStyleComponent(styleName, parent, BUILD_VERSION(1, 2));
+    return defaultTheme()->createStyleComponent(styleName, parent, BUILD_VERSION(1, 2));
 }
 
 void UCDeprecatedTheme::registerToContext(QQmlContext* context)
 {
-    UCTheme::defaultTheme().m_engine = context->engine();
-    UCTheme::defaultTheme().updateEnginePaths();
+    // the default theme must be set up prior to this call
+    QQmlEngine *engine = context->engine();
+    UCTheme *theme = UCTheme::defaultTheme(engine);
+    Q_ASSERT(theme);
+    // initialize deprecated theme using the default theme from the engine
+    UCDeprecatedTheme *oldTheme = new UCDeprecatedTheme(theme);
+    QQmlEngine::setContextForObject(oldTheme, context);
+
     // register deprecated Theme property
-    context->setContextProperty("Theme", this);
+    context->setContextProperty("Theme", oldTheme);
 
     ContextPropertyChangeListener *themeChangeListener =
         new ContextPropertyChangeListener(context, "Theme");
-    QObject::connect(this, SIGNAL(nameChanged()),
+    QObject::connect(oldTheme, SIGNAL(nameChanged()),
                      themeChangeListener, SLOT(updateContextProperty()));
 }

=== modified file 'src/Ubuntu/Components/plugin/ucdeprecatedtheme.h'
--- src/Ubuntu/Components/plugin/ucdeprecatedtheme.h	2015-05-18 05:42:05 +0000
+++ src/Ubuntu/Components/plugin/ucdeprecatedtheme.h	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -25,17 +25,14 @@
 class QQmlComponent;
 class QQmlContext;
 class UCTheme;
+class QQmlEngine;
 class UCDeprecatedTheme : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName RESET resetName NOTIFY nameChanged)
     Q_PROPERTY(QObject* palette READ palette NOTIFY paletteChanged)
 public:
-    static UCDeprecatedTheme& instance() {
-        static UCDeprecatedTheme instance;
-        return instance;
-    }
-    explicit UCDeprecatedTheme(QObject *parent = 0);
+    explicit UCDeprecatedTheme(UCTheme *theme);
 
     // getter/setters
     QString name();
@@ -44,7 +41,7 @@
     QObject* palette();
 
     Q_INVOKABLE QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent);
-    void registerToContext(QQmlContext* context);
+    static void registerToContext(QQmlContext* context);
 
 Q_SIGNALS:
     void nameChanged();
@@ -52,6 +49,7 @@
 
 private:
     void showDeprecatedNote(QObject *onItem, const char *note);
+    UCTheme *defaultTheme();
     QHash<QString, bool> m_notes;
 };
 

=== modified file 'src/Ubuntu/Components/plugin/uclabel.cpp'
--- src/Ubuntu/Components/plugin/uclabel.cpp	2015-12-07 12:09:45 +0000
+++ src/Ubuntu/Components/plugin/uclabel.cpp	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -108,8 +108,11 @@
     if (m_flags & ColorSet) {
         return;
     }
-    setColor(theme->getPaletteColor("selected", "backgroundText"));
-    m_flags &= ~ColorSet;
+    UCTheme *theme = getTheme();
+    if (theme) {
+        setColor(theme->getPaletteColor("normal", "baseText"));
+        m_flags &= ~ColorSet;
+    }
 }
 
 /*!

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2015-12-15 15:58:54 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2016-01-15 07:23:58 +0000
@@ -94,20 +94,20 @@
 void UCListItemDivider::paletteChanged()
 {
     Q_D(UCListItemDivider);
-    QColor background = d->listItem->getTheme()->getPaletteColor("normal", "background");
-    if (!background.isValid()) {
-        return;
-    }
-    // FIXME: we need a palette value for divider colors, till then base on the background
-    // luminance
     if (!d->colorFromChanged || !d->colorToChanged) {
-        qreal luminance = (background.red()*212 + background.green()*715 + background.blue()*73)/1000.0/255.0;
-        bool lightBackground = (luminance > 0.85);
+        QColor themeColor;
+        UCTheme *theme = d->listItem->getTheme();
+        if (theme) {
+            themeColor = d->listItem->getTheme()->getPaletteColor("normal", "base");
+        }
+        if (!themeColor.isValid()) {
+            return;
+        }
         if (!d->colorFromChanged) {
-            d->colorFrom = lightBackground ? QColor("#26000000") : QColor("#26FFFFFF");
+            d->colorFrom = themeColor;
         }
         if (!d->colorToChanged) {
-            d->colorTo = lightBackground ? QColor("#14FFFFFF") : QColor("#14000000");
+            d->colorTo = themeColor;
         }
         updateGradient();
     }
@@ -117,13 +117,13 @@
 {
     Q_D(UCListItemDivider);
     d->gradient.clear();
-    d->gradient.append(QGradientStop(0.0, d->colorFrom));
-    d->gradient.append(QGradientStop(0.49, d->colorFrom));
-    d->gradient.append(QGradientStop(0.5, d->colorTo));
-    d->gradient.append(QGradientStop(1.0, d->colorTo));
-    if (d->listItem) {
-        d->listItem->update();
+    if (height() > UCUnits::instance().dp(1)) {
+        d->gradient.append(QGradientStop(0.0, d->colorFrom));
+        d->gradient.append(QGradientStop(0.49, d->colorFrom));
+        d->gradient.append(QGradientStop(0.5, d->colorTo));
+        d->gradient.append(QGradientStop(1.0, d->colorTo));
     }
+    update();
 }
 
 QSGNode *UCListItemDivider::updatePaintNode(QSGNode *node, UpdatePaintNodeData *data)
@@ -137,9 +137,13 @@
 
     UCListItemPrivate *pListItem = UCListItemPrivate::get(d->listItem);
     bool lastItem = pListItem->countOwner ? (pListItem->index() == (pListItem->countOwner->property("count").toInt() - 1)): false;
-    if (!lastItem && (d->gradient.size() > 0) && ((d->colorFrom.alphaF() >= (1.0f / 255.0f)) || (d->colorTo.alphaF() >= (1.0f / 255.0f)))) {
+    if (!lastItem && ((d->colorFrom.alphaF() >= (1.0f / 255.0f)) || (d->colorTo.alphaF() >= (1.0f / 255.0f)))) {
         dividerNode->setRect(boundingRect());
-        dividerNode->setGradientStops(d->gradient);
+        if (d->gradient.size() > 0) {
+            dividerNode->setGradientStops(d->gradient);
+        } else {
+            dividerNode->setColor(d->colorFrom);
+        }
         dividerNode->update();
         return dividerNode;
     } else if (node) {
@@ -1648,7 +1652,10 @@
 {
     Q_D(UCListItem);
     d->customColor = false;
-    d->highlightColor = getTheme()->getPaletteColor("selected", "background");
+    UCTheme *theme = getTheme();
+    if (theme) {
+        d->highlightColor = theme->getPaletteColor("selected", "foreground");
+    }
     update();
     Q_EMIT highlightColorChanged();
 }
@@ -1745,10 +1752,16 @@
     if (mainAction == action) {
         return;
     }
+    if (mainAction) {
+        mainAction->removeOwningItem(q);
+    }
     mainAction = action;
-    if (mainAction && (mainAction->m_parameterType == UCAction::None)) {
-        // call setProperty to invoke notify signal
-        mainAction->setProperty("parameterType", UCAction::Integer);
+    if (mainAction) {
+        mainAction->addOwningItem(q);
+        if (mainAction->m_parameterType == UCAction::None) {
+            // call setProperty to invoke notify signal
+            mainAction->setProperty("parameterType", UCAction::Integer);
+        }
     }
     Q_EMIT q->actionChanged();
 }

=== modified file 'src/Ubuntu/Components/plugin/uclistitem_p.h'
--- src/Ubuntu/Components/plugin/uclistitem_p.h	2015-11-16 06:35:05 +0000
+++ src/Ubuntu/Components/plugin/uclistitem_p.h	2016-01-15 07:23:58 +0000
@@ -26,7 +26,7 @@
 
 #define IMPLICIT_LISTITEM_WIDTH_GU      40
 #define IMPLICIT_LISTITEM_HEIGHT_GU     7
-#define DIVIDER_THICKNESS_DP            2
+#define DIVIDER_THICKNESS_DP            1
 #define DEFAULT_SWIPE_THRESHOLD_GU      1.5
 
 class QQuickFlickable;

=== modified file 'src/Ubuntu/Components/plugin/uclistitemlayout.cpp'
--- src/Ubuntu/Components/plugin/uclistitemlayout.cpp	2015-11-10 11:39:51 +0000
+++ src/Ubuntu/Components/plugin/uclistitemlayout.cpp	2016-01-15 07:23:58 +0000
@@ -27,6 +27,7 @@
     \qmltype ListItemLayout
     \instantiates UCListItemLayout
     \inqmlmodule Ubuntu.Components 1.3
+    \since Ubuntu.Components 1.3
     \inherits SlotsLayout
     \ingroup ubuntu
 
@@ -74,7 +75,7 @@
     \l ListItem and ListItemLayout:
     \qml
     ListItem {
-        height: layout.height + divider.height
+        height: layout.height + (divider.visible ? divider.height : 0)
         ListItemLayout {
             id: layout
             title.text: "Hello developers!"
@@ -103,7 +104,7 @@
     \qml
     ListItem {
         id: listItem
-        height: layout.height + divider.height
+        height: layout.height + (divider.visible ? divider.height : 0)
 
         ListItemLayout {
             id: layout
@@ -155,8 +156,8 @@
     The \l title is positioned at the top, followed by \l subtitle and \l summary,
     respectively.
 
-    The \l subtitle has its top anchored to \l {title}'s baseline, with a margin of
-    4 DPs.
+    The \l subtitle has its top anchored to \l {title}'s bottom, with a margin of
+    2 DPs.
 
     The \l summary has its top tightly anchored to \l {subtitle}'s bottom.
 
@@ -208,6 +209,81 @@
     }
     \endqml
 
+    \section1 About aliasing labels properties
+    Due to the way ListItemsLayout's labels are created (see
+    \l {Optimizing memory consumption}) it is not possible to
+    directly alias their properties. It is still possible, however,
+    to expose an API that gives indirect read-write access to those
+    properties.
+    The following code:
+
+    \qml
+    ListItem {
+        property alias titleText: layout.title.text
+        ListItemLayout {
+            id: layout
+        }
+    }
+    \endqml
+
+    will return the error "Invalid alias location", because
+    the title object does not yet exist at time when the alias
+    is created.
+
+    If you need to expose an API for your component that allows
+    changing the properties of the labels, we recommend aliasing
+    the labels themselves. Let's assume you want to create a
+    QML component to use as a delegate of many
+    list views inside your application: you will probably have a qml
+    file holding the definition of the that delegate, and the content
+    of that file will be similar to:
+    \qml
+    //Content of CustomListItem.qml
+    import QtQuick 2.4
+    import Ubuntu.Components 1.3
+
+    ListItem {
+        id: listitem
+        property alias title: layout.title
+        property alias iconName: icon.name
+
+        height: layout.height + (divider.visible ? divider.height : 0)
+
+        ListItemLayout {
+            id: layout
+            Icon {
+                id: icon
+                width: units.gu(2)
+            }
+        }
+    }
+    \endqml
+
+    As you can see, we alias the label item itself instead of its
+    properties. This also has the advantage of only exposing one alias
+    instead of one for each property, thus making your QML app a bit more performant.
+    Once your delegate is defined, you can use it in your ListViews like usual.
+    \qml
+    //other UI code...
+
+    ListView {
+        anchors.fill: parent
+        model: ListModel {
+            id: listViewModel
+            ListElement { titleText: "Hello1"; icon: "message" }
+            ListElement { titleText: "Hello2"; icon: "email" }
+            ListElement { titleText: "Hello3"; icon: "email" }
+            ListElement { titleText: "Hello4"; icon: "message" }
+        }
+        delegate: CustomListItem {
+            title.text: model.titleText
+            iconName: model.icon
+        }
+    }
+    \endqml
+
+    Note how title's properties are all accessible via the "title" identifier.
+
 */
 UCListItemLayout::UCListItemLayout(QQuickItem *parent)
     : UCSlotsLayout(parent)

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-12-16 10:01:07 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2016-01-15 07:23:58 +0000
@@ -327,8 +327,9 @@
     Q_Q(UCStyledItemBase);
     // either styleComponent or styleName is valid
     QQmlComponent *component = styleComponent;
-    if (!component) {
-        component = q->getTheme()->createStyleComponent(styleDocument + ".qml", q, styleVersion);
+    UCTheme *theme = q->getTheme();
+    if (!component && theme) {
+        component = theme->createStyleComponent(styleDocument + ".qml", q, styleVersion);
     }
     if (!component) {
         return false;

=== modified file 'src/Ubuntu/Components/plugin/uctheme.cpp'
--- src/Ubuntu/Components/plugin/uctheme.cpp	2015-10-20 11:32:09 +0000
+++ src/Ubuntu/Components/plugin/uctheme.cpp	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -44,7 +44,7 @@
 #include <QtQml/private/qqmlbinding_p.h>
 #undef foreach
 
-
+const char *CONTEXT_THEME = "theme";
 quint16 UCTheme::previousVersion = 0;
 /*!
  * \qmltype ThemeSettings
@@ -345,20 +345,31 @@
  */
 UCTheme::UCTheme(QObject *parent)
     : QObject(parent)
-    , m_palette(UCTheme::defaultTheme().m_palette)
-    , m_engine(UCTheme::defaultTheme().m_engine)
-    , m_defaultStyle(false)
-{
-    init();
-}
-
-UCTheme::UCTheme(bool defaultStyle, QObject *parent)
-    : QObject(parent)
-    , m_palette(NULL)
-    , m_engine(NULL)
-    , m_defaultStyle(defaultStyle)
-{
-    init();
+    , m_parentTheme(Q_NULLPTR)
+    , m_palette(Q_NULLPTR)
+    , m_completed(false)
+{
+    init();
+}
+
+UCTheme *UCTheme::defaultTheme(QQmlEngine *engine)
+{
+    if (!engine || !engine->rootContext()) {
+        return Q_NULLPTR;
+    }
+    UCTheme *theme = Q_NULLPTR;
+    for (int tryCount = 0; !theme && tryCount < 2; tryCount++) {
+        theme = engine->rootContext()->contextProperty(CONTEXT_THEME).value<UCTheme*>();
+        if (!theme) {
+            createDefaultTheme(engine);
+        }
+    }
+    return theme;
+}
+
+void UCTheme::setupDefault()
+{
+    // FIXME: move this into QPA
     // set the default font
     QFont defaultFont = QGuiApplication::font();
     defaultFont.setFamily("Ubuntu");
@@ -378,21 +389,24 @@
 
 void UCTheme::classBegin()
 {
-    m_engine = qmlEngine(this);
-    updateEnginePaths();
-    loadPalette();
+    QQmlEngine *engine = qmlEngine(this);
+    updateEnginePaths(engine);
+    m_palette = UCTheme::defaultTheme(engine)->m_palette;
+    if (!m_palette) {
+        loadPalette(engine);
+    }
 }
 
-void UCTheme::updateEnginePaths()
+void UCTheme::updateEnginePaths(QQmlEngine *engine)
 {
-    if (!m_engine) {
+    if (!engine) {
         return;
     }
 
     QStringList paths = themeSearchPath();
     Q_FOREACH(const QString &path, paths) {
-        if (QDir(path).exists() && !m_engine->importPathList().contains(path)) {
-            m_engine->addImportPath(path);
+        if (QDir(path).exists() && !engine->importPathList().contains(path)) {
+            engine->addImportPath(path);
         }
     }
 }
@@ -458,7 +472,7 @@
                             this, &UCTheme::_q_defaultThemeChanged);
         updateThemePaths();
     }
-    loadPalette();
+    loadPalette(qmlEngine(this));
     Q_EMIT nameChanged();
     updateThemedItems();
 }
@@ -526,7 +540,7 @@
 QObject* UCTheme::palette()
 {
     if (!m_palette) {
-        loadPalette(false);
+        loadPalette(qmlEngine(this), false);
     }
     return m_palette;
 }
@@ -611,16 +625,20 @@
 }
 
 // registers the default theme property to the root context
-void UCTheme::registerToContext(QQmlContext* context)
+void UCTheme::createDefaultTheme(QQmlEngine* engine)
 {
-    UCTheme *defaultTheme = &UCTheme::defaultTheme();
-    defaultTheme->m_engine = context->engine();
-    defaultTheme->updateEnginePaths();
-
-    context->setContextProperty("theme", defaultTheme);
+    QQmlContext *context = engine->rootContext();
+
+    UCTheme *theme = new UCTheme(engine);
+    QQmlEngine::setContextForObject(theme, context);
+    context->setContextProperty(CONTEXT_THEME, theme);
+
+    theme->setupDefault();
+    theme->updateEnginePaths(engine);
+
     ContextPropertyChangeListener *listener =
-        new ContextPropertyChangeListener(context, "theme");
-    QObject::connect(defaultTheme, &UCTheme::nameChanged,
+        new ContextPropertyChangeListener(context, CONTEXT_THEME);
+    QObject::connect(theme, &UCTheme::nameChanged,
                      listener, &ContextPropertyChangeListener::updateContextProperty);
 }
 
@@ -674,42 +692,38 @@
 
     if (parent != NULL) {
         QQmlEngine* engine = qmlEngine(parent);
-        if (engine != m_engine && !m_engine) {
-            m_engine = engine;
-            updateEnginePaths();
-        }
+        Q_ASSERT(engine);
+        Q_ASSERT(engine == qmlEngine(this));
         // make sure we have the paths
-        if (engine != NULL) {
-            bool fallback = false;
-            QUrl url = styleUrl(styleName, version, &fallback);
-            if (url.isValid()) {
-                if (fallback) {
-                    qmlInfo(parent) << QStringLiteral("Theme '%1' has no '%2' style for version %3.%4, fall back to version %5.%6.")
-                                       .arg(name()).arg(styleName).arg(MAJOR_VERSION(version)).arg(MINOR_VERSION(version))
-                                       .arg(MAJOR_VERSION(LATEST_UITK_VERSION)).arg(MINOR_VERSION(LATEST_UITK_VERSION));
-                }
-                component = new QQmlComponent(engine, url, QQmlComponent::PreferSynchronous, parent);
-                if (component->isError()) {
-                    qmlInfo(parent) << component->errorString();
-                    delete component;
-                    component = NULL;
-                } else {
-                    // set context for the component
-                    QQmlEngine::setContextForObject(component, qmlContext(parent));
-                }
+        bool fallback = false;
+        QUrl url = styleUrl(styleName, version, &fallback);
+        if (url.isValid()) {
+            if (fallback) {
+                qmlInfo(parent) << QStringLiteral("Theme '%1' has no '%2' style for version %3.%4, fall back to version %5.%6.")
+                                   .arg(name()).arg(styleName).arg(MAJOR_VERSION(version)).arg(MINOR_VERSION(version))
+                                   .arg(MAJOR_VERSION(LATEST_UITK_VERSION)).arg(MINOR_VERSION(LATEST_UITK_VERSION));
+            }
+            component = new QQmlComponent(engine, url, QQmlComponent::PreferSynchronous, parent);
+            if (component->isError()) {
+                qmlInfo(parent) << component->errorString();
+                delete component;
+                component = NULL;
             } else {
-                qmlInfo(parent) <<
-                   UbuntuI18n::instance().tr(QString("Warning: Style %1 not found in theme %2").arg(styleName).arg(name()));
+                // set context for the component
+                QQmlEngine::setContextForObject(component, qmlContext(parent));
             }
+        } else {
+            qmlInfo(parent) <<
+               UbuntuI18n::instance().tr(QString("Warning: Style %1 not found in theme %2").arg(styleName).arg(name()));
         }
     }
 
     return component;
 }
 
-void UCTheme::loadPalette(bool notify)
+void UCTheme::loadPalette(QQmlEngine *engine, bool notify)
 {
-    if (!m_engine) {
+    if (!engine) {
         return;
     }
     if (m_palette) {
@@ -721,7 +735,7 @@
     // theme may not have palette defined
     QUrl paletteUrl = styleUrl("Palette.qml", previousVersion ? previousVersion : LATEST_UITK_VERSION);
     if (paletteUrl.isValid()) {
-        m_palette = QuickUtils::instance().createQmlObject(paletteUrl, m_engine);
+        m_palette = QuickUtils::instance().createQmlObject(paletteUrl, engine);
         if (m_palette) {
             m_palette->setParent(this);
         }
@@ -731,7 +745,7 @@
         }
     } else {
         // use the default palette if none defined
-        m_palette = defaultTheme().m_palette;
+        m_palette = defaultTheme(engine)->m_palette;
     }
 }
 
@@ -747,4 +761,3 @@
     }
     return result;
 }
-

=== modified file 'src/Ubuntu/Components/plugin/uctheme.h'
--- src/Ubuntu/Components/plugin/uctheme.h	2015-10-20 11:32:09 +0000
+++ src/Ubuntu/Components/plugin/uctheme.h	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -64,11 +64,7 @@
     };
 
     explicit UCTheme(QObject *parent = 0);
-    static UCTheme &defaultTheme()
-    {
-        static UCTheme instance(true);
-        return instance;
-    }
+    static UCTheme *defaultTheme(QQmlEngine *engine);
 
     // getter/setters
     UCTheme *parentTheme();
@@ -82,7 +78,6 @@
 
     // internal, used by the deprecated Theme.createStyledComponent()
     QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent, quint16 version = 0);
-    static void registerToContext(QQmlContext* context);
     void attachItem(QQuickItem *item, bool attach);
 
     // helper functions
@@ -106,12 +101,13 @@
     void _q_defaultThemeChanged();
 
 private:
-    UCTheme(bool defaultStyle, QObject *parent = 0);
+    static void createDefaultTheme(QQmlEngine* engine);
+    void setupDefault();
     void init();
-    void updateEnginePaths();
+    void updateEnginePaths(QQmlEngine *engine);
     void updateThemePaths();
     QUrl styleUrl(const QString& styleName, quint16 version, bool *isFallback = NULL);
-    void loadPalette(bool notify = true);
+    void loadPalette(QQmlEngine *engine, bool notify = true);
     void updateThemedItems();
 
     class PaletteConfig
@@ -165,8 +161,6 @@
     QList<ThemeRecord> m_themePaths;
     UCDefaultTheme m_defaultTheme;
     QPODVector<QQuickItem*, 4> m_attachedItems;
-    QQmlEngine *m_engine;
-    bool m_defaultStyle:1;
     bool m_completed:1;
 
     friend class UCDeprecatedTheme;

=== modified file 'src/Ubuntu/Components/plugin/ucthemingextension.cpp'
--- src/Ubuntu/Components/plugin/ucthemingextension.cpp	2015-10-21 14:02:43 +0000
+++ src/Ubuntu/Components/plugin/ucthemingextension.cpp	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -107,13 +107,28 @@
         return;
     }
 
+    // when we set a parent, the two items must be under the same engine
+    if (newParent && qmlEngine(m_item) != qmlEngine(newParent)) {
+        return;
+    }
+
+    if (!qmlEngine(m_item)) {
+        // the item is about to be deleted, parent change occurs as the parent is removed
+        Q_ASSERT(!newParent);
+        return;
+    }
+
     // make sure we have these handlers attached to each intermediate item
     QQuickItem *oldThemedAscendant = UCThemingExtension::ascendantThemed(m_prevParent);
     QQuickItem *newThemedAscendant = UCThemingExtension::ascendantThemed(newParent);
     UCThemingExtension *oldExtension = qobject_cast<UCThemingExtension*>(oldThemedAscendant);
     UCThemingExtension *newExtension = qobject_cast<UCThemingExtension*>(newThemedAscendant);
-    UCTheme *oldTheme = oldExtension ? oldExtension->getTheme() : &UCTheme::defaultTheme();
-    UCTheme *newTheme = newExtension ? newExtension->getTheme() : &UCTheme::defaultTheme();
+    UCTheme *oldTheme = oldExtension ? oldExtension->getTheme() : UCTheme::defaultTheme(qmlEngine(m_item));
+    UCTheme *newTheme = newExtension ? newExtension->getTheme() : UCTheme::defaultTheme(qmlEngine(m_item));
+
+    // neither of the themes can be null!
+    Q_ASSERT(oldTheme);
+    Q_ASSERT(newTheme);
 
     if (oldTheme != newTheme) {
         UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(m_item);
@@ -134,11 +149,10 @@
  *
  */
 UCThemingExtension::UCThemingExtension(QQuickItem *extendedItem)
-    : theme(&UCTheme::defaultTheme())
+    : theme(Q_NULLPTR)
     , themedItem(extendedItem)
     , themeType(Inherited)
 {
-    theme->attachItem(themedItem, true);
     themedItem->setUserData(xdata, new UCItemAttached(themedItem));
 }
 
@@ -157,7 +171,7 @@
     }
     QQuickItem *upperThemed = ascendantThemed(QQuickItemPrivate::get(themedItem)->parentItem);
     UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(upperThemed);
-    UCTheme *parentTheme = extension ? extension->getTheme() : &UCTheme::defaultTheme();
+    UCTheme *parentTheme = extension ? extension->getTheme() : UCTheme::defaultTheme(qmlEngine(themedItem));
     if (parentTheme != theme) {
         theme->setParentTheme(parentTheme);
     }
@@ -203,8 +217,18 @@
     }
 }
 
-UCTheme *UCThemingExtension::getTheme() const
+UCTheme *UCThemingExtension::getTheme()
 {
+    if (!theme) {
+        theme = UCTheme::defaultTheme(qmlEngine(themedItem));
+        if (!theme) {
+            QString msg = QStringLiteral("The item %1 was created without a valid QML Engine. Styling will not be possible.")
+                    .arg(themedItem->metaObject()->className());
+            qCritical().noquote() << msg;
+            return Q_NULLPTR;
+        }
+        theme->attachItem(themedItem, true);
+    }
     return theme;
 }
 void UCThemingExtension::setTheme(UCTheme *newTheme, ThemeType type)
@@ -244,7 +268,7 @@
 {
     QQuickItem *upperThemed = ascendantThemed(QQuickItemPrivate::get(themedItem)->parentItem);
     UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(upperThemed);
-    UCTheme *theme = extension ? extension->getTheme() : &UCTheme::defaultTheme();
+    UCTheme *theme = extension ? extension->getTheme() : UCTheme::defaultTheme(qmlEngine(themedItem));
     setTheme(theme, Inherited);
 }
 

=== modified file 'src/Ubuntu/Components/plugin/ucthemingextension.h'
--- src/Ubuntu/Components/plugin/ucthemingextension.h	2015-10-20 10:19:10 +0000
+++ src/Ubuntu/Components/plugin/ucthemingextension.h	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -44,14 +44,14 @@
     virtual void itemThemeChanged(UCTheme *, UCTheme*);
     virtual void itemThemeReloaded(UCTheme *);
 
-    UCTheme *getTheme() const;
+    UCTheme *getTheme();
     void setTheme(UCTheme *newTheme, ThemeType type = Custom);
     void resetTheme();
 
     static bool isThemed(QQuickItem *item);
     static QQuickItem *ascendantThemed(QQuickItem *item);
 
-protected:
+private:
     QPointer<UCTheme> theme;
     QQuickItem *themedItem;
     ThemeType themeType;

=== modified file 'src/Ubuntu/Components/qmldir'
--- src/Ubuntu/Components/qmldir	2015-12-17 13:48:23 +0000
+++ src/Ubuntu/Components/qmldir	2016-01-15 07:23:58 +0000
@@ -138,3 +138,5 @@
 ScrollView 1.3 1.3/ScrollView.qml
 PageHeader 1.3 1.3/PageHeader.qml
 Toolbar 1.3 1.3/Toolbar.qml
+singleton UbuntuColors 1.3 1.3/UbuntuColors.qml
+Icon 1.3 1.3/Icon.qml

=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea.cpp'
--- src/Ubuntu/UbuntuGestures/ucswipearea.cpp	2015-12-17 15:23:26 +0000
+++ src/Ubuntu/UbuntuGestures/ucswipearea.cpp	2016-01-15 07:23:58 +0000
@@ -813,10 +813,13 @@
 
             // FIXME: Handle window->screen() changes (ie window changing screens)
             Q_D(UCSwipeArea);
-            qreal pixelsPerMm = value.window->screen()->physicalDotsPerInch() / 25.4;
-            // FIXME: dpi can be negative lp#1525293
-            if (pixelsPerMm > 0)
-                d->setPixelsPerMm(pixelsPerMm);
+            qreal pixelsPerInch = value.window->screen()->physicalDotsPerInch();
+            if (pixelsPerInch < 0) {
+                // FIXME: dpi can be negative lp#1525293
+                // It can return garbage when run in a XVFB server (Virtual Framebuffer 'fake' X server)
+                pixelsPerInch = 72;
+            }
+            d->setPixelsPerMm(pixelsPerInch / 25.4);
         }
     }
     if (change == ItemVisibleHasChanged) {

=== modified file 'src/src.pro'
--- src/src.pro	2015-11-05 11:00:10 +0000
+++ src/src.pro	2016-01-15 07:23:58 +0000
@@ -15,6 +15,7 @@
 
 src_test.subdir  = Ubuntu/Test
 src_test.target  = sub-test
+src_test.depends = sub-components
 
 #order is important
 SUBDIRS += src_gestures src_components src_layouts src_performance_metrics src_test

=== modified file 'tests/unit/tst_components/tst_action.qml'
--- tests/unit/tst_components/tst_action.qml	2015-12-12 07:22:08 +0000
+++ tests/unit/tst_components/tst_action.qml	2016-01-15 07:23:58 +0000
@@ -37,6 +37,8 @@
      function cleanup() {
          triggeredSignalSpy.target = action;
          triggeredSignalSpy.clear();
+         context1.active = false;
+         context2.active = false;
      }
 
      function initTestCase() {
@@ -126,15 +128,21 @@
 
      function test_activate_contexts_data() {
          return [
-             {tag: "Activate context1", active: context1, inactive: context2},
-             {tag: "Activate context2", active: context2, inactive: context1},
-             {tag: "Activate context1 again", active: context1, inactive: context2},
+             {tag: "Activate context1", active: [context1], inactive: [context2]},
+             {tag: "Activate context2", active: [context2], inactive: [context1]},
+             {tag: "Activate context1, context2", active: [context1, context2], inactive: []},
          ];
      }
      function test_activate_contexts(data) {
-         data.active.active = true;
-         verify(data.active.active, "Context activation error");
-         verify(!data.inactive.active, "Context deactivation error");
+         for (var i = 0; i < data.active.length; i++) {
+            data.active[i].active = true;
+         }
+         for (var i = 0; i < data.active.length; i++) {
+            verify(data.active[i].active, "Context activation error");
+         }
+         for (var i = 0; i < data.inactive.length; i++) {
+            verify(!data.inactive[i].active, "Context deactivation error");
+         }
      }
 
      function test_overloaded_action_trigger_data() {

=== modified file 'tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml'
--- tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml	2015-11-27 10:36:08 +0000
+++ tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml	2016-01-15 07:23:58 +0000
@@ -30,7 +30,7 @@
         contentComponent: Rectangle {
             width: bottomEdge.width
             height: bottomEdge.height
-            color: UbuntuColors.lightGrey
+            color: UbuntuColors.silk
         }
 
         BottomEdgeRegion {

=== modified file 'tests/unit_x11/tst_components/AppTheme/Palette.qml'
--- tests/unit_x11/tst_components/AppTheme/Palette.qml	2015-04-24 14:34:39 +0000
+++ tests/unit_x11/tst_components/AppTheme/Palette.qml	2016-01-15 07:23:58 +0000
@@ -20,5 +20,5 @@
 
 Suru.Palette {
     normal.background: "#A21E1C"
-    selected.backgroundText: "lightblue"
+    normal.baseText: "lightblue"
 }

=== modified file 'tests/unit_x11/tst_components/MockKeyboard.qml'
--- tests/unit_x11/tst_components/MockKeyboard.qml	2015-07-02 17:39:03 +0000
+++ tests/unit_x11/tst_components/MockKeyboard.qml	2016-01-15 07:23:58 +0000
@@ -32,7 +32,7 @@
         visible: inputMethod.visible
 
         parent: QuickUtils.rootItem(inputMethod)
-        color: UbuntuColors.lightGrey
+        color: UbuntuColors.silk
         opacity: 0.5
         // Always on top, even modal Dialog overlay
         z: 100

=== added file 'tests/unit_x11/tst_components/tst_contextual_actions.qml'
--- tests/unit_x11/tst_components/tst_contextual_actions.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_contextual_actions.qml	2016-01-15 07:23:58 +0000
@@ -0,0 +1,326 @@
+/*
+ * Copyright 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
+ * 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 Lesser General Public License for more details.
+ *
+ * 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.4
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Loader {
+        id: testLoader
+        anchors.fill: parent
+    }
+
+    Component {
+        id: inactiveActionContextInChain
+
+        Item {
+            anchors.fill: parent
+            ActionContext {
+                active: true
+            }
+            Item {
+                anchors.fill: parent
+                ActionContext {
+                    objectName: "testContext"
+                    active: true
+                }
+
+                ActionItem {
+                    objectName: "testActionItem"
+                    action: Action {
+                        text: "Test"
+                        shortcut: 'Ctrl+T'
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: ambiguiousShortcutsInSameContext
+        Item {
+            ActionContext {
+                active: true
+            }
+            Column {
+                ActionItem {
+                    action: Action {
+                        shortcut: "Ctrl+T"
+                    }
+                }
+                ActionItem {
+                    action: Action {
+                        shortcut: "Ctrl+T"
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: ambiguiousShortcutsInDifferentContexts
+        Item {
+            id: root
+            anchors.fill: parent
+            ActionContext {
+                active: true
+            }
+            Row {
+                Item {
+                    width: root.width / 2
+                    height: root.height
+                    ActionContext {
+                        active: true
+                    }
+                    ActionItem {
+                        action: Action {
+                            shortcut: "Ctrl+T"
+                        }
+                    }
+                }
+                Item {
+                    width: root.width / 2
+                    height: root.height
+                    ActionContext {
+                        active: true
+                    }
+                    ActionItem {
+                        action: Action {
+                            shortcut: "Ctrl+T"
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: onePopupContextActive
+        Item {
+            PopupContext {
+                objectName: "popup1"
+                active: true
+            }
+            PopupContext {
+                objectName: "popup2"
+            }
+            PopupContext {
+                objectName: "popup3"
+            }
+        }
+    }
+
+    Component {
+        id: popupTest
+        MainView {
+            id: main
+            anchors.fill: parent
+            applicationName: "testApp"
+
+            property Popover popover: null
+
+            Button {
+                id: button
+                objectName: "mainButton"
+                anchors.centerIn: parent
+                action: Action {
+                    objectName: "mainAction"
+                    text: "Test &button"
+                    shortcut: "Ctrl+T"
+                }
+                onClicked: main.popover = PopupUtils.open(popup, button)
+            }
+
+            Component {
+                id: popup
+                Popover {
+                    contentWidth: units.gu(30)
+                    contentHeight: units.gu(30)
+                    Button {
+                        objectName: "popupButton"
+                        action: Action {
+                            objectName: "popupAction"
+                            text: "Test &button"
+                            shortcut: "Ctrl+T"
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: dialogTest
+        MainView {
+            id: main
+            anchors.fill: parent
+            applicationName: "testApp"
+
+            property Dialog popover: null
+
+            Button {
+                id: button
+                objectName: "mainButton"
+                anchors.centerIn: parent
+                action: Action {
+                    objectName: "mainAction"
+                    text: "Test &button"
+                    shortcut: "Ctrl+T"
+                }
+                onClicked: main.popover = PopupUtils.open(dialog)
+            }
+
+            Component {
+                id: dialog
+                Dialog {
+                    contentWidth: units.gu(30)
+                    contentHeight: units.gu(30)
+                    Button {
+                        objectName: "popupButton"
+                        action: Action {
+                            objectName: "popupAction"
+                            text: "Test &button"
+                            shortcut: "Ctrl+T"
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "ContextualActions"
+        when: windowShown
+
+        SignalSpy {
+            id: triggeredSpy
+            signalName: "triggered"
+        }
+
+        function createTest(component) {
+            testLoader.sourceComponent = component;
+            tryCompareFunction(function() { return testLoader.item != null }, true, 1000);
+            waitForRendering(testLoader.item);
+            wait(200)
+            return testLoader.item;
+        }
+
+        function cleanup() {
+            testLoader.sourceComponent = null;
+            triggeredSpy.target = null;
+            triggeredSpy.clear();
+            wait(200);
+        }
+
+        function test_inactive_actioncontext_in_chain() {
+            var item = createTest(inactiveActionContextInChain);
+            var testContext = findInvisibleChild(item, "testContext");
+            verify(testContext);
+            var testActionItem = findInvisibleChild(item, "testActionItem");
+            verify(testActionItem);
+
+            testContext.active = true;
+            triggeredSpy.target = testActionItem.action;
+            keyPress(Qt.Key_T, Qt.ControlModifier);
+            triggeredSpy.wait(200);
+
+            testContext.active = false;
+            triggeredSpy.clear();
+            keyPress(Qt.Key_T, Qt.ControlModifier);
+            expectFailContinue("", "No trigger when a context is inactive");
+            triggeredSpy.wait(200);
+        }
+
+        function test_ambiguous_actions_when_multiple_contexts_active_data() {
+            return [
+                {tag: "within same ActionContext", test: ambiguiousShortcutsInSameContext, message: warningFormat(66, 29, "QML Action: Ambiguous shortcut: Ctrl+T")},
+                {tag: "within different ActionContexts", test: ambiguiousShortcutsInDifferentContexts, message: warningFormat(107, 33, "QML Action: Ambiguous shortcut: Ctrl+T")},
+            ];
+        }
+        function test_ambiguous_actions_when_multiple_contexts_active(data) {
+            var test = createTest(data.test);
+            ignoreWarning(data.message);
+            keyClick(Qt.Key_T, Qt.ControlModifier);
+        }
+
+        function test_one_popup_context_active() {
+            var test = createTest(onePopupContextActive);
+            var popup1 = findInvisibleChild(test, "popup1");
+            var popup2 = findInvisibleChild(test, "popup2");
+            var popup3 = findInvisibleChild(test, "popup3");
+            verify(popup1);
+            verify(popup2);
+            verify(popup3);
+            verify(popup1.active);
+            verify(!popup2.active);
+            verify(!popup3.active);
+
+            // activate popup2
+            popup2.active = true;
+            verify(!popup1.active);
+            verify(popup2.active);
+            verify(!popup3.active);
+
+            // activate popup2
+            popup3.active = true;
+            verify(!popup1.active);
+            verify(!popup2.active);
+            verify(popup3.active);
+
+            // deactivate popup3, popup2 should be re-activated
+            popup3.active = false;
+            verify(!popup1.active);
+            verify(popup2.active);
+        }
+
+        function test_popovers_data() {
+            return [
+                {tag: "Popup", component: popupTest},
+                {tag: "Dialog", component: dialogTest},
+            ];
+        }
+        function test_popovers(data) {
+            var test = createTest(data.component);
+
+            var mainButton = findChild(test, "mainButton");
+            verify(mainButton);
+            triggeredSpy.target = mainButton.action;
+            keyClick(Qt.Key_T, Qt.ControlModifier);
+            triggeredSpy.wait(200);
+            mouseClick(mainButton, centerOf(mainButton).x, centerOf(mainButton).y);
+            tryCompareFunction(function() { return test.popover != null;}, true, 1000);
+
+            // trigger the action
+            triggeredSpy.clear();
+            keyClick(Qt.Key_T, Qt.ControlModifier);
+            expectFailContinue(data.tag, "Popup is active now");
+            triggeredSpy.wait(200);
+
+            var actionItem = findChild(test.popover, "popupButton");
+            verify(actionItem);
+            triggeredSpy.target = actionItem.action;
+            triggeredSpy.clear();
+            keyClick(Qt.Key_B, Qt.AltModifier);
+            triggeredSpy.wait(200);
+        }
+    }
+}

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2015-10-01 06:42:47 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2016-01-15 07:23:58 +0000
@@ -254,11 +254,9 @@
             var mappedDividerPos = defaults.mapFromItem(defaults.divider, defaults.divider.x, defaults.divider.y);
             compare(mappedDividerPos.x, 0, "divider's left anchor is wrong");
             compare(mappedDividerPos.x + defaults.divider.width, defaults.width, "divider's right anchor is wrong");
-            compare(defaults.divider.height, units.dp(2), "divider's thickness is wrong");
-            compare(defaults.divider.colorFrom, "#000000", "colorFrom differs.");
-            fuzzyCompare(defaults.divider.colorFrom.a, 0.14, 0.01, "colorFrom alpha differs");
-            compare(defaults.divider.colorTo, "#ffffff", "colorTo differs.");
-            fuzzyCompare(defaults.divider.colorTo.a, 0.07, 0.01, "colorTo alpha differs");
+            compare(defaults.divider.height, units.dp(1), "divider's thickness is wrong");
+            compare(defaults.divider.colorFrom, theme.palette.normal.base, "colorFrom differs.");
+            compare(defaults.divider.colorTo, theme.palette.normal.base, "colorTo differs.");
             compare(defaults.action, null, "No action by default.");
             compare(defaults.style, null, "Style is loaded upon first use.");
             compare(defaults.__styleInstance, null, "__styleInstance must be null.");

=== modified file 'tests/unit_x11/tst_components/tst_listitem13.qml'
--- tests/unit_x11/tst_components/tst_listitem13.qml	2015-10-01 06:42:47 +0000
+++ tests/unit_x11/tst_components/tst_listitem13.qml	2016-01-15 07:23:58 +0000
@@ -254,11 +254,9 @@
             var mappedDividerPos = defaults.mapFromItem(defaults.divider, defaults.divider.x, defaults.divider.y);
             compare(mappedDividerPos.x, 0, "divider's left anchor is wrong");
             compare(mappedDividerPos.x + defaults.divider.width, defaults.width, "divider's right anchor is wrong");
-            compare(defaults.divider.height, units.dp(2), "divider's thickness is wrong");
-            compare(defaults.divider.colorFrom, "#000000", "colorFrom differs.");
-            fuzzyCompare(defaults.divider.colorFrom.a, 0.14, 0.01, "colorFrom alpha differs");
-            compare(defaults.divider.colorTo, "#ffffff", "colorTo differs.");
-            fuzzyCompare(defaults.divider.colorTo.a, 0.07, 0.01, "colorTo alpha differs");
+            compare(defaults.divider.height, units.dp(1), "divider's thickness is wrong");
+            compare(defaults.divider.colorFrom, theme.palette.normal.base, "colorFrom differs.");
+            compare(defaults.divider.colorTo, theme.palette.normal.base, "colorTo differs.");
             compare(defaults.action, null, "No action by default.");
             compare(defaults.style, null, "Style is loaded upon first use.");
             compare(defaults.__styleInstance, null, "__styleInstance must be null.");

=== modified file 'tests/unit_x11/tst_components/tst_pagestack.qml'
--- tests/unit_x11/tst_components/tst_pagestack.qml	2015-10-21 19:33:28 +0000
+++ tests/unit_x11/tst_components/tst_pagestack.qml	2016-01-15 07:23:58 +0000
@@ -54,9 +54,15 @@
         id: tabs
         Tab {
             id: tab1
+            page: Page {
+                title: "Tab 1"
+            }
         }
         Tab {
             id: tab2
+            page: Page {
+                title: "Tab 2"
+            }
         }
     }
     Page {

=== modified file 'tests/unit_x11/tst_components/tst_shortcuts.qml'
--- tests/unit_x11/tst_components/tst_shortcuts.qml	2015-12-18 15:20:48 +0000
+++ tests/unit_x11/tst_components/tst_shortcuts.qml	2016-01-15 07:23:58 +0000
@@ -24,12 +24,17 @@
     width: 400
     height: 600
 
-    Action {
-        id: action
-    }
-    Action {
-        id: other
-        shortcut: 'Ctrl+G'
+    // actions must be either assigned to an active ActionContext or to an ActionItem to activate shortcuts
+    ActionContext {
+        id: context
+        active: true
+        Action {
+            id: action
+        }
+        Action {
+            id: other
+            shortcut: 'Ctrl+G'
+        }
     }
 
     TestUtil {
@@ -45,6 +50,8 @@
         }
 
         function init() {
+            context.active = true;
+            spy.target = action;
         }
         function cleanup() {
             spy.clear();
@@ -84,12 +91,12 @@
             ];
         }
         function test_shortcut_invalid(data) {
-            ignoreQMLWarning(':27:5: QML Action: Invalid shortcut: ');
+            ignoreQMLWarning(':31:9: QML Action: Invalid shortcut: ');
             action.shortcut = data;
         }
 
         function test_shortcut_duplicate() {
-            ignoreQMLWarning(':30:5: QML Action: Ambiguous shortcut: Ctrl+G');
+            ignoreQMLWarning(':34:9: QML Action: Ambiguous shortcut: Ctrl+G');
             action.shortcut = other.shortcut;
             keyClick(Qt.Key_G, Qt.ControlModifier);
         }
@@ -161,5 +168,22 @@
             }
             textSpy.wait(200);
         }
+
+        function test_contextual_action_shortcut_data() {
+            return [
+                {tag: "Active context", active: true, xfail: false},
+                {tag: "Inactive context", active: false, xfail: true},
+            ];
+        }
+        function test_contextual_action_shortcut(data) {
+            context.active = data.active;
+            spy.target = other;
+            spy.clear();
+            keyClick(Qt.Key_G, Qt.ControlModifier);
+            if (data.xfail) {
+                expectFailContinue("", "No shortcut fires");
+            }
+            spy.wait(200);
+        }
     }
 }

=== modified file 'tests/unit_x11/tst_components/tst_slotslayout.qml'
--- tests/unit_x11/tst_components/tst_slotslayout.qml	2015-11-09 16:20:34 +0000
+++ tests/unit_x11/tst_components/tst_slotslayout.qml	2016-01-15 07:23:58 +0000
@@ -66,6 +66,17 @@
             readonly property var trailingSlots: []
         }
         ListItemLayout {
+            id: layoutMultilineLabels
+            title.text: "test \n test"
+            title.maximumLineCount: 2
+            subtitle.text: "test2 \n test2 \n test2"
+            subtitle.maximumLineCount: 3
+            summary.text: "test3 \n test3"
+            summary.maximumLineCount: 2
+            readonly property var leadingSlots: []
+            readonly property var trailingSlots: []
+        }
+        ListItemLayout {
             id: layoutOneLeading
             readonly property var leadingSlots: [layoutOneLeading_leading1]
             readonly property var trailingSlots: []
@@ -375,6 +386,17 @@
             compare(item.padding.trailing, units.gu(1), "Default trailing padding")
         }
 
+        function checkDefaultWrapping(item) {
+            //we have to use WrapAnywhere because otherwise it will have unexpected behaviour
+            //when used together with ElideRight when the string wraps (it will elide too early).
+            compare(item.title.wrapMode, Label.WrapAnywhere, "Wrong default title wrapMode")
+            compare(item.subtitle.wrapMode, Label.WrapAnywhere, "Wrong default subtitle wrapMode")
+            compare(item.summary.wrapMode, Label.WrapAnywhere, "Wrong default summary wrapMode")
+            compare(item.title.elide, Label.ElideRight, "Wrong default title elide")
+            compare(item.subtitle.elide, Label.ElideRight, "Wrong default subtitle elide")
+            compare(item.summary.elide, Label.ElideRight, "Wrong default summary elide")
+        }
+
         function checkImplicitSize(item) {
             compare(item.implicitHeight, expectedImplicitHeight(item), "Implicit height check")
             compare(item.implicitWidth, column.width, "Fill parent's width")
@@ -718,7 +740,7 @@
                             "Default labels positioning, subtitle's y")
                 } else {
                     compare(listitemlayout.subtitle.y,
-                            listitemlayout.title.baselineOffset + units.dp(4),
+                            listitemlayout.title.y + listitemlayout.title.height + units.dp(2),
                             "Default labels positioning, subtitle's y")
                 }
             }
@@ -734,7 +756,7 @@
                         compare(listitemlayout.summary.y, 0,
                                 "Default labels positioning, summary's y")
                     } else {
-                        compare(listitemlayout.summary.y, listitemlayout.title.baselineOffset + units.dp(4),
+                        compare(listitemlayout.summary.y, listitemlayout.title.y + listitemlayout.title.height + units.dp(2),
                                 "Default labels positioning, summary's y")
                     }
                 } else  {
@@ -744,6 +766,10 @@
             }
         }
 
+        function test_defaultLabelsWrappingAndElide() {
+            checkDefaultWrapping(layoutLabels)
+        }
+
         function test_defaultMainSlotHeight() {
             var titleText = layoutLabels.title.text
             var subtitleText = layoutLabels.subtitle.text
@@ -873,5 +899,24 @@
             compare(obj !== null, true, "QML ListItemLayout: testing labels' QML context.")
             obj.destroy()
         }
+
+        //first version of ListItemLayout anchored subtitle to title's baseline, but that breaks
+        //when title is multiline
+        function test_multilineLabelsPositioning() {
+            compare(layoutMultilineLabels.title.maximumLineCount, 2,
+                    "Multiline labels positioning: wrong title maximumLineCount")
+            compare(layoutMultilineLabels.subtitle.maximumLineCount, 3,
+                    "Multiline labels positioning: wrong subtitle maximumLineCount")
+            compare(layoutMultilineLabels.summary.maximumLineCount, 2,
+                    "Multiline labels positioning: wrong summary maximumLineCount")
+
+            compare(layoutMultilineLabels.title.lineCount, 2,
+                    "Multiline labels positioning: wrong title lineCount")
+            compare(layoutMultilineLabels.subtitle.lineCount, 3,
+                    "Multiline labels positioning: wrong subtitle lineCount")
+            compare(layoutMultilineLabels.summary.lineCount, 2,
+                    "Multiline labels positioning: wrong summary lineCount")
+            checkLabelsY(layoutMultilineLabels)
+        }
     }
 }

=== modified file 'tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp'
--- tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp	2015-11-09 11:51:16 +0000
+++ tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * Copyright 2013-2016 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
@@ -21,6 +21,7 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
 #include "ucdeprecatedtheme.h"
+#include "uctheme.h"
 #include "uctestcase.h"
 #include <private/qquicktext_p.h>
 
@@ -68,10 +69,18 @@
 private:
     QString m_xdgDataPath;
 
+    UCDeprecatedTheme *instance(QQmlEngine &engine)
+    {
+        return engine.rootContext()->contextProperty("Theme").value<UCDeprecatedTheme*>();
+    }
+    void initDeprecatedTheme(QQmlEngine &engine)
+    {
+        UCDeprecatedTheme::registerToContext(engine.rootContext());
+    }
+
 private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
-    void testInstance();
     void testNameDefault();
     void testNameSet();
     void testCreateStyleComponent();
@@ -97,24 +106,21 @@
     qputenv("XDG_DATA_DIRS", m_xdgDataPath.toLocal8Bit());
 }
 
-void tst_UCDeprecatedTheme::testInstance()
-{
-    UCDeprecatedTheme::instance();
-}
-
 void tst_UCDeprecatedTheme::testNameDefault()
 {
-    UCDeprecatedTheme theme;
-    QCOMPARE(theme.name(), QString("Ubuntu.Components.Themes.Ambiance"));
+    QQmlEngine engine;
+    initDeprecatedTheme(engine);
+    QCOMPARE(instance(engine)->name(), QString("Ubuntu.Components.Themes.Ambiance"));
 }
 
 void tst_UCDeprecatedTheme::testNameSet()
 {
     QTest::ignoreMessage(QtWarningMsg, "Theme not found: \"MyBeautifulTheme\"");
 
-    UCDeprecatedTheme theme;
-    theme.setName("MyBeautifulTheme");
-    QCOMPARE(theme.name(), QString("MyBeautifulTheme"));
+    QQmlEngine engine;
+    initDeprecatedTheme(engine);
+    instance(engine)->setName("MyBeautifulTheme");
+    QCOMPARE(instance(engine)->name(), QString("MyBeautifulTheme"));
 }
 
 void tst_UCDeprecatedTheme::testCreateStyleComponent()
@@ -217,8 +223,9 @@
     qputenv("XDG_DATA_DIRS", "");
     qputenv("QML2_IMPORT_PATH", "");
 
-    UCDeprecatedTheme theme;
-    QCOMPARE(theme.name(), QString("Ubuntu.Components.Themes.Ambiance"));
+    QQmlEngine engine;
+    initDeprecatedTheme(engine);
+    QCOMPARE(instance(engine)->name(), QString("Ubuntu.Components.Themes.Ambiance"));
 }
 
 void tst_UCDeprecatedTheme::testBogusImportPathSet()
@@ -230,8 +237,9 @@
     qputenv("XDG_DATA_DIRS", "");
     qputenv("QML2_IMPORT_PATH", "/no/plugins/here");
 
-    UCDeprecatedTheme theme;
-    QCOMPARE(theme.name(), QString("Ubuntu.Components.Themes.Ambiance"));
+    QQmlEngine engine;
+    initDeprecatedTheme(engine);
+    QCOMPARE(instance(engine)->name(), QString("Ubuntu.Components.Themes.Ambiance"));
 }
 
 void tst_UCDeprecatedTheme::testMultipleImportPathsSet()

=== modified file 'tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro'
--- tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro	2015-03-23 16:28:35 +0000
+++ tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 include(../test-include.pri)
-QT += quick-private gui-private
+QT += quick-private gui-private qml-private
 SOURCES += tst_deprecated_theme_engine.cpp
 
 OTHER_FILES += \

=== added file 'tests/unit_x11/tst_subtheming/DefaultTheme.qml'
--- tests/unit_x11/tst_subtheming/DefaultTheme.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/DefaultTheme.qml	2016-01-15 07:23:58 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 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
+ * 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 Lesser General Public License for more details.
+ *
+ * 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.4
+import Ubuntu.Components 1.3
+
+Label {
+    id: label
+    width: 400
+    height: width
+    text: "HOLA"
+
+    Label {  }
+    Button {  }
+}

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-11-09 11:51:16 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2016-01-15 07:23:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 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
@@ -26,6 +26,7 @@
 #include "ucstyleditembase_p.h"
 #include "ucnamespace.h"
 #include "ucunits.h"
+#include "uclabel.h"
 
 class ThemeTestCase : public UbuntuTestCase
 {
@@ -100,7 +101,8 @@
 
     void test_default_theme()
     {
-        UCTheme::defaultTheme();
+        QQmlEngine engine;
+        UCTheme::defaultTheme(&engine);
     }
 
     void test_default_name()
@@ -128,6 +130,53 @@
         QCOMPARE(theme.name(), QString("Ubuntu.Components.Themes.Ambiance"));
     }
 
+    void test_create_without_engine()
+    {
+        QTest::ignoreMessage(QtCriticalMsg, "The item UCLabel was created without a valid QML Engine. Styling will not be possible.");
+        QScopedPointer<UCLabel> item(new UCLabel);
+        QVERIFY(!item->getTheme());
+    }
+
+    void test_default_theme_cleared_with_engine_bug1527546()
+    {
+        qputenv("QV4_FORCE_INTERPRETER", "1");
+        qputenv("QV4_MM_AGGRESSIVE_GC", "1");
+        for (int i = 0; i < 2; i++)
+        {
+            ThemeTestCase *view = new ThemeTestCase("DefaultTheme.qml");
+            QVERIFY(view->globalTheme());
+            QVERIFY(UCTheme::defaultTheme(view->engine()));
+            QObjectCleanupHandler themeCleanup;
+            themeCleanup.add(UCTheme::defaultTheme(view->engine()));
+            delete view;
+            QVERIFY(themeCleanup.isEmpty());
+        }
+    }
+
+    void test_multiple_view_instances_bug1527546()
+    {
+        qputenv("QV4_FORCE_INTERPRETER", "1");
+        qputenv("QV4_MM_AGGRESSIVE_GC", "1");
+
+        QScopedPointer<ThemeTestCase> view1(new ThemeTestCase("DefaultTheme.qml"));
+        QScopedPointer<ThemeTestCase> view2(new ThemeTestCase("DefaultTheme.qml"));
+
+        // the two views must have different default themes
+        QVERIFY(view1->globalTheme() != view2->globalTheme());
+    }
+
+    void test_multiple_themes_on_engine_bug1527546()
+    {
+        qputenv("QV4_FORCE_INTERPRETER", "1");
+        qputenv("QV4_MM_AGGRESSIVE_GC", "1");
+
+        QQmlEngine engine;
+        UCTheme *theme0 = UCTheme::defaultTheme(&engine);
+
+        UCTheme *theme1 = new UCTheme(&engine);
+        QVERIFY(theme0 != theme1);
+    }
+
     void test_create_style_component_data() {
         QTest::addColumn<QString>("styleName");
         QTest::addColumn<QString>("parentName");
@@ -304,7 +353,7 @@
         mainItem->resetTheme();
         parentChangeSpy.wait(200);
         QCOMPARE(parentChangeSpy.count(), 1);
-        QCOMPARE(mainItem->getTheme(), &UCTheme::defaultTheme());
+        QCOMPARE(mainItem->getTheme(), UCTheme::defaultTheme(view->engine()));
         QCOMPARE(testSet->parentTheme(), mainItem->getTheme());
     }
 
@@ -605,7 +654,7 @@
         movableItem->setParentItem(Q_NULLPTR);
         spy.wait(500);
         QCOMPARE(spy.count(), 1);
-        QCOMPARE(movableItem->getTheme(), &UCTheme::defaultTheme());
+        QCOMPARE(movableItem->getTheme(), UCTheme::defaultTheme(view->engine()));
     }
 
     void test_reparented_styleditem_special_case()

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro'
--- tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-09-28 16:57:11 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro	2016-01-15 07:23:58 +0000
@@ -44,4 +44,7 @@
     HintedButton.qml \
     OtherVersion.qml
 
+DISTFILES += \
+    DefaultTheme.qml
+