diff --git a/main_dashboard.yaml b/main_dashboard.yaml
index 9791bf5..5daea56 100644
--- a/main_dashboard.yaml
+++ b/main_dashboard.yaml
@@ -1643,7 +1643,7 @@ views:
             state: 'on'
       - type: grid
         cards:
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_room_header
             variables:
               - name: Living Room
@@ -1801,7 +1801,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
@@ -1819,7 +1819,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
@@ -1837,7 +1837,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
@@ -1845,7 +1845,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
@@ -1853,7 +1853,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Occupied
@@ -1887,7 +1887,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
@@ -1895,7 +1895,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Front 1
@@ -1903,7 +1903,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Front 2
@@ -1911,7 +1911,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Front 3
@@ -1919,7 +1919,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side 1
@@ -1927,7 +1927,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side 2
@@ -1935,7 +1935,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side 3
@@ -1943,7 +1943,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side 4
@@ -1951,7 +1951,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Back 1
@@ -1959,7 +1959,7 @@ views:
             grid_options:
               columns: 4
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Back 2
@@ -2033,7 +2033,7 @@ views:
                 name: Emma Rainbow
       - type: grid
         cards:
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_room_header
             variables:
               - name: Downstairs Bathroom
@@ -2097,7 +2097,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
@@ -2114,7 +2114,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
@@ -2123,7 +2123,7 @@ views:
             grid_options:
               columns: 6
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Occupied
@@ -2137,7 +2137,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
@@ -2146,7 +2146,7 @@ views:
             grid_options:
               columns: 6
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_security_button
             variables:
               - name: Side
@@ -3513,7 +3513,7 @@ views:
     sections:
       - type: grid
         cards:
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_room_header
             variables:
               - name: Basement Studio
@@ -3805,7 +3805,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
@@ -3834,7 +3834,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
@@ -3843,7 +3843,7 @@ views:
             grid_options:
               columns: 6
               rows: auto
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: main_accent_color_button
             variables:
               - name: Occupied