diff --git a/main_dashboard.yaml b/main_dashboard.yaml
index 3e0d73b..6628c0d 100644
--- a/main_dashboard.yaml
+++ b/main_dashboard.yaml
@@ -1628,131 +1628,52 @@ views:
               - power_entity: sensor.living_room_total_power_sensor
               - light_entity: light.living_room_lights
           - type: custom:bubble-card
-            card_type: separator
-            name: Lights
-            icon: mdi:lightbulb
-            card_layout: large
+            card_type: button
+            button_type: slider
+            modules:
+              - default
+              - subbutton_below
+            entity: light.living_room_lights
+            rows: '2'
+            icon: hue:room-living
+            tap_action:
+              action: toggle
+            double_tap_action:
+              action: perform-action
+              perform_action: input_select.select_option
+              target:
+                entity_id: input_select.living_room_scenes
+              data:
+                option: Adaptive
+            hold_action:
+              action: more-info
             sub_button:
-              - entity: select.living_room_led_strip_theme
+              - entity: light.living_room_overhead
+                tap_action:
+                  action: toggle
+                hold_action:
+                  action: more-info
+                show_name: true
+                name: Overhead
+              - entity: light.living_room_led_strip
                 name: LED Strip
-                show_name: true
                 icon: hue:lightstrip
-              - entity: input_select.living_room_scenes
-                name: Scenes
                 show_name: true
-          - type: horizontal-stack
-            cards:
-              - type: custom:mushroom-light-card
-                entity: light.living_room_lights
-                name: Lights
-                icon: hue:room-living
-                fill_container: true
-                use_light_color: true
-                show_brightness_control: true
-                show_color_temp_control: true
-                show_color_control: true
-                collapsible_controls: true
-                double_tap_action:
-                  action: call-service
-                  service: input_select.select_option
-                  service_data:
-                    option: Adaptive
-                  target:
-                    entity_id: input_select.living_room_scenes
-                primary_info: none
-                layout: vertical
-          - type: custom:bubble-card
-            card_type: button
-            button_type: slider
-            entity: light.living_room_overhead
-            name: Overhead
-            show_state: true
-            show_attribute: true
-            attribute: brightness
-            tap_action:
-              action: toggle
-            double_tap_action:
-              action: none
-            hold_action:
-              action: more-info
-            card_layout: large
-            columns: 2
-            icon: ''
-          - type: custom:bubble-card
-            card_type: button
-            button_type: slider
-            entity: light.living_room_led_strip
-            name: LED Strip
-            show_state: true
-            show_attribute: true
-            attribute: brightness
-            tap_action:
-              action: toggle
-            double_tap_action:
-              action: none
-            hold_action:
-              action: more-info
-            icon: hue:lightstrip
-            columns: 2
-            card_layout: large
-          - type: custom:bubble-card
-            card_type: button
-            button_type: switch
-            entity: light.christmas_tree
-            name: Tree
-            show_state: true
-            show_attribute: false
-            tap_action:
-              action: toggle
-            double_tap_action:
-              action: none
-            hold_action:
-              action: more-info
-            icon: mdi:pine-tree
-            button_action:
-              tap_action:
-                action: toggle
-              double_tap_action:
-                action: none
-              hold_action:
-                action: more-info
-            visibility:
-              - condition: or
-                conditions:
+                tap_action:
+                  action: toggle
+                hold_action:
+                  action: more-info
+              - entity: select.living_room_led_strip_theme
+                name: LED Strip Scene
+                icon: hue:lightstrip
+                visibility:
                   - condition: state
-                    entity: light.christmas_tree
-                    state_not: unavailable
-            card_layout: large
-            columns: 2
-          - type: custom:bubble-card
-            card_type: button
-            button_type: switch
-            entity: light.christmas_lights_front_window
-            name: Window
-            show_state: true
-            show_attribute: false
-            tap_action:
-              action: toggle
-            double_tap_action:
-              action: none
-            hold_action:
-              action: more-info
-            icon: mdi:string-lights
-            button_action:
-              tap_action:
-                action: toggle
-              double_tap_action:
-                action: none
-              hold_action:
-                action: more-info
-            visibility:
-              - condition: or
-                conditions:
-                  - condition: state
-                    entity: light.christmas_lights_front_window
-                    state_not: unavailable
-            card_layout: large
-            columns: 2
+                    entity: light.living_room_led_strip
+                    state: 'on'
+              - entity: input_select.living_room_scenes
+                name: Scene
+                icon: mdi:palette
+            name: Lights
           - type: custom:bubble-card
             card_type: separator
             name: Media