diff --git a/main_dashboard.yaml b/main_dashboard.yaml
index 0ec8273..4d30365 100644
--- a/main_dashboard.yaml
+++ b/main_dashboard.yaml
@@ -3974,130 +3974,85 @@ views:
               - icon: mdi:twitch
               - power_entity: sensor.basement_studio_total_power_sensor
               - light_entity: light.basement_studio_lights
-          - type: horizontal-stack
-            cards:
-              - type: custom:mushroom-light-card
-                entity: light.basement_studio_lights
-                name: Lights
-                icon: mdi:twitch
-                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.basement_studio_scenes
-                primary_info: none
-                layout: vertical
           - type: custom:bubble-card
-            card_type: separator
+            card_type: button
+            button_type: slider
+            modules:
+              - default
+              - subbutton_below
+            rows: 2.406
+            icon: mdi:twitch
+            tap_action:
+              action: toggle
+            double_tap_action:
+              action: perform-action
+              perform_action: input_select.select_option
+              target:
+                entity_id: input_select.basement_studio_scenes
+              data:
+                option: Adaptive
+            hold_action:
+              action: more-info
+            sub_button:
+              main:
+                - name: Lights
+                  buttons_layout: inline
+                  group:
+                    - entity: light.basement_led_strip_1
+                      name: LED Strip
+                      tap_action:
+                        action: toggle
+                      show_name: true
+                    - name: Stairwell
+                      tap_action:
+                        action: toggle
+                      show_name: true
+                      entity: light.basement_stairwell
+                    - name: Short
+                      tap_action:
+                        action: toggle
+                      show_name: true
+                      entity: light.basement_short_lamp
+                    - name: Tall
+                      tap_action:
+                        action: toggle
+                      show_name: true
+                      entity: light.basement_tall_lamp
+              bottom:
+                - name: Smaller Buttons
+                  group:
+                    - entity: select.living_room_led_strip_theme
+                      name: LED Strip Theme
+                      icon: hue:lightstrip
+                      sub_button_type: select
+                      fill_width: false
+                      show_name: true
+                    - entity: script.emma_rainbow_lights
+                      name: Emma Rainbow Lights
+                      fill_width: false
+                      show_name: true
+                  justify_content: space-between
+                - name: Scene
+                  buttons_layout: inline
+                  group:
+                    - name: Scene
+                      icon: mdi:palette
+                      sub_button_type: select
+                      show_name: true
+                      entity: input_select.basement_studio_scenes
+              bottom_layout: rows
             name: Lights
-            icon: mdi:lightbulb
-            card_layout: large
-          - type: custom:bubble-card
-            card_type: button
-            button_type: slider
-            entity: light.basement_led_strip_1
-            show_attribute: true
-            show_state: true
-            attribute: brightness
-            tap_action:
-              action: toggle
-            double_tap_action:
-              action: none
-            hold_action:
-              action: more-info
-            icon: hue:lightstrip
-            name: LED Strip 1
-            styles: >-
-              ${icon.setAttribute("icon", state === 'off' ? 'hue:lightstrip-off'
-              : 'hue:lightstrip')}
-            card_layout: large
-            columns: 2
-          - type: custom:bubble-card
-            card_type: button
-            button_type: slider
-            entity: light.basement_stairwell
-            name: Stairwell
-            show_state: true
-            show_attribute: true
-            attribute: brightness
-            tap_action:
-              action: toggle
-            double_tap_action:
-              action: none
-            hold_action:
-              action: more-info
-            styles: >-
-              ${icon.setAttribute("icon", state === 'off' ?
-              'hue:floor-shade-off' : 'hue:floor-shade')}
-            card_layout: large
-            columns: 2
-          - type: custom:bubble-card
-            card_type: button
-            button_type: slider
-            entity: light.basement_short_lamp
-            show_attribute: true
-            show_state: true
-            attribute: brightness
-            tap_action:
-              action: toggle
-            double_tap_action:
-              action: none
-            hold_action:
-              action: more-info
-            name: Short Lamp
-            styles: >-
-              ${icon.setAttribute("icon", state === 'off' ?
-              'hue:floor-shade-off' : 'hue:floor-shade')}
-            card_layout: large
-            columns: 2
-          - type: custom:bubble-card
-            card_type: button
-            button_type: slider
-            entity: light.basement_tall_lamp
-            name: Tall Lamp
-            show_state: true
-            show_attribute: true
-            attribute: brightness
-            tap_action:
-              action: toggle
-            double_tap_action:
-              action: none
-            hold_action:
-              action: more-info
-            styles: >-
-              ${icon.setAttribute("icon", state === 'off' ?
-              'hue:floor-shade-off' : 'hue:floor-shade')}
-            card_layout: large
-            columns: 2
-          - type: custom:timer-bar-card
-            filter: true
-            entities:
-              - entity: timer.basement_studio_door_timer
-                name: Door Timer
-                sync_issues: ignore
-                tap_action:
-                  action: call-service
-                  service: timer.finish
-                  target:
-                    entity_id: timer.basement_studio_door_timer
-                hold_action:
-                  action: more-info
-                double_tap_action:
-                  action: none
-            modifications:
-              - elapsed: 40%
-                bar_foreground: orange
-              - elapsed: 80%
-                bar_foreground: red
-            compressed: true
+            entity: light.basement_studio_lights
+          - type: custom:streamline-card
+            template: timer_card
+            variables:
+              entity: timer.basement_studio_door_timer
+              name: Motion Timer
+              icon: mdi:timer
+            visibility:
+              - condition: state
+                entity: timer.basement_studio_door_timer
+                state_not: idle
           - type: custom:bubble-card
             card_type: separator
             name: Media