diff --git a/configuration.yaml b/configuration.yaml
index 18150f28..54aa9a18 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -37,7 +37,7 @@ emulated_hue:
 #    - input_boolean
 #    - media_player
     - switch
-#    - scene
+    - scene
     
 ifttt:
   key: !secret ifttt_key
diff --git a/customize/homeassistant.yaml b/customize/homeassistant.yaml
index c4cf3328..75487c79 100755
--- a/customize/homeassistant.yaml
+++ b/customize/homeassistant.yaml
@@ -17,6 +17,7 @@ sensor.badlogin:
   hidden: true
     
 group.home_modes:
+  emulated_hue: false
   friendly_name: 'Home Modes'
   
 group.all_lights:
@@ -26,5 +27,17 @@ group.all_switches:
   hidden: false
 
 group.all_automations:
+  emulated_hue: false
   hidden: false
-  
\ No newline at end of file
+
+group.family:
+  emulated_hue: false  
+
+group.sensors:
+  emulated_hue: false
+
+group.network:
+  emulated_hue: false
+
+group.weather:
+  emulated_hue: false  
\ No newline at end of file
diff --git a/group/holiday.yaml b/group/holiday.yaml
index 689bbe89..296f26fd 100755
--- a/group/holiday.yaml
+++ b/group/holiday.yaml
@@ -1,4 +1,4 @@
-Holiday:
+Holiday lights:
   entities:
     - switch.halloween_lights_den
     - switch.halloween_lights_dining_room
diff --git a/group/lights.yaml b/group/lights.yaml
index db98da67..08116191 100755
--- a/group/lights.yaml
+++ b/group/lights.yaml
@@ -1,8 +1,8 @@
-Bedroom:
+Bedroom lights:
   entities:
     - light.bedroom
 
-Kitchen:
+Kitchen lights:
   entities:
     - light.kitchen_1
     - light.kitchen_2
@@ -13,7 +13,7 @@ Kitchen:
     - light.kitchen_sink
     - light.kitchen_fridge
     
-Living Room:
+Living Room lights:
   entities:
     - light.living_room_back_left
     - light.living_room_back_right
@@ -27,36 +27,43 @@ Living Room Accents:
     - light.couch_2
     - light.couch_tv    
 
-Dinette:
+Dinette lights:
   entities:
     - light.dinette_1
     - light.dinette_2
 
-Den:    
+Den lights:    
   entities:
     - light.den_lamp
 
-Foyer:
+Foyer lights:
   entities:
     - light.foyer_door
     - light.foyer
  
-Office:
+Office lights:
   entities:
     - light.office_lamp
     
-Upstairs:
+Upstairs lights:
   entities:
     - light.upstairs_lamp
 
-Dining_Room:
+Dining_Room lights:
   entities:
     - light.sconce_1
     - light.sconce_2
     - light.sconce_3
     - light.sconce_4
 
-Garage:
+Outdoor Pool Lights:
+  entities:
+    - light.pool_front_left
+    - light.pool_front_right
+    - light.pool_back_left
+    - light.pool_back_left
+    
+Garage lights:
   entities:
     - light.garage_attic
     - switch.garage_outlet
\ No newline at end of file