diff --git a/esphome/common/alarm-panel-esp8266.yaml b/esphome/common/alarm-panel-esp8266.yaml
index adfb9ed9..418e9094 100644
--- a/esphome/common/alarm-panel-esp8266.yaml
+++ b/esphome/common/alarm-panel-esp8266.yaml
@@ -78,13 +78,14 @@ packages:
   #     - packages/status-led.yaml
 
 dashboard_import:
-  package_import_url: github://konnected-io/konnected-esphome/alarm-panel-esp8266.yaml@master
+  package_import_url: github://konnected-io/konnected-esphome/alarm-panel-esp8266.yaml@master  # yamllint disable-line rule:line-length
   import_full_config: false
 
 ####
 # WEB SEVER
-# Enables the built-in web server for viewing the device state, internals and controls via web browser
-# on the same local network as the device.
+# Enables the built-in web server for viewing the device state,
+# internals and controls via web browser on the same local network
+# as the device.
 web_server:
   include_internal: true
 
diff --git a/esphome/common/esp32-ble-tracker.yaml b/esphome/common/esp32-ble-tracker.yaml
index 21746c1a..9618165c 100644
--- a/esphome/common/esp32-ble-tracker.yaml
+++ b/esphome/common/esp32-ble-tracker.yaml
@@ -58,46 +58,46 @@ text_sensor:
   - platform: ble_scanner
     name: "BLE Devices Scanner"
 
-sensor:
-  # https://esphome.io/components/sensor/xiaomi_ble.html#lywsd03mmc
-  # - platform: pvvx_mithermometer
-  #   mac_address: "A4:C1:38:D0:BF:A7"
-  #   temperature:
-  #     name: "Study BLE Temperature"
-  #   humidity:
-  #     name: "Study BLE Humidity"
-  #   battery_level:
-  #     name: "Study BLE Battery-Level"
-  #   battery_voltage:
-  #     name: "Study BLE Battery-Voltage"
-  #   signal_strength:
-  #     name: "Study BLE Signal"
+# sensor:
+#   # https://esphome.io/components/sensor/xiaomi_ble.html#lywsd03mmc
+#   - platform: pvvx_mithermometer
+#     mac_address: "A4:C1:38:D0:BF:A7"
+#     temperature:
+#       name: "Study BLE Temperature"
+#     humidity:
+#       name: "Study BLE Humidity"
+#     battery_level:
+#       name: "Study BLE Battery-Level"
+#     battery_voltage:
+#       name: "Study BLE Battery-Voltage"
+#     signal_strength:
+#       name: "Study BLE Signal"
 
-  # - platform: pvvx_mithermometer
-  #   mac_address: "A4:C1:38:81:CB:79"
-  #   temperature:
-  #     name: "Front Hall BLE Temperature"
-  #   humidity:
-  #     name: "Front Hall BLE Humidity"
-  #   battery_level:
-  #     name: "Front Hall BLE Battery-Level"
-  #   battery_voltage:
-  #     name: "Front Hall BLE Battery-Voltage"
-  #   signal_strength:
-  #     name: "Front Hall BLE Signal"
+#   - platform: pvvx_mithermometer
+#     mac_address: "A4:C1:38:81:CB:79"
+#     temperature:
+#       name: "Front Hall BLE Temperature"
+#     humidity:
+#       name: "Front Hall BLE Humidity"
+#     battery_level:
+#       name: "Front Hall BLE Battery-Level"
+#     battery_voltage:
+#       name: "Front Hall BLE Battery-Voltage"
+#     signal_strength:
+#       name: "Front Hall BLE Signal"
 
-  # - platform: pvvx_mithermometer
-  #   mac_address: "A4:C1:38:31:85:12"
-  #   temperature:
-  #     name: "Ensuite BLE Temperature"
-  #   humidity:
-  #     name: "Ensuite BLE Humidity"
-  #   battery_level:
-  #     name: "Ensuite BLE Battery-Level"
-  #   battery_voltage:
-  #     name: "Ensuite BLE Battery-Voltage"
-  #   signal_strength:
-  #     name: "Ensuite BLE Signal"
+#   - platform: pvvx_mithermometer
+#     mac_address: "A4:C1:38:31:85:12"
+#     temperature:
+#       name: "Ensuite BLE Temperature"
+#     humidity:
+#       name: "Ensuite BLE Humidity"
+#     battery_level:
+#       name: "Ensuite BLE Battery-Level"
+#     battery_voltage:
+#       name: "Ensuite BLE Battery-Voltage"
+#     signal_strength:
+#       name: "Ensuite BLE Signal"
 
 binary_sensor:
   - platform: ble_presence
diff --git a/esphome/common/packages/alarm-panel-esp8266-base.yaml b/esphome/common/packages/alarm-panel-esp8266-base.yaml
index 549ed438..de6a3268 100644
--- a/esphome/common/packages/alarm-panel-esp8266-base.yaml
+++ b/esphome/common/packages/alarm-panel-esp8266-base.yaml
@@ -3,9 +3,11 @@ substitutions:
 
   ####
   # NAME
-  # By default, the name of the ESPHome device is "alarm-panel-pro-xxxxxx" where xxxxxx is a unique identifier. The device's
-  # hostname on your network is also defined by the name, defaulting to "alarm-panel-pro-xxxxxx.local". Edit this variable to
-  # customize the name and hostname. Note: only lowercase characters, numbers and hyphen(-) are allowed.
+  # By default, the name of the ESPHome device is "alarm-panel-pro-xxxxxx"
+  # where xxxxxx is a unique identifier. The device's hostname on your network
+  # is also defined by the name, defaulting to "alarm-panel-pro-xxxxxx.local".
+  # Edit this variable to customize the name and hostname. 
+  # Note: only lowercase characters, numbers and hyphen(-) are allowed.
   name: alarm-panel
   friendly_name: Alarm Panel
   project_name: konnected.alarm-panel-esp8266