diff --git a/config/automation/System/detect_and_adjust_lights.yaml b/config/automation/System/detect_and_adjust_lights.yaml
index 859e23e2..585bbdaf 100755
--- a/config/automation/System/detect_and_adjust_lights.yaml
+++ b/config/automation/System/detect_and_adjust_lights.yaml
@@ -12,20 +12,22 @@
       event_type: state_changed
 
   condition:
+    - condition: template
+      value_template: >
+        {{ trigger.event.data.old_state is not none
+           and trigger.event.data.new_state is not none
+           and trigger.event.data.old_state.state == 'off'
+           and trigger.event.data.new_state.state == 'on' }}
     - condition: state
       entity_id: group.family
       state: 'home'
     - condition: state
       entity_id: input_boolean.alert_mode
       state: 'off'
-    - condition: template
-      value_template: "{{ trigger.event.data is not none }}"
     - condition: template
       value_template: "{{ trigger.event.data.entity_id is not none }}"
     - condition: template
       value_template: "{{ trigger.event.data.entity_id.split('.')[0] == 'light' }}"
-    # - condition: template
-    #   value_template: "{{ trigger.event.data.entity_id.split('_')[0] != 'light.tv' }}"
     - condition: template
       value_template: "{{ trigger.event.data.entity_id.split('_')[0] != 'light.couch' }}"
     - condition: template
@@ -34,14 +36,8 @@
       value_template: "{{ trigger.event.data.entity_id.split('_')[0] != 'light.flood_2' }}"
     - condition: template
       value_template: "{{ trigger.event.data.entity_id.split('_')[0] != 'light.treeflood' }}"
-    # - condition: template
-    #   value_template: "{{ trigger.event.data.entity_id.split('_')[0] != 'light.led' }}"
     - condition: template
       value_template: "{{ trigger.event.data.entity_id.split('_')[1] != 'screensaver' }}"
-    - condition: template
-      value_template: "{{ trigger.event.data.new_state.state == 'on' }}"
-    - condition: template
-      value_template: "{{ trigger.event.data.old_state.state == 'off' }}"
 
   action:
     - service: light.turn_on
diff --git a/config/configuration.yaml b/config/configuration.yaml
index 2a7ec1e8..b17d28ca 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -55,9 +55,16 @@ cloud:
         - cover
         - input_boolean
         - camera
+      exclude_entities:
+        - light.m1_back_left
+        - light.m1_back_right
+        - light.m1_front_left
+        - light.m1_front_right
+        - light.main_slider
+        - light.living_room
     entity_config:
       light.living_room_lights:
-        name: Living Room Lights
+        name: Living Room Color Lights
       light.main_slider:
         name: Living Room Slider