diff --git a/automation/color_tornado.yaml b/automation/color_tornado.yaml
new file mode 100755
index 00000000..fce40166
--- /dev/null
+++ b/automation/color_tornado.yaml
@@ -0,0 +1,19 @@
+######################################################################
+##  Color Tornado!
+######################################################################
+- alias: 'Color Tornado'
+  trigger:
+    - platform: state
+      entity_id: input_boolean.color_tornado
+      state: 'on'
+      from: 'off'
+
+  action:
+    - service: light.turn_on
+      entity_id:
+        - light.justin_go
+      data:
+        effect: colorloop
+
+    - service: input_boolean.turn_off
+      entity_id: input_boolean.color_tornado
diff --git a/input_boolean/trigger_booleans.yaml b/input_boolean/trigger_booleans.yaml
index afc1919a..70e75612 100755
--- a/input_boolean/trigger_booleans.yaml
+++ b/input_boolean/trigger_booleans.yaml
@@ -23,6 +23,10 @@ flash:
   name: Flash
   initial: off
 
+color_tornado:
+  name: Color Tornado!
+  initial: off
+
 guard_dog:
   name: Guard Dog
   initial: off
diff --git a/script/monthly_color_scene.yaml b/script/monthly_color_scene.yaml
index 72bcad64..11ee3d8d 100755
--- a/script/monthly_color_scene.yaml
+++ b/script/monthly_color_scene.yaml
@@ -1,5 +1,5 @@
 ######################################################################################################
-###Script to turn on scene for the appropriate month for the front of the house but only when the sun is down. 
+###Script to turn on scene for the appropriate month for the front of the house but only when the sun is down.
 #  action:
 #   - service: script.monthly_color_scene
 #
@@ -11,10 +11,7 @@ monthly_color_scene:
     - condition: state
       entity_id: sun.sun
       state: 'below_horizon'
-    - condition: state
-      entity_id: input_boolean.alert_mode
-      state: 'off'
-    
+
     - service: logbook.log
       data_template:
         name: "Launching Scene:"
@@ -33,18 +30,18 @@ monthly_color_scene:
           or now().strftime("%m%d")|int == 1111
           -%}
           RWB
-          {%- elif now().strftime("%m%d")|int >= 210 
+          {%- elif now().strftime("%m%d")|int >= 210
           and now().strftime("%m%d")|int <= 214-%}
           valentine
           {%- elif now().strftime("%m%d")|int == 228 -%}
           marti_gras
-          {%- elif now().strftime("%m%d")|int >= 314 
+          {%- elif now().strftime("%m%d")|int >= 314
           and now().strftime("%m%d")|int <= 317-%}
           st_patty
           {%- else -%}
           standard
           {%- endif -%}_colors"
-          
+
     - service: scene.turn_on
       data_template:
         entity_id: >
@@ -62,23 +59,23 @@ monthly_color_scene:
           or now().strftime("%m%d")|int == 1111
           -%}
           RWB
-          {%- elif now().strftime("%m%d")|int >= 210 
+          {%- elif now().strftime("%m%d")|int >= 210
           and now().strftime("%m%d")|int <= 214-%}
           valentine
           {%- elif now().strftime("%m%d")|int == 228 -%}
           marti_gras
-          {%- elif now().strftime("%m%d")|int >= 314 
+          {%- elif now().strftime("%m%d")|int >= 314
           and now().strftime("%m%d")|int <= 317-%}
           st_patty
           {%- else -%}
           standard
           {%- endif -%}_colors
- 
- 
-# http://www.calendar-365.com/holidays/2017.html 
+
+
+# http://www.calendar-365.com/holidays/2017.html
 # 101 New_years_day (colorloop)
 # RWB 212 Lincoln's Birthday
-# 214 Valentine's Day (pink, red) 
+# 214 Valentine's Day (pink, red)
 # RWB 220 President's Day
 # 228 Mardi Gras (purple, green, gold )
 # 317 st Patty (green)
@@ -100,4 +97,4 @@ monthly_color_scene:
 # 1123 Thanksgiving
 # 1212 Hanukkah start 8 days.
 # 1225 Chrismas
-# 1231 New years eve
\ No newline at end of file
+# 1231 New years eve