diff --git a/config/packages/energy.yaml b/config/packages/energy.yaml
index d882ba8..03c1012 100644
--- a/config/packages/energy.yaml
+++ b/config/packages/energy.yaml
@@ -2,6 +2,7 @@
 
 utility_meter:
   monthly_energy_import:
+    unique_id: 45592bcec26dce9610a2
     source: sensor.eagle_200_total_meter_energy_delivered
     name: Energy imported
     cycle: monthly
@@ -10,6 +11,7 @@ utility_meter:
       - offpeak
 
   daily_energy_import:
+    unique_id: 369a60ac77147745dc93
     source: sensor.eagle_200_total_meter_energy_delivered
     name: Energy imported
     cycle: daily
@@ -18,11 +20,13 @@ utility_meter:
       - offpeak
 
   monthly_energy_export:
+    unique_id: f1ad1161d984e5318715
     source: sensor.eagle_200_total_meter_energy_received
     name: Energy exported
     cycle: monthly
 
   daily_energy_export:
+    unique_id: 327f806728f2d087e8e5
     source: sensor.eagle_200_total_meter_energy_received
     name: Energy exported
     cycle: daily
@@ -83,36 +87,6 @@ rest_command:
     content_type: "application/x-www-form-urlencoded"
 
 sensor:
-  #   entity_id: sensor.inverter_grid_power_demand
-  #   state_characteristic: average_linear
-  #   max_age: "00:05"
-  # - platform: statistics
-  #   name: "Eagle-200 meter power demand (smooth)"
-  #   unique_id: 5596672fba54c89c2131
-  #   entity_id: sensor.eagle_200_meter_power_demand_w
-  #   state_characteristic: average_linear
-  #   max_age: "00:05"
-
-  # - platform: filter
-  #   name: "Inverter grid power demand (smooth)"
-  #   unique_id: 88bfc3a211f1540c90cf
-  #   entity_id: sensor.inverter_grid_power_demand
-  #   filters:
-  #     - filter: lowpass
-  #       time_constant: 30
-  #     - filter: time_simple_moving_average
-  #       window_size: "00:02"
-
-  # - platform: filter
-  #   name: "Eagle-200 meter power demand (smooth)"
-  #   unique_id: 5596672fba54c89c2131
-  #   entity_id: sensor.eagle_200_meter_power_demand_w
-  #   filters:
-  #     - filter: lowpass
-  #       time_constant: 30
-  #     - filter: time_simple_moving_average
-  #       window_size: "00:02"
-
   - platform: template
     sensors:
       # energy_import_price:
@@ -149,49 +123,6 @@ sensor:
         unit_of_measurement: W
         device_class: power
 
-      household_power_demand:
-        unique_id: c596e6b17b53069d1e9f
-        friendly_name: Household power demand
-        unit_of_measurement: W
-        device_class: power
-        value_template: >-
-          {{ states('sensor.inverter_active_power') | float +
-               states('sensor.eagle_200_meter_power_demand_w') | float }}
-
-      inverter_load_gap:
-        unique_id: c6a037b515944aeb1b67
-        friendly_name: Inverter load gap
-        value_template: >-
-          {{ states('sensor.inverter_load_power') | float - (
-                states('sensor.inverter_active_power') | float +
-                states('sensor.eagle_200_meter_power_demand_w') | float
-              ) }}
-        unit_of_measurement: W
-        device_class: power
-
-      inverter_demand_gap:
-        unique_id: 534503cd38944c345a6a
-        friendly_name: Inverter demand gap
-        value_template: >-
-          {{ (states('sensor.eagle_200_meter_power_demand_w') | float) -
-             (-1 * states('sensor.inverter_export_power') | float) }}
-        unit_of_measurement: W
-        device_class: power
-
-      inverter_demand_gap_perc:
-        unique_id: 12b4d474286fab17319d
-        friendly_name: Inverter demand gap %
-        value_template: >-
-          {{ 100 * (-1 * states('sensor.inverter_export_power') | float) / (states('sensor.eagle_200_meter_power_demand_w') | float) }}
-        unit_of_measurement: "%"
-
-      # inverter_demand_gap_perc_smooth:
-      #   unique_id: ad811b463d9a0a332c62
-      #   friendly_name: Inverter demand gap % (smooth)
-      #   value_template: >-
-      #     {{ 100 * states('sensor.inverter_grid_power_demand_smooth') | float / states('sensor.eagle_200_meter_power_demand_smooth') | float }}
-      #   unit_of_measurement: "%"
-
       current_electricity_cost:
         unique_id: current_electricity_cost
         value_template: |
diff --git a/config/zigbee2mqtt/state.json b/config/zigbee2mqtt/state.json
index 678f710..923b5b4 100644
--- a/config/zigbee2mqtt/state.json
+++ b/config/zigbee2mqtt/state.json
@@ -13,7 +13,7 @@
         "battery": 41,
         "temperature": 19,
         "linkquality": 255,
-        "device_temperature": 21,
+        "device_temperature": 23,
         "power_outage_count": 8
     },
     "0x00158d00080915bd": {
@@ -22,20 +22,20 @@
         "battery": 44,
         "temperature": 17,
         "linkquality": 255,
-        "device_temperature": 18,
+        "device_temperature": 19,
         "power_outage_count": 7
     },
     "0x00158d0007e7725b": {
-        "contact": false,
+        "contact": true,
         "voltage": 2975,
         "battery": 36,
         "temperature": 18,
         "linkquality": 255,
-        "device_temperature": 22,
+        "device_temperature": 23,
         "power_outage_count": 8
     },
     "0x00158d0008091b58": {
-        "contact": true,
+        "contact": false,
         "voltage": 3025,
         "battery": 50,
         "temperature": 12,
@@ -45,11 +45,11 @@
     },
     "0x00158d0007e4c4f2": {
         "contact": true,
-        "voltage": 2975,
-        "battery": 36,
+        "voltage": 2985,
+        "battery": 39,
         "temperature": 21,
         "linkquality": 255,
-        "device_temperature": 23,
+        "device_temperature": 24,
         "power_outage_count": 41
     },
     "0x5c0272fffee93bae": {
@@ -67,11 +67,11 @@
         "linkquality": 191
     },
     "0xa4c138fda4db2c5e": {
-        "occupancy": true,
+        "occupancy": false,
         "battery": 50,
         "sensitivity": "high",
         "keep_time": "120",
-        "illuminance": 898,
+        "illuminance": 364,
         "linkquality": 127
     },
     "0x84b4dbfffe850fda": {
diff --git a/lovelace/lovelace.lovelace_solar.yaml b/lovelace/lovelace.lovelace_solar.yaml
index 6e1ca91..a58ea49 100644
--- a/lovelace/lovelace.lovelace_solar.yaml
+++ b/lovelace/lovelace.lovelace_solar.yaml
@@ -65,6 +65,42 @@ config:
         unit: kWh
       title: Forecast
       type: entities
+    - entities:
+      - entities:
+        - entity: sensor.daily_energy_export
+          format: precision1
+          name: export
+        - entity: sensor.daily_energy_import_peak
+          format: precision1
+          name: peak
+        entity: sensor.daily_energy_import_offpeak
+        format: precision1
+        name: Today
+        state_header: offpeak
+        type: custom:multiple-entity-row
+      - entities:
+        - entity: sensor.monthly_energy_export
+          format: precision1
+          name: export
+        - entity: sensor.monthly_energy_import_peak
+          format: precision1
+          name: peak
+        entity: sensor.monthly_energy_import_offpeak
+        format: precision1
+        name: Cycle
+        state_header: offpeak
+        type: custom:multiple-entity-row
+      - entities:
+        - entity: sensor.eagle_200_total_meter_energy_received
+          format: precision1
+          name: exported
+        entity: sensor.eagle_200_total_meter_energy_delivered
+        format: precision1
+        name: Eagle-200 (all time)
+        state_header: imported
+        type: custom:multiple-entity-row
+      title: Trading
+      type: entities
     - cards:
       - entities:
         - entity: sensor.inverter_battery_level