diff --git a/.storage/lovelace.dashboard_home b/.storage/lovelace.dashboard_home
index ab38f23d..4ab4a9d7 100644
--- a/.storage/lovelace.dashboard_home
+++ b/.storage/lovelace.dashboard_home
@@ -80,14 +80,8 @@
               "show_state": true,
               "type": "entity"
             },
-            {
-              "entity": "sensor.octoprint_print_progress_live",
-              "type": "entity"
-            },
-            {
-              "entity": "sensor.octoprint_current_z",
-              "type": "entity"
-            }
+            "sensor.sparkx_i7_print_progress",
+            "sensor.sparkx_i7_position_z"
           ],
           "cards": [],
           "max_columns": 4,
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index b63c1a5a..7a28f6f3 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -1,13 +1,13 @@
 {
     "0xffffb40e0607ace4": {
-        "energy": 21.13,
+        "energy": 21.18,
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 120.5,
+        "voltage": 120.8,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
-        "power_factor": 0.14,
+        "power_factor": 0.6,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -15,22 +15,22 @@
             "latest_source": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/ThirdReality/SmartPlug_Zigbee_PROD_OTA_V101_1.01.01.ota",
             "latest_release_notes": null
         },
-        "power": 0.5,
+        "power": 160,
         "linkquality": 91,
-        "current": 0.03,
+        "current": 2.21,
         "power_on_behavior": "on"
     },
     "0xffffb40e0607af27": {
         "state": "ON",
-        "voltage": 119.9,
+        "voltage": 119.7,
         "ac_frequency": 60,
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 2.2,
-        "current": 0.1,
-        "energy": 46.43,
-        "power_factor": 0.19,
+        "power": 144,
+        "current": 3.2,
+        "energy": 46.48,
+        "power_factor": 0.37,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119.8,
+        "voltage": 120.3,
         "countdown_to_turn_on": 0,
-        "energy": 90.48,
-        "power_factor": 0.9,
+        "energy": 90.55,
+        "power_factor": 0.2,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,13 +58,13 @@
             "latest_release_notes": null
         },
         "linkquality": 120,
-        "power": 87.6,
-        "current": 0.85,
+        "power": 0.2,
+        "current": 0.01,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
         "battery": 100,
-        "contact": false,
+        "contact": true,
         "tamper": false,
         "battery_low": false,
         "linkquality": 120,
@@ -74,12 +74,12 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 119.3,
+        "voltage": 119.1,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 184.71,
-        "power": 0.8,
-        "current": 0.02,
+        "energy": 184.87,
+        "power": 101.1,
+        "current": 0.97,
         "power_factor": 0.39,
         "update": {
             "state": "idle",
@@ -95,13 +95,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 119.4,
-        "energy": 91.74,
+        "voltage": 120.1,
+        "energy": 91.86,
         "state": "ON",
-        "power": 44.2,
-        "current": 0.56,
+        "power": 39.4,
+        "current": 0.47,
         "ac_frequency": 60,
-        "power_factor": 0.69,
+        "power_factor": 0.72,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -114,10 +114,10 @@
     },
     "0xffffb40e060895b3": {
         "state": "ON",
-        "voltage": 120.1,
+        "voltage": 120.7,
         "ac_frequency": 60,
-        "energy": 12.14,
-        "current": 0.01,
+        "energy": 12.16,
+        "current": 0.28,
         "power": 0.1,
         "power_factor": 0.11,
         "linkquality": 87,
@@ -136,14 +136,14 @@
     "0xffffb40e0608864e": {
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 120.5,
-        "energy": 28.84,
+        "voltage": 121,
+        "energy": 29.03,
         "countdown_to_turn_on": 0,
         "state": "ON",
-        "current": 0.02,
+        "current": 0.04,
         "ac_frequency": 60,
-        "power": 0.4,
-        "power_factor": 0.14,
+        "power": 0.3,
+        "power_factor": 0.19,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -171,7 +171,7 @@
     },
     "0xa4c1380d0679ffff": {
         "battery": 100,
-        "temperature": 24.8,
+        "temperature": 25.8,
         "temperature_units": "celsius",
         "temperature_calibration": 0,
         "update": {