diff --git a/README.md b/README.md
index c13681b1..001bca55 100755
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ SSL via [SSLS](https://SSLS.com) - 5 Bucks A Year! - Keeps me safe!
 * [Ubiquiti Networks Unifi 802.11ac Pro](http://amzn.to/2mBSfE9) This keeps me warm with it's Wifi rays blanketing the house. Also used as a presence Tracker for iPhones/People.
 * Lots of iOS Devices ([iPads](http://amzn.to/2l2qyRb), iPods, [iPhones](http://amzn.to/2l9Yoq9))
 * [Nest Thermostats](http://amzn.to/2eAhB1k) - Smart Thermostat
+* [Nest Protects](http://amzn.to/2poqKhu) - Smart Smoke Detectors
 * [Amazon Echo](http://amzn.to/2dSVbK4) and [DOT](http://amzn.to/2e3vHFQ)
 * [Amazon Dash Buttons](http://amzn.to/2dPKZhM)
 * [Amazon Fire TV](http://amzn.to/2iiuaNT)
diff --git a/configuration.yaml b/configuration.yaml
index fd41a447..2c6daac0 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -19,6 +19,11 @@ http:
   ip_ban_enabled: True
   login_attempts_threshold: 3
 
+panel_iframe:
+  pihole:
+    title: 'Pi-hole'
+    icon: mdi:chart-pie
+    url: http://carlo-pihole/admin
 frontend:
 ios:
 
diff --git a/packages/uv_rays.yaml.disabled b/packages/uv_rays.yaml.disabled
index 268c8f0b..f26cbde8 100755
--- a/packages/uv_rays.yaml.disabled
+++ b/packages/uv_rays.yaml.disabled
@@ -2,69 +2,28 @@
 ################################################################
 ## Packages / Weather
 ## Dependencies: DARKSKY - https://darksky.net/dev/
-##               UVIMATE - https://uvimate.herokuapp.com/uvindex-api
-##                          !secret uv_mate_key: API KEY HERE
-##                          !secret uv_mate_resource: https://uvimate.herokuapp.com/api/getUVI/longitude/latitude
+## WUNDERGROUND - https://home-assistant.io/components/sensor.wunderground/
 ################################################################
 #-------------------------------------------
 homeassistant:
   customize:
-      sensor.uv_index:
+      sensor.pws_uv:
         friendly_name: 'UV Index'
         icon: mdi:white-balance-sunny
         emulated_hue: False
         hidden: False
-      sensor.uv_peak:
-        friendly_name: 'Peak UV Index'
-        icon: mdi:white-balance-sunny
-        emulated_hue: False
-        hidden: False
+
       sensor.uv_burn_time:
         friendly_name: 'Burn Time'
         icon: mdi:fire
         emulated_hue: False
         hidden: False
-      sensor.uv_sun_advice:
-        friendly_name: 'Sun Advice'
-        icon: mdi:sunglasses
-        emulated_hue: False
-        hidden: False
+
 #-------------------------------------------
 ######  UV
 sensor:
-  - platform: rest
-    name: uv_index
-    resource: !secret uv_mate_resource
-    method: GET
-    headers:
-      x-access-token: !secret uv_mate_key
-    value_template: '{{ value_json.result.uviData.uvi | round(2) }}'
-    scan_interval: 3600
-
-  - platform: rest
-    name: uv_peak
-    resource: !secret uv_mate_resource
-    method: GET
-    headers:
-      x-access-token: !secret uv_mate_key
-    value_template: "{{ value_json.result.uviData.uviMax | round(2) }} at {{ as_timestamp(value_json.result.uviData.uviMaxTime) | timestamp_custom('%I:%M') }}"
-    scan_interval: 3600
-
-  - platform: rest
-    name: uv_sun_advice
-    resource: !secret uv_mate_resource
-    method: GET
-    headers:
-      x-access-token: !secret uv_mate_key
-    value_template: '{{ value_json.result.sunAdvice.advice }}'
-    scan_interval: 3600
-
-  - platform: rest
-    name: uv_burn_time
-    resource: !secret uv_mate_resource
-    method: GET
-    headers:
-      x-access-token: !secret uv_mate_key
-    value_template: '{{ value_json.result.burnTime.mediterranean }}'
-    unit_of_measurement: Minutes
-    scan_interval: 3600
+  - platform: wunderground
+    api_key: !secret wunderground_key
+    pws_id: !secret wunderground_station
+    monitored_conditions:
+      - UV