diff --git a/daemon/src/devices/banglejsdevice.cpp b/daemon/src/devices/banglejsdevice.cpp
index 36dea5ed..5e0f40b7 100644
--- a/daemon/src/devices/banglejsdevice.cpp
+++ b/daemon/src/devices/banglejsdevice.cpp
@@ -175,6 +175,24 @@ void BangleJSDevice::initialise()
     }
 
     setConnectionState("authenticated");
+
+    setTime();
+}
+
+void BangleJSDevice::setTime() {
+    UARTService *uart = qobject_cast<UARTService*>(service(UARTService::UUID_SERVICE_UART));
+    if (!uart){
+        return;
+    }
+
+    qint64 ts;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+    ts = QDateTime::currentSecsSinceEpoch();
+#else
+    ts = QDateTime::currentDateTime().toTime_t();
+#endif
+    uart->tx(QByteArray(1, 0x10) + QString("setTime(" + QString::number(ts) + ");\n").toUtf8());
 }
 
 void BangleJSDevice::onPropertiesChanged(QString interface, QVariantMap map, QStringList list)
diff --git a/daemon/src/devices/banglejsdevice.h b/daemon/src/devices/banglejsdevice.h
index c2c2b512..37e06ec7 100644
--- a/daemon/src/devices/banglejsdevice.h
+++ b/daemon/src/devices/banglejsdevice.h
@@ -37,6 +37,8 @@ class BangleJSDevice : public AbstractDevice
     //Weather
     void sendWeather(CurrentWeather *weather) override;
 
+    void setTime();
+
 protected:
     virtual void onPropertiesChanged(QString interface, QVariantMap map, QStringList list);
 
diff --git a/daemon/translations/harbour-amazfishd-cs.ts b/daemon/translations/harbour-amazfishd-cs.ts
index 27a11f2f..1743eb21 100644
--- a/daemon/translations/harbour-amazfishd-cs.ts
+++ b/daemon/translations/harbour-amazfishd-cs.ts
@@ -12,7 +12,7 @@
 <context>
     <name>AsteroidOSDevice</name>
     <message>
-        <location filename="../src/devices/asteroidosdevice.cpp" line="313"/>
+        <location filename="../src/devices/asteroidosdevice.cpp" line="324"/>
         <source>Stored %1...</source>
         <translation>Uloženo %1 ...</translation>
     </message>
@@ -61,27 +61,27 @@
         <translation>Zařízení není platné, nemusí být podporované</translation>
     </message>
     <message>
-        <location filename="../src/deviceinterface.cpp" line="446"/>
+        <location filename="../src/deviceinterface.cpp" line="444"/>
         <source>Amazfish</source>
         <translation>Amazfish</translation>
     </message>
     <message>
-        <location filename="../src/deviceinterface.cpp" line="446"/>
+        <location filename="../src/deviceinterface.cpp" line="444"/>
         <source>Connected</source>
         <translation>Připojeno</translation>
     </message>
     <message>
-        <location filename="../src/deviceinterface.cpp" line="446"/>
+        <location filename="../src/deviceinterface.cpp" line="444"/>
         <source>Phone and watch are connected</source>
         <translation>Telefon a hodinky jsou propojeny</translation>
     </message>
     <message>
-        <location filename="../src/deviceinterface.cpp" line="511"/>
+        <location filename="../src/deviceinterface.cpp" line="504"/>
         <source>Low Battery</source>
         <translation>Slabá baterie</translation>
     </message>
     <message>
-        <location filename="../src/deviceinterface.cpp" line="511"/>
+        <location filename="../src/deviceinterface.cpp" line="504"/>
         <source>Battery level now </source>
         <translation>Stupeň nabití </translation>
     </message>
@@ -102,17 +102,17 @@
 <context>
     <name>HuamiDevice</name>
     <message>
-        <location filename="../src/devices/huamidevice.cpp" line="172"/>
+        <location filename="../src/devices/huamidevice.cpp" line="183"/>
         <source>Navigation Started</source>
         <translation>Navigace spuštěna</translation>
     </message>
     <message>
-        <location filename="../src/devices/huamidevice.cpp" line="174"/>
+        <location filename="../src/devices/huamidevice.cpp" line="185"/>
         <source>Navigation Stopped</source>
         <translation>Navigace zastavena</translation>
     </message>
     <message>
-        <location filename="../src/devices/huamidevice.cpp" line="181"/>
+        <location filename="../src/devices/huamidevice.cpp" line="192"/>
         <source>Progress</source>
         <translation>Průbeh</translation>
     </message>
diff --git a/documentation/build-instructions.md b/documentation/build-instructions.md
index 4af10c48..6946096e 100644
--- a/documentation/build-instructions.md
+++ b/documentation/build-instructions.md
@@ -42,12 +42,12 @@ sudo apt install -y qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libkdb3-de
 ```
 
 Two dependencies can be found on git repos
-https://git.sailfishos.org/mer-core/nemo-qml-plugin-dbus
+https://github.com/sailfishos/nemo-qml-plugin-dbus
 and
-https://git.sailfishos.org/mer-core/qtmpris
+https://github.com/sailfishos/qtmpris.git/
 
 ```
-git clone https://git.sailfishos.org/mer-core/qtmpris.git
+git clone https://github.com/sailfishos/qtmpris.git/
 cd qtmpris
 qmake
 make
@@ -59,7 +59,7 @@ cd ..
 ```
 
 ```
-git clone https://git.sailfishos.org/mer-core/nemo-qml-plugin-dbus.git
+git clone https://github.com/sailfishos/nemo-qml-plugin-dbus
 cd nemo-qml-plugin-dbus
 qmake
 make
@@ -143,7 +143,7 @@ clickable build --libs
 clickable desktop
 ```
 
-To build the application for ARM architecture and install it on your device, follow these steps:
+To build the libraries and the application for the architecture of the connected device and install the app on your device, follow these steps:
 
 ```
 clickable build --libs --app --arch detect --skip-review
diff --git a/lib/src/amazfishconfig.h b/lib/src/amazfishconfig.h
index 93f17fa0..eb0eecca 100644
--- a/lib/src/amazfishconfig.h
+++ b/lib/src/amazfishconfig.h
@@ -161,7 +161,7 @@ class AmazfishConfig : public QObject
     ENUM_OPTION(QStringLiteral("profile/gender"),       profileGender,       setProfileGender,       ProfileGender, ProfileGenderMale)
     ENUM_OPTION(QStringLiteral("profile/wearlocation"), profileWearLocation, setProfileWearLocation, WearLocation,  WearLocationLeftWrist)
 
-    UINT_OPTION(QStringLiteral("profile/height"),      profileHeight,      setProfileHeight,      200)
+    UINT_OPTION(QStringLiteral("profile/height"),      profileHeight,      setProfileHeight,      170)
     UINT_OPTION(QStringLiteral("profile/weight"),      profileWeight,      setProfileWeight,      70)
     UINT_OPTION(QStringLiteral("profile/alldayhrm"),   profileAllDayHRM,   setProfileAllDayHRM,   0)
     UINT_OPTION(QStringLiteral("profile/fitnessgoal"), profileFitnessGoal, setProfileFitnessGoal, 10000)
diff --git a/ui/qml/components/platform.kirigami/ApplicationWindowPL.qml b/ui/qml/components/platform.kirigami/ApplicationWindowPL.qml
index 0d3d1309..098c85e4 100644
--- a/ui/qml/components/platform.kirigami/ApplicationWindowPL.qml
+++ b/ui/qml/components/platform.kirigami/ApplicationWindowPL.qml
@@ -35,7 +35,7 @@ Kirigami.ApplicationWindow {
     pageStack.globalToolBar.showNavigationButtons: pages && pages.currentIndex > 0 ?
                                                        Kirigami.ApplicationHeaderStyle.ShowBackButton :
                                                        Kirigami.ApplicationHeaderStyle.NoNavigationButtons
-
+    property var    cover
     property real   compassOrientationOffset: 0
     property bool   isConvergent: true
     property var    initialPage
diff --git a/ui/qml/components/platform.qtcontrols/ApplicationWindowPL.qml b/ui/qml/components/platform.qtcontrols/ApplicationWindowPL.qml
index 6608f4ad..62857dd4 100644
--- a/ui/qml/components/platform.qtcontrols/ApplicationWindowPL.qml
+++ b/ui/qml/components/platform.qtcontrols/ApplicationWindowPL.qml
@@ -27,6 +27,7 @@ ApplicationWindow {
     height: 480
     visible: true
 
+    property var    cover
     property real   compassOrientationOffset: 0
     property alias  initialPage: pageStack.initialItem
     property string menuPageUrl
diff --git a/ui/qml/components/platform.uuitk/ApplicationWindowPL.qml b/ui/qml/components/platform.uuitk/ApplicationWindowPL.qml
index e80e5e79..8ecdd799 100644
--- a/ui/qml/components/platform.uuitk/ApplicationWindowPL.qml
+++ b/ui/qml/components/platform.uuitk/ApplicationWindowPL.qml
@@ -28,6 +28,7 @@ ApplicationWindow {
     height: 480
     visible: true
 
+    property var    cover
     property real   compassOrientationOffset: 0
     property alias  initialPage: pageStack.initialItem
     property string menuPageUrl
diff --git a/ui/qml/cover/CoverPage.qml b/ui/qml/cover/CoverPage.qml
index 9c34ddf7..b40e9136 100644
--- a/ui/qml/cover/CoverPage.qml
+++ b/ui/qml/cover/CoverPage.qml
@@ -70,7 +70,7 @@ CoverBackground {
 
             Image {
                 id: imgSteps
-                source: "../pics/icon-m-steps.png"
+                source: "../pics/custom-icons/icon-m-steps.png"
                 height: Theme.iconSizeMedium
                 width: height
             }
@@ -94,7 +94,7 @@ CoverBackground {
 
             Image {
                 id: imgHeartrate
-                source: "../pics/icon-m-heartrate.png"
+                source: "../pics/custom-icons/icon-m-heartrate.png"
                 height: Theme.iconSizeMedium
                 width: height
             }
diff --git a/ui/qml/harbour-amazfish.qml b/ui/qml/harbour-amazfish.qml
index 91985d99..506543dd 100644
--- a/ui/qml/harbour-amazfish.qml
+++ b/ui/qml/harbour-amazfish.qml
@@ -13,7 +13,7 @@ ApplicationWindowPL
     id: app
     initialPage: Component { FirstPage { } }
     property var    rootPage: null
-    //cover: Qt.resolvedUrl("cover/CoverPage.qml")
+    cover: Qt.resolvedUrl("cover/CoverPage.qml")
     //allowedOrientations: defaultAllowedOrientations
 
     property int _lastNotificationId: 0
diff --git a/ui/qml/pages/AnalysisPage.qml b/ui/qml/pages/AnalysisPage.qml
index bcc10cef..4670a25f 100644
--- a/ui/qml/pages/AnalysisPage.qml
+++ b/ui/qml/pages/AnalysisPage.qml
@@ -40,7 +40,7 @@ PagePL {
             graphTitle: qsTr("Heartrate")
             graphHeight: 300
 
-            axisY.units: "BPM"
+            axisY.units: qsTr("BPM")
             type: DataSource.Heartrate
 
             minY: 0
@@ -57,7 +57,7 @@ PagePL {
             graphTitle: qsTr("Steps")
             graphHeight: 300
 
-            axisY.units: "Steps"
+            axisY.units: qsTr("Steps")
             type: DataSource.Steps
 
             minY: 0
diff --git a/ui/qml/pages/BipFirmwarePage.qml b/ui/qml/pages/BipFirmwarePage.qml
index d9eaf496..fc5c4bb3 100644
--- a/ui/qml/pages/BipFirmwarePage.qml
+++ b/ui/qml/pages/BipFirmwarePage.qml
@@ -4,7 +4,7 @@ import "../components/platform"
 
 PagePL {
     id: page
-    title: qsTr("Download File")
+    title: qsTr("Install File")
 
     property string selectedFile: qsTr("None")
     property string fileVersion
@@ -19,7 +19,7 @@ PagePL {
 
         LabelPL {
             width: parent.width
-            text: qsTr("Select a file to download.");
+            text: qsTr("Select a file to install.");
         }
 
         ValueButtonPL {
diff --git a/ui/qml/pages/FirstPage.qml b/ui/qml/pages/FirstPage.qml
index 6854c27b..ac72f1d5 100644
--- a/ui/qml/pages/FirstPage.qml
+++ b/ui/qml/pages/FirstPage.qml
@@ -30,7 +30,7 @@ PagePL {
             }
         }
         PageMenuItemPL {
-            text: qsTr("Download File")
+            text: qsTr("Install File")
             onClicked: app.pages.push(Qt.resolvedUrl("BipFirmwarePage.qml"))
         }
         PageMenuItemPL {
@@ -199,6 +199,11 @@ PagePL {
                     text: AmazfishConfig.profileFitnessGoal.toLocaleString()
                 }
             }
+            Component.onCompleted: {
+                if (_connected) {
+                    _InfoSteps = parseInt(DaemonInterfaceInstance.information(Amazfish.INFO_STEPS), 10) || 0;
+                }
+            }
         }
 
         SectionHeaderPL {
diff --git a/ui/qml/pages/HeartratePage.qml b/ui/qml/pages/HeartratePage.qml
index f820ea97..3aa8ba3e 100644
--- a/ui/qml/pages/HeartratePage.qml
+++ b/ui/qml/pages/HeartratePage.qml
@@ -69,7 +69,7 @@ PagePL {
             graphTitle: qsTr("BPM")
             graphHeight: 300
 
-            axisY.units: "BPM"
+            axisY.units: qsTr("BPM")
             type: DataSource.Heartrate
             graphType: 2
 
@@ -85,45 +85,65 @@ PagePL {
 
         //Type summary
         Grid {
-            columns: 2
+            columns: 3
             spacing: styler.themePaddingMedium
-            width: parent.width
-            LabelPL { text: qsTr("Relaxed") }
-            Item { width: parent.width * 0.5; height: 50
+            width: parent.width - (styler.themePaddingMedium * 2)
+            LabelPL {text: qsTr("Relaxed")}
+            Item { 
+                width: parent.width * 0.5
+                height: 50
                 Rectangle { color: "grey"; width: parent.width * (relaxed  / total) ; height: parent.height }
-                LabelPL { text: Math.floor((relaxed / total) * 100) + "%"; anchors.centerIn: parent}
+                LabelPL { text: Math.round((relaxed / total) * 100) + "%"; anchors.centerIn: parent}
             }
-            LabelPL { text: qsTr("Light") }
-            Item { width: parent.width * 0.5; height: 50
+            LabelPL {text: qsTr("≤ %1 BPM".arg(Math.round(maxHR()*0.5)))}
+
+            LabelPL {text: qsTr("Light")}
+            Item {
+                width: parent.width * 0.5
+                height: 50
                 Rectangle { color: "lightblue"; width: parent.width * (light  / total) ; height: parent.height }
-                LabelPL { text: Math.floor((light / total) * 100) + "%"; anchors.centerIn: parent}
+                LabelPL { text: Math.round((light / total) * 100) + "%"; anchors.centerIn: parent}
             }
-            LabelPL { text: qsTr("Intensive")}
-            Item { width: parent.width * 0.5; height: 50
+            LabelPL {text: qsTr("≤ %1 BPM".arg(Math.round(maxHR()*0.6)))}
+
+            LabelPL {text: qsTr("Intensive")}
+            Item {
+                width: parent.width * 0.5
+                height: 50
                 Rectangle { color: "green"; width: parent.width * (intensive  / total) ; height: parent.height }
-                LabelPL { text: Math.floor((intensive / total) * 100) + "%"; anchors.centerIn: parent}
+                LabelPL { text: Math.round((intensive / total) * 100) + "%"; anchors.centerIn: parent}
             }
-            LabelPL { text: qsTr("Aerobic")}
-            Item { width: parent.width * 0.5; height: 50
+            LabelPL {text: qsTr("≤ %1 BPM".arg(Math.round(maxHR()*0.7)))}
+
+            LabelPL {text: qsTr("Aerobic")}
+            Item {
+                width: parent.width * 0.5
+                height: 50
                 Rectangle { color: "yellow"; width: parent.width * (aerobic  / total) ; height: parent.height }
-                LabelPL { text: Math.floor((aerobic / total) * 100) + "%"; anchors.centerIn: parent}
+                LabelPL { text: Math.round((aerobic / total) * 100) + "%"; anchors.centerIn: parent}
             }
+            LabelPL {text: qsTr("≤ %1 BPM".arg(Math.round(maxHR()*0.8)))}
 
-            LabelPL { text: qsTr("Anerobic")}
-            Item { width: parent.width * 0.5; height: 50
+            LabelPL {text: qsTr("Anerobic")}
+            Item {
+                width: parent.width * 0.5
+                height: 50
                 Rectangle { color: "orange"; width: parent.width * (anerobic  / total) ; height: parent.height }
-                LabelPL { text: Math.floor((anerobic / total) * 100) + "%"; anchors.centerIn: parent}
+                LabelPL { text: Math.round((anerobic / total) * 100) + "%"; anchors.centerIn: parent}
             }
+            LabelPL {text: qsTr("≤ %1 BPM".arg(Math.round(maxHR()*0.9)))}
 
-            LabelPL { text: qsTr("VO2 Max") }
-            Item { width: parent.width * 0.5; height: 50
+            LabelPL {text: qsTr("VO2 Max")}
+            Item {
+                width: parent.width * 0.5
+                height: 50
                 Rectangle { color: "red"; width: parent.width * (vo2max  / total) ; height: parent.height }
-                LabelPL { text: Math.floor((vo2max / total) * 100) + "%"; anchors.centerIn: parent}
+                LabelPL { text: Math.round((vo2max / total) * 100) + "%"; anchors.centerIn: parent}
             }
+            LabelPL {text: qsTr("≤ %1 BPM".arg(Math.round(maxHR())))}
         }
     }
 
-
     function updateGraphs() {
         graphHR.updateGraph(day);
         calculateZones();
@@ -179,33 +199,23 @@ PagePL {
 
     function maxHR() {
         var dob = AmazfishConfig.profileDOB;
+        var gender = AmazfishConfig.profileGender;
         var diff_ms = Date.now() - dob.getTime();
         var age_dt = new Date(diff_ms);
         var age = Math.abs(age_dt.getUTCFullYear() - 1970);
-        var max_hr = 200;
-
-        if (age >= 70) {
-            max_hr = 150;
-        } else if (age >= 65) {
-            max_hr = 155;
-        } else if (age >= 60) {
-            max_hr = 160;
-        } else if (age >= 55) {
-            max_hr = 165;
-        } else if (age >= 50) {
-            max_hr = 170;
-        } else if (age >= 45) {
-            max_hr = 175;
-        } else if (age >= 40) {
-            max_hr = 180;
-        } else if (age >= 35) {
-            max_hr = 185;
-        } else if (age >= 30) {
-            max_hr = 190;
-        } else if (age >= 25) {
-            max_hr = 195;
+        var max_hr;
+
+        // if no age is provided, use an average age
+        // this is to avoid providing too height values which may be a health risk
+        if (!age) {
+            age = 50
+        }
+        // max HR calculated with Wingate formula as the most recent evaluation with a large test group
+        // for details see https://en.wikipedia.org/wiki/Heart_rate#Maximum_heart_rate
+        if (gender = 1) { // 1=male
+            max_hr = 208.609-(0.716*age)
         } else {
-            max_hr = 200;
+            max_hr = 209.273-(0.804*age)
         }
 
         console.log("Age is", age, "max hr is", max_hr);
diff --git a/ui/qml/pages/StepsPage.qml b/ui/qml/pages/StepsPage.qml
index 443158eb..e39c279a 100644
--- a/ui/qml/pages/StepsPage.qml
+++ b/ui/qml/pages/StepsPage.qml
@@ -25,7 +25,7 @@ PagePL {
             font.pixelSize: styler.themeFontSizeExtraLarge * 3
             anchors.horizontalCenter: parent.horizontalCenter
             width: parent.width
-            text: _InfoSteps > 0 ? _InfoSteps : graphStepSummary.lastValue
+            text: _InfoSteps > 0 ? _InfoSteps.toLocaleString() : graphStepSummary.lastValue.toLocaleString()
             horizontalAlignment: Text.AlignHCenter
         }
 
@@ -50,7 +50,7 @@ PagePL {
             graphHeight: 300
 
             axisX.mask: "MM/dd"
-            axisY.units: "Steps"
+            axisY.units: qsTr("Steps")
             type: DataSource.StepSummary
             graphType: 2
 
diff --git a/ui/translations/harbour-amazfish-ui-cs.ts b/ui/translations/harbour-amazfish-ui-cs.ts
index 2d9f6cb4..d1371dab 100644
--- a/ui/translations/harbour-amazfish-ui-cs.ts
+++ b/ui/translations/harbour-amazfish-ui-cs.ts
@@ -61,6 +61,10 @@
         <source>Intensity</source>
         <translation>Intensita</translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation>TEP/MIN</translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -88,11 +92,11 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Stáhnout soubor</translation>
+        <translation type="vanished">Stáhnout soubor</translation>
     </message>
     <message>
         <source>Select a file to download.</source>
-        <translation>Vybrat soubor ke stažení.</translation>
+        <translation type="vanished">Vybrat soubor ke stažení.</translation>
     </message>
     <message>
         <source>None</source>
@@ -110,6 +114,14 @@
         <source>File not supported on this device</source>
         <translation>Soubor není podporavný na tomto zařízení</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation>Nainstalovat soubor</translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation>Vybrat soubor k instalaci.</translation>
+    </message>
 </context>
 <context>
     <name>DaemonInterface</name>
@@ -268,7 +280,7 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Stáhnout soubor</translation>
+        <translation type="vanished">Stáhnout soubor</translation>
     </message>
     <message>
         <source>Data Graphs</source>
@@ -298,6 +310,10 @@
         <source>Enable on boot</source>
         <translation>Povolit při startu</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation>Nainstalovat soubor</translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -938,11 +954,11 @@
     </message>
     <message>
         <source>%1 hrs</source>
-        <translation>%1 hodin</translation>
+        <translation type="vanished">%1 hodin</translation>
     </message>
     <message>
         <source>Deep %1 hrs</source>
-        <translation>Hluboký spánek %1 hodin</translation>
+        <translation type="vanished">Hluboký spánek %1 hodin</translation>
     </message>
     <message>
         <source>Sleep Summary</source>
@@ -957,6 +973,18 @@
         <source>Hours</source>
         <translation>Hodin</translation>
     </message>
+    <message>
+        <source>Total %1</source>
+        <translation>Celkem %1</translation>
+    </message>
+    <message>
+        <source>Light %1</source>
+        <translation>Lehký %1</translation>
+    </message>
+    <message>
+        <source>Deep %1</source>
+        <translation>Hluboký %1</translation>
+    </message>
 </context>
 <context>
     <name>SportPage</name>
diff --git a/ui/translations/harbour-amazfish-ui-de.ts b/ui/translations/harbour-amazfish-ui-de.ts
index 01ddec36..b69b16f9 100644
--- a/ui/translations/harbour-amazfish-ui-de.ts
+++ b/ui/translations/harbour-amazfish-ui-de.ts
@@ -61,6 +61,10 @@
         <source>Intensity</source>
         <translation>Intensität</translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished">BPM</translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -88,11 +92,11 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Datei herunterladen</translation>
+        <translation type="vanished">Datei herunterladen</translation>
     </message>
     <message>
         <source>Select a file to download.</source>
-        <translation>Wähle eine Datei zum herunterladen aus.</translation>
+        <translation type="vanished">Wähle eine Datei zum herunterladen aus.</translation>
     </message>
     <message>
         <source>None</source>
@@ -110,6 +114,14 @@
         <source>File not supported on this device</source>
         <translation>Datei für dieses Gerät nicht unterstützt</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DaemonInterface</name>
@@ -256,7 +268,7 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Datei herunterladen</translation>
+        <translation type="vanished">Datei herunterladen</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -298,6 +310,10 @@
         <source>Enable on boot</source>
         <translation>Beim Booten aktivieren</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -951,11 +967,23 @@
     </message>
     <message>
         <source>%1 hrs</source>
-        <translation>%1 Std</translation>
+        <translation type="vanished">%1 Std</translation>
     </message>
     <message>
         <source>Deep %1 hrs</source>
-        <translation>Tiefe %1 Std</translation>
+        <translation type="vanished">Tiefe %1 Std</translation>
+    </message>
+    <message>
+        <source>Total %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deep %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/ui/translations/harbour-amazfish-ui-es.ts b/ui/translations/harbour-amazfish-ui-es.ts
index edfe6a69..2f314e56 100644
--- a/ui/translations/harbour-amazfish-ui-es.ts
+++ b/ui/translations/harbour-amazfish-ui-es.ts
@@ -61,6 +61,10 @@
         <source>Intensity</source>
         <translation>Intensidad</translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation>BPM</translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -88,11 +92,11 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Enviar archivo</translation>
+        <translation type="vanished">Enviar archivo</translation>
     </message>
     <message>
         <source>Select a file to download.</source>
-        <translation>Selecciona archivo para enviar.</translation>
+        <translation type="vanished">Selecciona archivo para enviar.</translation>
     </message>
     <message>
         <source>None</source>
@@ -110,6 +114,14 @@
         <source>File not supported on this device</source>
         <translation>Archivo no soportado en este dispositivo</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation>Archivo de instalación</translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation>Seleccione un archivo para instalar.</translation>
+    </message>
 </context>
 <context>
     <name>DaemonInterface</name>
@@ -256,7 +268,7 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Enviar archivo</translation>
+        <translation type="vanished">Enviar archivo</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -298,6 +310,10 @@
         <source>Enable on boot</source>
         <translation>Activar al arrancar</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation>Archivo de instalación</translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -951,11 +967,23 @@
     </message>
     <message>
         <source>%1 hrs</source>
-        <translation>%1 hrs.</translation>
+        <translation type="vanished">%1 hrs.</translation>
     </message>
     <message>
         <source>Deep %1 hrs</source>
-        <translation>Profundo %1 hrs</translation>
+        <translation type="vanished">Profundo %1 hrs</translation>
+    </message>
+    <message>
+        <source>Total %1</source>
+        <translation>Total %1</translation>
+    </message>
+    <message>
+        <source>Light %1</source>
+        <translation>Ligero %1</translation>
+    </message>
+    <message>
+        <source>Deep %1</source>
+        <translation>Profundo %1</translation>
     </message>
 </context>
 <context>
diff --git a/ui/translations/harbour-amazfish-ui-fa.ts b/ui/translations/harbour-amazfish-ui-fa.ts
new file mode 100644
index 00000000..f3457d61
--- /dev/null
+++ b/ui/translations/harbour-amazfish-ui-fa.ts
@@ -0,0 +1,1263 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fa">
+<context>
+    <name>AddCityPage</name>
+    <message>
+        <source>Set Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Alarm</name>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AnalysisPage</name>
+    <message>
+        <source>Analysis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Heartrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Intensity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthKeyDialog</name>
+    <message>
+        <source>Enter auth key</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BatteryPage</name>
+    <message>
+        <source>Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BipFirmwarePage</name>
+    <message>
+        <source>Send file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File type/version: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File not supported on this device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DaemonInterface</name>
+    <message>
+        <source>Unexpected error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DebugInfo</name>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial No: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware Rev: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software Rev: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection State: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GPS Ver: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Test Notification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Test Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Test Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fetch debug log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Test Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debugging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Firmware Rev: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Function Tests</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Weather</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Music Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Somebody</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hello from Sailfish OS. This is a long message sent over BLE!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Donald Duck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hello, this is an email from Sailfish OS!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Test Immediate Alert Service</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DownloadDataMenuItem</name>
+    <message>
+        <source>Download Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstPage</name>
+    <message>
+        <source>Pair with watch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect from watch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect to watch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Graphs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Heartrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 bpm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable on boot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GraphData</name>
+    <message>
+        <source>No data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HeartratePage</name>
+    <message>
+        <source>Heartrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 bpm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Relaxed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Intensive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aerobic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anerobic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VO2 Max</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>JSTools</name>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Heartrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Altitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PairPage</name>
+    <message>
+        <source>Pair Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No devices found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan for devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning for devices…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pairing…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth adapter is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PairSelectDeviceType</name>
+    <message>
+        <source>Select Device Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>%1s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1m %2s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1h %2m %3s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Settings-alarms</name>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Settings-app</name>
+    <message>
+        <source>Notify on connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sync activity data each hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BT Adapter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low battery notification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Navigation notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simulate event reminder support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh rates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh weather every (%1) minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh calendar every (%1) minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amazfish Service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start service on boot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start/Stop the Amazfish Background Service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transliterate notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Settings-button-action</name>
+    <message>
+        <source>Button Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Double Press Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Triple Press Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quad Press Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Settings-device</name>
+    <message>
+        <source>Device Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>en_US</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>es_ES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zh_CN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>zh_TW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date/Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>24hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance Unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metric</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Imperial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ru_RU</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>de_DE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>it_IT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fr_FR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tr_TR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nl_NL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect Notification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Huami Display Items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Realtime HRM measurement</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Settings-huami-shortcuts</name>
+    <message>
+        <source>Huami Display Items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Heartrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Workout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weather</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Not Disturb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Music</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mute Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Event Reminder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>World Clock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Period</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SPO2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alexa</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AliPay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Settings-menu</name>
+    <message>
+        <source>Settings Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Donate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weather</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Strava</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Settings-profile</name>
+    <message>
+        <source>Profile Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height (cm): </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weight (kg): </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wear Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display on lift wrist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goal (steps): </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alert on fitness goal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use HRM for Sleep Detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All day HRM interval (minutes): </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Heartrate usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Schedule</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SleepPage</name>
+    <message>
+        <source>Sleep Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sleep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MM/dd</source>
+        <extracomment>Format for day on the sleep summary graph</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deep %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SportPage</name>
+    <message>
+        <source>Send to Strava</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active Seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Descent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Altitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Min Altitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Min Pace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Pace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average HR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Pace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Stride</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max HR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Stroke</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Stroke/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Lap Pace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Strokes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SWOLF Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swim Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Laps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Latitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Min Latitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Longitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Min Longitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Stride</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kcal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>meters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>seconds/m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>bpm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>seconds/km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>strokes/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>strokes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>swolf</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SportsSummaryPage</name>
+    <message>
+        <source>Sports Activities</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download Next Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StepsPage</name>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StravaSettingsPage</name>
+    <message>
+        <source>Strava settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Country: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not logged in</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StravaUploadPage</name>
+    <message>
+        <source>Strava Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activity name for Strava</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activity description for Strava</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type (Strava)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Commute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Uploading data...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking upload...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TCX uploaded...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activity upload complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>An unknown error occurred</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UnpairDeviceDialog</name>
+    <message>
+        <source>Unpair</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before proceeding you need to unpair your current device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/ui/translations/harbour-amazfish-ui-fr.ts b/ui/translations/harbour-amazfish-ui-fr.ts
index e2d5550a..708c1083 100644
--- a/ui/translations/harbour-amazfish-ui-fr.ts
+++ b/ui/translations/harbour-amazfish-ui-fr.ts
@@ -61,6 +61,10 @@
         <source>Intensity</source>
         <translation>Intensité</translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -88,11 +92,11 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Télécharger un fichier</translation>
+        <translation type="vanished">Télécharger un fichier</translation>
     </message>
     <message>
         <source>Select a file to download.</source>
-        <translation>Sélectionner un fichier à télécharger.</translation>
+        <translation type="vanished">Sélectionner un fichier à télécharger.</translation>
     </message>
     <message>
         <source>None</source>
@@ -110,6 +114,14 @@
         <source>File not supported on this device</source>
         <translation>Fichier non supporté sur cet appareil</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DaemonInterface</name>
@@ -256,7 +268,7 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Télécharger fichier</translation>
+        <translation type="vanished">Télécharger fichier</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -298,6 +310,10 @@
         <source>Enable on boot</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -941,20 +957,24 @@
         <translation>Sommeil</translation>
     </message>
     <message>
-        <source>%1 hrs</source>
+        <source>MM/dd</source>
+        <extracomment>Format for day on the sleep summary graph</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deep %1 hrs</source>
+        <source>Hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MM/dd</source>
-        <extracomment>Format for day on the sleep summary graph</extracomment>
+        <source>Total %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hours</source>
+        <source>Light %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deep %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/ui/translations/harbour-amazfish-ui-nb_NO.ts b/ui/translations/harbour-amazfish-ui-nb_NO.ts
index c1c818c6..9d529584 100644
--- a/ui/translations/harbour-amazfish-ui-nb_NO.ts
+++ b/ui/translations/harbour-amazfish-ui-nb_NO.ts
@@ -55,12 +55,16 @@
     </message>
     <message>
         <source>Steps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Skritt</translation>
     </message>
     <message>
         <source>Intensity</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -88,11 +92,11 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Last ned fil</translation>
+        <translation type="vanished">Last ned fil</translation>
     </message>
     <message>
         <source>Select a file to download.</source>
-        <translation>Velg fil å laste ned</translation>
+        <translation type="vanished">Velg fil å laste ned</translation>
     </message>
     <message>
         <source>None</source>
@@ -110,6 +114,14 @@
         <source>File not supported on this device</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DaemonInterface</name>
@@ -256,7 +268,7 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Last ned fil</translation>
+        <translation type="vanished">Last ned fil</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -298,6 +310,10 @@
         <source>Enable on boot</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -422,7 +438,7 @@
     <name>QObject</name>
     <message>
         <source>%1s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1% {1s?}</translation>
     </message>
     <message>
         <source>%1m %2s</source>
@@ -437,7 +453,7 @@
     <name>Settings-alarms</name>
     <message>
         <source>Alarms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alarmer</translation>
     </message>
     <message>
         <source>Save Settings</source>
@@ -547,7 +563,7 @@
     <name>Settings-button-action</name>
     <message>
         <source>Button Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Knappehandlinger</translation>
     </message>
     <message>
         <source>Double Press Action</source>
@@ -563,7 +579,7 @@
     </message>
     <message>
         <source>Save Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lagre innstillinger</translation>
     </message>
     <message>
         <source>No Action</source>
@@ -941,21 +957,25 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 hrs</source>
+        <source>MM/dd</source>
+        <extracomment>Format for day on the sleep summary graph</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deep %1 hrs</source>
+        <source>Hours</source>
+        <translation>Timer</translation>
+    </message>
+    <message>
+        <source>Total %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MM/dd</source>
-        <extracomment>Format for day on the sleep summary graph</extracomment>
+        <source>Light %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hours</source>
-        <translation>Timer</translation>
+        <source>Deep %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/ui/translations/harbour-amazfish-ui-nl.ts b/ui/translations/harbour-amazfish-ui-nl.ts
index 67ac1536..60335049 100644
--- a/ui/translations/harbour-amazfish-ui-nl.ts
+++ b/ui/translations/harbour-amazfish-ui-nl.ts
@@ -61,6 +61,10 @@
         <source>Intensity</source>
         <translation>Intensiteit</translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished">BPM</translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -88,11 +92,11 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Download bestand</translation>
+        <translation type="vanished">Download bestand</translation>
     </message>
     <message>
         <source>Select a file to download.</source>
-        <translation>Selecteer een bestand om te downloaden.</translation>
+        <translation type="vanished">Selecteer een bestand om te downloaden.</translation>
     </message>
     <message>
         <source>None</source>
@@ -110,6 +114,14 @@
         <source>File not supported on this device</source>
         <translation>Bestand niet ondersteund op dit apparaat</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DaemonInterface</name>
@@ -256,7 +268,7 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Download bestand</translation>
+        <translation type="vanished">Download bestand</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -298,6 +310,10 @@
         <source>Enable on boot</source>
         <translation>Inschakelen bij opstarten</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -942,11 +958,11 @@
     </message>
     <message>
         <source>%1 hrs</source>
-        <translation>%1 uur</translation>
+        <translation type="vanished">%1 uur</translation>
     </message>
     <message>
         <source>Deep %1 hrs</source>
-        <translation>Diep %1 uur</translation>
+        <translation type="vanished">Diep %1 uur</translation>
     </message>
     <message>
         <source>MM/dd</source>
@@ -957,6 +973,18 @@
         <source>Hours</source>
         <translation>Uur</translation>
     </message>
+    <message>
+        <source>Total %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deep %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SportPage</name>
diff --git a/ui/translations/harbour-amazfish-ui-pl.ts b/ui/translations/harbour-amazfish-ui-pl.ts
index 6140b246..2167ec23 100644
--- a/ui/translations/harbour-amazfish-ui-pl.ts
+++ b/ui/translations/harbour-amazfish-ui-pl.ts
@@ -61,6 +61,10 @@
         <source>Intensity</source>
         <translation>Intensywność</translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -88,11 +92,11 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Pobież plik</translation>
+        <translation type="vanished">Pobież plik</translation>
     </message>
     <message>
         <source>Select a file to download.</source>
-        <translation>Wybierz plik do pobrania</translation>
+        <translation type="vanished">Wybierz plik do pobrania</translation>
     </message>
     <message>
         <source>None</source>
@@ -110,6 +114,14 @@
         <source>File not supported on this device</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DaemonInterface</name>
@@ -256,7 +268,7 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Pobierz plik</translation>
+        <translation type="vanished">Pobierz plik</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -298,6 +310,10 @@
         <source>Enable on boot</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -941,20 +957,24 @@
         <translation>Sen</translation>
     </message>
     <message>
-        <source>%1 hrs</source>
+        <source>MM/dd</source>
+        <extracomment>Format for day on the sleep summary graph</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deep %1 hrs</source>
+        <source>Hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MM/dd</source>
-        <extracomment>Format for day on the sleep summary graph</extracomment>
+        <source>Total %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hours</source>
+        <source>Light %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deep %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/ui/translations/harbour-amazfish-ui-ru.ts b/ui/translations/harbour-amazfish-ui-ru.ts
index e81954ca..8742ce6a 100644
--- a/ui/translations/harbour-amazfish-ui-ru.ts
+++ b/ui/translations/harbour-amazfish-ui-ru.ts
@@ -61,6 +61,10 @@
         <source>Intensity</source>
         <translation>Нагрузка</translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -88,11 +92,11 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Загрузка файлов</translation>
+        <translation type="vanished">Загрузка файлов</translation>
     </message>
     <message>
         <source>Select a file to download.</source>
-        <translation>Выберите файл для загрузки</translation>
+        <translation type="vanished">Выберите файл для загрузки</translation>
     </message>
     <message>
         <source>None</source>
@@ -110,6 +114,14 @@
         <source>File not supported on this device</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DaemonInterface</name>
@@ -256,7 +268,7 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Загрузка файлов</translation>
+        <translation type="vanished">Загрузка файлов</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -298,6 +310,10 @@
         <source>Enable on boot</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -950,11 +966,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 hrs</source>
+        <source>Total %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deep %1 hrs</source>
+        <source>Deep %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/ui/translations/harbour-amazfish-ui-sv.ts b/ui/translations/harbour-amazfish-ui-sv.ts
index f4c7a881..cceb3641 100644
--- a/ui/translations/harbour-amazfish-ui-sv.ts
+++ b/ui/translations/harbour-amazfish-ui-sv.ts
@@ -61,6 +61,10 @@
         <source>Intensity</source>
         <translation>Intensitet</translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished">BPM</translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -88,11 +92,11 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Ladda ner fil</translation>
+        <translation type="vanished">Ladda ner fil</translation>
     </message>
     <message>
         <source>Select a file to download.</source>
-        <translation>Välj en fil att ladda ner.</translation>
+        <translation type="vanished">Välj en fil att ladda ner.</translation>
     </message>
     <message>
         <source>None</source>
@@ -110,6 +114,14 @@
         <source>File not supported on this device</source>
         <translation>Filformatet stöds inte på denna enhet</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a file to install.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DaemonInterface</name>
@@ -256,7 +268,7 @@
     </message>
     <message>
         <source>Download File</source>
-        <translation>Ladda ner fil</translation>
+        <translation type="vanished">Ladda ner fil</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -298,6 +310,10 @@
         <source>Enable on boot</source>
         <translation>Aktivera vid systemstart</translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -951,11 +967,23 @@
     </message>
     <message>
         <source>%1 hrs</source>
-        <translation>%1 tim</translation>
+        <translation type="vanished">%1 tim</translation>
     </message>
     <message>
         <source>Deep %1 hrs</source>
-        <translation>Djup %1 tim</translation>
+        <translation type="vanished">Djup %1 tim</translation>
+    </message>
+    <message>
+        <source>Total %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deep %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/ui/translations/harbour-amazfish-ui-zh_CN.ts b/ui/translations/harbour-amazfish-ui-zh_CN.ts
index 180f6f2d..a2e71485 100644
--- a/ui/translations/harbour-amazfish-ui-zh_CN.ts
+++ b/ui/translations/harbour-amazfish-ui-zh_CN.ts
@@ -64,8 +64,14 @@
         <source>Heartrate</source>
         <translation>心率</translation>
     </message>
+    <message>
+        <location filename="../qml/pages/AnalysisPage.qml" line="43"/>
+        <source>BPM</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../qml/pages/AnalysisPage.qml" line="57"/>
+        <location filename="../qml/pages/AnalysisPage.qml" line="60"/>
         <source>Steps</source>
         <translation>步数</translation>
     </message>
@@ -106,14 +112,22 @@
         <translation>无</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BipFirmwarePage.qml" line="7"/>
         <source>Download File</source>
-        <translation>下载文件</translation>
+        <translation type="vanished">下载文件</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BipFirmwarePage.qml" line="22"/>
         <source>Select a file to download.</source>
-        <translation>选择要下载的文件。</translation>
+        <translation type="vanished">选择要下载的文件。</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/BipFirmwarePage.qml" line="7"/>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/BipFirmwarePage.qml" line="22"/>
+        <source>Select a file to install.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qml/pages/BipFirmwarePage.qml" line="26"/>
@@ -321,9 +335,13 @@
         <translation>配对手表</translation>
     </message>
     <message>
-        <location filename="../qml/pages/FirstPage.qml" line="33"/>
         <source>Download File</source>
-        <translation>下载文件</translation>
+        <translation type="vanished">下载文件</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/FirstPage.qml" line="33"/>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qml/pages/FirstPage.qml" line="37"/>
@@ -346,32 +364,32 @@
         <translation>连接到手表</translation>
     </message>
     <message>
-        <location filename="../qml/pages/FirstPage.qml" line="148"/>
+        <location filename="../qml/pages/FirstPage.qml" line="147"/>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/FirstPage.qml" line="154"/>
+        <location filename="../qml/pages/FirstPage.qml" line="152"/>
         <source>Steps</source>
         <translation type="unfinished">步数</translation>
     </message>
     <message>
-        <location filename="../qml/pages/FirstPage.qml" line="205"/>
+        <location filename="../qml/pages/FirstPage.qml" line="210"/>
         <source>Heartrate</source>
         <translation type="unfinished">心率</translation>
     </message>
     <message>
-        <location filename="../qml/pages/FirstPage.qml" line="227"/>
+        <location filename="../qml/pages/FirstPage.qml" line="236"/>
         <source>%1 bpm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/FirstPage.qml" line="246"/>
+        <location filename="../qml/pages/FirstPage.qml" line="255"/>
         <source>Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/FirstPage.qml" line="251"/>
+        <location filename="../qml/pages/FirstPage.qml" line="260"/>
         <source>Enable on boot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -398,6 +416,7 @@
     </message>
     <message>
         <location filename="../qml/pages/HeartratePage.qml" line="69"/>
+        <location filename="../qml/pages/HeartratePage.qml" line="72"/>
         <source>BPM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -407,27 +426,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/HeartratePage.qml" line="96"/>
+        <location filename="../qml/pages/HeartratePage.qml" line="100"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/HeartratePage.qml" line="101"/>
+        <location filename="../qml/pages/HeartratePage.qml" line="109"/>
         <source>Intensive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/HeartratePage.qml" line="106"/>
+        <location filename="../qml/pages/HeartratePage.qml" line="118"/>
         <source>Aerobic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/HeartratePage.qml" line="112"/>
+        <location filename="../qml/pages/HeartratePage.qml" line="127"/>
         <source>Anerobic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/HeartratePage.qml" line="118"/>
+        <location filename="../qml/pages/HeartratePage.qml" line="136"/>
         <source>VO2 Max</source>
         <translation type="unfinished"></translation>
     </message>
@@ -593,27 +612,27 @@
 <context>
     <name>Settings-app</name>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="36"/>
+        <location filename="../qml/pages/Settings-app.qml" line="41"/>
         <source>Notifications</source>
         <translation>通知</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="44"/>
+        <location filename="../qml/pages/Settings-app.qml" line="49"/>
         <source>Notify on connect</source>
         <translation>连接时通知</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="80"/>
+        <location filename="../qml/pages/Settings-app.qml" line="85"/>
         <source>Refresh rates</source>
         <translation>刷新频率</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="86"/>
+        <location filename="../qml/pages/Settings-app.qml" line="91"/>
         <source>Sync activity data each hour</source>
         <translation>每小时同步活动数据</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="52"/>
+        <location filename="../qml/pages/Settings-app.qml" line="57"/>
         <source>Low battery notification</source>
         <translation>低电量通知</translation>
     </message>
@@ -628,62 +647,62 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="60"/>
+        <location filename="../qml/pages/Settings-app.qml" line="65"/>
         <source>Navigation notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="68"/>
+        <location filename="../qml/pages/Settings-app.qml" line="73"/>
         <source>Transliterate notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="76"/>
+        <location filename="../qml/pages/Settings-app.qml" line="81"/>
         <source>Simulate event reminder support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="97"/>
+        <location filename="../qml/pages/Settings-app.qml" line="102"/>
         <source>Refresh weather every (%1) minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="106"/>
+        <location filename="../qml/pages/Settings-app.qml" line="111"/>
         <source>Refresh calendar every (%1) minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="111"/>
+        <location filename="../qml/pages/Settings-app.qml" line="116"/>
         <source>Amazfish Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="118"/>
+        <location filename="../qml/pages/Settings-app.qml" line="123"/>
         <source>Start service on boot</source>
         <translation>启动时开启服务</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="133"/>
+        <location filename="../qml/pages/Settings-app.qml" line="138"/>
         <source>Start/Stop the Amazfish Background Service</source>
         <translation>开启/停止 Amazfish 后台服务</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="146"/>
+        <location filename="../qml/pages/Settings-app.qml" line="151"/>
         <source>Start</source>
         <translation>开启</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="155"/>
+        <location filename="../qml/pages/Settings-app.qml" line="160"/>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="165"/>
+        <location filename="../qml/pages/Settings-app.qml" line="170"/>
         <source>Button Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings-app.qml" line="177"/>
+        <location filename="../qml/pages/Settings-app.qml" line="182"/>
         <source>Save Settings</source>
         <translation>保存设置</translation>
     </message>
@@ -1182,27 +1201,32 @@
     </message>
     <message>
         <location filename="../qml/pages/SleepPage.qml" line="29"/>
-        <source>%1 hrs</source>
+        <source>Total %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qml/pages/SleepPage.qml" line="38"/>
-        <source>Deep %1 hrs</source>
+        <source>Light %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/SleepPage.qml" line="47"/>
+        <source>Deep %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SleepPage.qml" line="62"/>
+        <location filename="../qml/pages/SleepPage.qml" line="71"/>
         <source>MM/dd</source>
         <extracomment>Format for day on the sleep summary graph</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SleepPage.qml" line="63"/>
+        <location filename="../qml/pages/SleepPage.qml" line="72"/>
         <source>Hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SleepPage.qml" line="58"/>
+        <location filename="../qml/pages/SleepPage.qml" line="67"/>
         <source>Sleep Summary</source>
         <translation>睡眠摘要</translation>
     </message>
@@ -1215,213 +1239,213 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="88"/>
+        <location filename="../qml/pages/SportPage.qml" line="90"/>
         <source>Data:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="357"/>
+        <location filename="../qml/pages/SportPage.qml" line="359"/>
         <source>Steps</source>
         <translation type="unfinished">步数</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="358"/>
+        <location filename="../qml/pages/SportPage.qml" line="360"/>
         <source>Active Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="359"/>
+        <location filename="../qml/pages/SportPage.qml" line="361"/>
         <source>Calories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="360"/>
+        <location filename="../qml/pages/SportPage.qml" line="362"/>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="361"/>
+        <location filename="../qml/pages/SportPage.qml" line="363"/>
         <source>Ascent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="362"/>
+        <location filename="../qml/pages/SportPage.qml" line="364"/>
         <source>Descent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="363"/>
+        <location filename="../qml/pages/SportPage.qml" line="365"/>
         <source>Max Altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="364"/>
+        <location filename="../qml/pages/SportPage.qml" line="366"/>
         <source>Min Altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="365"/>
+        <location filename="../qml/pages/SportPage.qml" line="367"/>
         <source>Min Pace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="366"/>
+        <location filename="../qml/pages/SportPage.qml" line="368"/>
         <source>Max Pace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="367"/>
+        <location filename="../qml/pages/SportPage.qml" line="369"/>
         <source>Average HR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="368"/>
+        <location filename="../qml/pages/SportPage.qml" line="370"/>
         <source>Average Pace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="369"/>
+        <location filename="../qml/pages/SportPage.qml" line="371"/>
         <source>Average Stride</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="370"/>
+        <location filename="../qml/pages/SportPage.qml" line="372"/>
         <source>Max HR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="371"/>
+        <location filename="../qml/pages/SportPage.qml" line="373"/>
         <source>Time Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="372"/>
+        <location filename="../qml/pages/SportPage.qml" line="374"/>
         <source>Time Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="373"/>
+        <location filename="../qml/pages/SportPage.qml" line="375"/>
         <source>Time Flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="374"/>
+        <location filename="../qml/pages/SportPage.qml" line="376"/>
         <source>Average Stroke</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="375"/>
+        <location filename="../qml/pages/SportPage.qml" line="377"/>
         <source>Average Stroke/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="376"/>
+        <location filename="../qml/pages/SportPage.qml" line="378"/>
         <source>Average Lap Pace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="377"/>
+        <location filename="../qml/pages/SportPage.qml" line="379"/>
         <source>Strokes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="378"/>
+        <location filename="../qml/pages/SportPage.qml" line="380"/>
         <source>SWOLF Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="379"/>
+        <location filename="../qml/pages/SportPage.qml" line="381"/>
         <source>Swim Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="380"/>
+        <location filename="../qml/pages/SportPage.qml" line="382"/>
         <source>Laps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="381"/>
+        <location filename="../qml/pages/SportPage.qml" line="383"/>
         <source>Max Latitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="382"/>
+        <location filename="../qml/pages/SportPage.qml" line="384"/>
         <source>Min Latitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="383"/>
+        <location filename="../qml/pages/SportPage.qml" line="385"/>
         <source>Max Longitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="384"/>
+        <location filename="../qml/pages/SportPage.qml" line="386"/>
         <source>Min Longitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="385"/>
+        <location filename="../qml/pages/SportPage.qml" line="387"/>
         <source>Max Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="386"/>
+        <location filename="../qml/pages/SportPage.qml" line="388"/>
         <source>Total Stride</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="392"/>
+        <location filename="../qml/pages/SportPage.qml" line="394"/>
         <source>steps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="393"/>
+        <location filename="../qml/pages/SportPage.qml" line="395"/>
         <source>seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="394"/>
+        <location filename="../qml/pages/SportPage.qml" line="396"/>
         <source>kcal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="395"/>
+        <location filename="../qml/pages/SportPage.qml" line="397"/>
         <source>meters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="396"/>
+        <location filename="../qml/pages/SportPage.qml" line="398"/>
         <source>seconds/m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="397"/>
+        <location filename="../qml/pages/SportPage.qml" line="399"/>
         <source>bpm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="398"/>
+        <location filename="../qml/pages/SportPage.qml" line="400"/>
         <source>seconds/km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="399"/>
+        <location filename="../qml/pages/SportPage.qml" line="401"/>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="400"/>
+        <location filename="../qml/pages/SportPage.qml" line="402"/>
         <source>strokes/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="401"/>
+        <location filename="../qml/pages/SportPage.qml" line="403"/>
         <source>strokes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/SportPage.qml" line="402"/>
-        <location filename="../qml/pages/SportPage.qml" line="405"/>
+        <location filename="../qml/pages/SportPage.qml" line="404"/>
+        <location filename="../qml/pages/SportPage.qml" line="407"/>
         <source>swolf</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1449,6 +1473,7 @@
     <message>
         <location filename="../qml/pages/StepsPage.qml" line="9"/>
         <location filename="../qml/pages/StepsPage.qml" line="49"/>
+        <location filename="../qml/pages/StepsPage.qml" line="53"/>
         <source>Steps</source>
         <translation>步数</translation>
     </message>
diff --git a/ui/translations/harbour-amazfish-ui.ts b/ui/translations/harbour-amazfish-ui.ts
index 27b56f73..e40be225 100644
--- a/ui/translations/harbour-amazfish-ui.ts
+++ b/ui/translations/harbour-amazfish-ui.ts
@@ -61,6 +61,10 @@
         <source>Intensity</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>BPM</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AuthKeyDialog</name>
@@ -87,27 +91,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download File</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select a file to download.</source>
+        <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>File type/version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose File</source>
+        <source>File not supported on this device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File type/version: </source>
+        <source>Install File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File not supported on this device</source>
+        <source>Select a file to install.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -254,10 +258,6 @@
         <source>Pair with watch</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Download File</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
@@ -298,6 +298,10 @@
         <source>Enable on boot</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GraphData</name>
@@ -941,20 +945,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 hrs</source>
+        <source>MM/dd</source>
+        <extracomment>Format for day on the sleep summary graph</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deep %1 hrs</source>
+        <source>Hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MM/dd</source>
-        <extracomment>Format for day on the sleep summary graph</extracomment>
+        <source>Total %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hours</source>
+        <source>Light %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deep %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>