diff --git a/lovelace/00_myhome_view.yaml b/lovelace/00_myhome_view.yaml
index c871d01..de1485e 100644
--- a/lovelace/00_myhome_view.yaml
+++ b/lovelace/00_myhome_view.yaml
@@ -156,10 +156,10 @@ cards:
     show_state: true
     title: Fitness
     entities:
-      - entity: sensor.yo_mama_steps
+      - entity: sensor.suresh_steps
         icon: "mdi:run"
         name: Suresh Steps
-      - entity: sensor.yo_mama_floors_ascended
+      - entity: sensor.suresh_floors_ascended
         icon: "mdi:run"
         name: Suresh Floors Ascended
       - entity: sensor.mallika_steps
diff --git a/packages/daily_routines.yaml b/packages/daily_routines.yaml
index a08d44b..4eadd9b 100644
--- a/packages/daily_routines.yaml
+++ b/packages/daily_routines.yaml
@@ -171,6 +171,37 @@ automation:
       - service: switch.turn_on
         entity_id: switch.backyard_light
 
+  - alias: Christmas Lights ON (At Sunset)
+    trigger:
+      platform: sun
+      event: sunset
+      offset: "+00:00:00"
+    condition:
+      - condition: state
+        entity_id: input_boolean.light_automations
+        state: "on"
+    action:
+      - service: switch.turn_on
+        entity_id: switch.left
+      - service: switch.turn_on
+        entity_id: switch.backyard_light
+
+  - alias: Christmas Lights OFF (At Sunrise)
+    initial_state: true
+    trigger:
+      platform: sun
+      event: sunrise
+      offset: "00:15:00"
+    condition:
+      - condition: state
+        entity_id: input_boolean.light_automations
+        state: "on"
+    action:
+      - service: switch.turn_off
+        entity_id: switch.left
+      - service: switch.turn_off
+        entity_id: switch.backyard_light
+
   ###############################################################################
   # Turn indoor lights on 30 minutes before sunset
   ###############################################################################
diff --git a/packages/homesecurity.yaml b/packages/homesecurity.yaml
index 53ffba1..dd2fed1 100644
--- a/packages/homesecurity.yaml
+++ b/packages/homesecurity.yaml
@@ -240,25 +240,26 @@ automation:
   # When home security system is turned OFF or turned to Home mode from "away"
   # means, someone reached home from outside
   ###############################################################################
-  - alias: Turn ON Thermostat upon reaching home
-    initial_state: true
-    trigger:
-      platform: state
-      entity_id: alarm_control_panel.home
-    condition:
-      - condition: template
-        value_template: >
-          {% if trigger.from_state.state == 'armed_away' and
-                (trigger.to_state.state == 'armed_home' or trigger.to_state.state == 'disarmed') %}
-            true
-          {% else %}
-            false
-          {% endif %}
-    action:
-      - service: climate.set_away_mode
-        data_template:
-          entity_id: climate.dining_room
-          away_mode: "false"
+  # - alias: Turn ON Thermostat upon reaching home
+  #   initial_state: true
+  #   trigger:
+  #     platform: state
+  #     entity_id: alarm_control_panel.home
+  #   condition:
+  #     - condition: template
+  #       value_template: >
+  #         {% if trigger.from_state.state == 'armed_away' and
+  #               (trigger.to_state.state == 'armed_home' or trigger.to_state.state == 'disarmed') %}
+  #           true
+  #         {% else %}
+  #           false
+  #         {% endif %}
+  #   action:
+  #     - service: climate.set_preset_mode
+  #       target:
+  #         entity_id: climate.dining_room
+  #       data:
+  #         preset_mode: "eco"
 
   ###############################################################################
   # TURN HOME SECURITY SYSTEM ON AT BED TIME
diff --git a/packages/recycle_trash.yaml b/packages/recycle_trash.yaml
index e0d5233..43f9fa3 100644
--- a/packages/recycle_trash.yaml
+++ b/packages/recycle_trash.yaml
@@ -283,6 +283,8 @@ automation:
       conditions:
         - condition: template
           value_template: "{{ states('input_boolean.trash_reminders') == 'on' }}"
+        - condition: template
+          value_template: "{{ states('input_boolean.home_mode_away') == 'off' }}"          
         - condition: or
           conditions:
             - condition: state
diff --git a/packages/scripts.yaml b/packages/scripts.yaml
index 7b5bf2a..2b306fa 100644
--- a/packages/scripts.yaml
+++ b/packages/scripts.yaml
@@ -197,9 +197,13 @@ script:
       - service: notify.android_tv_fire_tv
         data:
           message: "{{ message }}"
-          title: "Hello!"
+          title: Mahasri Bot
           data:
             color: red
+            duration: 10
+            transparency: 1%
+            icon: 
+              path: /config/www/{{- [ "suresh.jpg", "srinika.jpg", "mallika.jpg", "hasika.jpg" ] | random  -}}
 
   good_night_tts:
     sequence: