diff --git a/config/lovelace/01_living_room.yaml b/config/lovelace/01_living_room.yaml
index 07182f3..ee25236 100644
--- a/config/lovelace/01_living_room.yaml
+++ b/config/lovelace/01_living_room.yaml
@@ -35,23 +35,15 @@ cards:
               - type: custom:decluttering-card
                 template: light_with_fade_and_switch
                 variables:
-                  - light: light.light_le_1
-                  - fade: switch.light_le_1_light_fade
+                  - light: light.light_lohas_1
+                  - fade: switch.light_lohas_1_fade
               - type: custom:decluttering-card
                 template: light_with_fade_and_switch
                 variables:
-                  - light: light.light_le_2
-                  - fade: switch.light_le_2_light_fade
-              - type: custom:decluttering-card
-                template: light_with_fade_and_switch
-                variables:
-                  - light: light.light_le_3
-                  - fade: switch.light_le_3_light_fade
-              - type: custom:decluttering-card
-                template: light_with_fade_and_switch
-                variables:
-                  - light: light.light_le_4
-                  - fade: switch.light_le_4_light_fade
+                  - light: light.light_lohas_2
+                  - fade: switch.light_lohas_2_fade
+              - light.light_le_9
+              - light.light_le_10
           - type: custom:fold-entity-row
             head:
               type: custom:decluttering-card
diff --git a/config/lovelace/02_master_bedroom.yaml b/config/lovelace/02_master_bedroom.yaml
index a2d984c..fbb1a0e 100644
--- a/config/lovelace/02_master_bedroom.yaml
+++ b/config/lovelace/02_master_bedroom.yaml
@@ -7,9 +7,52 @@ cards:
     cards:
       - type: entities
         title: Lights
-        entities:
-          - entity: light.bedside_light
         show_header_toggle: false
+        entities:
+          - type: custom:slider-entity-row
+            entity: light.master_bedroom_all_lights
+            name: All lights
+            toggle: true
+            step: 5
+          - type: custom:fold-entity-row
+            head:
+              entity: light.master_bedroom_main_lights
+              name: Main lights
+            entities:
+              - type: custom:slider-entity-row
+                entity: light.master_bedroom_main_lights
+                name: Brightness
+                hide_state: true
+                step: 5
+              - type: custom:slider-entity-row
+                entity: light.master_bedroom_main_lights
+                name: Temperature
+                attribute: color_temp
+                hide_state: true
+                min: 153
+                max: 500
+                step: 5
+              - type: custom:decluttering-card
+                template: light_with_fade_and_switch
+                variables:
+                  - light: light.light_le_1
+                  - fade: switch.light_le_1_fade
+              - type: custom:decluttering-card
+                template: light_with_fade_and_switch
+                variables:
+                  - light: light.light_le_2
+                  - fade: switch.light_le_2_fade
+              - type: custom:decluttering-card
+                template: light_with_fade_and_switch
+                variables:
+                  - light: light.light_le_3
+                  - fade: switch.light_le_3_fade
+              - type: custom:decluttering-card
+                template: light_with_fade_and_switch
+                variables:
+                  - light: light.light_le_4
+                  - fade: switch.light_le_4_fade
+          - light.bedside_light
 
       - type: custom:decluttering-card
         template: sonos_media_player
diff --git a/config/lovelace/03_kitchen.yaml b/config/lovelace/03_kitchen.yaml
index 66f8033..92f0bc7 100644
--- a/config/lovelace/03_kitchen.yaml
+++ b/config/lovelace/03_kitchen.yaml
@@ -3,6 +3,18 @@ path: kitchen
 icon: "mdi:chef-hat"
 badges: []
 cards:
+  - type: entities
+    title: Lights
+    show_header_toggle: false
+    entities:
+      - type: custom:fold-entity-row
+        entity: light.kitchen_main_lights
+        name: Main lights
+        entities:
+          - light.light_le_11
+          - light.light_le_12
+          - light.light_orbecco_1
+
   - type: custom:decluttering-card
     template: sonos_media_player
     variables:
diff --git a/config/lovelace/05_hallway.yaml b/config/lovelace/05_hallway.yaml
new file mode 100644
index 0000000..8965386
--- /dev/null
+++ b/config/lovelace/05_hallway.yaml
@@ -0,0 +1,22 @@
+title: Hallway
+path: hallway
+icon: "mdi:door-closed"
+badges: []
+cards:
+  - type: entities
+    title: Lights
+    show_header_toggle: false
+    entities:
+      - light.hallway_all_lights
+      - type: custom:fold-entity-row
+        entity: light.hallway_entrance_lights
+        name: Entrance lights
+        entities:
+          - light.light_le_5
+          - light.light_le_6
+      - type: custom:fold-entity-row
+        entity: light.hallway_main_lights
+        name: Main lights
+        entities:
+          - light.light_le_7
+          - light.light_le_8
diff --git a/config/lovelace/05_media.yaml b/config/lovelace/06_media.yaml
similarity index 100%
rename from config/lovelace/05_media.yaml
rename to config/lovelace/06_media.yaml
diff --git a/config/lovelace/06_system.yaml b/config/lovelace/07_system.yaml
similarity index 100%
rename from config/lovelace/06_system.yaml
rename to config/lovelace/07_system.yaml
diff --git a/config/lovelace/07_covid_19.yaml b/config/lovelace/08_covid_19.yaml
similarity index 100%
rename from config/lovelace/07_covid_19.yaml
rename to config/lovelace/08_covid_19.yaml
diff --git a/config/lovelace/08_test.yaml b/config/lovelace/09_test.yaml
similarity index 72%
rename from config/lovelace/08_test.yaml
rename to config/lovelace/09_test.yaml
index c8c40ba..95b019c 100644
--- a/config/lovelace/08_test.yaml
+++ b/config/lovelace/09_test.yaml
@@ -10,6 +10,32 @@ 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 83d6621..9f7065c 100644
--- a/config/ui-lovelace.yaml
+++ b/config/ui-lovelace.yaml
@@ -14,7 +14,8 @@ views:
   - !include lovelace/02_master_bedroom.yaml
   - !include lovelace/03_kitchen.yaml
   - !include lovelace/04_bathroom.yaml
-  - !include lovelace/05_media.yaml
-  - !include lovelace/06_system.yaml
-  - !include lovelace/07_covid_19.yaml
-  - !include lovelace/08_test.yaml
+  - !include lovelace/05_hallway.yaml
+  - !include lovelace/06_media.yaml
+  - !include lovelace/07_system.yaml
+  - !include lovelace/08_covid_19.yaml
+  - !include lovelace/09_test.yaml