diff --git a/config/packages/climate.yaml b/config/packages/climate.yaml
index c1c8c6c2..249a88cd 100644
--- a/config/packages/climate.yaml
+++ b/config/packages/climate.yaml
@@ -231,8 +231,8 @@ automation:
         below: 76
     condition:
       - condition: state
-        entity_id: binary_sensor.grid_status
-        state: 'normal'
+        entity_id: binary_sensor.powerwall_grid_status
+        state: 'on'
     action:
       - delay: "00:03:00"
       - service: climate.set_temperature
@@ -256,8 +256,8 @@ automation:
             entity_id: binary_sensor.sleepnumber_carlo_stacey_is_in_bed
             state: 'on'
           - condition: state
-            entity_id: binary_sensor.grid_status
-            state: 'normal'
+            entity_id: binary_sensor.powerwall_grid_status
+            state: 'on'
       - condition: state
         entity_id: sun.sun
         state: 'below_horizon'
@@ -292,8 +292,8 @@ automation:
             entity_id: input_boolean.guest_mode
             state: 'off'
           - condition: state
-            entity_id: binary_sensor.grid_status
-            state: 'normal'
+            entity_id: binary_sensor.powerwall_grid_status
+            state: 'on'
     action:
       - service: climate.set_hvac_mode
         data:
@@ -348,8 +348,8 @@ automation:
         entity_id: input_boolean.guest_mode
         state: 'off'
       - condition: state
-        entity_id: binary_sensor.grid_status
-        state: 'normal'
+        entity_id: binary_sensor.powerwall_grid_status
+        state: 'on'
     action:
       - service: climate.set_preset_mode
         data:
@@ -375,8 +375,8 @@ automation:
         at: "03:00:00"
     condition:
       - condition: state
-        entity_id: binary_sensor.grid_status
-        state: 'normal'
+        entity_id: binary_sensor.powerwall_grid_status
+        state: 'on'
     action:
       - service: climate.set_hvac_mode
         data:
@@ -408,8 +408,8 @@ automation:
       - condition: template # Only run if AC is idle (prevents fighting other automations)
         value_template: "{{ state_attr('climate.downstairs', 'hvac_action') == 'idle' }}"
       - condition: state # Never run if the grid is down and running on powerwall.
-        entity_id: binary_sensor.grid_status
-        state: 'normal'
+        entity_id: binary_sensor.powerwall_grid_status
+        state: 'on'
     action:
       - service: climate.set_preset_mode
         data:
diff --git a/config/packages/powerwall.yaml b/config/packages/powerwall.yaml
index fb8fcdfa..4c928dae 100755
--- a/config/packages/powerwall.yaml
+++ b/config/packages/powerwall.yaml
@@ -5,8 +5,36 @@
 # Read more about this on https://www.vcloudinfo.com
 # Tesla Powerwall added via UI Integration
 # Tesla Powerwall Monitoring #272
-######################################################################################################
-
+######################################################################
+# --------------------------------------------------------------
+# Binary Sensors:
+#  - binary_sensor.powerwall_charging ............. battery_charging (on=charging)
+#  - binary_sensor.powerwall_connected_to_tesla ... connectivity (on=connected)
+#  - binary_sensor.powerwall_grid_services_active .. power (on=active)
+#  - binary_sensor.powerwall_grid_status .......... power (on=grid up)
+#  - binary_sensor.powerwall_status ............... power (on=system ok)
+#
+# Power & Energy Sensors:
+#  - sensor.powerwall_charge ...................... battery %, 0–100
+#  - sensor.powerwall_backup_reserve .............. reserve %, 0–100
+#  - sensor.powerwall_battery_power ............... kW (+discharge / -charge)
+#  - sensor.powerwall_load_power .................. kW house load
+#  - sensor.powerwall_site_power .................. kW (+export / -import)
+#  - sensor.powerwall_solar_power ................. kW solar production
+#
+# Lifetime kWh Meters:
+#  - sensor.powerwall_battery_export .............. kWh → grid/load
+#  - sensor.powerwall_battery_import .............. kWh ← battery charged
+#  - sensor.powerwall_load_export ................. kWh exported from loads
+#  - sensor.powerwall_load_import ................. kWh imported to loads
+#  - sensor.powerwall_site_export ................. kWh site → grid
+#  - sensor.powerwall_site_import ................. kWh site ← grid
+#  - sensor.powerwall_solar_export ................ kWh solar → site/battery/grid
+#  - sensor.powerwall_solar_import ................ kWh solar ← grid (rare)
+#
+# Switches:
+#  - switch.powerwall_off_grid_operation .......... island mode toggle
+######################################################################
 
 #-------------------------------------------
 automation: