diff --git a/customizations/sensors.yaml b/customizations/sensors.yaml
index d4f5049e9cf388c621f8e475b7b3d395f262bff1..fb7b5e2d68a3e812580c98666ed98c525014100c 100644
--- a/customizations/sensors.yaml
+++ b/customizations/sensors.yaml
@@ -65,3 +65,36 @@ binary_sensor.office_motion_sensor_over_closet:
   friendly_name: Office near closet
 binary_sensor.office_motion_sensor_far_wall:
   friendly_name: Office far wall
+sensor.pws_weather:
+  friendly_name: Weather
+sensor.pws_temp_f:
+  friendly_name: Temperature
+sensor.pws_feelslike_string:
+  friendly_name: Feels Like
+  icon: mdi:thermometer
+sensor.pws_heat_index_string:
+  friendly_name: Heat Index
+  icon: mdi:thermometer
+sensor.pws_relative_humidity:
+  friendly_name: Humidity
+  icon: mdi:weather-rainy
+sensor.pws_dewpoint_string:
+  friendly_name: Dewpoint
+  icon: mdi:weather-rainy
+sensor.pws_wind_string:
+  friendly_name: Wind
+  icon: mdi:weather-windy
+sensor.pws_precip_today_string:
+  friendly_name: Precipitation
+  icon: mdi:weather-rainy
+sensor.pws_pressure_in:
+  friendly_name: Pressure
+  icon: mdi:thermometer-lines
+sensor.pws_visibility_mi:
+  friendly_name: Visibility
+sensor.pws_uv:
+  friendly_name: UV
+  icon: mdi:weather-sunny
+sensor.pws_solarradiation:
+  friendly_name: Solar Radiation
+  icon: mdi:weather-sunny
diff --git a/device-tracker.yaml b/device-tracker.yaml
index 4de636347379688a9c49cfd994a6e017dc2ed610..664553d2c5c6743de71376db53ba7b98a5436542 100644
--- a/device-tracker.yaml
+++ b/device-tracker.yaml
@@ -4,8 +4,6 @@
     green_keys: smartthings/Green Keys/presence
 - platform: asuswrt
   host: 192.168.1.1
-  protocol: ssh
-  mode: router
   username: !secret asus_user
   ssh_key: !secret asus_key
   consider_home: 90
diff --git a/groups.yaml b/groups.yaml
index c3e749d97027d9b1e99b9ed761c5be80747067d2..f93aad4fd5423502679e13426d3150a9afd4dcec 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -1,7 +1,7 @@
 default_view:
   name: DEFAULT
-  icon: mdi:home
   view: yes
+  icon: mdi:home
   entities:
     - group.locks
     - group.master_bedroom
@@ -15,6 +15,7 @@ default_view:
 sensor_view:
   name: Sensors
   view: yes
+  icon: mdi:gauge
   entities:
     - group.temperature
     - group.motion_sensors
@@ -25,17 +26,25 @@ sensor_view:
     - sensor.speedtest_ping
     - sensor.speedtest_download
     - sensor.speedtest_upload
-    - sensor.fastcom_speedtest
+    - sensor.fastcom_download
     - sun.sun
 status_view:
   name: Status
   view: yes
+  icon: mdi:chip
   entities:
     - group.sensor_pi
     - group.sensor_battery_levels
+weather_view:
+  name: Weather
+  view: yes
+  icon: mdi:white-balance-sunny
+  entities:
+    - group.wunderground
 misc_view:
   name: Misc
   view: yes
+  icon: mdi:power
   entities:
     - group.scripts_misc
     - media_player.nexus_player
@@ -208,3 +217,18 @@ scripts_misc:
   name: Actions
   entities:
     - script.restart_august_daemon
+wunderground:
+  name: Wunderground
+  entities:
+    - sensor.pws_weather
+    - sensor.pws_temp_f
+    - sensor.pws_feelslike_string
+    - sensor.pws_heat_index_string
+    - sensor.pws_relative_humidity
+    - sensor.pws_dewpoint_string
+    - sensor.pws_wind_string
+    - sensor.pws_precip_today_string
+    - sensor.pws_pressure_in
+    - sensor.pws_visibility_mi
+    - sensor.pws_uv
+    - sensor.pws_solarradiation
diff --git a/secrets.yaml b/secrets.yaml
index 9163c3452aa952c6cd45f09affce66757abaa764..52d328219a95ca379e2f0c3e0f8fc7ae7c0755c3 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -6,3 +6,7 @@ jabber_recipient:
 jabber_password: ""
 asus_user:
 asus_key:
+gravatar_erick:
+gravatar_chris:
+wunderground_key:
+wunderground_pws_id:
diff --git a/sensors/wunderground.yaml b/sensors/wunderground.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ea2cd78f49f10c3c1f7389ba4fb78745124fab37
--- /dev/null
+++ b/sensors/wunderground.yaml
@@ -0,0 +1,31 @@
+platform: wunderground
+api_key: !secret wunderground_key
+pws_id: !secret wunderground_pws_id
+monitored_conditions:
+  - weather
+  - temp_f
+  - temp_c
+  - station_id
+  - feelslike_c
+  - feelslike_f
+  - feelslike_string
+  - heat_index_c
+  - heat_index_f
+  - heat_index_string
+  - dewpoint_c
+  - dewpoint_f
+  - dewpoint_string
+  - wind_kph
+  - wind_mph
+  - UV
+  - pressure_in
+  - pressure_mb
+  - wind_dir
+  - wind_string
+  - relative_humidity
+  - visibility_mi
+  - visibility_km
+  - precip_today_in
+  - precip_today_metric
+  - precip_today_string
+  - solarradiation