diff --git a/config/packages/daily.yaml b/config/packages/daily.yaml
index 78048d8..6902f44 100755
--- a/config/packages/daily.yaml
+++ b/config/packages/daily.yaml
@@ -11,8 +11,8 @@ automation:
     alias: Coffee Time
     initial_state: true
     trigger:
-        platform: template
-        value_template: "{{ states('sensor.time') == (state_attr('input_datetime.coffee_time', 'timestamp') | int | timestamp_custom('%H:%M', False)) }}"
+        platform: time
+        at: input_datetime.coffee_time
     action:
     - service: scene.turn_on
       entity_id: scene.diminshed_livingroom_lighting
@@ -29,8 +29,8 @@ automation:
     alias: Good Morning
     initial_state: true
     trigger:
-        platform: template
-        value_template: "{{ states('sensor.time') == (state_attr('input_datetime.good_morning', 'timestamp') | int | timestamp_custom('%H:%M', False)) }}"
+        platform: time
+        at: input_datetime.good_morning
     action:
     - service: scene.turn_on
       entity_id: scene.normal_livingroom_lighting
@@ -58,8 +58,8 @@ automation:
     alias: Skylar Bedtime
     initial_state: true
     trigger:
-        platform: template
-        value_template: "{{ states('sensor.time') == (state_attr('input_datetime.skylar_nightly_report', 'timestamp') | int | timestamp_custom('%H:%M', False)) }}"
+        platform: time
+        at: input_datetime.skylar_nightly_report
     condition:
     - condition: state
       entity_id: input_boolean.vacation_mode
@@ -383,4 +383,5 @@ script:
     - condition: state
       entity_id: group.garage_doors
       state: 'on'
-    - service: script.driveway_on
\ No newline at end of file
+    - service: script.turn_on
+      entity_id: script.driveway_on
\ No newline at end of file
diff --git a/config/packages/integrations.yaml b/config/packages/integrations.yaml
index 4d98085..6e0f1bb 100755
--- a/config/packages/integrations.yaml
+++ b/config/packages/integrations.yaml
@@ -25,6 +25,9 @@ aarlo:
   last_format: '%m-%d %H:%M'
   refresh_devices_every: 2
   verbose_debug: True
+  tfa_host: 'imap.gmail.com'
+  tfa_username: !secret GV_USER
+  tfa_password: !secret GV_PASS
 
 # Testing internet speedtest  
 speedtestdotnet:
diff --git a/config/packages/lighting.yaml b/config/packages/lighting.yaml
index a9cccef..088036d 100755
--- a/config/packages/lighting.yaml
+++ b/config/packages/lighting.yaml
@@ -356,22 +356,11 @@ script:
   master_bedroom_lights_w_level:
     sequence:
       - service: light.turn_on
-        entity_id: light.jeff_lamp_level_light_color_on_off
+        entity_id: light.jeff_lamp_level_light_color_on_off, light.tower_spotlight_level_on_off, light.kat_lamp
         data:
           brightness: >
               {{ level | int }}
           color_temp: 369
-      - service: light.turn_on
-        entity_id: light.tower_spotlight_level_on_off
-        data:
-          brightness: >
-              {{ level | int }}
-          color_temp: 369
-      - service: light.turn_on
-        entity_id: light.kat_lamp
-        data:
-          brightness: >
-              {{ level | int }}
          
       
   master_bedroom_morning_wakeup_lighting:
diff --git a/config/packages/notify.yaml b/config/packages/notify.yaml
index 9e3693c..8e84935 100755
--- a/config/packages/notify.yaml
+++ b/config/packages/notify.yaml
@@ -10,7 +10,7 @@
 ###############################################################################
 # AWS Polly Options:
 # pause:
-#   <break time="3s"/>
+#   <break time="3s"/> 
 # emphasis: 
 #   <emphasis level="strong">really like</emphasis>
 #   level attribute values: