diff --git a/custom_templates/weather.jinja b/custom_templates/weather.jinja
index e0da57b..9aab118 100644
--- a/custom_templates/weather.jinja
+++ b/custom_templates/weather.jinja
@@ -1,29 +1,82 @@
-{% macro weatherReport(time,method) %}
+{% macro weatherReport(type,method,time) %}
 {% from 'time.jinja' import ct %}
 {% set ct = ct() | int %}
-{% if time in ['current','full'] %}
-  The current weather is {{ states('sensor.pirateweather_summary') | lower }}. It is {{ state_attr('weather.iron_nerd_weather_station','temperature') | round }} degrees outside and feels like {{ states('sensor.pirateweather_apparent_temperature') | round }} degrees.
-  {% if method == 'tts' %}
-    {% if is_state('binary_sensor.heat_threshold','on') %}
-      It is very hot outside, so be careful if you have to venture out.
-    {% elif is_state('binary_sensor.cold_threshold','on') %}
-      It is very cold outside, so be careful if you have to venture out.
+{% set time = time|default('day') %}
+{% if method == 'text' %}
+  {% if type in ['current','full'] %}
+    The current weather is {{ states('weather.iron_nerd_weather_station') | lower }}. It is {{ state_attr('weather.iron_nerd_weather_station','temperature') | round }} degrees outside and feels like {{ states('sensor.pirateweather_apparent_temperature') | round }} degrees.
+  {% endif %}
+  {% if type in ['forecast','full'] %}
+    {% if 14400 <= ct <= 61200 %}
+      The forecast high is {{ states('sensor.todays_high_temp') }}.
+    {% else %}
+      Overnight you can expect a low of {{ states('sensor.overnight_lowest_temperature') }}.
+    {% endif %}
+    {% if is_state('binary_sensor.early_night_mode','on') %}For tonight{% else %}For the rest of the day{% endif %}, the conditions are expected to be {{ state_attr('sensor.current_forecast','friendly') }}.
+  {% endif %}
+  {% if type in ['alerts','full'] %}
+    {% if is_state('input_boolean.tornado_alarm','on') %}
+      We are under a tornado warning. If you are not already in shelter, you should be. Get on it!
+    {% elif states('sensor.weatheralerts_active_alerts') > '0' %}
+      Current weather alerts: {{ states('sensor.weather_alert_string') }}.
+    {% endif %}
+    {% if is_state('binary_sensor.lightning_warning','on') %}
+      {% set ltgdist = (states('sensor.blitzortung_lightning_distance') | int) / 1.609 | round %}
+        There is lightning in the area. Nearest strike is {{ ltgdist }} away.
+    {% endif %}
+    {% if states('sensor.kdfi_visibility') | int < 3 %}
+      Caution: Current outdoor visibility is {{ states('sensor.kdfi_visibility') }} miles.
     {% endif %}
   {% endif %}
-{% endif %}
-{% if time in ['forecast','full'] %}
-  {% if 14400 <= ct <= 61200 %}
-    The forecast high is {{ states('sensor.todays_high_temp') }}.
-    {% if method == 'tts' %}
-      {% if is_state('input_boolean.hot_day','on') %}
-        It is going to be a very hot day, so be careful if you are going outside!
-      {% elif is_state('input_boolean.cold_day','on') %}
-        It is going to be a very cold day, so be careful if you are going outside!
-      {% endif %}
+{% elif method == 'tts' %}
+  {% if type in ['alerts','full'] %}
+    {% if states('sensor.weatheralerts_active_alerts') > '0' %}
+      "Currently there are weather alerts active. The total number of alerts is {{ states('sensor.weather_alerts_active_corrected') }}. They are as follows. "
+        {{ states('sensor.weather_alert_string') }}.
+    {% endif %}
+    {% if is_state('input_boolean.tornado_alarm','on') %}
+      "We are under a tornado warning. If you are not already in shelter, you should be. Get on it! "
+    {% elif is_state('input_boolean.tornado_watch','on') %}
+      {{ [
+        "There is currently a tornado watch active. Please keep an eye on the sky and your local weather reports. ",
+        "We are currently under a tornado watch. This means the possibility exists for a tornado to form. Be prepared, and be safe! ",
+        "The National Weather Service has issued a tornado watch for our area. Be prepared to take shelter if a warning is issued! ",
+      ] | random }}
+    {% endif %}
+    {% if is_state('binary_sensor.lightning_warning','on') %}
+      {% set ltgdist = (states('sensor.blitzortung_lightning_distance') | int) / 1.609 | round %}
+      {{ [
+        "There are reports of lightning in the area, please stay safe. ",
+        "My sensors detect the presence of lightning nearby, so you should prepare to take shelter if needed. ",
+        "A little birdy told me there is lightning nearby. His feathers were all sticking up, I have no idea why. ",
+        "Please exercise caution, as there is lightning in the area. ",
+        "That flashing in the sky is not interstellar warfare, it is simply lightning. But you should still be careful outside. ",
+      ] | random }}
+      "The nearest lightning strike is {{ ltgdist }} miles away. "
+    {% endif %}
+    {% if (states('sensor.kdfi_visibility') | int ) < 3 %}
+      {{ [
+        "It is foggy outside, please exercise caution when driving. ",
+        "The visibility outside is quite low. If you will be driving soon, please be cautious. ",
+        "It is pea soup outside right now, and that is just as awful to drive in as it is to eat. Be careful! ",
+        "Look out the window. Do you notice that you cannot see anything? Bear that in mind if you intend to drive any time soon. ",
+        "Be advised, it is very difficult to see outside right now. Drive safely. "
+      ] | random }}
     {% endif %}
-  {% else %}
-    Overnight you can expect a low of {{ states('sensor.overnight_lowest_temperature') }}.
   {% endif %}
-  Later {% if is_state('binary_sensor.early_night_mode','on') %}tonight{% else %}today{% endif %}, the conditions are expected to be {{ states('sensor.current_forecast') }}.
+
+  {% if type in ['current','full'] %}
+    {{ states('sensor.current_conditions_detail') }}
+  {% elif type == 'forecast' %}
+    {{ states('sensor.current_forecast_detail') }}
+  {% endif %}
+  {% if time in ['morning','day'] and type != 'alerts' %}
+    {{ [
+      'Just in case you were planning on going anywhere,',
+      'On the off chance that you planned to go outside,',
+      'If you were planning to go out and do something with your life,',
+      ] | random }}
+      {{ states('sensor.clothing_forecast_detail') }}
+  {% endif %}
 {% endif %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/packages/custom_weather.yaml b/packages/custom_weather.yaml
index 3f10155..c0c31fe 100644
--- a/packages/custom_weather.yaml
+++ b/packages/custom_weather.yaml
@@ -171,6 +171,9 @@ sensor:
           precipitation: >-
             {% set forecast = state_attr('weather.iron_nerd_weather_station','forecast')[0] %}
             {{ forecast.precipitation }}
+          friendly: >-
+            {% set forecast = state_attr('weather.iron_nerd_weather_station','forecast')[0] %}
+            {{ forecast.condition | replace("partlycloudy","partly cloudy") }}
       current_forecast_detail:
         friendly_name: Current Forecast Detail
         unique_id: e5ae9864-70b5-402c-9d2f-c4d6a10085df
@@ -522,7 +525,7 @@ sensor:
             {% else %}
               and {{ states.weather.iron_nerd_weather_station.state }}
             {% endif %}
-            {%- if is_state('binary_sensor.night','off')%}
+            {%- if is_state('binary_sensor.early_night_mode','off')%}
               {{ [
                 'Later Today ',
                 'For the rest of the day '
@@ -826,7 +829,7 @@ sensor:
               {% endif %}
             {% endif %}
             {% if states('sensor.thermal_comfort_simmerindex') in ['extremely_warm','danger_of_heatstroke','extreme_danger_of_heatstroke','circulatory_collapse_imminent'] %}
-              "To reiterate, the current weather is dangerously hot! "
+              "I cannot stress this enough, the current weather is dangerously hot! "
             {% endif %}
             {% if is_state('sensor.thermal_comfort_perception','somewhat_uncomfortable') %}
               "The humidity is somewhat uncomfortable outside."
diff --git a/templates/speech/daily_briefing.yaml b/templates/speech/daily_briefing.yaml
index 5ef25c5..ac473b1 100644
--- a/templates/speech/daily_briefing.yaml
+++ b/templates/speech/daily_briefing.yaml
@@ -5,63 +5,13 @@
   {% from 'time.jinja' import input_datetime_12hr %}
   {% from 'status.jinja' import tonyStatusReport, tinaStatusReport, kallenStatusReport, emmaStatusReport %}
   {% from 'easy_time.jinja' import count_the_days %}
+  {% from 'weather.jinja' import weatherReport %}
       <p>
         {{ greeting() }}
       </p>
-      
-      <p>
-        {% if is_state('input_boolean.tornado_alarm','on') %}
-          "We are under a tornado warning. If you are not already in shelter, you should be. Get on it! "
-        {% elif is_state('input_boolean.tornado_watch','on') %}
-          {{ [
-            "There is currently a tornado watch active. Please keep an eye on the sky and your local weather reports. ",
-            "We are currently under a tornado watch. This means the possibility exists for a tornado to form. Be prepared, and be safe! ",
-            "The National Weather Service has issued a tornado watch for our area. Be prepared to take shelter if a warning is issued! ",
-          ] | random }}
-        {% endif %}
-        {% if is_state('binary_sensor.lightning_warning','on') %}
-          {% set ltgdist = (states('sensor.blitzortung_lightning_distance') | int) / 1.609 | round %}
-          {{ [
-            "There are reports of lightning in the area, please stay safe. ",
-            "My sensors detect the presence of lightning nearby, so you should prepare to take shelter if needed. ",
-            "A little birdy told me there is lightning nearby. His feathers were all sticking up, I have no idea why. ",
-            "Please exercise caution, as there is lightning in the area. ",
-            "That flashing in the sky is not interstellar warfare, it is simply lightning. But you should still be careful outside. ",
-          ] | random }}
-          "The nearest lightning strike is {{ ltgdist }} miles away. "
-        {% endif %}
-        {% if states('sensor.weatheralerts_active_alerts') > '0' %}
-          "Currently there are weather alerts active. The total number of alerts is {{ states('sensor.weather_alerts_active_corrected') }}. They are as follows. "
-            {{ states('sensor.weather_alert_string') }}.
-        {% endif %}
-        {% if (states('sensor.kdfi_visibility') | int ) < 3 %}
-          {{ [
-            "It is foggy outside, please exercise caution when driving. ",
-            "The visibility outside is quite low. If you will be driving soon, please be cautious. ",
-            "It is pea soup outside right now, and that is just as awful to drive in as it is to eat. Be careful! ",
-            "Look out the window. Do you notice that you cannot see anything? Bear that in mind if you intend to drive any time soon. ",
-            "Be advised, it is very difficult to see outside right now. Drive safely. "
-          ] | random }}
-        {% endif %}
-        {{ states('sensor.current_conditions_detail') }}
-      </p>
 
       <p>
-        {{ [
-          'The weather for the rest of today should be,',
-          'The forecast for the rest of the day is,',
-          'Through the rest of your day, the weather is expected to be,'
-          ] | random }}
-          {{ states.sensor.current_forecast.state }}
-      </p>
-
-      <p>
-        {{ [
-          'Just in case you were planning on going anywhere,',
-          'On the off chance that you planned to go outside,',
-          'If you were planning to go out and do something with your life,',
-          ] | random }}
-          {{ states('sensor.clothing_forecast_detail') }}
+        {{ weatherReport('full','tts','day') }}
       </p>
 
       <p>
diff --git a/templates/speech/morning_briefing.yaml b/templates/speech/morning_briefing.yaml
index 942fb04..667a3ab 100644
--- a/templates/speech/morning_briefing.yaml
+++ b/templates/speech/morning_briefing.yaml
@@ -5,6 +5,7 @@
   {% from 'time.jinja' import input_datetime_12hr %}
   {% from 'status.jinja' import tonyStatusReport, tinaStatusReport, kallenStatusReport, emmaStatusReport %}
   {% from 'easy_time.jinja' import count_the_days %}
+  {% from 'weather.jinja' import weatherReport %}
     <p>
       {{ greeting_nodate() }}
     </p>
@@ -17,54 +18,11 @@
       ]|random }}
       {{states.sensor.today_is.state }}.
     </p>
+
     <p>
-        It is currently {{states.weather.iron_nerd_weather_station.state}} and {{states.sensor.pirateweather_temperature.state|round}} degrees in Defiance. 
-    </p>
-    <p>
-      {% if is_state('input_boolean.tornado_alarm','on') %}
-        "We are under a tornado warning. If you are not already in shelter, you should be. Get on it! "
-      {% elif is_state('input_boolean.tornado_watch','on') %}
-        {{ [
-          "There is currently a tornado watch active. Please keep an eye on the sky and your local weather reports. ",
-          "We are currently under a tornado watch. This means the possibility exists for a tornado to form. Be prepared, and be safe! ",
-          "The National Weather Service has issued a tornado watch for our area. Be prepared to take shelter if a warning is issued! ",
-        ] | random }}
-      {% endif %}
-      {% if is_state('binary_sensor.lightning_warning','on') %}
-        {% set ltgdist = (states('sensor.blitzortung_lightning_distance') | int) / 1.609 | round %}
-        {{ [
-          "There are reports of lightning in the area, please stay safe. ",
-          "My sensors detect the presence of lightning nearby, so you should prepare to take shelter if needed. ",
-          "A little birdy told me there is lightning nearby. His feathers were all sticking up, I have no idea why. ",
-          "Please exercise caution, as there is lightning in the area. ",
-          "That flashing in the sky is not interstellar warfare, it is simply lightning. But you should still be careful outside. ",
-        ] | random }}
-        "The nearest lightning strike is {{ ltgdist }} miles away. "
-      {% endif %}
-      {% if states('sensor.weatheralerts_active_alerts') > '0' %}
-        "Currently there are weather alerts active. The total number of alerts is {{ states('sensor.weather_alerts_active_corrected') }}. They are as follows. "
-          {{ states('sensor.weather_alert_string') }}.
-      {% endif %}
-      {% if (states('sensor.kdfi_visibility') | int ) < 3 %}
-        {{ [
-          "It is foggy outside, please exercise caution when driving. ",
-          "The visibility outside is quite low. If you will be driving soon, please be cautious. ",
-          "It is pea soup outside right now, and that is just as awful to drive in as it is to eat. Be careful! ",
-          "Look out the window. Do you notice that you cannot see anything? Bear that in mind if you intend to drive any time soon. ",
-          "Be advised, it is very difficult to see outside right now. Drive safely. "
-        ] | random }}
-      {% endif %}
-    </p>
-    <p>
-      {{ [
-          'The rest of the day should be,',
-          'Todays forecast should be ,'
-      ]|random }}
-        {{ states('sensor.current_forecast') }} 
-    </p>
-    <p>
-      {{ states('sensor.clothing_forecast_detail') }}
+      {{ weatherReport('full','tts','morning') }}
     </p>
+
     <p>
       {% if is_state('sensor.halloween_countdown','0') %}
         Happy Halloween!
diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml
index 22ae701..9d5b201 100644
--- a/templates/speech/nightly_briefing.yaml
+++ b/templates/speech/nightly_briefing.yaml
@@ -5,6 +5,7 @@
   {% from 'time.jinja' import input_datetime_12hr, read_time_from_calendar, next_twitch_stream %}
   {% from 'status.jinja' import tonyStatusReport, tinaStatusReport, kallenStatusReport, emmaStatusReport %}
   {% from 'easy_time.jinja' import count_the_days %}
+  {% from 'weather.jinja' import weatherReport %}
     <p>
       {{ greeting() }}
     </p>
@@ -16,42 +17,11 @@
         "My programmer decided that I should say something interesting here, and then he realized that he is not interesting. ",
       ] | random }}
     </p>
+
     <p>
-      {% if is_state('input_boolean.tornado_alarm','on') %}
-        "We are under a tornado warning. If you are not already in shelter, you should be. Get on it! "
-      {% elif is_state('input_boolean.tornado_watch','on') %}
-        {{ [
-          "There is currently a tornado watch active. Please keep an eye on the sky and your local weather reports. ",
-          "We are currently under a tornado watch. This means the possibility exists for a tornado to form. Be prepared, and be safe! ",
-          "The National Weather Service has issued a tornado watch for our area. Be prepared to take shelter if a warning is issued! ",
-        ] | random }}
-      {% endif %}
-      {% if states('sensor.weatheralerts_active_alerts') > '0' %}
-        "Currently there are weather alerts active. The total number of alerts is {{ states('sensor.weather_alerts_active_corrected') }}. They are as follows. "
-          {{ states('sensor.weather_alert_string') }}.
-      {% endif %}
-      {% if is_state('binary_sensor.lightning_warning','on') %}
-        {% set ltgdist = (states('sensor.blitzortung_lightning_distance') | int) / 1.609 | round %}
-        {{ [
-          "There are reports of lightning in the area, please stay safe. ",
-          "My sensors detect the presence of lightning nearby, so you should prepare to take shelter if needed. ",
-          "A little birdy told me there is lightning nearby. His feathers were all sticking up, I have no idea why. ",
-          "Please exercise caution, as there is lightning in the area. ",
-          "That flashing in the sky is not interstellar warfare, it is simply lightning. But you should still be careful outside. ",
-        ] | random }}
-        "The nearest lightning strike is {{ ltgdist }} miles away. "
-      {% endif %}
-      {% if (states('sensor.kdfi_visibility') | int ) < 3 %}
-        "I know it is night time, but just in case, "
-        {{ [
-          "It is foggy outside, please exercise caution when driving. ",
-          "The visibility outside is quite low. If you will be driving soon, please be cautious. ",
-          "It is pea soup outside right now, and that is just as awful to drive in as it is to eat. Be careful! ",
-          "Look out the window. Do you notice that you cannot see anything? Bear that in mind if you intend to drive any time soon. ",
-          "Be advised, it is very difficult to see outside right now. Drive safely. "
-        ] | random }}
-      {% endif %}
+      {{ weatherReport('full','tts','night') }}
     </p>
+
     <p>
       {{ tonyStatusReport('stream','tts') }}
       {% if is_state('binary_sensor.kallen_school_tomorrow','on') %}