multiple esphome device updates and new devices

esphome/esp-mainbathfancombo.yaml

@@ -23,7 +23,7 @@ substitutions:
   description_comment: "Main Bathroom Fan/Heat Switch using a Zemismart KS-811 Double Push Button. Extract Fan (1), IR heater (2)"
   device_area: "Laundry" # Allows ESP device to be automatically linked to an 'Area' in Home Assistant.  
   
-   # Project Naming
+  # Project Naming
   project_name: "Zemismart Technologies.KS-811-2 (Double)" # Project Details 
   project_version: "v1"  # Project V denotes release of yaml file, allowing checking of deployed vs latest version
   
@@ -45,34 +45,34 @@ substitutions:
   mqtt_remote_device1_command_topic: "${mqtt_main_command_topic}/masterbath-towelrail/operation"
   mqtt_remote_device1_command1: "BOOST"
 
-#############################################
-# 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:
-      device_name: ${device_name}
-      local_static_ip_address: ${static_ip_address}
-      local_ota_pass: ${ota_pass}
+      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
+      local_api_key: "${api_key}"
+  #common_webportal: !include
+  #  file: common/webportal_common.yaml
   common_mqtt: !include
     file: common/mqtt_common.yaml
     vars:
-      device_name: ${device_name}
+      local_device_name: "${device_name}"
   common_sntp: !include
     file: common/sntp_common.yaml
   common_general_sensors: !include
     file: common/sensors_common.yaml
     vars:
-      local_friendly_name: ${friendly_name}
-      local_update_interval: ${update_interval}
+      local_friendly_name: "${friendly_name}"
+      local_update_interval: "${update_interval}"
 
 #############################################
 # ESPHome