Add variables and iron out a few more conditions

.HA_VERSION

@@ -1 +1 @@
-2025.5.3
+2025.3.3

blueprints/automation/Twanne/smart_lux_dimmer.yaml

@@ -1,7 +1,7 @@
 blueprint:
   name: Smart Lux Dimmer
   author: AntonH
-  description: 'Version 4.3
+  description: 'Version 4.1
 
     Switch or dim lights based on the value of a light sensor.
 
@@ -24,11 +24,10 @@ blueprint:
         value?
       selector:
         entity:
-          filter:
-          - domain:
-            - sensor
-            device_class:
-            - illuminance
+          domain:
+          - sensor
+          device_class:
+          - illuminance
           multiple: false
     target_light:
       name: Target lights
@@ -82,8 +81,8 @@ blueprint:
           min: 0.0
           max: 100.0
           step: 1.0
-          unit_of_measurement: '%'
           mode: slider
+          unit_of_measurement: '%'
     light_value_2:
       name: Brightness at minimum light level
       description: Brightness of the light at minimum ambient light.
@@ -93,8 +92,8 @@ blueprint:
           min: 0.0
           max: 100.0
           step: 1.0
-          unit_of_measurement: '%'
           mode: slider
+          unit_of_measurement: '%'
     transition_time:
       name: Transition time
       description: 'The time it takes for the light to transition from the set value
@@ -125,9 +124,9 @@ blueprint:
             value: include_color
           - label: Set temperature
             value: include_temp
-          custom_value: false
-          sort: false
           multiple: false
+          sort: false
+          custom_value: false
     light_color:
       name: Light color
       description: Color of the light when between minimum and maximum ambient light
@@ -162,8 +161,8 @@ blueprint:
           min: 0.0
           max: 100.0
           step: 1.0
-          unit_of_measurement: '%'
           mode: slider
+          unit_of_measurement: '%'
     light_brightness_under_min:
       name: Brightness when ambient light value under min.
       description: Brightness of the light when the ambient light is lower than the
@@ -174,8 +173,8 @@ blueprint:
           min: 0.0
           max: 100.0
           step: 1.0
-          unit_of_measurement: '%'
           mode: slider
+          unit_of_measurement: '%'
     include_color_or_temp_over_under:
       name: Include color or temperature values when outside range
       description: 'Set a color or temperature value for the light when over maximum
@@ -194,9 +193,9 @@ blueprint:
             value: include_color_outside_range
           - label: Set temperature when outside range
             value: include_temp_outside_range
-          custom_value: false
-          sort: false
           multiple: false
+          sort: false
+          custom_value: false
     light_color_over_max:
       name: Color when ambient light value over max.
       description: Color of the light when the ambient light is higher than the set
@@ -237,25 +236,18 @@ variables:
   include_brightness_over_under: !input include_brightness_over_under
   include_color_or_temp_over_under: !input include_color_or_temp_over_under
   light_sensor: !input light_sensor_entity
-  max_brightness_value: !input max_brightness_value
-  min_brightness_value: !input min_brightness_value
-  maxB: '{{ max_brightness_value * 2.55 }}'
-  minB: '{{ min_brightness_value * 2.55 }}'
-  light_value_1: !input light_value_1
-  light_value_2: !input light_value_2
-  light1: '{{ light_value_1 * 2.55 }}'
-  light2: '{{ light_value_2 * 2.55 }}'
+  maxB: !input max_brightness_value
+  minB: !input min_brightness_value
+  light1: !input light_value_1
+  light2: !input light_value_2
   slope: '{{ ( light1 - light2 ) / ( maxB - minB ) }}'
   constant: '{{ light1 - ( slope * maxB ) }}'
-  light_brightness_over_max: !input light_brightness_over_max
-  light_brightness_under_min: !input light_brightness_under_min
-  brightness_over_max_pct: '{{ light_brightness_over_max * 2.55 }}'
-  brightness_under_min_pct: '{{ light_brightness_under_min * 2.55 }}'
-triggers:
-  trigger: state
+trigger:
+  platform: state
   entity_id: !input light_sensor_entity
-conditions: !input run_conditions
-actions:
+condition:
+- condition: !input run_conditions
+action:
 - choose:
   - conditions:
     - condition: template
@@ -266,20 +258,20 @@ actions:
         - condition: template
           value_template: '{{ include_color_or_temp == "include_no_color_temp" }}'
         sequence:
-        - action: light.turn_on
+        - service: light.turn_on
           data:
             transition: !input transition_time
-            brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+            brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
               }}'
           target: !input target_light
       - conditions:
         - condition: template
           value_template: '{{ include_color_or_temp == "include_color" }}'
         sequence:
-        - action: light.turn_on
+        - service: light.turn_on
           data:
             transition: !input transition_time
-            brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+            brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
               }}'
             rgb_color: !input light_color
           target: !input target_light
@@ -287,10 +279,10 @@ actions:
         - condition: template
           value_template: '{{ include_color_or_temp == "include_temp" }}'
         sequence:
-        - action: light.turn_on
+        - service: light.turn_on
           data:
             transition: !input transition_time
-            brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+            brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
               }}'
             color_temp: !input light_temp
           target: !input target_light
@@ -310,20 +302,20 @@ actions:
               entity_id: !input light_sensor_entity
               above: !input max_brightness_value
             sequence:
-            - action: light.turn_on
+            - service: light.turn_on
               data:
                 transition: !input transition_time
-                brightness: '{{ brightness_over_max_pct }}'
+                brightness_pct: !input light_brightness_over_max
               target: !input target_light
           - conditions:
             - condition: numeric_state
               entity_id: !input light_sensor_entity
               below: !input min_brightness_value
             sequence:
-            - action: light.turn_on
+            - service: light.turn_on
               data:
                 transition: !input transition_time
-                brightness: '{{ brightness_under_min_pct }}'
+                brightness_pct: !input light_brightness_under_min
               target: !input target_light
           - conditions:
             - condition: numeric_state
@@ -331,10 +323,10 @@ actions:
               below: !input max_brightness_value
               above: !input min_brightness_value
             sequence:
-            - action: light.turn_on
+            - service: light.turn_on
               data:
                 transition: !input transition_time
-                brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+                brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
                   }}'
               target: !input target_light
       - conditions:
@@ -348,10 +340,10 @@ actions:
               entity_id: !input light_sensor_entity
               above: !input max_brightness_value
             sequence:
-            - action: light.turn_on
+            - service: light.turn_on
               data:
                 transition: !input transition_time
-                brightness: '{{ brightness_over_max_pct }}'
+                brightness_pct: !input light_brightness_over_max
                 rgb_color: !input light_color_over_max
               target: !input target_light
           - conditions:
@@ -359,10 +351,10 @@ actions:
               entity_id: !input light_sensor_entity
               below: !input min_brightness_value
             sequence:
-            - action: light.turn_on
+            - service: light.turn_on
               data:
                 transition: !input transition_time
-                brightness: '{{ brightness_under_min_pct }}'
+                brightness_pct: !input light_brightness_under_min
                 rgb_color: !input light_color_under_min
               target: !input target_light
           - conditions:
@@ -371,10 +363,10 @@ actions:
               below: !input max_brightness_value
               above: !input min_brightness_value
             sequence:
-            - action: light.turn_on
+            - service: light.turn_on
               data:
                 transition: !input transition_time
-                brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+                brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
                   }}'
                 rgb_color: !input light_color
               target: !input target_light
@@ -389,10 +381,10 @@ actions:
               entity_id: !input light_sensor_entity
               above: !input max_brightness_value
             sequence:
-            - action: light.turn_on
+            - service: light.turn_on
               data:
                 transition: !input transition_time
-                brightness: '{{ brightness_over_max_pct }}'
+                brightness_pct: !input light_brightness_over_max
                 color_temp: !input light_temp_over_max
               target: !input target_light
           - conditions:
@@ -400,10 +392,10 @@ actions:
               entity_id: !input light_sensor_entity
               below: !input min_brightness_value
             sequence:
-            - action: light.turn_on
+            - service: light.turn_on
               data:
                 transition: !input transition_time
-                brightness: '{{ brightness_under_min_pct }}'
+                brightness_pct: !input light_brightness_under_min
                 color_temp: !input light_temp_under_min
               target: !input target_light
           - conditions:
@@ -412,10 +404,10 @@ actions:
               below: !input max_brightness_value
               above: !input min_brightness_value
             sequence:
-            - action: light.turn_on
+            - service: light.turn_on
               data:
                 transition: !input transition_time
-                brightness: '{{ (( slope * states(light_sensor)|int ) + constant)|round
+                brightness_pct: '{{ (( slope * states(light_sensor)|int ) + constant)|round
                   }}'
                 color_temp: !input light_temp
               target: !input target_light

blueprints/automation/Twanne/smart_lux_dimmer_basic.yaml

@@ -31,15 +31,12 @@ blueprint:
         text: {}
     light_sensor_entity:
       name: Light Sensor
-      description: Which light sensor do you want to use to measure the ambient light
-        value?
       selector:
         entity:
-          filter:
-          - domain:
-            - sensor
-            device_class:
-            - illuminance
+          domain:
+          - sensor
+          device_class:
+          - illuminance
           multiple: false
     max_brightness_value:
       name: Maximum ambient light value
@@ -97,17 +94,15 @@ variables:
   light_sensor: !input light_sensor_entity
   maxB: !input max_brightness_value
   minB: !input min_brightness_value
-  light_value_1: !input light_value_1
-  light_value_2: !input light_value_2
-  light1: '{{ light_value_1 * 2.55 }}'
-  light2: '{{ light_value_2 * 2.55 }}'
+  light1: !input light_value_1
+  light2: !input light_value_2
   slope: '{{ ( light1 - light2 ) / ( maxB - minB ) }}'
   constant: '{{ light1 - ( slope * maxB ) }}'
   days: !input schedule_days
-triggers:
-  trigger: state
+trigger:
+  platform: state
   entity_id: !input light_sensor_entity
-conditions:
+condition:
 - condition: numeric_state
   entity_id: !input light_sensor_entity
   above: !input min_brightness_value
@@ -116,9 +111,9 @@ conditions:
   before: !input schedule_stop
 - condition: template
   value_template: '{{ now().strftime(''%a'') | lower in days }}'
-actions:
-- action: light.turn_on
+action:
+- service: light.turn_on
   data:
-    brightness: "{% if states(light_sensor)|int > maxB %}\n  0\n{% else %}\n  {{ ((
-      slope * states(light_sensor)|int ) + constant)|round }}\n{% endif %}\n"
+    brightness_pct: "{% if states(light_sensor)|int > maxB %}\n  0\n{% else %}\n  {{
+      (( slope * states(light_sensor)|int ) + constant)|round }}\n{% endif %}\n"
   target: !input target_light

blueprints/automation/Twanne/the_everything_light.yaml

@@ -1,7 +1,7 @@
 blueprint:
   name: The Everything Light
   author: AntonH
-  description: "**Version 2.10**\nThe Everything Light: select any trigger and turn
+  description: "**Version 2.5**\nThe Everything Light: select any trigger and turn
     on your light in multiple ways:\n  - just turn the light on in it's default state\n
     \ - turn it on with a set brightness, color and/or temperature value\n  - turn
     it on dynamically with a brightness value that changes according to an ambient
@@ -55,13 +55,13 @@ blueprint:
         Toggle the light.
 
 
-        - **FIXED MODE:**
+        - **FIXED MODE: **
 
         The light will turn on at a set brightness percentage, optionally color or
         temperature can be set.
 
 
-        - **DYNAMIC MODE:**
+        - **DYNAMIC MODE**
 
         The light will be assigned a brightness value based on the value of a ambient
         light sensor, optionally color or temperature can be set.
@@ -74,15 +74,15 @@ blueprint:
           options:
           - label: DEFAULT MODE
             value: default
-          - label: TOGGLE MODE
+          - label: TOGGLE
             value: toggle
           - label: FIXED  MODE
             value: fixed
           - label: DYNAMIC MODE
             value: dynamic
-          custom_value: false
-          sort: false
           multiple: false
+          sort: false
+          custom_value: false
     transition_time:
       name: Transition time (FIXED & DYNAMIC MODE)
       description: "The time it takes for the light to transition to the assigned
@@ -110,9 +110,9 @@ blueprint:
             value: include_color
           - label: Set temperature
             value: include_temperature
-          custom_value: false
-          sort: false
           multiple: false
+          sort: false
+          custom_value: false
     light_color:
       name: Light color (FIXED & DYNAMIC MODE)
       description: Color of the light when between minimum and maximum ambient light
@@ -125,28 +125,22 @@ blueprint:
         color_rgb: {}
     light_temperature:
       name: Light temperature (FIXED & DYNAMIC MODE)
-      description: 'Temperature of the light when between minimum and maximum ambient
+      description: Temperature of the light when between minimum and maximum ambient
         light values.
-
-        (not all lights will support all values, please consult your lights spec sheet.)
-
-        '
       default: 2000
       selector:
-        color_temp:
-          unit: kelvin
-          min: 1500
-          max: 6500
+        color_temp: {}
     brightness:
       name: Brightness (FIXED BRIGHTNESS MODE)
       description: Set the brightness value the light needs to turn on at
-      default: 100
+      default: 0
       selector:
         number:
           min: 0.0
           max: 100.0
           step: 1.0
           mode: slider
+          unit_of_measurement: '%'
     light_sensor_entity:
       name: Light Sensor (DYNAMIC MODE)
       description: Which light sensor do you want to use to measure the ambient light
@@ -194,6 +188,7 @@ blueprint:
           max: 100.0
           step: 1.0
           mode: slider
+          unit_of_measurement: '%'
     light_value_2:
       name: Brightness at minimum light level (DYNAMIC MODE)
       description: Brightness of the light at minimum ambient light.
@@ -204,6 +199,7 @@ blueprint:
           max: 100.0
           step: 1.0
           mode: slider
+          unit_of_measurement: '%'
     light_brightness_over_max:
       name: Brightness when ambient light value over max (DYNAMIC MODE)
       description: Brightness of the light when the ambient light is higher than the
@@ -215,17 +211,19 @@ blueprint:
           max: 100.0
           step: 1.0
           mode: slider
+          unit_of_measurement: '%'
     light_brightness_under_min:
       name: Brightness when ambient light value under min (DYNAMIC MODE)
       description: Brightness of the light when the ambient light is lower than the
         set minimum value.
-      default: 255
+      default: 100
       selector:
         number:
           min: 0.0
           max: 100.0
           step: 1.0
           mode: slider
+          unit_of_measurement: '%'
     include_color_or_temp_over_under:
       name: Include color or temperature values when outside range (DYNAMIC MODE)
       description: 'Set a color or temperature value for the light when over maximum
@@ -244,9 +242,9 @@ blueprint:
             value: include_color_outside_range
           - label: Set temperature when outside range
             value: include_temp_outside_range
-          custom_value: false
-          sort: false
           multiple: false
+          sort: false
+          custom_value: false
     light_color_over_max:
       name: Color when ambient light value over max (DYNAMIC MODE)
       description: Color of the light when the ambient light is higher than the set
@@ -269,32 +267,18 @@ blueprint:
         color_rgb: {}
     light_temp_over_max:
       name: Temperature when ambient light value over max (DYNAMIC MODE)
-      description: 'Temperature of the light when the ambient light is higher than
+      description: Temperature of the light when the ambient light is higher than
         the set maximum value.
-
-        (not all lights will support all values, please consult your lights spec sheet.)
-
-        '
       default: 2000
       selector:
-        color_temp:
-          unit: kelvin
-          min: 1500
-          max: 6500
+        color_temp: {}
     light_temp_under_min:
       name: Temperature when ambient light value under min (DYNAMIC MODE)
-      description: 'Temperature of the light when the ambient light is lower than
-        the set minimum value.
-
-        (not all lights will support all values, please consult your lights spec sheet.)
-
-        '
+      description: Temperature of the light when the ambient light is lower than the
+        set minimum value.
       default: 2000
       selector:
-        color_temp:
-          unit: kelvin
-          min: 1500
-          max: 6500
+        color_temp: {}
     include_turn_off:
       name: Include light turn off function
       description: 'Select if the light needs to turn back off again and how you want
@@ -323,8 +307,8 @@ blueprint:
             value: trigger
           - label: Staircase function
             value: staircase
-          custom_value: false
           sort: false
+          custom_value: false
     turn_off_triggers:
       name: Turn off triggers
       description: Triggers that turn the light off
@@ -359,75 +343,71 @@ variables:
   include_color_or_temp: !input include_color_or_temp
   light_color: !input light_color
   light_temperature: !input light_temperature
-  brightness: !input brightness
-  light_brightness: '{{ brightness * 2.55 }}'
+  light_brightness: !input brightness
   light_sensor: !input light_sensor_entity
   maxB: !input max_brightness_value
   minB: !input min_brightness_value
-  light_value_1: !input light_value_1
-  light_value_2: !input light_value_2
-  light1: '{{ light_value_1 * 2.55 }}'
-  light2: '{{ light_value_2 * 2.55 }}'
+  light1: !input light_value_1
+  light2: !input light_value_2
   slope: '{{ ( light1 - light2 ) / ( maxB - minB ) }}'
   constant: '{{ light1 - ( slope * maxB ) }}'
-  dynamic_brightness: "{% if mode == \"dynamic\" %}\n  {{ (( slope * states(light_sensor)|int
+  dynamic_brightness_pct: "{% if mode == \"dynamic\" %}\n  {{ (( slope * states(light_sensor)|int
     ) + constant)|round }}\n{% else %}\n  0\n{% endif %}\n"
   include_color_or_temp_over_under: !input include_color_or_temp_over_under
   light_brightness_over_max: !input light_brightness_over_max
-  brightness_over_max_pct: '{{ light_brightness_over_max * 2.55 }}'
   light_color_over_max: !input light_color_over_max
   light_temp_over_max: !input light_temp_over_max
   light_brightness_under_min: !input light_brightness_under_min
-  brightness_under_min_pct: '{{ light_brightness_under_min * 2.55 }}'
   light_color_under_min: !input light_color_under_min
   light_temp_under_min: !input light_temp_under_min
   include_turn_off: !input include_turn_off
 trigger: !input triggers
-conditions: !input run_conditions
-actions:
+condition:
+- condition: !input run_conditions
+action:
 - choose:
   - conditions: '{{ mode == "toggle" }}'
     sequence:
-    - action: homeassistant.toggle
+    - service: homeassistant.toggle
       target: !input target_light
   - conditions: '{{ mode == "default" }}'
     sequence:
-    - action: homeassistant.turn_on
+    - service: homeassistant.turn_on
       target: !input target_light
   - conditions: '{{ mode == "fixed" }}'
     sequence:
-    - action: light.turn_on
+    - service: light.turn_on
       data: "{% if include_color_or_temp == \"include_color\" %}\n  {{ { \"transition\":
-        transition_time, \"brightness\": light_brightness, \"rgb_color\": light_color
+        transition_time, \"brightness_pct\": light_brightness, \"rgb_color\": light_color
         } }}\n{% elif include_color_or_temp == \"include_temperature\" %}\n  {{ {
-        \"transition\": transition_time, \"brightness\": light_brightness, \"color_temp\":
+        \"transition\": transition_time, \"brightness_pct\": light_brightness, \"color_temp\":
         light_temperature } }}\n{% else %}\n  {{ { \"transition\": transition_time,
-        \"brightness\": light_brightness } }}\n{% endif %}\n"
+        \"brightness_pct\": light_brightness } }}\n{% endif %}\n"
       target: !input target_light
   - conditions: '{{ mode == "dynamic" }}'
     sequence:
-    - action: light.turn_on
+    - service: light.turn_on
       data: "{% if states(light_sensor)|int > maxB %}\n  {% if include_color_or_temp_over_under
         == \"include_color_outside_range\" %}\n    {{ { \"transition\": transition_time,
-        \"brightness\": brightness_over_max_pct, \"rgb_color\": light_color_over_max
+        \"brightness_pct\": light_brightness_over_max, \"rgb_color\": light_color_over_max
         } }}\n  {% elif include_color_or_temp_over_under == \"include_temp_outside_range\"
-        %}\n    {{ { \"transition\": transition_time, \"brightness\": brightness_over_max_pct,
+        %}\n    {{ { \"transition\": transition_time, \"brightness_pct\": light_brightness_over_max,
         \"color_temp\": light_temp_over_max } }}\n  {% else %}\n    {{ { \"transition\":
-        transition_time, \"brightness\": brightness_over_max_pct } }}\n  {% endif
-        %}\n{% elif states(light_sensor)|int < minB %}\n  {% if include_color_or_temp_over_under
+        transition_time, \"brightness_pct\": light_brightness_over_max } }}\n  {%
+        endif %}\n{% elif states(light_sensor)|int < minB %}\n  {% if include_color_or_temp_over_under
         == \"include_color_outside_range\" %}\n    {{ { \"transition\": transition_time,
-        \"brightness\": brightness_under_min_pct, \"rgb_color\": light_color_under_min
+        \"brightness_pct\": light_brightness_under_min, \"rgb_color\": light_color_under_min
         } }}\n  {% elif include_color_or_temp_over_under == \"include_temp_outside_range\"
-        %}\n    {{ { \"transition\": transition_time, \"brightness\": brightness_under_min_pct,
+        %}\n    {{ { \"transition\": transition_time, \"brightness_pct\": light_brightness_under_min,
         \"color_temp\": light_temp_under_min } }}\n  {% else %}\n    {{ { \"transition\":
-        transition_time, \"brightness\": brightness_under_min_pct } }}\n  {% endif
-        %}\n{% else %}\n  {% if include_color_or_temp == \"include_color\" %}\n    {{
-        { \"transition\": transition_time, \"brightness\": light_brightness, \"rgb_color\":
-        light_color } }}\n  {% elif include_color_or_temp == \"include_temperature\"
-        %}\n    {{ { \"transition\": transition_time, \"brightness\": dynamic_brightness,
+        transition_time, \"brightness_pct\": light_brightness_under_min } }}\n  {%
+        endif %}\n{% else %}\n  {% if include_color_or_temp == \"include_color\" %}\n
+        \   {{ { \"transition\": transition_time, \"brightness_pct\": light_brightness,
+        \"rgb_color\": light_color } }}\n  {% elif include_color_or_temp == \"include_temperature\"
+        %}\n    {{ { \"transition\": transition_time, \"brightness_pct\": dynamic_brightness_pct,
         \"color_temp\": light_temperature } }}\n  {% else %}\n    {{ { \"transition\":
-        transition_time, \"brightness\": dynamic_brightness } }}\n  {% endif %}\n{%
-        endif %}\n"
+        transition_time, \"brightness_pct\": dynamic_brightness_pct } }}\n  {% endif
+        %}\n{% endif %}\n"
       target: !input target_light
 - if: !input turn_off_conditions
   then:
@@ -440,11 +420,11 @@ actions:
           timeout: !input staircase_duration
         else:
         - delay: !input staircase_duration
-      - action: homeassistant.turn_off
+      - service: homeassistant.turn_off
         target: !input target_light
     - conditions: '{{ "trigger" in include_turn_off and not "staircase" in include_turn_off
         }}'
       sequence:
       - wait_for_trigger: !input turn_off_triggers
-      - action: homeassistant.turn_off
+      - service: homeassistant.turn_off
         target: !input target_light

blueprints/automation/kind3r/cast-and-re-cast-a-lovelace-view-to-a-google-hub.yaml

@@ -10,7 +10,6 @@ blueprint:
       selector:
         entity:
           integration: cast
-          multiple: false
     view:
       name: Lovelace view path
       description: Path of the view to cast. A path has to be defined in your Lovelace
@@ -22,11 +21,11 @@ blueprint:
   source_url: https://community.home-assistant.io/t/cast-and-re-cast-a-lovelace-view-to-a-google-hub/259631
 trigger:
 - platform: state
-  entity_id: !input player
+  entity_id: !input 'player'
   to: 'off'
   for: 00:00:20
 - platform: state
-  entity_id: !input player
+  entity_id: !input 'player'
   to: paused
   for: 00:00:20
 - platform: time_pattern
@@ -39,38 +38,38 @@ action:
     - condition: or
       conditions:
       - condition: state
-        entity_id: !input player
+        entity_id: !input 'player'
         state: 'off'
       - condition: state
-        entity_id: !input player
+        entity_id: !input 'player'
         state: paused
         for: 00:00:20
     sequence:
     - service: media_player.volume_mute
       data:
         is_volume_muted: true
-        entity_id: !input player
+        entity_id: !input 'player'
     - service: media_player.turn_off
       data:
-        entity_id: !input player
+        entity_id: !input 'player'
     - delay:
         seconds: 2
     - service: media_player.turn_on
       data:
-        entity_id: !input player
+        entity_id: !input 'player'
     - service: cast.show_lovelace_view
       data:
-        view_path: !input view
-        dashboard_path: !input dashboard
-        entity_id: !input player
+        view_path: !input 'view'
+        dashboard_path: !input 'dashboard'
+        entity_id: !input 'player'
     - service: cast.show_lovelace_view
       data:
-        view_path: !input view
-        dashboard_path: !input dashboard
-        entity_id: !input player
+        view_path: !input 'view'
+        dashboard_path: !input 'dashboard'
+        entity_id: !input 'player'
     - delay:
         seconds: 10
     - service: media_player.volume_mute
       data:
         is_volume_muted: false
-        entity_id: !input player
+        entity_id: !input 'player'

configuration.yaml

@@ -32,16 +32,8 @@ frontend:
   extra_module_url:
   - /hacsfiles/hass-hue-icons/hass-hue-icons.js
   - /hacsfiles/hass-bha-icons/hass-bha-icons.js
-  - /hacsfiles/material-you-utilities/material-you-utilities.min.js
   javascript_version: latest
 
-panel_custom:
-  - name: material-you-panel
-    url_path: material-you-configuration
-    sidebar_title: Material You Utilities
-    sidebar_icon: mdi:material-design
-    module_url: /hacsfiles/material-you-utilities/material-you-utilities.min.js
-
 http:
   use_x_forwarded_for: true
   trusted_proxies:
@@ -115,8 +107,6 @@ recorder:
       - sensor.*gpu_core_load
       - sensor.portainer*
       - sensor.mosquitto*
-      - sensor.*_rssi
-      - sensor.weatherflow_hub*
     entities:
       - sensor.avg_ping
       - sensor.max_ping
@@ -131,8 +121,6 @@ recorder:
       - sensor.mariadb_database_size
       - sensor.random_joke
       - sensor.bypassed_sensors
-      - sensor.home_tempest_signal_strength
-      - sensor.home_tempest_uptime
   include:
     entities:
       - media_player.living_room_tv
@@ -178,8 +166,6 @@ influxdb:
     entity_globs:
       - binary_sensor.*tamper*
       - light.*screen*
-      - sensor.weatherflow_hub*
-      - sensor.home_tempest*
     entities:
       - sensor.last_boot
       - sensor.date
@@ -192,8 +178,6 @@ influxdb:
       - light.all_lights
       - fan.all_fans
       - sensor.random_joke
-      - sensor.home_tempest_signal_strength
-      - sensor.home_tempest_uptime
   include:
     domains:
       - sun
@@ -363,8 +347,6 @@ prometheus:
     exclude_entity_globs:
       - binary_sensor.*tamper*
       - light.*screen*
-      - sensor.weatherflow_hub*
-      - sensor.home_tempest*
     exclude_entities:
       - sensor.last_boot
       - sensor.date
@@ -377,8 +359,6 @@ prometheus:
       - light.all_lights
       - fan.all_fans
       - sensor.random_joke
-      - sensor.home_tempest_signal_strength
-      - sensor.home_tempest_uptime
     include_domains:
       - sun
       - light

custom_templates/easy_time.jinja

@@ -79,7 +79,7 @@
       45: 'quarter to {hour}',
       59: 'a minute to {hour}',
       'past_hour': '{minute} past {hour}',
-      'to_hour': '{minute} to {hour}',
+      'to_hour': '{minute} to {hour}', 
     },
     'time_of_day':{
       'midnight': 'midnight',
@@ -157,7 +157,7 @@
       'November',
       'December',
     ]
-  },
+  },  
   'nl':{
     '_language': 'Nederlands',
     'and': 'en',
@@ -203,8 +203,6 @@
       'today': 'vandaag',
       'tomorrow': 'morgen',
       'yesterday': 'gisteren',
-      'next': 'volgende',
-      'last': 'afgelopen',
     },
     'days':[
       "maandag",
@@ -228,30 +226,12 @@
       'oktober',
       'november',
       'december',
-    ],
-    'time_of_hour':{
-      0: '{hour} uur',
-      1: '1 over {hour}',
-      15: 'kwart over {hour}',
-      30: 'half {hour}',
-      45: 'kwart voor {hour}',
-      59: '1 voor {hour}',
-      'past_hour': '{minute} over {hour}',
-      'to_hour': '{minute} voor {hour}',
-      'to_half_hour': '{minute} voor half {hour}',
-      'past_half_hour': '{minute} over half {hour}',
-      'half_hour': 'half {hour}',
-      'use_twelve': true,
-    },
-    'time_of_day':{
-      'midnight': 'middernacht',
-      'noon': 'middag',
-    },
+    ]
   },
   'sv':{
     '_language': 'Svenska',
     'and': 'och',
-    'in': 'om',
+    'in': 'i',
     'ago': 'sedan',
     'now': 'nu',
     'lose': 'förlora',
@@ -293,7 +273,6 @@
       'today': 'idag',
       'tomorrow': 'imorgon',
       'yesterday': 'igår',
-      'next': 'nästa',
     },
     'days':[
       "måndag",
@@ -323,7 +302,7 @@
     '_language': 'Deutsch',
     'and': 'und',
     'in': 'in',
-    'ago': 'vor %s',
+    'ago': 'vor',
     'now': 'jetzt',
     'lose': 'Du verlierst',
     'gain': 'Du gewinnst',
@@ -384,7 +363,7 @@
       'Juli',
       'August',
       'September',
-      'Oktober',
+      'October',
       'November',
       'Dezember',
     ]
@@ -644,8 +623,6 @@
       'today': "aujourd'hui",
       'tomorrow': 'demain',
       'yesterday': 'hier',
-      'next': 'prochain',
-      'last': 'dernier',
     },
     'days':[
       "lundi",
@@ -716,8 +693,6 @@
       'today': 'hoy',
       'tomorrow': 'mañana',
       'yesterday': 'ayer',
-      'next': 'el próximo',
-      'last': 'el pasado',
     },
     'days':[
       'lunes',
@@ -736,26 +711,12 @@
       'mayo',
       'junio',
       'julio',
-      'agosto',
+      'agosto'
       'septiembre',
       'octubre',
       'noviembre',
       'diciembre'
-    ],
-    'time_of_hour':{
-      0: '{hour} en punto',
-      1: '{hour} y un minuto',
-      15: '{hour} y quarto',
-      30: '{hour} y media',
-      45: '{hour} menos quarto',
-      59: '{hour} menos uno',
-      'past_hour': '{hour} y {minute}',
-      'to_hour': '{hour} menos {minute}',
-    },
-    'time_of_day':{
-      'midnight': 'medianoche',
-      'noon': 'mediodía',
-    },
+    ]
   },
   'it':{
     '_language': 'Italiano',
@@ -904,9 +865,9 @@
     'and': 'i',
     'in': 'u',
     'ago': 'prije',
-    'now': 'sada',
+    'now': 'sad',
     'lose': 'gubiš',
-    'gain': 'dobivaš',
+    'gain': 'dobijaš',
     'time':{
       'format': '24-hr',
       'year': [
@@ -944,8 +905,8 @@
       'today': 'danas',
       'tomorrow': 'sutra',
       'yesterday': 'jučer',
-      'next': 'sljedeći',
-      'last': 'protekli',
+      'next': 'slijedeći',
+      'last': 'prošli',
     },
     'days':[
       "Ponedjeljak",
@@ -1042,421 +1003,11 @@
       'Listopad',
       'Grudzień',
     ]
-  },
-  'ru':{
-    '_language': 'Русский',
-    'and': 'и',
-    'in': 'в',
-    'ago': 'назад',
-    'now': 'сейчас',
-    'lose': 'уменьшение',
-    'gain': 'увеличение',
-    'time':{
-      'format': '24-hr',
-      'year': [
-        'г',
-        'год',
-        'лет',
-      ],
-      'week': [
-        'нед',
-        'неделя',
-        'недель',
-      ],
-      'day': [
-        'д',
-        'день',
-        'дней',
-      ],
-      'hour': [
-        'ч',
-        'час',
-        'часов',
-      ],
-      'minute': [
-        'мин',
-        'минута',
-        'минут',
-      ],
-      'second': [
-        'сек',
-        'секунда',
-        'секунд',
-      ],
-    },
-    'delta':{
-      'today': 'сегодня',
-      'tomorrow': 'завтра',
-      'yesterday': 'вчера',
-      'next': 'следующий',
-      'last': 'последний',
-    },
-    'days':[
-      "Понедельник",
-      "Вторник",
-      "Среда",
-      "Четверг",
-      "Пятница",
-      "Суббота",
-      "Воскресенье",
-    ],
-    'months':[
-      'Январь',
-      'Февраль',
-      'Март',
-      'Апрель',
-      'Май',
-      'Июнь',
-      'Июль',
-      'Август',
-      'Сентябрь',
-      'Октябрь',
-      'Ноябрь',
-      'Декабрь',
-    ],
-    'time_of_hour':{
-      0: '{hour} часов ровно',
-      1: '{hour} и 1 минута',
-      15: '{hour} с четвертью',
-      30: '{hour} с половиной',
-      45: 'без четверти {hour}',
-      59: 'без минуты {hour}',
-      'past_hour': '{hour} и {minute} минут',
-      'to_hour': 'без {minute} минут {hour}',
-    },
-    'time_of_day':{
-      'midnight': 'полночь',
-      'noon': 'полдень',
-    },
-  },
-  'uk':{
-    '_language': 'Українська',
-    'and': 'і',
-    'in': 'в',
-    'ago': 'тому',
-    'now': 'зараз',
-    'lose': 'зменшення',
-    'gain': 'збільшення',
-    'time':{
-      'format': '24-hr',
-      'year': [
-      'р',
-      'рік',
-      'роки',
-      ],
-      'week': [
-      'тиж',
-      'тиждень',
-      'тижні',
-      ],
-      'day': [
-      'д',
-      'день',
-      'дні',
-      ],
-      'hour': [
-      'год',
-      'година',
-      'години',
-      ],
-      'minute': [
-      'хв',
-      'хвилина',
-      'хвилини',
-      ],
-      'second': [
-      'сек',
-      'секунда',
-      'секунди',
-      ],
-    },
-    'delta':{
-      'today': 'сьогодні',
-      'tomorrow': 'завтра',
-      'yesterday': 'вчора',
-      'next': 'наступний',
-      'last': 'останній',
-    },
-    'days':[
-      "Понеділок",
-      "Вівторок",
-      "Середа",
-      "Четвер",
-      "П'ятниця",
-      "Субота",
-      "Неділя",
-    ],
-    'months':[
-      'Січень',
-      'Лютий',
-      'Березень',
-      'Квітень',
-      'Травень',
-      'Червень',
-      'Липень',
-      'Серпень',
-      'Вересень',
-      'Жовтень',
-      'Листопад',
-      'Грудень',
-    ],
-      'time_of_hour':{
-      0: '{hour} годин',
-      1: '{hour} годин(а) одна хвилина',
-      15: 'чверть на {hour}',
-      30: 'пів на {hour}',
-      45: 'за чверть {hour}',
-      59: 'за хвилину {hour}',
-      'past_hour': '{hour} та {minute} хвилин',
-      'to_hour': 'за {minute} хвилин {hour}', 
-    },
-    'time_of_day':{
-      'midnight': 'опівночі',
-      'noon': 'опівдні',
-    },
-    },
-  'zh-Hans':{
-    '_language': '简体中文',
-    'and': '',
-    'in': '',
-    'ago': '之前',
-    'now': '现在',
-    'lose': '失去',
-    'gain': '获得',
-    'time':{
-      'format': '24-hr',
-      'year': [
-        '年',
-        '年',
-        '年',
-      ],
-      'week': [
-        '周',
-        '星期',
-        '星期',
-      ],
-      'day': [
-        '天',
-        '天',
-        '天',
-      ],
-      'hour': [
-        '时',
-        '小时',
-        '小时',
-      ],
-      'minute': [
-        '分',
-        '分钟',
-        '分钟',
-      ],
-      'second': [
-        '秒',
-        '秒',
-        '秒',
-      ],
-    },
-    'delta':{
-      'today': '今天',
-      'tomorrow': '明天',
-      'yesterday': '昨天',
-      'next': '下一个',
-      'last': '上一个',
-    },
-    'days':[
-      "星期一",
-      "星期二",
-      "星期三",
-      "星期四",
-      "星期五",
-      "星期六",
-      "星期日",
-    ],
-    'months':[
-      '一月',
-      '二月',
-      '三月',
-      '四月',
-      '五月',
-      '六月',
-      '七月',
-      '八月',
-      '九月',
-      '十月',
-      '十一月',
-      '十二月',
-    ],
-    'time_of_day':{
-      'midnight': '午夜',
-      'noon': '正午',
-    },
-  },
-  'ko':{
-    '_language':'Korean',
-    'and':'',
-    'in':'후',
-    'ago':'전',
-    'now':'지금',
-    'lose':'감소',
-    'gain':'증가',
-    'time':{
-      'format':'24-hr',
-      'year':[
-        '년',
-        '년',
-        '년',
-      ],
-      'week':[
-        '주',
-        '주',
-        '주',
-      ],
-      'day':[
-        '일',
-        '일',
-        '일',
-      ],
-      'hour':[
-        '시',
-        '시간',
-        '시간',
-      ],
-      'minute':[
-        '분',
-        '분',
-        '분',
-      ],
-      'second':[
-        '초',
-        '초',
-        '초',
-      ],
-    },
-    'delta':{
-      'today':'오늘',
-      'tomorrow':'내일',
-      'yesterday':'어제',
-      'next':'다음',
-      'last':'지난',
-    },
-    'days':[
-      '월요일',
-      '화요일',
-      '수요일',
-      '목요일',
-      '금요일',
-      '토요일',
-      '일요일',
-    ],
-    'months':[
-      '1월',
-      '2월',
-      '3월',
-      '4월',
-      '5월',
-      '6월',
-      '7월',
-      '8월',
-      '9월',
-      '10월',
-      '11월',
-      '12월',
-    ],
-    'time_of_day':{
-      'midnight':'자정',
-      'noon':'정오',
-    },
-  },
-  'cs': {
-    '_language': 'Čeština',
-    'and': 'a',
-    'in': 'za',
-    'ago': 'před %s',
-    'now': 'nyní',
-    'lose': 'ztratit',
-    'gain': 'získat',
-    'time': {
-      'format': '12-hodin',
-      'year': [
-        'rok',
-        'rok',
-        'roky'
-      ],
-      'week': [
-        'týd',
-        'týden',
-        'týdny'
-      ],
-      'day': [
-        'd',
-        'den',
-        'dny'
-      ],
-      'hour': [
-        'hod',
-        'hodina',
-        'hodiny'
-      ],
-      'minute': [
-        'min',
-        'minuta',
-        'minuty'
-      ],
-      'second': [
-        'sek',
-        'sekunda',
-        'sekundy'
-      ]
-    },
-    'delta': {
-      'today': 'dnes',
-      'tomorrow': 'zítra',
-      'yesterday': 'včera',
-      'next': 'příští',
-      'last': 'poslední'
-    },
-    'days': [
-      'Pondělí',
-      'Úterý',
-      'Středa',
-      'Čtvrtek',
-      'Pátek',
-      'Sobota',
-      'Neděle'
-    ],
-    'months': [
-      'Leden',
-      'Únor',
-      'Březen',
-      'Duben',
-      'Květen',
-      'Červen',
-      'Červenec',
-      'Srpen',
-      'Září',
-      'Říjen',
-      'Listopad',
-      'Prosinec'
-    ],
-    'time_of_hour': {
-      0: '{hour} hodin',
-      1: 'minuta po {hour}',
-      15: 'čtvrt na {hour}',
-      30: 'půl {hour}',
-      45: 'tři čtvrtě na {hour}',
-      59: 'minuta do {hour}',
-      'past_hour': '{minute} po {hour}',
-      'to_hour': '{minute} do {hour}'
-    },
-    'time_of_day': {
-      'midnight': 'půlnoc',
-      'noon': 'poledne'
-    }
   }
 } %}
 
 {# DO NOT MODIFY BELOW THIS LINE #}
-{% set valid_entity_id_pattern = '^(?!.+__)(?!_)[\\da-z_]+(?<!_)\\.(?!_)[\\da-z_]+(?<!_)$' %}
+
 {% set _bad_value = '?' %}
 {% set _durations = {
   'year': 31536000,
@@ -1540,10 +1091,10 @@
 {%- endmacro -%}
 
 {%- macro _check_for_duration_sensor(input) %}
-{%- if input is string and input | regex_search(valid_entity_id_pattern) and input.startswith('sensor') and states[input] is not none and states[input].attributes.device_class is defined and states[input].attributes.unit_of_measurement is defined -%}
+{%- if input is string and input | regex_search('^(?!.+__)(?!_)[\da-z_]+(?<!_)\.(?!_)[\da-z_]+(?<!_)$') and input.startswith('sensor') and states[input] is not none and states[input].attributes.device_class is defined and states[input].attributes.unit_of_measurement is defined -%}
   {%- set obj = states[input] -%}
-  {%- set multiplier = _duration_sensor.get(obj.attributes.unit_of_measurement) -%}
-  {{- (obj.state | float * multiplier) | string | as_timedelta -}}
+  {%- set divisor = _duration_sensor.get(obj.attributes.unit_of_measurement) -%}
+  {{- (obj.state | float / divisor) | string | as_timedelta -}}
 {%- else %}
   {{- '' -}}
 {%- endif -%}
@@ -1565,7 +1116,7 @@
 {#- assume time as string or entity_id -#}
 {%- elif input is string and input not in ['', 'None'] -%}
   {#- if entity_id -#}
-  {%- if input | regex_search(valid_entity_id_pattern) -%}
+  {%- if input | regex_search('^(?!.+__)(?!_)[\da-z_]+(?<!_)\.(?!_)[\da-z_]+(?<!_)$') -%}
     {%- if attribute is not none and attribute is string -%}
       {{- _to_datetime(state_attr(input, attribute), None) -}}
     {%- elif input.startswith('input_datetime') and is_state_attr(input, 'has_date', False) -%}
@@ -1650,7 +1201,7 @@
   {%- set index = values.index(values | first | default) %}
   {%- for item in values[index:] %}
     {%- set duration = _durations.get(item, 1) %}
-    {%- set period = _periods.get(item, 0) %}
+    {%- set period = _periods.get(item, 1) %}
     {%- set value = ((seconds // duration) % (period if period else duration)) | int %}
     {%- if value > 0 or raw %}
       {%- if ns.ret | length == 0 %}
@@ -1701,8 +1252,8 @@
 {%- endmacro %}
 
 {%- macro _time_between(func, input1, attr1, utc1, input2, attr2, utc2) -%}
-{%- set t1 = _to_datetime(input1, attr1, utc1) | as_datetime | as_local -%}
-{%- set t2 = _to_datetime(input2, attr2, utc2) | as_datetime | as_local -%}
+{%- set t1 = _to_datetime(input1, attr1, utc1) | as_datetime -%}
+{%- set t2 = _to_datetime(input2, attr2, utc2) | as_datetime -%}
 {%- if t1 is not none and t2 is not none -%}
   {{- func(t1, t2) -}}
 {%- else -%}
@@ -1769,12 +1320,9 @@
 {%- if uptime %}
   {%- set value = _delta_seconds(now(), uptime) | int %}
   {%- set seconds = value | abs %}
-  {%- set current = value == 0 %}
-  {%- set future = not current and value / seconds > 0 %}
+  {%- set future = value / seconds > 0 %}
   {%- set items = _just_time(seconds, language, values, biggest, short=short, floor=floor) %}
-  {%- if current %}
-    {{- items }}
-  {%- elif future %}
+  {%- if future %}
     {{- translate('in', language=language) }} {{ items }}
   {%- else %}
     {%- set t = translate('ago', language=language) %}
@@ -1863,16 +1411,6 @@
 {{- _next_weekday(weekday, -7) }}
 {%- endmacro %}
 
-{%- macro nearest_day(weekday) %}
-{%- set today_timestamp = as_timestamp(today_at())|int %}
-{%- set this_weekday_timestamp = as_timestamp(this_weekday(weekday))|int %}
-{%- if today_timestamp <  this_weekday_timestamp %}
-  {{- _next_weekday(weekday, 0) }}
-{%- else %}
-  {{- _next_weekday(weekday, 7) }}
-{%- endif %}
-{%- endmacro %}
-
 {%- macro days_in_month(month=None) %}
 {%- set today = today_at() %}
 {%- set input = month if month is not none else today.month %}
@@ -1989,36 +1527,30 @@
 {%- endif -%}
 {%- endmacro -%}
 
-{%- macro month(month=None, language=None, short=False) %}
+{%- macro month(month=None, language=None) %}
 {%- if month is datetime %}
 {%- set idx = month.month - 1 %}
 {%- elif month is integer and month > 0 %}
 {%- set idx = (month - 1) % 12 %}
-{%- elif month | regex_match(valid_entity_id_pattern) %}
-{%- set idx = (states(month) | as_datetime | as_local).month - 1 %}
 {%- else %}
 {%- set idx = now().month - 1 %}
 {%- endif %}
-{%- set ret = translate('months', index=idx, language=language) %}
-{{- ret[:3] if short else ret }}
+{{- translate('months', index=idx, language=language) }}
 {%- endmacro %}
 
-{%- macro weekday(weekday=None, language=None, short=False) %}
+{%- macro weekday(weekday=None, language=None) %}
 {%- if weekday is datetime %}
 {%- set idx = weekday.weekday() %}
 {%- elif weekday is integer and weekday > 0 %}
 {%- set idx = (weekday - 1) % 7 %}
-{%- elif weekday | regex_match(valid_entity_id_pattern) %}
-{%- set idx = (states(weekday) | as_datetime | as_local).weekday() %}
 {%- else %}
 {%- set idx = now().weekday() %}
 {%- endif %}
-{%- set ret = translate('days', index=idx, language=language) %}
-{{- ret[:3] if short else ret }}
+{{- translate('days', index=idx, language=language) }}
 {%- endmacro %}
 
 {%- macro count_the_days(input, attr, utc=False) %}
-{%- set input = _to_datetime(input, attr, utc) | as_datetime | as_local %}
+{%- set input = _to_datetime(input, attr, utc) | as_datetime %}
 {%- set midnight = today_at() %}
 {{- (input - midnight).days }}
 {%- endmacro %}
@@ -2029,7 +1561,7 @@
 {%- set ns = namespace(days=[]) %}
 {%- for i in range(-7, 14) %}
   {%- set prefix = translate('delta', 'last', language=language) ~ ' ' if i < -1 else translate('delta', 'next', language=language)  ~ ' ' if i > 6 else '' %}
-  {%- set ns.days = ns.days + [ (i | string, prefix ~  _days.get(i, weekday(midnight.weekday() + (i % 7) + 1, language))) ] %}
+  {%- set ns.days = ns.days + [ (i | string, prefix ~  _days.get(i, weekday(midnight.weekday() + i + 1, language))) ] %}
 {%- endfor %}
 {%- set collection = dict.from_keys(ns.days) %}
 {%- set days = count_the_days(input, attr, utc) %}
@@ -2054,20 +1586,16 @@
 {%- macro hour(hour, language=None) %}
 {%- if hour is datetime %}
   {%- set hour = hour.hour %}
-{%- elif hour | regex_match(valid_entity_id_pattern) %}
-  {%- set hour = (states(hour) | as_datetime | as_local).hour %}
 {%- endif %}
 {%- set _12 = not (hour % 12) %}
 {%- set _24 = not (hour % 24) %}
-{%- set use_twelve = translate('time_of_day', 'use_twelve', language=language, fallback=false) %}
-{%- set _12hr = translate('time','format', language=language) == '12-hr' %}
-{%- if _12 and _24 and _12hr and not use_twelve %}
+{%- set _12hr = translate('time','format') == '12-hr' %}
+{%- if _12 and _24 and _12hr %}
   {{- translate('time_of_day', 'midnight', language=language) }}
-{%- elif _12 and _12hr and not use_twelve %}
+{%- elif _12 and _12hr %}
   {{- translate('time_of_day', 'noon', language=language) }}
 {%- else %}
-  {%- set ret = hour % 12 if _12hr else hour %}
-  {{- 12 if ret == 0 and use_twelve else ret }}
+  {{- hour % 12 if _12hr else hour }}
 {%- endif %}
 {%- endmacro %}
 
@@ -2089,22 +1617,7 @@
   {%- set hour_phrase = hour(this_hour, language=language) %}
   {%- set minute_phrase = _phrase('minute', 60 * this_minute, language, True, True) if this_minute % 5 else this_minute | string %}
 {%- endif %}
-{%- set this_config = translate('time_of_hour', language=language) %}
-{%- if (16 <= this_minute <= 29 and 'to_half_hour' in this_config) or (31 <= this_minute <= 44 and 'past_half_hour' in this_config) or (this_minute == 30 and 'half_hour' in this_config) %}
-  {%- set hour_phrase = hour(this_hour + 1, language=language) %}
-  {%- if 16 <= this_minute <= 29 %}
-    {%- set minute_calc = 30 - this_minute %}
-    {%- set fmat = translate('time_of_hour', 'to_half_hour', language=language) %}
-    {%- set minute_phrase = _phrase('minute', 60 * minute_calc, language, True, True) if this_minute % 5 else minute_calc | string %}
-  {%- elif 31 <= this_minute <= 44 %}
-    {%- set minute_calc = this_minute - 30 %}
-    {%- set fmat = translate('time_of_hour', 'past_half_hour', language=language) %}
-    {%- set minute_phrase = _phrase('minute', 60 * minute_calc, language, True, True) if this_minute % 5 else minute_calc | string %}
-  {%- else %}
-    {%- set minute_calc = None %}
-    {%- set fmat = translate('time_of_hour', 'half_hour', language=language) %}
-  {%- endif %}
-{%- elif this_minute in [0, 1, 15, 30, 45, 59] %}
+{%- if this_minute in [0, 1, 15, 30, 45, 59] %}
   {%- if hour_phrase in ['noon', 'midnight'] and this_minute == 0 %}
     {%- set fmat = '{hour}' %}
   {%- else %}

custom_templates/relative_time_plus.jinja

@@ -1,342 +1,234 @@
 {#
-  set phrases to be used in the relative_time_period macro
-  one list item per language, each time fraction contains a list with the short and several long forms of time units
+  set phrases to be used in the relative_time_period macro 
+  one list item per language, each time fraction contains a list with the singular, plural and abbriviated phrase 
   combine contains the text to combine the last time fraction, and error the text to display on wrong date input
-  Plural forms for languages: https://www.gnu.org/software/gettext/manual/gettext.html#Plural-forms
-  asian: ja, vi, ko
-  english: en, de, nl, sv, da, no, nb, nn, fo, es, pt, it, bg, el, fi, et, he, eo, hu, tr, ca
-  french: pt_BR, fr
-  latvian: lv
-  irish: ga
-  romanian: ro
-  lithuanian: lv
-  russian: ru, uk, be, sr, hr
-  slovak: cs, sk
-  polish: pl
-  slovenian: sl
-  arabic: ar
 #}
 {%- set _time_period_phrases = [
   {
     'language': 'en',
-    'plural_form': 'english',
     'phrases': {
-      'year': ['yr', 'year', 'years'],
-      'month': ['mth', 'month', 'months'],
-      'week': ['wk', 'week', 'weeks'],
-      'day': ['day', 'day', 'days'],
-      'hour': ['hr', 'hour', 'hours'],
-      'minute': ['min', 'minute', 'minutes'],
-      'second': ['sec', 'second', 'seconds'],
-      'millisecond': ['ms', 'millisecond', 'milliseconds'],
+      'year': ['year', 'years', 'yr'],
+      'month': ['month', 'months', 'mth'],
+      'week': ['week', 'weeks', 'wk'],
+      'day': ['day', 'days', 'day'],
+      'hour': ['hour', 'hours', 'hr'],
+      'minute': ['minute', 'minutes', 'min'],
+      'second': ['second', 'seconds', 'sec'],
+      'millisecond': ['millisecond', 'milliseconds', 'ms'],
       'combine': 'and',
       'error': 'Invalid date',
     }
   },
   {
     'language': 'pl',
-    'plural_form': 'polish',
     'phrases': {
-      'year': ['r', 'rok', 'lata', 'lat'],
-      'month': ['msc', 'miesiąc', 'miesiące', 'miesięcy'],
-      'week': ['tyg', 'tydzień', 'tygodnie', 'tygodni'],
-      'day': ['dzień', 'dzień', 'dni', 'dni'],
-      'hour': ['godz', 'godzina', 'godziny', 'godzin'],
-      'minute': ['min', 'minuta', 'minuty', 'minut'],
-      'second': ['sek', 'sekunda', 'sekundy', 'sekund'],
-      'millisecond': ['ms', 'milisekunda', 'milisekundy', 'milisekund'],
+      'year': ['rok', 'lat', 'r'],
+      'month': ['miesiąc', 'miesięcy', 'msc'],
+      'week': ['tydzień', 'tygodni', 'tyg'],
+      'day': ['dzień', 'dni', 'dzień'],
+      'hour': ['godzina', 'godzin', 'godz'],
+      'minute': ['minuta', 'minut', 'min'],
+      'second': ['sekunda', 'sekund', 'sek'],
+      'millisecond': ['milisekunda', 'milisekund', 'ms'],
       'combine': 'i',
       'error': 'Niepoprawna data',
     }
   },
   {
     'language': 'fr',
-    'plural_form': 'french',
     'phrases': {
-      'year': ['an', 'année', 'années'],
+      'year': ['année', 'années', 'an'],
       'month': ['mois', 'mois', 'mois'],
-      'week': ['sem', 'semaine', 'semaines'],
-      'day': ['j', 'jour', 'jours'],
-      'hour': ['h', 'heure', 'heures'],
-      'minute': ['min', 'minute', 'minutes'],
-      'second': ['sec', 'seconde', 'secondes'],
-      'millisecond': ['ms', 'milliseconde', 'millisecondes'],
+      'week': ['semaine', 'semaines', 'sem'],
+      'day': ['jour', 'jours', 'j'],
+      'hour': ['heure', 'heures', 'h'],
+      'minute': ['minute', 'minutes', 'min'],
+      'second': ['seconde', 'secondes', 'sec'],
+      'millisecond': ['milliseconde', 'millisecondes', 'ms'],
       'combine': 'et',
       'error': 'Date non valide',
     }
   },
   {
     'language': 'it',
-    'plural_form': 'english',
     'phrases': {
-      'year': ['aa', 'anno', 'anni'],
-      'month': ['mm', 'mese', 'mesi'],
-      'week': ['set', 'settimana', 'settimane'],
-      'day': ['gg', 'giorno', 'giorni'],
-      'hour': ['h', 'ora', 'ore'],
-      'minute': ['min', 'minuto', 'minuti'],
-      'second': ['sec', 'secondo', 'secondi'],
-      'millisecond': ['ms', 'millisecondo', 'millisecondi'],
+      'year': ['anno', 'anni', 'aa'],
+      'month': ['mese', 'mesi', 'mm'],
+      'week': ['settimana', 'settimane', 'set'],
+      'day': ['giorno', 'giorni', 'gg'],
+      'hour': ['ora', 'ore', 'h'],
+      'minute': ['minuto', 'minuti', 'min'],
+      'second': ['secondo', 'secondi', 'sec'],
+      'millisecond': ['millisecondo', 'millisecondi', 'ms'],
       'combine': 'e',
       'error': 'Data non valida',
     }
   },
   {
     'language': 'nb',
-    'plural_form': 'english',
     'phrases': {
       'year': ['år', 'år', 'år'],
-      'month': ['mnd', 'måned', 'måneder'],
-      'week': ['u', 'uke', 'uker'],
-      'day': ['d', 'dag', 'dager'],
-      'hour': ['t', 'time', 'timer'],
-      'minute': ['min', 'minutt', 'minutter'],
-      'second': ['sek', 'sekund', 'sekunder'],
-      'millisecond': ['ms', 'millisekund', 'millisekunder'],
+      'month': ['måned', 'måneder', 'mnd'],
+      'week': ['uke', 'uker', 'u'],
+      'day': ['dag', 'dager', 'd'],
+      'hour': ['time', 'timer', 't'],
+      'minute': ['minutt', 'minutter', 'min'],
+      'second': ['sekund', 'sekunder', 'sek'],
+      'millisecond': ['millisekund', 'millisekunder', 'ms'],
       'combine': 'og',
       'error': 'Ugyldig dato',
     }
   },
   {
     'language': 'nl',
-    'plural_form': 'english',
     'phrases': {
-      'year': ['jr', 'jaar', 'jaar'],
-      'month': ['mnd', 'maand', 'maanden'],
-      'week': ['wk', 'week', 'weken'],
-      'day': ['dg', 'dag', 'dagen'],
-      'hour': ['u', 'uur', 'uur'],
-      'minute': ['min', 'minuut', 'minuten'],
-      'second': ['sec', 'seconde', 'seconden'],
-      'millisecond': ['ms', 'milliseconde', 'milliseconden'],
+      'year': ['jaar', 'jaar', 'jr'],
+      'month': ['maand', 'maanden', 'mnd'],
+      'week': ['week', 'weken', 'wk'],
+      'day': ['dag', 'dagen', 'dg'],
+      'hour': ['uur', 'uur', 'u'],
+      'minute': ['minuut', 'minuten', 'min'],
+      'second': ['seconde', 'seconden', 'sec'],
+      'millisecond': ['milliseconde', 'milliseconden', 'ms'],
       'combine': 'en',
       'error': 'Ongeldige datum',
     }
   },
   {
     'language': 'nn',
-    'plural_form': 'english',
     'phrases': {
       'year': ['år', 'år', 'år'],
-      'month': ['mnd', 'månad', 'månader'],
-      'week': ['v', 'veke', 'veker'],
-      'day': ['d', 'dag', 'dagar'],
-      'hour': ['t', 'time', 'timar'],
-      'minute': ['min', 'minutt', 'minutt'],
-      'second': ['sek', 'sekund', 'sekund'],
-      'millisecond': ['ms', 'millisekund', 'millisekund'],
+      'month': ['månad', 'månader', 'mnd'],
+      'week': ['veke', 'veker', 'v'],
+      'day': ['dag', 'dagar', 'd'],
+      'hour': ['time', 'timar', 't'],
+      'minute': ['minutt', 'minutt', 'min'],
+      'second': ['sekund', 'sekund', 'sek'],
+      'millisecond': ['millisekund', 'millisekund', 'ms'],
       'combine': 'og',
       'error': 'Ugyldig dato',
     }
   },
   {
     'language': 'de',
-    'plural_form': 'english',
     'phrases': {
-      'year': ['J.', 'Jahr', 'Jahre'],
-      'month': ['M.', 'Monat', 'Monate'],
-      'week': ['Wo.', 'Woche', 'Wochen'],
-      'day': ['Tg.', 'Tag', 'Tage'],
-      'hour': ['Std.', 'Stunde', 'Stunden'],
-      'minute': ['Min.', 'Minute', 'Minuten'],
-      'second': ['Sek.', 'Sekunde', 'Sekunden'],
-      'millisecond': ['ms', 'Millisekunde', 'Millisekunden'],
+      'year': ['Jahr', 'Jahre', 'J.'],
+      'month': ['Monat', 'Monate', 'M.'],
+      'week': ['Woche', 'Wochen', 'Wo.'],
+      'day': ['Tag', 'Tage', 'Tg.'],
+      'hour': ['Stunde', 'Stunden', 'Std.'],
+      'minute': ['Minute', 'Minuten', 'Min.'],
+      'second': ['Sekunde', 'Sekunden', 'Sek.'],
+      'millisecond': ['Millisekunde', 'Millisekunden', 'ms'],
       'combine': 'und',
       'error': 'Falsches Datum',
     }
   },
   {
     'language': 'pt',
-    'plural_form': 'english',
     'phrases': {
-      'year': ['aa', 'ano', 'anos'],
-      'month': ['mm', 'mês', 'meses'],
-      'week': ['sem', 'semana', 'semanas'],
-      'day': ['d', 'dia', 'dias'],
-      'hour': ['h', 'hora', 'horas'],
-      'minute': ['min', 'minuto', 'minutos'],
-      'second': ['seg', 'segundo', 'segundos'],
-      'millisecond': ['ms', 'millissegundo', 'millissegundos'],
+      'year': ['ano', 'anos', 'aa'],
+      'month': ['mês', 'meses', 'mm'],
+      'week': ['semana', 'semanas', 'sem'],
+      'day': ['dia', 'dias', 'd'],
+      'hour': ['hora', 'horas', 'h'],
+      'minute': ['minuto', 'minutos', 'min'],
+      'second': ['segundo', 'segundos', 'seg'],
+      'millisecond': ['millissegundo', 'millissegundos', 'ms'],
       'combine': 'e',
       'error': 'Data Inválida',
     }
   },
   {
     'language': 'dk',
-    'plural_form': 'english',
     'phrases': {
       'year': ['år', 'år', 'år'],
-      'month': ['mnd', 'måned', 'måneder'],
-      'week': ['uge', 'uge', 'uger'],
-      'day': ['dag', 'dag', 'dage'],
-      'hour': ['t.', 'time', 'timer'],
-      'minute': ['min.', 'minut', 'minuter'],
-      'second': ['sek.', 'sekund', 'sekunder'],
-      'millisecond': ['ms.', 'millisekund', 'millisekunder'],
+      'month': ['måned', 'måneder', 'mnd'],
+      'week': ['uge', 'uger', 'uge'],
+      'day': ['dag', 'dage', 'dag'],
+      'hour': ['time', 'timer', 't.'],
+      'minute': ['minut', 'minuter', 'min.'],
+      'second': ['sekund', 'sekunder', 'sek.'],
+      'millisecond': ['millisekund', 'millisekunder', 'ms.'],
       'combine': 'og',
       'error': 'Ugyldig dato',
     }
   },
   {
     'language': 'sv',
-    'plural_form': 'english',
     'phrases': {
       'year': ['år', 'år', 'år'],
-      'month': ['mån', 'månad', 'månader'],
-      'week': ['v', 'vecka', 'veckor'],
-      'day': ['dag', 'dag', 'dagar'],
-      'hour': ['tim', 'timme', 'timmar'],
-      'minute': ['min', 'minut', 'minuter'],
-      'second': ['sek', 'sekund', 'sekunder'],
-      'millisecond': ['ms', 'millisekund', 'millisekunder'],
+      'month': ['månad', 'månader', 'mån'],
+      'week': ['vecka', 'veckor', 'v'],
+      'day': ['dag', 'dagar', 'dag'],
+      'hour': ['timme', 'timmar', 'tim'],
+      'minute': ['minut', 'minuter', 'min'],
+      'second': ['sekund', 'sekunder', 'sek'],
+      'millisecond': ['millisekund', 'millisekunder', 'ms'],
       'combine': 'och',
       'error': 'Ogiltigt datum',
     }
   },
   {
     'language': 'cs',
-    'plural_form': 'slovak',
     'phrases': {
-      'year': ['rok', 'rok', 'roky', 'let'],
-      'month': ['měs', 'měsíc', 'měsíce', 'měsíců'],
-      'week': ['týd', 'týden', 'týdny', 'týdnů'],
-      'day': ['d', 'den', 'dny', 'dní'],
-      'hour': ['hod', 'hodina', 'hodiny', 'hodin'],
-      'minute': ['min', 'minuta', 'minuty', 'minut'],
-      'second': ['sek', 'sekunda', 'sekundy', 'sekund'],
-      'millisecond': ['ms', 'millisekunda', 'millisekundy', 'millisekund'],
+      'year': ['rok', 'roky', 'rok'],
+      'month': ['měsíc', 'měsíce', 'měs'],
+      'week': ['týden', 'týdny', 'týd'],
+      'day': ['den', 'dny', 'd'],
+      'hour': ['hodina', 'hodiny', 'hod'],
+      'minute': ['minuta', 'minuty', 'min'],
+      'second': ['sekunda', 'sekundy', 'sek'],
+      'millisecond': ['millisekunda', 'millisekundy', 'ms'],
       'combine': 'a',
-      'error': 'špatné datum'
+      'error': 'špatný datum'
     }
   },
   {
     'language': 'fi',
-    'plural_form': 'english',
     'phrases': {
-      'year': ['v', 'vuosi', 'vuotta'],
-      'month': ['kk', 'kuukausi', 'kuukautta'],
-      'week': ['vk', 'viikko', 'viikkoa'],
-      'day': ['pv', 'päivä', 'päivää'],
-      'hour': ['t', 'tunti', 'tuntia'],
-      'minute': ['min', 'minuutti', 'minuuttia'],
-      'second': ['s', 'sekunti', 'sekuntia'],
-      'millisecond': ['ms', 'millisekunti', 'millisekuntia'],
+      'year': ['vuosi', 'vuotta', 'v'],
+      'month': ['kuukausi', 'kuukautta', 'kk'],
+      'week': ['viikko', 'viikkoa', 'vk'],
+      'day': ['päivä', 'päivää', 'pv'],
+      'hour': ['tunti', 'tuntia', 't'],
+      'minute': ['minuutti', 'minuuttia', 'min'],
+      'second': ['sekunti', 'sekuntia', 's'],
+      'millisecond': ['millisekunti', 'millisekuntia', 'ms'],
       'combine': 'ja',
       'error': 'Väärä päivämäärä',
     }
   },
   {
     'language': 'ru',
-    'plural_form': 'russian',
     'phrases': {
-      'year': ['г', 'год', 'года', 'лет'],
-      'month': ['м', 'месяц', 'месяца', 'месяцев'],
-      'week': ['н', 'неделя', 'недели', 'недель'],
-      'day': ['д', 'день', 'дня', 'дней'],
-      'hour': ['ч', 'час', 'часа', 'часов'],
-      'minute': ['м', 'минута', 'минуты', 'минут'],
-      'second': ['с', 'секунда', 'секунды', 'секунд'],
-      'millisecond': ['мс', 'милисекунда', 'милисекунды', 'милисекунд'],
+      'year': ['год', 'года', 'г'],
+      'month': ['месяц', 'месяцы', 'м'],
+      'week': ['неделя', 'недели', 'н'],
+      'day': ['день', 'дни', 'д'],
+      'hour': ['час', 'часы', 'ч'],
+      'minute': ['минута', 'минут', 'м'],
+      'second': ['секунд', 'секунды', 'с'],
+      'millisecond': ['милисекунд', 'милисекунды', 'мс'],
       'combine': 'и',
       'error': 'Неверная дата',
     }
   },
   {
     'language': 'uk',
-    'plural_form': 'russian',
     'phrases': {
-      'year': ['р', 'рік', 'роки', 'років'],
-      'month': ['м', 'місяць', 'місяці', 'місяців'],
-      'week': ['тижд', 'тиждень', 'тижні', 'тижнів'],
-      'day': ['дн', 'день', 'дні', 'днів'],
-      'hour': ['год', 'година', 'години', 'годин'],
-      'minute': ['хв', 'хвилина', 'хвилини', 'хвилин'],
-      'second': ['сек', 'секунда', 'секунди', 'секунд'],
-      'millisecond': ['мсек', 'мілісекунда', 'мілісекунди', 'мілісекунд'],
+      'year': ['рік', 'років', 'р'],
+      'month': ['місяць', 'місяців', 'м'],
+      'week': ['тиждень', 'тижнів', 'тижд'],
+      'day': ['день', 'днів', 'дн'],
+      'hour': ['годину', 'годин', 'год'],
+      'minute': ['хвилину', 'хвилин', 'хв'],
+      'second': ['секунду', 'секунд', 'сек'],
+      'millisecond': ['мілісекунду', 'мілісекунд', 'мсек'],
       'combine': 'та',
       'error': 'Недійсна дата',
     }
   },
-  {
-    'language': 'bg',
-    'plural_form': 'english',
-    'phrases': {
-      'year': ['г', 'година', 'години'],
-      'month': ['м', 'месец', 'месеца'],
-      'week': ['седм', 'седмица', 'седмици'],
-      'day': ['д', 'ден', 'дни'],
-      'hour': ['ч', 'час', 'часа'],
-      'minute': ['м', 'минута', 'минути'],
-      'second': ['с', 'секунда', 'секунди'],
-      'millisecond': ['мс', 'милисекунда', 'милисекунди'],
-      'combine': 'и',
-      'error': 'Невалидна дата',
-    }
-  },
-  {
-    'language': 'vi',
-    'plural_form': 'asian',
-    'phrases': {
-      'year': ['y', 'năm'],
-      'month': ['m', 'tháng'],
-      'week': ['w', 'tuần'],
-      'day': ['d', 'ngày'],
-      'hour': ['h', 'giờ'],
-      'minute': ['m', 'phút', 'phút'],
-      'second': ['s', 'giây'],
-      'millisecond': ['ms', 'mili giây'],
-      'combine': 'và',
-      'error': 'Ngày không hợp lệ',
-    }
-  },
-  {
-    'language': 'es',
-    'plural_form': 'english',
-    'phrases': {
-      'year': ['a', 'año', 'años'],
-      'month': ['m', 'mes', 'meses'],
-      'week': ['sem', 'semana', 'semanas'],
-      'day': ['d', 'día', 'días'],
-      'hour': ['h', 'hora', 'horas'],
-      'minute': ['min', 'minuto', 'minutos'],
-      'second': ['s', 'segundo', 'segundos'],
-      'millisecond': ['ms', 'milisegundo', 'milisegundos'],
-      'combine': 'y',
-      'error': 'Fecha inválida',
-    }
-  },
-  {
-    'language': 'he',
-    'plural_form': 'english',
-    'phrases': {
-      'year': ['שנה', 'שנה', 'שנים'],
-      'month': ['חודש', 'חודש', 'חודשים'],
-      'week': ['שבוע', 'שבוע', 'שבועות'],
-      'day': ['יום', 'יום', 'ימים'],
-      'hour': ['שעה', 'שעה', 'שעות'],
-      'minute': ['דקה', 'דקה', 'דקות'],
-      'second': ['שניה', 'שניה', 'שניות'],
-      'millisecond': ['מילי', 'מילישניה', 'מילישניות'],
-      'combine': 'ו',
-      'error': 'תאריך לא חוקי',
-    }
-  },
-  {
-    'language': 'hu',
-    'plural_form': 'english',
-    'phrases': {
-      'year': ['é', 'év', 'év'],
-      'month': ['hó', 'hónap', 'hónap'],
-      'week': ['hét', 'hét', 'hét'],
-      'day': ['n', 'nap', 'nap'],
-      'hour': ['ó', 'óra', 'óra'],
-      'minute': ['p', 'perc', 'perc'],
-      'second': ['mp', 'másodperc', 'másodperc'],
-      'millisecond': ['ms', 'ezredmásodperc', 'ezredmásodperc'],
-      'combine': 'és',
-      'error': 'Érvénytelen dátum',
-    }
-  },
 ] -%}
 
 {# macro to convert the abbreviated input for the not_use and always_show lists to the full time part names #}
@@ -363,14 +255,12 @@
     {%- set date = date if date is datetime else date | as_datetime('invalid') -%}
     {%- set compare_date = compare_date if compare_date is datetime else compare_date | as_datetime('invalid') -%}
     {%- set time = time | bool(true) -%}
-    {%- set parts = [parts | int(1), always_show | count] | max -%} 
-  {# create namespace to store debug data #}
-    {%- set debug = namespace(debug="") -%}
+    {%- set parts = [parts | int(1), always_show | count] | max -%}
   {# 1: check if date input is correct #}
     {%- if date is datetime and compare_date is datetime -%}
     {# convert date input to local or date only #}
       {%- set date = date | as_local if time else (date | as_local).date() -%}
-      {%- set compare_date = compare_date | as_local if time else (compare_date | as_local).date() -%} 
+      {%- set compare_date = compare_date | as_local if time else (compare_date | as_local).date() -%}
     {# determine highest and lowest date #}
       {%- set date_max = [compare_date, date] | max -%}
       {%- set date_min = [compare_date, date] | min -%}
@@ -392,7 +282,7 @@
       {%- if not not_use in [['millisecond'], []] -%}
         {%- set not_use = _abbr_to_full(not_use) | from_json -%}
       {%- endif -%}
-      {%- set not_use = not_use + ['hour', 'minute', 'second', 'millisecond' ] if not time else not_use -%} 
+      {%- set not_use = not_use + ['hour', 'minute', 'second', 'millisecond' ] if not time else not_use -%}
       {%- if always_show in [['all'], 'all'] -%}
         {%- set always_show = dur.keys() | list -%}
       {%- elif always_show != [] -%}
@@ -406,7 +296,7 @@
       {%- if do_use and ms < dur[do_use|last] -%}
         {{- {do_use | last: (ms / dur[do_use|last]) | round(0, round_mode)} | to_json -}}
       {%- else -%}
-    {# check if it is needed to determine years #}
+    {# check if it is needed to determine years #}    
       {%- if ms >= dur.day * 365 -%}
         {#- set numer of years, and set highest date using this number of years #}
           {%- set yrs = date_max.year - date_min.year - (1 if date_max.replace(year=date_min.year) < date_min else 0) -%}
@@ -415,7 +305,7 @@
           {%- set ms_yrs = ms -%}
       {%- endif -%}
       {%- set yrs = yrs | default(0) -%}
-      {# check if it is needed to determine months #}
+      {# check if it is needed to determine months #}    
         {%- set check_mth =
           ms >= dur.day * 28
           and 'month' in do_use
@@ -464,7 +354,7 @@
           {%- set first = keys | select('in', always_show | default([], true) + [first]) | first -%}
           {%- set to_use = keys[keys.index(first):] -%}
           {%- set to_output = to_use[:parts] -%}
-          {%- set last = dur.items() | selectattr('0', 'in', to_output) | map(attribute='0') | list | last | default('millisecond') -%}
+          {%- set last = to_output | last  |default('millisecond') -%}
         {# 3: check if there is anything left to use #}
           {%- if to_use -%}
             {%- set to_output = to_use[:parts] -%}
@@ -475,10 +365,9 @@
               {%- set to_reject = to_use | reject('in', to_output) | reject('in', always_show) | list -%}
               {%- set not_use = not_use + to_output[as_check*-1:] + to_reject -%}
               {%- set to_output = to_output | reject('in', not_use) | list  + always_show -%}
-              {%- set to_output = keys | select('in', to_output) | list + ['extra']-%}
+              {%- set to_output = keys | select('in', to_output) | list -%}
               {%- set output = time_split(date, parts, compare_date, not_use, always_show, time, round_mode) | from_json -%}
             {%- endif -%}
-
           {# apply round if needed #}
             {%- if round_mode in ['common', 'ceil'] and last != 'millisecond' -%}
               {# determine first and last item with data #}
@@ -487,59 +376,22 @@
                 {%- set remain_part = remain / dur[last] -%}
                 {%- set to_round = 1 if remain_part >= 0.5 and round_mode == 'common' else remain_part | round(0, round_mode) -%}
                 {%- set sec_to_add = ((dur[last] + (dur.day if last in  ['year', 'month'] else 1) - remain) | round(0, 'ceil') * to_round) / 1000 -%}
+                {%- set round_mode = 'floor' -%}
                 {%- set date_max = [compare_date, date] | max + timedelta(seconds=sec_to_add) -%}
                 {%- set date_min = [compare_date, date] | min -%}
-                {%- set output = time_split(date_max, parts, date_min, not_use, always_show, time, 'floor') | from_json -%}
-                {%- set output = dict(output.items() | selectattr('0', 'in', do_use)) -%}
-                {%- set keys = output.keys() | list -%}
-                {%- set with_value = output.items() | rejectattr('1', 'eq', 0) | map(attribute='0') | list -%}
-                {%- set first = with_value | first | default('millisecond') -%}
-                {%- set first = keys | select('in', always_show | default([], true) + [first]) | first -%}
-                {%- set to_use = keys[keys.index(first):] -%}
-                {%- set to_output = to_use[:parts] -%}
+                {%- set output = time_split(date_max, parts, date_min, not_use, always_show, time, round_mode) | from_json -%}
             {%- endif -%}
           {# output result #}
             {%- set zero_values = output.items() | selectattr('1', 'eq', 0) | map(attribute='0') | list -%}
             {%- set reject_list = zero_values | reject('in', always_show) | list -%}
-            {{- dict(output.items() | selectattr('0', 'in', to_output) | rejectattr('0', 'in', reject_list), **dict(debug=debug.debug) if debug.debug else dict()) | default({always_return: 0}, true) | to_json-}}
-          {%- else -%} {{- dict(error='No time parts left to output') -}}
+            {{- dict(output.items() | selectattr('0', 'in', to_output) | rejectattr('0', 'in', reject_list)) | default({always_return: 0}, true) | to_json -}}
+          {%- else -%} {{- dict(error='No time parts left to output') | to_json -}}
           {%- endif -%} {# 3 #}
-      {%- endif -%} {# 2 #} 
-    {%- else -%} {{- dict(error='Invalid date input')-}}
+      {%- endif -%} {# 2 #}
+    {%- else -%} {{- dict(error='Invalid date input') | to_json -}}
     {%- endif -%} {# 1 #}
 {%- endmacro -%}
 
-{# macro for determining the time unit variant depending on the language #}
-{%- macro plural(number=0, rule='english') -%}
-  {%- set mod100 = number % 100 -%}
-  {%- set mod10 = number % 10 -%}
-  {%- set form = 1 -%}
-  {%- if rule == 'english' -%}
-    {%- set form = 1 if number == 1 else 2 -%}
-  {%- elif rule == 'french' -%}
-    {%- set form = 1 if number <= 1 else 2 -%}
-  {%- elif rule == 'latvian' -%}
-    {%- set form = 1 if (mod10 == 1 and mod100 != 11) else 2 if number != 0 else 3 -%}
-  {%- elif rule == 'irish' -%}
-    {%- set form = 1 if number == 1 else 2 if number == 2 else 3 -%}
-  {%- elif rule == 'romanian' -%}
-    {%- set form = 1 if number == 1 else 2 if (number == 0 or (mod100 > 0 and mod100 < 20 )) else 3 -%}
-  {%- elif rule == 'lithuanian' -%}
-    {%- set form = 1 if (mod10 == 1 and mod100 != 11) else 2 if (mod10 >= 2 and (mod100 < 10 or mod100 >= 20)) else 3 -%}
-  {%- elif rule == 'russian' -%}
-    {%- set form = 1 if (mod10 == 1 and mod100 != 11) else 2 if (mod10 >= 2 and mod10 <= 4 and (mod100 < 10 or mod100 >= 20)) else 3 -%}
-  {%- elif rule == 'slovak' -%}
-    {%- set form = 1 if number == 1 else 2 if (number >= 2 and number <= 4) else 3 -%}
-  {%- elif rule == 'polish' -%}
-    {%- set form = 1 if number == 1 else 2 if (mod10 >= 2 and mod10 <= 4 and (mod100 < 10 or mod100 >= 20)) else 3 -%}
-  {%- elif rule == 'slovenian' -%}
-    {%- set form = 1 if mod100 == 1 else 2 if mod100 == 2 else 3 if (mod100 == 3 or mod100 == 4) else 4 -%}
-  {%- elif rule == 'arabic' -%}
-    {%- set form = 1 if number == 0 else 2 if number == 1 else 3 if number == 2 else 4 if (mod100 >= 3 and mod100 <= 10) else 5 if mod100 >= 11 else 6 -%}
-  {%- endif -%}
-  {{- form -}}
-{%- endmacro -%}
-
 {# macro to output a timedelta in a readable format #}
 {%- macro relative_time_plus(date, parts=1, abbr=false, language='en', compare_date=now(), not_use=['millisecond'], always_show=[], time=true, round_mode='floor') -%}
   {#- select correct phrases bases on language input #}
@@ -547,7 +399,6 @@
     {%- set languages = phrases | map(attribute='language') | list -%}
     {%- set language = iif(language in languages, language, 'en') -%}
     {%- set phr = phrases | selectattr('language', 'eq', language) | map(attribute='phrases') | list | first -%}
-    {%- set plural_form = phrases | selectattr('language', 'eq', language) | map(attribute='plural_form') | list | first -%}
     {%- set abbr = abbr | bool(false) -%}
   {# split timedelta #}
     {%- set time_parts = time_split(date, parts, compare_date, not_use, always_show, time, round_mode) | from_json -%}
@@ -558,9 +409,9 @@
     {# convert to phrases #}
       {%- set ns = namespace(phrases=[]) -%}
       {%- for i in time_parts.keys()  -%}
-        {%- set plural_variant = plural(time_parts[i], plural_form) | int -%}
-        {%- set phr_form = phr[i][0] if abbr else phr[i][plural_variant] -%}
-        {%- set phrase = '{} {}'.format(time_parts[i], phr_form) -%}
+        {%- set phr_abbr = phr[i][2] -%}
+        {%- set phr_verb = phr[i][1] if time_parts[i] != 1 else phr[i][0] -%}
+        {%- set phrase = '{} {}'.format(time_parts[i], phr_abbr if abbr else phr_verb) -%} 
         {%- set ns.phrases = ns.phrases + [phrase] -%}
       {%- endfor -%}
     {#- join phrases in a string, using phr.combine for the last item #}

custom_templates/sports.jinja

@@ -12,64 +12,21 @@
 {% endif %}
 {% endmacro %}
 
-{% macro period_str(team) %}
-{% if state_attr(team,'league') in ['NFL','NCAAF'] %}
-  quarter
-{% elif state_attr(team,'league') == 'MLB' %}
-  inning
-{% else %}
-  period
-{% endif %}
-{% endmacro %}
-
-{% macro sports_clock(team) %}
-  {% macro data() %}
-  {% set period_str = period_str(team) %}
-  {% set game_clock = state_attr(team,'clock') | lower %}
-  {% if state_attr(team,'league') == 'MLB' %}
-    {% set inning_parts = game_clock.split(' ') %}
-    in the {{ inning_parts[0] ~ ' of the ' ~ inning_parts[1] ~ ' ' ~ period_str }}
-  {% else %}
-    {% if ' - ' in game_clock %}
-      {% set clock_time, quarter = game_clock.split(' - ') %}
-      {% if quarter == 'ot' %}
-        with {{ clock_time ~ ' remaining in overtime' }}
-      {% else %}
-        with {{ clock_time ~ ' remaining in the ' ~ quarter ~ ' ' ~ period_str }}
-      {% endif %}
-    {% endif %}
-  {% endif %}
-  {% endmacro %}
-{{ cleanup(data()) }}
-{% endmacro %}
-
 {% macro sports_pregame(team) %}
   {% macro data() %}
-  {% if state_attr(team,'opponent_name') %}
-    {% set opponent_name = state_attr(team, 'opponent_name') %}
-    {% if opponent_name.endswith(' St') %}
-      {% set opponent_name = opponent_name | replace(' St', ' State') %}
-    {% endif %}
-  {% endif %}
   {% if is_state(team,'PRE') %}
     {% set date = state_attr(team,'date') | as_timestamp | timestamp_custom('%m-%d') %}
     {% if date == now().strftime('%m-%d') %}
-      The {{ state_attr(team,'friendly_name') }} will be playing today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} at {{ state_attr(team,'venue') }}. 
+      The {{ state_attr(team,'friendly_name') }} will be playing today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} at {{ state_attr(team,'venue') }}. 
       {{ sports_str(team,'start') }} is at {{ state_attr(team,'date') | as_timestamp | timestamp_custom('%I:%M %p') }}. 
     {% endif %}
   {% endif %}
-  {% endmacro %}
+  {% endmacro%}
 {{ cleanup(data()) }}
 {% endmacro %}
 
 {% macro sports_main(team) %}
   {% macro data() %}
-  {% if state_attr(team,'opponent_name') %}
-    {% set opponent_name = state_attr(team, 'opponent_name') %}
-    {% if opponent_name.endswith(' St') %}
-      {% set opponent_name = opponent_name | replace(' St', ' State') %}
-    {% endif %}
-  {% endif %}
   {% if is_state(team,'POST') %}
     {% set date = state_attr(team,'date') | as_timestamp | timestamp_custom('%m-%d') %}
     {% set yday = (as_timestamp(now()) - (24*3600)) | timestamp_custom('%m-%d') %}
@@ -77,11 +34,11 @@
       {% if state_attr(team,'clock') in ['postponed','Postponed'] %}
         The {{ state_attr(team,'friendly_name') }} had their game postponed today, and it will be played at a later date. 
       {% elif (state_attr(team,'team_score') | int) == state_attr(team,'opponent_score') | int %}
-        The {{ state_attr(team,'friendly_name') }} tied in their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} tied in their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'team_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} won their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} won their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'opponent_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} lost their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} lost their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
       {% endif %}
       {% if state_attr(team,'clock') not in ['postponed','Postponed'] %}
         This brings their record to {{ state_attr(team,'team_record') | replace("-"," and ") }} on the season. 
@@ -90,11 +47,11 @@
       {% if state_attr(team,'clock') in ['postponed','Postponed'] %}
         The {{ state_attr(team,'friendly_name') }} had their game postponed yesterday, and it will be played at a later date. 
       {% elif (state_attr(team,'team_score') | int) == state_attr(team,'opponent_score') | int %}
-        The {{ state_attr(team,'friendly_name') }} tied in their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} tied in their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'team_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} won their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} won their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'opponent_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} lost their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} lost their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
       {% endif %}
       {% if state_attr(team,'clock') not in ['postponed','Postponed'] %}
         This brings their record to {{ state_attr(team,'team_record') | replace("-"," and ") }} on the season. 
@@ -102,11 +59,11 @@
     {% endif %}
   {% elif is_state(team,'IN') %}
     {% if (state_attr(team,'team_score') | int) == (state_attr(team,'opponent_score') | int) %}
-      The {{ state_attr(team,'friendly_name') }} are currently tied in their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }} {{ sports_clock(team) }}.
+      The {{ state_attr(team,'friendly_name') }} are currently tied in their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
     {% elif (state_attr(team,'team_score') | int) > (state_attr(team,'opponent_score') | int) %}
-      The {{ state_attr(team,'friendly_name') }} are currently winning their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }} {{ sports_clock(team) }}. 
+      The {{ state_attr(team,'friendly_name') }} are currently winning their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
     {% else %}
-      The {{ state_attr(team,'friendly_name') }} are currently losing their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} with a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }} {{ sports_clock(team) }}. 
+      The {{ state_attr(team,'friendly_name') }} are currently losing their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} with a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
     {% endif %}
   {% endif %}
   {% endmacro %}

custom_templates/status.jinja

@@ -473,11 +473,12 @@
       Collin has Beyond The Bells today after school.
     {% endif %}
     {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
-      {{ states('input_text.kallen_pickup') }} will be picking Collin up from school today.
-      {% if is_state('input_boolean.kallen_school_early_release','on') %}
-        Today is an early release day!
-      {% endif %}
+      {{ states('input_text.kallen_pickup') }} will be picking Collin up from school today. 
+    {% else %}
       Pickup today will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
+      {% if is_state('input_boolean.kallen_school_early_release','on') %}
+        And It is early release!
+      {% endif %}
     {% endif %}
     {% if states('sensor.windows_open') | int > 0 %}
       'I detect that there are windows open. Make sure you close them before you leave, or else the security system will not arm. '
@@ -543,11 +544,10 @@
         {% endif %}
         {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
           {{ states('input_text.kallen_pickup') }} will be picking him up from school today.
-          {% if is_state('input_boolean.kallen_school_early_release','on') %}
-            The school is on an early release schedule, pickup is at {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
-          {% else %}
-            His pickup time is {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
-          {% endif %}
+        {% elif is_state('input_boolean.kallen_school_early_release','on') %}
+          The school is on an early release schedule, pickup is at {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
+        {% else %}
+          His pickup time is {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
         {% endif %}
       {% else %}
         {{ identKallen }} has school at {{ input_datetime_read('input_datetime.kallen_school_day_start') | trim }} today.

custom_templates/weather.jinja

@@ -19,15 +19,15 @@
   {% if type in ['alerts','full'] %}
     {% if is_state('input_boolean.tornado_alarm','on') %}
       We are under a tornado warning. If you are not already in shelter, you should be. Get on it!
-      {% if state_attr('binary_sensor.tornado_warning','confirmed') == true %}
+      {% if state_attr('binary_sensor.tornado_warning','confirmed' == true) %}
         A tornado has been confirmed in the area. Please take shelter immediately!
       {% endif %}
     {% elif is_state('binary_sensor.severe_thunderstorm_warning','on') %}
       We are under a severe thunderstorm warning.
-      {% if state_attr('binary_sensor.severe_thunderstorm_warning','tornado_possible') == true %}
+      {% if state_attr('binary_sensor.severe_thunderstorm_warning','tornado_possible' == true) %}
         The incoming storm has the potential to produce a tornado, so please pay attention and prepare to take shelter!
       {% endif %}
-      {% if state_attr('binary_sensor.severe_thunderstorm_warning','considerable_destructive') == true %}
+      {% if state_attr('binary_sensor.severe_thunderstorm_warning','considerable_destructive' == true) %}
         This storm has the potential to cause considerable damage. Please take shelter and stay safe!
       {% endif %}
     {% elif states('sensor.weatheralerts_active_alerts') > '0' and method != 'dashboard' %}
@@ -39,22 +39,7 @@
           There is lightning in the area. Nearest strike is {{ ltgdist }} miles away.
       {% endif %}
       {% if is_state('binary_sensor.raining','on') %}
-        {% if states('sensor.home_tempest_cloud_sensors_precipitation_intensity') not in ['unavailable','unknown','no_rain'] %}
-          {% set intensity = states('sensor.home_tempest_cloud_sensors_precipitation_intensity') %}
-          {% if intensity == 'very_light' %}
-            There is currently a very light drizzle falling.
-          {% elif intensity == 'light' %}
-            There is currently light rain falling. Front porch windows should be okay, but other windows should be closed.
-          {% elif intensity == 'moderate' %}
-            It is raining pretty good outside, you should probably make sure all windows are closed.
-          {% elif intensity in ['heavy','very_heavy'] %}
-            There is heavy rain falling, please make sure all doors and windows are closed at this time.
-          {% elif intensity == 'extreme' %}
-            It is raining extremely hard outside. Make sure all doors and windows are closed, and I recommend staying inside until it calms down. Perhaps check for roof leaks as well.
-          {% endif %}
-        {% else %}
-          It is currently raining. Make sure all doors and windows are closed!
-        {% endif %}
+        It is currently raining. Make sure all doors and windows are closed!
       {% endif %}
     {% endif %}
     {% if state_attr('weather.iron_nerd_weather_station','visibility') | int < 3 %}
@@ -75,15 +60,15 @@
     {% endif %}
     {% if is_state('input_boolean.tornado_alarm','on') %}
       "We are under a tornado warning. If you are not already in shelter, you should be. Get on it! "
-      {% if state_attr('binary_sensor.tornado_warning','confirmed') == true %}
+      {% if state_attr('binary_sensor.tornado_warning','confirmed' == true) %}
         "A tornado has been confirmed in the area. Please take shelter immediately! "
       {% endif %}
     {% elif is_state('binary_sensor.severe_thunderstorm_warning','on') %}
       "We are under a severe thunderstorm warning. "
-      {% if state_attr('binary_sensor.severe_thunderstorm_warning','tornado_possible') == true %}
+      {% if state_attr('binary_sensor.severe_thunderstorm_warning','tornado_possible' == true) %}
         "The incoming storm has the potential to produce a tornado, so please pay attention and prepare to take shelter! "
       {% endif %}
-      {% if state_attr('binary_sensor.severe_thunderstorm_warning','considerable_destructive') == true %}
+      {% if state_attr('binary_sensor.severe_thunderstorm_warning','considerable_destructive' == true) %}
         "This storm has the potential to cause considerable damage. Please take shelter and stay safe! "
       {% endif %}
     {% elif is_state('input_boolean.tornado_watch','on') %}
@@ -105,49 +90,12 @@
       "The nearest lightning strike is {{ ltgdist }} miles away. "
     {% endif %}
     {% if is_state('binary_sensor.raining','on') %}
-      {% if states('sensor.home_tempest_cloud_sensors_precipitation_intensity') not in ['unavailable','unknown','no_rain'] %}
-        {% set intensity = states('sensor.home_tempest_cloud_sensors_precipitation_intensity') %}
-        {% if intensity == 'very_light' %}
-          {{ [
-            "There is currently a very light drizzle falling. ",
-            "It is drizzling outside, but it is not too bad. ",
-            "The sky is spitting on us. That's not very nice, but a mild inconvenience at most. "
-          ] | random }}
-        {% elif intensity == 'light' %}
-          {{ [
-            "There is currently light rain falling. ",
-            "It is raining lightly outside, but it is not too bad. ",
-            "It kinda wainin outside, but just a little. "
-          ] | random }}
-          "Front porch windows should be okay, but other windows should be closed. "
-        {% elif intensity == 'moderate' %}
-          {{ [
-            "It is raining pretty good outside, you should probably make sure all windows are closed. ",
-            "It is raining at a decent rate outside, please make sure all windows are closed. "
-            "If you look outside, you will see that it wainin. "
-          ] | random }}
-        {% elif intensity in ['heavy','very_heavy'] %}
-          {{ [
-            "There is heavy rain falling, please make sure all doors and windows are closed at this time. ",
-            "It is raining heavily outside, please make sure all doors and windows are closed. ",
-            "It wainin sideways! Please make sure all doors and windows are closed. "
-          ] | random }}
-        {% elif intensity == 'extreme' %}
-          {{ [
-            "It is raining extremely hard outside. ",
-            "There is a torrential downpour outside. ",
-            "Holy crap, I have never seen it rain this hard before. "
-          ] | random }}
-          "Make sure all doors and windows are closed, and I recommend staying inside until it calms down. Perhaps check for roof leaks as well. "
-        {% endif %}
-      {% else %}
-        {{ [
-          "I have looked outside and determined that it is raining. ",
-          "If you look outside the window, you will notice, it wainin. ",
-          "It wainin sideways! ",
-          "There appears to be excessive moisture currently falling from the sky. Plan accordingly. ",
-        ] | random }}
-      {% endif %}
+      {{ [
+        "I have looked outside and determined that it is raining. ",
+        "If you look outside the window, you will notice, it wainin. ",
+        "It wainin sideways! ",
+        "There appears to be excessive moisture currently falling from the sky. Plan accordingly. ",
+      ] | random }}
     {% endif %}
     {% if (state_attr('weather.iron_nerd_weather_station','visibility') | int ) < 3 %}
       {{ [

input_select.yaml

@@ -11,7 +11,6 @@ report_type:
   options:
     - Bug Report
     - New Idea
-    - Adjustment
   initial: Bug Report
   icon: mdi:bug
 select_testing:

packages/climate.yaml

@@ -1,14 +1,14 @@
 template:
   - binary_sensor:
-    - name: Emma Bedroom Aircon - Compressor
+    - name: Emma Aircon - Compressor
       unique_id: 21bcbb62-823c-43ff-8c2c-26e940324ee6
-      state: "{{ states('sensor.emma_bedroom_aircon_power') | int > 150 }}"
-      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unknown','unavailable'] }}"
+      state: "{{ states('sensor.emma_air_conditioner_power') | int > 150 }}"
+      availability: "{{ states('fan.emma_air_conditioner') not in ['unknown','unavailable'] }}"
       device_class: running
-    - name: Emma Bedroom Aircon - Fan
+    - name: Emma Aircon - Fan
       unique_id: 9e3054cf-8f7e-4fef-9da4-5b2f2bc99c9d
-      state: "{{ states('sensor.emma_bedroom_aircon_power') | int > 20 }}"
-      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unknown','unavailable'] }}"
+      state: "{{ states('sensor.emma_air_conditioner_power') | int > 20 }}"
+      availability: "{{ states('fan.emma_air_conditioner') not in ['unknown','unavailable'] }}"
       device_class: running
     - name: Master Bedroom Aircon - Compressor
       unique_id: 87051957-1dbc-4d65-b138-e8469728f58f
@@ -116,6 +116,16 @@ template:
       unique_id: 2ce31844-b115-42b8-8213-feccf24e236c
       state: "{{ state_attr('climate.master_bedroom_aircon','temperature') | float }}"
       availability: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
+    - name: "Master Bedroom Eco Mode"
+      unique_id: edf36e23-adcf-4506-80eb-a14f4ea2fce0
+      state: "{{ is_state_attr('climate.master_bedroom_aircon','preset_mode','eco') }}"
+      icon: >-
+        {% if is_state_attr('climate.master_bedroom_aircon','preset_mode','eco') %}
+          mdi:home-lightning-bolt
+        {% else %}
+          mdi:home-lightning-bolt-outline
+        {% endif %}
+      availability: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
     - name: "Master Bedroom Aircon Fan Mode"
       unique_id: c0e4f9ba-0c6c-4673-9a75-13f253f2f2e8
       state: "{{ state_attr('climate.master_bedroom_aircon','fan_mode') }}"
@@ -132,26 +142,6 @@ template:
           mdi:fan-off
         {% endif %}
       availability: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
-    - name: "Emma Bedroom Target Temp"
-      unique_id: b81152a1-d4d9-4e3e-8a78-6039de2884ad
-      state: "{{ state_attr('climate.emma_bedroom_aircon','temperature') | float }}"
-      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unavailable','unknown'] }}"
-    - name: "Emma Bedroom Aircon Fan Mode"
-      unique_id: d678eb2e-be5b-4626-913d-fc1e32941ead
-      state: "{{ state_attr('climate.emma_bedroom_aircon','fan_mode') }}"
-      icon: >
-        {% if is_state_attr('climate.emma_bedroom_aircon','fan_mode','Auto') %}
-          mdi:fan-auto
-        {% elif is_state_attr('climate.emma_bedroom_aircon','fan_mode','Low') %}
-          mdi:fan-speed-1
-        {% elif is_state_attr('climate.emma_bedroom_aircon','fan_mode','Medium') %}
-          mdi:fan-speed-2
-        {% elif is_state_attr('climate.emma_bedroom_aircon','fan_mode','High') %}
-          mdi:fan-speed-3
-        {% else %}
-          mdi:fan-off
-        {% endif %}
-      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unavailable','unknown'] }}"
     - name: Living Room Average Temperature
       unique_id: c4a901a6-87e2-4257-b60b-2944be8fdf04
       state: >
@@ -197,17 +187,16 @@ input_boolean:
   master_bedroom_climate_protocol:
     name: Master Bedroom Climate Protocol
     icon: mdi:lightbulb-night
-  emma_bedroom_climate_protocol:
-    name: Emma Bedroom Climate Protocol
-    icon: mdi:lightbulb-night
   kallen_bedtime_protocol:
     name: Kallen Bedtime Protocol
     icon: mdi:lightbulb-night
 
-  # Turn on when air conditioners are installed, turn off in winter when we take them out
+  # Turn on when master bedroom air conditioner is installed, turn off in winter when we take it out, for smarter automations
   master_bedroom_aircon_installed:
     name: Master Bedroom Aircon Installed
     icon: mdi:tools
+
+  # Same thing, but for Emma's bedroom air conditioner
   emma_bedroom_aircon_installed:
     name: Emma Bedroom Aircon Installed
     icon: mdi:tools
@@ -216,9 +205,6 @@ input_boolean:
   master_bedroom_cooling_on:
     name: Master Bedroom Cooling On
     icon: mdi:snowflake
-  emma_bedroom_cooling_on:
-    name: Emma Bedroom Cooling On
-    icon: mdi:snowflake
 
   # Activated if the day will be excessively hot. For use with automations for daytime climate control.
   hot_day:
@@ -261,7 +247,6 @@ input_select:
     name: Scheduled Climate Mode - Emma Bedroom
     options:
       - AC
-      - Fan
       - Heat
       - White Noise
       - N/A
@@ -324,55 +309,13 @@ input_number:
     step: 1
     unit_of_measurement: °F
     icon: mdi:thermometer
-  emma_bedroom_daytime_temp:
-    name: Emma Bedroom Daytime Temp
-    min: 65
-    max: 80
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_night_temp:
-    name: Emma Bedroom Night Temp
-    min: 65
-    max: 80
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_bedtime_temp:
-    name: Emma Bedroom Bedtime Temp
-    min: 65
-    max: 80
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_aircon_run_threshold:
-    name: Emma Bedroom Aircon Run Threshold
+  emma_aircon_threshold:
+    name: Emma Aircon Threshold
     min: 40
     max: 80
     step: 1
     unit_of_measurement: °F
     icon: mdi:thermometer
-  emma_bedroom_aircon_mode_threshold:
-    name: Emma Bedroom Aircon Mode Threshold
-    min: 40
-    max: 80
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_fan_threshold:
-    name: Emma Bedroom Fan Threshold
-    min: 30
-    max: 70
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_auto_cooling_threshold:
-    name: Emma Bedroom Auto Cooling Threshold
-    min: 70
-    max: 90
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
   kallen_fan_threshold:
     name: Kallen Fan Threshold
     min: 40

packages/custom_weather.yaml

@@ -3,7 +3,6 @@ weather:
     name: "Iron Nerd Weather Station"
     condition_template: >
       {% set stations = [
-        states.weather.home_tempest_forecast_home,
         states.weather.home,
         states.weather.kdfi_daynight,
         states.weather.iron_nerd_studios,
@@ -13,7 +12,6 @@ weather:
       {{ states(result) }}
     temperature_template: >
       {% set temps = [
-        states.sensor.home_tempest_temperature,
         states.sensor.home_temperature,
         states.sensor.kdfi_temperature,
         states.sensor.pirateweather_temperature,
@@ -22,28 +20,8 @@ weather:
       {% set sensor = temps | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
       {{ states(sensor) | float }}
     temperature_unit: °F
-    dew_point_template: >
-      {% set dewpoints = [
-        states.sensor.home_tempest_dew_point,
-        states.sensor.home_dew_point,
-        states.sensor.kdfi_dew_point,
-        states.sensor.pirateweather_dew_point,
-        states.sensor.openweathermap_dew_point
-        ] %}
-        {% set sensor = dewpoints | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
-        {{ states(sensor) | float }}
-    apparent_temperature_template: >
-      {% set apparent_temps = [
-        states.sensor.home_tempest_feels_like,
-        states.sensor.home_temperature_feels_like,
-        states.sensor.pirateweather_apparent_temperature,
-        states.sensor.stratton_ave_apparent_temperature
-      ] %}
-      {% set sensor = apparent_temps | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
-      {{ states(sensor) | float }}
     humidity_template: >
       {% set humidity = [
-        states.sensor.home_tempest_humidity,
         states.sensor.home_relative_humidity,
         states.sensor.kdfi_relative_humidity,
         states.sensor.pirateweather_humidity,
@@ -62,14 +40,12 @@ weather:
       {{ forecasts | selectattr('forecast','defined') | map(attribute='forecast') | list | first }}
     forecast_hourly_template: >
       {% set forecasts = [
-        states.sensor.weather_com_hourly_weather_forecast.attributes,
+        states.sensor.weather_com_hourly_weather_forecast,
         states.sensor.pirateweather_hourly_weather_forecast.attributes
       ] %}
       {{ forecasts | selectattr('forecast','defined') | map(attribute='forecast') | list | first }}
     pressure_template: >
       {% set pressures = [
-        states.sensor.home_tempest_local_slp,
-        states.sensor.home_tempest_cloud_sensors_sea_level_pressure,
         states.sensor.home_pressure,
         states.sensor.kdfi_barometric_pressure
       ] %}
@@ -116,7 +92,6 @@ weather:
     name: "Iron Nerd Weather Station - Hourly"
     condition_template: >
       {% set stations = [
-        states.weather.home_tempest_forecast_home,
         states.weather.home,
         states.weather.tomorrow_io_stratton_ave_hourly,
         states.weather.iron_nerd_studios,
@@ -127,7 +102,6 @@ weather:
       {{ states(result) }}
     temperature_template: >
       {% set temps = [
-        states.sensor.home_tempest_temperature,
         states.sensor.home_temperature,
         states.sensor.kdfi_temperature,
         states.sensor.pirateweather_temperature,
@@ -136,28 +110,8 @@ weather:
       {% set sensor = temps | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
       {{ states(sensor) | float }}
     temperature_unit: °F
-    dew_point_template: >
-      {% set dewpoints = [
-        states.sensor.home_tempest_dew_point,
-        states.sensor.home_dew_point,
-        states.sensor.kdfi_dew_point,
-        states.sensor.pirateweather_dew_point,
-        states.sensor.openweathermap_dew_point
-        ] %}
-        {% set sensor = dewpoints | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
-        {{ states(sensor) | float }}
-    apparent_temperature_template: >
-      {% set apparent_temps = [
-        states.sensor.home_tempest_feels_like,
-        states.sensor.home_temperature_feels_like,
-        states.sensor.pirateweather_apparent_temperature,
-        states.sensor.stratton_ave_apparent_temperature
-      ] %}
-      {% set sensor = apparent_temps | selectattr('state','ne','unavailable') | selectattr('state','ne','unknown') | map(attribute='entity_id') | list | first %}
-      {{ states(sensor) | float }}
     humidity_template: >
       {% set humidity = [
-        states.sensor.home_tempest_humidity,
         states.sensor.home_relative_humidity,
         states.sensor.kdfi_relative_humidity,
         states.sensor.pirateweather_humidity,
@@ -167,15 +121,13 @@ weather:
       {{ states(result) | float }}
     forecast_hourly_template: >
       {% set forecasts = [
-        states.sensor.weather_com_hourly_weather_forecast.attributes,
+        states.sensor.weather_com_hourly_weather_forecast,
         states.weather.tomorrow_io_stratton_ave_hourly.attributes,
         states.sensor.pirateweather_hourly_weather_forecast.attributes
       ] %}
       {{ forecasts | selectattr('forecast','defined') | map(attribute='forecast') | list | first }}
     pressure_template: >
       {% set pressures = [
-        states.sensor.home_tempest_local_slp,
-        states.sensor.home_tempest_cloud_sensors_sea_level_pressure,
         states.sensor.home_pressure,
         states.sensor.kdfi_barometric_pressure
       ] %}
@@ -370,60 +322,6 @@ sensor:
   #     days: 7
 
 template:
-  - trigger:
-    - platform: time_pattern
-      minutes: /15
-    - platform: state
-      entity_id: weather.home_tempest_forecast_home
-    - platform: homeassistant
-      event: start
-    action:
-    - service: weather.get_forecasts
-      data:
-        type: daily
-      target:
-        entity_id: weather.home_tempest_forecast_home
-      response_variable: daily
-    - variables:
-        today: "{{ daily['weather.home_tempest_forecast_home'].forecast[0] }}"
-    sensor:
-    - name: Weatherflow Daily Weather Forecast
-      unique_id: 2c70c4ee-7f7f-42b4-ad40-90ce2b6c6d77
-      state: "{{ now().isoformat() }}"
-      attributes:
-        forecast: "{{ daily['weather.home_tempest_forecast_home'].forecast }}"
-    - name: Weatherflow High
-      unique_id: 296b4361-459a-48e7-9793-c003b88fcdef
-      state: "{{ today.temperature }}"
-      unit_of_measurement: °F
-    - name: Weatherflow Low
-      unique_id: 61c344be-33d3-4e1d-8d0d-277c2b850c0d
-      state: "{{ today.templow }}"
-      unit_of_measurement: °F
-    - name: Weatherflow Rain Chance Today
-      unique_id: ab0327ff-f20f-4d16-aeb5-78682b3e2397
-      state: "{{ today.precipitation_probability }}"
-      unit_of_measurement: "%"
-  - trigger:
-    - platform: time_pattern
-      minutes: /15
-    - platform: state
-      entity_id: weather.home_tempest_forecast_home
-    - platform: homeassistant
-      event: start
-    action:
-    - service: weather.get_forecasts
-      data:
-        type: hourly
-      target:
-        entity_id: weather.home_tempest_forecast_home
-      response_variable: hourly
-    sensor:
-    - name: Weatherflow Hourly Weather Forecast
-      unique_id: aa0b368c-ea23-4514-a697-e122353eb76d
-      state: "{{ now().isoformat() }}"
-      attributes:
-        forecast: "{{ hourly['weather.home_tempest_forecast_home'].forecast }}"
   - trigger:
     - platform: time_pattern
       minutes: /15
@@ -770,10 +668,10 @@ template:
           {% endif %}
     - name: "Lightning Warning"
       unique_id: edaddfc4-f7f0-4d75-aada-a2c588afe029
-      state: "{{ states('sensor.home_tempest_cloud_sensors_lightning_strikes_last_hour') | int > 0 }}"
+      state: "{{ states('sensor.blitzortung_lightning_counter') | int > 0 }}"
       device_class: safety
       attributes:
-        current_strikes: "{{ states('sensor.home_tempest_cloud_sensors_lightning_strikes_last_hour') | int }}"
+        current_strikes: "{{ states('sensor.blitzortung_lightning_counter') | int }}"
       icon: "{{ 'mdi:flash-alert' if states('sensor.blitzortung_lightning_counter') | int > 0 else 'mdi:flash-outline'}}"
     - name: "Audible Weather Alerts Allowed"
       unique_id: 03851823-32d5-44c1-af42-256fcd922069
@@ -803,57 +701,52 @@ template:
     - name: Raining
       unique_id: 232b43a4-4598-4315-ab76-42348c11e6ff
       state: >
-        {{ states('sensor.home_tempest_precipitation_intensity') | float > 0 or
-            states('sensor.home_tempest_precipitation_type') in ['rain','hail','rain_hail'] or
-            states('sensor.home_tempest_cloud_sensors_precipitation_description') in ['rain','heavy_rain'] or
-            is_state('binary_sensor.home_tempest_cloud_binary_sensors_is_raining','on') }}
-      icon: "{{ 'mdi:weather-rainy' if this.state == 'on' else 'mdi:weather-cloudy' }}"
+        {{ states('sensor.total_rain_sensors') | int > 1 }}
+      icon: "{{ 'mdi:weather-rainy' if states('sensor.total_rain_sensors') | int > 1 else 'mdi:weather-cloudy' }}"
   - sensor:
-    # - name: Total Rain Sensors
-    #   unique_id: b7c2e709-8f5c-4263-aa1d-fa8280afcddb
-    #   unit_of_measurement: 'sensors'
-    #   state: >
-    #     {% set sensors = [
-    #       states.sensor.home_tempest_precipitation_type,
-    #       states.sensor.pirateweather_precip,
-    #       states.sensor.openweathermap_precipitation_kind,
-    #       states.sensor.tomorrow_io_stratton_ave_precipitation_type
-    #     ] %}
-    #     {% set numeric_sensors = [
-    #       states.sensor.home_tempest_precipitation_intensity,
-    #       states.sensor.stratton_ave_precipitation
-    #     ] %}
-    #     {% set c1 = sensors | selectattr('state','eq','rain') | list | count %}
-    #     {% set c2 = numeric_sensors | map(attribute='state') | map('float') | select('gt',0) | list | count %}
-    #     {{ (c1 + c2) | int }}
+    - name: Total Rain Sensors
+      unique_id: b7c2e709-8f5c-4263-aa1d-fa8280afcddb
+      unit_of_measurement: 'sensors'
+      state: >
+        {% set sensors = [
+          states.sensor.pirateweather_precip,
+          states.sensor.openweathermap_precipitation_kind,
+          states.sensor.tomorrow_io_stratton_ave_precipitation_type
+        ] %}
+        {% set numeric_sensors = [
+          states.sensor.stratton_ave_precipitation
+        ] %}
+        {% set c1 = sensors | selectattr('state','eq','rain') | list | count %}
+        {% set c2 = numeric_sensors | map(attribute='state') | map('float') | select('gt',0) | list | count %}
+        {{ (c1 + c2) | int }}
     - name: Current Forecast
       unique_id: c0faea33-2ac3-40f1-8558-584c3f5d6b16
       icon: mdi:weather-sunny
       state: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
           {{ forecast.condition }}
       attributes:
         high_temp: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
           {{ forecast.temperature }}
         overnight_low: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
           {{ forecast.templow }}
         wind_bearing: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
           {{ forecast.wind_bearing }}
         wind_speed: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
           {{ forecast.wind_speed }}
         precipitation: >-
           {% if state_attr('weather.iron_nerd_weather_station','precipitation') %}
             {% set forecast = state_attr('weather.iron_nerd_weather_station','forecast')[0] %}
           {% else %}
-            {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
+            {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
           {% endif %}
           {{ forecast.precipitation }}
         friendly: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
           {{ forecast.condition | replace("partlycloudy","partly cloudy") }}
     - name: Current Forecast Detail
       unique_id: e5ae9864-70b5-402c-9d2f-c4d6a10085df
@@ -968,23 +861,23 @@ template:
       unique_id: a8ae26b0-ed26-4568-bb2b-f7c72707b009
       icon: mdi:weather-sunny
       state: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
           {{ forecast.condition }}
       attributes:
         high_temp: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
           {{ forecast.temperature }}
         overnight_low: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
           {{ forecast.templow }}
         wind_bearing: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
           {{ forecast.wind_bearing }}
         wind_speed: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
           {{ forecast.wind_speed }}
         precipitation: >-
-          {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[1] %}
+          {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[1] %}
           {{ forecast.precipitation }}
     - name: Tomorrow Forecast Detail
       unique_id: 21374ed0-80d1-49ba-817d-3e93eb3865e4
@@ -1289,7 +1182,7 @@ template:
       unit_of_measurement: '°F'
       device_class: temperature
       state: >-
-        {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
+        {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
         {% if is_number(forecast.temperature) %}
           {{ forecast.temperature }}
         {% else %}
@@ -1300,14 +1193,14 @@ template:
       unit_of_measurement: '°F'
       device_class: temperature
       state: >-
-        {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[2] %}
+        {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[2] %}
         {{ forecast.temperature }}
     - name: "Tonight's Low Temp"
       unique_id: 8ddc55b6-4728-4897-a32f-90be970f744b
       unit_of_measurement: '°F'
       device_class: temperature
       state: >-
-        {% set forecast = state_attr('sensor.weatherflow_daily_weather_forecast','forecast')[0] %}
+        {% set forecast = state_attr('sensor.weather_com_daily_weather_forecast','forecast')[0] %}
         {{ forecast.templow }}
     - name: "Clothing Forecast"
       unique_id: 8ed2684b-d0ad-402c-bc3c-340cb9b2437a
@@ -1568,8 +1461,8 @@ template:
       unit_of_measurement: '°F'
       state: >
         {% set ns = namespace(temps=[]) %}
-        {% set x = state_attr('sensor.weatherflow_hourly_weather_forecast','forecast')  | count %}
-        {% set pd = state_attr('sensor.weatherflow_hourly_weather_forecast','forecast') %}
+        {% set x = state_attr('sensor.weather_com_hourly_weather_forecast','forecast')  | count %}
+        {% set pd = state_attr('sensor.weather_com_hourly_weather_forecast','forecast') %}
         {% for i in range(0,x) %}
           {% set hr = as_timestamp(as_local(as_datetime(pd[i].datetime))) | timestamp_custom('%H') | int %}
           {% if hr in range(21,24) or hr in range(0,8) %}

packages/dashboards.yaml

@@ -1,11 +0,0 @@
-template:
-  - trigger:
-      - trigger: event
-        event_type: bubble_card_update_modules
-    sensor:
-      - name: "Bubble Card Modules"
-        state: "saved"
-        icon: "mdi:puzzle"
-        attributes:
-          modules: "{{ trigger.event.data.modules }}"
-          last_updated: "{{ trigger.event.data.last_updated }}"

packages/emmalynn.yaml

@@ -257,9 +257,6 @@ automation:
               time: >
                 {% from 'time.jinja' import current_time %}
                 {{ current_time('time',24) }}
-          - service: input_boolean.turn_off
-            target:
-              entity_id: input_boolean.emma_awake
       - conditions:
         - condition: trigger
           id: bedtime-timer-finished
@@ -284,9 +281,6 @@ automation:
               datetime: >
                 {% from 'time.jinja' import current_time %}
                 {{ current_time('time',24) }}
-          - service: input_boolean.turn_off
-            target:
-              entity_id: input_boolean.emma_awake
 
   - id: e59f638a-519f-4619-bf7d-b13251b3a374
     alias: Emma Meds Handler
@@ -810,11 +804,16 @@ script:
             datetime: >
               {% from 'time.jinja' import set_datetime %}
               {{ set_datetime(0,5) }}
-      - service: script.speech_engine
-        data:
-          who: common
-          type: normal
-          message: Emma has awoken, so it is time to make your way upstairs now
+      - if:
+        - condition: state
+          entity_id: binary_sensor.basement_occupied
+          state: 'on'
+        then:
+        - service: script.speech_engine
+          data:
+            who: basement
+            type: normal
+            message: Emma has awoken, so it is time to make your way upstairs now
       - service: input_datetime.set_datetime
         target:
           entity_id: input_datetime.emma_awake_at
@@ -899,3 +898,26 @@ script:
       - service: input_boolean.turn_off
         target:
           entity_id: input_boolean.white_noise_emma_bedroom
+      - if:
+        - condition: state
+          entity_id: fan.emma_air_conditioner
+          state: 'on'
+        then:
+        - service: script.turn_on
+          target:
+            entity_id: script.emma_aircon_shutoff
+
+  emma_aircon_shutoff:
+    alias: 'Emma Air Conditioner Shutoff'
+    mode: restart
+    description: 'Attempt to shut off air conditioner after compressor stops running'
+    sequence:
+    - wait_template: "{{ is_state('binary_sensor.emma_aircon_compressor','off') }}"
+      timeout:
+        minutes: 15
+      continue_on_timeout: true
+    - delay:
+        seconds: 5
+    - service: fan.turn_off
+      target:
+        entity_id: fan.emma_air_conditioner

packages/integrations.yaml

@@ -31,7 +31,8 @@ tts:
     region_name: 'us-east-1'
     text_type: ssml
     voice: Joanna
-    engine: generative
+    cache: true
+    engine: neural
 
 conversation:
 

packages/lighting_and_scenes.yaml

@@ -44,9 +44,12 @@ input_boolean:
   adaptive_lighting_adjustments:
     name: Adaptive Lighting Adjustments
     icon: mdi:knob
-  sunset_lights_triggered:
-    name: Sunset Lights Triggered
-    icon: mdi:weather-sunset
+  upstairs_hallway_motion_lighting:
+    name: Upstairs Hallway Motion Lighting
+    icon: mdi:motion-sensor
+  stairwell_motion_lighting:
+    name: Stairwell Motion Lighting
+    icon: mdi:motion-sensor
 
 input_number:
   upstairs_bathroom_motion_off_delay:
@@ -210,21 +213,6 @@ input_number:
     step: 5
     unit_of_measurement: lx
     icon: mdi:sun-wireless
-  front_porch_lux_threshold:
-    name: Front Porch Lux Threshold
-    min: 0
-    max: 2000
-    step: 5
-    mode: box
-    unit_of_measurement: lx
-    icon: mdi:sun-wireless
-  sunset_lights_outdoor_lux_threshold:
-    name: Sunset Lights Outdoor Lux Threshold
-    min: 0
-    max: 10000
-    step: 100
-    unit_of_measurement: lx
-    icon: mdi:sun-wireless
 
   # Settings for adaptive adjustments
   daytime_colortemp_front_porch:
@@ -507,7 +495,6 @@ input_select:
       - Evening Mode
       - Night Mode
       - Bright Mode
-      - Reading Mode
       - Reset
     initial: Select
     icon: mdi:desk
@@ -672,25 +659,6 @@ template:
           {% endif %}
       device_class: problem
       delay_on: "00:00:10"
-    - name: Light Switch Issue
-      unique_id: 381e8038-ea96-474c-92ec-d1296dc1369e
-      state: >
-        {% set lights = states.light.upstairs_bathroom_lights,
-                        states.light.hallway_overhead,
-                        states.light.downstairs_bathroom_lights,
-                        states.light.living_room_lights,
-                        states.light.front_porch_light %}
-        {% set issues = lights | selectattr('state','eq','unavailable') | list | count %}
-        {{ issues > 0 }}
-      attributes:
-        issues: >
-          {% set lights = states.light.upstairs_bathroom_lights,
-                          states.light.hallway_overhead,
-                          states.light.downstairs_bathroom_lights,
-                          states.light.living_room_lights,
-                          states.light.front_porch_light %}
-          {% set ids = lights | selectattr('state','eq','unavailable') | map(attribute='attributes.friendly_name') | list %}
-          {{ ids | join(', ') }}
   - sensor:
     - name: "Basement Studio Lights - Brightness Actual"
       unique_id: dee4dc84-a6a0-4150-903e-5b8bd436d962

packages/notify.yaml

@@ -198,57 +198,6 @@ input_number:
     step: 0.05
     icon: mdi:knob
 
-template:
-  - sensor:
-    - name: "Basement Echo Dot Volume"
-      state: >
-        {% if is_state('input_boolean.give_me_darkness','on') %}
-          {{ states('input_number.basement_echo_dot_night_volume') }}
-        {% else %}
-          {{ states('input_number.basement_echo_dot_day_volume') }}
-        {% endif %}
-      icon: mdi:volume-high
-    - name: "Basement Google Speaker Volume"
-      state: >
-        {% if is_state('input_boolean.give_me_darkness','on') %}
-          {{ states('input_number.basement_google_speaker_night_volume') }}
-        {% else %}
-          {{ states('input_number.basement_google_speaker_day_volume') }}
-        {% endif %}
-      icon: mdi:volume-high
-    - name: "Living Room Echo Dot Volume"
-      state: >
-        {% if is_state('input_boolean.give_me_darkness','on') %}
-          {{ states('input_number.living_room_echo_dot_night_volume') }}
-        {% else %}
-          {{ states('input_number.living_room_echo_dot_day_volume') }}
-        {% endif %}
-      icon: mdi:volume-high
-    - name: "Master Bedroom Echo Dot Volume"
-      state: >
-        {% if is_state('input_boolean.give_me_darkness','on') or is_state('binary_sensor.people_sleeping','on') %}
-          {{ states('input_number.master_bedroom_echo_dot_night_volume') }}
-        {% else %}
-          {{ states('input_number.master_bedroom_echo_dot_day_volume') }}
-        {% endif %}
-      icon: mdi:volume-high
-    - name: "Kallen Bedroom Google Speaker Volume"
-      state: >
-        {% if is_state('input_boolean.give_me_darkness','on') or is_state('input_boolean.kallen_sleeping','on') %}
-          {{ states('input_number.kallen_bedroom_google_speaker_night_volume') }}
-        {% else %}
-          {{ states('input_number.kallen_bedroom_google_speaker_day_volume') }}
-        {% endif %}
-      icon: mdi:volume-high
-    - name: "Emma Bedroom Google Speaker Volume"
-      state: >
-        {% if is_state('input_boolean.give_me_darkness','on') or is_state('input_boolean.emma_sleeping','on') %}
-          {{ states('input_number.emma_bedroom_google_speaker_night_volume') }}
-        {% else %}
-          {{ states('input_number.emma_bedroom_google_speaker_day_volume') }}
-        {% endif %}
-      icon: mdi:volume-high
-
 # Amazon Polly Sensors to see last message and location of audible notification
 mqtt:
   sensor:
@@ -376,14 +325,24 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.basement_echo_dot','volume_level') | float %}
-            {% set expected = states('sensor.basement_echo_dot_volume') | float %}
-            {{ current != expected }}
+            {% set night = states('input_number.basement_echo_dot_night_volume') | float %}
+            {% set day = states('input_number.basement_echo_dot_day_volume') | float %}
+            {% if is_state('input_boolean.give_me_darkness','on') %}
+              {{ current != night }}
+            {% else %}
+              {{ current != day }}
+            {% endif %}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.basement_echo_dot
           data:
-            volume_level: "{{ states('sensor.basement_echo_dot_volume') }}"
+            volume_level: >
+              {% if is_state('input_boolean.give_me_darkness','on') %}
+                {{ states('input_number.basement_echo_dot_night_volume') }}
+              {% else %}
+                {{ states('input_number.basement_echo_dot_day_volume') }}
+              {% endif %}
 # Basement Google Speaker
     - if:
       - condition: and
@@ -414,14 +373,24 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.basement_google_speaker','volume_level') | float %}
-            {% set expected = states('sensor.basement_google_speaker_volume') | float %}
-            {{ current != expected }}
+            {% set night = states('input_number.basement_google_speaker_night_volume') | float %}
+            {% set day = states('input_number.basement_google_speaker_day_volume') | float %}
+            {% if is_state('input_boolean.give_me_darkness','on') %}
+              {{ current != night }}
+            {% else %}
+              {{ current != day }}
+            {% endif %}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.basement_google_speaker
           data:
-            volume_level: "{{ states('sensor.basement_google_speaker_volume') }}"
+            volume_level: >
+              {% if is_state('input_boolean.give_me_darkness','on') %}
+                {{ states('input_number.basement_google_speaker_night_volume') }}
+              {% else %}
+                {{ states('input_number.basement_google_speaker_day_volume') }}
+              {% endif %}
       - service: media_player.volume_mute
         target:
           entity_id: media_player.basement_google_speaker
@@ -436,14 +405,24 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.living_room_echo_dot','volume_level') | float %}
-            {% set expected = states('sensor.living_room_echo_dot_volume') | float %}
-            {{ current != expected }}
+            {% set night = states('input_number.living_room_echo_dot_night_volume') | float %}
+            {% set day = states('input_number.living_room_echo_dot_day_volume') | float %}
+            {% if is_state('input_boolean.give_me_darkness','on') %}
+              {{ current != night }}
+            {% else %}
+              {{ current != day }}
+            {% endif %}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.living_room_echo_dot
           data:
-            volume_level: "{{ states('sensor.living_room_echo_dot_volume') }}"
+            volume_level: >
+              {% if is_state('input_boolean.give_me_darkness','on') %}
+                {{ states('input_number.living_room_echo_dot_night_volume') }}
+              {% else %}
+                {{ states('input_number.living_room_echo_dot_day_volume') }}
+              {% endif %}
 # Master Bedroom Echo Dot
     - if:
       - condition: state
@@ -456,14 +435,24 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.master_bedroom_echo_dot','volume_level') | float %}
-            {% set expected = states('sensor.master_bedroom_echo_dot_volume') | float %}
-            {{ current != expected }}
+            {% set night = states('input_number.master_bedroom_echo_dot_night_volume') | float %}
+            {% set day = states('input_number.master_bedroom_echo_dot_day_volume') | float %}
+            {% if is_state('input_boolean.give_me_darkness','on') %}
+              {{ current != night }}
+            {% else %}
+              {{ current != day }}
+            {% endif %}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.master_bedroom_echo_dot
           data:
-            volume_level: "{{ states('sensor.master_bedroom_echo_dot_volume') }}"
+            volume_level: >
+              {% if is_state('input_boolean.give_me_darkness','on') %}
+                {{ states('input_number.master_bedroom_echo_dot_night_volume') }}
+              {% else %}
+                {{ states('input_number.master_bedroom_echo_dot_day_volume') }}
+              {% endif %}
 # Kallen Bedroom Speaker
     - if:
       - condition: and
@@ -494,14 +483,24 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.kallen_bedroom_google_speaker','volume_level') | float %}
-            {% set expected = states('sensor.kallen_bedroom_google_speaker_volume') | float %}
-            {{ current != expected }}
+            {% set night = states('input_number.kallen_bedroom_google_speaker_night_volume') | float %}
+            {% set day = states('input_number.kallen_bedroom_google_speaker_day_volume') | float %}
+            {% if is_state('input_boolean.give_me_darkness','on') %}
+              {{ current != night }}
+            {% else %}
+              {{ current != day }}
+            {% endif %}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.kallen_bedroom_google_speaker
           data:
-            volume_level: "{{ states('sensor.kallen_bedroom_google_speaker_volume') }}"
+            volume_level: >
+              {% if is_state('input_boolean.give_me_darkness','on') %}
+                {{ states('input_number.kallen_bedroom_google_speaker_night_volume') }}
+              {% else %}
+                {{ states('input_number.kallen_bedroom_google_speaker_day_volume') }}
+              {% endif %}
       - service: media_player.volume_mute
         target:
           entity_id: media_player.kallen_bedroom_google_speaker
@@ -537,14 +536,24 @@ script:
         - condition: template
           value_template: >
             {% set current = state_attr('media_player.emma_bedroom_google_speaker','volume_level') | float %}
-            {% set expected = states('sensor.emma_bedroom_google_speaker_volume') | float %}
-            {{ current != expected }}
+            {% set night = states('input_number.emma_bedroom_google_speaker_night_volume') | float %}
+            {% set day = states('input_number.emma_bedroom_google_speaker_day_volume') | float %}
+            {% if is_state('input_boolean.give_me_darkness','on') %}
+              {{ current != night }}
+            {% else %}
+              {{ current != day }}
+            {% endif %}
         then:
         - service: media_player.volume_set
           target:
             entity_id: media_player.emma_bedroom_google_speaker
           data:
-            volume_level: "{{ states('sensor.kallen_bedroom_google_speaker_volume') }}"
+            volume_level: >
+              {% if is_state('input_boolean.give_me_darkness','on') %}
+                {{ states('input_number.emma_bedroom_google_speaker_night_volume') }}
+              {% else %}
+                {{ states('input_number.emma_bedroom_google_speaker_day_volume') }}
+              {% endif %}
       - service: media_player.volume_mute
         target:
           entity_id: media_player.emma_bedroom_google_speaker
@@ -1228,9 +1237,11 @@ script:
       data:
         message: >
           <voice name="{{ voice }}">
+          <amazon:auto-breaths>
           <prosody rate="fast">
           {{ message }}
           </prosody>
+          </amazon:auto-breaths>
           </voice>
         target: >
           {% if who in ['living_room_echo_dot', 'media_player.living_room_echo_dot','living_room'] %}
@@ -1317,34 +1328,53 @@ script:
             media_player.basement_google_speaker
           {% endif %}
         volume_level: >-
-          {% set numbers = [
-            states.sensor.emma_bedroom_google_speaker_volume.state,
-            states.sensor.kallen_bedroom_google_speaker_volume.state
+          {% set numbers_night = [
+            states.input_number.emma_bedroom_google_speaker_night_volume.state,
+            states.input_number.kallen_bedroom_google_speaker_night_volume.state
           ] %}
-          {% set kidsgroup = numbers | list | min | float %}
+          {% set numbers_day = [
+            states.input_number.emma_bedroom_google_speaker_day_volume.state,
+            states.input_number.kallen_bedroom_google_speaker_day_volume.state
+          ] %}
+          {% set kidsgroup_night = numbers_night | list | min | float %}
+          {% set kidsgroup_day = numbers_day | list | max | float %}
           {% if type in ['critical'] %}
             1.0
+          {% elif is_state('input_boolean.give_me_darkness','on') %}
+            {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %}
+              {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %}
+                {{ states('input_number.kallen_bedroom_google_speaker_night_volume') }}
+              {% elif is_state('input_boolean.kallen_sleeping','on') and is_state('input_boolean.emma_sleeping','off') %}
+                {{ states('input_number.emma_bedroom_google_speaker_night_volume') }}
+              {% else %}
+                {{ kidsgroup_night }}
+              {% endif %}
+            {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+              {{ states('input_number.kallen_bedroom_google_speaker_night_volume') }}
+            {% elif who in ['emma_bedroom','media_player.emma_bedroom_google_speaker'] %}
+              {{ states('input_number.emma_bedroom_google_speaker_night_volume') }}
+            {% elif who in ['Basement Google','basement_google'] %}
+              {{ states('input_number.basement_google_speaker_night_volume') }}
+            {% else %}
+              0.3
+            {% endif %}
           {% else %}
             {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %}
               {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %}
-                {{ states('sensor.kallen_bedroom_google_speaker_volume') }}
+                {{ states('input_number.kallen_bedroom_google_speaker_day_volume') }}
               {% elif is_state('input_boolean.kallen_sleeping','on') and is_state('input_boolean.emma_sleeping','off') %}
-                {{ states('sensor.emma_bedroom_google_speaker_volume') }}
+                {{ states('input_number.emma_bedroom_google_speaker_day_volume') }}
               {% else %}
-                {{ kidsgroup }}
+                {{ kidsgroup_day }}
               {% endif %}
             {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
-              {{ states('sensor.kallen_bedroom_google_speaker_volume') }}
+              {{ states('input_number.kallen_bedroom_google_speaker_day_volume') }}
             {% elif who in ['emma_bedroom','media_player.emma_bedroom_google_speaker'] %}
-              {{ states('sensor.emma_bedroom_google_speaker_volume') }}
+              {{ states('input_number.emma_bedroom_google_speaker_day_volume') }}
             {% elif who in ['Basement Google','basement_google'] %}
-              {{ states('sensor.basement_google_speaker_volume') }}
+              {{ states('input_number.basement_google_speaker_day_volume') }}
             {% else %}
-              {% if is_state('input_boolean.give_me_darkness','on') %}
-                0.3
-              {% else %}
-                0.6
-              {% endif %}
+              0.6
             {% endif %}
           {% endif %}
     - service: tts.amazon_polly_say

packages/powercalc.yaml

@@ -17,8 +17,8 @@ sensor:
     entity_id: switch.tina_desktop
     power_sensor_id: sensor.tina_desktop_power
   - platform: powercalc
-    entity_id: switch.emma_bedroom_aircon
-    power_sensor_id: sensor.emma_bedroom_aircon_power
+    entity_id: fan.emma_air_conditioner
+    power_sensor_id: sensor.emma_air_conditioner_power
   - platform: powercalc
     entity_id: switch.master_bedroom_aircon
     power_sensor_id: sensor.master_bedroom_aircon_power

packages/presence.yaml

@@ -613,6 +613,7 @@ automation:
               target:
                 entity_id:
                   - fan.kallen_bedroom_fan
+                  - fan.emma_air_conditioner
           - service: button.press
             target:
               entity_id: button.master_bedroom_climate_reset

packages/scheduling.yaml

@@ -418,14 +418,21 @@ script:
           entity_id: input_datetime.daily_briefing
           data:
             time: >
-              {% if is_state('input_boolean.kallen_school_today','off') and is_state('input_boolean.work_today','on') %}
+              {% from 'time.jinja' import time_from_calendar %}
+              {% if is_state('input_boolean.kallen_school_today','on') %}
+                {% if is_state('input_boolean.kallen_alternate_pickup','on') or is_state('input_boolean.kallen_btb','on') %}
+                  15:30
+                {% else %}
+                  {{ time_from_calendar('calendar.kallen_school_days','end_time','set','subtract',1) }}
+                {% endif %}
+              {% elif is_state('input_boolean.kallen_school_today','off') and is_state('input_boolean.work_today','off') %}
+                15:30
+              {% else %}
                 {% if (state_attr('input_datetime.tina_workday_end','timestamp')) > 61200 %}
                   16:00
                 {% else %}
                   {{ (state_attr('input_datetime.tina_workday_end', 'timestamp') + 3600) | timestamp_custom('%H:%M', false) }}
                 {% endif %}
-              {% else %}
-                15:30
               {% endif %}
       - if:
         - condition: state
@@ -554,7 +561,18 @@ script:
         - service: input_datetime.set_datetime
           entity_id: input_datetime.master_bedroom_wakeup
           data:
-            time: "16:30"
+            time: >
+              {% if is_state('input_boolean.kallen_school_today','on') %}
+                {% if is_state('input_boolean.kallen_alternate_pickup','on') or is_state('input_boolean.kallen_btb','on') %}
+                  16:30
+                {% elif is_state('input_boolean.kallen_school_early_release','on') %}
+                  12:30
+                {% else %}
+                  13:00
+                {% endif %}
+              {% else %}
+                16:30
+              {% endif %}
       - delay:
           milliseconds: 500
       - service: input_datetime.set_datetime
@@ -600,25 +618,20 @@ script:
           data:
             time: >
               {% set low = states('sensor.overnight_lowest_temperature') | int %}
-              {% set high = states('sensor.todays_high_temp') | int %}
               {% set kallen_bedtime = state_attr('input_datetime.kallen_bedtime','timestamp') | int %}
-              {% set cutoff = 81000 %} {# Cutoff time is 22:30 #}
-              {% if is_state('binary_sensor.kallen_school_tomorrow','on') %}
-                {% if is_state('input_boolean.hot_day','on') %}
-                  {{ (kallen_bedtime - 3600) | timestamp_custom('%H:%M',false) }}
-                {% elif low >= 56 or high >= 75 %}
-                  {{ (kallen_bedtime - 1800) | timestamp_custom('%H:%M',false) }}
-                {% else %}
-                  {{ kallen_bedtime | timestamp_custom('%H:%M',false) }}
-                {% endif %}
-              {% elif low > 60 or high > 74 %}
+              {% set cutoff = 81000 %}
+              {% if is_state('input_boolean.hot_day','on') and is_state('binary_sensor.kallen_school_tomorrow','on') %}
+                {{ (kallen_bedtime - 3600) | timestamp_custom('%H:%M',false) }}
+              {% elif is_state('input_boolean.hot_day','on') and is_state('binary_sensor.kallen_school_tomorrow','off') %}
+                {{ kallen_bedtime | timestamp_custom('%H:%M',false) }}
+              {% elif 56 <= low <= 60 %}
+                22:30
+              {% elif low > 60 %}
                 {% if kallen_bedtime < cutoff %}
                   {{ kallen_bedtime | timestamp_custom('%H:%M',false) }}
                 {% else %}
-                  22:00
+                  21:30
                 {% endif %}
-              {% elif 56 <= low <= 60 %}
-                22:30
               {% else %}
                 00:00
               {% endif %}
@@ -629,11 +642,11 @@ script:
               {% set low = states('sensor.overnight_lowest_temperature') | int %}
               {% set high = states('sensor.todays_high_temp') | int %}
               {% if low > 60 or is_state('input_boolean.hot_day','on') %}
-                01:00
+                00:00
               {% elif 50 <= low <= 60 %}
-                02:00
+                01:00
               {% elif low >= states('input_number.master_bedroom_fan_threshold') | int and high > 60 %}
-                03:00
+                02:00
               {% else %}
                 06:00
               {% endif %}
@@ -719,16 +732,11 @@ script:
             entity_id: input_select.scheduled_climate_mode_emma_bedroom
           data:
             option: >
-              {% set low = states('sensor.overnight_lowest_temperature') | int %}
-              {% set run_threshold = states('input_number.emma_bedroom_aircon_run_threshold') | int %}
-              {% set mode_threshold = states('input_number.emma_bedroom_aircon_mode_threshold') | int %}
-              {% if is_state('input_boolean.emma_bedroom_aircon_installed','off') %}
-                White Noise
-              {% elif low >= run_threshold %}
-                {% if low >= mode_threshold %}
+              {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') %}
+                {% if (states('sensor.overnight_lowest_temperature') | int) >= (states('input_number.emma_aircon_threshold') | int) %}
                   AC
                 {% else %}
-                  Fan
+                  White Noise
                 {% endif %}
               {% else %}
                 White Noise
@@ -742,11 +750,11 @@ script:
               {% set low = states('sensor.overnight_lowest_temperature') | int %}
               {% set bedtime = state_attr('input_datetime.emma_bedtime','timestamp') | int %}
               {% if is_state('input_boolean.hot_day','on') %}
-                {{ (bedtime - 5400) | timestamp_custom('%H:%M',false) }}
+                {{ (bedtime - 7200) | timestamp_custom('%H:%M',false) }}
               {% elif high >= 80 or low >= 60 %}
-                {{ (bedtime - 3600) | timestamp_custom('%H:%M',false) }}
+                {{ (bedtime - 5400) | timestamp_custom('%H:%M',false) }}
               {% else %}
-                {{ (bedtime - 1800) | timestamp_custom('%H:%M',false) }}
+                {{ (bedtime - 3600) | timestamp_custom('%H:%M',false) }}
               {% endif %}
       - service: input_boolean.turn_on
         target:

packages/sports.yaml

@@ -106,7 +106,7 @@ template:
       unique_id: 2987ae95-f55d-4994-b9dd-018278d2f5ad
       state: >
         {% from 'sports.jinja' import sports_inhibit %}
-        {{ sports_inhibit('sensor.minnesota_twins') }}
+        {{ state_attr('sensor.minnesota_twins','opponent_abbr') in ['CLE','LAD'] or sports_inhibit('sensor.minnesota_twins') }}
     - name: Minnesota Twins Event Today
       unique_id: 30055cb3-d259-4cef-90e1-7dea0a5cb439
       state: >
@@ -116,7 +116,7 @@ template:
       unique_id: b0980d47-d762-4f23-97b1-9e88da729d8f
       state: >
         {% from 'sports.jinja' import sports_inhibit %}
-        {{ state_attr('sensor.cleveland_guardians','opponent_abbr') in ['MIN','LAD'] or sports_inhibit('sensor.cleveland_guardians') }}
+        {{ sports_inhibit('sensor.cleveland_guardians') }}
     - name: Cleveland Guardians Event Today
       unique_id: 985a7b2c-9ebd-4a2e-8ee2-2ab5359310e0
       state: >
@@ -126,7 +126,7 @@ template:
       unique_id: 2c6aae6e-eff6-46e5-bee9-311f9bbc0c0e
       state: >
         {% from 'sports.jinja' import sports_inhibit %}
-        {{ state_attr('sensor.los_angeles_dodgers','opponent_abbr') in ['MIN'] or sports_inhibit('sensor.los_angeles_dodgers') }}
+        {{ state_attr('sensor.los_angeles_dodgers','opponent_abbr') in ['CLE'] or sports_inhibit('sensor.los_angeles_dodgers') }}
     - name: Los Angeles Dodgers Event Today
       unique_id: 7c2bd060-ea2c-4b81-8af7-3e6b9b3c639d
       state: >

packages/sysmon.yaml

@@ -63,25 +63,25 @@ template:
   - binary_sensor:
     - name: Tony Desktop On
       unique_id: 82ce673a-96ad-4af5-a8d1-be9ca9fa9c36
-      state: "{{ states('sensor.tony_desktop_power') | int > 25 }}"
+      state: "{{ states('sensor.tony_desktop_power') | int > 10 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.tony_desktop_power') | int }}W"
     - name: Tina Desktop On
       unique_id: 8484dbd4-2fae-4368-a4bc-d1bdc09e003f
-      state: "{{ states('sensor.tina_desktop_power') | int > 25 }}"
+      state: "{{ states('sensor.tina_desktop_power') | int > 10 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.tina_desktop_power') | int }}W"
     - name: Kallen Desktop On
       unique_id: ccc25d75-4915-449d-9b2e-09ad14ffac29
-      state: "{{ states('sensor.kallen_desktop_power') | int > 25 }}"
+      state: "{{ states('sensor.kallen_desktop_power') | int > 10 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.kallen_desktop_power') | int }}W"
     - name: Basement Server On
       unique_id: e6df7d98-d3ba-4e01-bae2-2ebafc8d78d6
-      state: "{{ states('sensor.basement_server_power') | int > 25 }}"
+      state: "{{ states('sensor.basement_server_power') | int > 10 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.basement_server_power') | int }}W"

readme.md

@@ -2,9 +2,11 @@ # Tony's Home Assistant Configs
 
 Just a place to track my work on my personal Home Assistant configuration, and learn as I go. Maybe also TRY to keep myself a little bit more organized ;)
 
-## Node-RED flows
+## New location for Node-RED flows
 
-My Node-RED flows can be found at [HA-NerdFlows](https://gitea.nerdhomeinc.com/home_automation/HA-NerdFlows). Additionally, code used in function nodes in my Node-RED flows can be found at [HA-NerdFlows-Functions](https://gitea.nerdhomeinc.com/home_automation/HA-NerdFlows-Functions).
+I have recently started using the Node-RED Projects feature, which makes version control for my flows a LOT easier than it was before.
+
+With this change, the Node-RED flows are now in their own repo. They can be found at [HA-NerdFlows](https://github.com/tm24fan8/HA-NerdFlows).
 
 ## Attributions
 
@@ -32,6 +34,7 @@ ## HACS Components
 - [Node-RED Companion](https://github.com/zachowj/hass-node-red)
 - [Holidays](https://github.com/bruxy70/Holidays)
 - [Twitch Helix](https://github.com/Radioh/ha_twitch_helix)
+- [Local Tuya](https://github.com/rospogrigio/localtuya)
 - [Pirate Weather](https://github.com/alexander0042/pirate-weather-ha)
 - [Holidays](https://github.com/bruxy70/Holidays)
 - [Thermal Comfort](https://github.com/dolezsa/thermal_comfort)
@@ -39,7 +42,7 @@ ## HACS Components
 - [HASS.Agent Media Player](https://github.com/LAB02-Research/HASS.Agent-MediaPlayer)
 - [Music Assistant](https://github.com/music-assistant/hass-music-assistant)
 - [Blitzortung Lightning Detector](https://github.com/mrk-its/homeassistant-blitzortung)
-- [Midea Air Conditioning](https://github.com/wuwentao/midea_ac_lan)
+- [Midea Air Conditioning](https://github.com/mill1000/midea-ac-py)
 - [WeatherAPI](https://github.com/iprak/weatherapi)
 - [Browser Mod](https://github.com/thomasloven/hass-browser_mod)
 - [Watchman](https://github.com/dummylabs/thewatchman)
@@ -47,6 +50,7 @@ ## HACS Components
 - [PyScript](https://github.com/custom-components/pyscript)
 - [Hass Animated Scenes](https://github.com/chazzu/hass-animated-scenes)
 - [Jokes](https://github.com/LaggAt/ha-jokes)
+- [Google Photos](https://github.com/Daanoz/ha-google-photos)
 - [Uptime Kuma](https://github.com/meichthys/uptime_kuma)
 - [Jellyfin](https://github.com/koying/jellyfin_ha)
 - [Sonoff LAN](https://github.com/AlexxIT/SonoffLAN)
@@ -54,9 +58,6 @@ ## HACS Components
 - [Govee LAN Control](https://github.com/wez/govee-lan-hass)
 - [Discord Game](https://github.com/LordBoos/discord_game)
 - [Versatile Thermostat](https://github.com/jmcollin78/versatile_thermostat)
-- [GasBuddy](https://github.com/firstof9/ha-gasbuddy)
-- [Union Pacific Big Boy Tracker](https://github.com/jheizer/up_4014_tracker)
-- [WeatherFlow Forecast](https://github.com/briis/weatherflow_forecast)
 
 </details>
 
@@ -69,19 +70,22 @@ ## HACS Lovelace Cards
 
 - [Bubble Card](https://github.com/Clooos/Bubble-Card) Backbone of the new mobile dashboard
 - [Config Template Card](https://github.com/iantrich/config-template-card)
-- [Streamline Card](https://github.com/brunosabot/streamline-card)
+- [Decluttering Card](https://github.com/custom-cards/decluttering-card)
+- [Card Tools](https://github.com/thomasloven/lovelace-card-tools) (required for various other cards)
 - [Layout Card](https://github.com/thomasloven/lovelace-layout-card)
 - [Scheduler Card](https://github.com/nielsfaber/scheduler-card) (required for Scheduler component)
 - [Horizon Card](https://github.com/rejuvenate/lovelace-horizon-card)
 - [Lovelace Home Feed Card](https://github.com/gadgetchnnel/lovelace-home-feed-card)
 - [Mini Graph Card](https://github.com/kalkih/mini-graph-card)
 - [Battery State Card](https://github.com/maxwroc/battery-state-card)
+- [Compass Card](https://github.com/tomvanswam/compass-card)
 - [Flipdown Timer Card](https://github.com/pmongloid/flipdown-timer-card)
 - [Atomic Calendar Revive](https://github.com/totaldebug/atomic-calendar-revive)
 - [Plotly Graph Card](https://github.com/dbuezas/lovelace-plotly-graph-card)
 - [Mushroom](https://github.com/piitaya/lovelace-mushroom)
 - [Apexcharts Card](https://github.com/RomRider/apexcharts-card)
 - [Auto Entities Card](https://github.com/thomasloven/lovelace-auto-entities)
+- [Slider Button Card](https://github.com/custom-cards/slider-button-card)
 - [Weather Radar Card](https://github.com/Makin-Things/weather-radar-card)
 - [Stack In Card](https://github.com/custom-cards/stack-in-card)
 - [Paper Buttons Row](https://github.com/jcwillox/lovelace-paper-buttons-row)
@@ -89,24 +93,32 @@ ## HACS Lovelace Cards
 - [Multiple Entity Row](https://github.com/benct/lovelace-multiple-entity-row)
 - [Weather Card](https://github.com/bramkragten/weather-card)
 - [Template Entity Row](https://github.com/thomasloven/lovelace-template-entity-row)
+- [Canvas Gauge Card](https://github.com/custom-cards/canvas-gauge-card)
+- [Datetime Card](https://github.com/a-p-z/datetime-card)
 - [Waze Travel Time](https://github.com/r-renato/ha-card-waze-travel-time)
 - [Fold Entity Row](https://github.com/thomasloven/lovelace-fold-entity-row)
+- [Slider Entity Row](https://github.com/thomasloven/lovelace-slider-entity-row)
 - [Room Card](https://github.com/marcokreeft87/room-card)
 - [Simple Thermostat Card](https://github.com/nervetattoo/simple-thermostat)
 - [Clock Weather Card](https://github.com/pkissling/clock-weather-card)
 - [Tabbed Card](https://github.com/kinghat/tabbed-card)
 - [HA Team Tracker Card](https://github.com/vasqued2/ha-teamtracker-card)
 - [Banner Card](https://github.com/nervetattoo/banner-card)
+- [Lovelace Lock Card](https://github.com/CyrisXD/love-lock-card)
 - [Card Templater](https://github.com/gadgetchnnel/lovelace-card-templater)
+- [Energy Overview Card](https://github.com/Sese-Schneider/ha-energy-overview-card)
 - [Button Card](https://github.com/custom-cards/button-card)
 - [Number Box Card](https://github.com/htmltiger/numberbox-card)
 - [Restriction Card](https://github.com/iantrich/restriction-card)
 - [Timer Bar Card](https://github.com/rianadon/timer-bar-card)
+- [Minimalistic Area Card](https://github.com/junalmeida/homeassistant-minimalistic-area-card)
 - [Sankey Chart Card](https://github.com/MindFreeze/ha-sankey-chart)
 - [Hourly Weather Card](https://github.com/decompil3d/lovelace-hourly-weather)
 - [Formula One Card](https://github.com/marcokreeft87/formulaone-card)
 - [UV Index Card](https://github.com/t1gr0u/uv-index-card)
+- [Github Flexi Card](https://github.com/maxwroc/github-flexi-card)
 - [Windrose Card](https://github.com/aukedejong/lovelace-windrose-card)
+- [Swipe Card](https://github.com/bramkragten/swipe-card)
 - [Meteoalarm Card](https://github.com/MrBartusek/MeteoalarmCard)
 - [Weather Chart Card](https://github.com/mlamberts78/weather-chart-card)
 - [Comfortable Environment Card](https://github.com/argaar/comfortable-environment-card)
@@ -123,16 +135,6 @@ ## AppDaemon Apps
 
 </details>
 
-## Custom Jinja2 Templates/Macros
-
-<details>
-<summary>Click here</summary>
-
-- [Easy Time](https://github.com/Petro31/easy-time-jinja)
-- [Relative Time](https://github.com/TheFes/relative-time-plus)
-
-</details>
-
 ## Themes/Icons
 
 <details>
@@ -144,6 +146,5 @@ ## Themes/Icons
 - [BHA Icon Pack](https://github.com/hulkhaugen/hass-bha-icons)
 - [Custom Icons Library](https://github.com/Mariusthvdb/custom-icons)
 - [FontAwesome](https://github.com/thomasloven/hass-fontawesome)
-- [Material Symbols](https://github.com/beecho01/material-symbols)
 
 </details>

scenes.yaml

@@ -1210,23 +1210,14 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - 'off'
+      - None
       - candle
       - fire
       - prism
-      - sparkle
-      - opal
-      - glisten
-      - underwater
-      - cosmos
-      - sunbeam
-      - enchant
-      - sunrise
-      - sunset
       supported_color_modes:
       - color_temp
       - xy
-      effect: 'off'
+      effect: None
       color_mode: xy
       brightness: 179
       color_temp_kelvin:
@@ -1253,23 +1244,14 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - 'off'
+      - None
       - candle
       - fire
       - prism
-      - sparkle
-      - opal
-      - glisten
-      - underwater
-      - cosmos
-      - sunbeam
-      - enchant
-      - sunrise
-      - sunset
       supported_color_modes:
       - color_temp
       - xy
-      effect: 'off'
+      effect: None
       color_mode: xy
       brightness: 255
       color_temp_kelvin:
@@ -1296,13 +1278,10 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - 'off'
+      - None
       - candle
       - fire
       - prism
-      - sparkle
-      - opal
-      - glisten
       supported_color_modes:
       - color_temp
       - xy
@@ -1363,23 +1342,14 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - 'off'
+      - None
       - candle
       - fire
       - prism
-      - sparkle
-      - opal
-      - glisten
-      - underwater
-      - cosmos
-      - sunbeam
-      - enchant
-      - sunrise
-      - sunset
       supported_color_modes:
       - color_temp
       - xy
-      effect: 'off'
+      effect: None
       color_mode: xy
       brightness: 255
       color_temp_kelvin:
@@ -1406,23 +1376,14 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - 'off'
+      - None
       - candle
       - fire
       - prism
-      - sparkle
-      - opal
-      - glisten
-      - underwater
-      - cosmos
-      - sunbeam
-      - enchant
-      - sunrise
-      - sunset
       supported_color_modes:
       - color_temp
       - xy
-      effect: 'off'
+      effect: None
       color_mode: xy
       brightness: 255
       color_temp_kelvin:
@@ -1480,17 +1441,14 @@
       min_mireds: 153
       max_mireds: 500
       effect_list:
-      - 'off'
+      - None
       - candle
       - fire
       - prism
-      - sparkle
-      - opal
-      - glisten
       supported_color_modes:
       - color_temp
       - xy
-      effect: 'off'
+      effect: None
       color_mode: xy
       brightness: 204
       color_temp_kelvin:

scripts.yaml

@@ -108,12 +108,27 @@ global_on:
 max_brightness:
   sequence:
   - alias: Turn off Adaptive Lighting and Motion Lighting
-    data: {}
-    target:
-      label_id:
-      - adaptive_lighting
-      - motion_lighting
-    action: switch.turn_off
+    parallel:
+    - service: automation.turn_off
+      metadata: {}
+      data:
+        stop_actions: true
+      target:
+        label_id: motion_lighting
+      alias: Automations
+    - alias: Switches
+      service: switch.turn_off
+      data: {}
+      target:
+        label_id:
+        - adaptive_lighting
+        - motion_lighting
+    - service: input_boolean.turn_off
+      metadata: {}
+      data: {}
+      target:
+        label_id: motion_lighting
+      alias: Input Booleans
   - delay:
       hours: 0
       minutes: 0
@@ -463,12 +478,26 @@ max_brightness_cleanup:
     target:
       entity_id: input_select.basement_studio_scenes
     alias: Set basement lights to adaptive
-  - service: switch.turn_on
-    metadata: {}
-    data: {}
-    target:
-      label_id: motion_lighting
-    alias: Turn on motion lighting
+  - alias: Turn on motion lighting
+    parallel:
+    - service: input_boolean.turn_on
+      metadata: {}
+      data: {}
+      target:
+        label_id: motion_lighting
+      alias: Input Booleans
+    - service: switch.turn_on
+      metadata: {}
+      data: {}
+      target:
+        label_id: motion_lighting
+      alias: Switches
+    - service: automation.turn_on
+      metadata: {}
+      data: {}
+      target:
+        label_id: motion_lighting
+      alias: Automations
   mode: single
   icon: mdi:broom
 cleanup_crash:
@@ -854,12 +883,6 @@ adaptive_on_first_floor:
 adaptive_on_second_floor:
   alias: Adaptive on Second Floor
   sequence:
-  - action: switch.turn_on
-    metadata: {}
-    data: {}
-    target:
-      entity_id: switch.adaptive_lighting_stairwell
-    alias: Turn on adaptive lighting in stairwell
   - if:
     - condition: state
       entity_id: light.hallway_overhead
@@ -1447,42 +1470,16 @@ evening_on_second_floor:
 goodnight_in_basement:
   alias: Goodnight in Basement
   sequence:
-  - target:
+  - service: light.turn_off
+    target:
       area_id:
       - basement_studio
       - furnace_room
     data: {}
-    action: light.turn_off
-    alias: Turn lights off
-  - target:
+  - service: fan.turn_off
+    target:
       entity_id: fan.basement_fan
     data: {}
-    action: fan.turn_off
-    alias: Turn fan off
-  - delay:
-      hours: 0
-      minutes: 0
-      seconds: 3
-      milliseconds: 0
-  - action: switch.turn_off
-    metadata: {}
-    data: {}
-    target:
-      entity_id: switch.adaptive_lighting_sleep_mode_basement_studio
-    alias: Turn off sleep mode
-  - action: switch.turn_on
-    metadata: {}
-    data: {}
-    target:
-      entity_id: switch.adaptive_lighting_basement_studio
-    alias: Turn on adaptive lighting
-  - action: input_text.set_value
-    metadata: {}
-    data:
-      value: Adaptive
-    target:
-      entity_id: input_text.basement_studio_selected_scene
-    alias: Reset selected scene text
 goodnight_on_first_floor:
   alias: Goodnight on First Floor
   sequence:
@@ -1576,14 +1573,14 @@ day_mode_in_tina_desk:
   alias: Day Mode in Tina Desk
   sequence:
   - parallel:
-    - target:
+    - service: light.turn_on
+      target:
         entity_id: light.tina_lamp_top
       data: {}
-      action: light.turn_on
-    - target:
+    - service: light.turn_off
+      target:
         entity_id: light.tina_lamp_side
       data: {}
-      action: light.turn_off
   - wait_template: '{{ is_state(''light.tina_lamp_side'',''off'') }}'
     timeout:
       seconds: 15
@@ -1593,57 +1590,52 @@ day_mode_in_tina_desk:
     - condition: state
       entity_id: switch.adaptive_lighting_tina_lamp
       state: 'off'
-      alias: If adaptive lighting is off
+      alias: If switch is off
     then:
-    - alias: Turn on adaptive lighting
+    - service: switch.turn_on
       data: {}
       target:
-        entity_id:
-        - switch.adaptive_lighting_tina_lamp
-        - switch.adaptive_lighting_adapt_brightness_tina_lamp
-        - switch.adaptive_lighting_adapt_color_tina_lamp
-      action: switch.turn_on
+        entity_id: switch.adaptive_lighting_tina_lamp
+      alias: Turn on the switch
     else:
     - alias: Apply adaptive lighting
+      service: adaptive_lighting.apply
       data:
         entity_id: switch.adaptive_lighting_tina_lamp
         adapt_brightness: true
         adapt_color: true
-      action: adaptive_lighting.apply
   mode: restart
   icon: mdi:palette
 evening_mode_in_tina_desk:
   alias: Evening Mode in Tina Desk
   sequence:
   - alias: Turn on lamp
+    service: light.turn_on
     data: {}
     target:
       entity_id:
       - light.tina_lamp_top
       - light.tina_lamp_side
-    action: light.turn_on
   - alias: Apply adaptive lighting to lamp
     if:
     - condition: state
       entity_id: switch.adaptive_lighting_tina_lamp
       state: 'off'
-      alias: If adaptive lighting is off
+      alias: If switch is off
     then:
-    - alias: Turn on adaptive lighting
+    - service: switch.turn_on
       data: {}
       target:
-        entity_id:
-        - switch.adaptive_lighting_tina_lamp
-        - switch.adaptive_lighting_adapt_brightness_tina_lamp
-        - switch.adaptive_lighting_adapt_color_tina_lamp
-      action: switch.turn_on
+        entity_id: switch.adaptive_lighting_tina_lamp
+      alias: Turn on the switch
     else:
-    - alias: Apply adaptive lighting
+    - service: adaptive_lighting.apply
       data:
         entity_id: switch.adaptive_lighting_tina_lamp
         adapt_brightness: true
         adapt_color: true
-      action: adaptive_lighting.apply
+        turn_on_lights: true
+      alias: Apply adaptive lighting
   mode: restart
   icon: mdi:palette
 night_mode_in_tina_desk:
@@ -2513,26 +2505,25 @@ kallen_morning_meds:
 kallen_night_meds:
   alias: Kallen Night Meds
   sequence:
-  - alias: Increment night reminder counter
+  - service: counter.increment
     metadata: {}
     data: {}
-    action: counter.increment
-    target:
-      entity_id: counter.kallen_night_meds_reminder_count
-  - data:
+    alias: Increment night reminder counter
+  - service: script.text_notify
+    data:
       type: alert
       who: all
       message: clear_notification
       tag: kallen-night-meds
     alias: Clear previous night notification
-    action: script.text_notify
   - delay:
       hours: 0
       minutes: 0
       seconds: 5
       milliseconds: 0
   - parallel:
-    - data:
+    - service: script.text_notify
+      data:
         who: "{% if states('person.christina_stork') in ['Bob Evans','BobEvans'] %}\n
           \ tony\n{% else %}\n  parents\n{% endif %}\n"
         type: alert
@@ -2545,8 +2536,8 @@ kallen_night_meds:
         - action: KALLEN_NIGHT_MEDS_SKIPPED
           title: Skip
       alias: Send to parents
-      action: script.text_notify
     - alias: Send to Kallen
+      service: script.text_notify
       data:
         who: kallen
         type: alert
@@ -2558,7 +2549,6 @@ kallen_night_meds:
           title: Taken
         - action: KALLEN_NIGHT_MEDS_SKIPPED
           title: Skip
-      action: script.text_notify
     alias: Send text notifications
   icon: mdi:medication
   mode: restart
@@ -3011,33 +3001,69 @@ emma_sleep:
       option: Adaptive
     alias: Set lights to adaptive
     action: input_select.select_option
-  - if:
-    - alias: White Noise
-      condition: and
-      conditions:
-      - condition: state
-        entity_id: input_select.scheduled_climate_mode_emma_bedroom
-        state: White Noise
-        alias: Scheduled mode is White Noise
-      - condition: state
-        entity_id: input_boolean.white_noise_emma_bedroom
-        state: 'off'
-        alias: White Noise is not already on
-    then:
-    - target:
-        entity_id: input_boolean.white_noise_emma_bedroom
-      data: {}
-      alias: Turn on white noise
-      action: input_boolean.turn_on
+  - alias: Select climate mode
+    choose:
+    - conditions:
+      - alias: AC
+        condition: and
+        conditions:
+        - condition: state
+          entity_id: input_select.scheduled_climate_mode_emma_bedroom
+          state: AC
+          alias: Scheduled mode is AC
+        - condition: state
+          entity_id: fan.emma_air_conditioner
+          state: 'off'
+          alias: Air conditioner is not already on
+      sequence:
+      - target:
+          entity_id: fan.emma_air_conditioner
+        data: {}
+        alias: Turn on air conditioner
+        action: fan.turn_on
+      - data:
+          who: parents
+          title: Emma Climate Schedule
+          message: The air conditioner in Emma's Bedroom has been activated.
+          type: normal
+          tag: emma-climate
+        alias: Send AC notification
+        action: script.text_notify
+    - conditions:
+      - alias: White Noise
+        condition: and
+        conditions:
+        - condition: state
+          entity_id: input_select.scheduled_climate_mode_emma_bedroom
+          state: White Noise
+          alias: Scheduled mode is White Noise
+        - condition: state
+          entity_id: input_boolean.white_noise_emma_bedroom
+          state: 'off'
+          alias: White Noise is not already on
+      sequence:
+      - target:
+          entity_id: input_boolean.white_noise_emma_bedroom
+        data: {}
+        alias: Turn on white noise
+        action: input_boolean.turn_on
+      - data:
+          who: parents
+          title: Emma Climate Schedule
+          message: White noise has been activated in Emma's Bedroom.
+          type: normal
+          tag: emma-climate
+        alias: Send white noise notification
+        action: script.text_notify
+    default:
     - data:
         who: parents
         title: Emma Climate Schedule
-        message: White noise has been activated in Emma's Bedroom.
+        message: No option selected for Emma's climate mode. No devices will be activated.
         type: normal
         tag: emma-climate
-      alias: Send white noise notification
+      alias: Send notification that no climate mode is selected
       action: script.text_notify
-    alias: Select climate mode
   icon: mdi:lightbulb-night
   mode: restart
 tina_morning_meds:
@@ -3564,41 +3590,3 @@ tina_tylenol:
   icon: mdi:medication
   max: 10
   description: ''
-reading_mode_in_tina_desk:
-  sequence:
-  - action: switch.turn_off
-    metadata: {}
-    data: {}
-    target:
-      entity_id: switch.adaptive_lighting_adapt_brightness_tina_lamp
-    alias: Turn off adaptive brightness, leave adaptive color on
-  - alias: Turn on lamp
-    action: light.turn_on
-    metadata: {}
-    data:
-      brightness_pct: 100
-    target:
-      entity_id: light.tina_desk_lights
-  - alias: Apply adaptive lighting to lamp
-    if:
-    - condition: state
-      entity_id: switch.adaptive_lighting_tina_lamp
-      state: 'off'
-      alias: If switch is off
-    then:
-    - data: {}
-      target:
-        entity_id: switch.adaptive_lighting_tina_lamp
-      alias: Turn on the switch
-      action: switch.turn_on
-    else:
-    - alias: Apply adaptive lighting
-      data:
-        entity_id: switch.adaptive_lighting_tina_lamp
-        adapt_color: true
-        turn_on_lights: true
-        adapt_brightness: false
-      action: adaptive_lighting.apply
-  alias: Reading Mode in Tina Desk
-  description: ''
-  icon: mdi:palette

sensors/house_stats.yaml

@@ -168,7 +168,7 @@
     unit_of_measurement: ''
     state: >-
       {% set compressors = [
-        states.binary_sensor.emma_bedroom_aircon_compressor,
+        states.binary_sensor.emma_aircon_compressor,
         states.binary_sensor.master_bedroom_aircon_compressor
       ] %}
       {{ compressors | selectattr('state','eq','on') | list | count | int }}
@@ -177,7 +177,7 @@
     unit_of_measurement: ''
     state: >-
       {% set fans = [
-        states.binary_sensor.emma_bedroom_aircon_fan,
+        states.binary_sensor.emma_aircon_fan,
         states.binary_sensor.master_bedroom_aircon_fan
       ] %}
       {{ fans | selectattr('state','eq','on') | list | count | int }}
@@ -196,7 +196,11 @@
     unit_of_measurement: ''
     state: >-
       {% set climate = states.climate | selectattr('state','ne','off') | rejectattr('state','eq','unavailable') | rejectattr('state','eq','unknown') | list | count | int %}
-      {{ climate | int }}
+      {% set fans = [
+        states.fan.emma_air_conditioner
+      ] %}
+      {% set fans_on = fans | selectattr('state','eq','on') | list | count | int %}
+      {{ climate + fans_on | int }}
   - name: Climate Devices Running
     unique_id: 3c61c756-2934-4294-8085-7d3855b692dd
     unit_of_measurement: ''

templates/speech/kallen_morning_briefing.yaml

@@ -98,7 +98,12 @@
           {% endif %}
           {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
             Today, you will be picked up from school by {{ states('input_text.kallen_pickup') }}.
+          {% elif is_state('input_boolean.work_today','off') %}
+            Today, you will be picked up from school by your parents.
+          {% else %}
+            Today, you will be picked up from school by your dad.
           {% endif %}
+          <s>Pickup today will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') }}</s>
           {% if count_the_days('input_datetime.school_last_day') | int == 0 -%}
             But today is the last day of School! 
           {%- endif %}

templates/speech/nightly_briefing.yaml

@@ -71,13 +71,9 @@
       {% else %}
         "Collin's room will be left alone, as he is spending the night elsewhere tonight. "
       {% endif %}
-      {% if states('input_select.scheduled_climate_mode_emma_bedroom_aircon') != 'N/A' %}
-        {% if is_state('input_select.scheduled_climate_mode_emma_bedroom_aircon','AC') and is_state('input_boolean.hot_day','on') %}
-          "Today was a hot day, so Emma's bedroom air conditioner will start cooling a bit earlier tonight at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
-        {% elif is_state('input_select.scheduled_climate_mode_emma_bedroom_aircon','AC') %}
-          "Emma's bedroom air conditioner will start cooling at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
-        {% elif is_state('input_select.scheduled_climate_mode_emma_bedroom_aircon','Fan') %}
-          "Emma's bedroom air conditioner will activate fan only mode at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
+      {% if states('input_select.scheduled_climate_mode_emma_bedroom') != 'N/A' %}
+        {% if is_state('input_select.scheduled_climate_mode_emma_bedroom','AC') and is_state('fan.emma_air_conditioner','off') %}
+          "Emma's air conditioner will be activated at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
         {% elif is_state('input_select.scheduled_climate_mode_emma_bedroom','White Noise') and is_state('input_boolean.white_noise_emma_bedroom','off') %}
           "Emma's white noise generator will activate at {{ input_datetime_read('input_datetime.emma_bedtime') }}. "
         {% endif %}

templates/speech/welcome_home.yaml

@@ -91,21 +91,8 @@
               {% endif %}
             {% endif %}
         {% endif %}
-        {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') %}
-          "the temperature in Emma's bedroom is {{ states('sensor.emma_bedroom_temperature') | int }} degrees. "
-            {% if not is_state('climate.emma_bedroom_aircon','off') %}
-              {% if is_state('climate.emma_bedroom_aircon','cool') %}
-                "and Emma's bedroom air conditioner is set for cooling to {{ state_attr('climate.emma_bedroom_aircon','temperature') }} degrees. "
-              {% elif is_state('climate.emma_bedroom_aircon','fan_only') %}
-                "and Emma's bedroom air conditioner is in fan only mode. "
-              {% elif is_state('climate.emma_bedroom_aircon','dry') %}
-                "and Emma's bedroom air conditioner is moonlighting as a dehumidifier. "
-              {% elif is_state('climate.emma_bedroom_aircon','auto') %}
-                "and Emma's bedroom air conditioner is making its own decisions. Be afraid, be very afraid. "
-              {% else %}
-                "and Emma's bedroom air conditioner is currently not speaking to me. Was it something I said? "
-              {% endif %}
-            {% endif %}
+        {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') and is_state('fan.emma_air_conditioner','on') %}
+          "Emma's air conditioner is {{ states('fan.emma_air_conditioner') }}. "
         {% endif %}
       {% endif %}
     </p>
@@ -128,7 +115,7 @@
         "Tina has work today. "
       {% endif %}
       {% if is_state('input_boolean.kallen_at_school','on') %}
-        "Collin is at school right now. His school day ends at {{ input_datetime_read('input_datetime.kallen_school_day_end') }}. "
+        "Collin is at school right now. His pickup time will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') }}. "
       {% elif is_state('input_boolean.kallen_school_today','on') %}
         "Collin has school today. "
       {% endif %}