diff --git a/.storage/lovelace.sparkx_i7 b/.storage/lovelace.sparkx_i7
index 61e71120..677dd5b4 100644
--- a/.storage/lovelace.sparkx_i7
+++ b/.storage/lovelace.sparkx_i7
@@ -33,24 +33,24 @@
                   "url": "octoprint2"
                 },
                 {
-                  "show_state": true,
-                  "show_name": true,
-                  "camera_view": "live",
-                  "fit_mode": "cover",
-                  "type": "picture-entity",
-                  "entity": "camera.sparkx_i7_printer_camera",
                   "camera_image": "camera.sparkx_i7_printer_camera",
+                  "camera_view": "live",
+                  "entity": "camera.sparkx_i7_printer_camera",
+                  "fit_mode": "cover",
                   "grid_options": {
                     "columns": "full"
-                  }
+                  },
+                  "show_name": true,
+                  "show_state": true,
+                  "type": "picture-entity"
                 },
                 {
-                  "type": "picture",
-                  "image_entity": "image.sparkx_i7_current_print_preview",
-                  "show_name": false,
                   "grid_options": {
                     "columns": 6
-                  }
+                  },
+                  "image_entity": "image.sparkx_i7_current_print_preview",
+                  "show_name": false,
+                  "type": "picture"
                 },
                 {
                   "entity": "sensor.sparkx_i7_print_status",
@@ -71,22 +71,34 @@
                   "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_position_x",
-                  "name": "X",
-                  "icon": "mdi:axis-x-arrow",
                   "grid_options": {
                     "columns": 4
-                  }
+                  },
+                  "icon": "mdi:axis-x-arrow",
+                  "name": "X",
+                  "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_position_y",
-                  "name": "Y",
-                  "icon": "mdi:axis-y-arrow",
                   "grid_options": {
                     "columns": 4
-                  }
+                  },
+                  "icon": "mdi:axis-y-arrow",
+                  "name": "Y",
+                  "type": "tile"
+                },
+                {
+                  "entity": "sensor.sparkx_i7_print_status",
+                  "grid_options": {
+                    "columns": 6
+                  },
+                  "icon": "mdi:message-alert-outline",
+                  "multiline_secondary": true,
+                  "name": "Printer Message",
+                  "primary": "{{ states(\"sensor.sparkx_i7_print_status\") | replace(\"_\", \" \") | title }}",
+                  "secondary": "{% set p = states(\"sensor.sparkx_i7_print_status\") %}{% set err = p.attributes.get(\"err\", {}) %}{% set code = err.get(\"errcode\", 0) | int(0) %}{% set msg = err.get(\"value\", \"\") %}{% if p.attributes.get(\"paused_flag\", false) %}Print paused{% elif msg %}ERROR {{ code }}: {{ msg }}{% elif code %}Printer error {{ code }}{% else %}No printer error{% endif %}",
+                  "type": "custom:mushroom-template-card"
                 }
               ],
               "type": "grid"
@@ -179,58 +191,58 @@
                   "type": "sensor"
                 },
                 {
-                  "type": "tile",
                   "entity": "number.sparkx_i7_print_tuning",
+                  "grid_options": {
+                    "columns": 6
+                  },
+                  "icon": "mdi:speedometer",
                   "name": "Print Tuning",
-                  "icon": "mdi:speedometer",
-                  "grid_options": {
-                    "columns": 6
-                  }
+                  "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_print_speed",
-                  "name": "Speed",
+                  "grid_options": {
+                    "columns": 6
+                  },
                   "icon": "mdi:speedometer",
-                  "grid_options": {
-                    "columns": 6
-                  }
+                  "name": "Speed",
+                  "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_real_time_flow",
-                  "name": "Real-Time Flow",
+                  "grid_options": {
+                    "columns": 6
+                  },
                   "icon": "mdi:cube-send",
-                  "grid_options": {
-                    "columns": 6
-                  }
+                  "name": "Real-Time Flow",
+                  "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_flow_rate",
-                  "name": "Flow Rate",
+                  "grid_options": {
+                    "columns": 6
+                  },
                   "icon": "mdi:chart-gantt",
-                  "grid_options": {
-                    "columns": 6
-                  }
+                  "name": "Flow Rate",
+                  "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_current_object",
-                  "name": "Object",
-                  "icon": "mdi:cube-outline",
                   "grid_options": {
                     "columns": 6
-                  }
+                  },
+                  "icon": "mdi:cube-outline",
+                  "name": "Object",
+                  "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_object_count",
-                  "name": "Object Count",
-                  "icon": "mdi:counter",
                   "grid_options": {
                     "columns": 6
-                  }
+                  },
+                  "icon": "mdi:counter",
+                  "name": "Object Count",
+                  "type": "tile"
                 }
               ],
               "type": "grid"
@@ -411,20 +423,20 @@
                   "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "button.sparkx_i7_home_xy_then_z",
-                  "name": "Home",
-                  "icon": "mdi:home-circle",
                   "grid_options": {
                     "columns": 4
                   },
+                  "icon": "mdi:home-circle",
+                  "name": "Home",
                   "tap_action": {
                     "action": "perform-action",
                     "perform_action": "button.press",
                     "target": {
                       "entity_id": "button.sparkx_i7_home_xy_then_z"
                     }
-                  }
+                  },
+                  "type": "tile"
                 }
               ],
               "type": "grid"
@@ -463,13 +475,13 @@
                   "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_used_material_length",
-                  "name": "Used Length",
-                  "icon": "mdi:counter",
                   "grid_options": {
                     "columns": 6
-                  }
+                  },
+                  "icon": "mdi:counter",
+                  "name": "Used Length",
+                  "type": "tile"
                 },
                 {
                   "entity": "sensor.sparkx_i7_filament_cost",
@@ -665,155 +677,149 @@
           "type": "sections"
         },
         {
-          "title": "CFS / Fans",
-          "path": "cfs-fans",
-          "type": "sections",
           "icon": "mdi:printer-3d-nozzle-outline",
           "max_columns": 4,
+          "path": "cfs-fans",
           "sections": [
             {
-              "type": "grid",
               "cards": [
                 {
-                  "type": "heading",
                   "heading": "CFS Box 1",
-                  "icon": "mdi:file-cabinet"
+                  "icon": "mdi:file-cabinet",
+                  "type": "heading"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_cfs_box_1_temperature",
-                  "name": "Temperature",
+                  "grid_options": {
+                    "columns": 6
+                  },
                   "icon": "mdi:thermometer",
-                  "grid_options": {
-                    "columns": 6
-                  }
+                  "name": "Temperature",
+                  "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_cfs_box_1_humidity",
-                  "name": "Humidity",
-                  "icon": "mdi:water-percent",
                   "grid_options": {
                     "columns": 6
-                  }
+                  },
+                  "icon": "mdi:water-percent",
+                  "name": "Humidity",
+                  "type": "tile"
                 },
                 {
-                  "type": "custom:mushroom-template-card",
                   "grid_options": {
                     "columns": 6
                   },
                   "icon": "mdi:printer-3d-nozzle",
+                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_box_1_slot_1_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}",
+                  "multiline_secondary": true,
                   "name": "Slot 1",
                   "primary": "{{ states('sensor.sparkx_i7_cfs_box_1_slot_1_filament') }}",
                   "secondary": "{% set col = states('sensor.sparkx_i7_slot_1_color_name') %}{% if col %}{{ col }} · {% endif %}{{ states('sensor.sparkx_i7_cfs_box_1_slot_1_remaining') }}% left",
-                  "multiline_secondary": true,
-                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_box_1_slot_1_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}"
+                  "type": "custom:mushroom-template-card"
                 },
                 {
-                  "type": "custom:mushroom-template-card",
                   "grid_options": {
                     "columns": 6
                   },
                   "icon": "mdi:printer-3d-nozzle",
+                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_box_1_slot_2_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}",
+                  "multiline_secondary": true,
                   "name": "Slot 2",
                   "primary": "{{ states('sensor.sparkx_i7_cfs_box_1_slot_2_filament') }}",
                   "secondary": "{% set col = states('sensor.sparkx_i7_slot_2_color_name') %}{% if col %}{{ col }} · {% endif %}{{ states('sensor.sparkx_i7_cfs_box_1_slot_2_remaining') }}% left",
-                  "multiline_secondary": true,
-                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_box_1_slot_2_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}"
+                  "type": "custom:mushroom-template-card"
                 },
                 {
-                  "type": "custom:mushroom-template-card",
                   "grid_options": {
                     "columns": 6
                   },
                   "icon": "mdi:printer-3d-nozzle",
+                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_box_1_slot_3_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}",
+                  "multiline_secondary": true,
                   "name": "Slot 3",
                   "primary": "{{ states('sensor.sparkx_i7_cfs_box_1_slot_3_filament') }}",
                   "secondary": "{% set col = states('sensor.sparkx_i7_slot_3_color_name') %}{% if col %}{{ col }} · {% endif %}{{ states('sensor.sparkx_i7_cfs_box_1_slot_3_remaining') }}% left",
-                  "multiline_secondary": true,
-                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_box_1_slot_3_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}"
+                  "type": "custom:mushroom-template-card"
                 },
                 {
-                  "type": "custom:mushroom-template-card",
                   "grid_options": {
                     "columns": 6
                   },
                   "icon": "mdi:printer-3d-nozzle",
+                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_box_1_slot_4_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}",
+                  "multiline_secondary": true,
                   "name": "Slot 4",
                   "primary": "{{ states('sensor.sparkx_i7_cfs_box_1_slot_4_filament') }}",
                   "secondary": "{% set col = states('sensor.sparkx_i7_slot_4_color_name') %}{% if col %}{{ col }} · {% endif %}{{ states('sensor.sparkx_i7_cfs_box_1_slot_4_remaining') }}% left",
-                  "multiline_secondary": true,
-                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_box_1_slot_4_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}"
+                  "type": "custom:mushroom-template-card"
                 }
-              ]
+              ],
+              "type": "grid"
             },
             {
-              "type": "grid",
               "cards": [
                 {
-                  "type": "heading",
                   "heading": "External / Active",
-                  "icon": "mdi:printer-3d"
+                  "icon": "mdi:printer-3d",
+                  "type": "heading"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_active_filament_slot",
-                  "name": "Active Slot",
-                  "icon": "mdi:swap-horizontal",
                   "grid_options": {
                     "columns": 6
-                  }
+                  },
+                  "icon": "mdi:swap-horizontal",
+                  "name": "Active Slot",
+                  "type": "tile"
                 },
                 {
-                  "type": "custom:mushroom-template-card",
                   "grid_options": {
                     "columns": 6
                   },
                   "icon": "mdi:lan-outline",
+                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_external_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}",
+                  "multiline_secondary": true,
                   "name": "External Filament",
                   "primary": "{{ states('sensor.sparkx_i7_cfs_external_filament') }}",
                   "secondary": "{% set col = states('sensor.sparkx_i7_external_color_name') %}{% if col %}{{ col }} · {% endif %}{{ states('sensor.sparkx_i7_cfs_external_remaining') }}% left",
-                  "multiline_secondary": true,
-                  "icon_color": "{% set c = states('sensor.sparkx_i7_cfs_external_color')|default('')|string %}{% set core = c|replace('#','') %}{% if core|length >= 6 %}#{{ core[-6:] }}{% endif %}"
+                  "type": "custom:mushroom-template-card"
                 },
                 {
-                  "type": "tile",
                   "entity": "sensor.sparkx_i7_filament_status",
-                  "name": "Filament Status",
-                  "icon": "mdi:printer-3d-nozzle-alert",
                   "grid_options": {
                     "columns": 6
-                  }
+                  },
+                  "icon": "mdi:printer-3d-nozzle-alert",
+                  "name": "Filament Status",
+                  "type": "tile"
                 }
-              ]
+              ],
+              "type": "grid"
             },
             {
-              "type": "grid",
               "cards": [
                 {
-                  "type": "heading",
                   "heading": "Fans",
-                  "icon": "mdi:fan"
+                  "icon": "mdi:fan",
+                  "type": "heading"
                 },
                 {
-                  "type": "tile",
                   "entity": "fan.sparkx_i7_model_fan",
+                  "features": [
+                    {
+                      "type": "fan-speed"
+                    }
+                  ],
+                  "grid_options": {
+                    "columns": 4
+                  },
+                  "icon": "mdi:fan",
                   "name": "Model Fan",
-                  "icon": "mdi:fan",
-                  "features": [
-                    {
-                      "type": "fan-speed"
-                    }
-                  ],
-                  "grid_options": {
-                    "columns": 4
-                  }
+                  "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "fan.sparkx_i7_case_fan",
-                  "name": "Case Fan",
-                  "icon": "mdi:fan",
                   "features": [
                     {
                       "type": "fan-speed"
@@ -821,13 +827,13 @@
                   ],
                   "grid_options": {
                     "columns": 4
-                  }
+                  },
+                  "icon": "mdi:fan",
+                  "name": "Case Fan",
+                  "type": "tile"
                 },
                 {
-                  "type": "tile",
                   "entity": "fan.sparkx_i7_side_fan",
-                  "name": "Side Fan",
-                  "icon": "mdi:fan",
                   "features": [
                     {
                       "type": "fan-speed"
@@ -835,11 +841,17 @@
                   ],
                   "grid_options": {
                     "columns": 4
-                  }
+                  },
+                  "icon": "mdi:fan",
+                  "name": "Side Fan",
+                  "type": "tile"
                 }
-              ]
+              ],
+              "type": "grid"
             }
-          ]
+          ],
+          "title": "CFS / Fans",
+          "type": "sections"
         }
       ]
     }
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index 3ba10da7..d41fdcbc 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -4,10 +4,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 121.6,
+        "voltage": 121.8,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
-        "power_factor": 0.14,
+        "power_factor": 0.11,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -27,7 +27,7 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 2.1,
+        "power": 2.3,
         "current": 0.1,
         "energy": 46.33,
         "power_factor": 0.18,
@@ -45,9 +45,9 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 121.4,
+        "voltage": 121.3,
         "countdown_to_turn_on": 0,
-        "energy": 90.32,
+        "energy": 90.33,
         "power_factor": 0.2,
         "ac_frequency": 60,
         "update": {
@@ -58,13 +58,13 @@
             "latest_release_notes": null
         },
         "linkquality": 120,
-        "power": 85.2,
-        "current": 0.83,
+        "power": 0.2,
+        "current": 0.01,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
         "battery": 100,
-        "contact": false,
+        "contact": true,
         "tamper": false,
         "battery_low": false,
         "linkquality": 120,
@@ -74,13 +74,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 119.6,
+        "voltage": 120.1,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 184.45,
-        "power": 98,
+        "energy": 184.46,
+        "power": 0.8,
         "current": 0.87,
-        "power_factor": 0.94,
+        "power_factor": 0.34,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -95,13 +95,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 121,
-        "energy": 91.46,
+        "voltage": 121.4,
+        "energy": 91.48,
         "state": "ON",
-        "power": 39.6,
-        "current": 0.42,
+        "power": 64.2,
+        "current": 0.72,
         "ac_frequency": 60,
-        "power_factor": 0.74,
+        "power_factor": 0.83,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -114,12 +114,12 @@
     },
     "0xffffb40e060895b3": {
         "state": "ON",
-        "voltage": 121.6,
+        "voltage": 121.7,
         "ac_frequency": 60,
-        "energy": 12.12,
-        "current": 0.01,
-        "power": 0.2,
-        "power_factor": 0.22,
+        "energy": 12.13,
+        "current": 0.24,
+        "power": 0.1,
+        "power_factor": 0.11,
         "linkquality": 87,
         "update": {
             "state": "idle",
@@ -136,7 +136,7 @@
     "0xffffb40e0608864e": {
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 121.7,
+        "voltage": 121.8,
         "energy": 28.84,
         "countdown_to_turn_on": 0,
         "state": "ON",
@@ -171,7 +171,7 @@
     },
     "0xa4c1380d0679ffff": {
         "battery": 100,
-        "temperature": 24.1,
+        "temperature": 23.9,
         "temperature_units": "celsius",
         "temperature_calibration": 0,
         "update": {