diff --git a/README.md b/README.md
index b01f2a34..188f3a14 100755
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Software on the Pi : [Home Assistant](https://home-assistant.io/) , [Dasher](htt
 * [Etekcity Outlets](http://amzn.to/2efNoBP)
 * [Door Sensors (AEON Labs)](http://amzn.to/2e3xDxY)
 * Nintendo Wii
+* Emulated Hue to try and get Alexa to see my switches.Not working yet http://carlo-pi:8300/api/12345678901234567890/lights
 
 **Automations:**
 * SMS and IFTTT Notifications for Offline Devices, BadLogins, HA Startups, new HA versions.
diff --git a/automation/good_night.yaml b/automation/good_night.yaml
index 80fda665..09e387a7 100755
--- a/automation/good_night.yaml
+++ b/automation/good_night.yaml
@@ -20,5 +20,7 @@
     state: not_home 
 
   action:
-    service: light.turn_off
-    entity_id: group.all_lights
+    - service: light.turn_off
+      entity_id: group.all_lights
+    - service: switch.turn_off
+      entity_id: group.all_switches
\ No newline at end of file
diff --git a/automation/late_night_helper.yaml b/automation/late_night_helper.yaml
index e49913bd..6f97d51f 100755
--- a/automation/late_night_helper.yaml
+++ b/automation/late_night_helper.yaml
@@ -24,6 +24,10 @@
       - group.living_room_accents
       - light.living_room_slider
       - light.dinette_light_1
+      - light.foyer_door_light
+      - light.kitchen_fridge_light
+      - light.kitchen_sink_light
+      - light.living_room_front_right
     data:
-      brightness: 150
+      brightness: 200
   
diff --git a/group/lights.yaml b/group/lights.yaml
index 64f86647..18c80218 100755
--- a/group/lights.yaml
+++ b/group/lights.yaml
@@ -2,6 +2,17 @@ Bedroom:
   entities:
     - light.bedroom_stacey_light
 
+Kitchen:
+  entities:
+    - light.kitchen_light_1
+    - light.kitchen_light_2
+    - light.kitchen_light_3
+    - light.kitchen_light_4
+    - light.kitchen_light_5
+    - light.kitchen_light_6
+    - light.kitchen_sink_light
+    - light.kitchen_fridge_light
+    
 Living Room:
   entities:
     - light.living_room_back_left
@@ -21,10 +32,15 @@ Dinette:
     - light.dinette_light_1
     - light.dinette_light_2
 
-Study:    
+Den:    
   entities:
     - light.front_office_lamp
 
+Foyer:
+  entities:
+    - light.foyer_door_light
+    - light.foyer_light
+ 
 Office:
   entities:
     - light.office_lamp
diff --git a/scene/tv_time.yaml b/scene/tv_time.yaml
index 7697a412..9681d0ab 100755
--- a/scene/tv_time.yaml
+++ b/scene/tv_time.yaml
@@ -1,9 +1,9 @@
 - name: Living Room TV Time
   entities:
-       light.dinette_light_1:
+       group.dinette:
            state: off
            transition: 10
-       light.dinette_light_2:
+       group.kitchen:
            state: off
            transition: 10
        light.living_room_front_left: