diff --git a/packages/energy/energy.yaml b/packages/energy/energy.yaml
index 18f6d8e..a645940 100644
--- a/packages/energy/energy.yaml
+++ b/packages/energy/energy.yaml
@@ -21,6 +21,12 @@ sensor:
     unit_prefix: k
     unit_time: h
 
+  - name: Clean Energy From Grid
+    platform: integration
+    source: sensor.emporia_vue_clean_power_from_grid
+    unit_prefix: k
+    unit_time: h
+
   - name: Total Energy To Grid
     platform: integration
     source: sensor.emporia_vue_net_power_to_grid
@@ -448,7 +454,7 @@ template:
       unit_of_measurement: W
       state: >
         {% set net_power = states('sensor.emporia_d937d0_1min')|float %}{{
-          iif(net_power > 0, net_power, 0) * states('sensor.grid_fossil_fuel_percentage', 0)|float
+          iif(net_power > 0, net_power, 0) * states('sensor.grid_fossil_fuel_percentage', 0)|float / 100.0
         }}
 
     - name: Emporia Vue Net Power To Grid
@@ -470,6 +476,15 @@ template:
           + states('sensor.emporia_d937d0_1min')|float
         }}
 
+    - name: Home Clean Power Consumption
+      device_class: power
+      unit_of_measurement: W
+      state: >
+        {{
+            states('sensor.emporia_vue_clean_power_from_grid')|float
+          + states('sensor.envoy_202221032900_current_power_production')|float
+        }}
+
 # -----------------------------------------------------------------------------
 # TOU Schedules
     - name: TOU Season
@@ -513,6 +528,11 @@ utility_meter:
       - Mid-Peak
       - On-Peak
 
+  daily_energy_total:
+    source: sensor.total_energy_from_grid
+    name: Daily Energy Consumption Total
+    cycle: daily
+
   daily_low_carbon:
     source: sensor.clean_energy_from_grid
     name: Daily Low Carbon Consumption
@@ -523,6 +543,11 @@ utility_meter:
     name: Daily Energy Generation
     cycle: daily
 
+  daily_consumption:
+    source: sensor.home_total_energy
+    name: Daily Home Consumption
+    cycle: daily
+
   monthly_consumed:
     source: sensor.total_energy_from_grid
     name: Monthly Energy Consumption