9 files changed, 10 insertions, 10 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
index a9a1cb98..1f018e2e 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
@@ -48,14 +48,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQ2
+import QtQuick 2.10
+import QtQuick.Controls 2.3 as QQC2
 import ".."
 import "../Style"
 import "fitness.js" as FitnessData
 
 Item {
-    QQ2.SwipeView {
+    QQC2.SwipeView {
         id: svFitnessContainer
 
         anchors.fill: parent
@@ -72,18 +72,18 @@ Item {
                     text: qsTr("Steps: ") + FitnessData.getSteps()
                     font.italic: true
                     font.pixelSize: UIStyle.fontSizeM
-                    color: UIStyle.colorQtGray1
+                    color: UIStyle.themeColorQtGray1
                 }
                 Image {
                     anchors.horizontalCenter: parent.horizontalCenter
-                    source: "images/man-walking.png"
+                    source: UIStyle.themeImagePath("images/man-walking")
                 }
                 Text {
                     anchors.horizontalCenter: parent.horizontalCenter
                     text: qsTr("Calories: ") + FitnessData.getCalories()
                     font.pixelSize: UIStyle.fontSizeS
                     font.italic: true
-                    color: UIStyle.colorQtGray3
+                    color: UIStyle.themeColorQtGray3
                 }
             }
         }
@@ -102,11 +102,11 @@ Item {
                           + qsTr(" miles")
                     font.italic: true
                     font.pixelSize: UIStyle.fontSizeM
-                    color: UIStyle.colorQtGray1
+                    color: UIStyle.themeColorQtGray1
                 }
                 Image {
                     anchors.horizontalCenter: parent.horizontalCenter
-                    source: "images/man-running.png"
+                    source: UIStyle.themeImagePath("images/man-running")
                 }
                 Text {
                     anchors.horizontalCenter: parent.horizontalCenter
@@ -115,13 +115,13 @@ Item {
                           + qsTr(" mins")
                     font.pixelSize: UIStyle.fontSizeS
                     font.italic: true
-                    color: UIStyle.colorQtGray3
+                    color: UIStyle.themeColorQtGray3
                 }
             }
         }
     }
 
-    QQ2.PageIndicator {
+    QQC2.PageIndicator {
         count: svFitnessContainer.count
         currentIndex: svFitnessContainer.currentIndex
 
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png
new file mode 100644
index 00000000..709c4b0f
--- /dev/null
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png
new file mode 100644
index 00000000..1497ba4a
--- /dev/null
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png
index 5efab6e2..5efab6e2 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png
index 2073d97f..2073d97f 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running@2x.png
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png
new file mode 100644
index 00000000..6de13144
--- /dev/null
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png
new file mode 100644
index 00000000..e094e071
--- /dev/null
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png
index 01add534..01add534 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png
index 037a8f03..037a8f03 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking@2x.png
+++ b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png