diff --git a/README.md b/README.md
index 38d5f1d2..66e56962 100755
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Software on the Pi : [Home Assistant](https://home-assistant.io/) , [Dasher](htt
 * [Door Sensors (AEON Labs)](http://amzn.to/2e3xDxY)
 * [Garadget](garadget.com) - Garage Door opener/sensor
 * Nintendo Wii
-* Emulated Hue pushes all Switch, Group and scene information to Alexa for First Class Control! [Broked!  Worked for literally long enough for me to clear out all my devices in Alexa. :( ]
+* Emulated Hue pushes all Switch, Group, input_boolean, script and scene information to Alexa for First Class Control! 
 * [iTeadStudio goodies](https://twitter.com/ccostan/status/793119824008384512) - SonOff and SonOn with a Slampher!
 * [LED RGB Wifi Controller - flux_led compatible](http://amzn.to/2hxpAL7) with [LED Strips](http://amzn.to/2gJYfZ5)
 
@@ -113,6 +113,7 @@ resource for my RF switches. (MQTT) bit.ly/2gBiOqz
 
 https://www.reddit.com/r/amazonecho/comments/5he8o7/diy_ir_blaster_10_instructions_inside/?st=IWIDBGRT&sh=dd117f28
 
+https://community.home-assistant.io/t/a-different-take-on-an-alarm-system/7809/5 - ALARM System info.
 
 #Lab notes:
 
diff --git a/customize/switches.yaml b/customize/switches.yaml
index 64fa4047..efac414c 100755
--- a/customize/switches.yaml
+++ b/customize/switches.yaml
@@ -70,8 +70,8 @@ switch.Outlet_304_3:
   icon: mdi:power-plug
   assumed_state: true  
   
-switch.Outlet_304_4: 
-  friendly_name: 'Outlet_304_4'
+switch.Village_Outlet: 
+  friendly_name: 'Village_Outlet'
   emulated_hue: true
   icon: mdi:power-plug
   assumed_state: true  
diff --git a/script/holiday_switches_on.yaml b/script/holiday_switches_on.yaml
index 3bf791cc..f4b6c1c6 100755
--- a/script/holiday_switches_on.yaml
+++ b/script/holiday_switches_on.yaml
@@ -1,23 +1,27 @@
-######################################################################################################
-###Script to shut switches with a 30 second delay to not trample codes
-###  Sample Call
-#  action:
-#   - service: script.holiday_switches_on
-######################################################################################################
-
-holiday_switches_on:
-  sequence:
-    - service: switch.turn_on
-      entity_id: switch.living_room_outlet
-    - delay: 00:00:30
-    - service: switch.turn_on
-      entity_id: switch.foyer_outlet
-    - delay: 00:00:30
-
-    - condition: sun
-      after: sunset
-    - service: switch.turn_on
-      entity_id: switch.den_outlet
-    - delay: 00:00:30
-    - service: switch.turn_on
-      entity_id: switch.dining_room_outlet
+######################################################################################################
+###Script to shut switches with a 30 second delay to not trample codes
+###  Sample Call
+#  action:
+#   - service: script.holiday_switches_on
+######################################################################################################
+
+holiday_switches_on:
+  sequence:
+    - service: switch.turn_on
+      entity_id: switch.living_room_outlet
+    - delay: 00:00:30
+    - service: switch.turn_on
+      entity_id: switch.foyer_outlet
+    - delay: 00:00:30
+
+    - condition: sun
+      after: sunset
+    - service: switch.turn_on
+      entity_id: switch.den_outlet
+    - delay: 00:00:30
+    - service: switch.turn_on
+      entity_id: switch.dining_room_outlet
+    - delay: 00:00:30
+    - service: switch.turn_on
+      entity_id: switch.village_outlet
+      
diff --git a/script/switch_turn_off.yaml b/script/switch_turn_off.yaml
index ac75a2b2..a0282719 100755
--- a/script/switch_turn_off.yaml
+++ b/script/switch_turn_off.yaml
@@ -1,56 +1,62 @@
-######################################################################################################
-###Script to shut switches with a 30 second delay to not trample codes
-###  Sample Call
-#  action:
-#   - service: script.switch_turn_off_all
-######################################################################################################
-
-switch_turn_off_all:
-  sequence:
-    - service: switch.turn_off
-      entity_id: switch.living_room_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.kitchen_Accents
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.den_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.foyer_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.printer_outlet
-    - delay: '00:01:00'    
-    - service: switch.turn_off
-      entity_id: switch.garage_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.dining_room_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.living_room_amp
-      
-    - service: switch.turn_off
-      entity_id: switch.living_room_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.kitchen_Accents
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.den_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.foyer_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.printer_outlet
-    - delay: '00:01:00'    
-    - service: switch.turn_off
-      entity_id: switch.garage_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.dining_room_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.living_room_amp
\ No newline at end of file
+######################################################################################################
+###Script to shut switches with a 30 second delay to not trample codes
+###  Sample Call
+#  action:
+#   - service: script.switch_turn_off_all
+######################################################################################################
+
+switch_turn_off_all:
+  sequence:
+    - service: switch.turn_off
+      entity_id: switch.living_room_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.kitchen_Accents
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.den_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.foyer_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.printer_outlet
+    - delay: '00:01:00'    
+    - service: switch.turn_off
+      entity_id: switch.garage_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.dining_room_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.living_room_amp
+    - delay: '00:01:00'      
+    - service: switch.turn_on
+      entity_id: switch.village_outlet
+      
+    - service: switch.turn_off
+      entity_id: switch.living_room_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.kitchen_Accents
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.den_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.foyer_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.printer_outlet
+    - delay: '00:01:00'    
+    - service: switch.turn_off
+      entity_id: switch.garage_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.dining_room_outlet
+    - delay: '00:01:00'
+    - service: switch.turn_off
+      entity_id: switch.living_room_amp
+    - delay: '00:01:00'      
+    - service: switch.turn_on
+      entity_id: switch.village_outlet
\ No newline at end of file
diff --git a/switch/rf_outlets.yaml b/switch/rf_outlets.yaml
index f8b61722..dfae5b23 100755
--- a/switch/rf_outlets.yaml
+++ b/switch/rf_outlets.yaml
@@ -82,8 +82,8 @@
       code_on: 5330691
       code_off: 5330700 
       
-# Outlet_304_4
-    Outlet_304_4:
+# Village_Outlet
+    Village_Outlet:
       protocol: 1
       pulselength: 186
       code_on: 5332227