diff --git a/input_select.yaml b/input_select.yaml
index aade275..4594eea 100644
--- a/input_select.yaml
+++ b/input_select.yaml
@@ -1,18 +1,3 @@
-tts_devices:
-  name: TTS Devices
-  options:
-    - Living Room
-    - Basement
-    - Basement Google
-    - Common Areas
-    - Master Bedroom
-    - Kallen Bedroom
-    - Emma Bedroom
-    - Kids Bedrooms
-    - All Bedrooms
-    - Everywhere
-  initial: Living Room
-  icon: mdi:dots-horizontal-circle
 announcement_voice:
   name: Announcement Voice
   options:
diff --git a/input_text.yaml b/input_text.yaml
index e61296f..556b8fd 100644
--- a/input_text.yaml
+++ b/input_text.yaml
@@ -1,6 +1,3 @@
-tts_message:
-  name: TTS Message
-  initial: Type your message here
 report_system:
   name: Report System
   initial: Type your report here
diff --git a/packages/jarvis.yaml b/packages/jarvis.yaml
index 3257041..e81f160 100644
--- a/packages/jarvis.yaml
+++ b/packages/jarvis.yaml
@@ -19,6 +19,26 @@ input_select:
       - Matthew
       - Salli
     icon: mdi:account-voice
+  tts_devices:
+    name: TTS Devices
+    options:
+      - Living Room
+      - Basement
+      - Basement Google
+      - Common Areas
+      - Master Bedroom
+      - Kallen Bedroom
+      - Emma Bedroom
+      - Kids Bedrooms
+      - All Bedrooms
+      - Everywhere
+    initial: Living Room
+    icon: mdi:dots-horizontal-circle
+
+input_text:
+  tts_message:
+    name: TTS Message
+    initial: Type your message here
 
 script:
   alexa_interjection: