diff --git a/config/automation/System/watchdog_light.yaml b/config/automation/System/watchdog_light.yaml
index 45a9ae5c..3eade75c 100755
--- a/config/automation/System/watchdog_light.yaml
+++ b/config/automation/System/watchdog_light.yaml
@@ -50,3 +50,4 @@
           - light.led_garage_small
           - light.led_outdoor_den
           - light.outdoor_bathroom
+          - light.flood2
diff --git a/config/automation/upstairs_motion_ifttt.yaml b/config/automation/upstairs_motion_ifttt.yaml
index 2735b72d..4db14f3b 100755
--- a/config/automation/upstairs_motion_ifttt.yaml
+++ b/config/automation/upstairs_motion_ifttt.yaml
@@ -5,7 +5,7 @@
     - platform: event
       event_type: upstairs_light_on
     - platform: state
-      entity_id: binary_sensor.upstairs_away_mode
+      entity_id: sensor.upstairs_away_mode
       to: 'False'
 
   condition:
@@ -24,7 +24,7 @@
     - platform: event
       event_type: upstairs_light_off
     - platform: state
-      entity_id: binary_sensor.upstairs_away_mode
+      entity_id: sensor.upstairs_away_mode
       to: 'True'
 
   action:
diff --git a/config/packages/nest_protects.yaml b/config/packages/nest_protects.yaml
index 85c691f8..fc6e2efb 100755
--- a/config/packages/nest_protects.yaml
+++ b/config/packages/nest_protects.yaml
@@ -5,82 +5,7 @@
 # - Write up- https://www.vcloudinfo.com/2017/06/psa-check-out-your-smoke-detectors-once.html
 ######################################################################################################
 #-----------------------------------
-homeassistant:
-  customize_glob:
-    "sensor.*_co_status":
-      
-    
-    "sensor.*_battery_health":
-      
-    
-    "sensor.*_color_status":
-      
-    
-    "sensor.*_smoke_status":
-      
-    
-    "sensor.*_security_state":
-      
-    
 
-  customize:
-
-    binary_sensor.hallway_nest_protect_kids_hallway_online:
-      friendly_name: Kids Hallway Protect
-      icon: mdi:nest-protect
-
-    binary_sensor.justins_room_nest_protect_online:
-      friendly_name: Justins Room Protect
-      icon: mdi:nest-protect
-
-    binary_sensor.kitchen_nest_protect_online:
-      friendly_name: Kitchen Protect
-      icon: mdi:nest-protect
-
-    binary_sensor.master_bedroom_nest_protect_online:
-      friendly_name: Master Bedroom Protect
-      icon: mdi:nest-protect
-
-    binary_sensor.master_hallway_nest_protect_online:
-      friendly_name: Master Hallway Protect
-      icon: mdi:nest-protect
-
-    binary_sensor.paiges_room_nest_protect_paiges_room_online:
-      friendly_name: Paiges Room Protect
-      icon: mdi:nest-protect
-
-    binary_sensor.upstairs_bedroom_nest_protect_online:
-      friendly_name: Upstairs Bedroom Protect
-      icon: mdi:nest-protect
-
-    binary_sensor.upstairs_living_room_nest_protect_online:
-      friendly_name: Upstairs Living Room Protect
-      icon: mdi:nest-protect
-
-    binary_sensor.office_nest_protect_online:
-        friendly_name: Office Protect
-        icon: mdi:nest-protect
-
-    group.protects:
-    
-#-------------------------------------------
-
-#-------------------------------------------
-group:
-  protects:
-    name: Nest Protects
-    entities:
-      - binary_sensor.upstairs_living_room_nest_protect_online
-      - binary_sensor.hallway_nest_protect_kids_hallway_online
-      - binary_sensor.justins_room_nest_protect_online
-      - binary_sensor.kitchen_nest_protect_online
-      - binary_sensor.master_bedroom_nest_protect_online
-      - binary_sensor.master_hallway_nest_protect_online
-      - binary_sensor.paiges_room_nest_protect_paiges_room_online
-      - binary_sensor.upstairs_bedroom_nest_protect_online
-      - binary_sensor.office_nest_protect_online
-
-#-------------------------------------------
 automation:
   - alias: Nest protect emergency
 
diff --git a/config/sensor/nest.yaml b/config/sensor/nest.yaml
index 8d260158..cd1eb842 100755
--- a/config/sensor/nest.yaml
+++ b/config/sensor/nest.yaml
@@ -4,24 +4,24 @@
 # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
 ###################################################
 
-- platform: nest
-  monitored_conditions:
+#- platform: nest
+#  monitored_conditions:
 #     - 'temperature'
 #     - 'target'
-     - 'humidity'
+#     - 'humidity'
 #     - 'operation_mode'
 #     - 'last_connection'
 #     - 'co_status'
 #     - 'smoke_status'
 
-- platform: template
-  sensors:
-     upstairs_away_mode:
-       entity_id: []
-       value_template: "{{ is_state_attr('climate.upstairs', 'away_mode', 'on') }}"
-
-- platform: template
-  sensors:
-     downstairs_away_mode:
-       entity_id: []
-       value_template: "{{ is_state_attr('climate.downstairs', 'away_mode', 'on') }}"
+# - platform: template
+#   sensors:
+#      upstairs_away_mode:
+#        entity_id: []
+#        value_template: "{{ is_state_attr('climate.upstairs', 'away_mode', 'on') }}"
+#
+# - platform: template
+#   sensors:
+#      downstairs_away_mode:
+#        entity_id: []
+#        value_template: "{{ is_state_attr('climate.downstairs', 'away_mode', 'on') }}"
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 0445996d..e69de29b 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 0445996d..e69de29b 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