diff --git a/.gitignore b/.gitignore
index fe0e53a0..563b847e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 .storage
 .uuid
 core.*
+core
 OZW_Log.txt
 home-assistant.log
 home-assistant_v2.db
@@ -33,8 +34,4 @@ nest.conf
 ipchange.yaml
 ip_bans.yaml
 production_auth.json
-<<<<<<< HEAD
 
-
-=======
->>>>>>> cd3d35d41e65e707044ab7c865ab2f343a3e0a07
diff --git a/config/configuration.yaml b/config/configuration.yaml
index 361b157b..07f6e84b 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -92,7 +92,7 @@ http:
   ssl_certificate: !secret ssl_certificate
   ssl_key: !secret ssl_key
   ip_ban_enabled: True
-  login_attempts_threshold: 2
+  login_attempts_threshold: 5
 
 frontend:
   javascript_version: latest
diff --git a/config/customize/sensors.yaml b/config/customize/sensors.yaml
index 6531aa26..531182c4 100755
--- a/config/customize/sensors.yaml
+++ b/config/customize/sensors.yaml
@@ -42,24 +42,6 @@ sensor.amazon_fire_stick:
   icon: mdi:fire
 
 
-
-sensor.carloxsmax_battery_level:
-  friendly_name: 'Carlo 6s+ Battery Level'
-
-  hidden: False
-  homebridge_hidden: True
-  icon: mdi:battery-40
-
-
-
-sensor.carloxsmax_battery_state:
-  friendly_name: 'Carlo 6s+ Battery State'
-
-  hidden: False
-  homebridge_hidden: True
-  icon: mdi:power-plug-off
-
-
 sensor.chromecast_audio_1:
   friendly_name: 'Chromecast Audio 1'
 
diff --git a/config/packages/ios.yaml b/config/packages/ios.yaml
index 457805c5..8981c43e 100755
--- a/config/packages/ios.yaml
+++ b/config/packages/ios.yaml
@@ -14,21 +14,16 @@ notify:
   - name: ios_family
     platform: group
     services:
-      - service: ios_staceys_iphone
-      - service: ios_carloxsmax
+      - service: mobile_app_stacey_6s
+      - service: mobile_app_carlo_xsmax
+      - service: mobile_app_paige_6s
   - name: ios_parents
     platform: group
     services:
-      - service: ios_staceys_iphone
-      - service: ios_carloxsmax
+      - service: mobile_app_stacey_6s
+      - service: mobile_app_carlo_xsmax
 
-group:
-  Phones:
-    entities:
-      - sensor.carloxsmax_battery_level
-      - sensor.carloxsmax_battery_state
-      - sensor.staceys_iphone_battery_level
-      - sensor.staceys_iphone_battery_state
+mobile_app:
 
 ios:
   push:
diff --git a/config/script/notify_engine.yaml b/config/script/notify_engine.yaml
index 6fc7ccfe..618cd5e5 100755
--- a/config/script/notify_engine.yaml
+++ b/config/script/notify_engine.yaml
@@ -30,9 +30,9 @@ notify_engine:
 
     - service_template: >
           {% if who == 'stacey' %}
-            notify.ios_staceys_iphone
+            notify.mobile_app_stacey_6s
           {% elif who == 'carlo' %}
-            notify.ios_carloxsmax
+            notify.mobile_app_carlo_xsmax
           {% elif who == 'parents' %}
             notify.ios_parents
           {% elif who == 'family' %}
@@ -51,7 +51,7 @@ notify_engine:
           apns_headers:
             'apns-collapse-id': "{{ apns_id }}"
           push:
-            sound: "{{ ios_sound }}"
-            badge: "{{ ios_badge }}"
+#           sound: "{{ ios_sound }}"
+#           badge: "{{ ios_badge }}"
             category: "{{ ios_category }}"
           entity_id: "{{ camera_entity }}"