diff --git a/.storage/lovelace.sparkx_i7 b/.storage/lovelace.sparkx_i7
index 8993a553..332ea74e 100644
--- a/.storage/lovelace.sparkx_i7
+++ b/.storage/lovelace.sparkx_i7
@@ -18,7 +18,7 @@
                 },
                 {
                   "grid_options": {
-                    "columns": 4
+                    "columns": "full"
                   },
                   "type": "custom:webrtc-camera",
                   "ui": true,
@@ -26,7 +26,7 @@
                 },
                 {
                   "grid_options": {
-                    "columns": 4
+                    "columns": "full"
                   },
                   "type": "custom:webrtc-camera",
                   "ui": true,
@@ -34,7 +34,7 @@
                 },
                 {
                   "grid_options": {
-                    "columns": 4
+                    "columns": "full"
                   },
                   "type": "custom:webrtc-camera",
                   "ui": true,
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index d84997a6..b3bc9a4f 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -1,13 +1,13 @@
 {
     "0xffffb40e0607ace4": {
-        "energy": 21.11,
+        "energy": 21.13,
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "voltage": 120.5,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
-        "power_factor": 0.82,
+        "power_factor": 0.44,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -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": 9.5,
+        "power": 3.4,
         "linkquality": 91,
-        "current": 0.1,
+        "current": 0.06,
         "power_on_behavior": "on"
     },
     "0xffffb40e0607af27": {
@@ -27,7 +27,7 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 2.1,
+        "power": 2,
         "current": 0.1,
         "energy": 46.16,
         "power_factor": 0.17,
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 120.1,
+        "voltage": 119.6,
         "countdown_to_turn_on": 0,
-        "energy": 89.97,
-        "power_factor": 0.9,
+        "energy": 89.98,
+        "power_factor": 0.2,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,8 +58,8 @@
             "latest_release_notes": null
         },
         "linkquality": 120,
-        "power": 83.6,
-        "current": 0.79,
+        "power": 0.2,
+        "current": 0.01,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
@@ -77,8 +77,8 @@
         "voltage": 118.8,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 183.74,
-        "power": 102.7,
+        "energy": 183.76,
+        "power": 101,
         "current": 0.9,
         "power_factor": 0.95,
         "update": {
@@ -95,13 +95,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 119.9,
-        "energy": 91.14,
+        "voltage": 119.1,
+        "energy": 91.15,
         "state": "ON",
-        "power": 58.5,
-        "current": 0.66,
+        "power": 61.7,
+        "current": 0.73,
         "ac_frequency": 60,
-        "power_factor": 0.74,
+        "power_factor": 0.75,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -119,7 +119,7 @@
         "energy": 12.09,
         "current": 0.01,
         "power": 0.1,
-        "power_factor": 0.22,
+        "power_factor": 0.11,
         "linkquality": 87,
         "update": {
             "state": "idle",
@@ -143,7 +143,7 @@
         "current": 0.13,
         "ac_frequency": 60,
         "power": 0.4,
-        "power_factor": 0.14,
+        "power_factor": 0.15,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -224,7 +224,7 @@
     },
     "0xb40e060fffe717c5": {
         "battery": 100,
-        "occupancy": false,
+        "occupancy": true,
         "tamper": false,
         "battery_low": false,
         "linkquality": 116,