diff --git a/.storage/lovelace.dashboard_home b/.storage/lovelace.dashboard_home
index 4ab4a9d7..b64a0bec 100644
--- a/.storage/lovelace.dashboard_home
+++ b/.storage/lovelace.dashboard_home
@@ -81,7 +81,13 @@
               "type": "entity"
             },
             "sensor.sparkx_i7_print_progress",
-            "sensor.sparkx_i7_position_z"
+            {
+              "entity": "sensor.sparkx_i7_position_z",
+              "icon": "mdi:axis-z-arrow",
+              "primary": "Position Z",
+              "secondary": "{{ '%.2f' % (states('sensor.sparkx_i7_position_z') | float(0)) }} mm",
+              "type": "custom:mushroom-template-card"
+            }
           ],
           "cards": [],
           "max_columns": 4,
diff --git a/.storage/lovelace.sparkx_i7 b/.storage/lovelace.sparkx_i7
index 1d77990b..92fc83b7 100644
--- a/.storage/lovelace.sparkx_i7
+++ b/.storage/lovelace.sparkx_i7
@@ -67,8 +67,11 @@
                     "columns": 4
                   },
                   "icon": "mdi:axis-z-arrow",
+                  "multiline_secondary": true,
                   "name": "Current Z",
-                  "type": "tile"
+                  "primary": "Current Z",
+                  "secondary": "{{ '%.2f' % (states('sensor.sparkx_i7_position_z') | float(0)) }} mm",
+                  "type": "custom:mushroom-template-card"
                 },
                 {
                   "entity": "sensor.sparkx_i7_position_x",
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index f25bf6cd..47bf7f76 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -1,10 +1,10 @@
 {
     "0xffffb40e0607ace4": {
-        "energy": 21.37,
+        "energy": 21.4,
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119,
+        "voltage": 119.3,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
         "power_factor": 0.63,
@@ -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": 190.1,
+        "power": 233.8,
         "linkquality": 91,
-        "current": 2.54,
+        "current": 3.12,
         "power_on_behavior": "on"
     },
     "0xffffb40e0607af27": {
         "state": "ON",
-        "voltage": 117.7,
+        "voltage": 118.5,
         "ac_frequency": 60,
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 157.4,
-        "current": 0.86,
+        "power": 2,
+        "current": 0.09,
         "energy": 46.6,
-        "power_factor": 0.98,
+        "power_factor": 0.17,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119.2,
+        "voltage": 119.1,
         "countdown_to_turn_on": 0,
-        "energy": 90.62,
-        "power_factor": 0.2,
+        "energy": 90.63,
+        "power_factor": 0.84,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,13 +58,13 @@
             "latest_release_notes": null
         },
         "linkquality": 120,
-        "power": 0.4,
-        "current": 0.03,
+        "power": 84.4,
+        "current": 0.84,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
         "battery": 100,
-        "contact": false,
+        "contact": true,
         "tamper": false,
         "battery_low": false,
         "linkquality": 120,
@@ -74,11 +74,11 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 118.6,
+        "voltage": 119.1,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 185.03,
-        "power": 115.9,
+        "energy": 185.05,
+        "power": 100.2,
         "current": 1.02,
         "power_factor": 0.95,
         "update": {
@@ -95,13 +95,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 118.8,
-        "energy": 91.95,
+        "voltage": 118.6,
+        "energy": 91.97,
         "state": "ON",
-        "power": 45.8,
-        "current": 0.51,
+        "power": 56.2,
+        "current": 0.62,
         "ac_frequency": 60,
-        "power_factor": 0.76,
+        "power_factor": 0.73,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -114,7 +114,7 @@
     },
     "0xffffb40e060895b3": {
         "state": "ON",
-        "voltage": 119.5,
+        "voltage": 119.3,
         "ac_frequency": 60,
         "energy": 12.16,
         "current": 0.01,
@@ -136,14 +136,14 @@
     "0xffffb40e0608864e": {
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 120.3,
+        "voltage": 120.5,
         "energy": 29.63,
         "countdown_to_turn_on": 0,
         "state": "ON",
         "current": 0.16,
         "ac_frequency": 60,
         "power": 1.3,
-        "power_factor": 0.15,
+        "power_factor": 0.14,
         "update": {
             "state": "idle",
             "installed_version": 268513381,