diff --git a/.gitignore b/.gitignore
index 6ff1ba57..c283f2ca 100755
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ tts
 secrets.yaml
 secrets
 known_devices.yaml
+.homekit.state
 phue.conf
 ios.conf
 pyozw.sqlite
diff --git a/config/configuration.yaml b/config/configuration.yaml
index ce387659..09d23409 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -37,8 +37,6 @@ cloud:
   alexa:
     filter:
       include_entities:
-        - group.all_lights
-        - group.all_switches
         - group.interior_lights
         - group.bedroom_lights
         - group.living_room_lights
@@ -65,7 +63,7 @@ cloud:
         - switch
         - cover
         - input_boolean
-        - group
+#        - group
       # exclude_entities:
       # exclude_domains:
       #   - light
@@ -77,10 +75,10 @@ cloud:
         display_categories: LIGHT
       group.upstairs_lights:
         display_categories: LIGHT
-      group.kitchen_accents:
-        display_categories: LIGHT
-      group.master_bathroom_accents:
-        display_categories: LIGHT
+      # group.kitchen_accents:
+      #   display_categories: SWITCH
+      # group.master_bathroom_accents:
+      #   display_categories: SWITCH
 
 http:
   base_url: !secret http_base_url
diff --git a/config/customize/switches.yaml b/config/customize/switches.yaml
index 57b807d3..42813609 100755
--- a/config/customize/switches.yaml
+++ b/config/customize/switches.yaml
@@ -16,13 +16,6 @@ switch.foyer_outlet:
   icon: mdi:power-plug
   assumed_state: true
 
-# switch.front_door_outlet:
-#   friendly_name: 'Front Door Outlet'
-#
-#   hidden: False
-#   icon: mdi:power-plug
-#   assumed_state: true
-
 switch.garage_outlet:
   friendly_name: 'Garage Outlet'
 
@@ -52,14 +45,6 @@ switch.living_room_outlet:
   assumed_state: true
 
 
-group.master_bathroom_accents:
-  friendly_name: 'Master Bathroom Accents'
-
-  hidden: False
-  icon: mdi:lightbulb-outline
-  assumed_state: true
-
-
 switch.outlet_304_2:
   friendly_name: 'Outlet 304 2'
 
diff --git a/config/group/switches.yaml b/config/group/switches.yaml
index 1c061791..688403e3 100755
--- a/config/group/switches.yaml
+++ b/config/group/switches.yaml
@@ -3,22 +3,24 @@ Interior Switches:
     - switch.den_outlet
     - switch.living_room_outlet
     - switch.foyer_outlet
-    - group.kitchen_accents
+    - switch.kitchen_accent_1
+    - switch.kitchen_accent_2
     - switch.printer_outlet
     - switch.front_door_outlet
     - switch.garage_outlet
     - switch.lr_amp
-    - group.master_bathroom_accents
+    - switch.master_bathroom_accent_1
+    - switch.master_bathroom_accent_2
     - switch.pool_deck
     - switch.1412_2_Outlet
     - switch.1412_3_Outlet
 
-kitchen_accents:
+Kitchen Accents:
   entities:
     - switch.kitchen_accent_1
     - switch.kitchen_accent_2
 
-master_bathroom_accents:
+Master Bathroom Accents:
   entities:
     - switch.master_bathroom_accent_1
     - switch.master_bathroom_accent_2