diff --git a/.storage/lovelace.sparkx_i7 b/.storage/lovelace.sparkx_i7
index 92fc83b7..5336337d 100644
--- a/.storage/lovelace.sparkx_i7
+++ b/.storage/lovelace.sparkx_i7
@@ -62,16 +62,13 @@
                   "type": "tile"
                 },
                 {
-                  "entity": "sensor.sparkx_i7_position_z",
+                  "entity": "sensor.sparkx_i7_position_z_2_decimals",
                   "grid_options": {
                     "columns": 4
                   },
                   "icon": "mdi:axis-z-arrow",
-                  "multiline_secondary": true,
                   "name": "Current Z",
-                  "primary": "Current Z",
-                  "secondary": "{{ '%.2f' % (states('sensor.sparkx_i7_position_z') | float(0)) }} mm",
-                  "type": "custom:mushroom-template-card"
+                  "type": "tile"
                 },
                 {
                   "entity": "sensor.sparkx_i7_position_x",
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index 47bf7f76..f9ece20d 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -1,10 +1,10 @@
 {
     "0xffffb40e0607ace4": {
-        "energy": 21.4,
+        "energy": 21.43,
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119.3,
+        "voltage": 118,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
         "power_factor": 0.63,
@@ -15,9 +15,9 @@
             "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": 233.8,
+        "power": 293.8,
         "linkquality": 91,
-        "current": 3.12,
+        "current": 3.91,
         "power_on_behavior": "on"
     },
     "0xffffb40e0607af27": {
@@ -27,7 +27,7 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 2,
+        "power": 1.9,
         "current": 0.09,
         "energy": 46.6,
         "power_factor": 0.17,
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119.1,
+        "voltage": 118.7,
         "countdown_to_turn_on": 0,
-        "energy": 90.63,
-        "power_factor": 0.84,
+        "energy": 90.64,
+        "power_factor": 0.2,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,8 +58,8 @@
             "latest_release_notes": null
         },
         "linkquality": 120,
-        "power": 84.4,
-        "current": 0.84,
+        "power": 0.2,
+        "current": 0.01,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
@@ -74,13 +74,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 119.1,
+        "voltage": 119,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 185.05,
-        "power": 100.2,
-        "current": 1.02,
-        "power_factor": 0.95,
+        "energy": 185.07,
+        "power": 1,
+        "current": 0.05,
+        "power_factor": 0.39,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -96,10 +96,10 @@
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
         "voltage": 118.6,
-        "energy": 91.97,
+        "energy": 91.98,
         "state": "ON",
-        "power": 56.2,
-        "current": 0.62,
+        "power": 49.2,
+        "current": 0.57,
         "ac_frequency": 60,
         "power_factor": 0.73,
         "update": {
@@ -114,12 +114,12 @@
     },
     "0xffffb40e060895b3": {
         "state": "ON",
-        "voltage": 119.3,
+        "voltage": 116.9,
         "ac_frequency": 60,
         "energy": 12.16,
         "current": 0.01,
         "power": 0.1,
-        "power_factor": 0.11,
+        "power_factor": 0,
         "linkquality": 87,
         "update": {
             "state": "idle",
@@ -136,7 +136,7 @@
     "0xffffb40e0608864e": {
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 120.5,
+        "voltage": 121.4,
         "energy": 29.63,
         "countdown_to_turn_on": 0,
         "state": "ON",
@@ -171,7 +171,7 @@
     },
     "0xa4c1380d0679ffff": {
         "battery": 100,
-        "temperature": 26.6,
+        "temperature": 26.7,
         "temperature_units": "celsius",
         "temperature_calibration": 0,
         "update": {