diff --git a/config/.HA_VERSION b/config/.HA_VERSION
index 26ed8f1b..0c960d54 100755
--- a/config/.HA_VERSION
+++ b/config/.HA_VERSION
@@ -1 +1 @@
-2025.2.5
\ No newline at end of file
+2025.3.3
\ No newline at end of file
diff --git a/config/UI YAML/Overview/Light_Stack.yaml b/config/UI YAML/Overview/Light_Stack.yaml
index 6368497b..106f7460 100755
--- a/config/UI YAML/Overview/Light_Stack.yaml	
+++ b/config/UI YAML/Overview/Light_Stack.yaml	
@@ -130,3 +130,58 @@ cards:
     tap_action:
       action: toggle
     card_layout: large
+  - type: custom:bubble-card
+    card_type: button
+    button_type: state
+    entity: group.exterior_lights
+    name: Exterior Lights
+    icon: mdi:palm-tree
+    show_state: true
+    show_attribute: false
+    show_last_changed: true
+    grid_options:
+      columns: 6
+      rows: 1
+  - type: custom:bubble-card
+    card_type: button
+    entity: sensor.lights_on_count
+    name: Lights On
+    icon: mdi:lightbulb-on-outline
+    show_state: true
+    tap_action:
+      action: navigate
+      navigation_path: "#lights-popup"
+    button_action:
+      tap_action:
+        action: navigate
+        navigation_path: "#lights-popup"
+  - type: vertical-stack
+    cards:
+      - type: custom:bubble-card
+        card_type: pop-up
+        hash: "#lights-popup"
+        name: Lights Control
+        icon: mdi:lightbulb-group
+        width_desktop: 500px
+        show_header: true
+        entity: sensor.lights_on_count
+        button_type: name
+      - type: custom:auto-entities
+        filter:
+          include:
+            - domain: light
+          exclude:
+            - state: "off"
+            - state: unavailable
+            - hidden_by: user
+        show_empty: true
+        entity: sensor.lights_on_count
+        button_type: state
+        show_name: true
+        card:
+          type: custom:auto-entities
+          card:
+            type: entities
+          filter:
+            include: []
+            exclude: []
diff --git a/config/UI YAML/Overview/Power_Stack.yaml b/config/UI YAML/Overview/Power_Stack.yaml
new file mode 100755
index 00000000..208b9502
--- /dev/null
+++ b/config/UI YAML/Overview/Power_Stack.yaml	
@@ -0,0 +1,53 @@
+# Power Stack Card Configuration
+# For more information visit: https://www.vcloudinfo.com/click-here
+
+type: vertical-stack
+cards:
+  - type: grid
+    cards:
+      - type: custom:power-flow-card-plus
+        entities:
+          battery:
+            state_of_charge: sensor.powerwall_charge
+            entity: sensor.powerwall_battery_power
+            use_metadata: false
+            invert_state: false
+            state_of_charge_unit_white_space: true
+            show_state_of_charge: true
+          grid:
+            secondary_info: {}
+            entity: sensor.powerwall_site_power
+          solar:
+            display_zero_state: true
+            secondary_info: {}
+            entity: sensor.powerwall_solar_power
+            icon: mdi:white-balance-sunny
+            color_icon: true
+          home:
+            secondary_info: {}
+            entity: sensor.powerwall_load_power
+        clickable_entities: true
+        display_zero_lines:
+          mode: grey_out
+          transparency: 50
+          grey_color:
+            - 189
+            - 189
+            - 189
+        use_new_flow_rate_model: true
+        w_decimals: 0
+        kw_decimals: 1
+        min_flow_rate: 0.75
+        max_flow_rate: 4
+        max_expected_power: 2000
+        min_expected_power: 0.01
+        watt_threshold: 1000
+        transparency_zero_lines: 0
+        grid_options:
+          columns: full
+          rows: auto
+      - type: vertical-stack
+        cards:
+          - type: energy-solar-graph
+          - type: energy-water-graph
+
diff --git a/config/automation/Timed_Triggers/0700.yaml b/config/automation/Timed_Triggers/0700.yaml
deleted file mode 100755
index ebc6ab26..00000000
--- a/config/automation/Timed_Triggers/0700.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-######################################################################
-##  Stuff that needs to happen at 08:30am.
-######################################################################
-
-- alias: 'Kids 700'
-  id: 3e0c4f40-0d55-42a0-9af9-37124b1b9b8b
-  mode: single
-  trigger:
-    - platform: time
-      at: '08:30:00'
-
-  condition:
-    - condition: state
-      entity_id: group.family
-      state: home
-    - condition: state
-      entity_id: input_boolean.school_mode
-      state: 'on'
-    - condition: time
-      weekday:
-        - mon
-        - tue
-        - wed
-        - thu
-        - fri
-
-  action:
-    - service: homeassistant.turn_on
-      entity_id:
-        - light.d1
-        - light.d2
-        - switch.office_lamp_switch_socket
-    - service: light.turn_off
-      entity_id:
-        - light.dining_room_lights
-
-    - wait_template: >-
-       {{ states.sun.sun.state == 'above_horizon' }}
-    - service: homeassistant.turn_off
-      entity_id:
-        - group.kitchen_accents        
-    - service: light.turn_off
-      entity_id: all
diff --git a/config/automation/Timed_Triggers/0800.yaml b/config/automation/Timed_Triggers/0800.yaml
deleted file mode 100755
index f218642c..00000000
--- a/config/automation/Timed_Triggers/0800.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-######################################################################
-##  Stuff that needs to happen at 08:00am.
-######################################################################
-
-- alias: 'Timed 0800'
-  id: 7bf33e23-021c-4e11-946b-b052b81fd2bc
-  mode: single
-  trigger:
-    - platform: time
-      at: '08:00:00'
-
-  condition:
-    - condition: state
-      entity_id: group.family
-      state: home
-    - condition: state
-      entity_id: input_boolean.school_mode
-      state: 'on'
-    - condition: time
-      weekday:
-        - mon
-        - tue
-        - wed
-        - thu
-        - fri
-
-  action:
-    - service: homeassistant.turn_on
-      entity_id:
-        - group.kitchen_accents
-    - delay: 00:15:00
-    - service: homeassistant.turn_on
-      entity_id:
-        - light.sink
-        - light.fridge
-        - light.k4
diff --git a/config/automation/Timed_Triggers/0830.yaml b/config/automation/Timed_Triggers/0830.yaml
index 33bd6f56..291db10a 100755
--- a/config/automation/Timed_Triggers/0830.yaml
+++ b/config/automation/Timed_Triggers/0830.yaml
@@ -1,12 +1,13 @@
 ######################################################################
-##  Automation for 08:30 AM Daily Tasks
+##  Automation for 07:00 AM Daily Tasks
 ##  https://www.vcloudinfo.com/click-here
 ##  This automation handles actions to be performed at 8:30 AM,
 ##  typically related to the family's morning routine.
 ######################################################################
 
-- alias: 'Kids left for the day'
-  id: 7cc9a7d6-8918-4a4a-98e7-a46abc9df4f1
+- alias: 'Kids 830'
+  id: 3e0c4f40-0d55-42a0-9af9-37124b1b9b8b
+  mode: single
   trigger:
     - platform: time
       at: '08:30:00'
@@ -15,22 +16,30 @@
     - condition: state
       entity_id: group.family
       state: home
+
     - condition: state
-      entity_id: input_boolean.guest_mode
-      state: 'off'
-    - condition: state
-      entity_id: input_boolean.school_mode
-      state: 'on'
-    - condition: time
-      weekday:
-        - mon
-        - tue
-        - wed
-        - thu
-        - fri
+      entity_id: sun.sun
+      state: below_horizon
+
   action:
-    - wait_template: "{{ is_state('group.garage_doors', 'open') }}"
-      timeout: '00:45:00'
-    - delay: 00:03:00
+    - service: homeassistant.turn_on
+      entity_id:
+        - light.d1
+        - light.d2
+        - light.sink
+        - light.fridge
+        - light.k4
+        - group.kitchen_accents
+        - switch.office_lamp_switch_socket
+        
+    - wait_template: >-
+       {{ states.sun.sun.state == 'above_horizon' }}
+    - service: homeassistant.turn_on
+      entity_id: switch.alarm_panel_1_motion_detection   
+    - service: button.press
+      entity_id: button.alarm_panel_1_restart_browser
+    - service: homeassistant.turn_off
+      entity_id:
+        - group.kitchen_accents        
     - service: light.turn_off
       entity_id: all
diff --git a/config/automation/Timed_Triggers/2200.yaml b/config/automation/Timed_Triggers/2200.yaml
index c82005e4..d845c835 100755
--- a/config/automation/Timed_Triggers/2200.yaml
+++ b/config/automation/Timed_Triggers/2200.yaml
@@ -17,7 +17,7 @@
     - wait_template: >-
        {{ not is_state('media_player.livingroomCC', 'playing') }}
     - wait_template: >-
-       {{ not is_state('media_player.whole_house', 'playing') }}
+       {{ not is_state('media_player.everywhere', 'playing') }}
 
     - service: script.speech_engine
       data:
diff --git a/config/automation/Timed_Triggers/night_watchdog.yaml b/config/automation/Timed_Triggers/night_watchdog.yaml
index ca4f2a79..11d0362a 100755
--- a/config/automation/Timed_Triggers/night_watchdog.yaml
+++ b/config/automation/Timed_Triggers/night_watchdog.yaml
@@ -14,7 +14,7 @@
       to: 'off'
       for: '00:02:00'
     - platform: state
-      entity_id: media_player.whole_house
+      entity_id: media_player.everywhere
       to: 'off'
       for: '00:02:00'
 
diff --git a/config/automation/Timed_Triggers/sunrise_turn_off.yaml b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
index bd116e9a..cbcb009b 100755
--- a/config/automation/Timed_Triggers/sunrise_turn_off.yaml
+++ b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
@@ -35,6 +35,7 @@
         - group.exterior_lights
         - light.outdoor_front_lights
         - group.outdoor_seasonal
+        - group.kitchen_accents
 
     - service: input_boolean.turn_off
       entity_id:
diff --git a/config/automation/Timed_Triggers/wake_up.yaml b/config/automation/Timed_Triggers/wake_up.yaml
index 6b46c49d..d7c923c6 100755
--- a/config/automation/Timed_Triggers/wake_up.yaml
+++ b/config/automation/Timed_Triggers/wake_up.yaml
@@ -21,8 +21,9 @@
       after: '07:00:00'
       before: '11:00:00'
   action:
-    - service: light.turn_on
+    - service: homeassistant.turn_on
       entity_id:
+        - switch.lr_amp
         - light.kitchen_lights
-    - service: switch.turn_on
-      entity_id: switch.lr_amp
+        - switch.alarm_panel_1_motion_detection
+    
\ No newline at end of file
diff --git a/config/automation/good_night.yaml b/config/automation/good_night.yaml
index f7d1cede..6c908deb 100755
--- a/config/automation/good_night.yaml
+++ b/config/automation/good_night.yaml
@@ -51,7 +51,9 @@
         - group.outdoor_seasonal
         - switch.kitchen_accent_2
         - group.master_bathroom_accents
+        - switch.alarm_panel_1_motion_detection
     - service: script.interior_off
+    
 
 - alias: 'Bed Presence AMP Trigger'
   id: 26846f7b-bc76-43d2-99be-af552d2300f
@@ -66,7 +68,6 @@
       entity_id: group.bed
       to: 'off'
       id: "out_of_bed"
-
   action:
     choose:
       - alias: "SomeOne in Bed"
@@ -83,8 +84,8 @@
                 - switch.kitchen_accent_2
                 - light.outdoor_bathroom
                 - group.master_bathroom_accents
-                - group.landscaping     
-
+                - group.landscaping    
+                - switch.alarm_panel_1_motion_detection 
     default:
       - service: homeassistant.turn_on
         target:
diff --git a/config/group/media_players.yaml b/config/group/media_players.yaml
index 6902762e..b3696ddd 100755
--- a/config/group/media_players.yaml
+++ b/config/group/media_players.yaml
@@ -4,7 +4,7 @@ media_players:
     - media_player.living_room_tv
     - media_player.living_room_ultra
     - media_player.upstairs_living_room
-#    - media_player.bedroom_alarm_panel
+    - media_player.bedroom_tablet
     - media_player.living_room
     - media_player.front_room_flex
     - media_player.garage
diff --git a/config/packages/phynplus.yaml b/config/packages/phynplus.yaml
index 3f3e4586..4716bcb7 100755
--- a/config/packages/phynplus.yaml
+++ b/config/packages/phynplus.yaml
@@ -22,7 +22,7 @@ automation:
     condition:
       - condition: time
         before: '03:00'
-        after: '04:00'
+        after: '05:00'
 
     action:
       - service: script.notify_engine_two_button
diff --git a/config/packages/stats.yaml b/config/packages/stats.yaml
index a3f68587..48b2e4e5 100755
--- a/config/packages/stats.yaml
+++ b/config/packages/stats.yaml
@@ -91,6 +91,19 @@ sensor:
         value_template: >
           {{ states.light | list | count }}
 
+      lights_on_count:
+        friendly_name: "Number of lights on"
+        value_template: >-
+           {% set lights = states.light | selectattr('state', 'eq', 'on') | list %}
+           {% set qty = lights | count %}
+           {% set p1 = 'lights are' if qty > 1 else 'light is' %}
+
+           {% if qty == 0 %} 
+            No lights on.
+           {% else %}
+            {{ qty }} {{ p1 }} on.
+           {% endif %}
+
       protect_count:
         friendly_name: 'Number of Smoke Detectors'
         value_template: >
diff --git a/config/packages/triggers/last_message.yaml b/config/packages/triggers/last_message.yaml
index 356670c3..3996aef0 100755
--- a/config/packages/triggers/last_message.yaml
+++ b/config/packages/triggers/last_message.yaml
@@ -55,7 +55,7 @@ automation:
         entity_id:
           - media_player.livingroomCC
           # - media_player.entry_alarm_panel
-          # - media_player.bedroom_alarm_panel
+          # - media_player.bedroom_tablet
         data:
           options: 
             voice: JennyNeural
diff --git a/config/packages/triggers/self_destruct.yaml b/config/packages/triggers/self_destruct.yaml
index 4c00eca2..4ccda0aa 100755
--- a/config/packages/triggers/self_destruct.yaml
+++ b/config/packages/triggers/self_destruct.yaml
@@ -46,7 +46,7 @@ automation:
       entity_id:
           - media_player.livingroomCC
           # - media_player.entry_alarm_panel
-          # - media_player.bedroom_alarm_panel
+          # - media_player.bedroom_tablet
       data:
         media_content_id: >
           "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/speechcons/self_destruct.mp3"
diff --git a/config/script/amp_settings.yaml b/config/script/amp_settings.yaml
index a462d806..19c02ca6 100755
--- a/config/script/amp_settings.yaml
+++ b/config/script/amp_settings.yaml
@@ -23,8 +23,7 @@ amp_settings:
             {% if media_player | length == 0 %}
               {% set media_player = [
                 'media_player.livingroomcc',
-                'media_player.alarm_clock',
-                'media_player.bedroom_alarm_panel'
+                'media_player.bedroom_tablet'
               ] %}
             {% endif %}
 
diff --git a/config/templates/speech/briefing.yaml b/config/templates/speech/briefing.yaml
index e4efb4f0..b5cb2d7a 100755
--- a/config/templates/speech/briefing.yaml
+++ b/config/templates/speech/briefing.yaml
@@ -244,6 +244,7 @@
     - Justin (Son): {{ states('person.justin') }} at {{ states('sensor.justin_place') if states('sensor.justin_place') != unknown else 'Away' }} 
     - Paige (Daughter): {{ states('person.paige') }} at {{ states('sensor.paige_place') if states('sensor.paige_place') != unknown else 'Away' }} 
     and our cat Molly: Always home.
+    - Location Context: When Paige is at FSU, you can say she is at her Dorm.  When Justin is at Stefanos, you can say he is at work. 
     Previous broadcast: "{{ state_attr('sensor.openai_response', 'response') }}"
     [Announce where everyone is if they are not at home. Avoid repeating information from the previous broadcast if it was within the hour]