diff --git a/automation/detect_and_adjust_lights.yaml b/automation/detect_and_adjust_lights.yaml
index 2060019e..e32df041 100755
--- a/automation/detect_and_adjust_lights.yaml
+++ b/automation/detect_and_adjust_lights.yaml
@@ -66,6 +66,8 @@
       value_template: "{{ trigger.event.data.entity_id.split('_')[0] != 'light.tv' }}"
     - condition: template
       value_template: "{{ trigger.event.data.entity_id.split('_')[0] != 'light.couch' }}"
+    - condition: template
+      value_template: "{{ trigger.event.data.entity_id.split('_')[0] != 'light.office' }}"
     - condition: template
       value_template: "{{ trigger.event.data.new_state.state == 'on' }}"
     - condition: template
diff --git a/automation/good_night.yaml b/automation/good_night.yaml
index 313e1ec8..94cf96c1 100755
--- a/automation/good_night.yaml
+++ b/automation/good_night.yaml
@@ -7,8 +7,11 @@
     - platform: event
       event_type: good_night
     - platform: state
-      entity_id: sensor.samsungtv
+      entity_id: 
+        - sensor.samsungtv
+        - sensor.withings_scale
       state: 'Offline'
+      from: 'Online'
 
   condition:
     - condition: time
diff --git a/automation/sunrise_turnon_and_off.yaml b/automation/sunrise_turnon_and_off.yaml
index d597c5f8..3db8642d 100755
--- a/automation/sunrise_turnon_and_off.yaml
+++ b/automation/sunrise_turnon_and_off.yaml
@@ -16,10 +16,9 @@
     - service: light.turn_on
       entity_id: 
         - light.outdoor_bathroom
-        - light.tv_light
-        - light.tv_stand_light
+        - group.living_room_accents
     - service: script.holiday_switches_on
-    - delay: '00:{{ (range(1, 59)|random|int) }}:00'
+    - delay: '00:{{ (range(1, 30)|random|int) }}:00'
     - service: script.monthly_front_house_scene
 ######################################################################
 
diff --git a/customize/scenes.yaml b/customize/scenes.yaml
index 8935e1e7..1675f2c2 100755
--- a/customize/scenes.yaml
+++ b/customize/scenes.yaml
@@ -4,15 +4,24 @@
 scene.front_full_brightness:
   friendly_name: 'Front Full Brightness'
   emulated_hue: False 
+  hidden: false
 
 scene.living_room_tv_time:
   friendly_name: 'TV Time'
   emulated_hue: True 
+  hidden: false
 
 scene.month_front_12_colors:
   friendly_name: 'Month Front 12 Colors'
   emulated_hue: False
+  hidden: true
 
-scene.month_front_1_colors:
-  friendly_name: 'Month Front 1 Colors'
-  emulated_hue: False
\ No newline at end of file
+scene.month_front_01_colors:
+  friendly_name: 'Month Front 01 Colors'
+  emulated_hue: False
+  hidden: true
+  
+scene.month_front_02_colors:
+  friendly_name: 'Month Front 02 Colors'
+  emulated_hue: False
+  hidden: true
\ No newline at end of file
diff --git a/scene/monthly_front_colors.yaml b/scene/monthly_front_colors.yaml
index bf210d6c..727418d3 100755
--- a/scene/monthly_front_colors.yaml
+++ b/scene/monthly_front_colors.yaml
@@ -34,25 +34,25 @@
   entities:
        light.outdoor_sconce_2:
            state: 'on'
-           color_name: 'HotPink'
+           color_name: 'Pink'
        light.outdoor_sconce_1:
            state: 'on'
-           color_name: 'HotPink'
+           color_name: 'Pink'
        light.outdoor_foyer:
            state: 'on'
-           color_name: 'HotPink'
+           color_name: 'Pink'
        light.outdoor_sconce_3:
            state: 'on'
-           color_name: 'HotPink'
-       light.garage_left:
-           state: 'on'
-           color_name: 'HotPink'
-       light.garage_small:
-           state: 'on'
-           color_name: 'HotPink'
-       light.outdoor_den:
-           state: 'on'
-           color_name: 'HotPink'
+           color_name: '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_front_12_colors
@@ -105,18 +105,18 @@
            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
+       # 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/switch/rf_outlets.yaml b/switch/rf_outlets.yaml
index a7c05f0b..97ac324b 100755
--- a/switch/rf_outlets.yaml
+++ b/switch/rf_outlets.yaml
@@ -69,7 +69,7 @@
       pulselength: 186
       code_on: 285955
       code_off: 285964 
-      signal_repetitions: 40
+      signal_repetitions: 50
             
 # Outlet 304_1
     Outlet_304_1: