diff --git a/automation/holiday.yaml b/automation/holiday.yaml
index 57b38636..b35b7ae4 100755
--- a/automation/holiday.yaml
+++ b/automation/holiday.yaml
@@ -11,10 +11,10 @@
               
   action:
     - service: switch.turn_on
-      entity_id: switch.halloween_lights_den
+      entity_id: switch.outlet_den
     - delay: 00:00:30
     - service: switch.turn_on
-      entity_id: switch.halloween_lights_dining_room
+      entity_id: switch.outlet_living_room
     
 - alias: 'Holiday Stuff off'  
   trigger:
@@ -26,9 +26,9 @@
 
   action:
     - service: switch.turn_off
-      entity_id: switch.halloween_lights_den
+      entity_id: switch.outlet_den
     - delay: 00:00:30
     - service: switch.turn_off
-      entity_id: switch.halloween_lights_dining_room
+      entity_id: switch.outlet_living_room
 
       
\ No newline at end of file
diff --git a/automation/kitchen_lights_and_accents.yaml b/automation/kitchen_lights_and_accents.yaml
index 474c3db8..1fd24848 100755
--- a/automation/kitchen_lights_and_accents.yaml
+++ b/automation/kitchen_lights_and_accents.yaml
@@ -25,12 +25,11 @@
     - platform: state
       entity_id: group.kitchen_lights
       state: 'off'
+      for: '00:05:00'
       
   condition:
     - condition: sun
       after: 'sunset'
-    - condition: time
-      before: '02:00:00'
 
   action:
     - service: switch.turn_on
diff --git a/automation/sunrise_turnon_and_off.yaml b/automation/sunrise_turnon_and_off.yaml
index ec14bd4d..23e457f8 100755
--- a/automation/sunrise_turnon_and_off.yaml
+++ b/automation/sunrise_turnon_and_off.yaml
@@ -6,11 +6,6 @@
   trigger:
     - platform: sun
       event: sunset
-    - platform: time
-      after: '20:00:00'
-#Time trigger is until I replace the stupid switch.
-#    - platform: event
-#      event_type: halloween_lights_on
               
   action:
     - service: switch.turn_on
@@ -25,19 +20,13 @@
   trigger:
     - platform: sun
       event: sunrise
-      offset: '-03:30:00'
-#    - platform: event
-#      event_type: halloween_lights_off          
+      offset: '-03:30:00'       
 
   action:
     - service: light.turn_off
-      entity_id: group.outdoor_front_lights
+      entity_id: group.all_lights
       data:
-        transition: 1200      
-    - service: light.turn_off
-      entity_id: light.outdoor_bathroom  
-    - service: light.turn_off
-      entity_id: group.outdoor_lights   
+        transition: 1200       
     - service: script.switch_turn_off_all
     
       
diff --git a/group/switches.yaml b/group/switches.yaml
index 09f05733..5aad39c3 100755
--- a/group/switches.yaml
+++ b/group/switches.yaml
@@ -1,7 +1,7 @@
 Switches:
   entities:
-    - switch.halloween_lights_den
-    - switch.halloween_lights_dining_room
+    - switch.outlet_den
+    - switch.outlet_living_room
     - switch.foyer_outlet
     - switch.kitchen_Accents
     - switch.printer_outlet
diff --git a/script/switch_turn_off.yaml b/script/switch_turn_off.yaml
index d106aac9..b5db932b 100755
--- a/script/switch_turn_off.yaml
+++ b/script/switch_turn_off.yaml
@@ -8,10 +8,10 @@
 switch_turn_off_all:
   sequence:
     - service: switch.turn_off
-      entity_id: switch.halloween_lights_den
+      entity_id: switch.outlet_den
     - delay: '00:01:00'
     - service: switch.turn_off
-      entity_id: switch.halloween_lights_dining_room
+      entity_id: switch.outlet_living_room
     - delay: '00:01:00'
     - service: switch.turn_off
       entity_id: switch.foyer_outlet
diff --git a/sensor/date_time.yaml b/sensor/date_time.yaml
new file mode 100755
index 00000000..268ea245
--- /dev/null
+++ b/sensor/date_time.yaml
@@ -0,0 +1,4 @@
+- platform: time_date
+  display_options:
+    - 'time'
+    - 'date'
\ No newline at end of file
diff --git a/switch/rf_outlets.yaml b/switch/rf_outlets.yaml
index 8b4fdf0f..b9268fe3 100755
--- a/switch/rf_outlets.yaml
+++ b/switch/rf_outlets.yaml
@@ -5,15 +5,22 @@
 - platform: rpi_rf
   gpio: 17
   switches:
-# Outlet 1
+# Outlet 1412_1
+    Garage_Outlet:
+      protocol: 1
+      pulselength: 186
+      code_on: 5264691
+      code_off: 5264700 
+  
+  # Outlet 1412_3
     Living_Room_Amp:
       protocol: 1
       pulselength: 186
       code_on: 5265155
       code_off: 5265164
 
-# Outlet 2
-    Halloween_Lights_Den:
+# Outlet 1412_2
+    Outlet_Den:
       protocol: 1
       pulselength: 186
       code_on: 5264835
@@ -25,23 +32,16 @@
       pulselength: 186
       code_on: 292099
       code_off: 292108 
-
-# Outlet 3
-    Garage_Outlet:
-      protocol: 1
-      pulselength: 186
-      code_on: 5264691
-      code_off: 5264700 
       
 # Outlet 311_1
-    Kitchen Accents:
+    Kitchen_Accents:
       protocol: 1
       pulselength: 186
       code_on: 283955
       code_off: 283964 
       
 # Outlet 311_2 : Responds to 311_1 as well.
-    Kitchen Accent 2:
+    Kitchen_Accent 2:
       protocol: 1
       pulselength: 186
       code_on: 284099
@@ -55,36 +55,36 @@
       code_off: 284428 
       
 # Outlet 311_4
-    Halloween_Lights_Dining_Room:
+    Outlet_Living_Room:
       protocol: 1
       pulselength: 186
       code_on: 285955
       code_off: 285964 
             
 # Outlet 304_1
-    Outlet 304_1:
+    Outlet_304_1:
       protocol: 1
-      pulselength: 189
+      pulselength: 186
       code_on: 5330027
       code_off: 5330236 
       
 # Outlet 304_2
-    Outlet 304_2:
+    Outlet_304_2:
       protocol: 1
-      pulselength: 189
+      pulselength: 186
       code_on: 5330371
       code_off: 5330380 
 
 # Outlet 304_3
-    Outlet 304_3:
+    Outlet_304_3:
       protocol: 1
-      pulselength: 189
+      pulselength: 186
       code_on: 5330691
       code_off: 5330700 
       
-# Outlet 304_4
-    Outlet 304_4:
+# Outlet_Dining_Room
+    Outlet_304_4:
       protocol: 1
-      pulselength: 189
+      pulselength: 186
       code_on: 5332227
       code_off: 5332236 
\ No newline at end of file