diff --git a/includes/lights.yaml b/includes/lights.yaml
index 3f2757d..ea4cf45 100644
--- a/includes/lights.yaml
+++ b/includes/lights.yaml
@@ -6,72 +6,55 @@
 #   password: !secret tv_password
 
 - platform: group
-  name: Living Room Lights
-  entities:
-    - light.corner_lamp
-    - light.table_lamp
-    - light.java_lamp
-    - light.elements
-
-- platform: group
-  name: Living Room Lights and ambilight
+  name: All the lights
   entities:
     - light.living_room_lights
-    # - light.tv_ambilight
+    - light.bedroom_lights
+    - light.bathroom_lights
+    - light.hallway_lights
+    - light.kitchen_lights
 
 - platform: group
-  name: Living Room Lights without elements
+  name: Living Room Lights
   entities:
-    - light.corner_lamp
-    - light.table_lamp
-    - light.java_lamp
+    - light.entrance_spot_1
+    - light.entrance_spot_2
+    - light.entrance_spot_3
+    - light.entrance_spot_4
+    - light.living_room_middle_spot_1
+    - light.living_room_middle_spot_2
+    - light.living_room_middle_spot_3
+    - light.living_room_middle_spot_4
+    - light.standing_lamp
 
 - platform: group
   name: Bedroom lights
   entities:
-    - light.bedroom_ceiling
-    - light.bedside_lamp
+    - light.bedside_lamp_left
+    - light.bedside_lamp_right
 
 - platform: group
   name: Bathroom Lights
   entities:
-    - light.bathroom_shower
-    - light.bathroom_mirror
-    - light.bathroom_toilet
+    - light.bathroom_back
+    - light.bathroom_entrance
+    - light.bathroom_middle_hallway
+    - light.bathroom_middle_sink
 
 - platform: group
   name: Hallway lights
   entities:
-    - light.hallway_spot
-    - light.hallway_entrance
-    - light.cabinet_lights
-
-- platform: group
-  name: All the lights
-  entities:
-    - light.hallway_lights
-    - light.bathroom_lights
-    - light.bedroom_lights
-    - light.kitchen_lights
-    - light.living_room_lights
-
-- platform: group
-  name: Cabinet lights
-  entities:
-    - light.cabinet_left
-    - light.cabinet_middle
-    - light.cabinet_right
+    - light.hallway
 
 - platform: group
   name: Kitchen Lights
   entities:
     - light.bench_upper_strip
     - light.bench_lower_strip
-    - light.standing_lamp
-    - light.cabinet_lights
-
 
 - platform: group
-  name: Office Lights
+  name: Pantry Lights
   entities:
-    - light.java_lamp
+    - light.pantry_spot_top
+    - light.pantry_spot_middle
+    - light.pantry_spot_bottom