diff --git a/lovelace/lights/lightbulbs.yaml b/lovelace/lights/lightbulbs.yaml
new file mode 100644
index 0000000..c5d66fb
--- /dev/null
+++ b/lovelace/lights/lightbulbs.yaml
@@ -0,0 +1,39 @@
+- type: 'custom:button-card'
+  template: card_title
+  name: Light Bulbs
+
+- type: custom:button-card
+  template: card_light_colorpick
+  entity: light.ceiling1
+  variables:
+    ulm_card_light_slider_horizontal_colors_name: Ceiling 1
+    ulm_card_light_slider_horizontal_colors_transition: 1
+
+- type: 'custom:button-card'
+  template: card_light_slider_collapse
+  variables:
+    ulm_card_light_slider_collapse_name: Ceiling 1
+    ulm_card_light_enable_collapse: false
+    ulm_card_light_name: Ceiling 1
+  entity: light.ceiling1
+- type: 'custom:button-card'
+  template: card_light_slider_collapse
+  variables:
+    ulm_card_light_slider_collapse_name: Ceiling 2
+    ulm_card_light_enable_collapse: false
+    ulm_card_light_name: Ceiling 2
+  entity: light.ceiling2
+- type: 'custom:button-card'
+  template: card_light_slider_collapse
+  variables:
+    ulm_card_light_slider_collapse_name: Ceiling 3
+    ulm_card_light_enable_collapse: false
+    ulm_card_light_name: Ceiling 3
+  entity: light.ceiling3
+- type: 'custom:button-card'
+  template: card_light_slider_collapse
+  variables:
+    ulm_card_light_slider_collapse_name: Bed
+    ulm_card_light_enable_collapse: false
+    ulm_card_light_name: Bed
+  entity: light.bed_ceiling
\ No newline at end of file
diff --git a/lovelace/lights/lightgroups.yaml b/lovelace/lights/lightgroups.yaml
new file mode 100644
index 0000000..3272af5
--- /dev/null
+++ b/lovelace/lights/lightgroups.yaml
@@ -0,0 +1,22 @@
+- type: 'custom:button-card'
+  template: card_title
+  name: Light Groups
+
+
+- type: 'custom:button-card'
+  template: card_light_slider_collapse
+  variables:
+    ulm_card_light_slider_collapse_name: Indirect
+    ulm_card_light_enable_collapse: false
+    ulm_card_light_name: Indirect
+    ulm_input_select_option: light indirect
+    ulm_input_select: input_select.minimalist_ui_switch
+  entity: light.all_indirect
+
+- type: 'custom:button-card'
+  template: card_light_slider_collapse
+  variables:
+    ulm_card_light_slider_collapse_name: Direct
+    ulm_card_light_enable_collapse: false
+    ulm_card_light_name: Direct
+  entity: light.all_direct
\ No newline at end of file
diff --git a/lovelace/lights/lightstripes.yaml b/lovelace/lights/lightstripes.yaml
new file mode 100644
index 0000000..7def890
--- /dev/null
+++ b/lovelace/lights/lightstripes.yaml
@@ -0,0 +1,19 @@
+- type: 'custom:button-card'
+  template: card_title
+  name: Light Stripes
+
+- type: 'custom:button-card'
+  template: card_light_slider_collapse
+  variables:
+    ulm_card_light_slider_collapse_name: Bed
+    ulm_card_light_enable_collapse: false
+    ulm_card_light_name: Bed
+  entity: light.bed
+
+- type: 'custom:button-card'
+  template: card_light_slider_collapse
+  variables:
+    ulm_card_light_slider_collapse_name: Desk
+    ulm_card_light_enable_collapse: false
+    ulm_card_light_name: Desk
+  entity: light.desk
\ No newline at end of file
diff --git a/lovelace/lights/scenes.yaml b/lovelace/lights/scenes.yaml
new file mode 100644
index 0000000..820ba6a
--- /dev/null
+++ b/lovelace/lights/scenes.yaml
@@ -0,0 +1,49 @@
+- type: 'custom:button-card'
+  template: card_title
+  name: Scenes
+
+- type: "custom:button-card"
+  template:
+    - card_scenes
+  variables:
+    entity_1:
+      entity_id: scene.light_flux
+      icon: "mdi:YOUR_ICON"
+      icon_color: "yellow"
+      name: Flux
+      bg_color: "yellow"
+    entity_2:
+      entity_id: scene.light_blue
+      icon: "mdi:YOUR_ICON"
+      icon_color: "blue"
+      name: Blue
+      bg_color: "blue"
+    entity_3:
+      entity_id: scene.light_night
+      icon: "mdi:YOUR_ICON"
+      icon_color: "purple"
+      name: Night
+      bg_color: "purple"
+    entity_4:
+      entity_id: scene.light_alloff
+      icon: "mdi:YOUR_ICON"
+      icon_color: "green"
+      name: All Off
+      bg_color: "green"
+    entity_5:
+      entity_id: scene.light_alloff
+      icon: "mdi:YOUR_ICON"
+      icon_color: "red"
+      name: All Off
+      bg_color: "red"
+
+
+- type: 'custom:button-card'
+  template: card_title
+  name: Switches
+
+- type: 'custom:button-card'
+  template: card_input_boolean
+  entity: switch.circadian_lighting_circadian_lighting
+  variables:
+    ulm_card_input_boolean_name: Circadian Lighting
\ No newline at end of file
diff --git a/lovelace/batteries.yaml b/lovelace/overview/batteries.yaml
similarity index 75%
rename from lovelace/batteries.yaml
rename to lovelace/overview/batteries.yaml
index b7e9176..1b403d6 100644
--- a/lovelace/batteries.yaml
+++ b/lovelace/overview/batteries.yaml
@@ -1,15 +1,11 @@
-- view_layout:
-    grid-area: "card1"
-  type: 'custom:button-card'
+- type: 'custom:button-card'
   template: card_title
   name: Batteries
 
 
 - type: "horizontal-stack"
   cards:
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_battery
       entity: sensor.iphone_battery_level
       variables:
@@ -18,9 +14,7 @@
         ulm_card_battery_battery_level_warning: 80
         ulm_card_battery_name: iPhone
 
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_battery
       entity: sensor.ipad_battery_level
       variables:
diff --git a/lovelace/climate.yaml b/lovelace/overview/climate.yaml
similarity index 70%
rename from lovelace/climate.yaml
rename to lovelace/overview/climate.yaml
index 9e71630..fc87aca 100644
--- a/lovelace/climate.yaml
+++ b/lovelace/overview/climate.yaml
@@ -1,19 +1,13 @@
-- view_layout:
-    grid-area: "card1"
-  type: 'custom:button-card'
+- type: 'custom:button-card'
   template: card_title
   name: Climate
 
 
-- view_layout:
-    grid-area: "card1"
-  type: custom:button-card
+- type: custom:button-card
   template: custom_card_httpedo13_sun
 
 
-- view_layout:
-    grid-area: "card1"
-  type: "custom:button-card"
+- type: "custom:button-card"
   template: card_weather
   entity: weather.dark_sky
   variables:
@@ -25,9 +19,7 @@
       fade: true
 
 
-- view_layout:
-    grid-area: "card1"
-  type: 'custom:button-card'
+- type: 'custom:button-card'
   template: card_graph
   entity: sensor.temperature_kai_temperature
   variables:
@@ -42,17 +34,13 @@
 
 - type: "horizontal-stack"
   cards:
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_generic
       entity: sensor.temperature_kai_humidity
       variables:
         ulm_card_generic_name: Humidity
 
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_generic
       entity: sensor.temperature_kai_pressure
       variables:
diff --git a/lovelace/energy.yaml b/lovelace/overview/energy.yaml
similarity index 72%
rename from lovelace/energy.yaml
rename to lovelace/overview/energy.yaml
index 4a296f6..8629107 100644
--- a/lovelace/energy.yaml
+++ b/lovelace/overview/energy.yaml
@@ -1,13 +1,9 @@
-- view_layout:
-    grid-area: "card1"
-  type: 'custom:button-card'
+- type: 'custom:button-card'
   template: card_title
   name: Energy
 
 
-- view_layout:
-    grid-area: "card1"
-  type: 'custom:button-card'
+- type: 'custom:button-card'
   template: card_graph
   entity: sensor.schreibtisch_current_consumption
   variables:
@@ -20,18 +16,14 @@
 
 - type: "horizontal-stack"
   cards:
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_generic
       entity: sensor.schreibtisch_today_s_consumption
       variables:
         ulm_card_generic_name: Today
         ulm_card_generic_icon: "mdi:home-lightning-bolt"
 
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_generic
       entity: sensor.schreibtisch_total_consumption
       variables:
diff --git a/lovelace/lights.yaml b/lovelace/overview/lights.yaml
similarity index 73%
rename from lovelace/lights.yaml
rename to lovelace/overview/lights.yaml
index 3a13f96..3a2d196 100644
--- a/lovelace/lights.yaml
+++ b/lovelace/overview/lights.yaml
@@ -1,15 +1,11 @@
-- view_layout:
-    grid-area: "card1"
-  type: 'custom:button-card'
+- type: 'custom:button-card'
   template: card_title
   name: Lights
 
 
 - type: "horizontal-stack"
   cards:
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_light_slider_collapse
       variables:
         ulm_card_light_slider_collapse_name: Indirect
@@ -19,9 +15,7 @@
         ulm_input_select: input_select.minimalist_ui_switch
       entity: light.all_indirect
 
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_light_slider_collapse
       variables:
         ulm_card_light_slider_collapse_name: Direct
@@ -30,9 +24,7 @@
       entity: light.all_direct
 
 
-- view_layout:
-    grid-area: "card1"
-  type: 'custom:button-card'
+- type: 'custom:button-card'
   template: card_input_boolean
   entity: switch.circadian_lighting_circadian_lighting
   variables:
diff --git a/lovelace/nas.yaml b/lovelace/overview/nas.yaml
similarity index 68%
rename from lovelace/nas.yaml
rename to lovelace/overview/nas.yaml
index 5b35e6c..87e3295 100644
--- a/lovelace/nas.yaml
+++ b/lovelace/overview/nas.yaml
@@ -1,15 +1,11 @@
-- view_layout:
-    grid-area: "card1"
-  type: 'custom:button-card'
+- type: 'custom:button-card'
   template: card_title
   name: NAS
 
 
 - type: "horizontal-stack"
   cards:
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_script
       variables:
         ulm_card_script_title: WOL
@@ -20,9 +16,7 @@
         service_data:
           entity_id: switch.server
 
-    - view_layout:
-        grid-area: "card1"
-      type: 'custom:button-card'
+    - type: 'custom:button-card'
       template: card_binary_sensor
       variables:
         ulm_card_binary_sensor_alert: true
diff --git a/lovelace/welcome.yaml b/lovelace/overview/welcome.yaml
similarity index 88%
rename from lovelace/welcome.yaml
rename to lovelace/overview/welcome.yaml
index 3d7d21d..84b71a5 100644
--- a/lovelace/welcome.yaml
+++ b/lovelace/overview/welcome.yaml
@@ -1,11 +1,7 @@
-- view_layout:
-    grid-area: "card1"
-  type: 'custom:button-card'
+- type: 'custom:button-card'
   template: card_title
   name: Home Assistant
-- view_layout:
-    grid-area: "card1"
-  type: "custom:button-card"
+- type: "custom:button-card"
   template: "card_welcome_scenes"
   triggers_update: input_boolean.welcome_collapse
   entity: input_boolean.welcome_collapse
diff --git a/lovelace/popup.yaml b/lovelace/popup.yaml
deleted file mode 100644
index fb6bec9..0000000
--- a/lovelace/popup.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: custom:state-switch
-  view_layout:
-    grid-area: popup
-    show:
-      mediaquery: "(min-width: 1100px)"
-  entity: input_select.minimalist_ui
-  default: default
-  transition: slide-down
-  transition_time: 500
-  states:
-    ## Lights
-    light indirect:
-      type: "custom:button-card"
-      template: "popup_light_brightness"
-      variables:
-        ulm_popup_light_entity: lights.all_indirect
\ No newline at end of file
diff --git a/packages/homeassistant/lovelace.yaml b/packages/homeassistant/lovelace.yaml
index 35fcfac..e16496c 100644
--- a/packages/homeassistant/lovelace.yaml
+++ b/packages/homeassistant/lovelace.yaml
@@ -20,8 +20,10 @@ lovelace:
       type: module
     - url: /hacsfiles/home-assistant-sun-card/home-assistant-sun-card.js
       type: module
-    - url: /hacsfiles/lovelace-layout-card/layout-card.js
-      type: module
-    - url: /hacsfiles/lovelace-state-switch/state-switch.js
+    #- url: /hacsfiles/lovelace-layout-card/layout-card.js
+    #  type: module
+    #- url: /hacsfiles/lovelace-state-switch/state-switch.js
+    #  type: module
+    - url: /hacsfiles/rgb-light-card/card.js
       type: module
                 
\ No newline at end of file
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index 6ece867..d4656e6 100644
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -14,28 +14,45 @@ views:
 
       - type: "vertical-stack"
         cards:
-          !include lovelace/welcome.yaml
+          !include lovelace/overview/welcome.yaml
 
       - type: "vertical-stack"
         cards:
-          !include lovelace/lights.yaml
+          !include lovelace/overview/lights.yaml
 
       - type: "vertical-stack"
         cards:
-          !include lovelace/climate.yaml
+          !include lovelace/overview/climate.yaml
 
       - type: "vertical-stack"
         cards:
-          !include lovelace/batteries.yaml
+          !include lovelace/overview/batteries.yaml
       
       - type: "vertical-stack"
         cards:
-          !include lovelace/energy.yaml
+          !include lovelace/overview/energy.yaml
 
       - type: "vertical-stack"
         cards:
-          !include lovelace/nas.yaml
+          !include lovelace/overview/nas.yaml
+
+
+  - title: "Lights"
+    path: 1
+    cards:
 
       - type: "vertical-stack"
         cards:
-          !include lovelace/popup.yaml
\ No newline at end of file
+          !include lovelace/lights/scenes.yaml
+
+      - type: "vertical-stack"
+        cards:
+          !include lovelace/lights//lightgroups.yaml
+
+      - type: "vertical-stack"
+        cards:
+          !include lovelace/lights/lightbulbs.yaml
+
+      - type: "vertical-stack"
+        cards:
+          !include lovelace/lights/lightstripes.yaml
\ No newline at end of file