Merge lp:~zsombi/ubuntu-ui-toolkit/04-apply-styleset into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Applying sub-theming on toolkit.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1458
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1618/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2069
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/348
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/348/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/345
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1822
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2067
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2067/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19333

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1618/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/04-apply-styleset]

1459. By Zsombor Egri on 2015-04-09

prereq sync

1460. By Zsombor Egri on 2015-04-09

license year updated, deprecations marked, 1.3 imported where theme is used.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1460
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1645/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2161/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/372/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/372/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2159/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1645/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/04-apply-styleset]

1461. By Zsombor Egri on 2015-04-10

prereq sync

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1461
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1649/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2176
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/379
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/379/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/376
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1916
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2174
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19534

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1649/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/04-apply-styleset]

1462. By Zsombor Egri on 2015-04-14

prereq sync

1463. By Zsombor Egri on 2015-04-14

adjusting changed styles to use the new theming

1464. By Zsombor Egri on 2015-04-14

removing subthemingEnabled from StyledItemBase

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1464
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1660/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2210
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/390
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/390/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/387
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1940
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2208
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2208/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19590

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1660/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/04-apply-styleset]

1465. By Zsombor Egri on 2015-04-14

fix theme change updates on the colors

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1465
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1662/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/392
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/392/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/389
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2211
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2211/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19591

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1662/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

1973 + showDeprecatedNote("Theme.name is deprecated. Use StyleSet instead.");

StyleSet is deprecated (used in multiple places)

[lp:~zsombi/ubuntu-ui-toolkit/04-apply-styleset]

1466. By Zsombor Egri on 2015-04-16

Styleset->ThemeSettings

[Tim Peeters (tpeeters)]

looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'examples/locale/locale.qml'
--- examples/locale/locale.qml	2015-03-03 13:47:48 +0000
+++ examples/locale/locale.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 /*!
@@ -89,7 +89,7 @@
                 highlight: Rectangle {
                     height: units.gu(2)
                     width: view.width
-                    color: Theme.palette.selected.background
+                    color: theme.palette.selected.background
                 }
             }
         }
@@ -100,7 +100,7 @@
                 leftMargin: units.gu(0.5)
                 bottom: parent.bottom
             }
-            color: Theme.palette.normal.base
+            color: theme.palette.normal.base
             width: parent.width
             Column {
                 anchors.fill: parent

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-03-11 17:10:20 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Template {
@@ -207,7 +207,7 @@
             confirmRemoval: (index % 2)
             backgroundIndicator: Rectangle {
                 anchors.fill: parent
-                color: Theme.palette.normal.base
+                color: theme.palette.normal.base
             }
         }
 

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Pickers.qml'
--- examples/ubuntu-ui-toolkit-gallery/Pickers.qml	2015-03-11 17:10:20 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Pickers.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Pickers 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Pickers 1.0
 
 Template {
     objectName: "pickersTemplate"
@@ -158,7 +158,7 @@
                         width: height
                         height: units.gu(3)
                         radius: width / 2
-                        color: Theme.palette.normal.background
+                        color: theme.palette.normal.background
                         antialiasing: true
                         Label {
                             text: Math.round(selector.value)

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Styles.qml'
--- examples/ubuntu-ui-toolkit-gallery/Styles.qml	2015-03-03 13:47:48 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Styles.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "stylesTemplate"
@@ -43,6 +43,7 @@
     OptionSelector {
         model: [ 'Ambiance', 'SuruDark' ]
         expanded: true
-        onSelectedIndexChanged: Theme.name = 'Ubuntu.Components.Themes.%1'.arg(model[selectedIndex])
+        selectedIndex: (theme.name == 'Ubuntu.Components.Themes.SuruDark')
+        onSelectedIndexChanged: theme.name = 'Ubuntu.Components.Themes.%1'.arg(model[selectedIndex])
     }
 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml'
--- examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml	2015-03-03 16:21:20 +0000
+++ examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.2
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "ubuntuShapesTemplate"
@@ -71,27 +71,27 @@
             UbuntuShape {
                 objectName: "ubuntushape_radius_small"
 
-                backgroundColor: Theme.palette.normal.foreground
+                backgroundColor: theme.palette.normal.foreground
                 radius: "small"
 
                 Label {
                     anchors.centerIn: parent
                     text: "small"
                     fontSize: "x-small"
-                    color: Theme.palette.normal.foregroundText
+                    color: theme.palette.normal.foregroundText
                 }
             }
 
             UbuntuShape {
                 objectName: "ubuntushape_radius_medium"
-                backgroundColor: Theme.palette.normal.foreground
+                backgroundColor: theme.palette.normal.foreground
                 radius: "medium"
 
                 Label {
                     anchors.centerIn: parent
                     text: "medium"
                     fontSize: "x-small"
-                    color: Theme.palette.normal.foregroundText
+                    color: theme.palette.normal.foregroundText
                 }
             }
         }
@@ -103,7 +103,7 @@
 
             UbuntuShape {
                 objectName: "ubuntushape_sizes_15_6"
-                backgroundColor: Theme.palette.normal.foreground
+                backgroundColor: theme.palette.normal.foreground
                 width: units.gu(15)
                 height: units.gu(6)
                 anchors.verticalCenter: parent.verticalCenter
@@ -111,7 +111,7 @@
 
             UbuntuShape {
                 objectName: "ubuntushape_sizes_10_14"
-                backgroundColor: Theme.palette.normal.foreground
+                backgroundColor: theme.palette.normal.foreground
                 width: units.gu(10)
                 height: units.gu(14)
             }

=== modified file 'modules/Ubuntu/Components/10/Button.qml'
--- modules/Ubuntu/Components/10/Button.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/10/Button.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
    \internal
@@ -32,5 +32,5 @@
 
     property string iconPosition: "left"
 
-    style: Theme.createStyleComponent("ButtonStyle.qml", button)
+    style: theme.createStyleComponent("ButtonStyle.qml", button)
 }

=== modified file 'modules/Ubuntu/Components/11/Button.qml'
--- modules/Ubuntu/Components/11/Button.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/11/Button.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Button
@@ -121,5 +121,5 @@
     */
     property string iconPosition: "left"
 
-    style: Theme.createStyleComponent("ButtonStyle.qml", button)
+    style: theme.createStyleComponent("ButtonStyle.qml", button)
 }

=== modified file 'modules/Ubuntu/Components/ActivityIndicator.qml'
--- modules/Ubuntu/Components/ActivityIndicator.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ActivityIndicator.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -55,5 +55,5 @@
     implicitWidth: units.gu(3)
     implicitHeight: units.gu(3)
 
-    style: Theme.createStyleComponent("ActivityIndicatorStyle.qml", indicator)
+    style: theme.createStyleComponent("ActivityIndicatorStyle.qml", indicator)
 }

=== modified file 'modules/Ubuntu/Components/AppHeader.qml'
--- modules/Ubuntu/Components/AppHeader.qml	2015-03-20 15:41:55 +0000
+++ modules/Ubuntu/Components/AppHeader.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Components
+import Ubuntu.Components 1.3 as Components
 
 /*!
     \internal
@@ -342,6 +342,6 @@
         }
     }
 
-    style: header.useDeprecatedToolbar ? Theme.createStyleComponent("HeaderStyle.qml", header) :
-                                         Theme.createStyleComponent("PageHeadStyle.qml", header)
+    style: header.useDeprecatedToolbar ? theme.createStyleComponent("HeaderStyle.qml", header) :
+                                         theme.createStyleComponent("PageHeadStyle.qml", header)
 }

=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
--- modules/Ubuntu/Components/CheckBox.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/CheckBox.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -49,5 +49,5 @@
      */
     onTriggered: checked = !checked
 
-    style: Theme.createStyleComponent("CheckBoxStyle.qml", checkBox)
+    style: theme.createStyleComponent("CheckBoxStyle.qml", checkBox)
 }

=== modified file 'modules/Ubuntu/Components/ComboButton.qml'
--- modules/Ubuntu/Components/ComboButton.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ComboButton.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -248,7 +248,7 @@
     property color dropdownColor: __styleInstance ? __styleInstance.defaultDropdownColor : color
 
 
-    style: Theme.createStyleComponent("ComboButtonStyle.qml", combo)
+    style: theme.createStyleComponent("ComboButtonStyle.qml", combo)
 
     Component.onCompleted: {
         // update mouse area to report clicks only on the main button area

=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Label.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -55,5 +55,5 @@
     property string fontSize: "medium"
 
     font.pixelSize: FontUtils.sizeToPixels(fontSize)
-    color: Theme.palette.selected.backgroundText
+    color: theme.palette.selected.backgroundText
 }

=== modified file 'modules/Ubuntu/Components/ListItems/Caption.qml'
--- modules/Ubuntu/Components/ListItems/Caption.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Caption.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Caption
@@ -52,7 +52,7 @@
         anchors.centerIn: parent
         width: parent.width - units.gu(1)
         wrapMode: Text.Wrap
-        color: Theme.palette.normal.backgroundText
+        color: theme.palette.normal.backgroundText
         horizontalAlignment: Text.AlignLeft
         fontSize: "small"
     }

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Empty
@@ -291,7 +291,7 @@
             top: parent.top
         }
         height: emptyListItem.height - bottomDividerLine.height
-        color: Theme.palette.selected.background
+        color: theme.palette.selected.background
     }
 
     ThinDivider {

=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import "." as ListItem
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype ItemSelector
@@ -207,7 +207,7 @@
 
             readonly property url chevron: __styleInstance.chevron
             readonly property url tick: __styleInstance.tick
-            readonly property color themeColour: Theme.palette.selected.fieldText
+            readonly property color themeColour: theme.palette.selected.fieldText
             readonly property alias colourImage: itemSelector.colourImage
             property bool currentlyExpanded: expanded || multiSelection
 
@@ -216,7 +216,7 @@
                 right: parent.right
             }
             state: itemSelector.expanded ? "expanded" : "collapsed"
-            style: Theme.createStyleComponent("ListItemOptionSelectorStyle.qml", listContainer)
+            style: theme.createStyleComponent("ListItemOptionSelectorStyle.qml", listContainer)
 
             states: [ State {
                     name: "expanded"

=== modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml'
--- modules/Ubuntu/Components/ListItems/LabelVisual.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/LabelVisual.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 // internal helper class for text inside the list items.
 Label {
@@ -32,7 +32,7 @@
 
     fontSize: "medium"
     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.selected.overlayText : theme.palette.selected.backgroundText
     opacity: label.enabled ? 1.0 : 0.5
 }

=== modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml'
--- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 // Internal helper class for the visuals of
 // the progression symbol.
@@ -25,5 +25,5 @@
     property bool showSplit: false
     property real splitMargin
 
-    style: Theme.createStyleComponent("ProgressionVisualStyle.qml", progressionVisual)
+    style: theme.createStyleComponent("ProgressionVisualStyle.qml", progressionVisual)
 }

=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Standard
@@ -172,7 +172,7 @@
             bottom: parent.bottom
             left: parent.left
         }
-        color: Theme.palette.selected.background
+        color: theme.palette.selected.background
     }
 
     Rectangle {
@@ -185,7 +185,7 @@
             bottom: parent.bottom
             right: parent.right
         }
-        color: Theme.palette.selected.background
+        color: theme.palette.selected.background
     }
 
     IconVisual {

=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype ThinDivider
@@ -53,7 +53,7 @@
     // a private property to catch theme background color change
     // use private property instead of embedding it into a QtObject to avoid further
     // performance decrease
-    property bool __lightBackground: ColorUtils.luminance(Theme.palette.normal.background) > 0.85
+    property bool __lightBackground: ColorUtils.luminance(theme.palette.normal.background) > 0.85
     // use a gradient of 4 steps instead of instantiating two Rectangles for performance reasons
     gradient: Gradient {
         GradientStop { position: 0.0; color: __lightBackground ? Qt.rgba(0, 0, 0, 0.1) : Qt.rgba(0, 0, 0, 0.4) }

=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****
@@ -262,7 +262,7 @@
 
             model: selector.values
             Rectangle {
-                color: Qt.lighter(Theme.palette.normal.base)
+                color: Qt.lighter(theme.palette.normal.base)
                 height: valueRepeater.valueHeight
                 width: parent.width
 

=== modified file 'modules/Ubuntu/Components/MainViewBase.qml'
--- modules/Ubuntu/Components/MainViewBase.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/MainViewBase.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.0
 
@@ -35,10 +35,10 @@
     StyledItem {
         id: background
         anchors.fill: parent
-        style: Theme.createStyleComponent("MainViewStyle.qml", background)
+        style: theme.createStyleComponent("MainViewStyle.qml", background)
 
         property color headerColor: backgroundColor
-        property color backgroundColor: Theme.palette.normal.background
+        property color backgroundColor: theme.palette.normal.background
         property color footerColor: backgroundColor
 
         /*
@@ -48,12 +48,12 @@
 
           Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
          */
-        property string theme: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
+        property string autoThemeName: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
                                    "Ambiance" : "SuruDark"
-        onThemeChanged: {
+        onAutoThemeNameChanged: {
             // only change the theme if the current one is a system one.
-            if (theme !== "" && (Theme.name.search("Ubuntu.Components.Themes") >= 0)) {
-                Theme.name = "Ubuntu.Components.Themes.%1".arg(theme);
+            if (autoThemeName !== "" && (theme.name.search("Ubuntu.Components.Themes") >= 0)) {
+                mainView.theme.name = "Ubuntu.Components.Themes.%1".arg(autoThemeName);
             }
         }
     }

=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
--- modules/Ubuntu/Components/OptionSelector.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/OptionSelector.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import "ListItems" as ListItem
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \qmltype OptionSelector
@@ -216,7 +216,7 @@
 
             readonly property url chevron: __styleInstance.chevron
             readonly property url tick: __styleInstance.tick
-            readonly property color themeColour: Theme.palette.selected.fieldText
+            readonly property color themeColour: theme.palette.selected.fieldText
             readonly property alias colourImage: optionSelector.colourImage
             property bool currentlyExpanded: expanded || multiSelection
 
@@ -225,7 +225,7 @@
                 right: parent.right
             }
             state: optionSelector.expanded ? "expanded" : "collapsed"
-            style: Theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
+            style: theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
             states: [ State {
                     name: "expanded"
                     when: listContainer.currentlyExpanded

=== modified file 'modules/Ubuntu/Components/PageHeadConfiguration11.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration11.qml	2015-03-20 11:05:40 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration11.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 /*!
   \internal
@@ -51,5 +51,5 @@
     PageHeadSections {
         id: headSections
     }
-    property color foregroundColor: Theme.palette.selected.backgroundText
+    property color foregroundColor: theme.palette.selected.backgroundText
 }

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Panel.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \qmltype Panel
@@ -55,7 +55,7 @@
 
                 Rectangle {
                     anchors.fill: parent
-                    color: Theme.palette.normal.overlay
+                    color: theme.palette.normal.overlay
 
                     Button {
                         anchors.centerIn: parent
@@ -109,7 +109,7 @@
         import Ubuntu.Components 1.2
 
         Rectangle {
-            color: Theme.palette.normal.background
+            color: theme.palette.normal.background
             width: units.gu(40)
             height: units.gu(40)
 
@@ -123,7 +123,7 @@
                 height: units.gu(8)
 
                 Rectangle {
-                    color: Theme.palette.normal.overlay
+                    color: theme.palette.normal.overlay
                     anchors.fill: parent
                     Rectangle {
                         width: units.gu(8)

=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype DatePicker
@@ -420,7 +420,7 @@
         }
     }
 
-    style: Theme.createStyleComponent("DatePickerStyle.qml", datePicker)
+    style: theme.createStyleComponent("DatePickerStyle.qml", datePicker)
     Binding {
         target: __styleInstance
         property: "view"

=== modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml'
--- modules/Ubuntu/Components/Pickers/Dialer.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/Dialer.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,13 +15,14 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Dialer
     \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief Dialer is a phone dialer style picker component.
+    \deprecated
 
     The Dialer component is dedicated for value selection where the value is
     compound of several sections, i.e. hour, minute and second, or integral and
@@ -144,7 +145,7 @@
     implicitHeight: size
     activeFocusOnPress: true
 
-    style: Theme.createStyleComponent("DialerStyle.qml", dialer)
+    style: theme.createStyleComponent("DialerStyle.qml", dialer)
 
     Item {
         id: internal

=== modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml'
--- modules/Ubuntu/Components/Pickers/DialerHand.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHand.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,13 +15,14 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype DialerHand
     \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief DialerHand represents a value selector on a Dialer.
+    \deprecated
 
     DialerHand components have meaning only if those are placed inside Dialer
     components. The dialer hand presents a value selection from the given dialer's
@@ -65,7 +66,7 @@
                 width: height
                 height: units.gu(3)
                 radius: width / 2
-                color: Theme.palette.normal.background
+                color: theme.palette.normal.background
                 antialiasing: true
                 Label {
                     text: Math.round(selector.value)
@@ -142,7 +143,7 @@
     width: parent.width
     height: parent.height
     activeFocusOnPress: true
-    style: Theme.createStyleComponent("DialerHandStyle.qml", dialerHand)
+    style: theme.createStyleComponent("DialerHandStyle.qml", dialerHand)
 
     /*! \internal */
     onParentChanged: {

=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
--- modules/Ubuntu/Components/Pickers/Picker.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Picker
@@ -159,7 +159,7 @@
     implicitHeight: units.gu(20)
     activeFocusOnPress: true
 
-    style: Theme.createStyleComponent("PickerStyle.qml", picker)
+    style: theme.createStyleComponent("PickerStyle.qml", picker)
 
     /*! \internal */
     property int __clickedIndex: -1

=== modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml'
--- modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype PickerDelegate
@@ -47,7 +47,7 @@
         internal.itemList.currentIndex = index;
     }
 
-    style: Theme.createStyleComponent("PickerDelegateStyle.qml", pickerDelegate)
+    style: theme.createStyleComponent("PickerDelegateStyle.qml", pickerDelegate)
 
     QtObject {
         id: internal

=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -17,7 +17,7 @@
 pragma Singleton
 import QtQuick 2.4
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Popups 1.0
 
@@ -200,7 +200,7 @@
 
             id: panel
             // no additional styling is needed
-            color: Theme.palette.normal.overlay
+            color: theme.palette.normal.overlay
             width: parent.width
             height: Qt.inputMethod.keyboardRectangle.height > 0 ? Qt.inputMethod.keyboardRectangle.height : units.gu(26)
             y: parent.height

=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 
 /*!
@@ -116,7 +116,7 @@
                 horizontalCenter: parent.horizontalCenter
             }
             wrapMode: Text.Wrap
-            color: Theme.palette.normal.overlayText
+            color: theme.palette.normal.overlayText
         }
         /*! \internal */
         onTriggered: popover.hide()

=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "internalPopupUtils.js" as InternalPopupUtils
 
 /*!
@@ -213,6 +213,6 @@
             }
         }
 
-        style: Theme.createStyleComponent("DialogForegroundStyle.qml", foreground)
+        style: theme.createStyleComponent("DialogForegroundStyle.qml", foreground)
     }
 }

=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import "internalPopupUtils.js" as InternalPopupUtils
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Popover
@@ -37,7 +37,7 @@
         import Ubuntu.Components.Popups 1.0
 
         Rectangle {
-            color: Theme.palette.normal.background
+            color: theme.palette.normal.background
             width: units.gu(80)
             height: units.gu(80)
             Component {
@@ -237,7 +237,7 @@
         signal showCompleted()
         signal hideCompleted()
 
-        style: Theme.createStyleComponent("PopoverForegroundStyle.qml", foreground)
+        style: theme.createStyleComponent("PopoverForegroundStyle.qml", foreground)
     }
 
     QtObject {

=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype SheetBase
@@ -23,6 +23,7 @@
     \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief Parent class of different types of sheets. Not to be used directly.
+    \deprecated
 
     Examples: See subclasses.
     \b{Sheets are deprecated. Consider using \l Dialog, \l Popover or \l PageStack instead.}
@@ -108,6 +109,6 @@
             }
         }
 
-        style: Theme.createStyleComponent("SheetForegroundStyle.qml", sheet)
+        style: theme.createStyleComponent("SheetForegroundStyle.qml", sheet)
     }
 }

=== modified file 'modules/Ubuntu/Components/ProgressBar10.qml'
--- modules/Ubuntu/Components/ProgressBar10.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ProgressBar10.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -64,5 +64,5 @@
     */
     property real value: 0.5
 
-    style: Theme.createStyleComponent("ProgressBarStyle.qml", progressBar)
+    style: theme.createStyleComponent("ProgressBarStyle.qml", progressBar)
 }

=== modified file 'modules/Ubuntu/Components/PullToRefresh.qml'
--- modules/Ubuntu/Components/PullToRefresh.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/PullToRefresh.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype PullToRefresh
@@ -222,7 +222,7 @@
       */
     signal refresh()
 
-    style: Theme.createStyleComponent("PullToRefreshStyle.qml", control)
+    style: theme.createStyleComponent("PullToRefreshStyle.qml", control)
     implicitHeight: __styleInstance.implicitHeight
     anchors {
         left: target.left

=== modified file 'modules/Ubuntu/Components/Scrollbar.qml'
--- modules/Ubuntu/Components/Scrollbar.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Scrollbar.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -145,5 +145,5 @@
         }
     }
 
-    style: Theme.createStyleComponent("ScrollbarStyle.qml", scrollbar)
+    style: theme.createStyleComponent("ScrollbarStyle.qml", scrollbar)
 }

=== modified file 'modules/Ubuntu/Components/Slider.qml'
--- modules/Ubuntu/Components/Slider.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/Slider.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -206,5 +206,5 @@
         onLiveValueChanged: if (isPressed) slider.requestFocus(Qt.MouseFocusReason)
     }
 
-    style: Theme.createStyleComponent("SliderStyle.qml", slider)
+    style: theme.createStyleComponent("SliderStyle.qml", slider)
 }

=== modified file 'modules/Ubuntu/Components/StyledItem.qml'
--- modules/Ubuntu/Components/StyledItem.qml	2015-03-05 16:09:05 +0000
+++ modules/Ubuntu/Components/StyledItem.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -27,13 +27,13 @@
 
     In order to make an Item stylable by the theme, it is enough to make the Item
     inherit from StyledItem and set its \l style property to be the result of the
-    appropriate call to Theme.createStyleComponent().
+    appropriate call to theme.createStyleComponent().
 
     Example definition of a custom Item MyItem.qml:
     \qml
         StyledItem {
             id: myItem
-            style: Theme.createStyleComponent("MyItemStyle.qml", myItem)
+            style: theme.createStyleComponent("MyItemStyle.qml", myItem)
         }
     \endqml
 

=== modified file 'modules/Ubuntu/Components/Switch.qml'
--- modules/Ubuntu/Components/Switch.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/Switch.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -40,5 +40,5 @@
 */
 CheckBox {
     id: switchItem
-    style: Theme.createStyleComponent("SwitchStyle.qml", switchItem)
+    style: theme.createStyleComponent("SwitchStyle.qml", switchItem)
 }

=== modified file 'modules/Ubuntu/Components/TabBar.qml'
--- modules/Ubuntu/Components/TabBar.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/TabBar.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -97,7 +97,7 @@
     implicitHeight: units.gu(7.5)
     activeFocusOnPress: true
 
-    style: Theme.createStyleComponent("TabBarStyle.qml", tabBar)
+    style: theme.createStyleComponent("TabBarStyle.qml", tabBar)
 
     QtObject {
         id: internal

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2015-03-10 11:49:27 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2015-04-16 13:25:32 +0000
@@ -803,7 +803,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.backgroundText
         font: editor.font
         elide: Text.ElideRight
         wrapMode: Text.WordWrap
@@ -873,5 +873,5 @@
         }
     }
 
-    style: Theme.createStyleComponent("TextAreaStyle.qml", control)
+    style: theme.createStyleComponent("TextAreaStyle.qml", control)
 }

=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2015-03-23 17:24:32 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Ubuntu
+import Ubuntu.Components 1.3 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 
 Ubuntu.StyledItem {
@@ -41,7 +41,7 @@
                                            handler.main.cursorDelegate :
                                            __styleInstance.cursorDelegate
 
-    style: Theme.createStyleComponent("TextCursorStyle.qml", cursorItem);
+    style: theme.createStyleComponent("TextCursorStyle.qml", cursorItem);
 
     objectName: "textCursor"
     //Caret instance from the style.

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2015-03-11 15:10:17 +0000
+++ modules/Ubuntu/Components/TextField.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Ubuntu
+import Ubuntu.Components 1.3 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 
 /*!
@@ -949,7 +949,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.backgroundText
         font: editor.font
         elide: Text.ElideRight
     }
@@ -1019,5 +1019,5 @@
         cursorPosition = 0;
     }
 
-    style: Theme.createStyleComponent("TextFieldStyle.qml", control)
+    style: theme.createStyleComponent("TextFieldStyle.qml", control)
 }

=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2015-03-10 11:49:27 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Popover {
@@ -96,7 +96,7 @@
                 width: Math.max(units.gu(5), implicitWidth) + units.gu(2)
                 height: units.gu(6)
                 action: actions[modelData]
-                style: Theme.createStyleComponent("ToolbarButtonStyle.qml", button)
+                style: theme.createStyleComponent("ToolbarButtonStyle.qml", button)
             }
         }
     }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: bubbleShape
@@ -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.overlay
 
     property point target
     property string direction: "down"
@@ -111,7 +111,7 @@
     UbuntuShape {
         anchors.fill: parent
         borderSource: "none"
-        color: Theme.palette.normal.overlay
+        color: theme.palette.normal.overlay
         image: bubbleShape.clipContent ? shapeSource : null
         visible: !square
     }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2015-03-05 19:34:59 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: checkBoxStyle
@@ -28,9 +28,9 @@
     /*!
       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: Qt.rgba(theme.palette.normal.foreground.r,
+                                                     theme.palette.normal.foreground.g,
+                                                     theme.palette.normal.foreground.b, 0.2)
 
     /*!
       The background color when the checkbox is checked.
@@ -45,7 +45,7 @@
     /*!
       The color of the icon.
      */
-    property color iconColor: Theme.palette.normal.foregroundText
+    property color iconColor: theme.palette.normal.foregroundText
 
     /*!
       The padding between the icon and the border of the thumb.

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     // style API
@@ -52,7 +52,7 @@
         width: styledItem.hand.width
         height: styledItem.hand.height
         radius: units.gu(1)
-        color: styledItem.hand.visible ? Theme.palette.normal.baseText : "#00000000"
+        color: styledItem.hand.visible ? theme.palette.normal.baseText : "#00000000"
         antialiasing: true
     }
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: headerStyle
@@ -38,7 +38,7 @@
 
     property int fontWeight: Font.Light
     property string fontSize: "x-large"
-    property color textColor: Theme.palette.selected.backgroundText
+    property color textColor: theme.palette.selected.backgroundText
     property real textLeftMargin: units.gu(2)
 
     implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-03-03 12:53:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components.Styles 1.2 as Styles
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Styles.ListItemStyle {
 
@@ -85,7 +85,7 @@
 
                         Rectangle {
                             anchors.fill: parent
-                            color: Theme.palette.selected.background
+                            color: theme.palette.selected.background
                             visible: pressed
                         }
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml	2015-04-08 16:21:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml	2015-04-16 13:25:32 +0000
@@ -33,12 +33,12 @@
     /*!
       The background color of the tapped item in the panel.
      */
-    property color highlightColor: Theme.palette.selected.background
+    property color highlightColor: theme.palette.selected.background
 
     /*!
       The foreground color (icon and text) of actions in the panel.
      */
-    property color foregroundColor: Theme.palette.selected.backgroundText
+    property color foregroundColor: theme.palette.selected.backgroundText
 
     property bool square: true
     callerMargin: -units.gu(1) + units.dp(4)

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2015-03-25 15:54:25 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: button
@@ -31,7 +31,7 @@
     Rectangle {
         visible: button.pressed
         anchors.fill: parent
-        color: Theme.palette.selected.background
+        color: theme.palette.selected.background
     }
 
     Icon {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2015-04-08 16:21:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2015-04-16 13:25:32 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Styles 1.2 as Style
@@ -41,7 +41,7 @@
     /*!
       The text color of unselected sections and the section divider.
      */
-    property color sectionColor: Theme.palette.selected.backgroundText
+    property color sectionColor: theme.palette.selected.backgroundText
 
     /*!
       The text color of the selected section.
@@ -51,7 +51,7 @@
     /*!
       The background color of the pressed section.
      */
-    property color sectionHighlightColor: Theme.palette.selected.background
+    property color sectionHighlightColor: theme.palette.selected.background
 
     implicitHeight: headerStyle.contentHeight + divider.height + sectionsItem.height
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 
 Item {
@@ -59,7 +59,7 @@
     UbuntuShape {
         anchors.fill: parent
         radius: "medium"
-        color: Theme.palette.normal.overlay
+        color: theme.palette.normal.overlay
         image: shapeSource
     }
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2015-03-10 12:16:04 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,15 +15,15 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: progressBarStyle
 
     property color foregroundColor: UbuntuColors.orange
     property color foregroundTextColor: '#FFFFFF'
-    property color backgroundColor: Theme.palette.normal.base
-    property color backgroundTextColor: Theme.palette.normal.baseText
+    property color backgroundColor: theme.palette.normal.base
+    property color backgroundTextColor: theme.palette.normal.baseText
 
     property var progressBar: styledItem
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
   The visuals handle both active and passive modes. This behavior is driven yet by
@@ -70,7 +70,7 @@
     property PropertyAnimation thumbConnectorFading: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
     property PropertyAnimation thumbFading: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
 
-    property color sliderColor: Theme.palette.normal.base
+    property color sliderColor: theme.palette.normal.base
     property real sliderRadius: units.gu(0.5)
     property color thumbConnectorColor: "white"
     property url forwardThumbReleased: (styledItem.align === Qt.AlignLeading || styledItem.align === Qt.AlignTrailing) ? "artwork/ScrollbarBottomIdle.png" : "artwork/ScrollbarRightIdle.png"

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2015-03-20 01:10:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
   The default slider style consists of a bar and a thumb shape.
@@ -27,7 +27,7 @@
     id: sliderStyle
 
     property color foregroundColor: UbuntuColors.orange
-    property color backgroundColor: Theme.palette.normal.base
+    property color backgroundColor: theme.palette.normal.base
 
     property real thumbSpacing: units.gu(0)
     property Item bar: background
@@ -81,7 +81,7 @@
         width: units.gu(2)
         height: units.gu(2)
         opacity: 0.97
-        color: Theme.palette.normal.overlay
+        color: theme.palette.normal.overlay
     }
 
     BubbleShape {
@@ -117,7 +117,7 @@
             anchors.centerIn: parent
             text: styledItem.formatValue(SliderUtils.liveValue(styledItem))
             fontSize: "large"
-            color: Theme.palette.normal.overlayText
+            color: theme.palette.normal.overlayText
         }
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: switchStyle
@@ -39,7 +39,7 @@
     /*!
       The background color of the switch.
      */
-    property color backgroundColor: Theme.palette.normal.base
+    property color backgroundColor: theme.palette.normal.base
 
     /*!
       The background color of the thumb when the switch is checked.
@@ -54,12 +54,12 @@
     /*!
       The foreground color of the icon that is currently selected.
      */
-    property color selectedIconColor: Theme.palette.normal.foregroundText
+    property color selectedIconColor: theme.palette.normal.foregroundText
 
    /*!
      The color of the icon that is not currently selected.
     */
-    property color unselectedIconColor: Theme.palette.normal.backgroundText
+    property color unselectedIconColor: theme.palette.normal.backgroundText
 
     /*!
       The source of the selected icon when the switch is checked.

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: tabBarStyle
@@ -25,8 +25,8 @@
     readonly property bool pressed: mouseArea.interacting
 
     // styling properties, public API
-    property color headerTextColor: Theme.palette.normal.backgroundText
-    property color headerTextSelectedColor: Theme.palette.selected.backgroundText
+    property color headerTextColor: theme.palette.normal.backgroundText
+    property color headerTextSelectedColor: theme.palette.selected.backgroundText
 
     // Don't start transitions because of updates to selectionMode before styledItem is completed.
     //  This fixes bug #1246792: "Disable tabs scrolling animations at startup"
@@ -42,7 +42,7 @@
 
     property string headerFontSize: "x-large"
     property int headerTextStyle: Text.Normal
-    property color headerTextStyleColor: Theme.palette.normal.backgroundText
+    property color headerTextStyleColor: theme.palette.normal.backgroundText
     property int headerFontWeight: Font.Light
     property real headerTextLeftMargin: units.gu(2)
     property real headerTextRightMargin: units.gu(2)

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2015-03-11 15:10:17 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 // frame
 // FIXME: stabilize API
@@ -25,13 +25,13 @@
     // 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.focus || 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.focus || styledItem.highlighted) ? theme.palette.selected.fieldText : theme.palette.normal.fieldText
+    property color selectedTextColor: theme.palette.selected.foregroundText
+    property color selectionColor: theme.palette.selected.foreground
     /*!
       Background fill color
       */
-    property color backgroundColor: (styledItem.focus || styledItem.highlighted) ? Theme.palette.selected.field : Theme.palette.normal.field
+    property color backgroundColor: (styledItem.focus || styledItem.highlighted) ? theme.palette.selected.field : theme.palette.normal.field
     property color errorColor: UbuntuColors.orange
 
     /*!

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: visuals
     // styling properties
-    property color color: Theme.palette.normal.overlay
+    property color color: theme.palette.normal.overlay
 
     anchors.fill: parent
 

=== modified file 'modules/Ubuntu/Components/Themes/Palette.qml'
--- modules/Ubuntu/Components/Themes/Palette.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Palette.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -37,11 +37,11 @@
     \qml
     Item {
         Rectangle {
-            color: Theme.palette.normal.base
+            color: theme.palette.normal.base
         }
 
         Text {
-            color: Theme.palette.normal.baseText
+            color: theme.palette.normal.baseText
         }
     }
     \endqml

=== modified file 'modules/Ubuntu/Components/Toolbar.qml'
--- modules/Ubuntu/Components/Toolbar.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Toolbar.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -134,7 +134,7 @@
         property bool opened: toolbar.opened
         property bool animating: toolbar.animating
 
-        style: Theme.createStyleComponent("ToolbarStyle.qml", background)
+        style: theme.createStyleComponent("ToolbarStyle.qml", background)
     }
 
     Item {

=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
--- modules/Ubuntu/Components/ToolbarButton.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ToolbarButton.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -83,5 +83,5 @@
     height: parent ? parent.height : undefined
     width: units.gu(5)
 
-    style: Theme.createStyleComponent("ToolbarButtonStyle.qml", toolbarButton)
+    style: theme.createStyleComponent("ToolbarButtonStyle.qml", toolbarButton)
 }

=== modified file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
--- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-03-12 20:52:56 +0000
+++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-04-16 13:25:32 +0000
@@ -70,21 +70,32 @@
             this, &UCDeprecatedTheme::paletteChanged);
 }
 
+void UCDeprecatedTheme::showDeprecatedNote(const char *note)
+{
+    QByteArray suppressNote = qgetenv("SUPPRESS_DEPRECATED_NOTE");
+    if (suppressNote.isEmpty() || suppressNote != "yes") {
+        qmlInfo(this) << note;
+    }
+}
+
 /*!
     \qmlproperty string Theme::name
 
     The name of the current theme.
 */
-QString UCDeprecatedTheme::name() const
+QString UCDeprecatedTheme::name()
 {
+    showDeprecatedNote("Theme.name is deprecated. Use ThemeSettings instead.");
     return UCTheme::defaultTheme().name();
 }
 void UCDeprecatedTheme::setName(const QString& name)
 {
+    showDeprecatedNote("Theme.name is deprecated. Use ThemeSettings instead.");
     UCTheme::defaultTheme().setName(name);
 }
 void UCDeprecatedTheme::resetName()
 {
+    showDeprecatedNote("Theme.name is deprecated. Use ThemeSettings instead.");
     UCTheme::defaultTheme().resetName();
 }
 
@@ -95,6 +106,7 @@
 */
 QObject* UCDeprecatedTheme::palette()
 {
+    showDeprecatedNote("Theme.palette is deprecated. Use ThemeSettings instead.");
     return UCTheme::defaultTheme().palette();
 }
 
@@ -105,6 +117,7 @@
 */
 QQmlComponent* UCDeprecatedTheme::createStyleComponent(const QString& styleName, QObject* parent)
 {
+    showDeprecatedNote("Theme.createStyleComponent() is deprecated. Use ThemeSettings instead.");
     return UCTheme::defaultTheme().createStyleComponent(styleName, parent);
 }
 

=== modified file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h'
--- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h	2015-03-12 20:11:38 +0000
+++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h	2015-04-16 13:25:32 +0000
@@ -37,7 +37,7 @@
     explicit UCDeprecatedTheme(QObject *parent = 0);
 
     // getter/setters
-    QString name() const;
+    QString name();
     void setName(const QString& name);
     void resetName();
     QObject* palette();
@@ -48,6 +48,9 @@
 Q_SIGNALS:
     void nameChanged();
     void paletteChanged();
+
+private:
+    void showDeprecatedNote(const char *note);
 };
 
 #endif // UCDEPRECATEDTHEME_H

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-03-23 16:23:55 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-04-16 13:25:32 +0000
@@ -15,7 +15,7 @@
  */
 
 #include "ucunits.h"
-#include "ucdeprecatedtheme.h"
+#include "uctheme.h"
 #include "uclistitem.h"
 #include "uclistitem_p.h"
 #include "uclistitemactions.h"
@@ -37,20 +37,6 @@
 #include <QtQuick/private/qquickbehavior_p.h>
 #include <QtQml/QQmlEngine>
 
-QColor getPaletteColor(const char *profile, const char *color)
-{
-    QColor result;
-    // FIXME: use theme when available
-    QObject *palette = UCDeprecatedTheme::instance().palette();
-    if (palette) {
-        QObject *paletteProfile = palette->property(profile).value<QObject*>();
-        if (paletteProfile) {
-            result = paletteProfile->property(color).value<QColor>();
-        }
-    }
-    return result;
-}
-
 /******************************************************************************
  * Divider
  */
@@ -99,13 +85,13 @@
 
 void UCListItemDivider::paletteChanged()
 {
-    QColor background = getPaletteColor("normal", "background");
+    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
-    Q_D(UCListItemDivider);
     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);
@@ -237,16 +223,21 @@
     QObject::connect(contentItem, SIGNAL(xChanged()),
                      q, SLOT(_q_updateSwiping()), Qt::DirectConnection);
 
-    // catch theme changes
-    // FIXME: use theme when available
-    QObject::connect(&UCDeprecatedTheme::instance(), SIGNAL(nameChanged()), q, SLOT(_q_updateThemedData()));
-    _q_updateThemedData();
+    // connect theme changes
+    QObject::connect(q, SIGNAL(themeChanged()),
+                     q, SLOT(_q_themeChanged()), Qt::DirectConnection);
 
     // watch grid unit size change and set implicit size
     QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(_q_updateSize()));
     _q_updateSize();
 }
 
+void UCListItemPrivate::_q_themeChanged()
+{
+    // call the post theme changes
+    updateStyling();
+}
+
 // inspired from IS_SIGNAL_CONNECTED(q, UCListItem, pressAndHold, ())
 // the macro cannot be used due to Arguments cannot be an empty ()
 bool UCListItemPrivate::isClickedConnected()
@@ -265,8 +256,9 @@
     return QObjectPrivate::get(q)->isSignalConnected(signalIdx);
 }
 
-void UCListItemPrivate::_q_updateThemedData()
+void UCListItemPrivate::updateStyling()
 {
+    UCStyledItemBasePrivate::updateStyling();
     Q_Q(UCListItem);
     // update the divider colors
     divider->paletteChanged();
@@ -381,8 +373,7 @@
         }
         delete implicitStyleComponent;
         Q_Q(UCListItem);
-        // FIXME: use theme when available
-        implicitStyleComponent = UCDeprecatedTheme::instance().createStyleComponent("ListItemStyle.qml", q);
+        implicitStyleComponent = getTheme()->createStyleComponent("ListItemStyle.qml", q);
         if (implicitStyleComponent) {
             // set the objectnane for testing in tst_listitems.qml
             implicitStyleComponent->setObjectName("ListItemThemeStyle");
@@ -407,7 +398,7 @@
     QQmlComponent *delegate = style();
     if (!delegate) {
         // the style is not loaded from the theme yet
-        _q_updateThemedData();
+        updateStyling();
         delegate = style();
     }
     if (!delegate) {
@@ -1010,6 +1001,13 @@
 {
 }
 
+void UCListItem::classBegin()
+{
+    UCStyledItemBase::classBegin();
+    Q_D(UCListItem);
+    d->_q_themeChanged();
+}
+
 void UCListItem::componentComplete()
 {
     UCStyledItemBase::componentComplete();
@@ -1519,7 +1517,7 @@
 {
     Q_D(UCListItem);
     d->customColor = false;
-    d->highlightColor = getPaletteColor("selected", "background");
+    d->highlightColor = d->getTheme()->getPaletteColor("selected", "background");
     update();
     Q_EMIT highlightColorChanged();
 }

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.h'
--- modules/Ubuntu/Components/plugin/uclistitem.h	2015-02-24 15:57:53 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.h	2015-04-16 13:25:32 +0000
@@ -65,6 +65,7 @@
     void resetHighlightColor();
 
 protected:
+    void classBegin();
     void componentComplete();
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data);
     void itemChange(ItemChange change, const ItemChangeData &data);
@@ -102,7 +103,7 @@
 
 private:
     Q_DECLARE_PRIVATE(UCListItem)
-    Q_PRIVATE_SLOT(d_func(), void _q_updateThemedData())
+    Q_PRIVATE_SLOT(d_func(), void _q_themeChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_relayout())
     Q_PRIVATE_SLOT(d_func(), void _q_updateSwiping())
     Q_PRIVATE_SLOT(d_func(), void _q_updateSize())

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-02-24 15:57:53 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-04-16 13:25:32 +0000
@@ -48,9 +48,9 @@
         return that->d_func();
     }
 
+    void _q_themeChanged();
     bool isClickedConnected();
     bool isPressAndHoldConnected();
-    void _q_updateThemedData();
     void _q_relayout();
     void _q_updateSwiping();
     void setSwiped(bool swiped);
@@ -115,6 +115,9 @@
     void setSelectMode(bool selectable);
     UCAction *action() const;
     void setAction(UCAction *action);
+
+protected:
+    void updateStyling();
 };
 
 class PropertyChange;
@@ -156,6 +159,4 @@
     QPointer<UCListItem> disablerItem;
 };
 
-QColor getPaletteColor(const char *profile, const char *color);
-
 #endif // UCVIEWITEM_P_H

=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-04-15 09:53:18 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-04-16 13:25:32 +0000
@@ -22,7 +22,6 @@
 
 UCStyledItemBasePrivate::UCStyledItemBasePrivate()
     : activeFocusOnPress(false)
-    , subthemingEnabled(true)
     , theme(0)
     , parentStyledItem(0)
 {
@@ -36,16 +35,8 @@
 {
     Q_Q(UCStyledItemBase);
     q->setFlag(QQuickItem::ItemIsFocusScope);
-    QByteArray env = qgetenv("UITK_SUBTHEMING");
-    subthemingEnabled = (env.isEmpty() || env == QByteArrayLiteral("yes"));
-    if (!subthemingEnabled) {
-        // every theme will be using the default theme
-        theme = &UCTheme::defaultTheme();
-        QObject::connect(theme, &UCTheme::nameChanged, q, &UCStyledItemBase::themeChanged);
-    } else {
-        QObject::connect(&UCTheme::defaultTheme(), &UCTheme::nameChanged,
-                         q, &UCStyledItemBase::themeChanged);
-    }
+    QObject::connect(&UCTheme::defaultTheme(), &UCTheme::nameChanged,
+                     q, &UCStyledItemBase::themeChanged);
 }
 
 
@@ -190,12 +181,10 @@
  */
 UCTheme *UCStyledItemBasePrivate::getTheme() const
 {
-    if (subthemingEnabled) {
-        if (theme) {
-            return theme;
-        } else if (!parentStyledItem.isNull()) {
-            return UCStyledItemBasePrivate::get(parentStyledItem)->getTheme();
-        }
+    if (theme) {
+        return theme;
+    } else if (!parentStyledItem.isNull()) {
+        return UCStyledItemBasePrivate::get(parentStyledItem)->getTheme();
     }
     return &UCTheme::defaultTheme();
 }
@@ -206,17 +195,6 @@
         return;
     }
 
-    if (!subthemingEnabled) {
-        // no subtheming
-        if (newTheme) {
-            theme = newTheme;
-            UCTheme::defaultTheme().setName(theme->name());
-        } else {
-            UCTheme::defaultTheme().resetName();
-        }
-        return;
-    }
-
     // disconnect from the previous set
     UCTheme *connectedSet = theme ?
                                 theme :
@@ -260,6 +238,9 @@
         Q_EMIT theme->parentThemeChanged();
     }
 
+    // update internal styling
+    updateStyling();
+
     Q_EMIT q->themeChanged();
 }
 void UCStyledItemBasePrivate::resetTheme()
@@ -309,9 +290,6 @@
 // disconnect parent stack till item is reached; all the stack if item == 0
 void UCStyledItemBasePrivate::disconnectTillItem(QQuickItem *item)
 {
-    if (!subthemingEnabled) {
-        return;
-    }
     Q_Q(UCStyledItemBase);
     while (!parentStack.isEmpty() && item != parentStack.top()) {
         QPointer<QQuickItem> stackItem = parentStack.pop();
@@ -395,7 +373,7 @@
 {
     QQuickItem::itemChange(change, data);
     Q_D(UCStyledItemBase);
-    if (change == ItemParentHasChanged && d->subthemingEnabled) {
+    if (change == ItemParentHasChanged) {
         if (!data.item) {
             d->disconnectTillItem(0);
         } else if (d->connectParents(0)) {

=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.h'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.h	2015-04-08 17:03:21 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.h	2015-04-16 13:25:32 +0000
@@ -29,7 +29,7 @@
     Q_PROPERTY(bool activeFocusOnPress
                READ activefocusOnPress WRITE setActiveFocusOnPress
                NOTIFY activeFocusOnPressChanged REVISION 1)
-    Q_PRIVATE_PROPERTY(d_func(), UCTheme *theme READ getTheme WRITE setTheme RESET resetTheme NOTIFY themeChanged REVISION 2)
+    Q_PRIVATE_PROPERTY(d_func(), UCTheme *theme READ getTheme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL REVISION 2)
 public:
     explicit UCStyledItemBase(QQuickItem *parent = 0);
 

=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- modules/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-04-08 17:03:21 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-04-16 13:25:32 +0000
@@ -44,12 +44,14 @@
     bool isParentFocusable();
 
     UCTheme *getTheme() const;
-    void setTheme(UCTheme *styleSet);
+    void setTheme(UCTheme *theme);
     void resetTheme();
 
+protected:
+    virtual void updateStyling() {}
+
 public:
     bool activeFocusOnPress:1;
-    bool subthemingEnabled:1;
     UCTheme *theme;
     QPointer<UCStyledItemBase> parentStyledItem;
 

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2015-04-08 17:03:21 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2015-04-16 13:25:32 +0000
@@ -409,3 +409,17 @@
         m_palette = defaultTheme().m_palette;
     }
 }
+
+// returns the palette color value of a color profile
+QColor UCTheme::getPaletteColor(const char *profile, const char *color)
+{
+    QColor result;
+    if (palette()) {
+        QObject *paletteProfile = m_palette->property(profile).value<QObject*>();
+        if (paletteProfile) {
+            result = paletteProfile->property(color).value<QColor>();
+        }
+    }
+    return result;
+}
+

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.h'
--- modules/Ubuntu/Components/plugin/uctheme.h	2015-04-08 17:03:21 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.h	2015-04-16 13:25:32 +0000
@@ -55,6 +55,9 @@
     Q_INVOKABLE QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent);
     static void registerToContext(QQmlContext* context);
 
+    // helper functions
+    QColor getPaletteColor(const char *profile, const char *color);
+
 Q_SIGNALS:
     void parentThemeChanged();
     void nameChanged();

=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
--- tests/unit/tst_performance/tst_performance.cpp	2015-04-08 17:03:21 +0000
+++ tests/unit/tst_performance/tst_performance.cpp	2015-04-16 13:25:32 +0000
@@ -63,24 +63,27 @@
         delete quickView;
     }
 
+    void clean()
+    {
+        qputenv("SUPPRESS_DEPRECATED_NOTE", "no");
+    }
+
     void benchmark_theming_data()
     {
         QTest::addColumn<QString>("document");
         QTest::addColumn<QUrl>("theme");
-        QTest::addColumn<QByteArray>("enableSubtheming");
+        QTest::addColumn<QString>("warning");
 
-        QTest::newRow("old theming, subtheming disabled") << "StyledItemOldTheming.qml" << QUrl("Ubuntu.Components.Themes.SuruDark") << QByteArray("no");
-        QTest::newRow("old theming, subtheming enabled") << "StyledItemOldTheming.qml" << QUrl("Ubuntu.Components.Themes.SuruDark") << QByteArray("yes");
-        QTest::newRow("subtheming, no changes on themes") << "Styling.qml" << QUrl() << QByteArray("yes");
-        QTest::newRow("subtheming, change mid item") << "Styling.qml" << QUrl("Ubuntu.Components.Themes.SuruDark") << QByteArray("yes");
+        QTest::newRow("old theming, subtheming enabled") << "StyledItemOldTheming.qml" << QUrl("Ubuntu.Components.Themes.SuruDark");
+        QTest::newRow("subtheming, no changes on themes") << "Styling.qml" << QUrl();
+        QTest::newRow("subtheming, change mid item") << "Styling.qml" << QUrl("Ubuntu.Components.Themes.SuruDark");
     }
     void benchmark_theming()
     {
         QFETCH(QString, document);
         QFETCH(QUrl, theme);
-        QFETCH(QByteArray, enableSubtheming);
 
-        qputenv("UITK_SUBTHEMING", enableSubtheming);
+        qputenv("SUPPRESS_DEPRECATED_NOTE", "yes");
         QQuickItem *root = 0;
         QBENCHMARK {
             root = loadDocument(document);

=== modified file 'tests/unit_x11/tst_components/tst_app_theming.qml'
--- tests/unit_x11/tst_components/tst_app_theming.qml	2015-03-23 16:23:55 +0000
+++ tests/unit_x11/tst_components/tst_app_theming.qml	2015-04-16 13:25:32 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import Ubuntu.Test 1.0
 
@@ -24,7 +24,7 @@
     width: units.gu(40)
     height: units.gu(71)
 
-    Component.onCompleted: Theme.name = "AppTheme"
+    Component.onCompleted: theme.name = "AppTheme"
 
     Label {
         id: testLabel
@@ -43,12 +43,12 @@
         // and will report failure if received
         function test_no_binding_loop_when_set_to_ambiance()
         {
-            Theme.name = "Ubuntu.Components.Themes.Ambiance";
+            main.theme.name = "Ubuntu.Components.Themes.Ambiance";
         }
 
         function test_reset_theme_should_not_give_binding_loops()
         {
-            Theme.name = undefined;
+            main.theme.name = undefined;
         }
     }
 }

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2015-02-27 08:00:52 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * 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
@@ -17,7 +17,7 @@
 import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Styles 1.2
 import QtQml.Models 2.1
 
@@ -318,7 +318,7 @@
         function test_0_defaults() {
             verify(defaults.contentItem !== null, "Defaults is null");
             compare(defaults.color, "#000000", "Transparent by default");
-            compare(defaults.highlightColor, Theme.palette.selected.background, "Theme.palette.selected.background color by default")
+            compare(defaults.highlightColor, theme.palette.selected.background, "theme.palette.selected.background color by default")
             compare(defaults.highlighted, false, "Not highlighted by default");
             compare(defaults.divider.visible, true, "divider is visible by default");
             compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0");

=== modified file 'tests/unit_x11/tst_components/tst_theming.qml'
--- tests/unit_x11/tst_components/tst_theming.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_components/tst_theming.qml	2015-04-16 13:25:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Test 1.0
 
 MainView {
@@ -24,8 +24,6 @@
     width: units.gu(50)
     height: units.gu(10)
 
-    useDeprecatedToolbar: false
-
     UbuntuTestCase {
         when: windowShown
 
@@ -46,15 +44,15 @@
             ];
         }
         function test_backgroundcolor_change(data) {
-            if (data.oldTheme !== Theme.name) {
-                Theme.name = data.oldTheme;
+            if (data.oldTheme !== mainView.theme.name) {
+                mainView.theme.name = data.oldTheme;
                 themeSpy.wait();
             }
             // change color;
             themeSpy.clear();
             mainView.backgroundColor = data.color;
             themeSpy.wait();
-            compare(Theme.name, data.newTheme, "Theme not chnaged");
+            compare(mainView.theme.name, data.newTheme, "Theme not chnaged");
         }
     }
 }

=== 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-03-23 17:24:32 +0000
+++ tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp	2015-04-16 13:25:32 +0000
@@ -89,6 +89,7 @@
 void tst_UCDeprecatedTheme::initTestCase()
 {
     m_xdgDataPath = QLatin1String(getenv("XDG_DATA_DIRS"));
+    qputenv("SUPPRESS_DEPRECATED_NOTE", "yes");
 }
 
 void tst_UCDeprecatedTheme::cleanupTestCase()

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-04-10 09:44:56 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-04-16 13:25:32 +0000
@@ -94,7 +94,6 @@
 
     void cleanup()
     {
-        qputenv("UITK_SUBTHEMING", "yes");
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", m_themesPath.toLatin1());
         qputenv("XDG_DATA_DIRS", m_xdgDataPath.toLocal8Bit());
     }
@@ -321,17 +320,8 @@
 
 
     // testing global context property 'theme' name changes
-    void test_set_global_theme_name_data()
-    {
-        QTest::addColumn<QByteArray>("subtheming");
-
-        QTest::newRow("Subtheming disabled") << QByteArray("no");
-        QTest::newRow("Subtheming enabled") << QByteArray("yes");
-    }
     void test_set_global_theme_name()
     {
-        QFETCH(QByteArray, subtheming);
-        qputenv("UITK_SUBTHEMING", subtheming);
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("TestMain.qml"));
         view->setGlobalTheme("Ubuntu.Components.Themes.SuruDark");
         // verify theme changes
@@ -347,19 +337,14 @@
     // no sub-theming si applied
     void test_set_styleditem_theme_name_data()
     {
-        QTest::addColumn<QByteArray>("subtheming");
         QTest::addColumn<QString>("itemName");
 
-        QTest::newRow("Subtheming disabled, set firstLevelStyled") << QByteArray("no") << "firstLevelStyled";
-        QTest::newRow("Subtheming disabled, set secondLevelStyled") << QByteArray("no") << "secondLevelStyled";
-        QTest::newRow("Subtheming enabled, set firstLevelStyled") << QByteArray("yes") << "firstLevelStyled";
-        QTest::newRow("Subtheming enabled, set secondLevelStyled") << QByteArray("yes") << "secondLevelStyled";
+        QTest::newRow("Subtheming enabled, set firstLevelStyled") << "firstLevelStyled";
+        QTest::newRow("Subtheming enabled, set secondLevelStyled") << "secondLevelStyled";
     }
     void test_set_styleditem_theme_name()
     {
-        QFETCH(QByteArray, subtheming);
         QFETCH(QString, itemName);
-        qputenv("UITK_SUBTHEMING", subtheming);
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("TestMain.qml"));
         // change theme name (theme)
         UCStyledItemBase *styled = view->findItem<UCStyledItemBase*>(itemName);