diff --git a/libnymea-app-core/connection/awsclient.cpp b/libnymea-app-core/connection/awsclient.cpp
index cc57954b..d4ad1c09 100644
--- a/libnymea-app-core/connection/awsclient.cpp
+++ b/libnymea-app-core/connection/awsclient.cpp
@@ -515,7 +515,7 @@ void AWSClient::deleteAccount()
     });
 }
 
-void AWSClient::unpairDevice(const QString &boxId)
+void AWSClient::unpairDevice(const QString &coreId)
 {
     if (!isLoggedIn()) {
         qWarning() << "Not logged in at AWS. Can't unpair device";
@@ -524,18 +524,18 @@ void AWSClient::unpairDevice(const QString &boxId)
     if (tokensExpired()) {
         qDebug() << "Cannot unpair device. Need to refresh our tokens";
         refreshAccessToken();
-        QueuedCall::enqueue(m_callQueue, QueuedCall("unpairDevice", boxId));
+        QueuedCall::enqueue(m_callQueue, QueuedCall("unpairDevice", coreId));
         return;
     }
     qDebug() << "unpairing device";
-    QUrl url(QString("https://%1/users/devices/%2").arg(m_configs.value(m_usedConfig).apiEndpoint).arg(boxId));
+    QUrl url(QString("https://%1/users/devices/%2").arg(m_configs.value(m_usedConfig).apiEndpoint).arg(coreId));
     QNetworkRequest request(url);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     request.setRawHeader("x-api-idToken", m_idToken);
 
     m_devices->setBusy(true);
     QNetworkReply *reply = m_nam->deleteResource(request);
-    connect(reply, &QNetworkReply::finished, this, [this, reply, boxId]() {
+    connect(reply, &QNetworkReply::finished, this, [this, reply, coreId]() {
         reply->deleteLater();
         m_devices->setBusy(false);
         QByteArray data = reply->readAll();
@@ -550,7 +550,7 @@ void AWSClient::unpairDevice(const QString &boxId)
             return;
         }
         qDebug() << "Device unpaired" << data;
-        m_devices->remove(boxId);
+        m_devices->remove(coreId);
 
     });
 }
@@ -838,7 +838,7 @@ bool AWSClient::tokensExpired() const
     return (m_accessTokenExpiry.addSecs(-10) < QDateTime::currentDateTime()) || (m_sessionTokenExpiry.addSecs(-10) < QDateTime::currentDateTime());
 }
 
-bool AWSClient::postToMQTT(const QString &boxId, const QString &timestamp, QObject* sender, std::function<void (bool)> callback)
+bool AWSClient::postToMQTT(const QString &coreId, const QString &timestamp, QObject* sender, std::function<void (bool)> callback)
 {
     if (!isLoggedIn()) {
         qWarning() << "Cannot post to MQTT. Not logged in to AWS";
@@ -847,10 +847,10 @@ bool AWSClient::postToMQTT(const QString &boxId, const QString &timestamp, QObje
     if (tokensExpired()) {
         qDebug() << "Cannot post to MQTT. Need to refresh the tokens first";
         refreshAccessToken();
-        QueuedCall::enqueue(m_callQueue, QueuedCall("postToMQTT", boxId, timestamp, sender, callback));
+        QueuedCall::enqueue(m_callQueue, QueuedCall("postToMQTT", coreId, timestamp, sender, callback));
         return true; // So far it looks we're doing ok... let's return true
     }    
-    QString topic = QString("%1/%2/proxy").arg(boxId).arg(QString(m_identityId));
+    QString topic = QString("%1/%2/proxy").arg(coreId).arg(QString(m_identityId));
 
     QPointer<QObject> senderWatcher = QPointer<QObject>(sender);
 
diff --git a/libnymea-app-core/connection/awsclient.h b/libnymea-app-core/connection/awsclient.h
index b0127d58..77537740 100644
--- a/libnymea-app-core/connection/awsclient.h
+++ b/libnymea-app-core/connection/awsclient.h
@@ -114,11 +114,11 @@ public:
     Q_INVOKABLE void confirmForgotPassword(const QString &username, const QString &code, const QString &newPassword);
     Q_INVOKABLE void deleteAccount();
 
-    Q_INVOKABLE void unpairDevice(const QString &boxId);
+    Q_INVOKABLE void unpairDevice(const QString &coreId);
 
     Q_INVOKABLE void fetchDevices();
 
-    Q_INVOKABLE bool postToMQTT(const QString &boxId, const QString &timestamp, QObject* sender, std::function<void(bool)> callback);
+    Q_INVOKABLE bool postToMQTT(const QString &coreId, const QString &timestamp, QObject* sender, std::function<void(bool)> callback);
     Q_INVOKABLE void getId();
 
     Q_INVOKABLE void registerPushNotificationEndpoint(const QString &registrationId, const QString &deviceDisplayName, const QString mobileDeviceId, const QString &mobileDeviceManufacturer, const QString &mobileDeviceModel);
diff --git a/libnymea-app-core/jsonrpc/jsonrpcclient.cpp b/libnymea-app-core/jsonrpc/jsonrpcclient.cpp
index d511f190..3c2f677c 100644
--- a/libnymea-app-core/jsonrpc/jsonrpcclient.cpp
+++ b/libnymea-app-core/jsonrpc/jsonrpcclient.cpp
@@ -421,7 +421,7 @@ void JsonRpcClient::helloReply(const QVariantMap &params)
 
         QVersionNumber minimumRequiredVersion = QVersionNumber(1, 0);
         if (m_jsonRpcVersion < minimumRequiredVersion) {
-            qWarning() << "Nymea box doesn't support minimum required version. Required:" << minimumRequiredVersion << "Found:" << m_jsonRpcVersion;
+            qWarning() << "Nymea core doesn't support minimum required version. Required:" << minimumRequiredVersion << "Found:" << m_jsonRpcVersion;
             m_connection->disconnect();
             emit invalidProtocolVersion(m_jsonRpcVersion.toString(), minimumRequiredVersion.toString());
             return;
diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc
index bb025d3a..b70bac89 100644
--- a/nymea-app/resources.qrc
+++ b/nymea-app/resources.qrc
@@ -20,7 +20,7 @@
         <file>ui/connection/wifisetup/ConnectWiFiPage.qml</file>
         <file>ui/connection/wifisetup/NetworkSettingsPage.qml</file>
         <file>ui/connection/wifisetup/BoxInfoPage.qml</file>
-        <file>ui/components/GuhHeader.qml</file>
+        <file>ui/components/NymeaHeader.qml</file>
         <file>ui/components/HeaderButton.qml</file>
         <file>ui/components/ColorPicker.qml</file>
         <file>ui/components/ColorIcon.qml</file>
@@ -32,7 +32,7 @@
         <file>ui/components/ErrorDialog.qml</file>
         <file>ui/components/ShutterControls.qml</file>
         <file>ui/components/MeaDialog.qml</file>
-        <file>ui/components/MeaListItemDelegate.qml</file>
+        <file>ui/components/NymeaListItemDelegate.qml</file>
         <file>ui/components/MainPageTabButton.qml</file>
         <file>ui/components/AutoSizeMenu.qml</file>
         <file>ui/components/EmptyViewPlaceholder.qml</file>
diff --git a/nymea-app/styles/dark/ApplicationWindow.qml b/nymea-app/styles/dark/ApplicationWindow.qml
index a7a3fc46..ef71792a 100644
--- a/nymea-app/styles/dark/ApplicationWindow.qml
+++ b/nymea-app/styles/dark/ApplicationWindow.qml
@@ -10,7 +10,7 @@ ApplicationWindow {
     font.capitalization: Font.MixedCase
     font.family: "Ubuntu"
 
-    // The system (box) name.
+    // The core system name.
     property string systemName: "nymea"
 
     // The app name
diff --git a/nymea-app/styles/light/ApplicationWindow.qml b/nymea-app/styles/light/ApplicationWindow.qml
index fa022708..5900b83e 100644
--- a/nymea-app/styles/light/ApplicationWindow.qml
+++ b/nymea-app/styles/light/ApplicationWindow.qml
@@ -9,7 +9,7 @@ ApplicationWindow {
     font.capitalization: Font.MixedCase
     font.family: "Ubuntu"
 
-    // The system (box) name.
+    // The core system name.
     property string systemName: "nymea"
 
     // The app name
diff --git a/nymea-app/styles/noir/ApplicationWindow.qml b/nymea-app/styles/noir/ApplicationWindow.qml
index af0b21c1..49098ae2 100644
--- a/nymea-app/styles/noir/ApplicationWindow.qml
+++ b/nymea-app/styles/noir/ApplicationWindow.qml
@@ -14,7 +14,7 @@ ApplicationWindow {
     font.capitalization: Font.MixedCase
     font.family: "Oswald"
 
-    // The system (box) name.
+    // The core system name.
     property string systemName: "nymea"
 
     // The app name
diff --git a/nymea-app/ui/MagicPage.qml b/nymea-app/ui/MagicPage.qml
index ddd826e5..74703ded 100644
--- a/nymea-app/ui/MagicPage.qml
+++ b/nymea-app/ui/MagicPage.qml
@@ -6,7 +6,7 @@ import Nymea 1.0
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Magic")
         onBackPressed: pageStack.pop()
 
@@ -74,7 +74,7 @@ Page {
             id: rulesProxy
             rules: engine.ruleManager.rules
         }
-        delegate: MeaListItemDelegate {
+        delegate: NymeaListItemDelegate {
             id: ruleDelegate
             width: parent.width
             iconName: "../images/" + (model.executable ? (iconTag ? iconTag.value : "slideshow") : "magic") + ".svg"
diff --git a/nymea-app/ui/MainPage.qml b/nymea-app/ui/MainPage.qml
index 0a48cfd8..40ffa07e 100644
--- a/nymea-app/ui/MainPage.qml
+++ b/nymea-app/ui/MainPage.qml
@@ -41,7 +41,7 @@ Page {
             ListElement { iconSource: "../images/share.svg"; text: qsTr("Configure things"); page: "thingconfiguration/EditThingsPage.qml" }
             ListElement { iconSource: "../images/magic.svg"; text: qsTr("Magic"); page: "MagicPage.qml" }
             ListElement { iconSource: "../images/stock_application.svg"; text: qsTr("App settings"); page: "appsettings/AppSettingsPage.qml" }
-            ListElement { iconSource: "../images/settings.svg"; text: qsTr("Box settings"); page: "SettingsPage.qml" }
+            ListElement { iconSource: "../images/settings.svg"; text: qsTr("System settings"); page: "SettingsPage.qml" }
         }
 
         onClicked: {
@@ -250,7 +250,7 @@ Page {
                         visible: engine.deviceManager.devices.count === 0 && !engine.deviceManager.fetchingData
                         title: qsTr("Welcome to %1!").arg(app.systemName)
                         // Have that split in 2 because we need those strings separated in EditDevicesPage too and don't want translators to do them twice
-                        text: qsTr("There are no things set up yet.") + "\n" + qsTr("In order for your %1 box to be useful, go ahead and add some things.").arg(app.systemName)
+                        text: qsTr("There are no things set up yet.") + "\n" + qsTr("In order for your %1 system to be useful, go ahead and add some things.").arg(app.systemName)
                         imageSource: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle)
                         buttonText: qsTr("Add a thing")
                         onButtonClicked: pageStack.push(Qt.resolvedUrl("thingconfiguration/NewThingPage.qml"))
diff --git a/nymea-app/ui/PushButtonAuthPage.qml b/nymea-app/ui/PushButtonAuthPage.qml
index 7423ad3f..63c375c5 100644
--- a/nymea-app/ui/PushButtonAuthPage.qml
+++ b/nymea-app/ui/PushButtonAuthPage.qml
@@ -8,7 +8,7 @@ Page {
     id: root
     signal backPressed();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Welcome to %1!").arg(app.systemName)
         backButtonVisible: true
         onBackPressed: {
diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index 61706e45..7dfd8f6c 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -316,7 +316,7 @@ Item {
                                     font.pixelSize: app.largeFont
                                 }
                                 Label {
-                                    text: qsTr("Sorry, the version of the %1 box you are trying to connect to is too old. This app requires at least version %2 but the %1 box only supports %3").arg(app.systemName).arg(popup.minimumVersion).arg(popup.actualVersion)
+                                    text: qsTr("Sorry, the version of the %1:core you are trying to connect to is too old. This app requires at least version %2 but this %1:core only supports %3").arg(app.systemName).arg(popup.minimumVersion).arg(popup.actualVersion)
                                     wrapMode: Text.WordWrap
                                     Layout.fillWidth: true
                                 }
diff --git a/nymea-app/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml
index c2b2a71e..63498ffe 100644
--- a/nymea-app/ui/SettingsPage.qml
+++ b/nymea-app/ui/SettingsPage.qml
@@ -7,8 +7,8 @@ import "components"
 
 Page {
     id: root
-    header: GuhHeader {
-        text: qsTr("Box settings")
+    header: NymeaHeader {
+        text: qsTr("System settings")
         backButtonVisible: true
         onBackPressed: pageStack.pop()
     }
@@ -29,7 +29,7 @@ Page {
                 Layout.fillWidth: true
                 Material.elevation: layout.isGrid ? 1 : 0
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/configure.svg"
                     text: qsTr("General")
@@ -45,11 +45,11 @@ Page {
                 Material.elevation: layout.isGrid ? 1 : 0
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/network-wifi.svg"
                     text: qsTr("Networking")
-                    subText: qsTr("Configure the box's network connection")
+                    subText: qsTr("Configure the system's network connection")
                     prominentSubText: false
                     wrapTexts: false
                     onClicked: pageStack.push(Qt.resolvedUrl("system/NetworkSettingsPage.qml"))
@@ -62,11 +62,11 @@ Page {
                 visible: engine.jsonRpcClient.ensureServerVersion("1.9")
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/cloud.svg"
                     text: qsTr("Cloud")
-                    subText: qsTr("Connect this box to %1:cloud").arg(app.systemName)
+                    subText: qsTr("Connect this %1:core to %1:cloud").arg(app.systemName)
                     prominentSubText: false
                     wrapTexts: false
                     onClicked: pageStack.push(Qt.resolvedUrl("system/CloudSettingsPage.qml"))
@@ -78,13 +78,13 @@ Page {
                 Material.elevation: layout.isGrid ? 1 : 0
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/network-vpn.svg"
                     text: qsTr("API interfaces")
                     prominentSubText: false
                     wrapTexts: false
-                    subText: qsTr("Configure how clients interact with this box")
+                    subText: qsTr("Configure how clients interact with this system")
                     onClicked: pageStack.push(Qt.resolvedUrl("system/ConnectionInterfacesPage.qml"))
                 }
             }
@@ -95,7 +95,7 @@ Page {
                 visible: engine.jsonRpcClient.ensureServerVersion("1.11")
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/mqtt.svg"
                     text: qsTr("MQTT broker")
@@ -111,7 +111,7 @@ Page {
                 Material.elevation: layout.isGrid ? 1 : 0
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/stock_website.svg"
                     text: qsTr("Web server")
@@ -128,7 +128,7 @@ Page {
                 Material.elevation: layout.isGrid ? 1 : 0
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/plugin.svg"
                     text: qsTr("Plugins")
@@ -144,7 +144,7 @@ Page {
                 Material.elevation: layout.isGrid ? 1 : 0
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/sdk.svg"
                     text: qsTr("Developer tools")
@@ -161,7 +161,7 @@ Page {
                 visible: engine.jsonRpcClient.ensureServerVersion("2.1") && engine.systemController.updateManagementAvailable
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/system-update.svg"
                     text: qsTr("System update")
@@ -177,7 +177,7 @@ Page {
                 Material.elevation: layout.isGrid ? 1 : 0
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/logs.svg"
                     text: qsTr("Log viewer")
@@ -193,7 +193,7 @@ Page {
                 Material.elevation: layout.isGrid ? 1 : 0
 
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/info.svg"
                     text: qsTr("About %1:core").arg(app.systemName)
diff --git a/nymea-app/ui/appsettings/AboutPage.qml b/nymea-app/ui/appsettings/AboutPage.qml
index 8e945169..037d96b6 100644
--- a/nymea-app/ui/appsettings/AboutPage.qml
+++ b/nymea-app/ui/appsettings/AboutPage.qml
@@ -7,7 +7,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("About %1").arg(app.appName)
         backButtonVisible: true
         onBackPressed: pageStack.pop()
@@ -23,14 +23,14 @@ Page {
             title: app.appName
             githubLink: "https://github.com/guh/nymea-app"
 
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 text: qsTr("App version:")
                 subText: appVersion
                 progressive: false
                 prominentSubText: false
             }
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 text: qsTr("Qt version:")
                 subText: qtVersion
diff --git a/nymea-app/ui/appsettings/AppLogPage.qml b/nymea-app/ui/appsettings/AppLogPage.qml
index 23d4f0ec..b7c7ad68 100644
--- a/nymea-app/ui/appsettings/AppLogPage.qml
+++ b/nymea-app/ui/appsettings/AppLogPage.qml
@@ -5,7 +5,7 @@ import Nymea 1.0
 import "../components"
 
 Page {
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("App log")
         backButtonVisible: true
         onBackPressed: pageStack.pop()
diff --git a/nymea-app/ui/appsettings/AppSettingsPage.qml b/nymea-app/ui/appsettings/AppSettingsPage.qml
index b1875b21..9b7aab4d 100644
--- a/nymea-app/ui/appsettings/AppSettingsPage.qml
+++ b/nymea-app/ui/appsettings/AppSettingsPage.qml
@@ -7,7 +7,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("App Settings")
         backButtonVisible: true
         onBackPressed: pageStack.pop()
@@ -29,7 +29,7 @@ Page {
                 Layout.fillWidth: true
                 Material.elevation: layout.isGrid ? 1 : 0
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     text: qsTr("Look & feel")
                     subText: qsTr("Customize the app's look and behavior")
@@ -44,10 +44,10 @@ Page {
                 Layout.fillWidth: true
                 Material.elevation: layout.isGrid ? 1 : 0
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     text: qsTr("Cloud login")
-                    subText: qsTr("Log into %1:cloud and manage connected boxes").arg(app.systemName)
+                    subText: qsTr("Log into %1:cloud and manage connected %1:core systems").arg(app.systemName)
                     iconName: "../images/cloud.svg"
                     prominentSubText: false
                     wrapTexts: false
@@ -59,7 +59,7 @@ Page {
                 Material.elevation: layout.isGrid ? 1 : 0
                 visible: settings.showHiddenOptions
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     text: qsTr("Developer options")
                     subText: qsTr("Yeehaaa!")
@@ -73,7 +73,7 @@ Page {
                 Layout.fillWidth: true
                 Material.elevation: layout.isGrid ? 1 : 0
                 padding: 0
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     width: parent.width
                     text: qsTr("About %1").arg(app.appName)
                     subText: qsTr("Find app versions and licence information")
diff --git a/nymea-app/ui/appsettings/CloudLoginPage.qml b/nymea-app/ui/appsettings/CloudLoginPage.qml
index 5bf12262..8d55de6d 100644
--- a/nymea-app/ui/appsettings/CloudLoginPage.qml
+++ b/nymea-app/ui/appsettings/CloudLoginPage.qml
@@ -6,7 +6,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Cloud login")
         onBackPressed: pageStack.pop()
     }
@@ -68,15 +68,15 @@ Page {
             Layout.rightMargin: app.margins
             wrapMode: Text.WordWrap
             text: AWSClient.awsDevices.count === 0 ?
-                      qsTr("There are no boxes connected to your cloud yet.") :
-                      qsTr("There are %n boxes connected to your cloud.", "", AWSClient.awsDevices.count)
+                      qsTr("There are no %1:core systems connected to your cloud yet.").arg(app.systemName) :
+                      qsTr("There are %n %1:core systems connected to your cloud.", "", AWSClient.awsDevices.count).arg(app.systemName)
         }
         ListView {
             Layout.fillWidth: true
             Layout.fillHeight: true
             clip: true
             model: AWSClient.awsDevices
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 width: parent.width
                 text: model.name
                 subText: model.id
@@ -109,7 +109,7 @@ Page {
     MeaDialog {
         id: logoutDialog
         title: qsTr("Goodbye")
-        text: qsTr("Sorry to see you go. If you log out you won't be able to connect to %1 boxes remotely any more. However, you can come back any time, we'll keep your user account. If you whish to completely delete your account and all the data associated with it, check the box below before hitting ok. If you decide to delete your account, all your personal information will be removed from %1:cloud and cannot be restored.").arg(app.systemName)
+        text: qsTr("Sorry to see you go. If you log out you won't be able to connect to %1:core systems remotely any more. However, you can come back any time, we'll keep your user account. If you whish to completely delete your account and all the data associated with it, check the box below before hitting ok. If you decide to delete your account, all your personal information will be removed from %1:cloud and cannot be restored.").arg(app.systemName)
         headerIcon: "../images/dialog-warning-symbolic.svg"
         standardButtons: Dialog.Cancel | Dialog.Ok
 
@@ -147,7 +147,7 @@ Page {
                 Layout.fillWidth: true
                 Layout.leftMargin: app.margins; Layout.rightMargin: app.margins; Layout.topMargin: app.margins
                 wrapMode: Text.WordWrap
-                text: qsTr("Log in to %1:cloud in order to connect to %1 boxes from anywhere.").arg(app.systemName)
+                text: qsTr("Log in to %1:cloud in order to connect to %1:core systems from anywhere.").arg(app.systemName)
             }
             Label {
                 Layout.fillWidth: true
@@ -262,7 +262,7 @@ Page {
         id: signupPageComponent
         Page {
             id: signupPage
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Sign up")
                 onBackPressed: pageStack.pop()
             }
@@ -373,7 +373,7 @@ Page {
     Component {
         id: enterCodeComponent
         Page {
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Confirm account")
                 onBackPressed: pageStack.pop()
             }
@@ -442,7 +442,7 @@ Page {
 
             property alias email: emailTextField.text
 
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Reset password")
                 onBackPressed: pageStack.pop()
             }
@@ -528,7 +528,7 @@ Page {
             }
 
             property string email
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Reset password")
                 onBackPressed: pageStack.pop()
             }
diff --git a/nymea-app/ui/appsettings/DeveloperOptionsPage.qml b/nymea-app/ui/appsettings/DeveloperOptionsPage.qml
index 1e0fb6cb..7657bfd3 100644
--- a/nymea-app/ui/appsettings/DeveloperOptionsPage.qml
+++ b/nymea-app/ui/appsettings/DeveloperOptionsPage.qml
@@ -6,7 +6,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Developer options")
         backButtonVisible: true
         onBackPressed: pageStack.pop()
@@ -40,7 +40,7 @@ Page {
             Layout.fillWidth: true
         }
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             text: qsTr("View log")
             onClicked: pageStack.push(Qt.resolvedUrl("../appsettings/AppLogPage.qml"))
diff --git a/nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml b/nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml
index 46c2c783..88a15b89 100644
--- a/nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml
+++ b/nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml
@@ -7,7 +7,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Look and feel")
         backButtonVisible: true
         onBackPressed: pageStack.pop()
diff --git a/nymea-app/ui/components/Imprint.qml b/nymea-app/ui/components/Imprint.qml
index 96f83cf1..1d381a0f 100644
--- a/nymea-app/ui/components/Imprint.qml
+++ b/nymea-app/ui/components/Imprint.qml
@@ -92,7 +92,7 @@ Item {
         ColumnLayout {
             Layout.fillWidth: true
 
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 iconName: "../images/stock_website.svg"
                 text: qsTr("Visit the nymea website")
@@ -104,7 +104,7 @@ Item {
                 }
             }
 
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 iconName: "../images/stock_website.svg"
                 text: qsTr("Visit GitHub page")
@@ -116,7 +116,7 @@ Item {
                 }
             }
 
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 text: qsTr("View privacy policy")
                 iconName: "../images/stock_website.svg"
@@ -128,7 +128,7 @@ Item {
                 }
             }
 
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 text: qsTr("View license text")
                 iconName: "../images/logs.svg"
@@ -164,7 +164,7 @@ Item {
                 wrapMode: Text.WordWrap
             }
         }
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             iconName: "../images/stock_website.svg"
             text: qsTr("Visit the Qt website")
@@ -181,7 +181,7 @@ Item {
     Component {
         id: licenseTextComponent
         Page {
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("License text")
                 onBackPressed: pageStack.pop()
             }
diff --git a/nymea-app/ui/components/GuhHeader.qml b/nymea-app/ui/components/NymeaHeader.qml
similarity index 100%
rename from nymea-app/ui/components/GuhHeader.qml
rename to nymea-app/ui/components/NymeaHeader.qml
diff --git a/nymea-app/ui/components/MeaListItemDelegate.qml b/nymea-app/ui/components/NymeaListItemDelegate.qml
similarity index 100%
rename from nymea-app/ui/components/MeaListItemDelegate.qml
rename to nymea-app/ui/components/NymeaListItemDelegate.qml
diff --git a/nymea-app/ui/components/RemoveDeviceMethodDialog.qml b/nymea-app/ui/components/RemoveDeviceMethodDialog.qml
index 08f894ee..6daa711a 100644
--- a/nymea-app/ui/components/RemoveDeviceMethodDialog.qml
+++ b/nymea-app/ui/components/RemoveDeviceMethodDialog.qml
@@ -38,7 +38,7 @@ Dialog {
         }
         ThinDivider {}
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             text: qsTr("Remove all those rules")
             progressive: false
@@ -49,7 +49,7 @@ Dialog {
             }
         }
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             text: qsTr("Update rules, removing this thing")
             Layout.fillWidth: true
             progressive: false
@@ -60,7 +60,7 @@ Dialog {
             }
         }
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             text: qsTr("Don't remove this thing")
             Layout.fillWidth: true
             progressive: false
diff --git a/nymea-app/ui/connection/CertificateDialog.qml b/nymea-app/ui/connection/CertificateDialog.qml
index 0ca054ee..0b4add0c 100644
--- a/nymea-app/ui/connection/CertificateDialog.qml
+++ b/nymea-app/ui/connection/CertificateDialog.qml
@@ -47,13 +47,13 @@ Dialog {
         Label {
             Layout.fillWidth: true
             wrapMode: Text.WordWrap
-            text: certDialog.hasOldFingerprint ? qsTr("The certificate of this %1 box has changed!").arg(app.systemName) : qsTr("It seems this is the first time you connect to this %1 box.").arg(app.systemName)
+            text: certDialog.hasOldFingerprint ? qsTr("The certificate of this %1:core has changed!").arg(app.systemName) : qsTr("It seems this is the first time you connect to this %1:core.").arg(app.systemName)
         }
 
         Label {
             Layout.fillWidth: true
             wrapMode: Text.WordWrap
-            text: certDialog.hasOldFingerprint ? qsTr("Did you change the box's configuration? Verify if this information is correct.") : qsTr("This is the box's certificate. Once you trust it, an encrypted connection will be established.")
+            text: certDialog.hasOldFingerprint ? qsTr("Did you change the system's configuration? Verify if this information is correct.") : qsTr("This is the certificate for this %1:core. Once you trust it, an encrypted connection will be established.").arg(app.systemName)
         }
 
         ThinDivider {}
diff --git a/nymea-app/ui/connection/ConnectPage.qml b/nymea-app/ui/connection/ConnectPage.qml
index eb025bc3..60889473 100644
--- a/nymea-app/ui/connection/ConnectPage.qml
+++ b/nymea-app/ui/connection/ConnectPage.qml
@@ -108,9 +108,9 @@ Page {
                     Label {
                         Layout.fillWidth: true
                         text: root.haveHosts ?
-                                  qsTr("There are %1 %2 boxes in your network! Which one would you like to use?").arg(hostsProxy.count).arg(app.systemName)
-                                : startupTimer.running ? qsTr("We haven't found any %1 boxes in your network yet.").arg(app.systemName)
-                                                       : qsTr("There doesn't seem to be a %1 box installed in your network. Please make sure your %1 box is correctly set up and connected.").arg(app.systemName)
+                                  qsTr("There are %1 %2:cores in your network! Which one would you like to use?").arg(hostsProxy.count).arg(app.systemName)
+                                : startupTimer.running ? qsTr("We haven't found a %1:core in your network yet.").arg(app.systemName)
+                                                       : qsTr("There doesn't seem to be a %1:core installed in your network. Please make sure your %1:core system is correctly set up and connected.").arg(app.systemName)
                         wrapMode: Text.WordWrap
                     }
                 }
@@ -123,7 +123,7 @@ Page {
                     model: hostsProxy
                     clip: true
 
-                    delegate: MeaListItemDelegate {
+                    delegate: NymeaListItemDelegate {
                         id: nymeaHostDelegate
                         width: parent.width
                         height: app.delegateHeight
@@ -203,7 +203,7 @@ Page {
                         visible: !root.haveHosts
 
                         Label {
-                            text: qsTr("Searching for %1 boxes...").arg(app.systemName)
+                            text: qsTr("Searching for %1:core systems...").arg(app.systemName)
                         }
 
                         BusyIndicator {
@@ -221,7 +221,7 @@ Page {
                     Layout.rightMargin: app.margins
                     wrapMode: Text.WordWrap
                     visible: discovery.nymeaHosts.count === 0
-                    text: qsTr("Do you have a %1 box but it's not connected to your network yet? Use the wireless setup to connect it!").arg(app.systemName)
+                    text: qsTr("Do you have a %1:core but it's not connected to your network yet? Use the wireless setup to connect it!").arg(app.systemName)
                 }
                 Button {
                     Layout.fillWidth: true
@@ -356,7 +356,7 @@ Page {
                         width: parent.width
                         Repeater {
                             model: dialog.nymeaHost.connections
-                            delegate: MeaListItemDelegate {
+                            delegate: NymeaListItemDelegate {
                                 Layout.fillWidth: true
                                 wrapTexts: false
                                 progressive: false
diff --git a/nymea-app/ui/connection/ConnectingPage.qml b/nymea-app/ui/connection/ConnectingPage.qml
index 40258b07..137743aa 100644
--- a/nymea-app/ui/connection/ConnectingPage.qml
+++ b/nymea-app/ui/connection/ConnectingPage.qml
@@ -65,7 +65,7 @@ Page {
                     errorMessage = qsTr("It seems you're not connected to the network.");
                     break;
                 case NymeaConnection.ConnectionStatusHostNotFound:
-                    errorMessage = qsTr("%1:core could not be found on this address. Please make sure you entered the address correctly and that the box is powered on.").arg(app.systemName);
+                    errorMessage = qsTr("%1:core could not be found on this address. Please make sure you entered the address correctly and that the system is powered on.").arg(app.systemName);
                     break;
                 case NymeaConnection.ConnectionStatusConnectionRefused:
                     errorMessage = qsTr("The host has rejected our connection. This probably means that %1 is not running on this host. Perhaps it's restarting?").arg(app.systemName);
diff --git a/nymea-app/ui/connection/LoginPage.qml b/nymea-app/ui/connection/LoginPage.qml
index 08c3ec07..b5baef09 100644
--- a/nymea-app/ui/connection/LoginPage.qml
+++ b/nymea-app/ui/connection/LoginPage.qml
@@ -8,7 +8,7 @@ Page {
     id: root
     signal backPressed();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Welcome to %1!").arg(app.systemName)
         backButtonVisible: true
         onBackPressed: root.backPressed()
@@ -40,7 +40,7 @@ Page {
                 message = qsTr("The password you've chose is too weak.")
                 break;
             case "UserErrorBackendError":
-                message = qsTr("An error happened with the user storage. Please make sure your %1 box is installed correctly.")
+                message = qsTr("An error happened with the user storage. Please make sure your %1:core system is installed correctly.").arg(app.systemName)
                 break;
             }
             var popup = errorDialog.createObject(root, {text: message});
@@ -72,7 +72,7 @@ Page {
                 Label {
                     Layout.fillWidth: true
                     text: engine.jsonRpcClient.initialSetupRequired ?
-                              qsTr("In order to use your %1 system, please enter your email address and set a password for your %1 box.").arg(app.systemName)
+                              qsTr("In order to use your %1 system, please enter your email address and set a password for it.").arg(app.systemName)
                             : qsTr("In order to use your %1 system, please log in.").arg(app.systemName)
                     wrapMode: Text.WordWrap
                 }
diff --git a/nymea-app/ui/connection/ManualConnectPage.qml b/nymea-app/ui/connection/ManualConnectPage.qml
index d9492811..9e7e1d5d 100644
--- a/nymea-app/ui/connection/ManualConnectPage.qml
+++ b/nymea-app/ui/connection/ManualConnectPage.qml
@@ -7,7 +7,7 @@ import "../components"
 Page {
     id: root
     objectName: "manualConnectPage"
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Manual connection")
         onBackPressed: pageStack.pop()
     }
diff --git a/nymea-app/ui/connection/SetupWizard.qml b/nymea-app/ui/connection/SetupWizard.qml
index 0085a384..406026d9 100644
--- a/nymea-app/ui/connection/SetupWizard.qml
+++ b/nymea-app/ui/connection/SetupWizard.qml
@@ -8,7 +8,7 @@ Page {
     id: root
     signal backPressed();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("First setup")
         backButtonVisible: true
         onBackPressed: root.backPressed()
diff --git a/nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml b/nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml
index 37022d68..c48a4b44 100644
--- a/nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml
+++ b/nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml
@@ -6,7 +6,7 @@ import Nymea 1.0
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Wireless Box setup")
         onBackPressed: pageStack.pop()
     }
@@ -71,7 +71,7 @@ Page {
             Layout.margins: app.margins
             Label {
                 Layout.fillWidth: true
-                text: qsTr("Searching for %1 boxes.").arg(app.systemName)
+                text: qsTr("Searching for %1:core systems.").arg(app.systemName)
                 wrapMode: Text.WordWrap
             }
             BusyIndicator {
@@ -87,7 +87,7 @@ Page {
             model: bluetoothDiscovery.deviceInfos
             clip: true
 
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 width: parent.width
                 iconName: Qt.resolvedUrl("../../images/bluetooth.svg")
                 text: model.name
@@ -112,7 +112,7 @@ Page {
                 wrapMode: Text.WordWrap
                 maximumLineCount: 2
                 elide: Text.ElideRight
-                text: qsTr("Troubles finding your box?")
+                text: qsTr("Troubles finding your %1:core?").arg(app.systemName)
             }
             Button {
                 text: qsTr("Help")
@@ -148,7 +148,7 @@ Page {
         id: helpPageComponent
         Page {
             id: helpPage
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Wireless setup help")
                 onBackPressed: pageStack.pop()
             }
@@ -194,7 +194,7 @@ Page {
                         Layout.rightMargin: app.margins
                         wrapMode: Text.WordWrap
                         font.bold: true
-                        text: "%1 box".arg(systemName)
+                        text: qsTr("%1 box").arg(systemName)
                     }
                     Label {
                         Layout.fillWidth: true
@@ -223,7 +223,7 @@ Page {
 
         Page {
             id: connectingPage
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Connecting...")
                 onBackPressed: pageStack.pop()
             }
diff --git a/nymea-app/ui/connection/wifisetup/BoxInfoPage.qml b/nymea-app/ui/connection/wifisetup/BoxInfoPage.qml
index 71420d7d..58952482 100644
--- a/nymea-app/ui/connection/wifisetup/BoxInfoPage.qml
+++ b/nymea-app/ui/connection/wifisetup/BoxInfoPage.qml
@@ -6,7 +6,7 @@ import Nymea 1.0
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Box information")
         onBackPressed: pageStack.pop()
     }
@@ -16,31 +16,31 @@ Page {
     ColumnLayout {
         anchors { left: parent.left; top: parent.top; right: parent.right }
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             progressive: false
             text: qsTr("System UUID")
             subText: networkManagerController.manager.modelNumber
         }
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             progressive: false
             text: qsTr("Manufacturer")
             subText: networkManagerController.manager.manufacturer
         }
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             progressive: false
             text: qsTr("Software revision")
             subText: networkManagerController.manager.softwareRevision
         }
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             progressive: false
             text: qsTr("Firmware revision")
             subText: networkManagerController.manager.firmwareRevision
         }
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             progressive: false
             text: qsTr("Hardware revision")
diff --git a/nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml b/nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml
index 92228db7..24e1fbfe 100644
--- a/nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml
+++ b/nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml
@@ -11,7 +11,7 @@ Page {
 
     signal connected();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Select wireless network")
         onBackPressed: {
             pageStack.pop();
@@ -43,7 +43,7 @@ Page {
             }
             clip: true
 
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 width: parent.width
                 text: model.ssid
                 enabled: !networkManagerController.manager.working
@@ -97,7 +97,7 @@ Page {
         id: authenticationPageComponent
         Page {
             id: authenticationPage
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Authenticate")
                 onBackPressed: pageStack.pop()
             }
@@ -196,7 +196,7 @@ Page {
                     Layout.fillWidth: true
                     wrapMode: Text.WordWrap
                     horizontalAlignment: Text.AlignHCenter
-                    text: qsTr("Connecting the %1 box to %2").arg(app.systemName).arg(connectingWifiWaitPage.ssid)
+                    text: qsTr("Connecting the %1:core to %2").arg(app.systemName).arg(connectingWifiWaitPage.ssid)
                 }
             }
         }
diff --git a/nymea-app/ui/connection/wifisetup/NetworkSettingsPage.qml b/nymea-app/ui/connection/wifisetup/NetworkSettingsPage.qml
index 90b5b9b5..58a5cf61 100644
--- a/nymea-app/ui/connection/wifisetup/NetworkSettingsPage.qml
+++ b/nymea-app/ui/connection/wifisetup/NetworkSettingsPage.qml
@@ -6,7 +6,7 @@ import Nymea 1.0
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Network settings")
         onBackPressed: pageStack.pop()
     }
diff --git a/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml b/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml
index f9900ae6..066f4825 100644
--- a/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml
+++ b/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml
@@ -12,7 +12,7 @@ Page {
 
     signal done()
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Wireless network setup")
         onBackPressed: {
             pageStack.pop();
@@ -92,7 +92,7 @@ Page {
             Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
             wrapMode: Text.WordWrap
             text: root.networkManagerController.manager.currentConnection
-                  ? qsTr("Your %1 box is connected to %2").arg(app.systemName).arg(root.networkManagerController.manager.currentConnection.ssid)
+                  ? qsTr("Your %1:core is connected to %2").arg(app.systemName).arg(root.networkManagerController.manager.currentConnection.ssid)
                   : ""
         }
 
@@ -109,7 +109,7 @@ Page {
             spacing: app.margins
             Label {
                 Layout.fillWidth: true
-                text: qsTr("Waiting for the %1 box to appear in your network.").arg(app.systemName)
+                text: qsTr("Waiting for the %1:core to appear in your network.").arg(app.systemName)
                 wrapMode: Text.WordWrap
             }
             BusyIndicator { }
@@ -120,7 +120,7 @@ Page {
             visible: url != ""
             Layout.fillWidth: true
             Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
-            text: qsTr("Connect to box")
+            text: qsTr("Connect to %1:core").arg(app.systemName)
             property string url
             onClicked: {
                 engine.connection.connect(url)
diff --git a/nymea-app/ui/delegates/ThingDelegate.qml b/nymea-app/ui/delegates/ThingDelegate.qml
index 8dbfc75b..6e5dd7ae 100644
--- a/nymea-app/ui/delegates/ThingDelegate.qml
+++ b/nymea-app/ui/delegates/ThingDelegate.qml
@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.2
 import "../components"
 import Nymea 1.0
 
-MeaListItemDelegate {
+NymeaListItemDelegate {
     id: root
     width: parent.width
     iconName: deviceClass ? app.interfacesToIcon(deviceClass.interfaces) : ""
diff --git a/nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml b/nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml
index 22a51267..892043a6 100644
--- a/nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml
+++ b/nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml
@@ -13,7 +13,7 @@ DeviceListPageBase {
 
     property bool invertControls: false
 
-    header: GuhHeader {
+    header: NymeaHeader {
         id: header
         onBackPressed: pageStack.pop()
         text: root.title
diff --git a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
index f014ed77..6204fbb8 100644
--- a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
+++ b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
@@ -8,7 +8,7 @@ import "../delegates"
 DeviceListPageBase {
     id: root
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: {
             if (root.shownInterfaces.length === 1) {
                 return qsTr("My %1").arg(app.interfaceToString(root.shownInterfaces[0]))
diff --git a/nymea-app/ui/devicelistpages/LightsDeviceListPage.qml b/nymea-app/ui/devicelistpages/LightsDeviceListPage.qml
index facc4476..922629fc 100644
--- a/nymea-app/ui/devicelistpages/LightsDeviceListPage.qml
+++ b/nymea-app/ui/devicelistpages/LightsDeviceListPage.qml
@@ -8,7 +8,7 @@ import "../components"
 
 DeviceListPageBase {
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Lights")
         onBackPressed: pageStack.pop()
 
diff --git a/nymea-app/ui/devicelistpages/PowerSocketsDeviceListPage.qml b/nymea-app/ui/devicelistpages/PowerSocketsDeviceListPage.qml
index 6de2cab5..e18db223 100644
--- a/nymea-app/ui/devicelistpages/PowerSocketsDeviceListPage.qml
+++ b/nymea-app/ui/devicelistpages/PowerSocketsDeviceListPage.qml
@@ -9,7 +9,7 @@ import QtQuick.Controls.Material 2.1
 DeviceListPageBase {
     id: root
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("My %1").arg(app.interfaceToString("powersocket"))
 
         onBackPressed: {
diff --git a/nymea-app/ui/devicelistpages/SensorsDeviceListPage.qml b/nymea-app/ui/devicelistpages/SensorsDeviceListPage.qml
index 8ca43278..aafb4ce0 100644
--- a/nymea-app/ui/devicelistpages/SensorsDeviceListPage.qml
+++ b/nymea-app/ui/devicelistpages/SensorsDeviceListPage.qml
@@ -8,7 +8,7 @@ import "../components"
 DeviceListPageBase {
     id: root
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Sensors")
         onBackPressed: pageStack.pop()
     }
diff --git a/nymea-app/ui/devicelistpages/SmartMeterDeviceListPage.qml b/nymea-app/ui/devicelistpages/SmartMeterDeviceListPage.qml
index 69aca325..2d808626 100644
--- a/nymea-app/ui/devicelistpages/SmartMeterDeviceListPage.qml
+++ b/nymea-app/ui/devicelistpages/SmartMeterDeviceListPage.qml
@@ -8,7 +8,7 @@ import "../components"
 DeviceListPageBase {
     id: root
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Smart meters")
         onBackPressed: pageStack.pop()
     }
diff --git a/nymea-app/ui/devicelistpages/WeatherDeviceListPage.qml b/nymea-app/ui/devicelistpages/WeatherDeviceListPage.qml
index 3b85b3d9..565c0b32 100644
--- a/nymea-app/ui/devicelistpages/WeatherDeviceListPage.qml
+++ b/nymea-app/ui/devicelistpages/WeatherDeviceListPage.qml
@@ -9,7 +9,7 @@ import "../customviews"
 DeviceListPageBase {
     id: root
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Weather")
         onBackPressed: pageStack.pop()
     }
diff --git a/nymea-app/ui/devicepages/DeviceLogPage.qml b/nymea-app/ui/devicepages/DeviceLogPage.qml
index 01b00219..27086dcb 100644
--- a/nymea-app/ui/devicepages/DeviceLogPage.qml
+++ b/nymea-app/ui/devicepages/DeviceLogPage.qml
@@ -12,7 +12,7 @@ Page {
     property Device device: null
     property var filterTypeIds: []
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("History for %1").arg(root.device.name)
         onBackPressed: pageStack.pop()
 
diff --git a/nymea-app/ui/devicepages/DevicePageBase.qml b/nymea-app/ui/devicepages/DevicePageBase.qml
index 7a142f68..aec021f7 100644
--- a/nymea-app/ui/devicepages/DevicePageBase.qml
+++ b/nymea-app/ui/devicepages/DevicePageBase.qml
@@ -14,7 +14,7 @@ Page {
 
     default property alias data: contentItem.data
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: device.name
         onBackPressed: pageStack.pop()
 
diff --git a/nymea-app/ui/devicepages/FingerprintReaderDevicePage.qml b/nymea-app/ui/devicepages/FingerprintReaderDevicePage.qml
index d3d51c5f..97da6563 100644
--- a/nymea-app/ui/devicepages/FingerprintReaderDevicePage.qml
+++ b/nymea-app/ui/devicepages/FingerprintReaderDevicePage.qml
@@ -55,7 +55,7 @@ DevicePageBase {
                 typeIds: [root.accessGrantedEventType.id, root.accessDeniedEventType.id];
             }
 
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 width: parent.width
                 iconName: accessGranted ? "../images/tick.svg" : "../images/dialog-error-symbolic.svg"
                 iconColor: accessGranted ? "green" : "red"
@@ -77,7 +77,7 @@ DevicePageBase {
     Component {
         id: manageUsersComponent
         Page {
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Manage users")
                 onBackPressed: pageStack.pop()
 
@@ -104,7 +104,7 @@ DevicePageBase {
                     clip: true
                     model: root.usersState.value
 
-                    delegate: MeaListItemDelegate {
+                    delegate: NymeaListItemDelegate {
                         text: modelData
                         width: parent.width
                         progressive: false
@@ -156,7 +156,7 @@ DevicePageBase {
         id: addUserComponent
         Page {
             id: addUserPage
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Add a new fingerprint")
                 onBackPressed: pageStack.pop()
             }
diff --git a/nymea-app/ui/devicepages/InputTriggerDevicePage.qml b/nymea-app/ui/devicepages/InputTriggerDevicePage.qml
index eb8eaeca..3b252d12 100644
--- a/nymea-app/ui/devicepages/InputTriggerDevicePage.qml
+++ b/nymea-app/ui/devicepages/InputTriggerDevicePage.qml
@@ -29,7 +29,7 @@ DevicePageBase {
             typeIds: [root.deviceClass.eventTypes.findByName("triggered").id];
         }
 
-//        delegate: MeaListItemDelegate {
+//        delegate: NymeaListItemDelegate {
 //            width: parent.width
 //            iconName: app.interfaceToIcon("inputtrigger")
 //            text: model.value.trim()
diff --git a/nymea-app/ui/devicepages/NotificationsDevicePage.qml b/nymea-app/ui/devicepages/NotificationsDevicePage.qml
index 4ee79901..6c8f6156 100644
--- a/nymea-app/ui/devicepages/NotificationsDevicePage.qml
+++ b/nymea-app/ui/devicepages/NotificationsDevicePage.qml
@@ -101,7 +101,7 @@ DevicePageBase {
                 typeIds: [root.deviceClass.actionTypes.findByName("notify").id];
             }
 
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 width: parent.width
                 iconName: app.interfaceToIcon("notifications")
                 text: model.value.trim()
diff --git a/nymea-app/ui/devicepages/StateLogPage.qml b/nymea-app/ui/devicepages/StateLogPage.qml
index a3c2a5fe..195e868d 100644
--- a/nymea-app/ui/devicepages/StateLogPage.qml
+++ b/nymea-app/ui/devicepages/StateLogPage.qml
@@ -24,7 +24,7 @@ Page {
         return false;
     }
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("History for %1").arg(root.stateType.displayName)
         onBackPressed: pageStack.pop()
     }
diff --git a/nymea-app/ui/magic/CalendarItemDelegate.qml b/nymea-app/ui/magic/CalendarItemDelegate.qml
index 079e0974..1e7aacc4 100644
--- a/nymea-app/ui/magic/CalendarItemDelegate.qml
+++ b/nymea-app/ui/magic/CalendarItemDelegate.qml
@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
 import Nymea 1.0
 import "../components"
 
-MeaListItemDelegate {
+NymeaListItemDelegate {
     id: root
     implicitHeight: app.delegateHeight
     progressive: false
diff --git a/nymea-app/ui/magic/ComposeEventDescriptorPage.qml b/nymea-app/ui/magic/ComposeEventDescriptorPage.qml
index 866f46d2..ff716a76 100644
--- a/nymea-app/ui/magic/ComposeEventDescriptorPage.qml
+++ b/nymea-app/ui/magic/ComposeEventDescriptorPage.qml
@@ -8,7 +8,7 @@ Page {
     id: root
     property var device: null
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Select event")
     }
 
diff --git a/nymea-app/ui/magic/DeviceRulesPage.qml b/nymea-app/ui/magic/DeviceRulesPage.qml
index 10410e4d..7a3f886f 100644
--- a/nymea-app/ui/magic/DeviceRulesPage.qml
+++ b/nymea-app/ui/magic/DeviceRulesPage.qml
@@ -12,7 +12,7 @@ Page {
     Component.onCompleted: print("+++ created devicerulespage")
     Component.onDestruction: print("--- destroying devicerulespage")
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Magic involving %1").arg(root.device.name)
         onBackPressed: pageStack.pop()
 
@@ -110,7 +110,7 @@ Page {
             filterDeviceId: root.device.id
         }
 
-        delegate: MeaListItemDelegate {
+        delegate: NymeaListItemDelegate {
             width: parent.width
             iconName: "../images/magic.svg"
             iconColor: !model.enabled ? "red" : (model.active ? app.accentColor : "grey")
diff --git a/nymea-app/ui/magic/EditCalendarItemPage.qml b/nymea-app/ui/magic/EditCalendarItemPage.qml
index 2ce7b3ac..f49f838e 100644
--- a/nymea-app/ui/magic/EditCalendarItemPage.qml
+++ b/nymea-app/ui/magic/EditCalendarItemPage.qml
@@ -18,7 +18,7 @@ Page {
     readonly property bool isWeekDayBased: repeatingBox.currentIndex === 3
     readonly property bool isMonthDayBased: repeatingBox.currentIndex === 4
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Pick a time frame")
         onBackPressed: root.backPressed();
     }
diff --git a/nymea-app/ui/magic/EditRulePage.qml b/nymea-app/ui/magic/EditRulePage.qml
index 706589f8..9a257fbc 100644
--- a/nymea-app/ui/magic/EditRulePage.qml
+++ b/nymea-app/ui/magic/EditRulePage.qml
@@ -221,7 +221,7 @@ Page {
         })
     }
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: root.rule.name.length === 0 ? qsTr("Add new magic") : qsTr("Edit %1").arg(root.rule.name)
         onBackPressed: {
             if (root.rule.compare(d.backupRule)) {
@@ -679,7 +679,7 @@ Page {
     Component {
         id: eventQuestionPageComponent
         Page {
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Add event")
                 onBackPressed: pageStack.pop()
             }
@@ -708,7 +708,7 @@ Page {
                             minimumJsonRpcVersion: "1.0"
                         }
                     }
-                    delegate: MeaListItemDelegate {
+                    delegate: NymeaListItemDelegate {
                         Layout.fillWidth: true
                         iconName: model.iconName
                         text: model.text
@@ -728,7 +728,7 @@ Page {
     Component {
         id: stateQuestionPageComponent
         Page {
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Add condition...")
 
                 onBackPressed: pageStack.pop()
@@ -758,7 +758,7 @@ Page {
                             minimumJsonRpcVersion: "1.0"
                         }
                     }
-                    delegate: MeaListItemDelegate {
+                    delegate: NymeaListItemDelegate {
                         Layout.fillWidth: true
                         iconName: model.iconName
                         text: model.text
@@ -781,7 +781,7 @@ Page {
             id: ruleActionQuestionPage
             property bool exitAction: false
 
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Add action...")
 
                 onBackPressed: pageStack.pop()
@@ -821,7 +821,7 @@ Page {
                             minimumJsonRpcVersion: "1.5"
                         }
                     }
-                    delegate: MeaListItemDelegate {
+                    delegate: NymeaListItemDelegate {
                         Layout.fillWidth: true
                         iconName: model.iconName
                         text: model.text
diff --git a/nymea-app/ui/magic/EditStateEvaluatorPage.qml b/nymea-app/ui/magic/EditStateEvaluatorPage.qml
index 84b00059..703005bf 100644
--- a/nymea-app/ui/magic/EditStateEvaluatorPage.qml
+++ b/nymea-app/ui/magic/EditStateEvaluatorPage.qml
@@ -6,7 +6,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Conditions")
         onBackPressed: pageStack.pop()
     }
diff --git a/nymea-app/ui/magic/EditTimeEventItemPage.qml b/nymea-app/ui/magic/EditTimeEventItemPage.qml
index 93c1a77b..b16aab9a 100644
--- a/nymea-app/ui/magic/EditTimeEventItemPage.qml
+++ b/nymea-app/ui/magic/EditTimeEventItemPage.qml
@@ -18,7 +18,7 @@ Page {
     readonly property bool isWeekDayBased: repeatingBox.currentIndex === 3
     readonly property bool isMonthDayBased: repeatingBox.currentIndex === 4
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Pick a time")
         onBackPressed: root.backPressed();
     }
diff --git a/nymea-app/ui/magic/EventDescriptorDelegate.qml b/nymea-app/ui/magic/EventDescriptorDelegate.qml
index 63ba021a..49ec8592 100644
--- a/nymea-app/ui/magic/EventDescriptorDelegate.qml
+++ b/nymea-app/ui/magic/EventDescriptorDelegate.qml
@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
 import Nymea 1.0
 import "../components"
 
-MeaListItemDelegate {
+NymeaListItemDelegate {
     id: root
     implicitHeight: app.delegateHeight
     canDelete: true
diff --git a/nymea-app/ui/magic/NewThingMagicPage.qml b/nymea-app/ui/magic/NewThingMagicPage.qml
index fc8e4390..f0cb8022 100644
--- a/nymea-app/ui/magic/NewThingMagicPage.qml
+++ b/nymea-app/ui/magic/NewThingMagicPage.qml
@@ -351,7 +351,7 @@ Page {
         }
     }
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("New magic")
         onBackPressed: root.done()
     }
@@ -366,7 +366,7 @@ Page {
                 ruleTemplates: RuleTemplates {}
                 filterInterfaceNames: root.deviceClass ? root.deviceClass.interfaces : []
             }
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 width: parent.width
                 text: model.description
 
diff --git a/nymea-app/ui/magic/RuleActionDelegate.qml b/nymea-app/ui/magic/RuleActionDelegate.qml
index 68fcf558..e45bec6c 100644
--- a/nymea-app/ui/magic/RuleActionDelegate.qml
+++ b/nymea-app/ui/magic/RuleActionDelegate.qml
@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
 import Nymea 1.0
 import "../components"
 
-MeaListItemDelegate {
+NymeaListItemDelegate {
     id: root
     implicitHeight: app.delegateHeight
     canDelete: true
diff --git a/nymea-app/ui/magic/SelectActionPage.qml b/nymea-app/ui/magic/SelectActionPage.qml
index f8ff42fd..3dd0f4c7 100644
--- a/nymea-app/ui/magic/SelectActionPage.qml
+++ b/nymea-app/ui/magic/SelectActionPage.qml
@@ -15,7 +15,7 @@ Page {
     property var actions: []
     signal complete();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: "Select action"
         onBackPressed: pageStack.pop()
     }
@@ -90,7 +90,7 @@ Page {
     Component {
         id: selectDeviceComponent
         Page {
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Select device")
                 onBackPressed: pageStack.pop()
             }
@@ -127,7 +127,7 @@ Page {
             property var device
             readonly property var deviceClass: engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId)
 
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Select action")
                 onBackPressed: pageStack.pop()
             }
@@ -174,7 +174,7 @@ Page {
             id: page
             property var device
             property var actionType
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("params")
                 onBackPressed: pageStack.pop()
             }
@@ -222,7 +222,7 @@ Page {
     Component {
         id: switchLightsCompoent
         Page {
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Switch lights")
                 onBackPressed: pageStack.pop()
             }
@@ -301,7 +301,7 @@ Page {
     Component {
         id: notificationActionComponent
         Page {
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Send notification")
                 onBackPressed: pageStack.pop()
             }
diff --git a/nymea-app/ui/magic/SelectEventDescriptorPage.qml b/nymea-app/ui/magic/SelectEventDescriptorPage.qml
index ae1b327f..aaa1de69 100644
--- a/nymea-app/ui/magic/SelectEventDescriptorPage.qml
+++ b/nymea-app/ui/magic/SelectEventDescriptorPage.qml
@@ -19,7 +19,7 @@ Page {
     onEventDescriptorChanged: buildInterface()
     Component.onCompleted: buildInterface()
 
-    header: GuhHeader {
+    header: NymeaHeader {
         id: header
         onBackPressed: root.backPressed();
 
diff --git a/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml b/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml
index 97ab94ff..50bc73a6 100644
--- a/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml
+++ b/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml
@@ -18,7 +18,7 @@ Page {
     signal backPressed();
     signal completed();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: "Options"
         onBackPressed: root.backPressed();
     }
diff --git a/nymea-app/ui/magic/SelectRuleActionPage.qml b/nymea-app/ui/magic/SelectRuleActionPage.qml
index b4305e82..6062b28a 100644
--- a/nymea-app/ui/magic/SelectRuleActionPage.qml
+++ b/nymea-app/ui/magic/SelectRuleActionPage.qml
@@ -22,7 +22,7 @@ Page {
     onRuleActionChanged: buildInterface()
     Component.onCompleted: buildInterface()
 
-    header: GuhHeader {
+    header: NymeaHeader {
         id: header
         onBackPressed: root.backPressed();
 
diff --git a/nymea-app/ui/magic/SelectRuleActionParamsPage.qml b/nymea-app/ui/magic/SelectRuleActionParamsPage.qml
index c192cf3c..acb949fb 100644
--- a/nymea-app/ui/magic/SelectRuleActionParamsPage.qml
+++ b/nymea-app/ui/magic/SelectRuleActionParamsPage.qml
@@ -21,7 +21,7 @@ Page {
     signal backPressed();
     signal completed();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: actionType.displayName
         onBackPressed: root.backPressed();
     }
@@ -126,7 +126,7 @@ Page {
                                 }
                             }
 
-                            MeaListItemDelegate {
+                            NymeaListItemDelegate {
                                 id: statePickerDelegate
                                 Layout.fillWidth: true
                                 text: deviceId === null || stateTypeId === null
diff --git a/nymea-app/ui/magic/SelectStateDescriptorPage.qml b/nymea-app/ui/magic/SelectStateDescriptorPage.qml
index eefe6c19..bb5fd186 100644
--- a/nymea-app/ui/magic/SelectStateDescriptorPage.qml
+++ b/nymea-app/ui/magic/SelectStateDescriptorPage.qml
@@ -19,7 +19,7 @@ Page {
     onStateDescriptorChanged: buildInterface()
     Component.onCompleted: buildInterface()
 
-    header: GuhHeader {
+    header: NymeaHeader {
         id: header
         onBackPressed: root.backPressed();
 
diff --git a/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml b/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml
index e3ac4a59..84a930d7 100644
--- a/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml
+++ b/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml
@@ -18,7 +18,7 @@ Page {
     signal backPressed();
     signal completed();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Options")
         onBackPressed: root.backPressed();
     }
diff --git a/nymea-app/ui/magic/SelectStatePage.qml b/nymea-app/ui/magic/SelectStatePage.qml
index 8cf605bf..6e9b5267 100644
--- a/nymea-app/ui/magic/SelectStatePage.qml
+++ b/nymea-app/ui/magic/SelectStatePage.qml
@@ -7,7 +7,7 @@ import Nymea 1.0
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Select state")
         onBackPressed: pageStack.pop()
     }
@@ -21,7 +21,7 @@ Page {
 
         model: device.deviceClass.stateTypes
 
-        delegate: MeaListItemDelegate {
+        delegate: NymeaListItemDelegate {
             width: parent.width
             iconName: "../images/state.svg"
             text: model.displayName
diff --git a/nymea-app/ui/magic/SelectThingPage.qml b/nymea-app/ui/magic/SelectThingPage.qml
index a92c1607..ad9dfb94 100644
--- a/nymea-app/ui/magic/SelectThingPage.qml
+++ b/nymea-app/ui/magic/SelectThingPage.qml
@@ -20,7 +20,7 @@ Page {
     signal interfaceSelected(string interfaceName);
     signal anySelected();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: root.selectInterface ?
                   qsTr("Select a kind of things") :
                   root.shownInterfaces.length > 0 ? qsTr("Select a %1").arg(app.interfaceToDisplayName(root.shownInterfaces[0])) : qsTr("Select a thing")
@@ -53,7 +53,7 @@ Page {
             Layout.fillWidth: true
         }
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             text: qsTr("Any %1").arg(app.interfaceToDisplayName(root.shownInterfaces[0]))
             visible: root.allowSelectAny
@@ -69,7 +69,7 @@ Page {
             Layout.fillHeight: true
             model: root.selectInterface ? interfacesProxy : devicesProxy
             clip: true
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 width: parent.width
                 text: root.selectInterface ? model.displayName : model.name
                 iconName: root.selectInterface ? app.interfaceToIcon(model.name) : app.interfacesToIcon(model.interfaces)
diff --git a/nymea-app/ui/magic/StateEvaluatorDelegate.qml b/nymea-app/ui/magic/StateEvaluatorDelegate.qml
index d6d9aa5f..7c257393 100644
--- a/nymea-app/ui/magic/StateEvaluatorDelegate.qml
+++ b/nymea-app/ui/magic/StateEvaluatorDelegate.qml
@@ -100,7 +100,7 @@ ItemDelegate {
     Component {
         id: stateQuestionPageComponent
         Page {
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Edit condition...")
 
                 onBackPressed: pageStack.pop()
@@ -123,7 +123,7 @@ ItemDelegate {
                             method: "editInterfaceStateDescriptor"
                         }
                     }
-                    delegate: MeaListItemDelegate {
+                    delegate: NymeaListItemDelegate {
                         Layout.fillWidth: true
                         iconName: model.iconName
                         text: model.text
diff --git a/nymea-app/ui/magic/TimeEventDelegate.qml b/nymea-app/ui/magic/TimeEventDelegate.qml
index ea47bef8..ecaaf2bd 100644
--- a/nymea-app/ui/magic/TimeEventDelegate.qml
+++ b/nymea-app/ui/magic/TimeEventDelegate.qml
@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
 import Nymea 1.0
 import "../components"
 
-MeaListItemDelegate{
+NymeaListItemDelegate{
     id: root
     implicitHeight: app.delegateHeight
     progressive: false
diff --git a/nymea-app/ui/system/AboutNymeaPage.qml b/nymea-app/ui/system/AboutNymeaPage.qml
index f5592176..6a40cd9e 100644
--- a/nymea-app/ui/system/AboutNymeaPage.qml
+++ b/nymea-app/ui/system/AboutNymeaPage.qml
@@ -7,7 +7,7 @@ import "../components"
 Page {
 
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("About %1:core").arg(app.systemName)
         onBackPressed: pageStack.pop()
     }
@@ -22,28 +22,28 @@ Page {
             title: qsTr("%1:core").arg(app.systemName)
             githubLink: "https://github.com/guh/nymea"
 
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 text: qsTr("Connection:")
                 subText: engine.connection.currentConnection.url
                 progressive: false
                 prominentSubText: false
             }
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 text: qsTr("Server UUID:")
                 subText: engine.jsonRpcClient.serverUuid
                 progressive: false
                 prominentSubText: false
             }
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 text: qsTr("Server version:")
                 subText: engine.jsonRpcClient.serverVersion
                 progressive: false
                 prominentSubText: false
             }
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 text: qsTr("JSON-RPC version:")
                 subText: engine.jsonRpcClient.jsonRpcVersion
diff --git a/nymea-app/ui/system/CloudSettingsPage.qml b/nymea-app/ui/system/CloudSettingsPage.qml
index 04ee5808..0f900ea7 100644
--- a/nymea-app/ui/system/CloudSettingsPage.qml
+++ b/nymea-app/ui/system/CloudSettingsPage.qml
@@ -6,7 +6,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Cloud settings")
         onBackPressed: pageStack.pop();
     }
diff --git a/nymea-app/ui/system/ConnectionInterfaceDelegate.qml b/nymea-app/ui/system/ConnectionInterfaceDelegate.qml
index 8f970feb..3c7d0a91 100644
--- a/nymea-app/ui/system/ConnectionInterfaceDelegate.qml
+++ b/nymea-app/ui/system/ConnectionInterfaceDelegate.qml
@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
 import Nymea 1.0
 import "../components"
 
-MeaListItemDelegate {
+NymeaListItemDelegate {
     text: qsTr("Interface: %1").arg(model.address === "0.0.0.0" ? qsTr("Any") : model.address === "127.0.0.1" ? qsTr("localhost") : model.address)
     subText: qsTr("Port: %1").arg(model.port)
     iconName: "../images/network-vpn.svg"
diff --git a/nymea-app/ui/system/ConnectionInterfacesPage.qml b/nymea-app/ui/system/ConnectionInterfacesPage.qml
index 808b37d3..80c54362 100644
--- a/nymea-app/ui/system/ConnectionInterfacesPage.qml
+++ b/nymea-app/ui/system/ConnectionInterfacesPage.qml
@@ -6,7 +6,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Connection interfaces")
         onBackPressed: pageStack.pop();
     }
diff --git a/nymea-app/ui/system/DeveloperTools.qml b/nymea-app/ui/system/DeveloperTools.qml
index 9fe5cc75..d0c57aa1 100644
--- a/nymea-app/ui/system/DeveloperTools.qml
+++ b/nymea-app/ui/system/DeveloperTools.qml
@@ -6,7 +6,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Developer tools")
         onBackPressed: pageStack.pop();
     }
diff --git a/nymea-app/ui/system/GeneralSettingsPage.qml b/nymea-app/ui/system/GeneralSettingsPage.qml
index e2c882dc..fd35b5cb 100644
--- a/nymea-app/ui/system/GeneralSettingsPage.qml
+++ b/nymea-app/ui/system/GeneralSettingsPage.qml
@@ -7,7 +7,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Box settings")
         backButtonVisible: true
         onBackPressed: pageStack.pop()
diff --git a/nymea-app/ui/system/LogViewerPage.qml b/nymea-app/ui/system/LogViewerPage.qml
index 9ebafae3..0219517b 100644
--- a/nymea-app/ui/system/LogViewerPage.qml
+++ b/nymea-app/ui/system/LogViewerPage.qml
@@ -7,7 +7,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Log viewer")
         onBackPressed: pageStack.pop()
 
diff --git a/nymea-app/ui/system/MqttBrokerSettingsPage.qml b/nymea-app/ui/system/MqttBrokerSettingsPage.qml
index 0d7e0781..154f79e6 100644
--- a/nymea-app/ui/system/MqttBrokerSettingsPage.qml
+++ b/nymea-app/ui/system/MqttBrokerSettingsPage.qml
@@ -6,7 +6,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("MQTT broker")
         onBackPressed: pageStack.pop();
     }
@@ -92,7 +92,7 @@ Page {
                 model: engine.nymeaConfiguration.mqttPolicies
                 clip: true
                 ScrollBar.vertical: ScrollBar {}
-                delegate: MeaListItemDelegate {
+                delegate: NymeaListItemDelegate {
                     width: parent.width
                     iconName: "../images/account.svg"
                     text: qsTr("Client ID: %1").arg(model.clientId)
diff --git a/nymea-app/ui/system/MqttPolicyPage.qml b/nymea-app/ui/system/MqttPolicyPage.qml
index ba958481..9a7c4d4e 100644
--- a/nymea-app/ui/system/MqttPolicyPage.qml
+++ b/nymea-app/ui/system/MqttPolicyPage.qml
@@ -7,7 +7,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Mqtt permission")
         onBackPressed: {
             root.rejected();
@@ -113,7 +113,7 @@ Page {
             model: root.policy.allowedPublishTopicFilters
             ScrollBar.vertical: ScrollBar {}
             clip: true
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 width: parent.width
                 text: modelData
                 canDelete: true
@@ -163,7 +163,7 @@ Page {
             model: root.policy.allowedSubscribeTopicFilters
             ScrollBar.vertical: ScrollBar {}
             clip: true
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 width: parent.width
                 text: modelData
                 canDelete: true
diff --git a/nymea-app/ui/system/NetworkSettingsPage.qml b/nymea-app/ui/system/NetworkSettingsPage.qml
index 617d02ab..78106ee8 100644
--- a/nymea-app/ui/system/NetworkSettingsPage.qml
+++ b/nymea-app/ui/system/NetworkSettingsPage.qml
@@ -7,7 +7,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Network settings")
         onBackPressed: {
             pageStack.pop();
@@ -50,7 +50,7 @@ Page {
     ColumnLayout {
         anchors.fill: parent
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             text: qsTr("Current connection state")
             prominentSubText: false
@@ -97,7 +97,7 @@ Page {
             }
         }
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             text: qsTr("Networking enabled")
             subText: qsTr("Enable or disable networking altogether")
@@ -133,7 +133,7 @@ Page {
         }
         ThinDivider {}
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             text: qsTr("Wired network")
             subText: qsTr("Shows the current ethernet status")
@@ -143,7 +143,7 @@ Page {
 
         Repeater {
             model: networkManager.wiredNetworkDevices
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 iconName: model.pluggedIn ? "../images/network-wired.svg" : "../images/network-wired-offline.svg"
                 text: model.interface + " (" + model.macAddress + ")"
@@ -159,7 +159,7 @@ Page {
 
         ThinDivider {}
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             text: qsTr("Wireless network")
             subText: qsTr("Enable or disable WiFi")
@@ -196,7 +196,7 @@ Page {
 
         Repeater {
             model: networkManager.wirelessNetworkDevices
-            MeaListItemDelegate {
+            NymeaListItemDelegate {
                 Layout.fillWidth: true
                 iconName: {
                     switch (model.state) {
@@ -247,7 +247,7 @@ Page {
         id: wirelessAccessPointsPageComponent
         Page {
             id: wirelessAccessPointsPage
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("WiFi networks")
                 onBackPressed: {
                     pageStack.pop();
@@ -266,7 +266,7 @@ Page {
                 anchors.fill: parent
                 model: apProxy
                 ScrollBar.vertical: ScrollBar {}
-                delegate: MeaListItemDelegate {
+                delegate: NymeaListItemDelegate {
                     width: parent.width
                     text: model.ssid
                     subText: model.macAddress
@@ -306,7 +306,7 @@ Page {
         Page {
             id: authPage
 
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Authenticate")
                 onBackPressed: pageStack.pop()
             }
@@ -361,7 +361,7 @@ Page {
         id: currentApPageComponent
         Page {
             id: currentApPage
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Current connection")
                 onBackPressed: pageStack.pop();
             }
@@ -372,19 +372,19 @@ Page {
                 anchors { left: parent.left; top: parent.top; right: parent.right }
                 columns: 1
 
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     Layout.fillWidth: true
                     text: qsTr("SSID")
                     subText: currentApPage.wirelessNetworkDevice.currentAccessPoint.ssid
                     progressive: false
                 }
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     Layout.fillWidth: true
                     text: qsTr("MAC Address")
                     subText: currentApPage.wirelessNetworkDevice.currentAccessPoint.macAddress
                     progressive: false
                 }
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     Layout.fillWidth: true
                     text: qsTr("Signal strength")
                     subText: currentApPage.wirelessNetworkDevice.currentAccessPoint.signalStrength
diff --git a/nymea-app/ui/system/PluginParamsPage.qml b/nymea-app/ui/system/PluginParamsPage.qml
index b6e6f3ec..e37ed7e3 100644
--- a/nymea-app/ui/system/PluginParamsPage.qml
+++ b/nymea-app/ui/system/PluginParamsPage.qml
@@ -10,7 +10,7 @@ Page {
     id: root
     property var plugin: null
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("%1 settings").arg(plugin.name)
         backButtonVisible: true
         onBackPressed: pageStack.pop()
diff --git a/nymea-app/ui/system/PluginsPage.qml b/nymea-app/ui/system/PluginsPage.qml
index 699c0a91..61297872 100644
--- a/nymea-app/ui/system/PluginsPage.qml
+++ b/nymea-app/ui/system/PluginsPage.qml
@@ -7,7 +7,7 @@ import Nymea 1.0
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Plugins")
         backButtonVisible: true
         onBackPressed: pageStack.pop()
@@ -42,7 +42,7 @@ Page {
             }
             clip: true
 
-            delegate: MeaListItemDelegate {
+            delegate: NymeaListItemDelegate {
                 property var plugin: pluginsProxy.get(index)
                 width: parent.width
                 iconName: "../images/plugin.svg"
diff --git a/nymea-app/ui/system/SystemUpdatePage.qml b/nymea-app/ui/system/SystemUpdatePage.qml
index 20641f56..f4049d33 100644
--- a/nymea-app/ui/system/SystemUpdatePage.qml
+++ b/nymea-app/ui/system/SystemUpdatePage.qml
@@ -7,7 +7,7 @@ import Nymea 1.0
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("System update")
         backButtonVisible: true
         onBackPressed: pageStack.pop()
@@ -145,7 +145,7 @@ Page {
                 visible: count > 0
                 model: updatesModel
                 clip: true
-                delegate: MeaListItemDelegate {
+                delegate: NymeaListItemDelegate {
                     width: parent.width
                     text: model.displayName
                     subText: model.candidateVersion
@@ -165,7 +165,7 @@ Page {
 
         ThinDivider {}
 
-        MeaListItemDelegate {
+        NymeaListItemDelegate {
             Layout.fillWidth: true
             text: qsTr("Install or remove software")
             onClicked: {
@@ -178,7 +178,7 @@ Page {
         id: repositoryListComponent
         Page {
             id: repositoryListPage
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Configure update sources")
                 onBackPressed: pageStack.pop()
             }
@@ -225,7 +225,7 @@ Page {
 
             property var packages: null
 
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("All packages")
                 onBackPressed: pageStack.pop()
             }
@@ -236,7 +236,7 @@ Page {
                     id: filterModel
                     packages: packageListPage.packages
                 }
-                delegate: MeaListItemDelegate {
+                delegate: NymeaListItemDelegate {
                     width: parent.width
                     text: model.displayName
                     subText: model.candidateVersion
@@ -264,7 +264,7 @@ Page {
 
             property Package pkg: null
 
-            header: GuhHeader {
+            header: NymeaHeader {
                 text: qsTr("Package information")
                 onBackPressed: pageStack.pop()
             }
@@ -297,14 +297,14 @@ Page {
                     wrapMode: Text.WordWrap
                 }
 
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     Layout.fillWidth: true
                     text: qsTr("Installed version:")
                     subText: packageDetailsPage.pkg.installedVersion.length > 0 ? packageDetailsPage.pkg.installedVersion : qsTr("Not installed")
                     progressive: false
                 }
 
-                MeaListItemDelegate {
+                NymeaListItemDelegate {
                     Layout.fillWidth: true
                     text: qsTr("Candidate version:")
                     subText: packageDetailsPage.pkg.candidateVersion
diff --git a/nymea-app/ui/system/WebServerSettingsPage.qml b/nymea-app/ui/system/WebServerSettingsPage.qml
index 99a5433e..b31e650c 100644
--- a/nymea-app/ui/system/WebServerSettingsPage.qml
+++ b/nymea-app/ui/system/WebServerSettingsPage.qml
@@ -6,7 +6,7 @@ import "../components"
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Web server")
         onBackPressed: pageStack.pop();
     }
diff --git a/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml b/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml
index dcaf6293..72f6b0af 100644
--- a/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml
+++ b/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml
@@ -10,7 +10,7 @@ Page {
     property Device device: null
     readonly property DeviceClass deviceClass: device ? device.deviceClass : null
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: root.device.name
         onBackPressed: pageStack.pop()
 
diff --git a/nymea-app/ui/thingconfiguration/EditThingsPage.qml b/nymea-app/ui/thingconfiguration/EditThingsPage.qml
index a2a1417b..94bdcc53 100644
--- a/nymea-app/ui/thingconfiguration/EditThingsPage.qml
+++ b/nymea-app/ui/thingconfiguration/EditThingsPage.qml
@@ -7,7 +7,7 @@ import Nymea 1.0
 
 Page {
     id: root
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Configure Things")
         onBackPressed: pageStack.pop()
 
diff --git a/nymea-app/ui/thingconfiguration/NewThingPage.qml b/nymea-app/ui/thingconfiguration/NewThingPage.qml
index dddeef8b..0dc58ead 100644
--- a/nymea-app/ui/thingconfiguration/NewThingPage.qml
+++ b/nymea-app/ui/thingconfiguration/NewThingPage.qml
@@ -9,7 +9,7 @@ import "../delegates"
 Page {
     id: root
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Set up new thing")
         onBackPressed: {
             pageStack.pop();
@@ -107,7 +107,7 @@ Page {
             groupByInterface: true
         }
 
-        delegate: MeaListItemDelegate {
+        delegate: NymeaListItemDelegate {
             id: deviceClassDelegate
             width: parent.width
             text: model.displayName
diff --git a/nymea-app/ui/thingconfiguration/SetupWizard.qml b/nymea-app/ui/thingconfiguration/SetupWizard.qml
index 1a27ec11..1fd99780 100644
--- a/nymea-app/ui/thingconfiguration/SetupWizard.qml
+++ b/nymea-app/ui/thingconfiguration/SetupWizard.qml
@@ -16,7 +16,7 @@ Page {
 
     signal done();
 
-    header: GuhHeader {
+    header: NymeaHeader {
         text: qsTr("Set up thing")
         onBackPressed: {
             if (internalPageStack.depth > 1) {
@@ -183,7 +183,7 @@ Page {
                         showNew: root.device === null
                         filterDeviceId: root.device !== null ? root.device.id : null
                     }
-                    delegate: MeaListItemDelegate {
+                    delegate: NymeaListItemDelegate {
                         width: parent.width
                         height: app.delegateHeight
                         text: model.name