diff --git a/config/.HA_VERSION b/config/.HA_VERSION
index b8f7d529..d2137b7c 100755
--- a/config/.HA_VERSION
+++ b/config/.HA_VERSION
@@ -1 +1 @@
-0.115.6
\ No newline at end of file
+0.116.0
\ No newline at end of file
diff --git a/config/homekit.yaml b/config/homekit.yaml
index 4918bf84..604e54fb 100755
--- a/config/homekit.yaml
+++ b/config/homekit.yaml
@@ -20,9 +20,9 @@ filter:
     - scene
     - light
   include_entities:
-    - camera.camera1
-    - camera.camera2
-    - camera.camera3
+    - camera.carlo_nvr_camera1
+    - camera.carlo_nvr_camera2
+    - camera.carlo_nvr_camera3
     - camera.front_door
     - light.bedroom
     - light.bedroom_lights
@@ -42,15 +42,15 @@ filter:
     - switch.lr_amp
   # exclude_entities:
 entity_config:
-  camera.camera1:
+  camera.carlo_nvr_camera1:
     linked_motion_sensor: binary_sensor.camera1_motion_sensor
     video_codec: copy
     stream_source: !secret camera1_stream
-  camera.camera2:
+  camera.carlo_nvr_camera2:
     linked_motion_sensor: binary_sensor.camera2_motion_sensor
     video_codec: copy
     stream_source: !secret camera2_stream
-  camera.camera3:
+  camera.carlo_nvr_camera3:
     linked_motion_sensor: binary_sensor.camera3_motion_sensor
     video_codec: copy
     stream_source: !secret camera3_stream
diff --git a/config/packages/battery_levels.yaml b/config/packages/battery_levels.yaml.DISABLED
similarity index 100%
rename from config/packages/battery_levels.yaml
rename to config/packages/battery_levels.yaml.DISABLED
diff --git a/config/packages/foscam.yaml b/config/packages/foscam.yaml
index 82097705..152aad5e 100755
--- a/config/packages/foscam.yaml
+++ b/config/packages/foscam.yaml
@@ -3,23 +3,6 @@
 # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
 # More Info : https://www.vcloudinfo.com/2019/03/using-foscam-cameras-with-home-assistant-and-synology.html
 #-------------------------------------------
-# homeassistant:
-#   customize_glob:
-#     "*.*_sleep_hours":
-#       unit_of_measurement: hours
-#       icon: mdi:sleep
-#
-#
-#-------------------------------------------
-
-# camera:
-#   - platform: synology
-#     url: !secret synology_url
-#     username: !secret synology_username
-#     password: !secret synology_password
-#     timeout: 15
-#     verify_ssl: False
-
 
 binary_sensor:
   - platform: rest
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 ec64cbcb..8f1ed21d 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