diff --git a/customize/darksky.yaml b/customize/darksky.yaml
deleted file mode 100755
index 9099e201..00000000
--- a/customize/darksky.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-sensor.dark_sky_summary:
-  friendly_name: 'Current Conditions'
-  icon: mdi:beach
-sensor.dark_sky_precip_intensity:
-  friendly_name: 'Rainfall'
-sensor.dark_sky_humidity:
-  friendly_name: 'Outdoor Humidity'
-sensor.dark_sky_temperature:
-  friendly_name: 'Outdoor Temp'
-     
\ No newline at end of file
diff --git a/customize/internet.yaml b/customize/internet.yaml
index 23cabc20..d6a967d6 100755
--- a/customize/internet.yaml
+++ b/customize/internet.yaml
@@ -1,3 +1,6 @@
+###################################
+##  Speedtest Section
+###################################
 sensor.speedtest_download:
   friendly_name: 'Download'
   icon: mdi:speedometer
@@ -6,6 +9,9 @@ sensor.speedtest_upload:
   friendly_name: 'Upload'
   icon: mdi:speedometer
   
+###################################
+##  Circle by Disney Section
+###################################
 sensor.circle:
   icon: mdi:google-circles-group
 device_tracker.circle:
diff --git a/customize/nest.yaml b/customize/nest.yaml
deleted file mode 100755
index 4d5d6592..00000000
--- a/customize/nest.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-climate.downstairs:
-  friendly_name: 'Nest Downstairs'
-  icon: mdi:air-conditioner
-climate.upstairs:
-  friendly_name: 'Nest Upstairs'
-  icon: mdi:air-conditioner
-
-sensor.downstairs_humidity:  
-  icon: mdi:water-percent
-sensor.upstairs_humidity:  
-  icon: mdi:water-percent
\ No newline at end of file
diff --git a/customize/rokus.yaml b/customize/tv_devices.yaml
similarity index 58%
rename from customize/rokus.yaml
rename to customize/tv_devices.yaml
index bef5069c..2340e76d 100755
--- a/customize/rokus.yaml
+++ b/customize/tv_devices.yaml
@@ -1,10 +1,16 @@
+###################################
+##  Roku Section
+###################################
 media_player.roku_1gj361038190: 
   friendly_name: 'Downstairs Main Roku'
 media_player.roku_1gs3ac111661:
   friendly_name: 'Upstairs Roku'
 media_player.roku_2N006T621680:
   friendly_name: 'Bedroom Roku'
-  
+
+###################################
+##  TabloTv Section
+###################################  
 device_tracker.tablotv:
   hidden: true
 sensor.tablotv:
diff --git a/customize/weather.yaml b/customize/weather.yaml
new file mode 100755
index 00000000..a4aad389
--- /dev/null
+++ b/customize/weather.yaml
@@ -0,0 +1,38 @@
+###################################
+##  DarkSky Section
+###################################
+sensor.dark_sky_summary:
+  friendly_name: 'Today's Conditions'
+  icon: mdi:beach
+sensor.dark_sky_minutely_summary:
+  friendly_name: 'Current Conditions'
+  icon: mdi:beach
+sensor.dark_sky_nearest_storm_distance:
+  friendly_name: 'Storm Tracker'
+sensor.dark_sky_precip_intensity:
+  friendly_name: 'Rainfall'
+sensor.dark_sky_humidity:
+  friendly_name: 'Outdoor Humidity'
+sensor.dark_sky_temperature:
+  friendly_name: 'Outdoor Temp'
+
+###################################
+##  Nest Section
+###################################
+climate.downstairs:
+  friendly_name: 'Nest Downstairs'
+  icon: mdi:air-conditioner
+climate.upstairs:
+  friendly_name: 'Nest Upstairs'
+  icon: mdi:air-conditioner
+
+sensor.downstairs_humidity:  
+  icon: mdi:water-percent
+sensor.upstairs_humidity:  
+  icon: mdi:water-percent
+
+###################################
+##  Sun Section
+###################################
+sun.sun:
+  hidden: true
\ No newline at end of file
diff --git a/group/weather.yaml b/group/weather.yaml
index a510c5cc..c1aef33e 100755
--- a/group/weather.yaml
+++ b/group/weather.yaml
@@ -4,7 +4,8 @@ Weather:
     - sensor.downstairs_humidity
     - climate.upstairs
     - sensor.upstairs_humidity
-    - sensor.dark_sky_summary
+#    - sensor.dark_sky_summary
+    - sensor.dark_sky_minutely_summary
     - sensor.dark_sky_precip_intensity
     - sensor.dark_sky_humidity
     - sensor.dark_sky_temperature
diff --git a/sensor/weather.yaml b/sensor/weather.yaml
index fd8495e3..65611bdb 100755
--- a/sensor/weather.yaml
+++ b/sensor/weather.yaml
@@ -2,7 +2,7 @@
   api_key: !secret forecast_key
     
   monitored_conditions:
-    - summary
+#    - summary
 #    - precip_type
     - precip_intensity
     - temperature