diff --git a/customize.yaml b/customize.yaml
index 5ac1ebe..18d37c6 100644
--- a/customize.yaml
+++ b/customize.yaml
@@ -73,6 +73,18 @@ sensor.dark_sky_visability:
   icon: mdi:eye-outline
   friendly_name: Visability
 
+sensor.dark_sky_daily_low_temperature:
+  friendly_name: Todays Low
+  icon: thermometer-lines
+
+sensor.dark_sky_daily_high_temperature:
+  friendly_name: Todays High
+  icon: thermometer-lines
+
+sensor.dark_sky_daily_max_precip_intensity:
+  friendly_name: Rain Intensity
+  icon: gauge
+
 # Devices #
 
 device_tracker.owntracks_jeffreysphone:
@@ -197,18 +209,20 @@ switch.rail_lights:
 
 sensor.garage_door:
   icon: mdi:garage
+  friendly_name: Garage Door
 
 cover.garage_door:
   icon: mdi:garage
+  friendly_name: Garage Door
 
 sensor.home_to_summit:
-  friendly_name: "Time to Summit"
+  friendly_name: "Home to Summit"
   icon: mdi:car
 
 sensor.home_to_zoo:
-  friendly_name: "Time to Zoo Atlanta"
+  friendly_name: "Home to Zoo Atlanta"
   icon: mdi:car
 
 sensor.pws_alerts:
   friendly_name: "Weather Alerts"
-  icon: mdi.alert
+  icon: mdi:alert
diff --git a/groups.yaml b/groups.yaml
index b7fdc99..2ffda55 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -58,9 +58,10 @@ weather:
   view: yes
   icon: mdi:weather-partlycloudy
   entities:
-    - group.weather
     - group.temperature
     - group.precipitation
+    - group.wind
+    - group.daily_stats
 
 #################################################################################
 ### Grops ###
@@ -110,17 +111,6 @@ Outside Lights:
 Thermostat:
   - climate.first_floor
 
-Weather:
-  - sensor.dark_sky_summary
-  - sensor.dark_sky_apparent_temperature
-  - sensor.dark_sky_humidity
-  - sensor.dark_sky_cloud_coverage
-  - sensor.pws_wind_mph
-  - sensor.pws_wind_gust_mph
-  - sensor.pws_wind_dir
-  - sensor.dark_sky_visibility
-  - sensor.dark_sky_pressure
-
 Sun and Moon:
   - sun.sun
   - sensor.moon
@@ -128,6 +118,7 @@ Sun and Moon:
 Weather Summary:
   - sensor.dark_sky_summary
   - sensor.dark_sky_apparent_temperature
+  - sensor.dark_sky_humidity
   - sensor.dark_sky_minutely_summary
   - sensor.dark_sky_hourly_summary
   - sensor.dark_sky_daily_summary
@@ -143,6 +134,18 @@ Precipitation:
   - sensor.dark_sky_precip
   - sensor.dark_sky_precip_probability
   - sensor.pws_precip_today_in
+  - sensor.dark_sky_visibility
+  - sensor.dark_sky_pressure
+
+Wind:
+  - sensor.pws_wind_mph
+  - sensor.pws_wind_gust_mph
+  - sensor.pws_wind_dir
+
+Daily Stats:
+  - sensor.dark_sky_daily_low_temperature
+  - sensor.dark_sky_daily_high_temperature
+  - sensor.dark_sky_daily_max_precip_intensity
 
 Internet:
   - sensor.speedtest_ping