diff --git a/config/automation/Timed_Triggers/sunrise_turn_off.yaml b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
index 8f16923d..1e2702b9 100755
--- a/config/automation/Timed_Triggers/sunrise_turn_off.yaml
+++ b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
@@ -4,6 +4,7 @@
 
 - alias: 'Sunset Stuff off'
   id: 232b95e8-1354-4f63-8ae4-1063f300f2f0
+  mode: single
   trigger:
     - platform: sun
       event: sunrise
@@ -59,7 +60,6 @@
     - service: input_boolean.turn_off
       entity_id:
         - input_boolean.medicine
-        - input_boolean.daylight_override
         - input_boolean.guest_mode
 
     - service: homeassistant.update_entity  #Look for a new Home Assistant Version
diff --git a/config/automation/dark_rainy_day.yaml b/config/automation/dark_rainy_day.yaml
index 09bf68f5..705fcc90 100755
--- a/config/automation/dark_rainy_day.yaml
+++ b/config/automation/dark_rainy_day.yaml
@@ -60,10 +60,7 @@
           - light.living_room_accents
         brightness: 255
         kelvin: 5500
-        
-    - service: input_boolean.turn_on
-      entity_id:
-        - input_boolean.daylight_override
+
     - service: script.speech_engine
       data_template:
         value1: "It is getting a little dark inside the house because of the {{trigger.entity_id.split('_')[2]|replace('precip','rain') }} {{trigger.entity_id.split('_')[3]|replace('intensity',' ')}} outside.  I will turn on some extra lights in the living room."
diff --git a/config/automation/dash_buttons.yaml b/config/automation/dash_buttons.yaml
index 23b85953..9e6ca1d9 100755
--- a/config/automation/dash_buttons.yaml
+++ b/config/automation/dash_buttons.yaml
@@ -14,8 +14,6 @@
       entity_id: automation.toggle_office_light_onoff
     - service: light.toggle
       entity_id: light.office_lamp
-    - service: input_boolean.turn_on
-      entity_id: input_boolean.daylight_override
     - delay:
         minutes: 1
     # enable this automation - This prevents duplicate pushes.
diff --git a/config/packages/office_motion.yaml b/config/packages/office_motion.yaml
index 9cb86dee..bb86f213 100755
--- a/config/packages/office_motion.yaml
+++ b/config/packages/office_motion.yaml
@@ -18,16 +18,11 @@ binary_sensor:
     payload_off: 0
     device_class: motion
 
-# This boolean gets reset every night in the sunset automation.
-# Gets turned on by dash button automation primarily.
-input_boolean:
-  daylight_override:
-    name: Daylight Override
-    initial: off
 
 automation:
   - alias: 'Motion in the Office - Turn on Light'
     id: 5a8e9dc3-a851-4cce-a054-d96f599cb1f5
+    mode: restart
     trigger:
       - platform: state
         entity_id:
@@ -36,9 +31,6 @@ automation:
         from: 'off'
 
     condition:
-      - condition: state
-        entity_id: group.family
-        state: 'home'
       - condition: state
         entity_id: light.office_lights
         state: 'off'
@@ -50,22 +42,6 @@ automation:
           - condition: state
             entity_id: binary_sensor.sleepnumber_carlo_carlo_is_in_bed
             state: 'off'
-      - condition: or
-        conditions:
-          - condition: time
-            after: '18:00:00'
-          - condition: state
-            entity_id: sun.sun
-            state: 'below_horizon'
-          - condition: state
-            entity_id: input_boolean.daylight_override
-            state: 'on'
-          - condition: numeric_state
-            entity_id: sensor.dark_sky_cloud_coverage
-            above: 90
-          - condition: numeric_state
-            entity_id: sensor.dark_sky_precip_intensity
-            above: 1
 
     action:
       - service: light.turn_on
@@ -73,6 +49,7 @@ automation:
 
   - alias: 'Motion in the Office - Turn off Light'
     id: 346d8210-2160-4911-8be0-1ad696cc69d1
+    mode: restart
     trigger:
       - platform: state
         entity_id:
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 06098b9d..efef7295 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 201998ca..6e1c25e0 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