diff --git a/packages/school.yaml b/packages/school.yaml
index 3739800..c718292 100644
--- a/packages/school.yaml
+++ b/packages/school.yaml
@@ -71,6 +71,21 @@ input_datetime:
     has_time: true
     icon: mdi:clock-alert
 
+template:
+  - binary_sensor:
+    - name: Kallen School Tomorrow
+      unique_id: 73d91e2f-35b5-491c-9c8b-c6d89d67b53c
+      state: >-
+        {%- set test=(as_timestamp(now())+ (86400)) | timestamp_custom("%Y-%m-%d",true) %}
+        {{ state_attr('calendar.kallen_school_days','start_time') == test + (" 09:00:00" or " 08:00:00") }}
+      icon: mdi:school
+    - name: Kallen Band Tomorrow
+      unique_id: c57855eb-0499-4585-9081-9b2244ce6845
+      state: >-
+        {%- set test=(as_timestamp(now())+ (86400)) | timestamp_custom("%Y-%m-%d",true) %}
+        {{ state_attr('calendar.kallen_school_days','start_time') == test + " 08:00:00" }}
+      icon: mdi:trumpet
+
 sensor:
   - platform: template
     sensors:
@@ -113,28 +128,6 @@ sensor:
         attribute_templates:
           date: "{{ state_attr('input_datetime.spring_break_start','timestamp') | timestamp_custom('%B %d, %Y') }}"
         unit_of_measurement: 'Days'
-      kallen_school_tomorrow:
-        unique_id: 0a1b81bc-2080-4006-b0f1-270af904d411
-        friendly_name: 'Kallen School Tomorrow'
-        value_template: >-
-          {%- set test=(as_timestamp(now())+ (86400)) | timestamp_custom("%Y-%m-%d",true) %}
-          {% if states.calendar.kallen_school_days.attributes.start_time == test + " 09:00:00" %}
-            on
-          {% elif states.calendar.kallen_school_days.attributes.start_time == test + " 08:00:00" %}
-            on
-          {% else %}
-            off
-          {% endif %}
-      kallen_band_tomorrow:
-        unique_id: 2906baeb-98ec-4215-8043-e223f2759ed7
-        friendly_name: 'Kallen Band Tomorrow'
-        value_template: >-
-          {%- set test=(as_timestamp(now())+ (86400)) | timestamp_custom("%Y-%m-%d",true) %}
-          {% if states.calendar.kallen_school_days.attributes.start_time == test + " 08:00:00" %}
-            on
-          {% else %}
-            off
-          {% endif %}
       kallen_lunch_menu_week:
         friendly_name: Lunch Menu Week
         unique_id: 62ba9dcb-3cd3-4875-8e6f-86bebf542c37
diff --git a/templates/speech/kallen_nightly_briefing.yaml b/templates/speech/kallen_nightly_briefing.yaml
index 5e189bc..3b72c1c 100644
--- a/templates/speech/kallen_nightly_briefing.yaml
+++ b/templates/speech/kallen_nightly_briefing.yaml
@@ -11,12 +11,12 @@
           'The count down clock until bedtime has started. Time to get cleaned up, get your pajamas on, and head for your bedroom.',
           'Its the final countdown <break time="2s"/> until bedtime, silly. Time to get ready to head that way!'
         ] | random }}
-      {% if is_state('sensor.kallen_school_tomorrow', 'on') %} 
+      {% if is_state('binary_sensor.kallen_school_tomorrow', 'on') %} 
         {{ [ 'Because you have school tomorrow. ',
           'Because you have to get up early tomorrow for school.',
           'Because you want to be ready for school tomorrow.'
         ] | random }}
-        {% if is_state('sensor.kallen_band_tomorrow','on') %}
+        {% if is_state('binary_sensor.kallen_band_tomorrow','on') %}
           {{ [
             'And you have band practice in the morning. ',
             'And you have a date with a trombone first thing in the morning. ',
diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml
index b96f38c..219850a 100644
--- a/templates/speech/nightly_briefing.yaml
+++ b/templates/speech/nightly_briefing.yaml
@@ -56,8 +56,8 @@
           "Tony 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 {{ (state_attr('input_datetime.tony_streaming_start_time','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. "
       {% endif %}
-      {% if is_state('sensor.kallen_school_tomorrow','on') %}
-        {% if is_state('sensor.kallen_band_tomorrow','on') %}
+      {% if is_state('binary_sensor.kallen_school_tomorrow','on') %}
+        {% if is_state('binary_sensor.kallen_band_tomorrow','on') %}
           "Collin has school tomorrow, and there will be band practice in the morning at {{ as_timestamp(strptime(state_attr('calendar.kallen_school_days','start_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%I:%M %p") }}. "
         {% else %}
           "Collin has school tomorrow at {{ as_timestamp(strptime(state_attr('calendar.kallen_school_days','start_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%I:%M %p") }}. "