diff --git a/config/automation/good_night.yaml b/config/automation/good_night.yaml
index b7f2ad3d..f8cb19b7 100755
--- a/config/automation/good_night.yaml
+++ b/config/automation/good_night.yaml
@@ -45,3 +45,9 @@
     - service: homeassistant.turn_off
       entity_id: group.outdoor_xmas_lights
     - service: script.interior_off
+
+    - wait_template: "{{ states.media_player.master_bedroom.state == 'standby' }}"
+      timeout: '00:30:00'
+
+    - service: homeassistant.turn_off
+      entity_id: group.landscaping
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 7e70ef52..04ccb131 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 a90f4a54..17af5555 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