diff --git a/config/automation/Timed_Triggers/sunset_turn_on.yaml b/config/automation/Timed_Triggers/sunset_turn_on.yaml
index dd9ca722..6625cdf6 100755
--- a/config/automation/Timed_Triggers/sunset_turn_on.yaml
+++ b/config/automation/Timed_Triggers/sunset_turn_on.yaml
@@ -6,12 +6,11 @@
 
 - alias: 'Sunset Stuff on'
   trigger:
-    - platform: state
-      entity_id: sun.sun
-      to: 'below_horizon'
-      from: 'above_horizon'
-
+    - platform: sun
+      event: sunset
+      offset: "-00:20:00"
   action:
+    - delay: '00:{{ (range(1, 20)|random|int) }}:00'
     - service: script.tweet_engine_image
       data_template:
         tweet: >-
@@ -40,7 +39,6 @@
           "/config/www/custom_ui/floorplan/images/branding/landscape_light.png",
           "/config/www/custom_ui/floorplan/images/branding/sunset.png"
           ] | random }}
-    - delay: '00:{{ (range(1, 20)|random|int) }}:00'
     - service: script.speech_engine
       data:
         call_dark_outside: 1
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 59177296..b634d420 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 40416166..e74fb0e8 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