diff --git a/automation/dark_rainy_day.yaml b/automation/dark_rainy_day.yaml
index 68d14487..b7200b47 100755
--- a/automation/dark_rainy_day.yaml
+++ b/automation/dark_rainy_day.yaml
@@ -50,8 +50,8 @@
 - alias: 'Rain is over'  
   trigger:
     - platform: numeric_state
-      entity_id: sensor.dark_sky_cloud_coverage
-      above: 90
+      entity_id: sensor.dark_sky_precip_intensity
+      below: 1
       
   action:
     - service: light.turn_off
diff --git a/scene/monthly_colors.yaml b/scene/monthly_colors.yaml
index aa5f6fe8..be6fbe27 100755
--- a/scene/monthly_colors.yaml
+++ b/scene/monthly_colors.yaml
@@ -7,113 +7,23 @@
     
 - name: month_01_colors
   entities:
-       light.outdoor_foyer:
-       light.outdoor_sconce_1:
-       light.outdoor_sconce_2: 
+       group.outdoor_front_lights:
            state: 'on'
            color_name: 'Gold'
 
-       light.outdoor_sconce_3:
-           state: 'on'
-           color_name: 'Gold'
-       light.garage_left:
-           state: 'on'
-           color_name: 'Yellow'
-       light.garage_small:
-           state: 'on'
-           color_name: 'Yellow'
-       light.outdoor_den:
-           state: 'on'
-           color_name: 'Yellow'
-           # brightness: 150
-
 - name: month_02_colors
   entities:
-       light.outdoor_sconce_1:
+       group.outdoor_front_lights:
            state: 'on'
            color_name: 'Hot Pink'
-       light.outdoor_sconce_2:
-           state: 'on'
-           color_name: 'Hot Pink'
-       light.outdoor_sconce_3:
-           state: 'on'
-           color_name: 'Hot Pink'
-       light.outdoor_foyer:
-           state: 'on'
-           color_name: 'Hot Pink'
-       # light.garage_left:
-           # state: 'on'
-           # color_name: 'Pink'
-       # light.garage_small:
-           # state: 'on'
-           # color_name: 'Pink'
-       # light.outdoor_den:
-           # state: 'on'
-           # color_name: 'Pink'
-           # brightness: 150
            
-- name: month_12_colors
-  entities:
-
-       light.outdoor_foyer:
-           state: 'on'
-           color_name: 'Blue'
-           # brightness: 255
-       light.outdoor_sconce_1:
-           state: 'on'
-           color_name: 'Gold'
-           # brightness: 255
-       light.outdoor_sconce_2:
-           state: 'on'
-           color_name: 'Blue'
-           # brightness: 255
-       light.outdoor_sconce_3:
-           state: 'on'
-           color_name: 'Blue'
-           # brightness: 255
-       light.garage_left:
-           state: 'on'
-           color_name: 'Royal Blue'
-           # brightness: 255
-       light.garage_small:
-           state: 'on'
-           color_name: 'Royal Blue'
-           # brightness: 255
-       light.outdoor_den:
-           state: 'on'
-           color_name: 'Royal Blue'
-           # brightness: 255
 
 - name: front_full_brightness
   entities:
-       light.outdoor_foyer:
+       group.outdoor_front_lights:
            state: 'on'
            color_name: 'White'
            brightness: 255
-       light.outdoor_sconce_1:
-           state: 'on'
-           color_name: 'White'
-           brightness: 255
-       light.outdoor_sconce_2:
-           state: 'on'
-           color_name: 'White'
-           brightness: 255
-       light.outdoor_sconce_3:
-           state: 'on'
-           color_name: 'White'
-           brightness: 255
-       # light.garage_left:
-           # state: 'on'
-           # color_name: 'White'
-           # brightness: 255
-       # light.garage_small:
-           # state: 'on'
-           # color_name: 'White'
-           # brightness: 255
-       # light.outdoor_den:
-           # state: 'on'
-           # color_name: 'White'
-           # brightness: 255
-       
+
 
         
\ No newline at end of file
diff --git a/script/monthly_colors_scene.yaml b/script/monthly_colors_scene.yaml
index c8a4972e..9be6b414 100755
--- a/script/monthly_colors_scene.yaml
+++ b/script/monthly_colors_scene.yaml
@@ -30,9 +30,55 @@ monthly_color_scene:
       data_template:
         entity_id: >
           "scene.month_
-          {%- if now().strftime("%m%d")|int > 202 and now().strftime("%m%d")|int < 206  -%}
-          valentines_day
+          {%- if now().strftime("%m%d")|int == 101 -%}
+          new_years_day
+          {%- elif now().strftime("%m%d")|int == 212
+          or now().strftime("%m%d")|int == 220
+          or now().strftime("%m%d")|int == 520
+          or now().strftime("%m%d")|int == 529
+          or now().strftime("%m%d")|int == 614
+          or now().strftime("%m%d")|int == 704
+          or now().strftime("%m%d")|int == 904
+          or now().strftime("%m%d")|int == 911
+          or now().strftime("%m%d")|int == 1111
+          -%}
+          RWB
+          {%- 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 
+          and now().strftime("%m%d")|int <= 317-%}
+          st_patty
           {%- else -%}
           {{ states('sensor.date').split('-')[1] }}
           {%- endif -%}_colors"
- 
\ No newline at end of file
+ 
+ 
+# http://www.calendar-365.com/holidays/2017.html 
+# 101 New_years_day (colorloop)
+# RWB 212 Lincoln's Birthday
+# 214 Valentine's Day (pink, red) 
+# RWB 220 President's Day
+# 228 Mardi Gras (purple, green, gold )
+# 317 st Patty (green)
+# 414 Good Friday
+# 416 Easter
+# 422 Earth Day
+# 505 Cinco de Mayo
+# 514 Mother's Day
+# RWB 520 Armed Forces Day
+# RWB 529 Memorial Day
+# RWB 614 Flag Day
+# 618 Fathers day
+# RWB 704 July 4th
+# RWB 904 Labor Day
+# RWB 911 Patriots day
+# 1009 columbus day
+# 1031 halloween
+# RWB 1111 veterans day
+# 1123 Thanksgiving
+# 1212 Hanukkah start 8 days.
+# 1225 Chrismas
+# 1231 New years eve
\ No newline at end of file