diff --git a/config/automation/System/watchdog_light.yaml b/config/automation/System/watchdog_light.yaml
index 8bc66617..fe2010c7 100755
--- a/config/automation/System/watchdog_light.yaml
+++ b/config/automation/System/watchdog_light.yaml
@@ -13,12 +13,6 @@
       to: 'on'
       for: '00:20:00'
 
-    - platform: state
-      entity_id:
-        - light.upstairs_lights
-      to: 'on'
-      for: '02:00:00'
-
 #Turn it off!
   action:
     - service: homeassistant.turn_off
@@ -53,3 +47,7 @@
           - light.led_outdoor_den
           - light.outdoor_bathroom
           - light.flood2
+          - light.hallway
+          - light.hallway_lights
+          - light.foyer_lights
+          
diff --git a/config/automation/upstairs_motion_ifttt.yaml b/config/automation/upstairs_motion_ifttt.yaml
index 4aab0b62..d3b2d568 100755
--- a/config/automation/upstairs_motion_ifttt.yaml
+++ b/config/automation/upstairs_motion_ifttt.yaml
@@ -1,3 +1,9 @@
+#-------------------------------------------
+# @CCOSTAN
+# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
+# Lighitng based on Nest Away status
+#-------------------------------------------
+# Nest ThermoStat https://amzn.to/2eAhB1k
 # Uses the Nest thermostat to turn on lights and turn them off upstairs.
 
 - alias: 'Upstairs Light Turn on'
@@ -29,6 +35,11 @@
       entity_id: binary_sensor.upstairs_nest_away
       to: 'on'
 
+    - platform: state
+      entity_id: light.upstairs_lights
+      to: 'on'
+      for: '02:00:00'
+
   action:
     service: light.turn_off
     entity_id: light.upstairs_lights
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 6869a0aa..501b0913 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/Light.png b/config/www/custom_ui/floorplan/images/branding/light.png
similarity index 100%
rename from config/www/custom_ui/floorplan/images/branding/Light.png
rename to config/www/custom_ui/floorplan/images/branding/light.png
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 e7c00603..446bd64d 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