diff --git a/input_boolean.yaml b/input_boolean.yaml
index 6c9524a..1fe24ce 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -1,27 +1,3 @@
-weather_reports:
-  name: Weather Info
-  icon: mdi:weather-cloudy-alert
-traffic_reports:
-  name: Traffic Reports
-  icon: mdi:traffic-light
-sun_reports:
-  name: Sun Reports
-  icon: mdi:weather-sunny-alert
-shuffle_spotify:
-  name: Spotify Shuffle
-  icon: mdi:spotify
-tornado_watch:
-  name: Tornado Watch
-  icon: mdi:message-alert
-vacation_mode:
-  name: Vacation Mode
-  icon: mdi:umbrella-beach
-night_mode:
-  name: Night Mode
-  icon: mdi:lightbulb-night
 toggle_testing:
   name: Toggle Testing
-  icon: mdi:test-tube
-goodnight:
-  name: Goodnight
-  icon: mdi:sleep
\ No newline at end of file
+  icon: mdi:test-tube
\ No newline at end of file
diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index 545ac0b..86564da 100644
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -82,6 +82,15 @@ input_boolean:
   kallen_nightly_briefing:
     name: Kallen Nightly Briefing Ran
     icon: mdi:home-analytics
+  weather_reports:
+    name: Weather Info
+    icon: mdi:weather-cloudy-alert
+  traffic_reports:
+    name: Traffic Reports
+    icon: mdi:traffic-light
+  sun_reports:
+    name: Sun Reports
+    icon: mdi:weather-sunny-alert
 
 intent_script:
   PlayAnnouncement:
diff --git a/packages/multimedia.yaml b/packages/multimedia.yaml
index 404f383..5c5facf 100644
--- a/packages/multimedia.yaml
+++ b/packages/multimedia.yaml
@@ -2,6 +2,9 @@ input_boolean:
   spotify_idle_or_paused:
     name: Spotify Idle or Paused
     icon: mdi:spotify
+  shuffle_spotify:
+    name: Spotify Shuffle
+    icon: mdi:spotify
 
 intent_script:
   SetVolume:
diff --git a/packages/time.yaml b/packages/time.yaml
index a58dbbd..30c9799 100644
--- a/packages/time.yaml
+++ b/packages/time.yaml
@@ -1,3 +1,11 @@
+input_boolean:
+  night_mode:
+    name: Night Mode
+    icon: mdi:lightbulb-night
+  goodnight:
+    name: Goodnight
+    icon: mdi:sleep
+
 sensor:
 - platform: time_date
   display_options:
diff --git a/packages/weatheralerts.yaml b/packages/weatheralerts.yaml
index cf6cf61..68d617b 100644
--- a/packages/weatheralerts.yaml
+++ b/packages/weatheralerts.yaml
@@ -42,7 +42,10 @@
 ################################################################################
 
 
-
+input_boolean:
+  tornado_watch:
+    name: Tornado Watch
+    icon: mdi:message-alert
 
 ################################################################################
 ## sensor ##