diff --git a/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h b/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h
index 7fc94082..2b0566ab 100644
--- a/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h
+++ b/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h
@@ -113,10 +113,11 @@ const HomeAssistantSensor PriceSensors[PriceSensorCount] PROGMEM = {
 
 const HomeAssistantSensor PriceSensor PROGMEM = {"Price in %02d %s", "/prices", "prices['%d']", 4000, "", "monetary", ""};
 
-const uint8_t SystemSensorCount PROGMEM = 2;
+const uint8_t SystemSensorCount PROGMEM = 3;
 const HomeAssistantSensor SystemSensors[SystemSensorCount] PROGMEM = {
     {"Status",                     "/state",   "rssi",               180, "dBm",  "signal_strength", "measurement"},
-    {"Supply volt",                "/state",   "vcc",                180, "V",    "voltage",         "measurement"}
+    {"Supply volt",                "/state",   "vcc",                180, "V",    "voltage",         "measurement"},
+    {"Uptime",                     "/state",   "up",                 180, "s",    "uptime",          "measurement"}
 };
 
 const HomeAssistantSensor TemperatureSensor PROGMEM = {"Temperature sensor %s", "/temperatures", "temperatures['%s']", 900, "°C", "temperature", "measurement"};
diff --git a/lib/JsonMqttHandler/include/json/json1_json.h b/lib/JsonMqttHandler/include/json/json1_json.h
new file mode 100644
index 00000000..10c8a274
--- /dev/null
+++ b/lib/JsonMqttHandler/include/json/json1_json.h
@@ -0,0 +1,2 @@
+static const char JSON1_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%u,"t":%lu,"vcc":%.3f,"rssi":%d,"temp":%.2f,"data":{"P":%d},"realtime":{"h":%.2f,"d":%.1f,"t":%d,"x":%.2f,"he":%.2f,"de":%.1f}})=="==";
+const int JSON1_JSON_LEN PROGMEM = 155;
\ No newline at end of file
diff --git a/lib/JsonMqttHandler/include/json/json2_json.h b/lib/JsonMqttHandler/include/json/json2_json.h
new file mode 100644
index 00000000..0f52846b
--- /dev/null
+++ b/lib/JsonMqttHandler/include/json/json2_json.h
@@ -0,0 +1,2 @@
+static const char JSON2_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%u,"t":%lu,"vcc":%.3f,"rssi":%d,"temp":%.2f,"data":{"lv":"%s","id":"%s","type":"%s","P":%d,"Q":%d,"PO":%d,"QO":%d,"I1":%.2f,"I2":%.2f,"I3":%.2f,"U1":%.2f,"U2":%.2f,"U3":%.2f},"realtime":{"h":%.2f,"d":%.1f,"t":%d,"x":%.2f,"he":%.2f,"de":%.1f}})=="==";
+const int JSON2_JSON_LEN PROGMEM = 270;
\ No newline at end of file
diff --git a/lib/JsonMqttHandler/include/json/json3_json.h b/lib/JsonMqttHandler/include/json/json3_json.h
new file mode 100644
index 00000000..72f00aae
--- /dev/null
+++ b/lib/JsonMqttHandler/include/json/json3_json.h
@@ -0,0 +1,2 @@
+static const char JSON3_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%u,"t":%lu,"vcc":%.3f,"rssi":%d,"temp":%.2f,"data":{"lv":"%s","id":"%s","type":"%s","P":%d,"Q":%d,"PO":%d,"QO":%d,"I1":%.2f,"I2":%.2f,"I3":%.2f,"U1":%.2f,"U2":%.2f,"U3":%.2f,"tPI":%.3f,"tPO":%.3f,"tQI":%.3f,"tQO":%.3f,"rtc":%lu},"realtime":{"h":%.2f,"d":%.1f,"t":%d,"x":%.2f,"he":%.2f,"de":%.1f}})=="==";
+const int JSON3_JSON_LEN PROGMEM = 324;
\ No newline at end of file
diff --git a/lib/JsonMqttHandler/include/json/json4_json.h b/lib/JsonMqttHandler/include/json/json4_json.h
new file mode 100644
index 00000000..3d3d9adf
--- /dev/null
+++ b/lib/JsonMqttHandler/include/json/json4_json.h
@@ -0,0 +1,2 @@
+static const char JSON4_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%u,"t":%lu,"vcc":%.3f,"rssi":%d,"temp":%.2f,"data":{"lv":"%s","id":"%s","type":"%s","P":%d,"P1":%.2f,"P2":%.2f,"P3":%.2f,"Q":%d,"PO":%d,"PO1":%.2f,"PO2":%.2f,"PO3":%.2f,"QO":%d,"I1":%.2f,"I2":%.2f,"I3":%.2f,"U1":%.2f,"U2":%.2f,"U3":%.2f,"PF":%.2f,"PF1":%.2f,"PF2":%.2f,"PF3":%.2f,"tPI":%.3f,"tPO":%.3f,"tQI":%.3f,"tQO":%.3f,"tPI1":%.3f,"tPI2":%.3f,"tPI3":%.3f,"tPO1":%.3f,"tPO2":%.3f,"tPO3":%.3f,"rtc":%lu},"realtime":{"h":%.2f,"d":%.1f,"t":%d,"x":%.2f,"he":%.2f,"de":%.1f}})=="==";
+const int JSON4_JSON_LEN PROGMEM = 502;
\ No newline at end of file
diff --git a/lib/JsonMqttHandler/include/json/jsonprices_json.h b/lib/JsonMqttHandler/include/json/jsonprices_json.h
new file mode 100644
index 00000000..5c16d93a
--- /dev/null
+++ b/lib/JsonMqttHandler/include/json/jsonprices_json.h
@@ -0,0 +1,2 @@
+static const char JSONPRICES_JSON[] PROGMEM = R"=="==({"id":"%s","prices":{"0":%s,"1":%s,"2":%s,"3":%s,"4":%s,"5":%s,"6":%s,"7":%s,"8":%s,"9":%s,"10":%s,"11":%s,"12":%s,"13":%s,"14":%s,"15":%s,"16":%s,"17":%s,"18":%s,"19":%s,"20":%s,"21":%s,"22":%s,"23":%s,"24":%s,"25":%s,"26":%s,"27":%s,"28":%s,"29":%s,"30":%s,"31":%s,"32":%s,"33":%s,"34":%s,"35":%s,"36":%s,"37":%s,"min":%.4f,"max":%.4f,"cheapest1hr":"%s","cheapest3hr":"%s","cheapest6hr":"%s"}})=="==";
+const int JSONPRICES_JSON_LEN PROGMEM = 395;
\ No newline at end of file
diff --git a/lib/JsonMqttHandler/include/json/jsonsys_json.h b/lib/JsonMqttHandler/include/json/jsonsys_json.h
new file mode 100644
index 00000000..6d9fb6f5
--- /dev/null
+++ b/lib/JsonMqttHandler/include/json/jsonsys_json.h
@@ -0,0 +1,2 @@
+static const char JSONSYS_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%d,"vcc":%.3f,"rssi":%d,"temp":%.2f,"version":"%s"})=="==";
+const int JSONSYS_JSON_LEN PROGMEM = 79;
\ No newline at end of file
diff --git a/lib/SvelteUi/app/package-lock.json b/lib/SvelteUi/app/package-lock.json
index 1f2bd433..095de595 100644
--- a/lib/SvelteUi/app/package-lock.json
+++ b/lib/SvelteUi/app/package-lock.json
@@ -1164,6 +1164,7 @@
       }
     },
     "node_modules/follow-redirects": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "version": "1.15.3",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
@@ -1172,6 +1173,11 @@
       "version": "1.15.4",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
       "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+>>>>>>> main
+=======
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 >>>>>>> main
       "dev": true,
       "funding": [
@@ -2782,6 +2788,7 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/vite": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz",
@@ -2790,6 +2797,11 @@
       "version": "3.2.8",
       "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.8.tgz",
       "integrity": "sha512-EtQU16PLIJpAZol2cTLttNP1mX6L0SyI0pgQB1VOoWeQnMSvtiwovV3D6NcjN8CZQWWyESD2v5NGnpz5RvgOZA==",
+>>>>>>> main
+=======
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.10.tgz",
+      "integrity": "sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==",
 >>>>>>> main
       "dev": true,
       "dependencies": {
@@ -3582,6 +3594,7 @@
       }
     },
     "follow-redirects": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "version": "1.15.3",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
@@ -3590,6 +3603,11 @@
       "version": "1.15.4",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
       "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+>>>>>>> main
+=======
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 >>>>>>> main
       "dev": true
     },
@@ -4619,6 +4637,7 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "vite": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz",
@@ -4627,6 +4646,11 @@
       "version": "3.2.8",
       "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.8.tgz",
       "integrity": "sha512-EtQU16PLIJpAZol2cTLttNP1mX6L0SyI0pgQB1VOoWeQnMSvtiwovV3D6NcjN8CZQWWyESD2v5NGnpz5RvgOZA==",
+>>>>>>> main
+=======
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.10.tgz",
+      "integrity": "sha512-Dx3olBo/ODNiMVk/cA5Yft9Ws+snLOXrhLtrI3F4XLt4syz2Yg8fayZMWScPKoz12v5BUv7VEmQHnsfpY80fYw==",
 >>>>>>> main
       "dev": true,
       "requires": {