diff --git a/config/lovelace/06_lights.yaml b/config/lovelace/06_lights.yaml
new file mode 100644
index 0000000..99e54c6
--- /dev/null
+++ b/config/lovelace/06_lights.yaml
@@ -0,0 +1,52 @@
+title: Lights
+path: lights
+panel: false
+icon: mdi:lightbulb
+badges: []
+cards:
+  - type: entities
+    title: Living room
+    icon: mdi:sofa
+    entities:
+      - light.living_room_all_lights
+      - light.living_room_main_lights
+      - light.light_lohas_1
+      - light.light_lohas_2
+      - light.light_le_9
+      - light.light_le_10
+      - light.pc
+
+  - type: entities
+    title: Master bedroom
+    icon: mdi:bed-empty
+    entities:
+      - light.master_bedroom_all_lights
+      - light.master_bedroom_main_lights
+      - light.light_le_1
+      - light.light_le_2
+      - light.light_le_3
+      - light.light_le_4
+      - light.bedside_light
+
+  - type: entities
+    title: Kitchen
+    icon: mdi:chef-hat
+    entities:
+      - light.kitchen_main_lights
+      - light.light_le_11
+      - light.light_le_12
+      - light.light_orbecco_1
+
+  - type: entities
+    title: Hallway
+    icon: mdi:door-closed
+    entities:
+      - light.hallway_all_lights
+      - light.hallway_main_lights
+      - light.hallway_entrance_lights
+      - light.light_le_5
+      - light.light_le_6
+      - light.light_le_7
+      - light.light_le_8
+
+
diff --git a/config/lovelace/06_media.yaml b/config/lovelace/07_media.yaml
similarity index 100%
rename from config/lovelace/06_media.yaml
rename to config/lovelace/07_media.yaml
diff --git a/config/lovelace/07_network.yaml b/config/lovelace/08_network.yaml
similarity index 100%
rename from config/lovelace/07_network.yaml
rename to config/lovelace/08_network.yaml
diff --git a/config/lovelace/08_system.yaml b/config/lovelace/09_system.yaml
similarity index 100%
rename from config/lovelace/08_system.yaml
rename to config/lovelace/09_system.yaml
diff --git a/config/lovelace/09_covid_19.yaml b/config/lovelace/10_covid_19.yaml
similarity index 100%
rename from config/lovelace/09_covid_19.yaml
rename to config/lovelace/10_covid_19.yaml
diff --git a/config/lovelace/10_test.yaml b/config/lovelace/11_test.yaml
similarity index 75%
rename from config/lovelace/10_test.yaml
rename to config/lovelace/11_test.yaml
index c29da31..91717b2 100644
--- a/config/lovelace/10_test.yaml
+++ b/config/lovelace/11_test.yaml
@@ -24,32 +24,6 @@ cards:
       - entity: sensor.carbon_activity
       - entity: sensor.carbon_last_update_trigger
 
-  - type: entities
-    entities:
-      - entity: light.light_le_1
-      - entity: light.light_le_2
-      - entity: light.light_le_3
-      - entity: light.light_le_4
-      - entity: light.light_le_5
-      - entity: light.light_le_6
-      - entity: light.light_le_7
-      - entity: light.light_le_8
-      - entity: light.light_le_9
-      - entity: light.light_le_10
-      - entity: light.light_le_11
-      - entity: light.light_le_12
-      - entity: light.light_lohas_1
-      - entity: light.light_lohas_2
-      - entity: light.light_orbecco_1
-      - entity: light.living_room_all_lights
-      - entity: light.living_room_main_lights
-      - entity: light.master_bedroom_all_lights
-      - entity: light.master_bedroom_main_lights
-      - entity: light.hallway_all_lights
-      - entity: light.hallway_main_lights
-      - entity: light.hallway_entrance_lights
-      - entity: light.kitchen_main_lights
-
   - type: "custom:light-entity-card"
     brightness: true
     brightness_icon: weather-sunny
diff --git a/config/ui-lovelace.yaml b/config/ui-lovelace.yaml
index 6fb597b..29f8b35 100644
--- a/config/ui-lovelace.yaml
+++ b/config/ui-lovelace.yaml
@@ -15,8 +15,9 @@ views:
   - !include lovelace/03_kitchen.yaml
   - !include lovelace/04_bathroom.yaml
   - !include lovelace/05_hallway.yaml
-  - !include lovelace/06_media.yaml
-  - !include lovelace/07_network.yaml
-  - !include lovelace/08_system.yaml
-  - !include lovelace/09_covid_19.yaml
-  - !include lovelace/10_test.yaml
+  - !include lovelace/06_lights.yaml
+  - !include lovelace/07_media.yaml
+  - !include lovelace/08_network.yaml
+  - !include lovelace/09_system.yaml
+  - !include lovelace/10_covid_19.yaml
+  - !include lovelace/11_test.yaml