diff --git a/config/automation/Pool_Deck_lights.yaml b/config/automation/Pool_Deck_lights.yaml
index a1684e85..56d71aad 100755
--- a/config/automation/Pool_Deck_lights.yaml
+++ b/config/automation/Pool_Deck_lights.yaml
@@ -30,10 +30,10 @@
     - service: switch.turn_on
       entity_id: switch.back_landscaping
     - service: light.turn_on
-      entity_id: group.outdoor_pool_lights
+      entity_id: light.outdoor_pool_lights
       data:
         color_temp: 369
     - wait_template: >-
         {{ states.binary_sensor.MCU2_GPIO12.state == 'off' }}
     - service: light.turn_off
-      entity_id: group.outdoor_pool_lights
+      entity_id: light.outdoor_pool_lights
diff --git a/config/automation/System/watchdog_light.yaml b/config/automation/System/watchdog_light.yaml
index 38276a7f..45a9ae5c 100755
--- a/config/automation/System/watchdog_light.yaml
+++ b/config/automation/System/watchdog_light.yaml
@@ -7,14 +7,14 @@
     - platform: state
       entity_id:
         - light.hallway
-        - group.hallway_lights
-        - group.foyer_lights
+        - light.hallway_lights
+        - light.foyer_lights
       to: 'on'
       for: '00:20:00'
 
     - platform: state
       entity_id:
-        - group.upstairs
+        - light.upstairs_lights
       to: 'on'
       for: '02:00:00'
 
diff --git a/config/automation/Timed_Triggers/0550.yaml b/config/automation/Timed_Triggers/0550.yaml
index 64ad10b7..fce90cc9 100755
--- a/config/automation/Timed_Triggers/0550.yaml
+++ b/config/automation/Timed_Triggers/0550.yaml
@@ -25,7 +25,7 @@
   action:
     - service: homeassistant.turn_on
       entity_id:
-        - group.dining_room_lights
+        - light.dining_room_lights
         - light.fridge
         - light.k2
         - light.k3
diff --git a/config/automation/Timed_Triggers/0650.yaml b/config/automation/Timed_Triggers/0650.yaml
index 0b6133e3..fdbbfb94 100755
--- a/config/automation/Timed_Triggers/0650.yaml
+++ b/config/automation/Timed_Triggers/0650.yaml
@@ -29,7 +29,7 @@
         - light.d2
     - service: light.turn_off
       entity_id:
-        - group.dining_room_lights
+        - light.dining_room_lights
 
     - wait_template: >-
        {{ states.sun.sun.state == 'above_horizon' }}
diff --git a/config/automation/Timed_Triggers/startup_notification.yaml b/config/automation/Timed_Triggers/startup_notification.yaml
index 484c8aee..02709284 100755
--- a/config/automation/Timed_Triggers/startup_notification.yaml
+++ b/config/automation/Timed_Triggers/startup_notification.yaml
@@ -16,7 +16,7 @@
         apns_id: 'Startup'
 
     - service: light.turn_off
-      entity_id: group.hallway_lights
+      entity_id: light.hallway_lights
 
     - service: mqtt.publish
       data:
diff --git a/config/automation/Timed_Triggers/sunrise_turn_off.yaml b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
index b31f148c..aa137037 100755
--- a/config/automation/Timed_Triggers/sunrise_turn_off.yaml
+++ b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
@@ -39,8 +39,8 @@
     - service: homeassistant.turn_off
       entity_id:
         - group.exterior_lights
-        - group.outdoor_front_lights
-        - group.outdoor_pool_lights
+        - light.outdoor_front_lights
+        - light.outdoor_pool_lights
         - group.outdoor_xmas_lights
 
     - service: light.turn_off
@@ -52,7 +52,7 @@
       entity_id:
         - group.master_bathroom_accents
         - group.exterior_lights
-        - group.outdoor_front_lights
+        - light.outdoor_front_lights
         - group.outdoor_xmas_lights
 
     - service: input_boolean.turn_off
diff --git a/config/automation/Timed_Triggers/sunset_turn_on.yaml b/config/automation/Timed_Triggers/sunset_turn_on.yaml
index 7d865b32..a452a385 100755
--- a/config/automation/Timed_Triggers/sunset_turn_on.yaml
+++ b/config/automation/Timed_Triggers/sunset_turn_on.yaml
@@ -77,7 +77,7 @@
        - switch.living_room_outlet
     - service: light.turn_on
       entity_id:
-       - group.living_room_accents
+       - light.living_room_accents
     - wait_template: >-
        {{ is_state('group.garadget', 'closed') }}
     - wait_template: >-
diff --git a/config/automation/Timed_Triggers/wake_up.yaml b/config/automation/Timed_Triggers/wake_up.yaml
index d374173d..0d030f36 100755
--- a/config/automation/Timed_Triggers/wake_up.yaml
+++ b/config/automation/Timed_Triggers/wake_up.yaml
@@ -21,6 +21,6 @@
   action:
     - service: light.turn_on
       entity_id:
-        - group.kitchen_lights
+        - light.kitchen_lights
     - service: switch.turn_on
       entity_id: switch.lr_amp
diff --git a/config/automation/kitchen_lights_and_accents.yaml b/config/automation/kitchen_lights_and_accents.yaml
index af6bcc62..8f18bcb8 100755
--- a/config/automation/kitchen_lights_and_accents.yaml
+++ b/config/automation/kitchen_lights_and_accents.yaml
@@ -7,7 +7,7 @@
 - alias: Kitchen lights on - Accent lights off
   trigger:
     - platform: state
-      entity_id: group.kitchen_lights
+      entity_id: light.kitchen_lights
       to: 'on'
       for: '00:05:00'
 
@@ -25,7 +25,7 @@
 - alias: Kitchen lights off - turn on Accent lights
   trigger:
     - platform: state
-      entity_id: group.kitchen_lights
+      entity_id: light.kitchen_lights
       to: 'off'
       for: '00:05:00'
     - platform: state
@@ -37,7 +37,7 @@
     - condition: sun
       after: 'sunset'
     - condition: state
-      entity_id: group.kitchen_lights
+      entity_id: light.kitchen_lights
       state: 'off'
     - condition: or
       conditions:
diff --git a/config/automation/late_night_outside_helper.yaml b/config/automation/late_night_outside_helper.yaml
index 013fee8d..0d8ccc88 100755
--- a/config/automation/late_night_outside_helper.yaml
+++ b/config/automation/late_night_outside_helper.yaml
@@ -22,7 +22,7 @@
       entity_id: scene.front_full_brightness
     - service: light.turn_on
       entity_id:
-        - group.living_room_accents
+        - light.living_room_accents
       data_template:
         # Red if Open, Gold if Closed
         rgb_color: >
@@ -49,7 +49,7 @@
     - service: script.monthly_color_scene
     - service: light.turn_on
       entity_id:
-        - group.living_room_accents
+        - light.living_room_accents
       data_template:
         # Red if Open, Gold if Closed
         rgb_color: >
diff --git a/config/automation/mealtime.yaml b/config/automation/mealtime.yaml
index e47a38f0..78933f66 100755
--- a/config/automation/mealtime.yaml
+++ b/config/automation/mealtime.yaml
@@ -12,10 +12,10 @@
   action:
     - service: light.turn_on
       entity_id:
-        - group.dinette_lights
-        - group.kitchen_lights
+        - light.dinette_lights
+        - light.kitchen_lights
     - service: light.turn_off
       entity_id:
-        - group.living_room_lights
+        - light.living_room_lights
     - service: input_boolean.turn_off
       entity_id: input_boolean.meal_time
diff --git a/config/automation/tv_time_on_and_off.yaml b/config/automation/tv_time_on_and_off.yaml
index 32f097e9..00897922 100755
--- a/config/automation/tv_time_on_and_off.yaml
+++ b/config/automation/tv_time_on_and_off.yaml
@@ -43,8 +43,8 @@
 
     - service: light.turn_off
       entity_id:
-        - group.dinette_lights
-        - group.kitchen_lights
+        - light.dinette_lights
+        - light.kitchen_lights
 
     - service: switch.turn_on
       entity_id: group.kitchen_Accents
diff --git a/config/automation/upstairs_motion_ifttt.yaml b/config/automation/upstairs_motion_ifttt.yaml
index f7587e91..2735b72d 100755
--- a/config/automation/upstairs_motion_ifttt.yaml
+++ b/config/automation/upstairs_motion_ifttt.yaml
@@ -17,7 +17,7 @@
 
   action:
     - service: light.turn_on
-      entity_id: group.upstairs
+      entity_id: light.upstairs_lights
 
 - alias: 'Upstairs Light Turn off'
   trigger:
@@ -29,4 +29,4 @@
 
   action:
     service: light.turn_off
-    entity_id: group.upstairs
+    entity_id: light.upstairs_lights
diff --git a/config/automation/work.yaml b/config/automation/work.yaml
index 9945c6ff..23f04725 100755
--- a/config/automation/work.yaml
+++ b/config/automation/work.yaml
@@ -12,9 +12,9 @@
   action:
     - service: light.turn_off
       entity_id:
-        - group.dinette_lights
-        - group.kitchen_lights
-        - group.living_room_lights
+        - light.dinette_lights
+        - light.kitchen_lights
+        - light.living_room_lights
     - service: light.turn_on
       entity_id:
         - light.office_lamp
diff --git a/config/configuration.yaml b/config/configuration.yaml
index cdbdf5d3..bd0eea96 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -40,10 +40,9 @@ cloud:
   alexa:
     filter:
       include_entities:
-        - group.outdoor_pool_lights
-        - group.Exterior_Lights
-        - group.outdoor_pool_lights
-        - group.outdoor_front_lights
+        - group.exterior_lights
+        - light.outdoor_pool_lights
+        - light.outdoor_front_lights
         - group.landscaping
         - group.master_bathroom_accents
         - group.kitchen_accents
@@ -69,7 +68,7 @@ cloud:
         - input_boolean
         - camera
     # entity_config:
-    #   group.kitchen_lights:
+    #   light.kitchen_lights:
     #     display_categories: LIGHT
 
 http:
diff --git a/config/group/Indoor_Outdoor.yaml b/config/group/Indoor_Outdoor.yaml
index 4bc25973..e502bf37 100755
--- a/config/group/Indoor_Outdoor.yaml
+++ b/config/group/Indoor_Outdoor.yaml
@@ -23,7 +23,7 @@ Exterior_Lights:
   entities:
     - light.outdoor_bathroom
     - light.outside_pool_lights
-    - group.outdoor_pool_lights
-    - group.outdoor_front_lights
+    - light.outdoor_pool_lights
+    - light.outdoor_front_lights
     - group.landscaping
     - group.outdoor_xmas_lights
diff --git a/config/packages/alarm.yaml b/config/packages/alarm.yaml
index 4979d514..459bd5c0 100755
--- a/config/packages/alarm.yaml
+++ b/config/packages/alarm.yaml
@@ -288,7 +288,7 @@ automation:
     action:
       - service: light.turn_on
         entity_id:
-          - group.living_room_accents
+          - light.living_room_accents
         data_template:
           rgb_color: >
             {% if states.group.entry_points.state == 'on' or states.group.garage_doors.state != 'closed' -%}
diff --git a/config/scene/monthly_colors.yaml b/config/scene/monthly_colors.yaml
index 2cb4da0c..ad49ac36 100755
--- a/config/scene/monthly_colors.yaml
+++ b/config/scene/monthly_colors.yaml
@@ -13,14 +13,14 @@
 
 - name: month_standard_colors
   entities:
-       group.outdoor_front_lights:
+       light.outdoor_front_lights:
            state: 'on'
            #color_name: 'Gold'
            rgb_color: [255,223,0]
 
 - name: front_full_brightness
   entities:
-     group.outdoor_front_lights:
+     light.outdoor_front_lights:
          state: 'on'
          #color_name: 'White'
          rgb_color: [255,255,255]
@@ -68,7 +68,7 @@
 
 - name: month_valentine_colors
   entities:
-       group.outdoor_front_lights:
+       light.outdoor_front_lights:
            state: 'on'
            #color_name: 'Crimson'
            rgb_color: [220,20,60]
@@ -114,14 +114,14 @@
 
 - name: month_st_patty_colors
   entities:
-       group.outdoor_front_lights:
+       light.outdoor_front_lights:
            state: 'on'
            #color_name: 'Green'
            rgb_color: [0,128,0]
 
 - name: month_pi_colors
   entities:
-       group.outdoor_front_lights:
+       light.outdoor_front_lights:
            state: 'on'
            rgb_color: [3,14,159]
 
@@ -244,7 +244,7 @@
 
 - name: month_mothers_day_colors
   entities:
-      group.outdoor_front_lights:
+      light.outdoor_front_lights:
           state: 'on'
           #color_name: 'Lavender'
           rgb_color: [244,187,255]
@@ -317,7 +317,7 @@
 
 - name: month_thanksgiving_colors
   entities:
-       group.outdoor_front_lights:
+       light.outdoor_front_lights:
            state: 'on'
            #color_name: 'orange'
            rgb_color: [255,165,0]
diff --git a/config/script/emergency.yaml b/config/script/emergency.yaml
index 2fc8b952..993415da 100755
--- a/config/script/emergency.yaml
+++ b/config/script/emergency.yaml
@@ -11,7 +11,7 @@ emergency:
 # Switch all outside front lights to Red to indicate emergency
     - service: light.turn_on
       entity_id:
-        - group.outdoor_front_lights
+        - light.outdoor_front_lights
       data:
         #color_name: 'red'
         rgb_color: [255,0,0]
diff --git a/config/script/front_house_motion.yaml b/config/script/front_house_motion.yaml
index 72d1a4d0..8e7674ea 100755
--- a/config/script/front_house_motion.yaml
+++ b/config/script/front_house_motion.yaml
@@ -32,14 +32,14 @@ front_house_motion:
       data:
         entity_id:
           - light.outdoor_bathroom
-          - group.outdoor_pool_lights
+          - light.outdoor_pool_lights
         brightness: 255
     - service: script.dog_bark
     - delay: '00:{{ range(0,1) | random | int }}{{ range(0,9) | random | int }}:00'
     - service: light.turn_off
       entity_id:
-        - group.outdoor_front_lights
-        - group.outdoor_pool_lights
+        - light.outdoor_front_lights
+        - light.outdoor_pool_lights
     - service: light.turn_on
       entity_id: light.outdoor_bathroom
       data:
diff --git a/config/www/custom_ui/floorplan/alarm.yaml b/config/www/custom_ui/floorplan/alarm.yaml
index acba35c4..8dadc377 100755
--- a/config/www/custom_ui/floorplan/alarm.yaml
+++ b/config/www/custom_ui/floorplan/alarm.yaml
@@ -7,8 +7,8 @@ rules:
     entities:
       - input_boolean.guest_mode
       - input_boolean.good_night
-      - group.kitchen_lights
-      - group.living_room_lights
+      - light.kitchen_lights
+      - light.living_room_lights
 
     states:
       - state: 'on'