diff --git a/mobile_dashboard.yaml b/mobile_dashboard.yaml
index 07cb416..878e383 100644
--- a/mobile_dashboard.yaml
+++ b/mobile_dashboard.yaml
@@ -1305,6 +1305,11 @@ views:
                       .bubble-icon {
                         color: ${state === 'on' ? 'var(--success-color)' : 'var(--text-color)'} !important;
                       }
+              - type: custom:decluttering-card
+                template: popup_timer_card
+                variables:
+                  - name: Lights Timer
+                  - entity: timer.front_porch_motion_timer
           - type: vertical-stack
             cards:
               - type: custom:bubble-card
@@ -1576,27 +1581,11 @@ views:
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.basement_occupied
-              - type: custom:timer-bar-card
-                filter: true
-                entities:
+              - type: custom:decluttering-card
+                template: popup_timer_card
+                variables:
+                  - name: Door Timer
                   - 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
       - type: grid
         cards:
           - type: vertical-stack