Merge branch 'main_dash_overhaul' into dev

home_automation/Home-Assistant-Configs#257

admin_dashboard.yaml

@@ -200,13 +200,13 @@ views:
                         action: call-service
                         service: watchman.report
                 entities:
-                  - entity: sensor.watchman_missing_services
+                  - entity: sensor.watchman_missing_actions
-                    name: Services
+                    name: Actions
               - entity: input_select.default_log_level
                 name: Default Log Level
               - entity: input_select.log_level
                 name: Core Log Level
-            title: Home Assistant Stats
+              - entity: input_boolean.recorder
             state_color: true
             show_header_toggle: false
             visibility:
@@ -496,6 +496,26 @@ views:
                 state_map:
                   'on': Open
                   'off': Closed
+              - entity: binary_sensor.emma_bedroom_window
+                state_map:
+                  'on': Open
+                  'off': Closed
+              - entity: binary_sensor.kallen_bedroom_window_1
+                state_map:
+                  'on': Open
+                  'off': Closed
+              - entity: binary_sensor.kallen_bedroom_window_2
+                state_map:
+                  'on': Open
+                  'off': Closed
+              - entity: binary_sensor.master_bedroom_window_1
+                state_map:
+                  'on': Open
+                  'off': Closed
+              - entity: binary_sensor.master_bedroom_window_2
+                state_map:
+                  'on': Open
+                  'off': Closed
               - entity: sensor.living_room_windows_open
                 name: Living Room Windows
       - type: grid
@@ -543,6 +563,11 @@ views:
                   - sensor.downstairs_bathroom_window_1_battery
                   - sensor.downstairs_bathroom_window_2_battery
                   - sensor.upstairs_bathroom_window_battery
+                  - sensor.master_bedroom_window_1_battery
+                  - sensor.master_bedroom_window_2_battery
+                  - sensor.kallen_bedroom_window_1_battery
+                  - sensor.kallen_bedroom_window_2_battery
+                  - sensor.emma_bedroom_window_battery
               - name: 'Glass Break Sensors (min: {min}%, count: {count})'
                 secondary_info: Battery levels {range}%
                 icon: mdi:image-broken-variant
@@ -591,6 +616,8 @@ views:
                   value: '*chrome*'
                 - name: entity_id
                   value: sensor.front_doorbell_battery
+                - name: entity_id
+                  value: '*home_tempest_cloud*'
             tap_action: more-info
       - type: grid
         cards:
@@ -919,8 +946,8 @@ views:
             heading: Emma
           - type: entities
             entities:
-              - entity: input_datetime.emma_bedroom_cooling
+              - entity: input_datetime.emma_bedroom_climate
-                name: Cooling
+                name: Climate
               - entity: input_datetime.emma_bedtime
                 name: Bedtime
               - entity: input_datetime.emma_wakeup
@@ -982,112 +1009,6 @@ views:
             title: Modes
             show_header_toggle: false
             state_color: true
-          - type: entities
-            entities:
-              - entity: input_number.master_bedroom_aircon_run_threshold
-                name: Run Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_aircon_run_threshold') |
-                  int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.master_bedroom_aircon_mode_threshold
-                name: Mode Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_aircon_mode_threshold') |
-                  int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.master_bedroom_auto_cooling_threshold
-                name: MBR Auto Cooling
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_auto_cooling_threshold') |
-                  int %} {% set roomtemp =
-                  states('sensor.master_bedroom_temperature') | int %} {{
-                  'Threshold Met' if roomtemp >= threshold else '' }}
-              - entity: input_number.master_bedroom_mode_switch_threshold
-                name: MBR Mode Switch
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_mode_switch_threshold') |
-                  int %} {% set high = states('sensor.todays_high_temp') | int
-                  %} {{ 'Threshold Met' if high >= 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
-                entity: input_boolean.master_bedroom_aircon_installed
-                state: 'on'
-            show_header_toggle: false
-            state_color: true
-          - type: entities
-            entities:
-              - entity: input_number.emma_bedroom_aircon_run_threshold
-                name: Run Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_aircon_run_threshold') | int
-                  %} {% set low = states('sensor.tonights_low_temp') | int %} {{
-                  'Threshold Met' if low >= threshold else '' }}
-              - 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_number.emma_bedroom_mode_switch_threshold
-                name: EBR Mode Switch
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_mode_switch_threshold') |
-                  int %} {% set high = states('sensor.todays_high_temp') | int
-                  %} {{ 'Threshold Met' if high >= 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
-                name: MBR Fan
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_fan_threshold') | int %}
-                  {% set low = states('sensor.tonights_low_temp') | int %} {{
-                  'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.kallen_fan_threshold
-                name: Kallen Fan
-                secondary_info: >
-                  {% set threshold = states('input_number.kallen_fan_threshold')
-                  | int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-            title: Fans
-            show_header_toggle: false
-            state_color: true
           - type: entities
             entities:
               - entity: input_number.hot_day_threshold
@@ -1140,6 +1061,185 @@ views:
             state_color: true
             title: Weather
         column_span: 1
+      - type: grid
+        cards:
+          - type: heading
+            heading: Thresholds
+            heading_style: title
+          - type: custom:auto-entities
+            card:
+              type: entities
+            filter:
+              include:
+                - options: {}
+                  domain: input_number
+                  entity_id: '*hot_threshold'
+                  sort:
+                    method: entity_id
+              exclude: []
+          - type: custom:auto-entities
+            card:
+              type: entities
+            filter:
+              include:
+                - options: {}
+                  domain: input_number
+                  entity_id: '*cold_threshold'
+                  sort:
+                    method: entity_id
+              exclude: []
+        column_span: 2
+      - type: grid
+        cards:
+          - type: heading
+            heading: Master Bedroom Climate Settings
+            heading_style: title
+          - type: entities
+            entities:
+              - entity: input_boolean.master_bedroom_climate_protocol
+                name: Climate Automations
+              - entity: input_boolean.master_bedroom_aircon_installed
+                name: Aircon Installed
+            title: General
+            show_header_toggle: false
+            state_color: true
+          - type: entities
+            entities:
+              - entity: input_number.master_bedroom_fan_threshold
+                name: Fan
+              - entity: input_number.master_bedroom_aircon_run_threshold
+                name: Aircon Run
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.master_bedroom_aircon_run_threshold') |
+                  int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+              - entity: input_number.master_bedroom_aircon_mode_threshold
+                name: Aircon Mode
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.master_bedroom_aircon_mode_threshold') |
+                  int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+              - entity: input_number.master_bedroom_auto_cooling_threshold
+                name: Auto Cooling
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.master_bedroom_auto_cooling_threshold') |
+                  int %} {% set roomtemp =
+                  states('sensor.master_bedroom_temperature') | int %} {{
+                  'Threshold Met' if roomtemp >= threshold else '' }}
+              - entity: input_number.master_bedroom_mode_switch_threshold
+                name: Mode Switch
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.master_bedroom_mode_switch_threshold') |
+                  int %} {% set high = states('sensor.todays_high_temp') | int
+                  %} {{ 'Threshold Met' if high >= threshold else '' }}
+              - entity: input_boolean.master_bedroom_aircon_installed
+                name: Aircon Installed
+            title: Aircon Settings
+            visibility:
+              - condition: state
+                entity: input_boolean.master_bedroom_aircon_installed
+                state: 'on'
+            show_header_toggle: false
+            state_color: true
+      - type: grid
+        cards:
+          - type: heading
+            heading: Kallen Bedroom Climate Settings
+            heading_style: title
+          - type: entities
+            entities:
+              - entity: input_number.kallen_fan_threshold
+                name: Kallen Fan
+                secondary_info: >
+                  {% set threshold = states('input_number.kallen_fan_threshold')
+                  | int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+            title: Fan Settings
+            show_header_toggle: false
+            state_color: true
+      - type: grid
+        cards:
+          - type: heading
+            heading: Emma Bedroom Climate Settings
+            heading_style: title
+          - type: entities
+            entities:
+              - entity: input_boolean.emma_bedroom_climate_protocol
+                name: Climate Automations
+              - entity: input_boolean.emma_bedroom_aircon_installed
+                name: Aircon Installed
+              - entity: input_boolean.emma_bedroom_heater_installed
+                name: Heater Installed
+            show_header_toggle: false
+            state_color: true
+            title: General
+          - type: entities
+            entities:
+              - entity: input_number.emma_bedroom_aircon_run_threshold
+                name: Run Threshold
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_aircon_run_threshold') | int
+                  %} {% set low = states('sensor.tonights_low_temp') | int %} {{
+                  'Threshold Met' if low >= threshold else '' }}
+              - 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_number.emma_bedroom_mode_switch_threshold
+                name: EBR Mode Switch
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_mode_switch_threshold') |
+                  int %} {% set high = states('sensor.todays_high_temp') | int
+                  %} {{ 'Threshold Met' if high >= threshold else '' }}
+              - entity: switch.emma_bedroom_climate_watchdog
+                name: Climate Watchdog
+            title: Aircon Settings
+            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.emma_bedroom_heater_run_threshold
+                name: Run Threshold
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_heater_run_threshold') | int
+                  %} {% set low = states('sensor.tonights_low_temp') | int %} {{
+                  'Threshold Met' if low < threshold else '' }}
+              - entity: input_number.emma_bedroom_heater_shutoff_threshold
+                name: Shutoff Threshold
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_heater_shutoff_threshold') |
+                  int %} {% set low = states('sensor.tonights_low_temp') | int
+                  %} {{ 'Threshold Met' if low >= threshold else '' }}
+            title: Heater Settings
+            visibility:
+              - condition: state
+                entity: input_boolean.emma_bedroom_heater_installed
+                state: 'on'
+            show_header_toggle: false
+            state_color: true
       - type: grid
         cards:
           - type: heading

mobile_dashboard.yaml

@@ -474,26 +474,40 @@ views:
             heading_style: title
           - type: custom:meteoalarm-card
             entities:
-              entity: sensor.weatheralerts
+              - entity: sensor.weatheralerts_defiance_ohz004_ohc039
             integration: weatheralerts
             hide_when_no_warning: true
             visibility:
-              - condition: state
+              - condition: numeric_state
-                entity: sensor.weatheralerts_alerts_are_active
+                entity: sensor.weatheralerts_defiance_ohz004_ohc039
-                state: 'Yes'
+                above: 0
-          - type: custom:clock-weather-card
+            override_headline: false
-            entity: weather.iron_nerd_weather_station
+          - type: custom:weather-forecast-card
-            sun_entity: sun.sun
+            show_current: true
-            weather_icon_type: fill
+            show_forecast: true
-            humidity_sensor: sensor.home_relative_humidity
+            default_forecast: daily
-            show_humidity: true
-            apparent_sensor: sensor.home_temperature_feels_like
-            animated_icon: true
-            forecast_rows: 7
-            time_format: 12
             tap_action:
               action: navigate
               navigation_path: /lovelace/weather
+            entity: weather.iron_nerd_weather_station
+            show_condition_effects: true
+            forecast:
+              mode: chart
+              show_sun_times: true
+              extra_attribute: wind_bearing
+              use_color_thresholds: false
+              hourly_group_size: 1
+              temperature_precision: 0
+            forecast_action:
+              tap_action:
+                action: toggle-forecast
+            current:
+              show_attributes:
+                - apparent_temperature
+                - visibility
+                - pressure
+                - wind_speed
+              temperature_precision: 0
           - type: heading
             icon: mdi:home-account
             heading: People
@@ -1246,7 +1260,7 @@ views:
                     styles: |-
                       .bubble-button-background {
                         opacity: 1 !important;
-                        background-color: ${state === 'on' ? 'var(--accent-color)' : 'var(--background-color-2)'} !important;
+                        background-color: ${state === 'on' ? 'var(--bubble-accent-color)' : 'var(--background-color-2)'} !important;
                       }
                     modules:
                       - default
@@ -1281,7 +1295,7 @@ views:
                     styles: |-
                       .bubble-button-background {
                         opacity: 1 !important;
-                        background-color: ${state === 'on' ? 'var(--accent-color)' : 'var(--background-color-2)'} !important;
+                        background-color: ${state === 'on' ? 'var(--bubble-accent-color)' : 'var(--background-color-2)'} !important;
                       }
                     modules:
                       - default
@@ -1631,13 +1645,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.basement_studio_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.basement_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -1837,19 +1851,19 @@ views:
                     variables:
                       name: Front Motion
                       entity: binary_sensor.living_room_front_motion
-                      color: accent-color
+                      color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       name: Back Motion
                       entity: binary_sensor.living_room_back_motion
-                      color: accent-color
+                      color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       name: Occupied
                       entity: binary_sensor.living_room_occupied
-                      color: accent-color
+                      color: bubble-accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2007,13 +2021,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.downstairs_bathroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.downstairs_bathroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -2194,13 +2208,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.mud_room_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.mud_room_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -2287,13 +2301,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.stairwell_bottom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.stairwell_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -2384,13 +2398,27 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.stairwell_top_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.upstairs_hallway_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Security
+                icon: mdi:security
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Window
+                      entity: binary_sensor.stairway_window_upper
+                      color: error-color
+                  - type: custom:bubble-card
+                    card_type: empty-column
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2494,13 +2522,27 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.upstairs_bathroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.upstairs_bathroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Security
+                icon: mdi:security
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Window
+                      entity: binary_sensor.upstairs_bathroom_window
+                      color: error-color
+                  - type: custom:bubble-card
+                    card_type: empty-column
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2536,17 +2578,20 @@ views:
                   data:
                     option: Adaptive
                 sub_button:
+                  main:
                     - entity: input_select.master_bedroom_scenes
                       name: Scenes
                       tap_action:
                         action: toggle
                       show_name: false
                       icon: mdi:palette
+                      sub_button_type: select
                     - entity: switch.master_bedroom_motion_lighting
                       name: Motion Lighting
                       icon: mdi:motion-sensor
                       tap_action:
                         action: toggle
+                  bottom: []
                 modules:
                   - default
               - type: custom:bubble-card
@@ -2669,7 +2714,7 @@ views:
                           styles: |-
                             .bubble-button-background {
                               opacity: 1 !important;
-                              background-color: ${state === 'on' ? 'var(--accent-color)' : 'var(--background-color-2)'} !important;
+                              background-color: ${state === 'on' ? 'var(--bubble-accent-color)' : 'var(--background-color-2)'} !important;
                             }
                         - type: custom:bubble-card
                           card_type: button
@@ -2757,13 +2802,31 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.master_bedroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.master_bedroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Security
+                icon: mdi:security
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Window 1
+                      entity: binary_sensor.master_bedroom_window_1
+                      color: error-color
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Window 2
+                      entity: binary_sensor.master_bedroom_window_2
+                      color: error-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2798,16 +2861,19 @@ views:
                   data:
                     option: Adaptive
                 sub_button:
+                  main:
                     - entity: input_select.kallen_bedroom_scenes
                       name: Scenes
                       tap_action:
                         action: toggle
                       show_name: false
                       icon: mdi:palette
+                      sub_button_type: select
                     - entity: switch.kallen_bedroom_motion_lighting
                       name: Motion Lighting
                       tap_action:
                         action: toggle
+                  bottom: []
               - type: custom:bubble-card
                 card_type: separator
                 name: Lights
@@ -2944,13 +3010,31 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.kallen_bedroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.kallen_bedroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Security
+                icon: mdi:security
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Window 1
+                      entity: binary_sensor.kallen_bedroom_window_1
+                      color: error-color
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Window 2
+                      entity: binary_sensor.kallen_bedroom_window_2
+                      color: error-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2980,18 +3064,21 @@ views:
                 hold_action:
                   action: more-info
                 sub_button:
+                  main:
                     - entity: input_select.emma_bedroom_scenes
                       name: Scenes
                       tap_action:
                         action: toggle
                       show_name: false
                       icon: mdi:palette
+                      sub_button_type: select
                     - entity: switch.emma_bedroom_motion_lighting
                       name: Motion Lighting
                       tap_action:
                         action: toggle
                       hold_action:
                         action: more-info
+                  bottom: []
                 modules:
                   - default
               - type: custom:bubble-card
@@ -3015,7 +3102,42 @@ views:
                       double_tap_action:
                         action: none
                   - type: custom:bubble-card
-                    card_type: empty-column
+                    card_type: button
+                    entity: switch.emma_door_alert
+                    name: Door Alert
+                    show_state: true
+                    tap_action:
+                      action: toggle
+                    double_tap_action:
+                      action: none
+                    hold_action:
+                      action: more-info
+                    button_action:
+                      double_tap_action:
+                        action: none
+                    button_type: switch
+                    sub_button:
+                      main: []
+                      bottom: []
+                    styles: >-
+                      .is-unavailable {
+                        opacity: 0.5 !important;
+                      }
+
+                      .bubble-button-background {
+                        opacity: 1 !important;
+                        background-color: ${state === 'on' ? 'var(--success-color)' : 'var(--error-color)'} !important;
+                        transition: background-color 1s !important;
+                      }
+
+                      .bubble-icon {
+                        opacity: 1 !important;
+                        color: ${state === 'on' ? 'var(--success-color)' : 'var(--error-color)'} !important;
+                        transition: color 1s !important;
+                      }
+
+                      ${icon.setAttribute("icon", hass.states[entity].state ===
+                      'off' ? 'mdi:alert' : 'mdi:check')}
               - type: custom:bubble-card
                 card_type: separator
                 name: Environment
@@ -3063,7 +3185,7 @@ views:
                           styles: |-
                             .bubble-button-background {
                               opacity: 1 !important;
-                              background-color: ${state === 'on' ? 'var(--accent-color)' : 'var(--background-color-2)'} !important;
+                              background-color: ${state === 'on' ? 'var(--bubble-accent-color)' : 'var(--background-color-2)'} !important;
                             }
                         - type: custom:bubble-card
                           card_type: button
@@ -3180,13 +3302,31 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.emma_bedroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.emma_bedroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Security
+                icon: mdi:security
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Door
+                      entity: binary_sensor.emma_bedroom_door
+                      color: error-color
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Window
+                      entity: binary_sensor.emma_bedroom_window
+                      color: error-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -3243,6 +3383,20 @@ views:
                       - name: Back
                       - entity: binary_sensor.back_door
                       - color: error-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Basement Studio
+                icon: mdi:twitch
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      - name: Door
+                      - entity: binary_sensor.basement_studio_door
+                      - color: error-color
+                  - type: custom:bubble-card
+                    card_type: empty-column
               - type: custom:bubble-card
                 card_type: separator
                 name: Living Room
@@ -3399,6 +3553,60 @@ views:
                       - color: error-color
                   - type: custom:bubble-card
                     card_type: empty_column
+              - type: custom:bubble-card
+                card_type: separator
+                name: Master Bedroom
+                icon: mdi:bed
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      - name: Window
+                      - entity: binary_sensor.master_bedroom_window_1
+                      - color: error-color
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      - name: Window 1
+                      - entity: binary_sensor.master_bedroom_window_2
+                      - color: error-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Kallen Bedroom
+                icon: mdi:bunk-bed
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      - name: Window 1
+                      - entity: binary_sensor.kallen_bedroom_window_1
+                      - color: error-color
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      - name: Window 2
+                      - entity: binary_sensor.kallen_bedroom_window_2
+                      - color: error-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Emma Bedroom
+                icon: hue:room-nursery
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      - name: Door
+                      - entity: binary_sensor.emma_bedroom_door
+                      - color: error-color
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      - name: Window
+                      - entity: binary_sensor.emma_bedroom_window
+                      - color: error-color
           - type: vertical-stack
             cards:
               - type: custom:bubble-card
@@ -3659,14 +3867,88 @@ views:
                 button_type: name
                 name: Gas Prices
                 icon: mdi:gas-station
-              - type: entities
+                sub_button:
-                entities:
+                  main: []
-                  - entity: sensor.local_minimum_gas_price
+                  bottom: []
-                    name: Minimum
+              - type: horizontal-stack
-                  - entity: sensor.local_average_gas_price
+                cards:
-                    name: Average
+                  - type: custom:gauge-card-pro
-                  - entity: sensor.local_maximum_gas_price
+                    entity: sensor.local_minimum_gas_price
-                    name: Maximum
+                    segments:
+                      - pos: 2
+                        color: var(--success-color)
+                      - pos: 3
+                        color: var(--warning-color)
+                      - pos: 4
+                        color: var(--error-color)
+                    needle: true
+                    gradient: true
+                    titles:
+                      primary: Minimum
+                    gradient_resolution: auto
+                    min: 2
+                    max: 4
+                    round: small
+                    value_texts:
+                      primary: |-
+                        {% if states(entity) in ['unavailable','unknown'] %}
+                        ?
+                        {% else %}
+                        {{ states(entity) }}
+                        {% endif %}
+                      primary_unit: '{{ '''' }}'
+                  - type: custom:gauge-card-pro
+                    entity: sensor.local_average_gas_price
+                    segments:
+                      - pos: 2
+                        color: var(--success-color)
+                      - pos: 3
+                        color: var(--warning-color)
+                      - pos: 4
+                        color: var(--error-color)
+                    needle: true
+                    gradient: true
+                    titles:
+                      primary: Average
+                    gradient_resolution: auto
+                    min: 2
+                    max: 4
+                    round: small
+                    value_texts:
+                      primary: |-
+                        {% if states(entity) in ['unavailable','unknown'] %}
+                        ?
+                        {% else %}
+                        {{ states(entity) }}
+                        {% endif %}
+                      primary_unit: '{{ '''' }}'
+                  - type: custom:gauge-card-pro
+                    entity: sensor.local_maximum_gas_price
+                    segments:
+                      - pos: 2
+                        color: var(--success-color)
+                      - pos: 3
+                        color: var(--warning-color)
+                      - pos: 4
+                        color: var(--error-color)
+                    needle: true
+                    gradient: true
+                    titles:
+                      primary: Maximum
+                    gradient_resolution: auto
+                    min: 2
+                    max: 4
+                    round: small
+                    value_texts:
+                      primary: |-
+                        {% if states(entity) in ['unavailable','unknown'] %}
+                        ?
+                        {% else %}
+                        {{ states(entity) }}
+                        {% endif %}
+                      primary_font_size_reduction: 0
+                      primary_unit_before_value: true
+                      primary_unit: '{{ '''' }}'
               - type: custom:auto-entities
                 card:
                   type: entities
@@ -3856,6 +4138,24 @@ views:
             entity: switch.emma_door_alert
             state: 'off'
         color: var(--warning-color)
+      - type: custom:mushroom-template-badge
+        content: '{{ ''Disabled'' if states(entity) == ''off'' else ''Enabled'' }}'
+        icon: mdi:database
+        color: >-
+          {{ 'var(--error-color)' if states(entity) == 'off' else
+          'var(--success-color)' }}
+        entity: input_boolean.recorder
+        label: Recorder Status
+        visibility:
+          - condition: and
+            conditions:
+              - condition: user
+                users:
+                  - c3909d27048140729f002aaef0391775
+                  - 5244463d054a454389c06b76e6229b53
+              - condition: state
+                entity: input_boolean.recorder
+                state: 'off'
       - type: custom:mushroom-template-badge
         content: Tornado Possible
         color: var(--error-color)
@@ -3874,9 +4174,28 @@ views:
         icon: '{{ state_attr(''binary_sensor.tornado_possible'',''icon'') }}'
       - type: custom:mushroom-template-badge
         content: >-
+          {% if
+          states('sensor.home_tempest_cloud_sensors_lightning_strikes_last_hour')
+          | int > 0 %}
+
           {{
           states('sensor.home_tempest_cloud_sensors_lightning_strikes_last_hour')
-          }} strikes in last hour!
+          | int }} strikes last hour!
+
+          {% elif
+          states('sensor.home_tempest_cloud_sensors_lightning_strikes_last_3_hours')
+          | int > 0 %}
+
+          {{
+          states('sensor.home_tempest_cloud_sensors_lightning_strikes_last_3_hours')
+          | int }} strikes last 3 hours!
+
+          {% else %}
+
+          {{ states('sensor.blitzortung_lightning_counter') }} strikes during
+          this storm!
+
+          {% endif %}
         icon: mdi:lightning-bolt
         color: var(--warning-color)
         entity: binary_sensor.lightning_warning
@@ -4145,7 +4464,9 @@ views:
                 state_not: No Risk
       - type: custom:mushroom-template-badge
         content: |-
-          {% if is_state(entity,'on') %}
+          {% if is_state('input_boolean.recliner_mode','on') %}
+          Recliner Mode
+          {% elif is_state(entity,'on') %}
           Do Not Enter
           {% elif is_state('input_boolean.studio_quiet','on') %}
           Studio Quiet
@@ -4154,21 +4475,35 @@ views:
           {% endif %}
         entity: input_boolean.do_not_enter_basement_studio
         label: Basement Status
-        color: |-
+        color: >-
-          {% if is_state(entity,'on') %}
+          {% if is_state(entity,'on') or
+          is_state('input_boolean.recliner_mode','on') %}
+
           var(--error-color)
+
           {% elif is_state('input_boolean.studio_quiet','on') %}
+
           var(--warning-color)
+
           {% else %}
+
           var(--success-color)
+
           {% endif %}
-        icon: |-
+        icon: >-
-          {% if is_state(entity,'on') %}
+          {% if is_state(entity,'on') or
+          is_state('input_boolean.recliner_mode','on') %}
+
           mdi:close-circle
+
           {% elif is_state('input_boolean.studio_quiet','on') %}
+
           mdi:alert
+
           {% else %}
+
           mdi:check-circle
+
           {% endif %}
         tap_action:
           action: none
@@ -5583,10 +5918,14 @@ views:
             entities:
               - entity: binary_sensor.tony_desktop_on
                 name: Status
+              - entity: button.tony_asus_satellite_reboot
+                name: Reboot
+                confirmation: true
+              - entity: button.tony_asus_satellite_shutdown
+                name: Shutdown
+                confirmation: true
               - entity: script.tony_desktop_wake
                 name: Wake
-              - entity: script.tony_desktop_shutdown
-                name: Shutdown
             show_header_toggle: false
             state_color: true
     visible:
@@ -5676,10 +6015,12 @@ views:
             entities:
               - entity: binary_sensor.tina_desktop_on
                 name: Status
+              - entity: button.xia_desktop_reboot
+                name: Reboot
+              - entity: button.xia_desktop_shutdown
+                name: Shutdown
               - entity: script.tina_desktop_wake
                 name: Wake
-              - entity: script.tina_desktop_shutdown
-                name: Shutdown
             show_header_toggle: false
             state_color: true
   - title: Kallen
@@ -6159,6 +6500,63 @@ views:
                 black
               {% endif %}
         column_span: 1
+      - type: grid
+        cards:
+          - type: heading
+            heading_style: title
+            heading: College Hockey
+          - type: custom:teamtracker-card
+            entity: sensor.michigan_wolverines_hockey
+            visibility:
+              - condition: state
+                entity: sensor.michigan_wolverines_hockey
+                state_not: NOT_FOUND
+              - condition: state
+                entity: sensor.michigan_wolverines_hockey
+                state_not: BYE
+              - condition: state
+                entity: binary_sensor.michigan_wolverines_hockey_inhibit
+                state: 'off'
+            show_league: false
+          - type: custom:teamtracker-card
+            entity: sensor.minnesota_golden_gophers_hockey
+            visibility:
+              - condition: state
+                entity: sensor.minnesota_golden_gophers_hockey
+                state_not: NOT_FOUND
+              - condition: state
+                entity: sensor.minnesota_golden_gophers_hockey
+                state_not: BYE
+              - condition: state
+                entity: binary_sensor.minnesota_golden_gophers_hockey_inhibit
+                state: 'off'
+            show_league: false
+          - type: custom:teamtracker-card
+            entity: sensor.minnesota_state_mavericks_hockey
+            visibility:
+              - condition: state
+                entity: sensor.minnesota_state_mavericks_hockey
+                state_not: NOT_FOUND
+              - condition: state
+                entity: sensor.minnesota_state_mavericks_hockey
+                state_not: BYE
+              - condition: state
+                entity: binary_sensor.minnesota_state_mavericks_hockey_inhibit
+                state: 'off'
+            show_league: false
+        column_span: 3
+        visibility:
+          - condition: or
+            conditions:
+              - condition: state
+                entity: binary_sensor.michigan_wolverines_hockey_inhibit
+                state: 'off'
+              - condition: state
+                entity: binary_sensor.minnesota_golden_gophers_hockey_inhibit
+                state: 'off'
+              - condition: state
+                entity: binary_sensor.minnesota_state_mavericks_hockey_inhibit
+                state: 'off'
     max_columns: 5
     cards: []
     subview: true
@@ -6328,22 +6726,24 @@ views:
                   - c3909d27048140729f002aaef0391775
           - type: entities
             entities:
+              - entity: input_number.master_bedroom_fan_threshold
+                name: Fan
               - entity: input_number.master_bedroom_aircon_run_threshold
-                name: Run Threshold
+                name: Aircon Run
                 secondary_info: >
                   {% set threshold =
                   states('input_number.master_bedroom_aircon_run_threshold') |
                   int %} {% set low = states('sensor.tonights_low_temp') | int
                   %} {{ 'Threshold Met' if low >= threshold else '' }}
               - entity: input_number.master_bedroom_aircon_mode_threshold
-                name: Mode Threshold
+                name: Aircon Mode
                 secondary_info: >
                   {% set threshold =
                   states('input_number.master_bedroom_aircon_mode_threshold') |
                   int %} {% set low = states('sensor.tonights_low_temp') | int
                   %} {{ 'Threshold Met' if low >= threshold else '' }}
               - entity: input_number.master_bedroom_auto_cooling_threshold
-                name: MBR Auto Cooling
+                name: Auto Cooling
                 secondary_info: >
                   {% set threshold =
                   states('input_number.master_bedroom_auto_cooling_threshold') |
@@ -6351,19 +6751,12 @@ views:
                   states('sensor.master_bedroom_temperature') | int %} {{
                   'Threshold Met' if roomtemp >= threshold else '' }}
               - entity: input_number.master_bedroom_mode_switch_threshold
-                name: MBR Mode Switch
+                name: Mode Switch
                 secondary_info: >
                   {% set threshold =
                   states('input_number.master_bedroom_mode_switch_threshold') |
                   int %} {% set high = states('sensor.todays_high_temp') | int
                   %} {{ 'Threshold Met' if high >= threshold else '' }}
-              - entity: input_number.master_bedroom_fan_threshold
-                name: MBR Fan
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_fan_threshold') | int %}
-                  {% set low = states('sensor.tonights_low_temp') | int %} {{
-                  'Threshold Met' if low >= threshold else '' }}
               - entity: input_boolean.master_bedroom_aircon_installed
                 name: Aircon Installed
               - entity: input_boolean.master_bedroom_climate_protocol
@@ -6437,8 +6830,8 @@ views:
             entities:
               - entity: input_select.scheduled_climate_mode_emma_bedroom
                 name: Scheduled Mode
-              - entity: input_datetime.emma_bedroom_cooling
+              - entity: input_datetime.emma_bedroom_climate
-                name: Cooling
+                name: Climate
               - entity: input_boolean.emma_bedroom_climate_override
                 name: Climate Schedule Override
             state_color: true
@@ -6692,12 +7085,15 @@ views:
               - entity: zone.meijer
               - entity: zone.menards
               - entity: zone.middle_school
-              - entity: zone.rite_aid
               - entity: zone.the_elder_storks
               - entity: zone.wal_mart
               - entity: zone.latty
             hours_to_show: 24
             theme_mode: dark
+            grid_options:
+              columns: full
+              rows: 8
+        column_span: 2
       - type: grid
         cards:
           - type: heading
@@ -6845,14 +7241,14 @@ views:
           - type: custom:streamline-card
             template: state_color_button
             variables:
-              entity: binary_sensor.living_room_front_motion
+              entity: input_boolean.toggle_testing
               name: State Color Button
-              color: accent-color
+              color: bubble-accent-color
               columns: '2'
           - type: custom:streamline-card
             template: state_color_button_nav
             variables:
-              entity: binary_sensor.security_faults
+              entity: input_boolean.toggle_testing
               name: State Color Button Nav
               navigation_path: '#security'
               color: error-color
@@ -6911,6 +7307,7 @@ views:
                 action: navigate
                 navigation_path: '#basement-studio'
             sub_button:
+              main:
                 - entity: sensor.basement_studio_temperature
                   name: Temp
                   show_state: true
@@ -6926,6 +7323,7 @@ views:
                     action: navigate
                     navigation_path: '#basement-studio'
                   show_background: false
+              bottom: []
             modules:
               - default
               - temperature_colouring
@@ -6962,6 +7360,7 @@ views:
                 action: navigate
                 navigation_path: '#front-porch'
             sub_button:
+              main:
                 - entity: sensor.home_tempest_temperature
                   name: Temp
                   show_state: true
@@ -6977,6 +7376,7 @@ views:
                     action: navigate
                     navigation_path: '#front-porch'
                   show_background: false
+              bottom: []
             modules:
               - default
               - temperature_colouring
@@ -7018,7 +7418,7 @@ views:
           - type: custom:bubble-card
             card_type: button
             button_type: state
-            entity: binary_sensor.living_room_back_motion
+            entity: input_boolean.toggle_testing
             name: State Color Button
             show_state: true
             tap_action:
@@ -7037,11 +7437,11 @@ views:
               - default
               - state_color_button
             state_color_button:
-              color: accent-color
+              color: bubble-accent-color
           - type: custom:bubble-card
             card_type: button
             button_type: state
-            entity: binary_sensor.security_faults
+            entity: input_boolean.toggle_testing
             name: State Color Button Nav
             show_state: true
             tap_action:
@@ -7303,6 +7703,27 @@ views:
               - condition: numeric_state
                 entity: sensor.anniversary_tony_s_birthday
                 below: 8
+      - type: grid
+        cards:
+          - type: heading
+            heading: Bubble Weather Card
+            heading_style: title
+            icon: mdi:weather-partly-cloudy
+          - type: custom:bubble-card
+            card_type: button
+            button_type: state
+            sub_button:
+              main: []
+              bottom: []
+            modules:
+              - weather_forecast
+            entity: weather.iron_nerd_weather_station
+            weather_forecast:
+              type: daily
+              disable_dynamic_background: false
+              disable_animations: false
+              hide_icon_background: false
+              card_layout: default
     header:
       layout: responsive
       badges_position: bottom