diff --git a/automations.yaml b/automations.yaml
index 923de38..ac8ce52 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -15,7 +15,7 @@
     data: {}
   - service: script.text_notify
     data:
-      type: Critical
+      type: critical
       title: Tornado Warning - TAKE COVER!
       message: The National Weather Service has issued a Tornado Warning for our area.
         Take Cover NOW!!!!
@@ -34,7 +34,7 @@
       message: A tornado warning has been issued, please take cover immediately! A
         tornado warning has been issued, please take cover immediately! A tornado
         warning has been issued, please take cover immediately!
-      type: Alert
+      type: alert
     alias: Elevated TTS alert
   - delay:
       hours: 0
@@ -457,19 +457,23 @@
     data: {}
   - service: script.max_brightness_cleanup
     data: {}
-  - service: notify.all_ios
+  - service: script.text_notify
     data:
       title: Tornado Warning is cleared
       message: Check your surroundings and make sure it is safe to leave cover
-  - service: notify.tv_notifications
+      who: all
+      type: alert
+  - service: script.tv_notify
     data:
       title: Tornado Warning is cleared
       message: Check your surroundings and make sure it is safe to leave cover
+      who: all
   - service: script.speech_engine
     data:
       who: everywhere
       message: Tornado warning has been cleared. Check your surroundings and make
         sure it is safe to leave cover.
+      type: alert
   - wait_template: '{{ is_state(''input_boolean.tornado_alarm'',''on'') }}'
     continue_on_timeout: true
     timeout: 00:05:00
diff --git a/packages/notify.yaml b/packages/notify.yaml
index 01759ed..12d3948 100644
--- a/packages/notify.yaml
+++ b/packages/notify.yaml
@@ -700,9 +700,9 @@ script:
         selector:
           select:
             options:
-              - Normal
-              - Alert
-              - Critical
+              - normal
+              - alert
+              - critical
     sequence:
       - choose:
         - conditions:
@@ -1054,16 +1054,16 @@ script:
         selector:
           select:
             options:
-              - Living Room
-              - Basement
-              - Basement Google
-              - Common Areas
-              - Master Bedroom
-              - Kallen Bedroom
-              - Emma Bedroom
-              - Kids Bedrooms
-              - All Bedrooms
-              - Everywhere
+              - living_room
+              - basement
+              - basement_google
+              - common_areas
+              - master_bedroom
+              - kallen_bedroom
+              - emma_bedroom
+              - kids_bedrooms
+              - all_bedrooms
+              - everywhere
       message:
         name: 'Message'
         description: 'This is the message you want Jarvis to read.'
@@ -1095,9 +1095,9 @@ script:
         selector:
           select:
             options:
-              - Normal
-              - Alert
-              - Critical
+              - normal
+              - alert
+              - critical
     variables:
       voice: "{{ states('input_select.jarvis_voice') }}"
     sequence: