diff --git a/custom_templates/status.jinja b/custom_templates/status.jinja
index 1b9dd76..f201f35 100644
--- a/custom_templates/status.jinja
+++ b/custom_templates/status.jinja
@@ -52,9 +52,9 @@
 {% macro tony_morning_meds(type,method) %}
 {% if is_state('binary_sensor.overnight','off') %}
   {% if is_state('input_boolean.tony_morning_meds_taken','on') %}
-    Tony took his morning meds at {{ input_datetime_read('input_datetime.tony_morning_meds_taken','withdate') | trim }}.
+    {% if type == 'meds' %}Tony{% else %}He{% endif %} took his morning meds at {{ input_datetime_read('input_datetime.tony_morning_meds_taken','withdate') | trim }}.
   {% elif is_state('input_boolean.tony_morning_meds_taken','off') and ct >= 21600 %}
-    Tony has not taken his morning meds.
+    {% if type == 'meds' %}Tony{% else %}He{% endif %} has not taken his morning meds.
     {% if ct < state_attr('input_datetime.tony_morning_meds_notify','timestamp') | int %}
       {% if method == 'tts' %}
         {{ ['He has a reminder scheduled for',
@@ -72,9 +72,9 @@
 
 {% macro tony_night_meds(type,method) %}
 {% if is_state('input_boolean.tony_night_meds_taken','on') and (is_state('binary_sensor.overnight','on') or ct < 43200) %}
-  Tony took his night meds at {{ input_datetime_read('input_datetime.tony_night_meds_taken','withdate') | trim }}.
+  {% if type == 'meds' %}Tony{% else %}He{% endif %} took his night meds at {{ input_datetime_read('input_datetime.tony_night_meds_taken','withdate') | trim }}.
 {% elif is_state('input_boolean.tony_night_meds_taken','off') and is_state('binary_sensor.overnight','on') %}
-  Tony has not taken his night meds.
+  {% if type == 'meds' %}Tony{% else %}He{% endif %} has not taken his night meds.
   {% if method == 'tts' %}
     {{ ['He will be reminded when he goes to bed.',
         'I will make sure he is reminded when it is time.',
@@ -101,10 +101,10 @@
 {% set game = state_attr('sensor.twitch_ironnerd24','game') %}
 {% set viewers = state_attr('sensor.twitch_ironnerd24','viewers') %}
 {% if is_state('sensor.twitch_ironnerd24','streaming') %}
-{% if type == 'stream' %}Tony{% else %}He{% endif %} is currently streaming. The current stream category is {{ game }}. The current viewer count is {{ viewers }}.
+Tony is currently streaming. The current stream category is {{ game }}. The current viewer count is {{ viewers }}.
 {% elif is_state('input_boolean.tony_streaming_today','on') or calendar_event_today('calendar.tony_s_twitch_schedule') == 'true' %}
   {% if method == 'tts' %}
-    {% if type == 'stream' %}Tony{% else %}He{% endif %}
+    Tony
     {{ [
     " will be pretending to be a real content creator tonight. ",
     " will be doing his best to defeat his impostor syndrome tonight. ",
@@ -113,11 +113,11 @@
     " is not really all that funny, but tonight he will present himself to a crowd of questionable individuals who seem to think that he is. "
   ] | random }} The studio is scheduled to go online at {{ streamstart }}. "
   {% elif method == 'text' %}
-    {% if type == 'stream' %}Tony{% else %}He{% endif %} will be streaming today. Stream starts at {{ streamstart }}.
+    Tony will be streaming today. Stream starts at {{ streamstart }}.
   {% endif %}
 {% elif state_attr('calendar.tony_s_twitch_schedule','start_time') != none %}
   {% if count_the_days('calendar.tony_s_twitch_schedule','start_time') | int == 1 %}
-    {% if type == 'stream' %}Tony{% else %}He{% endif %} will be streaming at {{ time_from_calendar('calendar.tony_s_twitch_schedule','start_time','read') }} tomorrow.
+    Tony will be streaming at {{ time_from_calendar('calendar.tony_s_twitch_schedule','start_time','read') }} tomorrow.
   {% endif %}
 {% endif %}
 {% endmacro %}