diff --git a/.storage/lovelace.sparkx_i7 b/.storage/lovelace.sparkx_i7
index 07d95656..1bc7ec4e 100644
--- a/.storage/lovelace.sparkx_i7
+++ b/.storage/lovelace.sparkx_i7
@@ -47,12 +47,16 @@
                   "url": "octoprint2"
                 },
                 {
+                  "camera_image": "camera.sparkx_i7_printer_camera",
+                  "camera_view": "live",
+                  "entity": "camera.sparkx_i7_printer_camera",
+                  "fit_mode": "cover",
                   "grid_options": {
                     "columns": "full"
                   },
-                  "type": "custom:webrtc-camera",
-                  "ui": true,
-                  "url": "creality_k2_192_168_1_233"
+                  "show_name": true,
+                  "show_state": true,
+                  "type": "picture-entity"
                 },
                 {
                   "cards": [
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index a9059913..90e4c448 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -4,7 +4,7 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119,
+        "voltage": 118.5,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
         "power_factor": 0.15,
@@ -22,7 +22,7 @@
     },
     "0xffffb40e0607af27": {
         "state": "ON",
-        "voltage": 117.6,
+        "voltage": 118.6,
         "ac_frequency": 60,
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
@@ -30,7 +30,7 @@
         "power": 2.1,
         "current": 0.09,
         "energy": 49.19,
-        "power_factor": 0.17,
+        "power_factor": 0.2,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -77,8 +77,8 @@
         "voltage": 117.3,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 192.63,
-        "power": 100.7,
+        "energy": 192.64,
+        "power": 99,
         "current": 0.91,
         "power_factor": 0.94,
         "update": {
@@ -98,10 +98,10 @@
         "voltage": 118.6,
         "energy": 95.13,
         "state": "ON",
-        "power": 11.1,
+        "power": 14,
         "current": 0.18,
         "ac_frequency": 60,
-        "power_factor": 0.5,
+        "power_factor": 0.51,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -119,7 +119,7 @@
         "energy": 12.91,
         "current": 0.01,
         "power": 0.1,
-        "power_factor": 0.22,
+        "power_factor": 0.11,
         "linkquality": 87,
         "update": {
             "state": "idle",
@@ -224,7 +224,7 @@
     },
     "0xb40e060fffe717c5": {
         "battery": 100,
-        "occupancy": true,
+        "occupancy": false,
         "tamper": false,
         "battery_low": false,
         "linkquality": 116,