diff --git a/main_dashboard.yaml b/main_dashboard.yaml
index 803ed59..5d146aa 100644
--- a/main_dashboard.yaml
+++ b/main_dashboard.yaml
@@ -1724,7 +1724,7 @@ views:
             state: 'on'
       - type: grid
         cards:
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_room_header
             variables:
               - name: Living Room
@@ -1882,7 +1882,7 @@ views:
             name: Status
             icon: mdi:list-box
             card_layout: large
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_temperature_button
             variables:
               - name: Front Temp
@@ -1900,7 +1900,7 @@ views:
             show_attribute: false
             card_layout: large
             columns: 2
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_temperature_button
             variables:
               - name: Back Temp
@@ -1918,7 +1918,7 @@ views:
             show_attribute: false
             card_layout: large
             columns: 2
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Front Motion
@@ -1926,7 +1926,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Back Motion
@@ -1934,7 +1934,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Occupied
@@ -1968,7 +1968,7 @@ views:
             name: Security
             icon: mdi:security
             card_layout: large
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Door
@@ -1976,7 +1976,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Front 1
@@ -1984,7 +1984,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Front 2
@@ -1992,7 +1992,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Front 3
@@ -2000,7 +2000,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side 1
@@ -2008,7 +2008,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side 2
@@ -2016,7 +2016,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side 3
@@ -2024,7 +2024,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side 4
@@ -2032,7 +2032,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Back 1
@@ -2040,7 +2040,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Back 2
@@ -2114,7 +2114,7 @@ views:
                 name: Emma Rainbow
       - type: grid
         cards:
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_room_header
             variables:
               - name: Downstairs Bathroom
@@ -2178,7 +2178,7 @@ views:
             name: Status
             icon: mdi:list-box
             card_layout: large
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_temperature_button
             variables:
               - name: Temp
@@ -2195,7 +2195,7 @@ views:
             name: Lux
             card_layout: large
             columns: 2
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Motion
@@ -2204,7 +2204,7 @@ views:
             grid_options:
               columns: 6
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Occupied
@@ -2218,7 +2218,7 @@ views:
             name: Security
             icon: mdi:security
             card_layout: large
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Back
@@ -2227,7 +2227,7 @@ views:
             grid_options:
               columns: 6
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side
@@ -3660,7 +3660,7 @@ views:
     sections:
       - type: grid
         cards:
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_room_header
             variables:
               - name: Basement Studio
@@ -4030,7 +4030,7 @@ views:
             name: Status
             icon: mdi:list-box
             card_layout: large
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_temperature_button
             variables:
               - name: Temp
@@ -4059,7 +4059,7 @@ views:
                 action: none
             card_layout: large
             columns: 2
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Motion
@@ -4068,7 +4068,7 @@ views:
             grid_options:
               columns: 6
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Occupied