diff --git a/.storage/lovelace.sparkx_i7 b/.storage/lovelace.sparkx_i7
index 41a010c4..62ce0662 100644
--- a/.storage/lovelace.sparkx_i7
+++ b/.storage/lovelace.sparkx_i7
@@ -393,20 +393,52 @@
                   "type": "history-graph"
                 },
                 {
-                  "type": "history-graph",
-                  "grid_options": {
-                    "columns": "full"
+                  "type": "custom:apexcharts-card",
+                  "graph_span": "1h",
+                  "header": {
+                    "show": true,
+                    "title": "Fan Speeds",
+                    "show_states": true,
+                    "colorize_states": true
                   },
-                  "entities": [
+                  "apex_config": {
+                    "chart": {
+                      "height": 200,
+                      "legend": {
+                        "show": false
+                      }
+                    },
+                    "grid": {
+                      "xaxis": {
+                        "lines": {
+                          "show": true
+                        },
+                        "borderColor": "#555"
+                      }
+                    },
+                    "yaxis": [
+                      {
+                        "opposite": true,
+                        "decimals": 0,
+                        "tickAmount": 2
+                      }
+                    ]
+                  },
+                  "all_series_config": {
+                    "stroke_width": 2,
+                    "show": {
+                      "name_in_header": true
+                    }
+                  },
+                  "series": [
                     {
                       "entity": "sensor.sparkx_moonraker_hotend_fan",
-                      "name": "Target"
+                      "name": "Hotend"
                     }
                   ],
-                  "title": "Fan",
-                  "hours_to_show": 24,
-                  "show_names": true,
-                  "expand_legend": true
+                  "grid_options": {
+                    "columns": "full"
+                  }
                 }
               ],
               "type": "grid"
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index c8a843f9..298c68e0 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119.7,
+        "voltage": 119.8,
         "countdown_to_turn_on": 0,
-        "energy": 105.33,
-        "power_factor": 0.2,
+        "energy": 105.34,
+        "power_factor": 0.17,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,8 +58,8 @@
             "latest_release_notes": null
         },
         "linkquality": 145,
-        "power": 84.4,
-        "current": 0.9,
+        "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.3,
+        "voltage": 119.8,
         "state": "ON",
         "ac_frequency": 60,
         "energy": 213.84,
-        "power": 94,
-        "current": 0.87,
-        "power_factor": 0.95,
+        "power": 3.6,
+        "current": 0.82,
+        "power_factor": 0.34,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -95,11 +95,11 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 119.9,
+        "voltage": 118.8,
         "energy": 101.33,
         "state": "ON",
-        "power": 25.4,
-        "current": 0.29,
+        "power": 48.3,
+        "current": 0.67,
         "ac_frequency": 60,
         "power_factor": 0.61,
         "update": {
@@ -119,7 +119,7 @@
         "energy": 14.61,
         "current": 0.01,
         "power": 0.2,
-        "power_factor": 0.11,
+        "power_factor": 0.22,
         "linkquality": 116,
         "update": {
             "state": "idle",