diff --git a/.storage/lovelace.3d_printer_cellphone b/.storage/lovelace.3d_printer_cellphone
index 8a6eea18..0bf4dc1f 100644
--- a/.storage/lovelace.3d_printer_cellphone
+++ b/.storage/lovelace.3d_printer_cellphone
@@ -101,15 +101,16 @@
                   }
                 },
                 {
+                  "type": "custom:mushroom-template-card",
                   "entity": "sensor.sparkx_i7_filament_weight_estimated",
                   "grid_options": {
-                    "columns": 6
+                    "columns": 12
                   },
-                  "icon": "{% set st = states('sensor.sparkx_i7_print_status') %}{% if st in ['printing', 'paused'] %}mdi:printer-3d-nozzle{% else %}mdi:calendar-today{% endif %}",
+                  "icon": "{% set st = states('sensor.sparkx_i7_print_status') %} {% if st in ['printing', 'paused'] %}\n  mdi:printer-3d-nozzle\n{% else %}\n  mdi:cash-multiple\n{% endif %}",
+                  "icon_color": "{% set st = states('sensor.sparkx_i7_print_status') %} {% if st in ['printing', 'paused'] %}\n  blue\n{% else %}\n  green\n{% endif %}",
                   "multiline_secondary": true,
-                  "name": "Filament Used",
-                  "primary": "{% set st = states('sensor.sparkx_i7_print_status') %}{% if st in ['printing', 'paused'] %}{{ states('sensor.sparkx_i7_filament_weight_estimated') | round(1) }} g{% else %}Last job: {{ states('input_number.sparkx_i7_last_job_filament_weight') | round(1) }} g{% endif %}",
-                  "type": "custom:mushroom-template-card"
+                  "primary": "{% set st = states('sensor.sparkx_i7_print_status') %} {% if st in ['printing', 'paused'] %}\n  {{ states('sensor.sparkx_i7_filament_weight_estimated') | round(1) }} g\n{% else %}\n  Last: {{ states('input_number.sparkx_i7_last_job_filament_weight') | round(1) }} g\n{% endif %}",
+                  "secondary": "{% set st = states('sensor.sparkx_i7_print_status') %} {% if st in ['printing', 'paused'] %}\n  {{ states('sensor.sparkx_i7_filament_cost') | round(2) }} $ (live)\n{% else %}\n  {{ states('input_number.sparkx_i7_last_job_cost') | round(2) }} $ (last job)\n{% endif %}"
                 },
                 {
                   "type": "heading",
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index 4f64a566..ffe80348 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -47,7 +47,7 @@
         "countdown_to_turn_off": 0,
         "voltage": 121.5,
         "countdown_to_turn_on": 0,
-        "energy": 105.8,
+        "energy": 105.81,
         "power_factor": 0.89,
         "ac_frequency": 60,
         "update": {
@@ -58,7 +58,7 @@
             "latest_release_notes": null
         },
         "linkquality": 145,
-        "power": 85.7,
+        "power": 86.5,
         "current": 0.85,
         "power_on_behavior": "on"
     },
@@ -74,13 +74,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 119.5,
+        "voltage": 120.5,
         "state": "ON",
         "ac_frequency": 60,
         "energy": 215.2,
-        "power": 99,
-        "current": 0.92,
-        "power_factor": 0.95,
+        "power": 0.7,
+        "current": 0.02,
+        "power_factor": 0.34,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -95,10 +95,10 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 121.8,
-        "energy": 101.72,
+        "voltage": 121.3,
+        "energy": 101.73,
         "state": "ON",
-        "power": 26.2,
+        "power": 24,
         "current": 0.33,
         "ac_frequency": 60,
         "power_factor": 0.62,
@@ -119,7 +119,7 @@
         "energy": 14.73,
         "current": 0.01,
         "power": 0.1,
-        "power_factor": 0.11,
+        "power_factor": 0.13,
         "linkquality": 116,
         "update": {
             "state": "idle",
@@ -171,7 +171,7 @@
     },
     "0xa4c1380d0679ffff": {
         "battery": 100,
-        "temperature": 19.9,
+        "temperature": 19.7,
         "temperature_units": "celsius",
         "temperature_calibration": 0,
         "update": {