diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp
index 105b106c..c45c0205 100644
--- a/nymea-app/main.cpp
+++ b/nymea-app/main.cpp
@@ -170,8 +170,8 @@ int main(int argc, char *argv[])
     qmlRegisterType<NfcThingActionWriter>("Nymea", 1, 0, "NfcThingActionWriter");
 
     qmlRegisterSingletonType<PushNotifications>("Nymea", 1, 0, "PushNotifications", PushNotifications::pushNotificationsProvider);
-    qmlRegisterSingletonType(QUrl("qrc:///ui/utils/NymeaUtils.qml"), "Nymea", 1, 0, "NymeaUtils" );
-    qmlRegisterSingletonType(QUrl("qrc:///ui/utils/AirQualityIndex.qml"), "Nymea", 1, 0, "AirQualityIndex" );
+    qmlRegisterSingletonType(QUrl("qrc:///ui/utils/NymeaUtils.qml"), "NymeaApp.Utils", 1, 0, "NymeaUtils" );
+    qmlRegisterSingletonType(QUrl("qrc:///ui/utils/AirQualityIndex.qml"), "NymeaApp.Utils", 1, 0, "AirQualityIndex" );
 
     qmlRegisterType<DashboardModel>("Nymea", 1, 0, "DashboardModel");
     qmlRegisterUncreatableType<DashboardItem>("Nymea", 1, 0, "DashboardItem", "");
diff --git a/nymea-app/ui/MainMenu.qml b/nymea-app/ui/MainMenu.qml
index 23b497fc..4657edac 100644
--- a/nymea-app/ui/MainMenu.qml
+++ b/nymea-app/ui/MainMenu.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.1
 import Qt.labs.settings 1.0
 import "components"
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 Drawer {
     id: root
diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index fbeedf93..db63609e 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/nymea-app/ui/Nymea.qml
@@ -36,6 +36,7 @@ import Qt.labs.settings 1.0
 import Qt.labs.folderlistmodel 2.2
 import QtQuick.Window 2.3
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ApplicationWindow {
     id: app
diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index 5767f61a..0dce7639 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.2
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "components"
 import "connection"
 
diff --git a/nymea-app/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml
index c9327052..a0fe42d7 100644
--- a/nymea-app/ui/SettingsPage.qml
+++ b/nymea-app/ui/SettingsPage.qml
@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "components"
 
 Page {
diff --git a/nymea-app/ui/components/BatteryStatusIcon.qml b/nymea-app/ui/components/BatteryStatusIcon.qml
index a3e8af5c..316fb39e 100644
--- a/nymea-app/ui/components/BatteryStatusIcon.qml
+++ b/nymea-app/ui/components/BatteryStatusIcon.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.9
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ColorIcon {
     id: root
diff --git a/nymea-app/ui/components/ConnectionStatusIcon.qml b/nymea-app/ui/components/ConnectionStatusIcon.qml
index 2c78248d..67b94727 100644
--- a/nymea-app/ui/components/ConnectionStatusIcon.qml
+++ b/nymea-app/ui/components/ConnectionStatusIcon.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.9
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ColorIcon {
     id: root
diff --git a/nymea-app/ui/components/MediaPlayer.qml b/nymea-app/ui/components/MediaPlayer.qml
index 54828228..e76293b8 100644
--- a/nymea-app/ui/components/MediaPlayer.qml
+++ b/nymea-app/ui/components/MediaPlayer.qml
@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import QtGraphicalEffects 1.0
 import "../delegates"
 import "../utils"
diff --git a/nymea-app/ui/customviews/GenericTypeGraph.qml b/nymea-app/ui/customviews/GenericTypeGraph.qml
index f2f45f2e..7a9aa646 100644
--- a/nymea-app/ui/customviews/GenericTypeGraph.qml
+++ b/nymea-app/ui/customviews/GenericTypeGraph.qml
@@ -33,6 +33,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../customviews"
 import QtCharts 2.2
diff --git a/nymea-app/ui/delegates/InterfaceTile.qml b/nymea-app/ui/delegates/InterfaceTile.qml
index c5c39829..8894c3da 100644
--- a/nymea-app/ui/delegates/InterfaceTile.qml
+++ b/nymea-app/ui/delegates/InterfaceTile.qml
@@ -33,6 +33,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQuick.Controls.Material 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 
 MainPageTile {
diff --git a/nymea-app/ui/devicelistpages/LightThingsListPage.qml b/nymea-app/ui/devicelistpages/LightThingsListPage.qml
index f11ef46c..bfab3502 100644
--- a/nymea-app/ui/devicelistpages/LightThingsListPage.qml
+++ b/nymea-app/ui/devicelistpages/LightThingsListPage.qml
@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.2
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../utils"
 
diff --git a/nymea-app/ui/devicelistpages/ThingsListPageBase.qml b/nymea-app/ui/devicelistpages/ThingsListPageBase.qml
index badddc15..87afdcf8 100644
--- a/nymea-app/ui/devicelistpages/ThingsListPageBase.qml
+++ b/nymea-app/ui/devicelistpages/ThingsListPageBase.qml
@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 
 Page {
diff --git a/nymea-app/ui/devicepages/SensorDevicePage.qml b/nymea-app/ui/devicepages/SensorDevicePage.qml
index 292d779b..2e0e8b46 100644
--- a/nymea-app/ui/devicepages/SensorDevicePage.qml
+++ b/nymea-app/ui/devicepages/SensorDevicePage.qml
@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../customviews"
 
diff --git a/nymea-app/ui/grouping/GroupThingsPage.qml b/nymea-app/ui/grouping/GroupThingsPage.qml
index cd7da31c..366c8d78 100644
--- a/nymea-app/ui/grouping/GroupThingsPage.qml
+++ b/nymea-app/ui/grouping/GroupThingsPage.qml
@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../delegates"
 
diff --git a/nymea-app/ui/mainviews/FavoritesView.qml b/nymea-app/ui/mainviews/FavoritesView.qml
index 4b783d83..0ff82f36 100644
--- a/nymea-app/ui/mainviews/FavoritesView.qml
+++ b/nymea-app/ui/mainviews/FavoritesView.qml
@@ -33,6 +33,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQuick.Controls.Material 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../delegates"
 
diff --git a/nymea-app/ui/mainviews/dashboard/DashboardAddWizard.qml b/nymea-app/ui/mainviews/dashboard/DashboardAddWizard.qml
index c7518d6d..b5b950b8 100644
--- a/nymea-app/ui/mainviews/dashboard/DashboardAddWizard.qml
+++ b/nymea-app/ui/mainviews/dashboard/DashboardAddWizard.qml
@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.2
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../../components"
 import "../../delegates"
 
diff --git a/nymea-app/ui/mainviews/dashboard/DashboardFolderDelegate.qml b/nymea-app/ui/mainviews/dashboard/DashboardFolderDelegate.qml
index c766b3c8..880108f0 100644
--- a/nymea-app/ui/mainviews/dashboard/DashboardFolderDelegate.qml
+++ b/nymea-app/ui/mainviews/dashboard/DashboardFolderDelegate.qml
@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.2
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../../components"
 import "../../delegates"
 
diff --git a/nymea-app/ui/mainviews/dashboard/DashboardThingDelegate.qml b/nymea-app/ui/mainviews/dashboard/DashboardThingDelegate.qml
index c7446479..87cd9c06 100644
--- a/nymea-app/ui/mainviews/dashboard/DashboardThingDelegate.qml
+++ b/nymea-app/ui/mainviews/dashboard/DashboardThingDelegate.qml
@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.2
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../../components"
 import "../../delegates"
 
diff --git a/nymea-app/ui/mainviews/energy/ConsumerStats.qml b/nymea-app/ui/mainviews/energy/ConsumerStats.qml
index a77d9b74..fe768379 100644
--- a/nymea-app/ui/mainviews/energy/ConsumerStats.qml
+++ b/nymea-app/ui/mainviews/energy/ConsumerStats.qml
@@ -3,6 +3,7 @@ import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.2
 import QtCharts 2.3
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "qrc:/ui/components/"
 
 StatsBase {
diff --git a/nymea-app/ui/mainviews/energy/ConsumersHistory.qml b/nymea-app/ui/mainviews/energy/ConsumersHistory.qml
index 1f5f38f5..7a97f8a9 100644
--- a/nymea-app/ui/mainviews/energy/ConsumersHistory.qml
+++ b/nymea-app/ui/mainviews/energy/ConsumersHistory.qml
@@ -3,6 +3,7 @@ import QtCharts 2.3
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "qrc:/ui/components"
 
 Item {
diff --git a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml
index fc42cb06..74e360b2 100644
--- a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml
+++ b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "qrc:/ui/components"
 
 Item {
diff --git a/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml b/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml
index 0eae0b52..bfae1c62 100644
--- a/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml
+++ b/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ChartView {
     id: consumptionPieChart
diff --git a/nymea-app/ui/mainviews/energy/CurrentPowerBalancePieChart.qml b/nymea-app/ui/mainviews/energy/CurrentPowerBalancePieChart.qml
index c34e5263..21d421bb 100644
--- a/nymea-app/ui/mainviews/energy/CurrentPowerBalancePieChart.qml
+++ b/nymea-app/ui/mainviews/energy/CurrentPowerBalancePieChart.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "qrc:/ui/components"
 
 Item {
diff --git a/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml b/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
index a987a3cb..a8113626 100644
--- a/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
+++ b/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ChartView {
     id: productionPieChart
diff --git a/nymea-app/ui/system/UsersSettingsPage.qml b/nymea-app/ui/system/UsersSettingsPage.qml
index 74f4161f..9de50fb6 100644
--- a/nymea-app/ui/system/UsersSettingsPage.qml
+++ b/nymea-app/ui/system/UsersSettingsPage.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 
 SettingsPageBase {
diff --git a/nymea-app/ui/system/zigbee/ZigbeeNodePage.qml b/nymea-app/ui/system/zigbee/ZigbeeNodePage.qml
index fe515f67..c0bbe316 100644
--- a/nymea-app/ui/system/zigbee/ZigbeeNodePage.qml
+++ b/nymea-app/ui/system/zigbee/ZigbeeNodePage.qml
@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.3
 import "qrc:/ui/components"
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 SettingsPageBase {
     id: root