multiple esphome device updates and new devices

esphome/esp-downstbathswitch.yaml

@@ -22,7 +22,7 @@ substitutions:
   device_name: "esp-downstbathswitch"
   friendly_name: "Downstairs Bath Lightswitch (3)"
   description_comment: "Downstairs Bathroom Main Lightswitch using a Zemismart KS-811 Triple Push Button. Main Light (1), Cabinet Light (2), Extract Fan (3)"
-  device_area: "Downstairs Bathroom" # Allows ESP device to be automatically linked to an 'Area' in Home Assistant.  
+  device_area: "Downstairs Flat" # Allows ESP device to be automatically linked to an 'Area' in Home Assistant.  
   
   # Project Naming
   project_name: "Zemismart Technologies.KS-811 Triple" # Project Details 
@@ -42,24 +42,27 @@ substitutions:
   switch_2_name: "Cabinet Light"
   switch_3_name: "Extract Fan" # This is virtual only, no power connected to 3rd relay 
 
-#############################################
-# Included Common Packages
-# https://esphome.io/components/esphome.html
-#############################################
+##########################################################################################
+# PACKAGES: Included Common Packages
+# https://esphome.io/components/packages.html
+##########################################################################################
 packages:
   common_wifi: !include
     file: common/network_common.yaml
     vars:
+      local_device_name: "${device_name}"
       local_static_ip_address: "${static_ip_address}"
       local_ota_pass: "${ota_pass}"
   common_api: !include
     file: common/api_common.yaml
     vars:
       local_api_key: "${api_key}"
-#  common_webportal: !include
-#    file: common/webportal_common.yaml
-#  common_mqtt: !include
-#    file: common/mqtt_common.yaml
+  #common_webportal: !include
+  #  file: common/webportal_common.yaml
+  common_mqtt: !include
+    file: common/mqtt_common.yaml
+    vars:
+      local_device_name: "${device_name}"
   common_sntp: !include
     file: common/sntp_common.yaml
   common_general_sensors: !include