diff --git a/automations.yaml b/automations.yaml
index 08d42c9..c94a0b8 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -60,3 +60,38 @@
     conditions: []
   action: []
   mode: single
+- id: '1693027703299'
+  alias: Downstairs Kitchen turn ON LEDs on with main lights
+  description: ''
+  trigger:
+  - platform: device
+    type: turned_on
+    device_id: 1a7e2bfdfaa08e2b78bcbd5d5d12d2a7
+    entity_id: 2921a7f1e6616c97c2ed502cbe950503
+    domain: switch
+  condition: []
+  action:
+  - service: light.turn_on
+    data:
+      transition: 10
+      brightness_pct: 95
+    target:
+      entity_id: light.controller_dimmable_3c317c
+  mode: single
+- id: '1693027792035'
+  alias: Downstairs Kitchen turn OFF LEDs with main lights
+  description: ''
+  trigger:
+  - platform: device
+    type: turned_off
+    device_id: 1a7e2bfdfaa08e2b78bcbd5d5d12d2a7
+    entity_id: 2921a7f1e6616c97c2ed502cbe950503
+    domain: switch
+  condition: []
+  action:
+  - service: light.turn_off
+    data:
+      transition: 10
+    target:
+      entity_id: light.controller_dimmable_3c317c
+  mode: single
diff --git a/automations/two_way_light_switching.yaml b/automations/two_way_light_switching.yaml
index 5c4d499..adca7f8 100644
--- a/automations/two_way_light_switching.yaml
+++ b/automations/two_way_light_switching.yaml
@@ -1,12 +1,13 @@
-- alias: "Two Way Lights - Garage Corridor - 1"
+- id: "Two_Way_Lights_-_Garage_Corridor_-_1"
+  alias: "Two Way Lights - Garage Corridor - 1"
   trigger:
     - platform: state
-      entity_id: switch.obk_garageswitch_1_e6f7_1
+      entity_id: switch.garage_entry_switch_1
   action:
     - choose:
         - conditions:
             - condition: state
-              entity_id: switch.obk_garageswitch_1_e6f7_1
+              entity_id: switch.garage_entry_switch_1
               state: "on"
           sequence:
             - service: switch.turn_on
@@ -14,7 +15,8 @@
       default:
         - service: switch.turn_off
           entity_id: switch.tasmo_ks811d_5613_lounge_4b
-- alias: "Two Way Lights - Garage Corridor - 2"
+- id: "Two_Way_Lights_-_Garage_Corridor_-_2"
+  alias: "Two Way Lights - Garage Corridor - 2"
   trigger:
     - platform: state
       entity_id: switch.tasmo_ks811d_5613_lounge_4b
@@ -26,20 +28,21 @@
               state: "on"
           sequence:
             - service: switch.turn_on
-              entity_id: switch.obk_garageswitch_1_e6f7_1
+              entity_id: switch.garage_entry_switch_1
       default:
         - service: switch.turn_off
-          entity_id: switch.obk_garageswitch_1_e6f7_1
+          entity_id: switch.garage_entry_switch_1
 
-- alias: "Two Way Lights - Garage Main - 1"
+- id: "Two_Way_Lights_-_Garage_Main_-_1"
+  alias: "Two Way Lights - Garage Main - 1"
   trigger:
     - platform: state
-      entity_id: switch.obk_garageswitch_1_e6f7_2
+      entity_id: switch.garage_entry_switch_3
   action:
     - choose:
         - conditions:
             - condition: state
-              entity_id: switch.obk_garageswitch_1_e6f7_2
+              entity_id: switch.garage_entry_switch_3
               state: "on"
           sequence:
             - service: switch.turn_on
@@ -47,7 +50,8 @@
       default:
         - service: switch.turn_off
           entity_id: switch.tasmo_sbas_0407_garagelight
-- alias: "Two Way Lights - Garage Main - 2"
+- id: "Two_Way_Lights_-_Garage_Main_-_2"
+  alias: "Two Way Lights - Garage Main - 2"
   trigger:
     - platform: state
       entity_id: switch.tasmo_sbas_0407_garagelight
@@ -59,7 +63,7 @@
               state: "on"
           sequence:
             - service: switch.turn_on
-              entity_id: switch.obk_garageswitch_1_e6f7_2
+              entity_id: switch.garage_entry_switch_3
       default:
         - service: switch.turn_off
-          entity_id: switch.obk_garageswitch_1_e6f7_2
+          entity_id: switch.garage_entry_switch_3
diff --git a/packages/gas_heater_operation.yaml b/packages/gas_heater_operation.yaml
index 5cfd910..092555e 100644
--- a/packages/gas_heater_operation.yaml
+++ b/packages/gas_heater_operation.yaml
@@ -16,4 +16,4 @@ mqtt:
       state_off: "OFF"
       optimistic: false
       qos: 0
-      # retain: true
+      retain: true # need this, or fire starts on HA reboot.  Could fix in Node red too.
diff --git a/packages/openbeken.yaml b/packages/openbeken.yaml
index afa7bb5..e168059 100644
--- a/packages/openbeken.yaml
+++ b/packages/openbeken.yaml
@@ -1,32 +1,62 @@
 mqtt:
-  switch:
-    - unique_id: "Garage Entry Switch (Triple, obkE6F7)_relay_1"
-      name: "obk-garageswitch-1-E6F7 1"
-      state_topic: "obk-garageswitch-1-E6F7/1/get"
-      command_topic: "obk-garageswitch-1-E6F7/1/set"
+  switch: 
+    - unique_id: "Garage_Entry_Switch_1"
+      name: "Garage Entry Switch 1"
+      state_topic: "obk/obk-ks811t-006D-garageentry/1/get"
+      command_topic: "obk/obk-ks811t-006D-garageentry/1/set"
       qos: 1
       payload_on: 1
       payload_off: 0
       retain: true
       availability:
-        - topic: "obk-garageswitch-1-E6F7/connected"
-    - unique_id: "Garage Entry Switch (Triple, obkE6F7)_relay_2"
-      name: "obk-garageswitch-1-E6F7 2"
-      state_topic: "obk-garageswitch-1-E6F7/2/get"
-      command_topic: "obk-garageswitch-1-E6F7/2/set"
+        - topic: "obk/obk-ks811t-006D-garageentry/connected"
+    - unique_id: "Garage_Entry_Switch_2"
+      name: "Garage Entry Switch 2"
+      state_topic: "obk/obk-ks811t-006D-garageentry/2/get"
+      command_topic: "obk/obk-ks811t-006D-garageentry/2/set"
       qos: 1
       payload_on: 1
       payload_off: 0
       retain: true
       availability:
-        - topic: "obk-garageswitch-1-E6F7/connected"
-    - unique_id: "Garage Entry Switch (Triple, obkE6F7)_relay_3"
-      name: "obk-garageswitch-1-E6F7 3"
-      state_topic: "obk-garageswitch-1-E6F7/3/get"
-      command_topic: "obk-garageswitch-1-E6F7/3/set"
+        - topic: "obk/obk-ks811t-006D-garageentry/connected"
+    - unique_id: "Garage_Entry_Switch_3"
+      name: "Garage Entry Switch 3"
+      state_topic: "obk/obk-ks811t-006D-garageentry/3/get"
+      command_topic: "obk/obk-ks811t-006D-garageentry/3/set"
       qos: 1
       payload_on: 1
       payload_off: 0
       retain: true
       availability:
-        - topic: "obk-garageswitch-1-E6F7/connected"
+        - topic: "obk/obk-ks811t-006D-garageentry/connected"
+    - unique_id: "Main_Bathroom_Light_Switch_1"
+      name: "Main Bathroom Light Switch 1"
+      state_topic: "obk/obk-ks811t-B1C4-mainbath1/1/get"
+      command_topic: "obk/obk-ks811t-B1C4-mainbath1/1/set"
+      qos: 1
+      payload_on: 1
+      payload_off: 0
+      retain: true
+      availability:
+        - topic: "obk/obk-ks811t-B1C4-mainbath1/connected"
+    - unique_id: "Main_Bathroom_Light_Switch_2"
+      name: "Main Bathroom Light Switch 2"
+      state_topic: "obk/obk-ks811t-B1C4-mainbath1/2/get"
+      command_topic: "obk/obk-ks811t-B1C4-mainbath1/2/set"
+      qos: 1
+      payload_on: 1
+      payload_off: 0
+      retain: true
+      availability:
+        - topic: "obk/obk-ks811t-B1C4-mainbath1/connected"
+    - unique_id: "Main_Bathroom_Light_Switch_3"
+      name: "Main Bathroom Light Switch 3"
+      state_topic: "obk/obk-ks811t-B1C4-mainbath1/3/get"
+      command_topic: "obk/obk-ks811t-B1C4-mainbath1/3/set"
+      qos: 1
+      payload_on: 1
+      payload_off: 0
+      retain: true
+      availability:
+        - topic: "obk/obk-ks811t-B1C4-mainbath1/connected"
diff --git a/packages/presense_sense.yaml b/packages/presense_sense.yaml
index 2dc1864..e7c4ff8 100644
--- a/packages/presense_sense.yaml
+++ b/packages/presense_sense.yaml
@@ -1,25 +1,61 @@
+# ESPresence Sensing
+# https://espresense.com/home_assistant
+#
 sensor:
   - platform: mqtt_room
-    device_id: "d75fda56c990"
-    name: "Nissan Leaf LNM748 (BTB01)"
-    state_topic: "espresense/rooms"
+    unique_id: !secret btb01_uID
+    device_id: !secret btb01_dID
+    name: !secret btb01_name
+    state_topic: !secret btb01_topic
     timeout: 60
     away_timeout: 120 # number of seconds after which the enitity will get status not_home
   - platform: mqtt_room
-    device_id: "f54fe90c3d15"
-    name: "Mazda MPV KUU64 (BTB02)"
-    state_topic: "espresense/rooms"
+    unique_id: !secret btb02_uID
+    device_id: !secret btb02_dID
+    name: !secret btb02_name
+    state_topic: !secret btb02_topic
     timeout: 60
     away_timeout: 120 # number of seconds after which the enitity will get status not_home
   - platform: mqtt_room
-    device_id: "c5eba6d8e8fd"
-    name: "Vespa Scooter B8EJJ (BTB03)"
-    state_topic: "espresense/rooms"
+    unique_id: !secret btb03_uID
+    device_id: !secret btb03_dID
+    name: !secret btb03_name
+    state_topic: !secret btb03_topic
     timeout: 60
     away_timeout: 120 # number of seconds after which the enitity will get status not_home
   - platform: mqtt_room
-    device_id: "ed5e450c84a5"
-    name: "Zephyr Caravan Z556D (BTB04)"
-    state_topic: "espresense/rooms"
+    unique_id: !secret btb04_uID
+    device_id: !secret btb04_dID
+    name: !secret btb04_name
+    state_topic: !secret btb04_topic
     timeout: 60
     away_timeout: 120 # number of seconds after which the enitity will get status not_home
+  - platform: mqtt_room
+    unique_id: !secret btb05_uID
+    device_id: !secret btb05_dID
+    name: !secret btb05_name
+    state_topic: !secret btb05_topic
+    timeout: 60
+    away_timeout: 120 # number of seconds after which the enitity will get status not_home
+  - platform: mqtt_room
+    unique_id: !secret btb06_uID
+    device_id: !secret btb06_dID
+    name: !secret btb06_name
+    state_topic: !secret btb06_topic
+    timeout: 60
+    away_timeout: 120 # number of seconds after which the enitity will get status not_home
+  - platform: mqtt_room
+    unique_id: !secret btb07_uID
+    device_id: !secret btb07_dID
+    name: !secret btb07_name
+    state_topic: !secret btb07_topic
+    timeout: 60
+    away_timeout: 120 # number of seconds after which the enitity will get status not_home
+  - platform: mqtt_room
+    unique_id: !secret btb08_uID
+    device_id: !secret btb08_dID
+    name: !secret btb08_name
+    state_topic: !secret btb08_topic
+    timeout: 60
+    away_timeout: 120 # number of seconds after which the enitity will get status not_home
+
diff --git a/packages/tautulli.yaml b/packages/tautulli.yaml
deleted file mode 100644
index 82bce9d..0000000
--- a/packages/tautulli.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-#sensor:
-#  - platform: tautulli
-#    api_key: !secret tautulli_api_key
-#    host: !secret tautulli_api_host
-#    port: !secret tautulli_api_port