Switch calendar cards on main dashboard

From Atomic Calendar Revive to Calendar Card Pro

admin_dashboard.yaml

@@ -75,18 +75,6 @@ views:
             title: Automations
             state_color: true
             show_header_toggle: false
-          - type: entities
-            entities:
-              - entity: input_text.material_rounded_base_color_tony_stork
-                secondary_info: none
-                name: Tony
-              - entity: input_text.material_rounded_base_color_christina_stork
-                secondary_info: none
-                name: Tina
-              - entity: input_text.material_rounded_base_color_kallen_stork
-                secondary_info: none
-                name: Kallen
-            title: Theme Colors
       - type: grid
         cards:
           - type: heading
@@ -368,6 +356,7 @@ views:
               - entity: binary_sensor.front_door
               - entity: binary_sensor.back_door
               - entity: binary_sensor.basement_studio_door
+              - entity: binary_sensor.emma_bedroom_door
               - entity: binary_sensor.front_window_1
               - entity: binary_sensor.front_window_2
               - entity: binary_sensor.kitchen_big_window
@@ -424,7 +413,7 @@ views:
                   - sensor.front_door_battery
                   - sensor.back_door_battery
                   - sensor.basement_studio_door_battery
-                  - sensor.downstairs_bathroom_door_battery
+                  - sensor.emma_bedroom_door_battery
               - name: 'Window Sensors (min: {min}%, count: {count})'
                 secondary_info: Battery levels {range}%
                 icon: mdi:window-closed
@@ -909,6 +898,10 @@ views:
                   int %} {% set roomtemp =
                   states('sensor.master_bedroom_temperature') | int %} {{
                   'Threshold Met' if roomtemp >= threshold else '' }}
+              - entity: input_boolean.master_bedroom_aircon_installed
+                name: Aircon Installed
+              - entity: input_boolean.master_bedroom_climate_protocol
+                name: Climate Automations
             title: Master Bedroom Aircon
             visibility:
               - condition: state
@@ -918,20 +911,43 @@ views:
             state_color: true
           - type: entities
             entities:
-              - entity: input_number.emma_aircon_threshold
+              - entity: input_number.emma_bedroom_aircon_run_threshold
+                name: Run Threshold
                 secondary_info: >
                   {% set threshold =
-                  states('input_number.emma_aircon_threshold') | int %} {% set
-                  low = states('sensor.tonights_low_temp') | int %} {{
+                  states('input_number.emma_bedroom_aircon_run_threshold') | int
+                  %} {% set low = states('sensor.tonights_low_temp') | int %} {{
                   'Threshold Met' if low >= threshold else '' }}
-                name: Bedtime
-            show_header_toggle: false
-            state_color: true
+              - entity: input_number.emma_bedroom_aircon_mode_threshold
+                name: Mode Threshold
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_aircon_mode_threshold') |
+                  int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+              - entity: input_number.emma_bedroom_auto_cooling_threshold
+                name: EBR Auto Cooling
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_auto_cooling_threshold') |
+                  int %} {% set roomtemp =
+                  states('sensor.emma_bedroom_temperature') | int %} {{
+                  'Threshold Met' if roomtemp >= threshold else '' }}
+              - entity: input_boolean.emma_bedroom_aircon_installed
+                name: Aircon Installed
+              - entity: input_boolean.emma_bedroom_heater_installed
+                name: Heater Installed
+              - entity: input_boolean.emma_bedroom_climate_protocol
+                name: Climate Automations
+              - entity: switch.emma_bedroom_climate_watchdog
+                name: Climate Watchdog
             title: Emma Bedroom Aircon
             visibility:
               - condition: state
                 entity: input_boolean.emma_bedroom_aircon_installed
                 state: 'on'
+            show_header_toggle: false
+            state_color: true
           - type: entities
             entities:
               - entity: input_number.master_bedroom_fan_threshold
@@ -1494,80 +1510,108 @@ views:
             heading: Volume Settings
             heading_style: title
             icon: mdi:volume-high
+          - type: entities
+            entities:
+              - entity: sensor.basement_echo_dot_volume
+                name: Basement Echo
+                secondary_info: >
+                  {% if
+                  is_state_attr('media_player.basement_echo_dot','is_volume_muted',true)
+                  %}
+                    MUTED
+                  {% elif
+                  state_attr('media_player.basement_echo_dot','volume_level') %}
+                    {{ state_attr('media_player.basement_echo_dot','volume_level') | round(2) }}
+                  {% else %}
+                    Off
+                  {% endif %}
+              - entity: sensor.basement_google_speaker_volume
+                name: Basement Google
+                secondary_info: >
+                  {% if
+                  is_state_attr('media_player.basement_google_speaker','is_volume_muted',true)
+                  %}
+                    MUTED
+                  {% elif
+                  state_attr('media_player.basement_google_speaker','volume_level')
+                  %}
+                    {{ state_attr('media_player.basement_google_speaker','volume_level') | round(2) }}
+                  {% else %}
+                    Off
+                  {% endif %}
+              - entity: sensor.living_room_echo_dot_volume
+                name: Living Room Echo
+                secondary_info: >
+                  {% if
+                  is_state_attr('media_player.living_room_echo_dot','is_volume_muted',true)
+                  %}
+                    MUTED
+                  {% elif
+                  state_attr('media_player.living_room_echo_dot','volume_level')
+                  %}
+                    {{ state_attr('media_player.living_room_echo_dot','volume_level') | round(2) }}
+                  {% else %}
+                    Off
+                  {% endif %}
+              - entity: sensor.master_bedroom_echo_dot_volume
+                name: Master Bedroom Echo
+                secondary_info: >
+                  {% if
+                  is_state_attr('media_player.master_bedroom_echo_dot','is_volume_muted',true)
+                  %}
+                    MUTED
+                  {% elif
+                  state_attr('media_player.master_bedroom_echo_dot','volume_level')
+                  %}
+                    {{ state_attr('media_player.master_bedroom_echo_dot','volume_level') | round(2) }}
+                  {% else %}
+                    Off
+                  {% endif %}
+              - entity: sensor.kallen_bedroom_google_speaker_volume
+                name: Kallen Bedroom Google
+                secondary_info: >
+                  {% if
+                  is_state_attr('media_player.kallen_bedroom_google_speaker','is_volume_muted',true)
+                  %}
+                    MUTED
+                  {% elif
+                  state_attr('media_player.kallen_bedroom_google_speaker','volume_level')
+                  %}
+                    {{ state_attr('media_player.kallen_bedroom_google_speaker','volume_level') | round(2) }}
+                  {% else %}
+                    Off
+                  {% endif %}
+              - entity: sensor.emma_bedroom_google_speaker_volume
+                name: Emma Bedroom Google
+                secondary_info: >
+                  {% if
+                  is_state_attr('media_player.emma_bedroom_google_speaker','is_volume_muted',true)
+                  %}
+                    MUTED
+                  {% elif
+                  state_attr('media_player.emma_bedroom_google_speaker','volume_level')
+                  %}
+                    {{ state_attr('media_player.emma_bedroom_google_speaker','volume_level') | round(2) }}
+                  {% else %}
+                    Off
+                  {% endif %}
+            title: Active Settings
+            show_header_toggle: false
+            state_color: true
           - type: entities
             entities:
               - entity: input_number.basement_echo_dot_day_volume
                 name: Basement Echo
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','off') %}
-                    {% if is_state_attr('media_player.basement_echo_dot','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.basement_echo_dot','volume_level') %}
-                      {{ state_attr('media_player.basement_echo_dot','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
               - entity: input_number.basement_google_speaker_day_volume
                 name: Basement Google
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','off') %}
-                    {% if is_state_attr('media_player.basement_google_speaker','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.basement_google_speaker','volume_level') %}
-                      {{ state_attr('media_player.basement_google_speaker','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
               - entity: input_number.living_room_echo_dot_day_volume
                 name: Living Room Echo
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','off') %}
-                    {% if is_state_attr('media_player.living_room_echo_dot','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.living_room_echo_dot','volume_level') %}
-                      {{ state_attr('media_player.living_room_echo_dot','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
               - entity: input_number.master_bedroom_echo_dot_day_volume
                 name: Master Bedroom Echo
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','off') %}
-                    {% if is_state_attr('media_player.master_bedroom_echo_dot','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.master_bedroom_echo_dot','volume_level') %}
-                      {{ state_attr('media_player.master_bedroom_echo_dot','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
               - entity: input_number.kallen_bedroom_google_speaker_day_volume
                 name: Kallen Bedroom Google
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','off') %}
-                    {% if is_state_attr('media_player.kallen_bedroom_google_speaker','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.kallen_bedroom_google_speaker','volume_level') %}
-                      {{ state_attr('media_player.kallen_bedroom_google_speaker','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
               - entity: input_number.emma_bedroom_google_speaker_day_volume
                 name: Emma Bedroom Google
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','off') %}
-                    {% if is_state_attr('media_player.emma_bedroom_google_speaker','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.emma_bedroom_google_speaker','volume_level') %}
-                      {{ state_attr('media_player.emma_bedroom_google_speaker','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
             title: Day
             show_header_toggle: false
             state_color: true
@@ -1575,76 +1619,17 @@ views:
             entities:
               - entity: input_number.basement_echo_dot_night_volume
                 name: Basement Echo
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','on') %}
-                    {% if is_state_attr('media_player.basement_echo_dot','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.basement_echo_dot','volume_level') %}
-                      {{ state_attr('media_player.basement_echo_dot','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
               - entity: input_number.basement_google_speaker_night_volume
                 name: Basement Google
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','on') %}
-                    {% if is_state_attr('media_player.basement_google_speaker','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.basement_google_speaker','volume_level') %}
-                      {{ state_attr('media_player.basement_google_speaker','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
               - entity: input_number.living_room_echo_dot_night_volume
                 name: Living Room Echo
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','on') %}
-                    {% if is_state_attr('media_player.living_room_echo_dot','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.living_room_echo_dot','volume_level') %}
-                      {{ state_attr('media_player.living_room_echo_dot','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
+                secondary_info: ''
               - entity: input_number.master_bedroom_echo_dot_night_volume
                 name: Master Bedroom Echo
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','on') %}
-                    {% if is_state_attr('media_player.master_bedroom_echo_dot','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.master_bedroom_echo_dot','volume_level') %}
-                      {{ state_attr('media_player.master_bedroom_echo_dot','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
               - entity: input_number.kallen_bedroom_google_speaker_night_volume
                 name: Kallen Bedroom Google
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','on') %}
-                    {% if is_state_attr('media_player.kallen_bedroom_google_speaker','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.kallen_bedroom_google_speaker','volume_level') %}
-                      {{ state_attr('media_player.kallen_bedroom_google_speaker','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
               - entity: input_number.emma_bedroom_google_speaker_night_volume
                 name: Emma Bedroom Google
-                secondary_info: |
-                  {% if is_state('input_boolean.give_me_darkness','on') %}
-                    {% if is_state_attr('media_player.emma_bedroom_google_speaker','is_volume_muted',true) %}
-                      MUTED
-                    {% elif state_attr('media_player.emma_bedroom_google_speaker','volume_level') %}
-                      {{ state_attr('media_player.emma_bedroom_google_speaker','volume_level') | round(2) }}
-                    {% else %}
-                      Off
-                    {% endif %}
-                  {% endif %}
             title: Night
             show_header_toggle: false
             state_color: true

main_dashboard.yaml

@@ -1,4 +1,4 @@
-decluttering_templates:
+streamline_templates:
   phone_info_grid:
     card:
       type: custom:stack-in-card
@@ -342,48 +342,52 @@ views:
             heading: Family Calendar
             heading_style: title
             icon: mdi:calendar
-          - type: custom:atomic-calendar-revive
-            enableModeChange: true
-            firstDayOfWeek: 1
-            maxDaysToShow: 7
-            refreshInterval: 15
-            entities:
-              - calendar.family
-              - calendar.kallen_school_days
-              - calendar.tony_s_twitch_schedule
+          - entities:
+              - entity: calendar.family
+                label: mdi:human-male-female-child
+                color: green
+                accent_color: green
+              - entity: calendar.kallen_school_days
+                label: mdi:school
+                color: orange
+                accent_color: orange
+              - entity: calendar.tony_s_twitch_schedule
+                label: mdi:twitch
+                color: purple
+                accent_color: purple
               - calendar.kallen_early_release
               - calendar.tm24fan8_gmail_com
               - calendar.irishpirate1988_gmail_com
               - calendar.vacation
-            showLoader: true
-            hideFinishedEvents: true
-            showRelativeTime: false
-            showDate: true
-            sortByStartTime: true
-            showLocation: true
-            hideDuplicates: false
-            noEventText: Nothing scheduled for today!
-            showCurrentEventLine: false
-            showMonth: false
-            showProgressBar: true
-            showWeekDay: true
-            disableEventLink: false
-            showNoEventsForToday: true
-            showEventIcon: false
-            showFullDayProgress: false
-            showLastCalendarWeek: false
-            disableCalEventLink: false
-            disableCalLocationLink: false
-            showTimeRemaining: true
-            showAllDayEvents: true
-            hoursOnSameLine: false
-            showMultiDayEventParts: false
-            showMultiDay: false
-            showDescription: false
-            disableLocationLink: false
-            showCalendarName: false
-            showAllDayHours: true
-            disableCalLink: false
+            days_to_show: 5
+            week_separator_width: 1px
+            month_separator_width: 1px
+            today_indicator: dot
+            weekend_weekday_color: cyan
+            weekend_day_color: cyan
+            weekend_month_color: cyan
+            today_weekday_color: ''
+            today_day_color: ''
+            today_month_color: ''
+            show_countdown: true
+            show_progress_bar: true
+            remove_location_country: true
+            weather:
+              position: date
+              date:
+                show_conditions: true
+                show_high_temp: true
+                show_low_temp: false
+                icon_size: 14px
+                font_size: 12px
+                color: var(--primary-text-color)
+              event:
+                show_conditions: true
+                show_temp: true
+                icon_size: 14px
+                font_size: 12px
+                color: var(--primary-text-color)
+            type: custom:calendar-card-pro
       - type: grid
         cards:
           - type: heading
@@ -544,6 +548,20 @@ views:
                 attributes:
                   label: Text Notify
                   icon: mdi:text
+              - card:
+                  type: entities
+                  entities:
+                    - entity: input_text.report_system
+                      name: Description
+                    - entity: input_select.report_type
+                      name: Report Type
+                    - entity: button.send_report
+                  title: Report System
+                  show_header_toggle: false
+                  state_color: false
+                attributes:
+                  label: Reports
+                  icon: mdi:bug
       - type: grid
         cards:
           - type: heading
@@ -1478,6 +1496,17 @@ views:
               show_header_toggle: false
               state_color: true
               title: Lights On
+          - show_name: true
+            show_icon: true
+            type: button
+            tap_action:
+              action: toggle
+            entity: button.emma_door_alert_cancel
+            show_state: false
+            visibility:
+              - condition: state
+                entity: timer.emma_door_alert
+                state: active
         visibility:
           - condition: state
             entity: light.second_floor_lights
@@ -2021,6 +2050,9 @@ views:
                         eco:
                           name: Eco On
                         boost: false
+                        comfort: false
+                        sleep: false
+                        away: false
               - type: custom:state-switch
                 entity: input_boolean.master_bedroom_aircon_installed
                 states:
@@ -2344,70 +2376,71 @@ views:
                           service: timer.finish
                           target:
                             entity_id: timer.emma_bedroom_motion_timer
+                - type: entities
+                  state_color: true
+                  entities:
+                    - type: custom:paper-buttons-row
+                      buttons:
+                        - entity: input_boolean.emma_sleeping
+                          name: Sleeping
+                          layout: icon|name_state
+                          state:
+                            case: first
+                          state_icons:
+                            'on': mdi:sleep
+                            'off': mdi:sleep-off
+                            unavailable: mdi:map-marker-question
+                        - entity: input_boolean.white_noise_emma_bedroom
+                          name: White Noise
+                          layout: icon|name_state
+                          state:
+                            case: first
+                          state_icons:
+                            'on': mdi:volume-high
+                            'off': mdi:volume-off
+                            unavailable: mdi:map-marker-question
+                  show_header_toggle: false
                 - type: custom:state-switch
                   entity: input_boolean.emma_bedroom_aircon_installed
                   states:
                     'on':
-                      type: entities
+                      type: custom:simple-thermostat
+                      entity: climate.emma_bedroom_aircon
+                      header: false
+                      decimals: 0
+                      step_size: 1
+                      layout:
+                        mode:
+                          headings: false
+                          names: true
+                          icons: true
+                        step: row
+                      control:
+                        hvac:
+                          heat: false
+                        preset:
+                          none:
+                            name: Eco Off
+                          eco:
+                            name: Eco On
+                          boost: false
+                          comfort: false
+                          sleep: false
+                          away: false
+                - type: custom:state-switch
+                  entity: input_boolean.emma_bedroom_aircon_installed
+                  states:
+                    'on':
+                      type: glance
+                      show_name: true
+                      show_icon: true
+                      show_state: true
                       state_color: true
                       entities:
-                        - type: custom:paper-buttons-row
-                          buttons:
-                            - entity: input_boolean.emma_sleeping
-                              name: Sleeping
-                              layout: icon|name_state
-                              state:
-                                case: first
-                              state_icons:
-                                'on': mdi:sleep
-                                'off': mdi:sleep-off
-                                unavailable: mdi:map-marker-question
-                            - entity: fan.emma_air_conditioner
-                              name: A/C
-                              layout: icon|name_state
-                              state:
-                                case: first
-                              state_icons:
-                                'on': mdi:fan
-                                'off': mdi:fan-off
-                                unavailable: mdi:map-marker-question
-                            - entity: input_boolean.white_noise_emma_bedroom
-                              name: White Noise
-                              layout: icon|name_state
-                              state:
-                                case: first
-                              state_icons:
-                                'on': mdi:volume-high
-                                'off': mdi:volume-off
-                                unavailable: mdi:map-marker-question
-                        - entity: binary_sensor.emma_aircon_compressor
+                        - entity: binary_sensor.emma_bedroom_aircon_compressor
                           name: Compressor
-                        - entity: script.emma_aircon_shutoff
-                          name: Aircon Shutoff
-                    'off':
-                      type: entities
-                      entities:
-                        - type: custom:paper-buttons-row
-                          buttons:
-                            - entity: input_boolean.emma_sleeping
-                              name: Sleeping
-                              layout: icon|name_state
-                              state:
-                                case: first
-                              state_icons:
-                                'on': mdi:sleep
-                                'off': mdi:sleep-off
-                                unavailable: mdi:map-marker-question
-                            - entity: input_boolean.white_noise_emma_bedroom
-                              name: White Noise
-                              layout: icon|name_state
-                              state:
-                                case: first
-                              state_icons:
-                                'on': mdi:volume-high
-                                'off': mdi:volume-off
-                                unavailable: mdi:map-marker-question
-                  show_header_toggle: false
+                        - entity: binary_sensor.emma_bedroom_aircon_filter_alert
+                          name: Filter
                 - type: custom:state-switch
                   entity: input_boolean.emma_bedroom_heater_installed
                   states:
@@ -2452,8 +2485,15 @@ views:
                           layout: icon|name_state
                           state:
                             case: first
+                    - entity: switch.emma_door_alert
+                      name: Door Alert
+                    - entity: button.emma_door_alert_cancel
+                      name: Cancel Door Alert
                     - entity: switch.emma_bedroom_motion_lighting
                       name: Motion Lighting
+                    - entity: switch.emma_bedroom_climate_watchdog
+                      name: Climate Watchdog
+                      secondary_info: Protects aircon settings
                     - entity: input_number.nighttime_brightness_emma_bedroom
                       name: Night Brightness
                     - entity: input_number.emma_bedroom_lights_off_delay
@@ -2966,6 +3006,11 @@ views:
                         layout: icon|name_state
                         state:
                           case: first
+                      - entity: switch.front_porch_storm_mode
+                        name: Storm Mode
+                        layout: icon|name_state
+                        state:
+                          case: first
                   - entity: input_number.daytime_colortemp_front_porch
                     name: Day Colortemp
                   - entity: input_number.nighttime_colortemp_front_porch
@@ -3403,18 +3448,12 @@ views:
         cards:
           - type: heading
             heading: Master Bedroom
-          - type: entities
-            entities:
-              - entity: input_boolean.master_bedroom_aircon_installed
-                name: Aircon Installed
-              - entity: input_boolean.master_bedroom_climate_protocol
-                name: Climate Automations
-            state_color: true
-            show_header_toggle: false
           - type: entities
             entities:
               - entity: switch.master_bedroom_aircon_display
                 name: A/C Display
+              - entity: switch.master_bedroom_aircon_prompt_tone
+                name: Prompt Tone
               - entity: binary_sensor.master_bedroom_aircon_filter_alert
                 name: Filter Status
               - entity: input_number.master_bedroom_daytime_temp
@@ -3425,6 +3464,13 @@ views:
                 name: Bedtime Temp
               - entity: button.master_bedroom_fan_only
                 name: A/C Fan Only
+              - entity: button.master_bedroom_day_mode
+                name: Day Mode
+                icon: m3rf:sunny
+              - entity: button.master_bedroom_night_mode
+                name: Night Mode
+              - entity: button.master_bedroom_bedtime_mode
+                name: Bedtime Mode
               - entity: button.master_bedroom_climate_reset
                 name: Climate Reset
             show_header_toggle: false
@@ -3442,33 +3488,40 @@ views:
         cards:
           - type: heading
             heading: Emma Bedroom
-          - type: custom:state-switch
-            entity: input_boolean.emma_bedroom_aircon_installed
-            transition: flip
-            states:
-              'on':
-                type: entities
-                entities:
-                  - entity: input_boolean.emma_bedroom_aircon_installed
-                    name: Emma Bedroom Aircon Installed
-                  - entity: script.emma_aircon_shutoff
-                    name: Shut A/C off safely
-                show_header_toggle: false
-                state_color: true
-              'off':
-                type: entities
-                entities:
-                  - entity: input_boolean.emma_bedroom_aircon_installed
-                    name: Emma Bedroom Aircon Installed
-                    secondary_info: Turn on in summer
-                show_header_toggle: false
-                state_color: true
           - type: entities
             entities:
-              - entity: input_boolean.emma_bedroom_heater_installed
-                name: Heater Installed
+              - entity: switch.emma_bedroom_aircon_display
+                name: A/C Display
+              - entity: switch.emma_bedroom_aircon_prompt_tone
+                name: Prompt Tone
+              - entity: switch.emma_bedroom_climate_watchdog
+                name: Climate Watchdog
+                secondary_info: Protects aircon settings
+              - entity: binary_sensor.emma_bedroom_aircon_filter_alert
+                name: Filter Status
+              - entity: input_number.emma_bedroom_daytime_temp
+                name: Daytime Temp
+              - entity: input_number.emma_bedroom_night_temp
+                name: Night Temp
+              - entity: input_number.emma_bedroom_bedtime_temp
+                name: Bedtime Temp
+              - entity: button.emma_bedroom_fan_only
+                name: A/C Fan Only
+              - entity: button.emma_bedroom_day_mode
+                name: Day Mode
+                icon: m3rf:sunny
+              - entity: button.emma_bedroom_night_mode
+                name: Night Mode
+              - entity: button.emma_bedroom_bedtime_mode
+                name: Bedtime Mode
+              - entity: button.emma_bedroom_climate_reset
+                name: Climate Reset
             show_header_toggle: false
             state_color: true
+            visibility:
+              - condition: state
+                entity: input_boolean.emma_bedroom_aircon_installed
+                state: 'on'
         visibility:
           - condition: user
             users:
@@ -3490,12 +3543,23 @@ views:
                 exclude_states:
                   - unavailable
                   - unknown
+              - entity: climate.emma_bedroom_aircon
+                icon: mdi:air-conditioner
+                exclude_states:
+                  - unavailable
+                  - unknown
               - entity: sensor.master_bedroom_target_temp
                 icon: mdi:thermostat
                 name: Master Bedroom Set Temp
                 exclude_states:
                   - unavailable
                   - unknown
+              - entity: sensor.emma_bedroom_target_temp
+                icon: mdi:thermostat
+                name: Emma Bedroom Set Temp
+                exclude_states:
+                  - unavailable
+                  - unknown
               - entity: fan.master_bedroom_fan
                 name: Master Bedroom Fan
                 exclude_states:
@@ -3511,27 +3575,27 @@ views:
                 exclude_states:
                   - unavailable
                   - unknown
-              - entity: fan.emma_air_conditioner
-                exclude_states:
-                  - unavailable
-                  - unknown
-              - entity: sensor.master_bedroom_aircon_eco_mode
+              - entity: switch.master_bedroom_aircon_eco_mode
                 name: Master Bedroom Eco Mode
-                exclude_states:
-                  - unavailable
-                  - unknown
               - entity: sensor.master_bedroom_aircon_fan_mode
                 name: Master Bedroom A/C Fan
                 exclude_states:
                   - unavailable
                   - unknown
-              - entity: binary_sensor.emma_aircon_fan
-                name: Emma A/C Fan
+              - entity: binary_sensor.emma_bedroom_aircon_fan
+                name: Emma Bedroom A/C Fan
                 exclude_states:
                   - unavailable
                   - unknown
-              - entity: binary_sensor.emma_aircon_compressor
-                name: Emma A/C Compressor
+              - entity: binary_sensor.emma_bedroom_aircon_compressor
+                name: Emma Bedroom A/C Compressor
+                exclude_states:
+                  - unavailable
+                  - unknown
+              - entity: switch.emma_bedroom_aircon_eco_mode
+                name: Emma Bedroom Eco Mode
+              - entity: sensor.emma_bedroom_aircon_fan_mode
+                name: Emma Bedroom A/C Fan
                 exclude_states:
                   - unavailable
                   - unknown
@@ -3565,6 +3629,16 @@ views:
                 exclude_states:
                   - unavailable
                   - unknown
+              - entity: switch.master_bedroom_aircon_display
+                name: Master Bedroom A/C Display
+                exclude_states:
+                  - unavailable
+                  - unknown
+              - entity: switch.emma_bedroom_aircon_display
+                name: Emma Bedroom A/C Display
+                exclude_states:
+                  - unavailable
+                  - unknown
     max_columns: 4
     cards: []
     badges: []
@@ -3932,9 +4006,6 @@ views:
                 name: I am awake
               - entity: input_select.kallen_morning_briefing_location
                 name: Morning Briefing Location
-              - entity: input_text.material_rounded_base_color_kallen_stork
-                secondary_info: none
-                name: Theme Color
     max_columns: 4
     cards: []
     background:
@@ -4087,11 +4158,11 @@ views:
         cards:
           - type: heading
             heading: Tony's iPhone
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: iphone_entities_card
             variables:
               - device: tony_s_iphone
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: phone_info_grid
             variables:
               - device: tony_s_iphone
@@ -4100,11 +4171,11 @@ views:
         cards:
           - type: heading
             heading: Tina's iPhone
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: iphone_entities_card
             variables:
               - device: tinas_iphone
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: phone_info_grid
             variables:
               - device: tinas_iphone
@@ -4113,11 +4184,11 @@ views:
         cards:
           - type: heading
             heading: Kallen's iPhone
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: iphone_entities_card
             variables:
               - device: kallen_iphone
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: phone_info_grid
             variables:
               - device: kallen_iphone
@@ -4152,7 +4223,7 @@ views:
         cards:
           - type: heading
             heading: Tony's iPad
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: ipad_entities_card
             variables:
               - device: tony_s_ipad
@@ -4160,7 +4231,7 @@ views:
         cards:
           - type: heading
             heading: Tina’s iPad
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: ipad_entities_card
             variables:
               - device: tinas_ipad
@@ -5094,7 +5165,7 @@ views:
         cards:
           - type: heading
             heading: ironnerd24
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: xbox_card
             variables:
               - gamertag: tm24fan
@@ -5102,7 +5173,7 @@ views:
         cards:
           - type: heading
             heading: kjsgamer2012
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: xbox_card
             variables:
               - gamertag: kjsgamer2012
@@ -5110,7 +5181,7 @@ views:
         cards:
           - type: heading
             heading: irishpirate1988
-          - type: custom:decluttering-card
+          - type: custom:streamline-card
             template: xbox_card
             variables:
               - gamertag: irishpirate1988
@@ -5776,22 +5847,6 @@ views:
                     {{ "Stupid" if
                     is_state('input_boolean.early_night_mode','on') else "Not
                     Stupid" }}
-          - type: custom:config-template-card
-            variables:
-              BOOL_STATE: states['input_boolean.toggle_testing'].state
-              LIGHT_STATE: states['light.living_room_lights'].state
-            entities:
-              - light.living_room_lights
-              - input_boolean.toggle_testing
-            card:
-              type: entities
-              title: '${BOOL_STATE === ''on'' ? ''Testing'' : ''Fucked Up''}'
-              entities:
-                - entity: light.living_room_lights
-                  name: '${BOOL_STATE === ''on'' ? ''Lights'' : ''Other Lights''}'
-                - entity: input_boolean.toggle_testing
-              show_header_toggle: false
-              state_color: true
       - type: grid
         cards:
           - type: heading
@@ -6132,6 +6187,13 @@ views:
                 entity: sensor.home_wind_direction_degrees
           - type: entities
             entities:
+              - entity: binary_sensor.tornado_warning
+                type: custom:multiple-entity-row
+                name: Warnings
+                state_header: Tornado
+                entities:
+                  - entity: binary_sensor.severe_thunderstorm_warning
+                    name: Severe T-storm
               - entity: sensor.home_wind_speed
                 type: custom:multiple-entity-row
                 name: Wind