diff --git a/config/automation/dark_rainy_day.yaml b/config/automation/dark_rainy_day.yaml
index 3ab93019..038554b0 100755
--- a/config/automation/dark_rainy_day.yaml
+++ b/config/automation/dark_rainy_day.yaml
@@ -56,7 +56,7 @@
           - light.living_room_lights
           - light.living_room_accents
         brightness: 255
-        kelvin: 5500
+        color_temp_kelvin: 5500
 
     - service: script.speech_engine
       data:
diff --git a/config/automation/living_room_color_defaults.yaml b/config/automation/living_room_color_defaults.yaml
index 74d5b0e0..5fa43708 100644
--- a/config/automation/living_room_color_defaults.yaml
+++ b/config/automation/living_room_color_defaults.yaml
@@ -36,14 +36,14 @@
               target:
                 entity_id: light.living_room_lights
               data:
-                kelvin: 5500
+                color_temp_kelvin: 5500
                 brightness: 255
       default:
         - service: light.turn_on
           target:
             entity_id: light.living_room_lights
           data:
-            kelvin: 2700
+            color_temp_kelvin: 2700
             brightness: 200
 
 - alias: 'Restore Living Room After Entry Secured'
@@ -71,29 +71,29 @@
               state: 'above_horizon'
           sequence:
             - service: light.turn_on
-              target:
-                entity_id: light.living_room_lights
-              data:
-                kelvin: 5500
-                brightness: 255
+            target:
+              entity_id: light.living_room_lights
+            data:
+              color_temp_kelvin: 5500
+              brightness: 255
             - service: light.turn_on
               target:
                 entity_id: light.living_room_accents
               data:
-                kelvin: 5500
+                color_temp_kelvin: 5500
                 brightness: 200
       default:
         - service: light.turn_on
           target:
             entity_id: light.living_room_lights
           data:
-            kelvin: 2700
+            color_temp_kelvin: 2700
             brightness: 200
         - service: light.turn_on
           target:
             entity_id: light.living_room_accents
           data:
-            kelvin: 2700
+            color_temp_kelvin: 2700
             brightness: 170
 
 - alias: 'Living Room Red on Entry/Garage Open'
diff --git a/config/packages/glances.yaml b/config/packages/glances.yaml
index 79336e23..2f6aaf0b 100755
--- a/config/packages/glances.yaml
+++ b/config/packages/glances.yaml
@@ -40,7 +40,7 @@ automation:
     id: proxmox-garage-high-temp-warning-automation
     trigger:
       - platform: numeric_state
-        entity_id: sensor.proxmox_garage_avg_temp
+        entity_id: sensor.proxmox_garage_average_temperature
         above: 145  # Adjust threshold as needed
     action:
       - service: script.notify_engine
diff --git a/config/packages/stats.yaml b/config/packages/stats.yaml
index ccd73f99..f4b3c6bf 100755
--- a/config/packages/stats.yaml
+++ b/config/packages/stats.yaml
@@ -122,15 +122,7 @@ template:
         unit_of_measurement: "count"
         icon: mdi:binary-sensor
         state: >-
-           {% set lights = states.light | selectattr('state', 'eq', 'on') | list %}
-           {% set qty = lights | count %}
-           {% set p1 = 'lights are' if qty > 1 else 'light is' %}
-
-           {% if qty == 0 %} 
-            No lights on.
-           {% else %}
-            {{ qty }} {{ p1 }} on.
-           {% endif %}
+          {{ states.light | selectattr('state', 'eq', 'on') | list | count }}
 
       - name: "Number of Smoke Detectors"
         unit_of_measurement: "count"
diff --git a/config/scene/living_room.yaml b/config/scene/living_room.yaml
index d66412f8..9bc3d066 100755
--- a/config/scene/living_room.yaml
+++ b/config/scene/living_room.yaml
@@ -66,60 +66,60 @@
   entities:
       light.m1_front_left:
           state: on
-          kelvin: 5500
+          color_temp_kelvin: 5500
           brightness: 255
       light.m1_front_right:
           state: on
-          kelvin: 5500
+          color_temp_kelvin: 5500
           brightness: 255
       light.m1_back_right:
           state: on
-          kelvin: 5500
+          color_temp_kelvin: 5500
           brightness: 255
       light.m1_back_left:
           state: on
-          kelvin: 5500
+          color_temp_kelvin: 5500
           brightness: 255
       light.tv_stand_light:
           state: on
-          kelvin: 5500
+          color_temp_kelvin: 5500
           brightness: 200
       light.tv_light:
           state: on
-          kelvin: 5500
+          color_temp_kelvin: 5500
           brightness: 200
       light.couch_1:
           state: on
-          kelvin: 5500
+          color_temp_kelvin: 5500
           brightness: 255
 
 - name: Living_Room_Evening_Amber
   entities:
       light.m1_front_left:
           state: on
-          kelvin: 2700
+          color_temp_kelvin: 2700
           brightness: 200
       light.m1_front_right:
           state: on
-          kelvin: 2700
+          color_temp_kelvin: 2700
           brightness: 200
       light.m1_back_right:
           state: on
-          kelvin: 2700
+          color_temp_kelvin: 2700
           brightness: 200
       light.m1_back_left:
           state: on
-          kelvin: 2700
+          color_temp_kelvin: 2700
           brightness: 200
       light.tv_stand_light:
           state: on
-          kelvin: 2700
+          color_temp_kelvin: 2700
           brightness: 170
       light.tv_light:
           state: on
-          kelvin: 2700
+          color_temp_kelvin: 2700
           brightness: 170
       light.couch_1:
           state: on
-          kelvin: 2700
+          color_temp_kelvin: 2700
           brightness: 220
diff --git a/config/script/notify_engine.yaml b/config/script/notify_engine.yaml
index ff8be20c..674ecc92 100755
--- a/config/script/notify_engine.yaml
+++ b/config/script/notify_engine.yaml
@@ -1,4 +1,13 @@
-######################################################################################################
+######################################################################
+# @CCOSTAN - Follow Me on X
+# For more info visit https://www.vcloudinfo.com/click-here
+# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
+# -------------------------------------------------------------------
+# Notification Engine Scripts - Flexible push helpers for family devices.
+#  Compose messages from value1/value2/value3 with optional actions.
+# -------------------------------------------------------------------
+# Video Tutorial: https://youtu.be/mK1wdpxhLbM
+######################################################################
 ### Script for Sending Notifications to Mobile Phones
 # This script (`notify_engine`) and its variant (`notify_engine_two_button`) are designed to send 
 # customized notifications to specified recipients in Home Assistant.
@@ -23,11 +32,6 @@
 #   - 'icon1', 'icon2': Icons for the buttons (optional).
 #   - 'destructive1', 'destructive2': Boolean flags to mark buttons as destructive (optional).
 
-# Author: @CCOSTAN
-# Original Repository: https://github.com/CCOSTAN/Home-AssistantConfig
-# Video Tutorial for Android Compatibility: https://youtu.be/mK1wdpxhLbM
-######################################################################################################
-
 
 notify_engine:
   sequence:
@@ -51,7 +55,7 @@ notify_engine:
           {% endif %}
       data:
         title: "{{ title }}"
-        message: "{{ value1 }} {{ value2 }} {{ value3 }}"
+        message: "{{ ' '.join([value1|default('', true), value2|default('', true), value3|default('', true)]) | trim }}"
         data:
           group: "{{ group|default('information') }}"
           interuption_level: "{{ level|default('active') }}"
@@ -78,7 +82,7 @@ notify_engine_two_button:
             notify.ios_family
           {% endif %}
       data:
-        message: "{{ value1 }} {{ value2 }} {{ value3 }}"
+        message: "{{ ' '.join([value1|default('', true), value2|default('', true), value3|default('', true)]) | trim }}"
         title: "{{ title|default('', true) }}"
         data:
           actions: