diff --git a/config/automation/Speech/announcements.yaml b/config/automation/Speech/announcements.yaml
index 9a754381..ed19b117 100755
--- a/config/automation/Speech/announcements.yaml
+++ b/config/automation/Speech/announcements.yaml
@@ -25,7 +25,7 @@
           {{ trigger.to_state.entity_id }}
 
     - wait_template: "{{ states.binary_sensor.mcu1_gpio12.state == 'on' }}"
-      timeout: '00:10:00'
+      timeout: '00:05:00'
 
     - wait_template: "{{ states.binary_sensor.kitchen_door.state == 'on' }}"
       timeout: '00:1:00'
diff --git a/config/automation/late_night_helper.yaml b/config/automation/late_night_helper.yaml
index caa5271a..56ea4514 100755
--- a/config/automation/late_night_helper.yaml
+++ b/config/automation/late_night_helper.yaml
@@ -49,3 +49,14 @@
         - light.fridge
         - light.living_room_slider
         - light.M1_front_right
+
+    # Only Disarm if armed.  Otherwise, Exit out.
+    - condition: state
+      entity_id: alarm_control_panel.alexa_guard
+      state:
+        - armed_away
+        - armed_home
+        - armed
+
+    - service: alarm_control_panel.alarm_disarm
+      entity_id: alarm_control_panel.alexa_guard
diff --git a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png
index fea7ee2a..810430bf 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png and b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png differ
diff --git a/config/www/custom_ui/floorplan/images/branding/solar_readings.png b/config/www/custom_ui/floorplan/images/branding/solar_readings.png
index ad8e1b24..0580fc8f 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/solar_readings.png and b/config/www/custom_ui/floorplan/images/branding/solar_readings.png differ