diff --git a/config/.HA_VERSION b/config/.HA_VERSION
index 6903c5ba..8c273553 100755
--- a/config/.HA_VERSION
+++ b/config/.HA_VERSION
@@ -1 +1 @@
-0.78.3
\ No newline at end of file
+0.80.1
\ No newline at end of file
diff --git a/config/group/arris_stats.yaml b/config/group/arris_stats.yaml
new file mode 100755
index 00000000..c73355b1
--- /dev/null
+++ b/config/group/arris_stats.yaml
@@ -0,0 +1,13 @@
+media_players:
+  entities:
+    - media_player.livingroomcc
+    - media_player.living_room_tv
+    - media_player.living_room_ultra
+    - media_player.upstairs_living_room
+    - media_player.bedroom_alarm_panel
+    - media_player.living_room
+    - media_player.office
+    - media_player.kitchen
+    - media_player.justin_room
+    - media_player.tap
+    - media_player.upstairs
diff --git a/config/packages/arris_router.yaml b/config/packages/arris_router.yaml
new file mode 100755
index 00000000..4c2a2bda
--- /dev/null
+++ b/config/packages/arris_router.yaml
@@ -0,0 +1,50 @@
+#-------------------------------------------
+# @CCOSTAN
+# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
+# Neato Support for D7 Connected Botvac - control my [Neato Vacuum](http://amzn.to/2kqnnqu) with Home Assistant.
+#-------------------------------------------
+homeassistant:
+  customize_glob:
+    "*.arris_tg1682g_router*":
+      homebridge_hidden: True
+      hidden: False
+#-------------------------------------------
+
+group:
+  router:
+    name: Router Stats
+    control: hidden
+    entities:
+      - sensor.arris_tg1682g_router_bytes_received
+      - sensor.arris_tg1682g_router_bytes_sent
+      - sensor.arris_tg1682g_router_kbytesec_received
+      - sensor.arris_tg1682g_router_kbytesec_sent
+      - sensor.arris_tg1682g_router_packets_received
+      - sensor.arris_tg1682g_router_packets_sent
+      - sensor.arris_tg1682g_router_packetssec_received
+      - sensor.arris_tg1682g_router_packetssec_sent
+
+#############################################################################
+###  Automations - Alerts related to the JuiceBox (http://amzn.to/2AZVQ37)
+##############################################################################
+  #
+  # - alias: 'JuiceBox AMP Alert!'
+  #   initial_state: 'on'
+  #   trigger:
+  #     - platform: numeric_state
+  #       entity_id: sensor.carlojuice_amps
+  #       above: 24
+  #       for:
+  #         minutes: 2
+  #   action:
+  #     - service: input_boolean.turn_on
+  #       entity_id: input_boolean.alert_mode
+  #
+  #     - service: script.notify_engine
+  #       data_template:
+  #         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'
+  #
+  #     - service: script.speech_engine
+  #       data_template:
+  #         value1: "The Juice Box Charger is pulling {{ states('sensor.carlojuice_amps') }} AMPs.  This is above the safety mark of 30.  Please unplug charger immediately."
diff --git a/config/packages/rachio.yaml b/config/packages/rachio.yaml
index 3b8fd2bb..63d4f189 100755
--- a/config/packages/rachio.yaml
+++ b/config/packages/rachio.yaml
@@ -21,12 +21,6 @@ sensor:
     state_topic: "ifttt/rachio/watering_time"
     name: "Rachio_watering_time"
 
-binary_sensor:
-  - platform: rachio
-
-switch:
-  - platform: rachio
-
 group:
   rachio:
     entities:
@@ -37,7 +31,7 @@ group:
       - switch.front_lawn
       - switch.left_side_house
       - switch.front_hedges__right_side_house
-    
+
 automation:
   ###################################
   ##  LOG IFTTT Stuff - Rachio
diff --git a/config/sensor/systemmonitor.yaml b/config/sensor/systemmonitor.yaml
index 22f0b6e6..3015359f 100755
--- a/config/sensor/systemmonitor.yaml
+++ b/config/sensor/systemmonitor.yaml
@@ -44,7 +44,7 @@
 
 - platform: rest
   scan_interval: 86400
-  resource: https://icanhazip.com
+  resource: https://api.ipify.org/
   name: External IP
   value_template: '{{ value }}'
 
diff --git a/config/www/custom_ui/floorplan/images/branding/solar_readings.png b/config/www/custom_ui/floorplan/images/branding/solar_readings.png
index ade54c11..d4c6aacd 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/solar_readings.png and b/config/www/custom_ui/floorplan/images/branding/solar_readings.png differ