From 91ad6f3a7126eeec7978d41dcfb22d9b8a912563 Mon Sep 17 00:00:00 2001
From: ccostan <carlo@ipm.com>
Date: Sat, 6 Jun 2020 16:43:37 -0400
Subject: [PATCH] Moved groups to Light Groups.  Added filters to Homekit and
 Alexa.  REMOVED Homebridge references.  #764

---
 config/configuration.yaml                     |  63 +++----
 config/customize/binary_sensors.yaml          |  94 +++++------
 config/customize/device_tracker.yaml          |  90 +++++-----
 config/customize/groups.yaml                  |  28 ++--
 config/customize/input_booleans.yaml          |  40 ++---
 config/customize/lights.yaml                  |  96 +++++------
 config/customize/scripts.yaml                 |  30 ++--
 config/customize/sensors.yaml                 | 156 +++++++++---------
 config/customize/switches.yaml                |   4 +-
 config/group/lights.yaml                      | 106 ------------
 config/homekit.yaml                           |  20 ++-
 config/light_groups.yaml                      | 141 ++++++++++++++++
 config/packages/alarm.yaml                    |   4 +-
 .../packages/arris_router.yaml.decommissioned |   2 +-
 config/packages/grafana.yaml                  |   2 +-
 config/packages/juicenet.yaml                 |   2 +-
 config/packages/mychevy.yaml.disabled         |   2 +-
 config/packages/nest_protects.yaml            |  12 +-
 config/packages/time_date_sensors.yaml        |   4 +-
 .../triggers/mqtt_screens.yaml.disabled       |   2 +-
 20 files changed, 466 insertions(+), 432 deletions(-)
 create mode 100755 config/light_groups.yaml

diff --git a/config/configuration.yaml b/config/configuration.yaml
index 0e3ed711..576614dd 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -40,40 +40,37 @@ cloud:
   alexa:
     filter:
       include_entities:
-        - group.interior_lights
-        - group.bedroom_lights
-        - group.living_room_lights
-        - group.living_room_accents
-        - group.dinette_lights
-        - group.dining_room_lights
-        - group.den_lights
-        - group.foyer_lights
-        - group.office_lights
-        - group.hallway_lights
-        - group.kitchen_lights
-        - group.kitchen_accents
-        - group.upstairs_lights
         - group.outdoor_pool_lights
-        - group.master_bathroom_accents
-        - group.garage_lights
-        - group.paiges_room
-        - group.justins_room
         - group.Exterior_Lights
         - group.outdoor_pool_lights
         - group.outdoor_front_lights
         - group.landscaping
+        - group.master_bathroom_accents
+        - group.kitchen_accents
+        - light.bedroom
+        - light.bedroom_lights
+        - light.den_lights
+        - light.dinette_lights
+        - light.dining_room_lights
+        - light.foyer_lights
+        - light.garage_lights
+        - light.hallway_lights
+        - light.kitchen_lights
+        - light.living_room_accents
+        - light.living_room_lights
+        - light.office_lights
+        - light.outdoor_front_lights
+        - light.outdoor_pool_lights
+        - light.outside_pool_lights
+        - light.upstairs_lights
       include_domains:
         - switch
         - cover
         - input_boolean
         - camera
-    entity_config:
-      group.kitchen_lights:
-        display_categories: LIGHT
-      group.bedroom_lights:
-        display_categories: LIGHT
-      group.upstairs_lights:
-        display_categories: LIGHT
+    # entity_config:
+    #   group.kitchen_lights:
+    #     display_categories: LIGHT
 
 http:
   server_port: !secret http_port
@@ -121,23 +118,7 @@ hue:
       allow_unreachable: true
       allow_hue_groups: false
 
-light:
-  # Reference : https://www.flexfireleds.com/pages/Comparison-between-3528-LEDs-and-5050-LEDs.html
-  - platform: flux_led
-    automatic_add: True
-    devices:
-      192.168.10.30:
-        name: led_garage_snip
-        mode: "rgb"
-      192.168.10.31:
-        name: led_outdoor_den
-        mode: "rgb"
-      192.168.10.32:
-        name: led_garage_large
-        mode: "rgb"
-      192.168.10.33:
-        name: led_garage_small
-        mode: "rgb"
+light: !include light_groups.yaml
 
 ifttt:
   key: !secret ifttt_key
diff --git a/config/customize/binary_sensors.yaml b/config/customize/binary_sensors.yaml
index 5cbc2f59..83a0afb8 100755
--- a/config/customize/binary_sensors.yaml
+++ b/config/customize/binary_sensors.yaml
@@ -2,7 +2,7 @@ binary_sensor.bedroom_alarm_panel:
   friendly_name: 'Bedroom Alarm Panel'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 
@@ -11,7 +11,7 @@ binary_sensor.carlowink:
   friendly_name: 'Carlo-Wink'
   
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:router-wireless
 
 
@@ -20,7 +20,7 @@ binary_sensor.downstairs_thermostat_fan:
   friendly_name: 'Downstairs Thermostat Fan'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -29,7 +29,7 @@ binary_sensor.downstairs_thermostat_has_leaf:
   friendly_name: 'Downstairs Thermostat Has Leaf'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -38,7 +38,7 @@ binary_sensor.downstairs_thermostat_is_locked:
   friendly_name: 'Downstairs Thermostat Is Locked'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -47,7 +47,7 @@ binary_sensor.downstairs_thermostat_is_using_emergency_heat:
   friendly_name: 'Downstairs Thermostat Is Using Emergency Heat'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -56,7 +56,7 @@ binary_sensor.downstairs_thermostat_online:
   friendly_name: 'Downstairs Thermostat Online'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -65,7 +65,7 @@ binary_sensor.entry_alarm_panel:
   friendly_name: 'Entry Alarm Panel'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 
@@ -74,7 +74,7 @@ binary_sensor.hallway_linen:
   friendly_name: 'Hallway Linen Door'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:home-variant
 
 
@@ -83,7 +83,7 @@ binary_sensor.hallway_nest_protect_kids_hallway_online:
   friendly_name: 'Kids Hallway Protect'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:nest-protect
 
 
@@ -92,7 +92,7 @@ binary_sensor.hallway_pantry:
   friendly_name: 'Hallway Pantry Door'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:home-variant
 
 
@@ -101,7 +101,7 @@ binary_sensor.iss:
   friendly_name: 'Iss Visibility'
   
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:satellite-variant
 
 
@@ -110,7 +110,7 @@ binary_sensor.justins_room_nest_protect_online:
   friendly_name: 'Justins Room Protect'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:nest-protect
 
 
@@ -119,7 +119,7 @@ binary_sensor.kitchen_door:
   friendly_name: 'Kitchen Door'
   
   hidden: False
-  homebridge_hidden: False
+  
   icon: mdi:home-variant
 
 
@@ -128,7 +128,7 @@ binary_sensor.kitchen_nest_protect_online:
   friendly_name: 'Kitchen Protect'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:nest-protect
 
 
@@ -137,7 +137,7 @@ binary_sensor.master_bedroom_nest_protect_online:
   friendly_name: 'Master Bedroom Protect'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:nest-protect
 
 
@@ -146,7 +146,7 @@ binary_sensor.master_hallway_nest_protect_online:
   friendly_name: 'Master Hallway Protect'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:nest-protect
 
 
@@ -155,7 +155,7 @@ binary_sensor.mcu1_gpio10:
   friendly_name: 'Dining Room Windows'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -164,7 +164,7 @@ binary_sensor.mcu1_gpio12:
   friendly_name: 'Interior Garage Door'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -173,7 +173,7 @@ binary_sensor.mcu1_gpio13:
   friendly_name: 'Front Den Windows'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -182,7 +182,7 @@ binary_sensor.mcu1_gpio14:
   friendly_name: 'Office Window'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -191,7 +191,7 @@ binary_sensor.mcu1_gpio4:
   friendly_name: 'Paige Window'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -200,7 +200,7 @@ binary_sensor.mcu1_gpio5:
   friendly_name: 'Front Door'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -209,7 +209,7 @@ binary_sensor.mcu2_gpio10:
   friendly_name: 'Master Bathroom Window'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -218,7 +218,7 @@ binary_sensor.mcu2_gpio12:
   friendly_name: 'Main Slider'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -227,7 +227,7 @@ binary_sensor.mcu2_gpio13:
   friendly_name: 'Upstairs Bedroom Window'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -236,7 +236,7 @@ binary_sensor.mcu2_gpio14:
   friendly_name: 'Justin Window'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -245,7 +245,7 @@ binary_sensor.mcu2_gpio4:
   friendly_name: 'Dinette Windows'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -254,7 +254,7 @@ binary_sensor.mcu2_gpio5:
   friendly_name: 'Back Door'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -263,7 +263,7 @@ binary_sensor.mcu2_gpio9:
   friendly_name: 'Master Slider'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -272,7 +272,7 @@ binary_sensor.mcu3_gpio10:
   friendly_name: 'Master Bedroom Window'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -281,7 +281,7 @@ binary_sensor.mcu3_gpio14:
   friendly_name: 'Upstairs Windows'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -290,7 +290,7 @@ binary_sensor.mcu3_gpio4:
   friendly_name: 'Stacey Bedroom Window'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -299,7 +299,7 @@ binary_sensor.mcu3_gpio5:
   friendly_name: 'Carlo Bedroom Window'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -308,7 +308,7 @@ binary_sensor.mcu3_light:
   friendly_name: 'Panel Door'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:security-home
 
 
@@ -317,7 +317,7 @@ binary_sensor.office_motion:
   friendly_name: 'Office Motion Sensor'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:sensor
 
 
@@ -326,7 +326,7 @@ binary_sensor.office_nest_protect_online:
   friendly_name: 'Office Protect'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:nest-protect
 
 
@@ -335,7 +335,7 @@ binary_sensor.paiges_room_nest_protect_paiges_room_online:
   friendly_name: 'Paiges Room Protect'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:nest-protect
 
 
@@ -344,7 +344,7 @@ binary_sensor.sleepnumber_carlo_carlo_is_in_bed:
   friendly_name: 'Carlo Is In Bed'
   
   hidden: False
-  homebridge_hidden: False
+  
 
 
 
@@ -353,7 +353,7 @@ binary_sensor.sleepnumber_carlo_stacey_is_in_bed:
   friendly_name: 'Stacey Is In Bed'
   
   hidden: False
-  homebridge_hidden: False
+  
 
 
 
@@ -362,7 +362,7 @@ binary_sensor.upstairs_bedroom_nest_protect_online:
   friendly_name: 'Upstairs Bedroom Protect'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:nest-protect
 
 
@@ -371,7 +371,7 @@ binary_sensor.upstairs_living_room_nest_protect_online:
   friendly_name: 'Upstairs Living Room Protect'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:nest-protect
 
 
@@ -380,7 +380,7 @@ binary_sensor.upstairs_thermostat_fan:
   friendly_name: 'Upstairs Thermostat Fan'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -389,7 +389,7 @@ binary_sensor.upstairs_thermostat_has_leaf:
   friendly_name: 'Upstairs Thermostat Has Leaf'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -398,7 +398,7 @@ binary_sensor.upstairs_thermostat_is_locked:
   friendly_name: 'Upstairs Thermostat Is Locked'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -407,7 +407,7 @@ binary_sensor.upstairs_thermostat_is_using_emergency_heat:
   friendly_name: 'Upstairs Thermostat Is Using Emergency Heat'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -416,4 +416,4 @@ binary_sensor.upstairs_thermostat_online:
   friendly_name: 'Upstairs Thermostat Online'
   
   hidden: True
-  homebridge_hidden: True
+
diff --git a/config/customize/device_tracker.yaml b/config/customize/device_tracker.yaml
index b4891edd..33b15e4e 100755
--- a/config/customize/device_tracker.yaml
+++ b/config/customize/device_tracker.yaml
@@ -2,7 +2,7 @@ device_tracker.actiontechap:
   friendly_name: 'Actiontechap'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -11,25 +11,25 @@ device_tracker.bedroom_alarm_panel:
   friendly_name: 'Bedroom Alarm Panel'
   
   hidden: True
-  homebridge_hidden: True
+
 
 device_tracker.hue_hub_1:
   friendly_name: 'Hue Hub 1'
   
   hidden: True
-  homebridge_hidden: True
+
 
 device_tracker.hue_hub_2:
   friendly_name: 'Hue Hub 2'
   
   hidden: True
-  homebridge_hidden: True
+
 
 device_tracker.entry_alarm_panel:
   friendly_name: 'Entry Alarm Panel'
   
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -38,7 +38,7 @@ device_tracker.alexa_echo:
   friendly_name: 'Alexa Echo'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -47,7 +47,7 @@ device_tracker.amazon_dot:
   friendly_name: 'Amazon Dot'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -56,7 +56,7 @@ device_tracker.amazon_fire_stick:
   friendly_name: '50f5da4cd5ec'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -65,7 +65,7 @@ device_tracker.carlo:
   friendly_name: 'Carlo'
   
   hidden: False
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -74,7 +74,7 @@ device_tracker.carlopihole:
   friendly_name: 'Carlo-Pihole'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -83,7 +83,7 @@ device_tracker.chromecast_audio_1:
   friendly_name: 'Chromecast Audio 1'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -92,7 +92,7 @@ device_tracker.chromecast_audio_2:
   friendly_name: 'Chromecast Audio 2'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -101,21 +101,21 @@ device_tracker.circle:
   friendly_name: 'Circle'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 device_tracker.study_ap:
   friendly_name: 'Ubiquiti AP Study'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 device_tracker.cisco_ap:
   friendly_name: 'Cisco Ap'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -124,7 +124,7 @@ device_tracker.hue_h_1:
   friendly_name: 'Hue H 1'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -133,7 +133,7 @@ device_tracker.hue_h_2:
   friendly_name: 'Hue H 2'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -142,7 +142,7 @@ device_tracker.ipmdemounit:
   friendly_name: 'Ipmdemounit'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -151,7 +151,7 @@ device_tracker.justin_dot:
   friendly_name: 'Justin-Dot'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -160,7 +160,7 @@ device_tracker.large_garage:
   friendly_name: 'Large Garage'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -169,7 +169,7 @@ device_tracker.living_room_roku:
   friendly_name: 'Living Room Roku'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -178,7 +178,7 @@ device_tracker.master_bedroom_roku:
   friendly_name: 'Master Bedroom Roku'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -187,7 +187,7 @@ device_tracker.nest_downstairs:
   friendly_name: 'Nest Downstairs'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -196,7 +196,7 @@ device_tracker.nest_upstairs:
   friendly_name: 'Nest Upstairs'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -205,7 +205,7 @@ device_tracker.nodemcu1:
   friendly_name: 'Nodemcu1'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:chip
 
 
@@ -214,7 +214,7 @@ device_tracker.nodemcu2:
   friendly_name: 'Nodemcu2'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:chip
 
 
@@ -223,7 +223,7 @@ device_tracker.nodemcu3:
   friendly_name: 'Nodemcu3'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:chip
 
 
@@ -232,7 +232,7 @@ device_tracker.nodemcu4:
   friendly_name: 'A020a618077f'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:chip
 
 
@@ -241,7 +241,7 @@ device_tracker.printer:
   friendly_name: '001ba94e7b4a'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -250,7 +250,7 @@ device_tracker.rachio:
   friendly_name: 'Rachio'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -259,7 +259,7 @@ device_tracker.rgb_led_garage_large:
   friendly_name: 'Rgb Led Garage Large'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -268,7 +268,7 @@ device_tracker.rgb_led_garage_small:
   friendly_name: 'Rgb Led Garage Small'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -277,7 +277,7 @@ device_tracker.rgb_led_outdoor_den:
   friendly_name: 'Rgb Led Outdoor Den'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -286,7 +286,7 @@ device_tracker.samsungtv:
   friendly_name: 'Samsung Tv'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -295,7 +295,7 @@ device_tracker.skybell:
   friendly_name: 'Skybell'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -304,7 +304,7 @@ device_tracker.sleep_number_bed:
   friendly_name: 'Sleep Number Bed'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -313,7 +313,7 @@ device_tracker.small_garage:
   friendly_name: 'Small Garage'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -322,7 +322,7 @@ device_tracker.smart_water_meter:
   friendly_name: 'Smart Water Meter'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -331,7 +331,7 @@ device_tracker.stacey:
   friendly_name: 'Stacey'
   
   hidden: False
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -340,7 +340,7 @@ device_tracker.staceyiphone_nat:
   friendly_name: 'Stacey Iphone 2'
   
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -349,7 +349,7 @@ device_tracker.tablotv:
   friendly_name: 'Tablotv'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -358,7 +358,7 @@ device_tracker.trendnetap:
   friendly_name: 'Trendnet Ap'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -367,7 +367,7 @@ device_tracker.unifi_ap:
   friendly_name: 'Unifi Ap'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -376,7 +376,7 @@ device_tracker.wii:
   friendly_name: 'Wii'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
 
 
@@ -385,5 +385,5 @@ device_tracker.withings_scale:
   friendly_name: 'Withings Scale'
   
   hidden: True
-  homebridge_hidden: True
+
   icon: False
diff --git a/config/customize/groups.yaml b/config/customize/groups.yaml
index 80fba061..38917b77 100755
--- a/config/customize/groups.yaml
+++ b/config/customize/groups.yaml
@@ -2,21 +2,21 @@ group.all_automations:
   friendly_name: 'All Automations'
   
   hidden: True
-  homebridge_hidden: true
+
 
 
 group.garage_doors:
   friendly_name: 'All Covers'
   
   hidden: True
-  homebridge_hidden: true
+
 
 
 group.all_devices:
   friendly_name: 'All Devices'
   
   hidden: True
-  homebridge_hidden: true
+
 
 
 group.all_lights:
@@ -30,7 +30,7 @@ group.all_scripts:
   friendly_name: 'All Scripts'
   
   hidden: True
-  homebridge_hidden: true
+
 
 group.all_switches:
   friendly_name: 'All Switches'
@@ -43,14 +43,14 @@ group.amps:
   friendly_name: 'Amps'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 group.sleep_number_bed:
   friendly_name: 'Sleep Number Bed'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 group.bedroom_lights:
@@ -92,7 +92,7 @@ group.family:
   friendly_name: 'Family'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 group.foyer_lights:
@@ -106,7 +106,7 @@ group.garadget:
   friendly_name: 'Garage Doors'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 group.garage_lights:
@@ -127,7 +127,7 @@ group.home_modes:
   friendly_name: 'Home Modes'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 group.interior_lights:
@@ -169,14 +169,14 @@ group.media_players:
   friendly_name: 'Media Players'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 group.network:
   friendly_name: 'Network'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 group.office_lights:
@@ -211,14 +211,14 @@ group.sensors:
   friendly_name: 'Sensors'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 group.switches:
   friendly_name: 'Switches'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 group.upstairs_lights:
@@ -232,4 +232,4 @@ group.weather:
   friendly_name: 'Weather'
   
   hidden: False
-  homebridge_hidden: true
+
diff --git a/config/customize/input_booleans.yaml b/config/customize/input_booleans.yaml
index 1007a9a3..9c89ec4c 100755
--- a/config/customize/input_booleans.yaml
+++ b/config/customize/input_booleans.yaml
@@ -2,7 +2,7 @@ input_boolean.alert_mode:
   friendly_name: 'Alert Mode'
   
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:alert-octagram
 
 
@@ -11,7 +11,7 @@ input_boolean.color_tornado:
   friendly_name: 'Color Tornado'
   
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:invert-colors
 
 
@@ -20,7 +20,7 @@ input_boolean.daylight_override:
   friendly_name: 'Daylight Override'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 
@@ -29,7 +29,7 @@ input_boolean.flash:
   friendly_name: 'Flash'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:yin-yang
 
 
@@ -38,7 +38,7 @@ input_boolean.good_morning:
   friendly_name: 'Good Morning'
   
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:weather-sunset-up
 
 
@@ -47,7 +47,7 @@ input_boolean.good_night:
   friendly_name: 'Good Night'
   
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:weather-night
 
 
@@ -56,7 +56,7 @@ input_boolean.guard_dog:
   friendly_name: 'Guard Dog'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:paw
 
 
@@ -65,7 +65,7 @@ input_boolean.guest_mode:
   friendly_name: 'Guest Mode'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:account-alert
 
 
@@ -74,7 +74,7 @@ input_boolean.home_stats:
   friendly_name: 'Home Stats'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:chart-bar
 
 
@@ -83,7 +83,7 @@ input_boolean.house_station:
   friendly_name: 'House Station'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:radio
 
 
@@ -92,7 +92,7 @@ input_boolean.lastmsg:
   friendly_name: 'Repeat Message'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:repeat-once
 
 
@@ -101,7 +101,7 @@ input_boolean.meal_time:
   friendly_name: 'Meal Time'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:food
 
 
@@ -110,7 +110,7 @@ input_boolean.medicine:
   friendly_name: 'Medicine'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 
@@ -119,7 +119,7 @@ input_boolean.responsibilities:
   friendly_name: 'Responsibilities'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:delete-sweep
 
 
@@ -128,7 +128,7 @@ input_boolean.school_mode:
   friendly_name: 'School Mode'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:school
 
 
@@ -137,7 +137,7 @@ input_boolean.self_destruct:
   friendly_name: 'Self Destruct'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:skull
 
 
@@ -146,7 +146,7 @@ input_boolean.sleepy_dog:
   friendly_name: 'Sleepy Dog'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:bell-sleep
 
 
@@ -155,7 +155,7 @@ input_boolean.speech_notifications:
   friendly_name: 'Speech Notifications'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:speaker-wireless
 
 
@@ -164,7 +164,7 @@ input_boolean.tv_time:
   friendly_name: 'Tv Time'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:television-guide
 
 
@@ -173,5 +173,5 @@ input_boolean.work:
   friendly_name: 'Work'
   
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:briefcase
diff --git a/config/customize/lights.yaml b/config/customize/lights.yaml
index eb31b3bd..7cc34734 100755
--- a/config/customize/lights.yaml
+++ b/config/customize/lights.yaml
@@ -2,7 +2,7 @@ light.bedroom:
   friendly_name: 'Bedroom'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -11,7 +11,7 @@ light.bedroom_hallway:
   friendly_name: 'Bedroom Hallway'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -20,7 +20,7 @@ light.couch_1:
   friendly_name: 'Couch 1'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -29,7 +29,7 @@ light.d1:
   friendly_name: 'D1'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -38,7 +38,7 @@ light.d2:
   friendly_name: 'D2'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -47,7 +47,7 @@ light.den_lamp:
   friendly_name: 'Den Lamp'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -56,7 +56,7 @@ light.f1:
   friendly_name: 'F1'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -65,7 +65,7 @@ light.f2:
   friendly_name: 'F2'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -74,7 +74,7 @@ light.fridge:
   friendly_name: 'Fridge'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -83,7 +83,7 @@ light.garage_attic:
   friendly_name: 'Garage Attic'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 
@@ -92,7 +92,7 @@ light.justin_go:
   friendly_name: 'Justin Go'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -101,7 +101,7 @@ light.k1:
   friendly_name: 'K1'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -110,7 +110,7 @@ light.k2:
   friendly_name: 'K2'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -119,7 +119,7 @@ light.k3:
   friendly_name: 'K3'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -128,7 +128,7 @@ light.k4:
   friendly_name: 'K4'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -137,7 +137,7 @@ light.k5:
   friendly_name: 'K5'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -146,7 +146,7 @@ light.k6:
   friendly_name: 'K6'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -155,7 +155,7 @@ light.kids_hallway:
   friendly_name: 'Kids Hallway'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -164,20 +164,20 @@ light.led_garage_large:
   friendly_name: 'Garage Large Led'
   
   hidden: False
-  homebridge_hidden: True
+
 
 light.led_garage_snip:
   friendly_name: 'Garage Snip Led'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 light.led_garage_small:
   friendly_name: 'Garage Small Led'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -186,7 +186,7 @@ light.led_outdoor_den:
   friendly_name: 'Outdoor Den Led'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -195,7 +195,7 @@ light.m1_back_left:
   friendly_name: 'M1 Back Left'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -204,7 +204,7 @@ light.m1_back_right:
   friendly_name: 'M1 Back Right'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -213,7 +213,7 @@ light.m1_front_left:
   friendly_name: 'M1 Front Left'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -222,7 +222,7 @@ light.m1_front_right:
   friendly_name: 'M1 Front Right'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -231,7 +231,7 @@ light.m1_slider:
   friendly_name: 'M1 Slider'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -240,7 +240,7 @@ light.master_toilet:
   friendly_name: 'Master Toilet'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -249,7 +249,7 @@ light.office_lamp:
   friendly_name: 'Office Lamp'
   
   hidden: False
-  homebridge_hidden: False
+  
 
 
 
@@ -258,7 +258,7 @@ light.outdoor_bathroom:
   friendly_name: 'Outdoor Bathroom'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -267,7 +267,7 @@ light.outdoor_foyer:
   friendly_name: 'Outdoor Foyer'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -276,7 +276,7 @@ light.outdoor_sconce_1:
   friendly_name: 'Outdoor Sconce 1'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -285,7 +285,7 @@ light.outdoor_sconce_2:
   friendly_name: 'Outdoor Sconce 2'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -294,7 +294,7 @@ light.outdoor_sconce_3:
   friendly_name: 'Outdoor Sconce 3'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -303,7 +303,7 @@ light.outside_pool_lights:
   friendly_name: 'Outside Pool Lights'
   
   hidden: False
-  homebridge_hidden: true
+
 
 
 
@@ -312,7 +312,7 @@ light.p1_back_left:
   friendly_name: 'P1 Back Left'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -321,7 +321,7 @@ light.p1_back_right:
   friendly_name: 'P1 Back Right'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -330,7 +330,7 @@ light.p1_front_left:
   friendly_name: 'P1 Front Left'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -339,7 +339,7 @@ light.p1_front_right:
   friendly_name: 'P1 Front Right'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -348,7 +348,7 @@ light.paige_go:
   friendly_name: 'Paige Go'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -357,7 +357,7 @@ light.s1:
   friendly_name: 'S1'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -366,7 +366,7 @@ light.s2:
   friendly_name: 'S2'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -375,7 +375,7 @@ light.s3:
   friendly_name: 'S3'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -384,7 +384,7 @@ light.s4:
   friendly_name: 'S4'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -393,7 +393,7 @@ light.sink:
   friendly_name: 'Sink'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -402,7 +402,7 @@ light.tv_light:
   friendly_name: 'Tv Light'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -411,7 +411,7 @@ light.tv_stand_light:
   friendly_name: 'Tv Stand Light'
   
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -420,4 +420,4 @@ light.upstairs_lamp:
   friendly_name: 'Upstairs Lamp'
   
   hidden: False
-  homebridge_hidden: True
+
diff --git a/config/customize/scripts.yaml b/config/customize/scripts.yaml
index 4f0d39fe..605c93b6 100755
--- a/config/customize/scripts.yaml
+++ b/config/customize/scripts.yaml
@@ -1,7 +1,7 @@
 script.amp_settings:
   friendly_name: 'Amp Settings'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -9,7 +9,7 @@ script.amp_settings:
 script.dog_bark:
   friendly_name: 'Dog Bark'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -17,7 +17,7 @@ script.dog_bark:
 script.emergency:
   friendly_name: 'Emergency'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -25,7 +25,7 @@ script.emergency:
 script.flash_notify:
   friendly_name: 'Flash Notify'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -33,7 +33,7 @@ script.flash_notify:
 script.front_house_motion:
   friendly_name: 'Front House Motion'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -41,7 +41,7 @@ script.front_house_motion:
 script.interior_off:
   friendly_name: 'Interior Off'
   hidden: False
-  homebridge_hidden: true
+
 
 
 
@@ -49,7 +49,7 @@ script.interior_off:
 script.monthly_color_scene:
   friendly_name: 'Monthly Front House Scene'
   hidden: False
-  homebridge_hidden: true
+
 
 
 
@@ -57,7 +57,7 @@ script.monthly_color_scene:
 script.notify_engine:
   friendly_name: 'Ifttt Notify'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -65,7 +65,7 @@ script.notify_engine:
 script.skybell_pressed:
   friendly_name: 'Skybell Pressed'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -73,7 +73,7 @@ script.skybell_pressed:
 script.speech_engine:
   friendly_name: 'Voice Notify'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -81,7 +81,7 @@ script.speech_engine:
 script.speech_processing:
   friendly_name: 'Voice Processing'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -89,7 +89,7 @@ script.speech_processing:
 script.switch_turn_off_all:
   friendly_name: 'Switch Turn Off All'
   hidden: False
-  homebridge_hidden: true
+
 
 
 
@@ -97,7 +97,7 @@ script.switch_turn_off_all:
 script.tweet_engine:
   friendly_name: 'Tweet Notify'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -105,7 +105,7 @@ script.tweet_engine:
 script.tweet_engine_image:
   friendly_name: 'Tweet Engine Image'
   hidden: True
-  homebridge_hidden: true
+
 
 
 
@@ -113,4 +113,4 @@ script.tweet_engine_image:
 script.tweet_engine_setup:
   friendly_name: 'Tweet Engine Setup'
   hidden: True
-  homebridge_hidden: true
+
diff --git a/config/customize/sensors.yaml b/config/customize/sensors.yaml
index 531182c4..b700df71 100755
--- a/config/customize/sensors.yaml
+++ b/config/customize/sensors.yaml
@@ -2,7 +2,7 @@ sensor.bedroom_alarm_panel:
   friendly_name: 'Bedroom Alarm Panel'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -11,7 +11,7 @@ sensor.entry_alarm_panel:
   friendly_name: 'Entry Alarm Panel'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -20,7 +20,7 @@ sensor.alexa_echo:
   friendly_name: 'Alexa Echo'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:amazon
 
 
@@ -29,7 +29,7 @@ sensor.amazon_dot:
   friendly_name: 'Amazon Dot'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:amazon
 
 
@@ -38,7 +38,7 @@ sensor.amazon_fire_stick:
   friendly_name: 'Fire Stick'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:fire
 
 
@@ -46,7 +46,7 @@ sensor.chromecast_audio_1:
   friendly_name: 'Chromecast Audio 1'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:music-circle
 
 
@@ -55,7 +55,7 @@ sensor.chromecast_audio_2:
   friendly_name: 'Chromecast Audio 2'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:music-circle
 
 
@@ -64,7 +64,7 @@ sensor.circle:
   friendly_name: 'Disney Circle'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:google-circles-group
 
 
@@ -73,7 +73,7 @@ sensor.study_ap:
   friendly_name: 'Cisco Main Ap'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:router-wireless
 
 
@@ -82,7 +82,7 @@ sensor.dark_sky_cloud_coverage:
   friendly_name: 'Dark Sky Cloud Coverage'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:weather-partlycloudy
 
 
@@ -91,7 +91,7 @@ sensor.dark_sky_daily_max_precip_intensity:
   friendly_name: 'Dark Sky Daily Max Precip Intensity'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:thermometer
 
 
@@ -100,7 +100,7 @@ sensor.dark_sky_humidity:
   friendly_name: 'Outdoor Humidity'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:water-percent
 
 
@@ -109,7 +109,7 @@ sensor.dark_sky_minutely_summary:
   friendly_name: 'Current Conditions'
 
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:beach
 
 
@@ -118,7 +118,7 @@ sensor.dark_sky_precip_intensity:
   friendly_name: 'Rainfall'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:weather-rainy
 
 
@@ -127,7 +127,7 @@ sensor.dark_sky_temperature:
   friendly_name: 'Outdoor Temp'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:thermometer
 
 
@@ -136,7 +136,7 @@ sensor.dark_sky_wind_speed:
   friendly_name: 'Dark Sky Wind Speed'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:weather-windy
 
 
@@ -145,7 +145,7 @@ sensor.date:
   friendly_name: 'Date'
 
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:calendar
 
 
@@ -154,7 +154,7 @@ sensor.disk_use_percent:
   friendly_name: 'Disk Usage'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:harddisk
 
 
@@ -163,7 +163,7 @@ sensor.downstairs_away_mode:
   friendly_name: 'Downstairs Away Mode'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -172,7 +172,7 @@ sensor.downstairs_thermostat_humidity:
   friendly_name: 'Downstairs Thermostat Humidity'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:water-percent
 
 
@@ -181,7 +181,7 @@ sensor.downstairs_thermostat_hvac_state:
   friendly_name: 'Downstairs Thermostat Hvac State'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -190,7 +190,7 @@ sensor.downstairs_thermostat_operation_mode:
   friendly_name: 'Downstairs Thermostat Operation Mode'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -199,7 +199,7 @@ sensor.downstairs_thermostat_target:
   friendly_name: 'Downstairs Thermostat Target'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -208,7 +208,7 @@ sensor.downstairs_thermostat_temperature:
   friendly_name: 'Downstairs Thermostat Temperature'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -217,7 +217,7 @@ sensor.external_ip:
   friendly_name: 'External Ip'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -226,7 +226,7 @@ sensor.floorplan_date:
   friendly_name: 'Date'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -235,7 +235,7 @@ sensor.floorplan_time:
   friendly_name: 'Time'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -244,7 +244,7 @@ sensor.ha_installed_version:
   friendly_name: 'Ha Installed Version'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -253,14 +253,14 @@ sensor.ha_uptime:
   friendly_name: 'Ha Uptime'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 sensor.hue_hub_1:
   friendly_name: 'Hue Hub 1'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:router-wireless
 
 
@@ -269,7 +269,7 @@ sensor.hue_hub_2:
   friendly_name: 'Hue Hub 2'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:router-wireless
 
 
@@ -278,7 +278,7 @@ sensor.ipchange:
   friendly_name: 'Ipchange'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -287,7 +287,7 @@ sensor.justins_room_nest_protect_battery_health:
   friendly_name: 'Justins Room Nest Protect Battery Health'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -298,7 +298,7 @@ sensor.large_garage:
   friendly_name: 'Large Garage'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:car-connected
 
 
@@ -307,7 +307,7 @@ sensor.large_garage_reflection_rate:
   friendly_name: 'Reflection Rate'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -316,7 +316,7 @@ sensor.large_garage_status:
   friendly_name: 'State Of The Door'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -325,7 +325,7 @@ sensor.large_garage_time_in_state:
   friendly_name: 'Time In State'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:timer-sand
 
 
@@ -334,7 +334,7 @@ sensor.large_garage_wifi_signal_strength:
   friendly_name: 'Wifi Strength'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:wifi
 
 
@@ -343,14 +343,14 @@ sensor.last_message:
   friendly_name: 'Last Message'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 sensor.medicine_time:
   friendly_name: 'Medicine Time'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -359,7 +359,7 @@ sensor.moon:
   friendly_name: 'Moon'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:brightness-3
 
 
@@ -368,7 +368,7 @@ sensor.nest_downstairs:
   friendly_name: 'Downstairs Nest'
 
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:air-conditioner
 
 
@@ -377,7 +377,7 @@ sensor.nest_upstairs:
   friendly_name: 'Upstairs Nest'
 
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:air-conditioner
 
 
@@ -386,7 +386,7 @@ sensor.nodemcu1:
   friendly_name: 'Nodemcu1'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:alarm-bell
 
 
@@ -395,7 +395,7 @@ sensor.nodemcu2:
   friendly_name: 'Nodemcu2'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:alarm-bell
 
 
@@ -404,7 +404,7 @@ sensor.nodemcu3:
   friendly_name: 'Nodemcu3'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:alarm-bell
 
 
@@ -414,7 +414,7 @@ sensor.printer:
   friendly_name: 'Printer'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:printer
 
 
@@ -423,7 +423,7 @@ sensor.process_homebridge:
   friendly_name: 'Apple Homekit'
 
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:memory
 
 
@@ -432,7 +432,7 @@ sensor.process_mosquitto:
   friendly_name: 'Mosquitto'
 
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:memory
 
 
@@ -441,7 +441,7 @@ sensor.process_node:
   friendly_name: 'Dash Button Monitor'
 
   hidden: False
-  homebridge_hidden: true
+
   icon: mdi:memory
 
 
@@ -450,7 +450,7 @@ sensor.rgb_led_garage_large:
   friendly_name: 'Rgb Led Garage Large'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:led-on
 
 
@@ -459,7 +459,7 @@ sensor.rgb_led_garage_small:
   friendly_name: 'Rgb Led Garage Small'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:led-on
 
 
@@ -468,7 +468,7 @@ sensor.rgb_led_outdoor_den:
   friendly_name: 'Rgb Led Outdoor Den'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:led-on
 
 
@@ -477,7 +477,7 @@ sensor.samsungtv:
   friendly_name: 'Samsung Tv'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:television
 
 
@@ -486,7 +486,7 @@ sensor.last_boot:
   friendly_name: 'Since Last Boot'
 
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:clock
 
 
@@ -495,7 +495,7 @@ sensor.last_boot_templated:
   friendly_name: 'Raspberry Pi Uptime'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:clock-start
 
 
@@ -503,7 +503,7 @@ sensor.sleep_number_bed:
   friendly_name: 'Sleep Number Bed'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:hotel
 
 
@@ -512,7 +512,7 @@ sensor.sleepnumber_carlo_carlo_sleepnumber:
   friendly_name: 'Carlo Sleepnumber'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:hotel
 
 
@@ -521,7 +521,7 @@ sensor.sleepnumber_carlo_stacey_sleepnumber:
   friendly_name: 'Stacey Sleepnumber'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:hotel
 
 
@@ -530,7 +530,7 @@ sensor.small_garage:
   friendly_name: 'Small Garage'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:car-connected
 
 
@@ -539,7 +539,7 @@ sensor.small_garage_reflection_rate:
   friendly_name: 'Reflection Rate'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -548,7 +548,7 @@ sensor.small_garage_status:
   friendly_name: 'State Of The Door'
 
   hidden: False
-  homebridge_hidden: True
+
 
 
 
@@ -557,7 +557,7 @@ sensor.small_garage_time_in_state:
   friendly_name: 'Time In State'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:timer-sand
 
 
@@ -566,7 +566,7 @@ sensor.small_garage_wifi_signal_strength:
   friendly_name: 'Wifi Strength'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:wifi
 
 
@@ -575,7 +575,7 @@ sensor.smart_water_meter:
   friendly_name: 'Smart Water Meter'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:water
 
 
@@ -584,7 +584,7 @@ sensor.speedtest_download:
   friendly_name: 'Download'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:speedometer
 
 
@@ -593,7 +593,7 @@ sensor.speedtest_upload:
   friendly_name: 'Upload'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:speedometer
 
 
@@ -602,7 +602,7 @@ sensor.tablotv:
   friendly_name: 'Tablo Tv'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:television-guide
 
 
@@ -611,7 +611,7 @@ sensor.time:
   friendly_name: 'Time'
 
   hidden: True
-  homebridge_hidden: True
+
   icon: mdi:clock
 
 
@@ -620,7 +620,7 @@ sensor.unifi_ap:
   friendly_name: 'Unifi Ap'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:router-wireless
 
 
@@ -629,14 +629,14 @@ sensor.upstairs_away_mode:
   friendly_name: 'Upstairs Away Mode'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 sensor.upstairs_thermostat_humidity:
   friendly_name: 'Upstairs Thermostat Humidity'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:water-percent
 
 
@@ -644,7 +644,7 @@ sensor.upstairs_thermostat_hvac_state:
   friendly_name: 'Upstairs Thermostat Hvac State'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -653,7 +653,7 @@ sensor.upstairs_thermostat_operation_mode:
   friendly_name: 'Upstairs Thermostat Operation Mode'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -662,7 +662,7 @@ sensor.upstairs_thermostat_target:
   friendly_name: 'Upstairs Thermostat Target'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -671,7 +671,7 @@ sensor.upstairs_thermostat_temperature:
   friendly_name: 'Upstairs Thermostat Temperature'
 
   hidden: True
-  homebridge_hidden: True
+
 
 
 
@@ -680,7 +680,7 @@ sensor.wii:
   friendly_name: 'Wii'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:gamepad-variant
 
 
@@ -689,5 +689,5 @@ sensor.withings_scale:
   friendly_name: 'Withings Scale'
 
   hidden: False
-  homebridge_hidden: True
+
   icon: mdi:scale-bathroom
diff --git a/config/customize/switches.yaml b/config/customize/switches.yaml
index 1efb3192..de8c8f07 100755
--- a/config/customize/switches.yaml
+++ b/config/customize/switches.yaml
@@ -7,7 +7,7 @@ switch.pool_deck:
   friendly_name: 'Pool Deck'
 
   hidden: False
-  homebridge_hidden: False
+  
 
 
 switch.lr_amp:
@@ -21,4 +21,4 @@ switch.pihole_temp_disable:
   friendly_name: 'Pihole Temp Disable'
 
   hidden: False
-  homebridge_hidden: true
+
diff --git a/config/group/lights.yaml b/config/group/lights.yaml
index d7be14b4..e69de29b 100755
--- a/config/group/lights.yaml
+++ b/config/group/lights.yaml
@@ -1,106 +0,0 @@
-Bedroom lights:
-  entities:
-    - light.bedroom
-
-kitchen lights:
-  entities:
-    - light.k1
-    - light.k2
-    - light.k3
-    - light.k4
-    - light.k5
-    - light.k6
-    - light.sink
-    - light.fridge
-
-Living Room lights:
-  entities:
-    - light.m1_back_left
-    - light.m1_back_right
-    - light.m1_front_left
-    - light.m1_front_right
-    - light.m1_slider
-
-Living Room Accents:
-  entities:
-    - light.couch_1
-    - light.tv_light
-    - light.tv_stand_light
-
-Dinette lights:
-  entities:
-    - light.d1
-    - light.d2
-
-Den lights:
-  entities:
-    - light.den_lamp
-
-Foyer lights:
-  entities:
-    - light.f1
-    - light.f2
-
-Office lights:
-  entities:
-    - light.office_lamp
-
-Upstairs lights:
-  entities:
-    - light.upstairs_lamp
-    - light.dimmable_light_1
-    - light.dimmable_light_2
-    - light.upstairs_hallway
-
-Dining Room lights:
-  entities:
-    - light.s1
-    - light.s2
-    - light.s3
-    - light.s4
-
-Outdoor Pool Lights:
-  entities:
-    - light.p1_front_left
-    - light.p1_front_right
-    - light.p1_back_left
-    - light.p1_back_right
-
-Outdoor Front Lights:
-  entities:
-    - light.outdoor_foyer
-    - light.outdoor_sconce_1
-    - light.outdoor_sconce_2
-    - light.outdoor_sconce_3
-    - light.led_garage_large
-    - light.led_garage_snip
-    - light.led_garage_small
-    - light.led_outdoor_den
-    - light.front_door
-
-outdoor xmas lights:
-    - light.flood1
-    - light.flood2
-    - switch.xmas1
-    - switch.xmas2
-    - switch.xmas3
-
-Garage lights:
-  
-  entities:
-    - light.garage_attic
-
-Hallway Lights:
-  entities:
-    - light.kids_hallway
-    - light.bedroom_hallway
-    - light.upstairs_hallway
-    - light.garage_hallway
-
-Justins Room:
-  entities:
-    - light.justin_go
-
-Paiges Room:
-  entities:
-    - light.paige_go
diff --git a/config/homekit.yaml b/config/homekit.yaml
index b17efb96..7d574593 100755
--- a/config/homekit.yaml
+++ b/config/homekit.yaml
@@ -10,6 +10,7 @@ filter:
     - climate
     - cover
     - lock
+    - camera
   exclude_domains:
     - media_player
     - sensor
@@ -18,6 +19,23 @@ filter:
     - switch
     - scene
     - light
-  # include_entities:
+  include_entities:
+    - light.bedroom
+    - light.bedroom_lights
+    - light.den_lights
+    - light.dinette_lights
+    - light.dining_room_lights
+    - light.foyer_lights
+    - light.garage_lights
+    - light.hallway_lights
+    - light.kitchen_lights
+    - light.living_room_accents
+    - light.living_room_lights
+    - light.office_lights
+    - light.outdoor_front_lights
+    - light.outdoor_pool_lights
+    - light.outside_pool_lights
+    - light.upstairs_lights
 
+    - switch.lr_amp
   # exclude_entities:
diff --git a/config/light_groups.yaml b/config/light_groups.yaml
new file mode 100755
index 00000000..dc472d7e
--- /dev/null
+++ b/config/light_groups.yaml
@@ -0,0 +1,141 @@
+#-------------------------------------------
+# @CCOSTAN
+# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
+# Read all about this and more at https://vCloudInfo.com
+# Additional Light groups control file for better Alexa / HomeKit support
+# https://github.com/CCOSTAN/Home-AssistantConfig/issues/764
+######################################################################################################
+
+# Reference : https://www.flexfireleds.com/pages/Comparison-between-3528-LEDs-and-5050-LEDs.html
+- platform: flux_led
+  automatic_add: True
+  devices:
+    192.168.10.30:
+      name: led_garage_snip
+      mode: "rgb"
+    192.168.10.31:
+      name: led_outdoor_den
+      mode: "rgb"
+    192.168.10.32:
+      name: led_garage_large
+      mode: "rgb"
+    192.168.10.33:
+      name: led_garage_small
+      mode: "rgb"
+
+- platform: group
+  name: Kitchen Lights
+  entities:
+    - light.k1
+    - light.k2
+    - light.k3
+    - light.k4
+    - light.k5
+    - light.k6
+    - light.sink
+    - light.fridge
+
+- platform: group
+  name: Bedroom lights
+  entities:
+    - light.bedroom
+
+- platform: group
+  name: Living Room lights
+  entities:
+    - light.m1_back_left
+    - light.m1_back_right
+    - light.m1_front_left
+    - light.m1_front_right
+#   - light.m1_slider
+
+- platform: group
+  name: Living Room Accents
+  entities:
+    - light.couch_1
+    - light.tv_light
+    - light.tv_stand_light
+
+- platform: group
+  name: Dinette lights
+  entities:
+    - light.d1
+    - light.d2
+
+- platform: group
+  name: Den lights
+  entities:
+    - light.den_lamp
+
+- platform: group
+  name: Foyer lights
+  entities:
+    - light.f1
+    - light.f2
+
+- platform: group
+  name: Office lights
+  entities:
+    - light.office_lamp
+
+- platform: group
+  name: Upstairs lights
+  entities:
+    - light.upstairs_lamp
+    - light.dimmable_light_1
+    - light.dimmable_light_2
+    - light.upstairs_hallway
+
+- platform: group
+  name: Dining Room lights
+  entities:
+    - light.s1
+    - light.s2
+    - light.s3
+    - light.s4
+
+- platform: group
+  name: Outdoor Pool Lights
+  entities:
+    - light.p1_front_left
+    - light.p1_front_right
+    - light.p1_back_left
+    - light.p1_back_right
+
+- platform: group
+  name: Outdoor Front Lights
+  entities:
+    - light.outdoor_foyer
+    - light.outdoor_sconce_1
+    - light.outdoor_sconce_2
+    - light.outdoor_sconce_3
+    - light.led_garage_large
+    - light.led_garage_snip
+    - light.led_garage_small
+    - light.led_outdoor_den
+    - light.front_door
+    - light.flood1
+    - light.flood2
+
+- platform: group
+  name: Garage lights
+  entities:
+    - light.garage_attic
+
+- platform: group
+  name: Hallway Lights
+  entities:
+    - light.kids_hallway
+    - light.bedroom_hallway
+    - light.upstairs_hallway
+    - light.garage_hallway
+
+- platform: group
+  name: Justins Room
+  entities:
+    - light.justin_go
+
+- platform: group
+  name: Paiges Room
+  entities:
+    - light.paige_go
diff --git a/config/packages/alarm.yaml b/config/packages/alarm.yaml
index 86799d82..6f4eb491 100755
--- a/config/packages/alarm.yaml
+++ b/config/packages/alarm.yaml
@@ -57,10 +57,10 @@ homeassistant:
 
     group.entry_points:
       friendly_name: Alarm Entry Points
-      homebridge_hidden: true
+    
     group.interior_door:
       friendly_name: Interior doors
-      homebridge_hidden: true
+    
 #-------------------------------------------
 binary_sensor:
   - platform: mqtt
diff --git a/config/packages/arris_router.yaml.decommissioned b/config/packages/arris_router.yaml.decommissioned
index 907d924f..1d181ce3 100755
--- a/config/packages/arris_router.yaml.decommissioned
+++ b/config/packages/arris_router.yaml.decommissioned
@@ -6,7 +6,7 @@
 homeassistant:
   customize_glob:
     "*.arris_tg1682g_router*":
-      homebridge_hidden: True
+    
       hidden: False
 #-------------------------------------------
 
diff --git a/config/packages/grafana.yaml b/config/packages/grafana.yaml
index 1459bd48..67d7807b 100755
--- a/config/packages/grafana.yaml
+++ b/config/packages/grafana.yaml
@@ -6,7 +6,7 @@ homeassistant:
   customize:
     sensor.download_grafana_solar:
       hidden: true
-      homebridge_hidden: True
+    
 #-------------------------------------------
 
 sensor:
diff --git a/config/packages/juicenet.yaml b/config/packages/juicenet.yaml
index 9b91db72..cc6d3483 100755
--- a/config/packages/juicenet.yaml
+++ b/config/packages/juicenet.yaml
@@ -6,7 +6,7 @@
 homeassistant:
   customize_glob:
     "*.carlojuice*":
-      homebridge_hidden: True
+    
       hidden: False
 #-------------------------------------------
 juicenet:
diff --git a/config/packages/mychevy.yaml.disabled b/config/packages/mychevy.yaml.disabled
index a40a8000..4fcfbf63 100755
--- a/config/packages/mychevy.yaml.disabled
+++ b/config/packages/mychevy.yaml.disabled
@@ -11,7 +11,7 @@
 #       icon: mdi:camera-front
 #
 #       hidden: False
-#       homebridge_hidden: True
+#     
 
 group:
   bolt:
diff --git a/config/packages/nest_protects.yaml b/config/packages/nest_protects.yaml
index d6bed05a..8f5e67aa 100755
--- a/config/packages/nest_protects.yaml
+++ b/config/packages/nest_protects.yaml
@@ -9,19 +9,19 @@ homeassistant:
   customize_glob:
     "sensor.*_co_status":
       hidden: True
-      homebridge_hidden: true
+    
     "sensor.*_battery_health":
       hidden: True
-      homebridge_hidden: true
+    
     "sensor.*_color_status":
       hidden: True
-      homebridge_hidden: true
+    
     "sensor.*_smoke_status":
       hidden: True
-      homebridge_hidden: true
+    
     "sensor.*_security_state":
       hidden: True
-      homebridge_hidden: true
+    
 
   customize:
 
@@ -62,7 +62,7 @@ homeassistant:
         icon: mdi:nest-protect
 
     group.protects:
-      homebridge_hidden: true
+    
 #-------------------------------------------
 
 #-------------------------------------------
diff --git a/config/packages/time_date_sensors.yaml b/config/packages/time_date_sensors.yaml
index a696b11a..47a62567 100755
--- a/config/packages/time_date_sensors.yaml
+++ b/config/packages/time_date_sensors.yaml
@@ -6,11 +6,11 @@ homeassistant:
     "sensor.floorplan_*":
 
       hidden: True
-      homebridge_hidden: True
+
     "sensor.clock_*":
 
       hidden: True
-      homebridge_hidden: True
+
 #---Sensor for Time and Date.-----------------------------
 sensor:
   - platform: template
diff --git a/config/packages/triggers/mqtt_screens.yaml.disabled b/config/packages/triggers/mqtt_screens.yaml.disabled
index e2cd4efb..3156666c 100755
--- a/config/packages/triggers/mqtt_screens.yaml.disabled
+++ b/config/packages/triggers/mqtt_screens.yaml.disabled
@@ -10,7 +10,7 @@ homeassistant:
       icon: mdi:monitor-multiple
       emulated_hue_hidden: False
       hidden: False
-      homebridge_hidden: False
+      
 
 #-------------------------------------------
 switch: