diff --git a/config/automation/Speech/High_Wind_Speed_Check.yaml b/config/automation/Speech/High_Wind_Speed_Check.yaml
index 199fc6ec..4da76192 100755
--- a/config/automation/Speech/High_Wind_Speed_Check.yaml
+++ b/config/automation/Speech/High_Wind_Speed_Check.yaml
@@ -18,7 +18,7 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'VERY HIGH WINDS:'
         value1:  >-
           {% set windspeed = states.sensor.dark_sky_wind_speed.state | round %}
@@ -36,7 +36,7 @@
       entity_id: input_boolean.alert_mode
 
     - service: script.speech_engine
-      data_template:
+      data:
         value1: >
           {% set windspeed = states.sensor.dark_sky_wind_speed.state | round %}
           {% if ( windspeed > 25 ) and ( windspeed <= 40 ) %}
@@ -52,7 +52,7 @@
     - service: script.emergency
 
     - service: script.tweet_engine_no_image
-      data_template:
+      data:
         tweet: >
           {% set windspeed = states.sensor.dark_sky_wind_speed.state | round %}
           {% if ( windspeed > 25 ) and ( windspeed <= 40 ) %}
diff --git a/config/automation/Speech/announcements.yaml b/config/automation/Speech/announcements.yaml
index ed19b117..a15c73ef 100755
--- a/config/automation/Speech/announcements.yaml
+++ b/config/automation/Speech/announcements.yaml
@@ -19,7 +19,7 @@
   action:
     # This Group is defined in the groups directory.
     - service: group.set
-      data_template:
+      data:
         object_id: "arriving"
         add_entities: >-
           {{ trigger.to_state.entity_id }}
@@ -32,7 +32,7 @@
 
     - delay: '00:01:00'
     - service: script.speech_engine
-      data_template:
+      data:
 #         {% set person = state_attr(trigger.entity_id, "friendly_name")%}      This is another way to do it.
 #         {% set person = trigger.entity_id.split('.')[1]|replace('_', ' ')%}
         personarriving: >
@@ -81,7 +81,7 @@
         call_window_check: 1
 
     - service: group.set
-      data_template:
+      data:
         object_id: "arriving"
         entities: []
 
diff --git a/config/automation/Speech/door_opened.yaml b/config/automation/Speech/door_opened.yaml
index 92058e11..07ec2f15 100755
--- a/config/automation/Speech/door_opened.yaml
+++ b/config/automation/Speech/door_opened.yaml
@@ -22,7 +22,7 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         who: 'parents'
         value1: "The {{ trigger.to_state.attributes.friendly_name }} has been {{ (trigger.to_state.state)|replace('_', ' ') }}."
         apns_id: 'information'
@@ -31,6 +31,6 @@
       entity_id: input_boolean.alert_mode
 
     - service: script.speech_engine
-      data_template:
+      data:
         call_window_check: 1
         call_inside_weather: 1
diff --git a/config/automation/Speech/guest_mode.yaml b/config/automation/Speech/guest_mode.yaml
index 66358472..ed86da5d 100755
--- a/config/automation/Speech/guest_mode.yaml
+++ b/config/automation/Speech/guest_mode.yaml
@@ -14,7 +14,7 @@
 
   action:
     - service: script.speech_engine
-      data_template:
+      data:
         value1: >
           {{ [
           "Guest Mode has been enabled for the rest of the day.",
@@ -54,7 +54,7 @@
       entity_id:
         - input_boolean.guest_mode
     - service: script.speech_engine
-      data_template:
+      data:
         value1: >
           {{ [
           "Guest Mode has been disabled and normal automations will continue.",
diff --git a/config/automation/Speech/nest.yaml b/config/automation/Speech/nest.yaml
index bbccccee..f41e2d87 100755
--- a/config/automation/Speech/nest.yaml
+++ b/config/automation/Speech/nest.yaml
@@ -19,6 +19,6 @@
 
   action:
     - service: script.speech_engine
-      data_template:
+      data:
         NestStatus: "The {{ trigger.entity_id.split('.')[1].split('_')[0]}} {{ trigger.entity_id.split('.')[1].split('_')[1]}} has now been turned on for {{(trigger.to_state.state)}}."
         call_window_check: 1
diff --git a/config/automation/Speech/new_device.yaml b/config/automation/Speech/new_device.yaml
index 4d673c34..23eed2a0 100755
--- a/config/automation/Speech/new_device.yaml
+++ b/config/automation/Speech/new_device.yaml
@@ -13,11 +13,11 @@
         {{ not is_state('media_player.livingroomCC', 'playing') }}
 
     - service: script.speech_engine
-      data_template:
+      data:
         NewDevice: "There has been a new device detected on the network.  Be sure to appropriately catagorize {{trigger.event.data.host_name}} within Circle."
 
     - service: script.tweet_engine_no_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "New Device on the Network! @MeetCircle has alerted me and now it is locked down.",
diff --git a/config/automation/System/CucKoo_Clock.yaml b/config/automation/System/CucKoo_Clock.yaml
index 522bb9c4..8d05d5be 100755
--- a/config/automation/System/CucKoo_Clock.yaml
+++ b/config/automation/System/CucKoo_Clock.yaml
@@ -2,6 +2,7 @@
 # @CCOSTAN
 # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
 ## Plays the number of cuckoos per hour and 1 on the half hour.
+# More Info and Video: https://www.vcloudinfo.com/2017/11/building-digital-cuckoo-clock-with-home.html
 #####################################################################
 
 - alias: Cuckoo Clock
@@ -35,7 +36,7 @@
     - wait_template: "{{ not is_state('media_player.livingroomCC', 'playing') }}"
 
     - service: media_player.play_media
-      data_template:
+      data:
         entity_id: >
           {% if states.group.bed.state == 'off' %}
           media_player.livingroomCC
diff --git a/config/automation/System/Self_heal.yaml b/config/automation/System/Self_heal.yaml
index a6bbb1c8..33153a83 100755
--- a/config/automation/System/Self_heal.yaml
+++ b/config/automation/System/Self_heal.yaml
@@ -13,7 +13,7 @@
   action:
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >-
           {{ [
           "While they sleep, I self heal the #Z-Wave network with #Wink. (https://github.com/CCOSTAN/Home-AssistantConfig#hubs)",
diff --git a/config/automation/System/Wink_update_notification.yaml b/config/automation/System/Wink_update_notification.yaml
index c5babd3b..adff72a4 100755
--- a/config/automation/System/Wink_update_notification.yaml
+++ b/config/automation/System/Wink_update_notification.yaml
@@ -7,14 +7,14 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         value1: 'Check the Wink Hub.  Update is needed.'
         value2: "{{ states.binary_sensor.carlowink.attributes }}"
         value3: ''
         who: 'carlo'
 
     - service: notify.html5
-      data_template:
+      data:
         title: "Wink Update Available"
         message: "Wink Update is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}"
         data:
@@ -27,10 +27,10 @@
         notification_id: "update_available"
 
     - service: ifttt.trigger
-      data_template: {"event":"GitPost", "value1":"Wink Update is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}", "value2":"{{ states.binary_sensor.carlowink.attributes }}"}
+      data: {"event":"GitPost", "value1":"Wink Update is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}", "value2":"{{ states.binary_sensor.carlowink.attributes }}"}
 
     - service: script.tweet_engine_no_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Check @TheWinkApp Hub @CCostan. Update is needed. {{ states.binary_sensor.carlowink.attributes }}",
diff --git a/config/automation/System/bad_logins.yaml b/config/automation/System/bad_logins.yaml
index 0951f738..fa7d0a7b 100755
--- a/config/automation/System/bad_logins.yaml
+++ b/config/automation/System/bad_logins.yaml
@@ -10,7 +10,7 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         value1: 'Bad Login: '
         value2: 'There was a Hack attempt!'
         value3: 'Go Check the GUI for details.'
@@ -18,7 +18,7 @@
         apns_id: 'information'
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Seriously, I am a Smart Home. I am logging your hack attempt.",
diff --git a/config/automation/System/detect_and_adjust_lights.yaml b/config/automation/System/detect_and_adjust_lights.yaml
index 20dd9e53..e621d923 100755
--- a/config/automation/System/detect_and_adjust_lights.yaml
+++ b/config/automation/System/detect_and_adjust_lights.yaml
@@ -39,7 +39,7 @@
 
   action:
     - service: light.turn_on
-      data_template:
+      data:
         entity_id: "{{ trigger.event.data.entity_id }}"
         brightness: >
           {% set hour=states("sensor.time").split(':')[0] | int %}
diff --git a/config/automation/System/door_chime.yaml b/config/automation/System/door_chime.yaml
index d405829d..f400628b 100755
--- a/config/automation/System/door_chime.yaml
+++ b/config/automation/System/door_chime.yaml
@@ -22,7 +22,7 @@
         volume_level: 0.22
 
     - service: media_player.play_media
-      data_template:
+      data:
         entity_id: >
           {% if states.group.bed.state == 'off' %}
           media_player.livingroomCC
diff --git a/config/automation/System/ip_change.yaml b/config/automation/System/ip_change.yaml
index 2f00f94f..5294bc48 100755
--- a/config/automation/System/ip_change.yaml
+++ b/config/automation/System/ip_change.yaml
@@ -14,7 +14,7 @@
       to: 'True'
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         value1: 'Changed IP address:'
         value2: "New IP: {{ states('sensor.exteral_ip') }}"
         value3: ' - Be sure to Change DNS!'
@@ -22,7 +22,7 @@
         apns_id: 'ip-change'
 
     - service: script.tweet_engine_no_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "That's weird. Looks like my IP address changed. @CCostan, please check it out.",
diff --git a/config/automation/System/rachio_rain_delay.yaml b/config/automation/System/rachio_rain_delay.yaml
index 34c71324..d3345122 100755
--- a/config/automation/System/rachio_rain_delay.yaml
+++ b/config/automation/System/rachio_rain_delay.yaml
@@ -31,10 +31,10 @@
 
   action:
     - service: ifttt.trigger
-      data_template: {"event":"Rachio_Rain_Delay"}
+      data: {"event":"Rachio_Rain_Delay"}
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Looks like Rain, Pausing the @_Rachio for 24 hours. (https://github.com/CCOSTAN/Home-AssistantConfig#landscaping)",
diff --git a/config/automation/System/trigger_dump.yaml b/config/automation/System/trigger_dump.yaml
index cce9d1bb..b38b256d 100755
--- a/config/automation/System/trigger_dump.yaml
+++ b/config/automation/System/trigger_dump.yaml
@@ -9,13 +9,13 @@
         event_type: feedreader
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           value1: 'Check the MQTT Dump'
           value2: '/dump/{{ trigger.platform }}'
           who: 'carlo'
           apns_id: 'information'
       - service: mqtt.publish
-        data_template:
+        data:
           topic: '/dump/{{ trigger.platform }}'
           retain: false
           payload: >-
diff --git a/config/automation/System/update_notification.yaml b/config/automation/System/update_notification.yaml
index ac7fb10d..11eade35 100755
--- a/config/automation/System/update_notification.yaml
+++ b/config/automation/System/update_notification.yaml
@@ -15,17 +15,17 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }} '
         value1: "Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }} is now available."
         who: 'carlo'
         apns_id: 'information'
 
     - service: ifttt.trigger
-      data_template: {"event":"GitPost", "value1":"Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }}  is now available.", "value2":"{{ states.binary_sensor.updater.attributes.newest_version }} "}
+      data: {"event":"GitPost", "value1":"Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }}  is now available.", "value2":"{{ states.binary_sensor.updater.attributes.newest_version }} "}
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >-
           {% macro getIntro() %}
            {{- [
diff --git a/config/automation/System/watchdog_light.yaml b/config/automation/System/watchdog_light.yaml
index fe2010c7..ac3a5265 100755
--- a/config/automation/System/watchdog_light.yaml
+++ b/config/automation/System/watchdog_light.yaml
@@ -16,7 +16,7 @@
 #Turn it off!
   action:
     - service: homeassistant.turn_off
-      data_template:
+      data:
         entity_id: "{{ trigger.entity_id }}"
 
 - alias: Make it Right WatchDog!
@@ -33,7 +33,7 @@
 #Turn it off!
   action:
     - service: homeassistant.turn_off
-      data_template:
+      data:
         entity_id:
           - switch.front_landscaping
           - switch.back_landscaping
diff --git a/config/automation/Timed_Triggers/2200.yaml b/config/automation/Timed_Triggers/2200.yaml
index 9ddf1c74..498dcb67 100755
--- a/config/automation/Timed_Triggers/2200.yaml
+++ b/config/automation/Timed_Triggers/2200.yaml
@@ -15,7 +15,7 @@
        {{ not is_state('media_player.whole_house', 'playing') }}
 
     - service: script.speech_engine
-      data_template:
+      data:
         call_no_announcement: 1
         call_garage_check: 1
         call_window_check: 1
diff --git a/config/automation/Timed_Triggers/night_watchdog.yaml b/config/automation/Timed_Triggers/night_watchdog.yaml
index b7b9703f..ca4f2a79 100755
--- a/config/automation/Timed_Triggers/night_watchdog.yaml
+++ b/config/automation/Timed_Triggers/night_watchdog.yaml
@@ -40,5 +40,5 @@
 
   action:
     - service: switch.turn_off
-      data_template:
+      data:
         entity_id: "{{ trigger.entity_id }}"
diff --git a/config/automation/Timed_Triggers/startup_notification.yaml b/config/automation/Timed_Triggers/startup_notification.yaml
index 201b49ff..48a8c17f 100755
--- a/config/automation/Timed_Triggers/startup_notification.yaml
+++ b/config/automation/Timed_Triggers/startup_notification.yaml
@@ -10,7 +10,7 @@
       event: start
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'Home Assistant StartUp'
         value1: 'Home Assistant is Up and Running!'
         who: 'carlo'
@@ -33,7 +33,7 @@
         payload: "get-status"
 
     - service: group.set
-      data_template:
+      data:
         object_id: "arriving"
         entities: []
 
diff --git a/config/automation/Timed_Triggers/sunrise_turn_off.yaml b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
index 1e2702b9..6de1e261 100755
--- a/config/automation/Timed_Triggers/sunrise_turn_off.yaml
+++ b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
@@ -16,7 +16,7 @@
       entity_id:
         - group.landscaping
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Even though they are sleeping, I still turn off the outdoor lights before sunrise.",
diff --git a/config/automation/Timed_Triggers/sunset_turn_on.yaml b/config/automation/Timed_Triggers/sunset_turn_on.yaml
index 1cfeb1d3..8ac03900 100755
--- a/config/automation/Timed_Triggers/sunset_turn_on.yaml
+++ b/config/automation/Timed_Triggers/sunset_turn_on.yaml
@@ -19,7 +19,7 @@
   action:
     - delay: '00:{{ (range(1, 20)|random|int) }}:00'
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >-
           {{ [
           "Right before sunset, I turn on the outdoor lights.",
@@ -65,7 +65,7 @@
     - service: light.turn_on
       entity_id:
         - light.outdoor_bathroom
-      data_template:
+      data:
         brightness: >
           {% if states.group.family.state == 'home' -%}
           10
diff --git a/config/automation/dark_rainy_day.yaml b/config/automation/dark_rainy_day.yaml
index 8ebb3482..c7039c55 100755
--- a/config/automation/dark_rainy_day.yaml
+++ b/config/automation/dark_rainy_day.yaml
@@ -62,7 +62,7 @@
         kelvin: 5500
 
     - service: script.speech_engine
-      data_template:
+      data:
         value1: "It is getting a little dark inside the house because of the {{trigger.entity_id.split('_')[2]|replace('precip','rain')|replace('counter','lightning') }} {{trigger.entity_id.split('_')[3]|replace('intensity',' ')}} outside.  I will turn on some extra lights in the living room."
         call_window_check: 1
         call_garage_check: 1
diff --git a/config/automation/late_night_outside_helper.yaml b/config/automation/late_night_outside_helper.yaml
index 21981ddf..c959c2f9 100755
--- a/config/automation/late_night_outside_helper.yaml
+++ b/config/automation/late_night_outside_helper.yaml
@@ -33,7 +33,7 @@
         - service: scene.turn_on
           entity_id: scene.tv_time
 
-    - service_template: >
+    - service: >
        {% set hour=states("sensor.time").split(':')[0] | int %}
        {% if hour >= 5 and hour <= 9 and states.group.bed.state == 'on'%}
          switch.turn_off
diff --git a/config/automation/medicine_logger.yaml b/config/automation/medicine_logger.yaml
index 68308467..9826c97a 100755
--- a/config/automation/medicine_logger.yaml
+++ b/config/automation/medicine_logger.yaml
@@ -23,13 +23,13 @@
         message: "Took Medicine today."
 
     - service: mqtt.publish
-      data_template:
+      data:
         payload: '{{ states("sensor.date") }}'
         topic: 'dash/medicine/medicine_time'
         retain: true
 
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'Medicine Reminder Completed'
         value1: 'Carlo Took Medicine today.'
         who: 'parents'
diff --git a/config/packages/alarm.yaml b/config/packages/alarm.yaml
index db5dfd77..d64da440 100755
--- a/config/packages/alarm.yaml
+++ b/config/packages/alarm.yaml
@@ -242,7 +242,7 @@ automation:
         data:
           entity_id: climate.downstairs
       - service: script.speech_engine
-        data_template:
+        data:
           value1: >
             {{ [
             "The {{ trigger.to_state.attributes.friendly_name }} has been opened for about 5 minutes.  I will shut down the Air Conditioner so you can enjoy the fresh air.",
@@ -326,7 +326,7 @@ automation:
           - service: scene.turn_on
             entity_id: scene.tv_time
 
-  # - service_template: >-
+  # - service: >-
   #     {% if states.group.entry_points.state == 'on' or states.group.garage_doors.state != 'closed' -%}
   #       light.turn_on
   #       entity_id:
@@ -353,7 +353,7 @@ automation:
 
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           value1: 'Someone has opened up the Alarm Panel Door!'
           who: 'carlo'
           apns_id: 'information'
diff --git a/config/packages/alarm_clock.yaml.DISABLED b/config/packages/alarm_clock.yaml.DISABLED
index 936e6c24..afc1d562 100755
--- a/config/packages/alarm_clock.yaml.DISABLED
+++ b/config/packages/alarm_clock.yaml.DISABLED
@@ -109,12 +109,12 @@ automation:
         state: 'home'
     action:
       - service: media_player.volume_set
-        data_template:
+        data:
           entity_id:
             - media_player.alarm_clock
           volume_level: 0.3
       - service: media_player.play_media
-        data_template:
+        data:
           entity_id:
             - media_player.alarm_clock
           #media_content_id: "http://listen.181fm.com/181-kickincountry_128k.mp3"
diff --git a/config/packages/august.yaml b/config/packages/august.yaml
index f9ed2255..f783592c 100755
--- a/config/packages/august.yaml
+++ b/config/packages/august.yaml
@@ -32,7 +32,7 @@ automation:
 
     action:
       - service: script.speech_engine
-        data_template:
+        data:
           DoorLocked: "The {{ trigger.to_state.name }} is now {{ trigger.to_state.state }}."
 
   - alias: 'Door UnLocked Announcement'
@@ -46,5 +46,5 @@ automation:
 
     action:
       - service: script.speech_engine
-        data_template:
+        data:
           DoorUnLocked: "The {{ trigger.to_state.name }} has been {{ trigger.to_state.state }} for 10 minutes. I will lock it in 10 minutes if it is still unlocked."
diff --git a/config/packages/battery_levels.yaml b/config/packages/battery_levels.yaml
index 9ed7c0b4..ad6c28e4 100755
--- a/config/packages/battery_levels.yaml
+++ b/config/packages/battery_levels.yaml
@@ -48,12 +48,12 @@ automation:
       value_template: "{% if states('sensor.low_battery') %}true{% endif %}"
     action:
       - service: persistent_notification.create
-        data_template:
+        data:
           title: Low Battery
           message: "{{ states('sensor.low_battery') }}"
           notification_id: low-battery-alert
       - service: script.notify_engine
-        data_template:
+        data:
           value1: "Low battery levels: {{ states('sensor.low_battery') }}"
           who: 'carlo'
           apns_id: 'information'
diff --git a/config/packages/blink.yaml b/config/packages/blink.yaml
index ce0ed7b6..4a350248 100755
--- a/config/packages/blink.yaml
+++ b/config/packages/blink.yaml
@@ -30,7 +30,7 @@ automation:
       - service: blink.blink_update
 
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Check Fridge'
           value1: "Please check the fridge, the temperature has been {{ states('sensor.blink_blink1_temperature') }} degrees for at least 20 minutes."
           who: 'family'
@@ -39,7 +39,7 @@ automation:
       - wait_template: "{{ states.group.family.state == 'home' }}"
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: "Please check the fridge, the temperature has been {{ states('sensor.blink_blink1_temperature') }} degrees for at least 20 minutes."
           no_fridge: 1
 
diff --git a/config/packages/epson_printer.yaml b/config/packages/epson_printer.yaml
index bb4f78f4..5c344c05 100755
--- a/config/packages/epson_printer.yaml
+++ b/config/packages/epson_printer.yaml
@@ -27,12 +27,12 @@ automation:
         - wed
     action:
       - service: persistent_notification.create
-        data_template:
+        data:
           title: Low Ink
           message: "{{ trigger.to_state.attributes.friendly_name }} is at {{ trigger.to_state.state }} "
           notification_id: low-battery-alert
       - service: script.notify_engine
-        data_template:
+        data:
           value1: "{{ trigger.to_state.attributes.friendly_name }} is at {{ trigger.to_state.state }} "
           who: 'carlo'
           apns_id: 'information'
diff --git a/config/packages/fitness_steps.yaml b/config/packages/fitness_steps.yaml
index 6c62f263..d658ade8 100755
--- a/config/packages/fitness_steps.yaml
+++ b/config/packages/fitness_steps.yaml
@@ -21,7 +21,7 @@ automation:
 
     action:
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "Somebody just hit {{ trigger.entity_id }} steps on the #Fitbit!",
diff --git a/config/packages/garadget.yaml b/config/packages/garadget.yaml
index 6e24df9f..f2809560 100755
--- a/config/packages/garadget.yaml
+++ b/config/packages/garadget.yaml
@@ -108,7 +108,7 @@ automation:
         for: '00:02:30'
 
     action:
-    # - service_template: >
+    # - service: >
     #    {% set hour=states("sensor.time").split(':')[0] | int %}
     #    {% if hour >= 7 and hour <= 9 and states.input_boolean.school_mode.state == 'on'%}
     #      input_boolean.turn_off
@@ -118,7 +118,7 @@ automation:
     #   entity_id: input_boolean.alert_mode
 
       - service: script.speech_engine
-        data_template:
+        data:
           DoorClosed: "The {{ trigger.entity_id.split('.')[1]|replace('_', ' ') }} is now {{ (trigger.to_state.state)|replace('_', ' ') }}."
           call_garage_check: 1
 
@@ -148,7 +148,7 @@ automation:
         entity_id: input_boolean.alert_mode
 
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Check/Close Garage Doors - High Speed Wind Alert:'
           value1: "Small: {{ states('cover.small_garage_door')}}"
           value2: "Large: {{ states('cover.large_garage_door')}}"
@@ -156,7 +156,7 @@ automation:
           who: 'parents'
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: >
             "The winds are picking up outside.  The wind speed is {{ states('sensor.dark_sky_wind_speed')|round}} miles per hour.  For safety, please close the garage doors.
             {% if is_state('cover.large_garage_door', 'open') -%}
@@ -168,7 +168,7 @@ automation:
             {% endif %}"
 
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "Wind speed is {{ states('sensor.dark_sky_wind_speed')|round}} miles per hour.  For safety, I'm going to close the @garadget doors.",
@@ -226,7 +226,7 @@ automation:
 
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Check Garage Doors:'
           value1: "Small: {{ states('cover.small_garage_door')}}"
           value2: "Large: {{ states('cover.large_garage_door')}}"
@@ -235,5 +235,5 @@ automation:
           apns_id: 'information'
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: "Please check the garage doors. The Small garage is {{ states('cover.small_garage_door')}} and the large garage is {{ states('cover.large_garage_door')}}"
diff --git a/config/packages/grafana.yaml b/config/packages/grafana.yaml
index 70a91649..3be0dd1f 100755
--- a/config/packages/grafana.yaml
+++ b/config/packages/grafana.yaml
@@ -35,7 +35,7 @@ automation:
         offset: '+02:30:00'
     action:
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >-
             {{ [
             "I have just finished crunching the numbers and here is the latest #Solar Production graph. "
diff --git a/config/packages/hacs.yaml b/config/packages/hacs.yaml
index 49b56093..5f9a6438 100755
--- a/config/packages/hacs.yaml
+++ b/config/packages/hacs.yaml
@@ -20,10 +20,10 @@ automation:
 
     action:
       - service: ifttt.trigger
-        data_template:  {"event":"GitPost", "value2":"HACS - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}", "value1":"Update to HACS {{state_attr('sensor.hacs','repositories')}}: There is {{ states.sensor.hacs.state }} update."}
+        data:  {"event":"GitPost", "value2":"HACS - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}", "value1":"Update to HACS {{state_attr('sensor.hacs','repositories')}}: There is {{ states.sensor.hacs.state }} update."}
 
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >-
             Hey @CCostan - There are {{ states.sensor.hacs.state }} updates to HACS components:
             {%- for repo in state_attr("sensor.hacs","repositories") -%}
diff --git a/config/packages/hasspodcast.yaml b/config/packages/hasspodcast.yaml
index b63a4cbf..a8ab0d2e 100755
--- a/config/packages/hasspodcast.yaml
+++ b/config/packages/hasspodcast.yaml
@@ -22,7 +22,7 @@ automation:
     action:
 
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: '{{trigger.event.data.title}} - {{trigger.event.data.link}}'
           image: >-
             {% set pictures = [
diff --git a/config/packages/holiday.yaml b/config/packages/holiday.yaml
index 99d0bf25..5fa73878 100755
--- a/config/packages/holiday.yaml
+++ b/config/packages/holiday.yaml
@@ -160,7 +160,7 @@ automation:
 
       - delay: '0{{ (range(4, 8)|random|int) }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}'
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "Today is {{ states.sensor.holiday.state }}. Time to adjust the outside light colors!",
diff --git a/config/packages/ios.yaml b/config/packages/ios.yaml
index d2c68b28..4826413e 100755
--- a/config/packages/ios.yaml
+++ b/config/packages/ios.yaml
@@ -69,7 +69,7 @@ automation:
         actionName: NOT_HOME
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Medicine Reminder'
           value1: 'Ok. I will remind you when you get home.'
           who: 'carlo'
@@ -77,7 +77,7 @@ automation:
       - wait_template: >-
           {{ states.person.carlo.state == 'home' }}
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Medicine Reminder'
           value1: 'Now that your home, please take your medicine!'
           who: 'carlo'
@@ -107,7 +107,7 @@ automation:
 
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Medicine Alert!'
           value1: 'Please take your Medicine!'
           ios_category: "tablet"
diff --git a/config/packages/juicenet.yaml b/config/packages/juicenet.yaml
index b50523c9..0d691c73 100755
--- a/config/packages/juicenet.yaml
+++ b/config/packages/juicenet.yaml
@@ -28,7 +28,7 @@ automation:
 
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           value1: "The Garage charger is now in {{ states('sensor.carlojuice_charging_status') }} mode."
           who: 'parents'
           apns_id: 'information'
@@ -70,7 +70,7 @@ automation:
         entity_id: switch.juicebox_restart
 
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "The #JuiceBox Pro had to be restarted. It was unable to connect back to @emotorwerks servers.",
@@ -106,13 +106,13 @@ automation:
         entity_id: input_boolean.alert_mode
 
       - service: script.notify_engine
-        data_template:
+        data:
           value1: "The Juice Box Charger is pulling {{ states('sensor.carlojuice_amps') }} AMPs.  This is above the safety mark of 30.  Please unplug charger immediately."
           who: 'parents'
           apns_id: 'JuiceBox'
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: "The Juice Box Charger is pulling {{ states('sensor.carlojuice_amps') }} AMPs.  This is above the safety mark of 30.  Please unplug charger immediately."
 
       - delay: 00:02:00
@@ -140,13 +140,13 @@ automation:
         entity_id: input_boolean.alert_mode
 
       - service: script.notify_engine
-        data_template:
+        data:
           value1: "The Juice Box Charger is running very Hot.  Temperature is around {{ states('sensor.carlojuice_temperature') }} degrees.  This is above the safety mark of 140.  Please unplug the car immediately."
           who: 'parents'
           apns_id: 'JuiceBox'
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: "The Juice Box Charger is running very Hot.  Temperature is around {{ states('sensor.carlojuice_temperature') }} degrees.  This is above the safety mark of 140.  Please unplug the car immediately."
 
       - delay: 00:02:00
@@ -162,7 +162,7 @@ automation:
     action:
       - delay: '0{{ range(0,3) | random | int }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:00'
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "The #Chevy Bolt Charged for {{(states.sensor.carlojuice_charge_time.state  | int /60) | round() }} minutes and Juiced up {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs.",
diff --git a/config/packages/lightning.yaml b/config/packages/lightning.yaml
index cc646128..f11bf5dd 100755
--- a/config/packages/lightning.yaml
+++ b/config/packages/lightning.yaml
@@ -58,7 +58,7 @@ automation:
 
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Lightning Warning!'
           value1: "Lightning has been detected within {{(states('sensor.blitzortung_lightning_distance') | int / 1.69) | round (1, 'floor')}} Miles of our home.  Be careful if outdoors."
           ios_category: "LIGHTNING"
@@ -66,7 +66,7 @@ automation:
           apns_id: 'Alert'
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: "Lightning has been detected within {{(states('sensor.blitzortung_lightning_distance') | int / 1.69) | round (1, 'floor')}} Miles of our home.  Please make sure everyone is inside the house."
           call_window_check: 1
           call_garage_check: 1
@@ -75,7 +75,7 @@ automation:
               minutes: 20
 
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "{{ states('sensor.blitzortung_lightning_counter') }} lightning strike(s) have been detected within {{(states('sensor.blitzortung_lightning_distance') | int / 1.69) | round (1, 'floor')}} Miles of our home.",
diff --git a/config/packages/logger.yaml b/config/packages/logger.yaml
index f5c345ad..1488f174 100755
--- a/config/packages/logger.yaml
+++ b/config/packages/logger.yaml
@@ -32,11 +32,11 @@ automation:
 #        - input_select.log_component
     action:
       - service: logger.set_level
-        data_template:
+        data:
           homeassistant.components: "{{ states.input_select.log_level.state }}"
 
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: "My logging level has just been set to {{ states.input_select.log_level.state }}"
           image: >-
             {{ [
diff --git a/config/packages/minecraft.yaml.disabled b/config/packages/minecraft.yaml.disabled
index f231c79a..8672ab96 100755
--- a/config/packages/minecraft.yaml.disabled
+++ b/config/packages/minecraft.yaml.disabled
@@ -36,7 +36,7 @@ automation:
     action:
       - service: light.turn_on
         entity_id: light.justin_go
-        data_template:
+        data:
           color_name: >
             {% if states.sensor.bear_stone.state|int == 1 %}
               gold
@@ -48,7 +48,7 @@ automation:
               red
             {% endif %}
 
-      - service_template: >
+      - service: >
             {% if states.sensor.bear_stone.state|int > 0 %}
               light.turn_on
             {% else %}
diff --git a/config/packages/neato.yaml b/config/packages/neato.yaml
index 8be3733d..36823d06 100755
--- a/config/packages/neato.yaml
+++ b/config/packages/neato.yaml
@@ -41,7 +41,7 @@ automation:
 
     action:
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "#Neato returning to base. Vacuumed up a TON. (https://amzn.to/2CKHZya)",
@@ -77,7 +77,7 @@ automation:
       - wait_template: "{{ states.group.family.state == 'home' }}"
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: >
             {% set error =  states.vacuum.carlo_neato.attributes['status'] %}
             {{ [
@@ -91,7 +91,7 @@ automation:
         entity_id: vacuum.carlo_neato
 
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Help Neato'
           value1: "{{ states.vacuum.carlo_neato.attributes['status'] }}"
           who: 'family'
diff --git a/config/packages/nest_protects.yaml b/config/packages/nest_protects.yaml
index 45459bfc..8e0a1a4d 100755
--- a/config/packages/nest_protects.yaml
+++ b/config/packages/nest_protects.yaml
@@ -54,21 +54,21 @@ automation:
         entity_id: input_boolean.alert_mode
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: "The {{ trigger.to_state.attributes.friendly_name }} is now {{ (trigger.to_state.state)|replace('_', ' ') }}.  Please check immediately."
 
       - service: script.notify_engine
-        data_template:
+        data:
           value1: "An emergency has been detected on {{ trigger.to_state.attributes.friendly_name }} Please investigate IMMEDIATELY."
           who: "family"
           apns_id: '{{ trigger.to_state.attributes.friendly_name }}'
 
       - service: script.tweet_engine_no_image
-        data_template:
+        data:
           tweet: "An emergency has been detected on {{ trigger.to_state.attributes.friendly_name }} @CCostan (https://www.vcloudinfo.com/2017/06/psa-check-out-your-smoke-detectors-once.html)"
 
       - service: script.emergency
-        data_template:
+        data:
           call_garage_open: 1
 
 
@@ -93,7 +93,7 @@ automation:
     action:
 
       - service: script.notify_engine
-        data_template:
+        data:
           value1: "The {{ trigger.to_state.attributes.friendly_name }} is now {{ (trigger.to_state.state)|replace('_', ' ') }}.  Please check immediately."
           who: "family"
           apns_id: '{{ trigger.to_state.attributes.friendly_name }}'
diff --git a/config/packages/network.yaml.disabled b/config/packages/network.yaml.disabled
index 4ce383f7..0df30a11 100755
--- a/config/packages/network.yaml.disabled
+++ b/config/packages/network.yaml.disabled
@@ -148,11 +148,11 @@ automation:
 
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           value1: 'Offline Devices:'
           value3: "{{ states.sensor.network_detail.state }}"
           who: 'carlo'
 
       # - service: script.speech_engine
-      #   data_template:
+      #   data:
       #     value1: "The following Devices are in an Offline state {{ trigger.to_state.state }}"
diff --git a/config/packages/phynplus.yaml b/config/packages/phynplus.yaml
index 5f21dc27..6b1f8eea 100755
--- a/config/packages/phynplus.yaml
+++ b/config/packages/phynplus.yaml
@@ -37,7 +37,7 @@ automation:
 
     action:
       - service: script.speech_engine
-        data_template:
+        data:
           value1: >
             {{ [
             "Attention please.  The Phyn unit has detected a possible leak.  Please verify there are no leaks in the house. "
@@ -45,7 +45,7 @@ automation:
           call_no_announcement: 1
 
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "The @Phyn has detected a {{ trigger.event.data.alert_type }} and notified us using Home Assistant. ",
@@ -61,7 +61,7 @@ automation:
          {{ states.sun.sun.state == 'above_horizon' }}
 
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Phyn Leak Detection'
           value1: 'Phyn is sensing {{ trigger.event.data.alert_type }} and turned off the water.  Please verify {{ trigger.event.data.where }}.'
           who: 'parents'
@@ -77,17 +77,17 @@ automation:
         actionName: PHYN_WATER_ON
     action:
       - service: ifttt.trigger
-        data_template: {"event":"phyn_water_on"}
+        data: {"event":"phyn_water_on"}
 
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Phyn Leak Detection'
           value1: 'Request Recieved. Attempting to Turn the Water back on.'
           who: 'parents'
           apns_id: 'IFTTT_Phyn'
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: >
             {{ [
             "I have been asked to Turn the House Water back on.  Please verify there are no leaks in the house. "
diff --git a/config/packages/pihole.yaml b/config/packages/pihole.yaml
index 5f13de89..36240ba1 100755
--- a/config/packages/pihole.yaml
+++ b/config/packages/pihole.yaml
@@ -15,7 +15,7 @@ automation:
     action:
       - delay: '00:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:00'
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "I blocked {{states.sensor.pi_hole_ads_blocked_today.state}} ads. That is {{states.sensor.pi_hole_ads_percentage_blocked_today.state}}% of my internet traffic.",
@@ -37,7 +37,7 @@ automation:
     action:
       - delay: '0{{ (range(1, 5)|random|int) }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:00'
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "There are currently {{states.sensor.pi_hole_dns_unique_clients.state}} clients on my network.",
diff --git a/config/packages/powerwall.yaml b/config/packages/powerwall.yaml
index 6dc80618..1e7dddb0 100755
--- a/config/packages/powerwall.yaml
+++ b/config/packages/powerwall.yaml
@@ -26,7 +26,7 @@ automation:
           value_template: "{{ states('binary_sensor.grid_status') == 'off' }}"
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('on', 'up')|replace('off', 'down') }}."
           value1: "Please verify with the Tesla App."
           who: 'parents'
@@ -48,7 +48,7 @@ automation:
          - group.interior_lights
          - group.exterior_lights
       - service: script.notify_engine
-        data_template:
+        data:
          title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('True', 'up')|replace('False', 'down') }}."
          value1: "Taking actions to turning off the House Lights to preserve Battery Power."
          who: 'family'
@@ -62,7 +62,7 @@ automation:
          - group.exterior_lights
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: "Because of the Power Outage, the Lights will be recycled for 3 minutes.  Lights may turn on and off during this time."
 
       - delay:
@@ -73,7 +73,7 @@ automation:
           - group.exterior_lights
 
       - service: script.speech_engine
-        data_template:
+        data:
           value1: "Automatic light recycling has been completed.  Any abnormalities will have to be addressed in the Hue App most likely. "
 
 # https://github.com/CCOSTAN/Home-AssistantConfig/issues/547
@@ -100,7 +100,7 @@ automation:
            - climate.upstairs
 
       - service: script.notify_engine
-        data_template:
+        data:
           title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('True', 'up')|replace('False', 'down') }}."
           value1: "Taking actions to turning off the AC units to preserve Battery Power."
           who: 'family'
@@ -144,7 +144,7 @@ automation:
           preset_mode: eco
 
       - service: script.notify_engine
-        data_template:
+        data:
           title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('True', 'up')|replace('False', 'down') }}."
           value1: "All AC systems are set back to normal operations."
           who: 'family'
diff --git a/config/packages/processmonitor.yaml b/config/packages/processmonitor.yaml
index 678647cf..4e1f2bea 100755
--- a/config/packages/processmonitor.yaml
+++ b/config/packages/processmonitor.yaml
@@ -31,7 +31,7 @@ automation:
         above: 80
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           value1: 'Hard Drive Monitor:'
           value2: "Your harddrive is running out of Space! /dev/root:{{ states.sensor.disk_use_percent.state }}%!"
           value3: 'Attempting to clean'
@@ -46,7 +46,7 @@ automation:
         above: 90
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           value1: 'Hard Drive Monitor:'
           value2: "Your harddrive is running out of Space! /dev/root:{{ states.sensor.disk_use_percent.state }}%!"
           who: 'carlo'
diff --git a/config/packages/rachio.yaml b/config/packages/rachio.yaml
index 9818f9c0..48b7612a 100755
--- a/config/packages/rachio.yaml
+++ b/config/packages/rachio.yaml
@@ -28,13 +28,13 @@ automation:
 
     action:
       - service: mqtt.publish
-        data_template:
+        data:
           payload: '{{ states("sensor.date") }}'
           topic: 'ifttt/rachio/watering_time'
           retain: true
 
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "Just finished watering the lawn with @_Rachio.",
diff --git a/config/packages/radio.yaml.disabled b/config/packages/radio.yaml.disabled
index 5c28c465..a505f382 100755
--- a/config/packages/radio.yaml.disabled
+++ b/config/packages/radio.yaml.disabled
@@ -41,11 +41,11 @@ input_boolean:
 #       - service: media_player.volume_set
 #         entity_id:
 #           - media_player.livingroomCC
-#         data_template:
+#         data:
 #           volume_level: 0.2
 #
 #       - service: media_player.play_media
-#         data_template:
+#         data:
 #           entity_id:
 #             - media_player.LivingRoomCC
 #           media_content_id: "http://listen.181fm.com/181-kickincountry_128k.mp3"
diff --git a/config/packages/roku.yaml b/config/packages/roku.yaml
index 114532e4..9cfe6d26 100755
--- a/config/packages/roku.yaml
+++ b/config/packages/roku.yaml
@@ -52,7 +52,7 @@ automation:
           command: find_remote
 
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Living Room Remote'
           value1: 'Find Remote'
           ios_category: "REMOTELR"
@@ -74,7 +74,7 @@ automation:
         entity_id: input_boolean.living_room_remote_finder
 
       - service: script.notify_engine
-        data_template:
+        data:
           title: 'Living Room Remote'
           value1: 'Remote has been found.'
           who: "family"
diff --git a/config/packages/skybellhd.yaml.disabled b/config/packages/skybellhd.yaml.disabled
index 9e77b91d..6ece46a7 100755
--- a/config/packages/skybellhd.yaml.disabled
+++ b/config/packages/skybellhd.yaml.disabled
@@ -92,5 +92,5 @@ automation:
   #Turn it back on!
     action:
       - service: homeassistant.turn_on
-        data_template:
+        data:
           entity_id: "{{ trigger.entity_id }}"
diff --git a/config/packages/space.yaml b/config/packages/space.yaml
index 8a6b7864..d3ca7447 100755
--- a/config/packages/space.yaml
+++ b/config/packages/space.yaml
@@ -43,12 +43,12 @@ automation:
 
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           value1: 'Go Outside!  There is a Rocket Launch very soon! {{states.sensor.next_launch.attributes.stream }}'
           apns_id: 'information'
 
       - service: script.tweet_engine_no_image
-        data_template:
+        data:
           tweet: >-
             {{ [
             "There is a Rocket launch happening right now!  I can see it if I look closely. {{states.sensor.next_launch.attributes.stream }}",
@@ -70,7 +70,7 @@ automation:
 
     action:
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >-
             {{ [
             "The ISS is above me right now!",
@@ -96,7 +96,7 @@ automation:
     action:
       - delay: '0{{ (range(1, 5)|random|int) }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:00'
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >-
             {{ [
             "There is a Full Moon out tonight!",
diff --git a/config/packages/travis.yaml b/config/packages/travis.yaml
index b478719f..3c99d3d5 100755
--- a/config/packages/travis.yaml
+++ b/config/packages/travis.yaml
@@ -31,7 +31,7 @@ automation:
 
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           value1: 'Travis validation testing failed.'
           who: 'carlo'
           apns: 'information'
diff --git a/config/packages/triggers/last_message.yaml b/config/packages/triggers/last_message.yaml
index 6121c02c..6349aff6 100755
--- a/config/packages/triggers/last_message.yaml
+++ b/config/packages/triggers/last_message.yaml
@@ -38,7 +38,7 @@ automation:
           - media_player.livingroomCC
           - media_player.entry_alarm_panel
           - media_player.bedroom_alarm_panel
-        data_template:
+        data:
           message: >
             <speak>
             {{states.sensor.last_message.state}}
diff --git a/config/packages/triggers/self_destruct.yaml b/config/packages/triggers/self_destruct.yaml
index fe79ef2f..3ec15dd5 100755
--- a/config/packages/triggers/self_destruct.yaml
+++ b/config/packages/triggers/self_destruct.yaml
@@ -47,7 +47,7 @@ automation:
           - media_player.livingroomCC
           - media_player.entry_alarm_panel
           - media_player.bedroom_alarm_panel
-      data_template:
+      data:
         media_content_id: >
           "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/speechcons/self_destruct.mp3"
         media_content_type: audio/mp4
diff --git a/config/packages/triggers/sleepy_dog.yaml b/config/packages/triggers/sleepy_dog.yaml
index e8c56b5c..12345080 100755
--- a/config/packages/triggers/sleepy_dog.yaml
+++ b/config/packages/triggers/sleepy_dog.yaml
@@ -35,7 +35,7 @@ automation:
       - service: input_boolean.turn_off
         entity_id: input_boolean.sleepy_dog
       - service: script.speech_engine
-        data_template:
+        data:
           call_no_announcement: 1
           value1: >
             {{ [
diff --git a/config/packages/twitter.yaml b/config/packages/twitter.yaml
index c93ce16d..591f4f8a 100755
--- a/config/packages/twitter.yaml
+++ b/config/packages/twitter.yaml
@@ -189,7 +189,7 @@ automation:
 
     action:
       - service: media_player.play_media
-        data_template:
+        data:
           entity_id:
             - media_player.livingroomCC
             - media_player.bedroom_alarm_panel
@@ -207,7 +207,7 @@ automation:
 
     action:
       - service: script.tweet_engine_image
-        data_template:
+        data:
           tweet: >-
             {% set repo = trigger.event.data.repo %}
             {% set issue = trigger.event.data.issue %}
@@ -253,7 +253,7 @@ automation:
     action:
       - delay: '0{{ range(0,2) | random | int }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}'
       - service: script.tweet_engine_random
-        data_template:
+        data:
           pick: >-
             {% set pick = [
               "solar",
@@ -293,7 +293,7 @@ automation:
     action:
       - delay: '0{{ range(0,2) | random | int }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}'
       - service: script.tweet_youtube_engine_setup
-        data_template:
+        data:
           pick: !include ../templates/speech/youtube_picker.yaml
 
   - alias: 'Random YouTube Videos CCostan'
@@ -320,6 +320,6 @@ automation:
       #     {%- endif -%}
     action:
       - service: script.tweet_youtube_engine_setup
-        data_template:
+        data:
           who: 'ccostan'
           pick: !include ../templates/speech/youtube_picker.yaml
diff --git a/config/packages/youtube.yaml b/config/packages/youtube.yaml
index dcc1fd9a..58781748 100755
--- a/config/packages/youtube.yaml
+++ b/config/packages/youtube.yaml
@@ -31,7 +31,7 @@ automation:
       - delay: '00:10:00'
       
       - service: script.tweet_engine_no_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "New Video! {{ states('sensor.vcloudinfo') }} - {{ state_attr('sensor.vcloudinfo','url') }} "
@@ -41,7 +41,7 @@ automation:
       - delay: '00:10:00'
 
       - service: script.tweet_engine_no_image
-        data_template:
+        data:
           tweet: >
             {{ [
             "New Video! {{ states('sensor.vcloudinfo') }} - {{ state_attr('sensor.vcloudinfo','url') }} "
diff --git a/config/script/amp_settings.yaml b/config/script/amp_settings.yaml
index a7726388..0d22305b 100755
--- a/config/script/amp_settings.yaml
+++ b/config/script/amp_settings.yaml
@@ -7,7 +7,7 @@
 amp_settings:
   sequence:
     - service: media_player.volume_set
-      data_template:
+      data:
         entity_id: >-
             {% if media_player | length == 0 %}
               {% set media_player = [
diff --git a/config/script/dog_bark.yaml b/config/script/dog_bark.yaml
index 4cbf36d7..64fbfbb7 100755
--- a/config/script/dog_bark.yaml
+++ b/config/script/dog_bark.yaml
@@ -2,7 +2,7 @@
 ###Script to send notifications to the ChromeCast Audios during normal hours and only when we are home! Call like this:
   # action:
     # service: script.dog_bark
-    # data_template:
+    # data:
       # value1: 'Startup: Home Assistant is Up and Running!'
 
 ######################################################################################################
@@ -31,7 +31,7 @@ dog_bark:
     - service: media_player.volume_set
       entity_id:
         - media_player.livingroomCC
-      data_template:
+      data:
         volume_level: >
           {% if now().strftime("%H")|int < 12 and now().strftime("%H")|int > 6%}
           0.45
@@ -42,7 +42,7 @@ dog_bark:
           {% endif %}
 
     - service: media_player.play_media
-      data_template:
+      data:
         entity_id:
           - media_player.livingroomCC
           - media_player.entry_alarm_panel
diff --git a/config/script/emergency.yaml b/config/script/emergency.yaml
index 993415da..701ba67c 100755
--- a/config/script/emergency.yaml
+++ b/config/script/emergency.yaml
@@ -22,7 +22,7 @@ emergency:
         flash: long
       # Rachio is already inergrated Natively with Protects to run SPRINKLERS with smoke conditions..
 #    - service: ifttt.trigger
-#      data_template: {"event":"rachio_start_front"}
+#      data: {"event":"rachio_start_front"}
 
       # Turn on All LIGHTS 100% Brightness
     - service: light.turn_on
diff --git a/config/script/monthly_color_scene.yaml b/config/script/monthly_color_scene.yaml
index 0a138128..a509d131 100755
--- a/config/script/monthly_color_scene.yaml
+++ b/config/script/monthly_color_scene.yaml
@@ -21,7 +21,7 @@ monthly_color_scene:
       state: 'below_horizon'
 
     - service: scene.turn_on
-      data_template:
+      data:
         entity_id: >
           scene.month_
           {%- if states.sensor.flag.state == "True" -%}
diff --git a/config/script/notify_engine.yaml b/config/script/notify_engine.yaml
index 80dfbe97..6ab03a9f 100755
--- a/config/script/notify_engine.yaml
+++ b/config/script/notify_engine.yaml
@@ -2,7 +2,7 @@
 ###Script to send notifications to IFTTT to notify me on the mobile Phone! Call like this:
   # action:
     # service: script.notify_engine
-    # data_template:
+    # data:
       # title: 'Ios Title'
       # value1: 'Startup: Home Assistant is Up and Running!'
       # value2: "{{ trigger.to_state.state }}"
@@ -26,9 +26,9 @@ notify_engine:
           entity_id: input_boolean.text_notifications
           state: 'on'
     # - service: ifttt.trigger
-    #   data_template: {"event":"notify_engine", "value1":"{{ value1 }}", "value2":"{{ value2 }}", "value3":"{{ value3 }}"}
+    #   data: {"event":"notify_engine", "value1":"{{ value1 }}", "value2":"{{ value2 }}", "value3":"{{ value3 }}"}
 
-    - service_template: >
+    - service: >
           {% if who == 'stacey' %}
             notify.mobile_app_stacey_6s
           {% elif who == 'carlo' %}
@@ -40,7 +40,7 @@ notify_engine:
           {% else %}
             notify.ios_family
           {% endif %}
-      data_template:
+      data:
         title: "{{ title }}"
         message: "{{ value1 }} {{ value2 }} {{ value3 }}"
         data:
diff --git a/config/script/skybell_pressed.yaml b/config/script/skybell_pressed.yaml
index e8402015..2b30e81c 100755
--- a/config/script/skybell_pressed.yaml
+++ b/config/script/skybell_pressed.yaml
@@ -14,7 +14,7 @@ skybell_pressed:
         message: "Someone Pressed the Doorbell."
 
     - service: script.speech_engine
-      data_template:
+      data:
         value1: >
           {{ [
           "Please check the Front Door.  Someone Pressed the Doorbell.",
@@ -26,7 +26,7 @@ skybell_pressed:
           ] | random }}
 
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'Front DoorBell'
         value1: 'Someone pressed the doorbell'
         who: 'family'
@@ -38,7 +38,7 @@ skybell_pressed:
     - service: script.flash_notify
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Oh, that tickled. Someone just pressed the @MySkyBell.",
diff --git a/config/script/speech_engine.yaml b/config/script/speech_engine.yaml
index f2de1022..c9581abd 100755
--- a/config/script/speech_engine.yaml
+++ b/config/script/speech_engine.yaml
@@ -28,7 +28,7 @@ speech_engine:
           state: 'on'
 
     - service: script.speech_processing
-      data_template:
+      data:
         media_player: >-
             {% if media_player | length == 0 %}
               {% set media_player = [
diff --git a/config/script/speech_processing.yaml b/config/script/speech_processing.yaml
index 3af4b656..310c0805 100755
--- a/config/script/speech_processing.yaml
+++ b/config/script/speech_processing.yaml
@@ -12,7 +12,7 @@ speech_processing:
   mode: queued
   sequence:
     - service: mqtt.publish
-      data_template:
+      data:
         topic: 'polly/lastmsg'
         payload: "This message is from {{ now().strftime('%-I') }}:{{ now().strftime('%M') }} {{ now().strftime('%p') }}. {{ speech_message | truncate(220)}}"
         retain: true
@@ -48,7 +48,7 @@ speech_processing:
       entity_id: switch.lr_amp
 
     - service: media_player.volume_set
-      data_template:
+      data:
         entity_id: >
           {{ media_player }}
         volume_level: >-
@@ -61,7 +61,7 @@ speech_processing:
           {% endif %}
 
     # - service: notify.alexa_media
-    #   data_template:
+    #   data:
     #     data:
     #       type: tts
     #     target: >
@@ -74,7 +74,7 @@ speech_processing:
     #         {{ speech_message }}
 
     - service: tts.amazon_polly_say
-      data_template:
+      data:
         entity_id: media_player.livingroomCC
         message: >-
           <speak>
diff --git a/config/script/speechcons.yaml.disabled b/config/script/speechcons.yaml.disabled
index 1fb2d1bf..a8eaeb89 100755
--- a/config/script/speechcons.yaml.disabled
+++ b/config/script/speechcons.yaml.disabled
@@ -2,7 +2,7 @@
 ###Script to send notifications to the ChromeCast Audios during normal hours and only when we are home! Call like this:
   # action:
     # service: script.speechcons
-    # data_template:
+    # data:
       # speechcon: 'Bazinga'
 # @CCOSTAN
 # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
@@ -29,7 +29,7 @@ speechcon:
     - service: media_player.volume_set
       entity_id:
         - media_player.livingroomCC
-      data_template:
+      data:
         volume_level: >
           {% if now().strftime("%H")|int < 12 and now().strftime("%H")|int > 6%}
           0.3
@@ -42,7 +42,7 @@ speechcon:
     - service: media_player.play_media
       entity_id:
         - media_player.LivingRoomCC
-      data_template:
+      data:
         media_content_id: >
           "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/speechcons/{{speechcon}}._TTH_.mp3"
         media_content_type: audio/mp4
diff --git a/config/script/tweet.yaml b/config/script/tweet.yaml
index 39ea550a..d770a0b8 100755
--- a/config/script/tweet.yaml
+++ b/config/script/tweet.yaml
@@ -11,19 +11,19 @@
 tweet_engine_image:
    sequence:
     - service: mqtt.publish
-      data_template:
+      data:
         topic: 'ifttt/message'
         payload: >-
           {{ tweet }}
         retain: true
 
-    - service_template: >
+    - service: >
           {% if who == 'ccostan' %}
             notify.ccostan
           {% else %}
             notify.bearstoneha
           {% endif %}
-      data_template:
+      data:
         message: >-
           {{ tweet }} #IOT #SmartHome
         data:
@@ -33,19 +33,19 @@ tweet_engine_image:
 tweet_engine_no_image:
    sequence:
     - service: mqtt.publish
-      data_template:
+      data:
         topic: 'ifttt/message'
         payload: >-
           {{ tweet }}
         retain: true
 
-    - service_template: >
+    - service: >
           {% if who == 'ccostan' %}
             notify.ccostan
           {% else %}
             notify.bearstoneha
           {% endif %}
-      data_template:
+      data:
         message: >-
           {{ tweet }} #IOT #SmartHome
 
@@ -53,7 +53,7 @@ tweet_engine_no_image:
 tweet_engine_random:
    sequence:
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >-
           {%- macro tweet(topic) -%}
             {% set tweets = {
@@ -285,10 +285,10 @@ tweet_engine_random:
 
 
     # - service: ifttt.trigger
-    #   data_template: {"event":"facebook_tweet", "value1":"{{ tweet }}", "value2":"{{ value2 }}", "value3":"{{ value3 }}"}
+    #   data: {"event":"facebook_tweet", "value1":"{{ tweet }}", "value2":"{{ value2 }}", "value3":"{{ value3 }}"}
 
     # - service: ifttt.trigger
-    #   data_template:
+    #   data:
     #     event: >-
     #       facebook_tweet
     #     value1: >
diff --git a/config/script/tweet_youtube.yaml b/config/script/tweet_youtube.yaml
index 7ec2d122..e0454569 100755
--- a/config/script/tweet_youtube.yaml
+++ b/config/script/tweet_youtube.yaml
@@ -8,7 +8,7 @@
 tweet_youtube_engine_setup:
    sequence:
     - service: script.tweet_engine_image
-      data_template:
+      data:
         who: '{{ who }}'
         tweet: >-
           {%- macro tweet(topic) -%}
diff --git a/config/www/custom_ui/floorplan/clock.yaml b/config/www/custom_ui/floorplan/clock.yaml
index 4e8b1eaa..80a4bb8d 100755
--- a/config/www/custom_ui/floorplan/clock.yaml
+++ b/config/www/custom_ui/floorplan/clock.yaml
@@ -39,7 +39,7 @@ rules:
   - entity: media_player.alarm_clock
     image_template: '/local/custom_ui/floorplan/buttons/${(entity.state === "playing") ? "stop" : "radio_on"}.svg'
     action:
-      service_template: '${(entity.state === "playing") ? "media_player.media_stop" : "media_player.play_media"}'
+      service: '${(entity.state === "playing") ? "media_player.media_stop" : "media_player.play_media"}'
       data:
         media_content_id: http://listen.djcmedia.com:80/americascountryhigh
         media_content_type: audio/mp4
diff --git a/config/www/custom_ui/floorplan/clock_config.yaml b/config/www/custom_ui/floorplan/clock_config.yaml
index 7c602c51..9ee805b6 100755
--- a/config/www/custom_ui/floorplan/clock_config.yaml
+++ b/config/www/custom_ui/floorplan/clock_config.yaml
@@ -72,7 +72,7 @@ rules:
   - element: floorplan.save_alarm_time_button
     action:
       service: mqtt.publish
-      data_template: '{
+      data: '{
         "payload": "${(("0" + (parseInt((entities[`floorplan.hours`].state).slice(-2)) + 24) % 24)).slice(-2)}:${("0" + (((parseInt(entities[`floorplan.minutes`].state) / 5) * 5) % 60)).slice(-2)}",
         "topic": "clock/stacey_alarm_time",
         "retain": true
@@ -91,7 +91,7 @@ rules:
   - entity: media_player.alarm_clock
     image_template: '/local/custom_ui/floorplan/buttons/${(entity.state === "playing") ? "stop" : "radio_on"}.svg'
     action:
-      service_template: '${(entity.state === "playing") ? "media_player.media_stop" : "media_player.play_media"}'
+      service: '${(entity.state === "playing") ? "media_player.media_stop" : "media_player.play_media"}'
       data:
         media_content_id: http://listen.djcmedia.com:80/americascountryhigh
         media_content_type: audio/mp4
diff --git a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png
index 01f67128..d78236a2 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png and b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png differ