diff --git a/config/automation/Timed_Triggers/startup_notification.yaml b/config/automation/Timed_Triggers/startup_notification.yaml
index ff1f7843..bb1ef470 100755
--- a/config/automation/Timed_Triggers/startup_notification.yaml
+++ b/config/automation/Timed_Triggers/startup_notification.yaml
@@ -10,7 +10,8 @@
   action:
     - service: script.notify_engine
       data_template:
-        value1: 'Startup: Home Assistant is Up and Running!'
+        title: 'Home Assistant StartUp'
+        value1: 'Home Assistant is Up and Running!'
         who: 'carlo'
 
     - service: light.turn_off
diff --git a/config/automation/garadget.yaml b/config/automation/garadget.yaml
index 71613cf1..44ea8796 100755
--- a/config/automation/garadget.yaml
+++ b/config/automation/garadget.yaml
@@ -24,10 +24,11 @@
   action:
     - service: script.notify_engine
       data_template:
-        value1: 'Check Garage Doors Reflection:'
-        value2: "Small: {{ states('sensor.small_garage_reflection_rate')}}"
-        value3: "Large: {{ states('sensor.large_garage_reflection_rate')}}"
+        title: 'Check Garage Doors Reflection:'
+        value1: "Small: {{ states('sensor.small_garage_reflection_rate')}}"
+        value2: "Large: {{ states('sensor.large_garage_reflection_rate')}}"
         who: "carlo"
+        camera_entity: "camera.camera2"
 
 ##############################################################################
 
@@ -75,10 +76,11 @@
   action:
     - service: script.notify_engine
       data_template:
-        value1: 'Check Garage Doors:'
-        value2: "Small: {{ states('cover.small_garage')}}"
-        value3: "Large: {{ states('cover.large_garage')}}"
+        title: 'Check Garage Doors:'
+        value1: "Small: {{ states('cover.small_garage')}}"
+        value2: "Large: {{ states('cover.large_garage')}}"
         who: "family"
+        camera_entity: "camera.camera2"
 
     - service: script.speech_engine
       data_template:
diff --git a/config/packages/skybellhd.yaml b/config/packages/skybellhd.yaml
index 58e8cede..a029b449 100755
--- a/config/packages/skybellhd.yaml
+++ b/config/packages/skybellhd.yaml
@@ -83,31 +83,7 @@ automation:
 
     action:
       - service: script.skybell_pressed
-      - service: script.tweet_engine_image
-        data_template:
-          tweet: >
-            {{ [
-            "Oh, that tickled. Someone just pressed the @MySkyBell.",
-            "Ouch! That hurt. Who touched the SkyBell Doorbell?",
-            "Someone just poked me in the @MySkybell!",
-            "I see you! You are at the @MySkyBell and you just pressed it.",
-            "Someone answer my door.  Someone just pressed the doorbell.",
-            "Knock, Knock.  Housekeeping? Just kiddin', someone just rang the doorbell."
-            ] | random + [
-            " #Security",
-            " (https://github.com/CCOSTAN/Home-AssistantConfig#cameras)",
-            " (http://www.vmwareinfo.com/2017/07/my-smart-home-look-at-parts-that-make.html)",
-            " #HomeAutomation"
-            ] | random }}
-          image: >-
-            {{ [
-            "/config/www/custom_ui/floorplan/images/branding/sleeping.png",
-            "/config/www/custom_ui/floorplan/images/branding/door.png",
-            "/config/www/custom_ui/floorplan/images/branding/door2.png",
-            "/config/www/custom_ui/floorplan/images/branding/light4.png",
-            "/config/www/custom_ui/floorplan/images/branding/landscape_light.png",
-            "/config/www/custom_ui/floorplan/images/branding/camera.png",
-            ] | random }}
+
 
 # Motion Sensing
   - alias: 'Log SkyBell Motion detection'
diff --git a/config/script/notify_engine.yaml b/config/script/notify_engine.yaml
index 178e8e2b..fdb5ebaa 100755
--- a/config/script/notify_engine.yaml
+++ b/config/script/notify_engine.yaml
@@ -28,10 +28,19 @@ notify_engine:
             notify.ios_carloxsmax
           {% elif who == 'parents' %}
             notify.ios_parents
+          {% elif who == 'family' %}
+            notify.ios_family
           {% else %}
             notify.ios_family
           {% endif %}
       data_template:
+        title: "{{ title }}"
         message: "{{ value1 }} {{ value2 }} {{ value3 }}"
         data:
-          subtitle: "Home Assistant Notify"
+          attachment:
+            content-type: "{{ content_type }}"
+            push:
+              sound: "{{ ios_sound }}"
+              badge: "{{ ios_badge }}"
+              category: "{{ ios_category }}"
+          entity_id: "{{ camera_entity }}"
diff --git a/config/script/skybell_pressed.yaml b/config/script/skybell_pressed.yaml
index 5d6bcc75..3af5cd56 100755
--- a/config/script/skybell_pressed.yaml
+++ b/config/script/skybell_pressed.yaml
@@ -13,15 +13,41 @@ skybell_pressed:
         name: "SkyBell HD Doorbell:"
         message: "Someone Pressed the Doorbell."
 
-    - service: script.flash_notify
     - service: script.speech_engine
       data:
         value1: 'Please check the Front Door.  Someone Pressed the Doorbell.'
 
-    - service: notify.ios_family
-      data:
-        message: Someone Pressed the Doorbell!
-        data:
-          push:
-            category: camera
-          entity_id: camera.stone_door
+    - service: script.notify_engine
+      data_template:
+        ios_title: 'DoorBell'
+        value1: 'Someone pressed the doorbell'
+        who: 'family'
+        camera_entity: camera.stone_door
+
+    - service: script.flash_notify
+    
+    - service: script.tweet_engine_image
+      data_template:
+        tweet: >
+          {{ [
+          "Oh, that tickled. Someone just pressed the @MySkyBell.",
+          "Ouch! That hurt. Who touched the SkyBell Doorbell?",
+          "Someone just poked me in the @MySkybell!",
+          "I see you! You are at the @MySkyBell and you just pressed it.",
+          "Someone answer my door.  Someone just pressed the doorbell.",
+          "Knock, Knock.  Housekeeping? Just kidding. Someone just rang the doorbell."
+          ] | random + [
+          " #Security",
+          " (https://github.com/CCOSTAN/Home-AssistantConfig#cameras)",
+          " (http://www.vmwareinfo.com/2017/07/my-smart-home-look-at-parts-that-make.html)",
+          " #HomeAutomation"
+          ] | random }}
+        image: >-
+          {{ [
+          "/config/www/custom_ui/floorplan/images/branding/sleeping.png",
+          "/config/www/custom_ui/floorplan/images/branding/door.png",
+          "/config/www/custom_ui/floorplan/images/branding/door2.png",
+          "/config/www/custom_ui/floorplan/images/branding/light4.png",
+          "/config/www/custom_ui/floorplan/images/branding/landscape_light.png",
+          "/config/www/custom_ui/floorplan/images/branding/camera.png",
+          ] | random }}