diff --git a/mea/discovery/upnpdiscovery.cpp b/mea/discovery/upnpdiscovery.cpp
index 04cbffce..7b40f1dd 100644
--- a/mea/discovery/upnpdiscovery.cpp
+++ b/mea/discovery/upnpdiscovery.cpp
@@ -134,9 +134,11 @@ void UpnpDiscovery::readData()
         data.resize(pendingDatagramSize());
         readDatagram(data.data(), data.size(), &hostAddress, &port);
     }
+    if (data.contains("10.10.10.128"))
+        qDebug() << "Data received" << data;
 
     // if the data contains the HTTP OK header...
-    if (data.contains("HTTP/1.1 200 OK")) {
+    if (data.contains("HTTP/1.1 200 OK") || data.contains("NOTIFY * HTTP/1.1")) {
         QUrl location;
         bool isNymea = false;
 
diff --git a/mea/jsonrpc/jsontypes.cpp b/mea/jsonrpc/jsontypes.cpp
index d6814cb8..f68dabee 100644
--- a/mea/jsonrpc/jsontypes.cpp
+++ b/mea/jsonrpc/jsontypes.cpp
@@ -407,7 +407,7 @@ QPair<Types::Unit, QString> JsonTypes::stringToUnit(const QString &unitString)
     } else if (unitString == "UnitHours") {
         return QPair<Types::Unit, QString>(Types::UnitHours, "h");
     } else if (unitString == "UnitUnixTime") {
-        return QPair<Types::Unit, QString>(Types::UnitUnixTime, "");
+        return QPair<Types::Unit, QString>(Types::UnitUnixTime, "datetime");
     } else if (unitString == "UnitMeterPerSecond") {
         return QPair<Types::Unit, QString>(Types::UnitMeterPerSecond, "m/s");
     } else if (unitString == "UnitKiloMeterPerHour") {
diff --git a/mea/ui/devicepages/ColorLightDevicePage.qml b/mea/ui/devicepages/ColorLightDevicePage.qml
index 3ed44ed2..e7162e97 100644
--- a/mea/ui/devicepages/ColorLightDevicePage.qml
+++ b/mea/ui/devicepages/ColorLightDevicePage.qml
@@ -78,6 +78,13 @@ DevicePageBase {
         }
 
 
+
+
+
+
+
+
+
         ColorPickerCt {
             id: pickerCt
             Layout.fillWidth: true
diff --git a/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml b/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml
index c5feb8cc..1a965799 100644
--- a/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml
+++ b/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml
@@ -114,7 +114,8 @@ Page {
         Label {
             property var value: ""
             property var stateTypeId: null
-            text: value + " " + deviceClass.stateTypes.getStateType(stateTypeId).unitString
+            property var unitString: deviceClass.stateTypes.getStateType(stateTypeId).unitString
+            text: unitString === "datetime" ? Qt.formatDateTime(new Date(value * 1000), Qt.DefaultLocaleShortDate) : value + " " + unitString
             horizontalAlignment: Text.AlignHCenter
         }
     }