diff --git a/automation/sunrise_turnon_and_off.yaml b/automation/sunrise_turnon_and_off.yaml
index 388b3658..049a8a42 100755
--- a/automation/sunrise_turnon_and_off.yaml
+++ b/automation/sunrise_turnon_and_off.yaml
@@ -32,7 +32,10 @@
 
   action:
     - service: light.turn_off
-      entity_id: group.all_lights    
+      entity_id: 
+        - group.all_lights    
+        - light.outfoor_front
+        - group.outdoor_lights
     - service: script.interior_off
 
     
diff --git a/automation/watchdog.yaml b/automation/watchdog.yaml
index 9ac68357..1c2f62f9 100755
--- a/automation/watchdog.yaml
+++ b/automation/watchdog.yaml
@@ -28,13 +28,12 @@
 - alias: Automated Light WatchDog!
   trigger:
     - platform: state
-      entity_id: light.hallway
-      state: 'on'
-      for: '00:20:00'
-    - platform: state
-      entity_id: group.foyer_lights
+      entity_id: 
+        - light.hallway
+        - group.foyer_lights
       state: 'on'
       for: '00:20:00'
+
     - platform: state
       entity_id:
         - light.paige_go
@@ -50,26 +49,6 @@
 
 ##############################################################################
 
-- alias: If Outdoor lights are on and it's daytime, TURN THEM OFF!!
-  hide_entity: True
-  trigger:
-    - platform: time
-      minutes: '/47'
-      seconds: 0
-
-  condition:
-    - condition: state
-      entity_id: sun.sun
-      state: 'above_horizon'
-    - condition: state
-      entity_id: group.outdoor_lights
-      state: 'on'
-      
-  action:
-    - service: light.turn_off
-      entity_id: group.outdoor_lights
-
-
 - alias: "NOTIFY IF IP CHANGES"
   hide_entity: True
   trigger:
diff --git a/customize/lights.yaml b/customize/lights.yaml
index e618c9e7..0881abdb 100755
--- a/customize/lights.yaml
+++ b/customize/lights.yaml
@@ -83,13 +83,13 @@ light.outdoor_den:
   emulated_hue: True
   hidden: False 
   
-light.hallway:
-  friendly_name: 'Hallway'
+light.kids_hallway:
+  friendly_name: 'Kids Hallway'
   emulated_hue: False
   hidden: False 
 
-light.hallway_2:
-  friendly_name: 'Hallway'
+light.bedroom_hallway:
+  friendly_name: 'Bedroom Hallway'
   emulated_hue: False
   hidden: False 
 
diff --git a/group/lights.yaml b/group/lights.yaml
index e0e14c3c..80d18625 100755
--- a/group/lights.yaml
+++ b/group/lights.yaml
@@ -81,5 +81,5 @@ Garage lights:
     
 Hallway Lights:
   entities:
-    - light.hallway
+    - light.kids_hallway
     - light.bedroom_hallway