diff --git a/mcu-air-office-r.yaml b/mcu-air-office-r.yaml
index 7bc9118..abe5b29 100644
--- a/mcu-air-office-r.yaml
+++ b/mcu-air-office-r.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: air-office-r
   name: Office R Air
@@ -104,7 +105,7 @@ light:
           move_interval: 100ms
 
 sensor:
-# https://blissair.com/what-is-pm-2-5.htm
+  # https://blissair.com/what-is-pm-2-5.htm
   - platform: pm1006
     uart_id: particle_uart
     update_interval: 20s
diff --git a/mcu-atoms3.yaml b/mcu-atoms3.yaml
index 04b8b09..f6a6f01 100644
--- a/mcu-atoms3.yaml
+++ b/mcu-atoms3.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: atoms3
   name: AtomS3
@@ -118,36 +119,36 @@ canbus:
     bit_rate: 1000KBPS
     use_extended_id: true
     on_frame:
-    - can_id: 0x123
-      use_extended_id: true
-      then:
-      - lambda: |-
-          std::string b(x.begin(), x.end());
-          ESP_LOGD("can extended id 0x123", "%s", &b[0] );
-    - can_id: 0x123
-      then:
-      - lambda: |-
-          std::string b(x.begin(), x.end());
-          ESP_LOGD("can standard id 0x123", "%s", &b[0] );
-    - can_id: 0x3f1
-      can_id_mask: 0x7ff
-      use_extended_id: false
-      then:
-      - lambda: |-
-          std::string b(x.begin(), x.end());
-          ESP_LOGD("can id 0x03f1", "%s", &b[0] );
-    - can_id: 0x108
-      use_extended_id: false
-      then:
-      - lambda: |-
-          std::string b(x.begin(), x.end());
-          ESP_LOGD("can id 0x108", "%s", &b[0] );
-    - can_id: 0x109
-      use_extended_id: false
-      then:
-      - lambda: |-
-          std::string b(x.begin(), x.end());
-          ESP_LOGD("can id 0x109", "%s", &b[0] );
+      - can_id: 0x123
+        use_extended_id: true
+        then:
+        - lambda: |-
+            std::string b(x.begin(), x.end());
+            ESP_LOGD("can extended id 0x123", "%s", &b[0] );
+      - can_id: 0x123
+        then:
+        - lambda: |-
+            std::string b(x.begin(), x.end());
+            ESP_LOGD("can standard id 0x123", "%s", &b[0] );
+      - can_id: 0x3f1
+        can_id_mask: 0x7ff
+        use_extended_id: false
+        then:
+        - lambda: |-
+            std::string b(x.begin(), x.end());
+            ESP_LOGD("can id 0x03f1", "%s", &b[0] );
+      - can_id: 0x108
+        use_extended_id: false
+        then:
+        - lambda: |-
+            std::string b(x.begin(), x.end());
+            ESP_LOGD("can id 0x108", "%s", &b[0] );
+      - can_id: 0x109
+        use_extended_id: false
+        then:
+        - lambda: |-
+            std::string b(x.begin(), x.end());
+            ESP_LOGD("can id 0x109", "%s", &b[0] );
 
 i2c:
   # - id: i2c_groove
@@ -177,9 +178,9 @@ i2c:
 #   - platform: gpio
 #     pin: 1
 #     id: hub_1
-  # - platform: gpio
-  #   pin: 2
-  #   id: hub_2
+# - platform: gpio
+#   pin: 2
+#   id: hub_2
 
 m5stack_4relay:
   id: m5stack_relay_1
@@ -229,7 +230,7 @@ switch:
       - output.turn_off: motor_in1
       - output.turn_off: motor_in2
 
-# switch:
+  # switch:
   - platform: m5stack_4relay
     name: Relay 1
     id: relay_1
diff --git a/mcu-basement-2.yaml b/mcu-basement-2.yaml
index 638f8ef..aa0d8fb 100644
--- a/mcu-basement-2.yaml
+++ b/mcu-basement-2.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: basement-2
   name_short: Basement
diff --git a/mcu-basement.yaml b/mcu-basement.yaml
index 3dbc8b4..fc8c224 100644
--- a/mcu-basement.yaml
+++ b/mcu-basement.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: basement
   name: Basement
@@ -40,35 +41,35 @@ binary_sensor:
     name: Light Switch
     device_class: light
     on_click:
-    - min_length: 50ms
-      max_length: 350ms
-      then:
-        - homeassistant.service:
-            service: light.toggle
-            data:
-              entity_id: light.mcu_basement_2_light
-    - min_length: 351ms
-      max_length: 1000ms
-      then:
-        - homeassistant.service:
-            service: light.toggle
-            data:
-              entity_id: light.exercise_room
-    - min_length: 1001ms
-      max_length: 10000ms
-      then:
-        # - homeassistant.service:
-        #     service: light.turn_off
-        #     data:
-        #       entity_id: light.basement_light
-        - homeassistant.service:
-            service: light.turn_off
-            data:
-              entity_id: light.exercise_room
-        - homeassistant.service:
-            service: light.turn_off
-            data:
-              entity_id: light.exercise_room_fan
+      - min_length: 50ms
+        max_length: 350ms
+        then:
+          - homeassistant.service:
+              service: light.toggle
+              data:
+                entity_id: light.mcu_basement_2_light
+      - min_length: 351ms
+        max_length: 1000ms
+        then:
+          - homeassistant.service:
+              service: light.toggle
+              data:
+                entity_id: light.exercise_room
+      - min_length: 1001ms
+        max_length: 10000ms
+        then:
+          # - homeassistant.service:
+          #     service: light.turn_off
+          #     data:
+          #       entity_id: light.basement_light
+          - homeassistant.service:
+              service: light.turn_off
+              data:
+                entity_id: light.exercise_room
+          - homeassistant.service:
+              service: light.turn_off
+              data:
+                entity_id: light.exercise_room_fan
   - platform: gpio
     pin:
       number: 10
diff --git a/mcu-bedroom-lamp-left.yaml b/mcu-bedroom-lamp-left.yaml
index 7f2ec0d..ad5f4ba 100644
--- a/mcu-bedroom-lamp-left.yaml
+++ b/mcu-bedroom-lamp-left.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: bedroom-lamp-left
   name: Bedroom Lamp Left
@@ -95,7 +96,7 @@ script:
                   id: my_light_mode
                   state: white
           then:
-            - front_panel.turn_on_leds: [ POWER, COLOR ]
+            - front_panel.turn_on_leds: [POWER, COLOR]
             - front_panel.set_level: !lambda return id(current_brightness);
       # In night light mode, turn off the front panel illumination, except
       # for the power button.
@@ -105,7 +106,7 @@ script:
                 id: my_light_mode
                 state: night
           then:
-            - front_panel.turn_on_leds: [ POWER ]
+            - front_panel.turn_on_leds: [POWER]
       - front_panel.update_leds:
 
 # If you want to control light presets from Home Assistant, then you can
@@ -201,18 +202,18 @@ light:
     # These bindings have been setup below, using the binary_sensor for
     # the color button.
     presets:
-#      rgb:
-#        red:         { red: 100%, green: 0%,   blue: 0%   }
-#        green:       { red: 0%,   green: 100%, blue: 0%   }
-#        blue:        { red: 0%,   green: 0%,   blue: 100% }
-#        yellow:      { red: 100%, green: 100%, blue: 0%   }
-#        purple:      { red: 100%, green: 0%,   blue: 100% }
-#        randomize:   { effect: Fast Random                }
+      # rgb:
+      # red:         { red: 100%, green: 0%,   blue: 0%   }
+      # green:       { red: 0%,   green: 100%, blue: 0%   }
+      # blue:        { red: 0%,   green: 0%,   blue: 100% }
+      # yellow:      { red: 100%, green: 100%, blue: 0%   }
+      # purple:      { red: 100%, green: 0%,   blue: 100% }
+      # randomize:   { effect: Fast Random                }
       white:
-        cold:        { color_temperature: 153 mireds      }
-        chilly:      { color_temperature: 275 mireds      }
-        luke:        { color_temperature: 400 mireds      }
-        warm:        { color_temperature: 588 mireds      }
+        cold:        {color_temperature: 153 mireds}
+        chilly:      {color_temperature: 275 mireds}
+        luke:        {color_temperature: 400 mireds}
+        warm:        {color_temperature: 588 mireds}
 
 # Binary sensors can be created for handling front panel touch / release
 # events. To specify what part of the front panel to look at, the "for"
@@ -224,16 +225,16 @@ binary_sensor:
     id: my_power_button
     for: POWER_BUTTON
     on_multi_click:
-    - timing:
-        - ON for at most 0.8s
-      then:
-        - light.toggle: my_light
-    - timing:
-        - ON for at least 0.8s
-      then:
-        - light.turn_on:
-            id: my_light
-            brightness: 1%
+      - timing:
+          - ON for at most 0.8s
+        then:
+          - light.toggle: my_light
+      - timing:
+          - ON for at least 0.8s
+        then:
+          - light.turn_on:
+              id: my_light
+              brightness: 1%
 
   # When tapping the color button, activate the next preset.
   # When holding the color button, activate the next preset group.
@@ -241,17 +242,17 @@ binary_sensor:
     id: my_color_button
     for: COLOR_BUTTON
     on_multi_click:
-    - timing:
-        - ON for at most 0.6s
-      then:
-        - preset.activate:
-            next: preset
-    - timing:
-        - ON for at least 0.6s
-      then:
-        - globals.set:
-            id: group_control
-            value: !lambda return !id(group_control);
+      - timing:
+          - ON for at most 0.6s
+        then:
+          - preset.activate:
+              next: preset
+      - timing:
+          - ON for at least 0.6s
+        then:
+          - globals.set:
+              id: group_control
+              value: !lambda return !id(group_control);
 #      - timing:
 #          - ON for at least 0.6s
 #        then:
@@ -271,20 +272,20 @@ sensor:
     id: my_slider_level
     range_from: 0.02
     on_value:
-    - if:
-        condition:
-          lambda: |-
-            return id(group_control);
-        then:
-          - homeassistant.service:
-              service: light.turn_on
-              data:
-                light_name: bedroom_lamp
+      - if:
+          condition:
+            lambda: |-
+              return id(group_control);
+          then:
+            - homeassistant.service:
+                service: light.turn_on
+                data:
+                  light_name: bedroom_lamp
+                  brightness: !lambda return x;
+          else:
+            - light.turn_on:
+                id: my_light
                 brightness: !lambda return x;
-        else:
-          - light.turn_on:
-              id: my_light
-              brightness: !lambda return x;
 
 # This text sensor propagates the currently active light mode.
 # The possible light modes are: "off", "rgb", "white" and "night".
diff --git a/mcu-bedroom-lamp-right.yaml b/mcu-bedroom-lamp-right.yaml
index 6301e6c..a30a49a 100644
--- a/mcu-bedroom-lamp-right.yaml
+++ b/mcu-bedroom-lamp-right.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: bedroom-lamp-right
   name: Bedroom Lamp Right
@@ -92,7 +93,7 @@ script:
                   id: my_light_mode
                   state: white
           then:
-            - front_panel.turn_on_leds: [ POWER, COLOR ]
+            - front_panel.turn_on_leds: [POWER, COLOR]
             - front_panel.set_level: !lambda return id(current_brightness);
       # In night light mode, turn off the front panel illumination, except
       # for the power button.
@@ -102,7 +103,7 @@ script:
                 id: my_light_mode
                 state: night
           then:
-            - front_panel.turn_on_leds: [ POWER ]
+            - front_panel.turn_on_leds: [POWER]
       - front_panel.update_leds:
 
 # If you want to control light presets from Home Assistant, then you can
@@ -198,18 +199,18 @@ light:
     # These bindings have been setup below, using the binary_sensor for
     # the color button.
     presets:
-#      rgb:
-#        red:         { red: 100%, green: 0%,   blue: 0%   }
-#        green:       { red: 0%,   green: 100%, blue: 0%   }
-#        blue:        { red: 0%,   green: 0%,   blue: 100% }
-#        yellow:      { red: 100%, green: 100%, blue: 0%   }
-#        purple:      { red: 100%, green: 0%,   blue: 100% }
-#        randomize:   { effect: Fast Random                }
+      # rgb:
+      # red:         { red: 100%, green: 0%,   blue: 0%   }
+      # green:       { red: 0%,   green: 100%, blue: 0%   }
+      # blue:        { red: 0%,   green: 0%,   blue: 100% }
+      # yellow:      { red: 100%, green: 100%, blue: 0%   }
+      # purple:      { red: 100%, green: 0%,   blue: 100% }
+      # randomize:   { effect: Fast Random                }
       white:
-        cold:        { color_temperature: 153 mireds      }
-        chilly:      { color_temperature: 275 mireds      }
-        luke:        { color_temperature: 400 mireds      }
-        warm:        { color_temperature: 588 mireds      }
+        cold:        {color_temperature: 153 mireds}
+        chilly:      {color_temperature: 275 mireds}
+        luke:        {color_temperature: 400 mireds}
+        warm:        {color_temperature: 588 mireds}
 
 # Binary sensors can be created for handling front panel touch / release
 # events. To specify what part of the front panel to look at, the "for"
diff --git a/mcu-c6-test-1.yaml b/mcu-c6-test-1.yaml
index 62f7fc4..2d27d0b 100644
--- a/mcu-c6-test-1.yaml
+++ b/mcu-c6-test-1.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: c6-test-1
   name: C6 TEST 1
diff --git a/mcu-c6-test-2.yaml b/mcu-c6-test-2.yaml
index fb77971..43a07b9 100644
--- a/mcu-c6-test-2.yaml
+++ b/mcu-c6-test-2.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: c6-test-2
   name: C6 TEST 2
diff --git a/mcu-cam-1.yaml b/mcu-cam-1.yaml
index 1213d03..f63071a 100644
--- a/mcu-cam-1.yaml
+++ b/mcu-cam-1.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: cam-1
   name: Cam 1
diff --git a/mcu-can-node-1.yaml b/mcu-can-node-1.yaml
index 80343de..99dfd0d 100644
--- a/mcu-can-node-1.yaml
+++ b/mcu-can-node-1.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: can-node-1
   name: CAN Node 1
diff --git a/mcu-can-node-2.yaml b/mcu-can-node-2.yaml
index 8bcd268..feaebc0 100644
--- a/mcu-can-node-2.yaml
+++ b/mcu-can-node-2.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: can-node-2
   name: CAN Node 2
diff --git a/mcu-cec-bedroom.yaml b/mcu-cec-bedroom.yaml
index 49a45aa..d2df586 100644
--- a/mcu-cec-bedroom.yaml
+++ b/mcu-cec-bedroom.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: cec-bedroom
   name: Bedroom TV
@@ -52,11 +53,11 @@ uart:
     baud_rate: 9600
 
 sensor:
- - platform: a02yyuw
-   uart_id: uart_distance
-   name: 'Distance'
-   accuracy_decimals: 2
-   unit_of_measurement: cm
+  - platform: a02yyuw
+    uart_id: uart_distance
+    name: 'Distance'
+    accuracy_decimals: 2
+    unit_of_measurement: cm
 
 binary_sensor:
   - platform: gpio
@@ -138,22 +139,22 @@ hdmi_cec:
       then:
         - hdmi_cec.send: # Report ARC started
             destination: 0x0
-            data: [ 0xC1 ]
+            data: [0xC1]
     - opcode: 0x70 # System audio mode request
       then:
         - hdmi_cec.send:
             destination: 0x0
-            data: [ 0x72, 0x01 ]
+            data: [0x72, 0x01]
     - opcode: 0x71 # Give audio status
       then:
         - hdmi_cec.send:
             destination: 0x0
-            data: [ 0x7A, 0x7F ]
+            data: [0x7A, 0x7F]
     - opcode: 0x7D # Give audio system mode status
       then:
         - hdmi_cec.send:
             destination: 0x0
-            data: [ 0x7E, 0x01 ]
+            data: [0x7E, 0x01]
     - opcode: 0x46 # Give OSD name
       then:
         - hdmi_cec.send:
diff --git a/mcu-clock-1.yaml b/mcu-clock-1.yaml
index 3af65f6..1951f2e 100644
--- a/mcu-clock-1.yaml
+++ b/mcu-clock-1.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: clock-1
   name: Clock 1
diff --git a/mcu-clock-living-room.yaml b/mcu-clock-living-room.yaml
index b8518da..9144970 100644
--- a/mcu-clock-living-room.yaml
+++ b/mcu-clock-living-room.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: clock-living-room
   name: Living room Clock
@@ -21,7 +22,7 @@ external_components:
       url: https://github.com/trip5/esphome-tm1650
       ref: main
     refresh: 60s
-    components: [ tm1650 ]
+    components: [tm1650]
 
 packages:
   common: !include common/common.yaml
diff --git a/mcu-desk-lamp.yaml b/mcu-desk-lamp.yaml
index 9f506b9..fdac90a 100644
--- a/mcu-desk-lamp.yaml
+++ b/mcu-desk-lamp.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: desk-lamp
   name: Desk Lamp
diff --git a/mcu-dimmer.yaml b/mcu-dimmer.yaml
index 6d1ca1a..65db2bd 100644
--- a/mcu-dimmer.yaml
+++ b/mcu-dimmer.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: dimmer
   name: Dimmer
diff --git a/mcu-echo-1.yaml b/mcu-echo-1.yaml
index a16d734..3d74431 100644
--- a/mcu-echo-1.yaml
+++ b/mcu-echo-1.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: echo-1
   name: Echo 1
@@ -31,7 +32,7 @@ external_components:
   #   components: [ speaker, rtttl ]
   #   refresh: 0s
   - source: github://pr#5177
-    components: [ rtttl ]
+    components: [rtttl]
     refresh: 0s
 
 packages:
@@ -48,10 +49,10 @@ api:
             rtttl: !lambda 'return song;'
 
 # i2c:
-  # sda: 26
-  # scl: 32
-#   scan: true #false
-#   frequency: 100kHz
+#   - sda: 26
+#     scl: 32
+#     scan: true #false
+#     frequency: 100kHz
 
 # uart:
 #   id: particle_uart
diff --git a/mcu-echo.yaml b/mcu-echo.yaml
index 1cf229b..dd1ee3f 100644
--- a/mcu-echo.yaml
+++ b/mcu-echo.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: echo
   name: Echo
diff --git a/mcu-eworkbench.yaml b/mcu-eworkbench.yaml
index 87cee80..65e46b6 100644
--- a/mcu-eworkbench.yaml
+++ b/mcu-eworkbench.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: eworkbench
   name: Electronics Workbench
diff --git a/mcu-fireplace.yaml b/mcu-fireplace.yaml
index 0722044..f7eac00 100644
--- a/mcu-fireplace.yaml
+++ b/mcu-fireplace.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: fireplace
   name: Heating Fireplace
diff --git a/mcu-gate.yaml b/mcu-gate.yaml
index d9f81a8..90d8f07 100644
--- a/mcu-gate.yaml
+++ b/mcu-gate.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: gate
   name: Gate
diff --git a/mcu-gateway.yaml b/mcu-gateway.yaml
index d4c78cc..46fe44f 100644
--- a/mcu-gateway.yaml
+++ b/mcu-gateway.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: gateway
   name: Gateway
@@ -73,19 +74,19 @@ ethernet:
 #   clk_mode: GPIO17_OUT
 #   phy_addr: 0
 #   power_pin: 12
-  # use_address: 10.17.240.245
+# use_address: 10.17.240.245
 
-  # # Optional manual IP
-  # manual_ip:
-  #   static_ip: 10.17.240.254
-  #   gateway: 10.17.240.1
-  #   subnet: 255.255.255.0
+# # Optional manual IP
+# manual_ip:
+#   static_ip: 10.17.240.254
+#   gateway: 10.17.240.1
+#   subnet: 255.255.255.0
 
 
 # ethernet:
-  # use_address: 10.17.241.254
-  # use_address: 10.17.241.98
-  # use_address: mcu-gateway.local
+# use_address: 10.17.241.254
+# use_address: 10.17.241.98
+# use_address: mcu-gateway.local
 
 uart:
   id: uart_modbus
@@ -190,17 +191,17 @@ sensor:
     register_count: 2
     filters:
       - calibrate_linear:
-        - 50 -> 0
-        - 450 -> 5
+          - 50 -> 0
+          - 450 -> 5
 
 switch:
-- platform: modbus_controller
-  modbus_controller_id: modbus_adc_1
-  name: Readress MODBUS
-  register_type: holding
-  address: 0x00FD
-  entity_category: config
-  icon: "mdi:toggle-switch"
+  - platform: modbus_controller
+    modbus_controller_id: modbus_adc_1
+    name: Readress MODBUS
+    register_type: holding
+    address: 0x00FD
+    entity_category: config
+    icon: "mdi:toggle-switch"
 
 esp32_ble_tracker:
   scan_parameters:
diff --git a/mcu-heater.yaml b/mcu-heater.yaml
index 9e50377..52f4278 100644
--- a/mcu-heater.yaml
+++ b/mcu-heater.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: heater
   name: Heater
@@ -248,13 +249,13 @@ switch:
 sensor:
   # - platform: ds248x
   - platform: dallas_temp
-# [22:06:25][D][dallas.sensor:082]:     0x1701143E35C5AA28  Feed
-# [22:06:25][D][dallas.sensor:082]:     0x7301143F7F57AA28  Return
-# [22:06:25][D][dallas.sensor:082]:     0xF701143E397FAA28  Heater Tank
-# [22:06:25][D][dallas.sensor:082]:     0x5A041750B2C8FF28  Hot Water Tank - Bottom (Solar)
-# [22:06:25][D][dallas.sensor:082]:     0xDB041750EAE2FF28  Heating Water Return (OUT from System, TO Heater)
-# [22:06:25][D][dallas.sensor:082]:     0xB2041750CF1AFF28  Heating Water (OUT from Heater, TO System)
-# [22:06:25][D][dallas.sensor:082]:     0x960417517301FF28  Hot Water Tank - TOP (Heater)
+    # [22:06:25][D][dallas.sensor:082]:     0x1701143E35C5AA28  Feed
+    # [22:06:25][D][dallas.sensor:082]:     0x7301143F7F57AA28  Return
+    # [22:06:25][D][dallas.sensor:082]:     0xF701143E397FAA28  Heater Tank
+    # [22:06:25][D][dallas.sensor:082]:     0x5A041750B2C8FF28  Hot Water Tank - Bottom (Solar)
+    # [22:06:25][D][dallas.sensor:082]:     0xDB041750EAE2FF28  Heating Water Return (OUT from System, TO Heater)
+    # [22:06:25][D][dallas.sensor:082]:     0xB2041750CF1AFF28  Heating Water (OUT from Heater, TO System)
+    # [22:06:25][D][dallas.sensor:082]:     0x960417517301FF28  Hot Water Tank - TOP (Heater)
     # address: 0x320417500A93FF28 # 1. broken
     # address: 0x67041750F44CFF28 # 2. broken
     address: 0x960417517301FF28 # Hot Water Tank - TOP (Heater)
diff --git a/mcu-kitchen.yaml b/mcu-kitchen.yaml
index fbadf35..37ae3a1 100644
--- a/mcu-kitchen.yaml
+++ b/mcu-kitchen.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: kitchen
   name: Kitchen
diff --git a/mcu-lightening.yaml b/mcu-lightening.yaml
index 409e20a..18e5319 100644
--- a/mcu-lightening.yaml
+++ b/mcu-lightening.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: lightening
   name: Lightening detector
@@ -16,9 +17,6 @@ esp32:
   framework:
     type: esp-idf
 
-external_components:
-  - source: components
-
 packages:
   common: !include common/common.yaml
 
@@ -38,11 +36,11 @@ as3935_i2c:
   irq_pin: 26
 
 binary_sensor:
-#   - platform: gpio
-#     # name: Button
-#     pin:
-#       number: 39
-#       inverted: true
+  #   - platform: gpio
+  #     # name: Button
+  #     pin:
+  #       number: 39
+  #       inverted: true
   - platform: as3935
     name: Storm Alert
 
@@ -62,4 +60,3 @@ sensor:
       name: Energy
     distance:
       name: Storm Distance
-
diff --git a/mcu-lvgl-eworkbench.yaml b/mcu-lvgl-eworkbench.yaml
index 9fc8fe7..94ab6b3 100644
--- a/mcu-lvgl-eworkbench.yaml
+++ b/mcu-lvgl-eworkbench.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: lvgl-eworkbench
   name: Electronics Workbench Display
diff --git a/mcu-lvgl-trainer.yaml b/mcu-lvgl-trainer.yaml
index abd00a3..6139814 100644
--- a/mcu-lvgl-trainer.yaml
+++ b/mcu-lvgl-trainer.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: lvgl-trainer
   name: Trainer Display
@@ -141,8 +142,8 @@ touchscreen:
     i2c_id: touchscreen_bus
     update_interval: 100ms
     # interrupt_pin:
-      # number: 3
-      # ignore_strapping_warning: true
+    # number: 3
+    # ignore_strapping_warning: true
     calibration:
       x_min: 0
       x_max: 479
@@ -209,14 +210,14 @@ lvgl:
   log_level: WARN
   color_depth: 16
   default_font: montserrat_18
-#   on_idle:
-#     - timeout: !lambda "return (id(display_timeout).state * 1000);"
-#       then:
-#         - logger.log: "LVGL is idle"
-#         - light.turn_off:
-#             id: display_backlight
-#             transition_length: 2500ms
-#         - lvgl.pause:
+  #   on_idle:
+  #     - timeout: !lambda "return (id(display_timeout).state * 1000);"
+  #       then:
+  #         - logger.log: "LVGL is idle"
+  #         - light.turn_off:
+  #             id: display_backlight
+  #             transition_length: 2500ms
+  #         - lvgl.pause:
   top_layer:
     widgets:
       - buttonmatrix:
@@ -229,21 +230,21 @@ lvgl:
           #   styles: header_footer
           rows:
             - buttons:
-              - id: page_prev
-                text: "\uF053"
-                on_press:
-                  then:
-                    lvgl.page.previous:
-              - id: page_home
-                text: "\uF015"
-                on_press:
-                  then:
-                    lvgl.page.show: main_page
-              - id: page_next
-                text: "\uF054"
-                on_press:
-                  then:
-                    lvgl.page.next:
+                - id: page_prev
+                  text: "\uF053"
+                  on_press:
+                    then:
+                      lvgl.page.previous:
+                - id: page_home
+                  text: "\uF015"
+                  on_press:
+                    then:
+                      lvgl.page.show: main_page
+                - id: page_next
+                  text: "\uF054"
+                  on_press:
+                    then:
+                      lvgl.page.next:
   pages:
     - id: main_page
       widgets:
diff --git a/mcu-lvgl.yaml b/mcu-lvgl.yaml
index d93e0da..03d45af 100644
--- a/mcu-lvgl.yaml
+++ b/mcu-lvgl.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: lvgl
   name: LVGL
diff --git a/mcu-m5paper.yaml b/mcu-m5paper.yaml
index aaf8bf1..00ca8d8 100644
--- a/mcu-m5paper.yaml
+++ b/mcu-m5paper.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: m5paper
   name: M5Paper
diff --git a/mcu-mains-power.yaml b/mcu-mains-power.yaml
index c53ec6d..0a9e649 100644
--- a/mcu-mains-power.yaml
+++ b/mcu-mains-power.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: mains-power
   name: Mains Power
diff --git a/mcu-nrf-dk.yaml b/mcu-nrf-dk.yaml
index be0f5c2..1b3efd2 100644
--- a/mcu-nrf-dk.yaml
+++ b/mcu-nrf-dk.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: mcu-nrf-dk
   friendly_name: mcu-nrf-dk
diff --git a/mcu-nspanel-bedroom.yaml b/mcu-nspanel-bedroom.yaml
index 86a89d8..9c01476 100644
--- a/mcu-nspanel-bedroom.yaml
+++ b/mcu-nspanel-bedroom.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: nspanel-bedroom
   name: Bedroom NSPanel
diff --git a/mcu-nspanel-dev.yaml b/mcu-nspanel-dev.yaml
index 937ee0c..e9bcef2 100644
--- a/mcu-nspanel-dev.yaml
+++ b/mcu-nspanel-dev.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: nspanel-dev
   name: NSPanel DEV
@@ -87,7 +88,7 @@ api:
         # - delay: 10s
         # - lambda: 'id(nspanel_id).send_custom_command("notify~~");'
 
-# DISABLED until https://github.com/olicooper/esphome-nspanel-lovelace-native/issues/20 is fixed
+    # DISABLED until https://github.com/olicooper/esphome-nspanel-lovelace-native/issues/20 is fixed
     # - service: update_tft
     #   then:
     #     - lambda: |-
diff --git a/mcu-nspanel-fireplace.yaml b/mcu-nspanel-fireplace.yaml
index ff12841..e67bfdd 100644
--- a/mcu-nspanel-fireplace.yaml
+++ b/mcu-nspanel-fireplace.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: nspanel-fireplace
   name: Fireplace NSPanel
@@ -189,7 +190,7 @@ binary_sensor:
       number: 14
       inverted: true
     on_click:
-    #   - switch.toggle: relay_1
+      #   - switch.toggle: relay_1
       - min_length: 50ms
         max_length: 350ms
         then:
@@ -219,7 +220,7 @@ binary_sensor:
       number: 27
       inverted: true
     on_click:
-    #   - switch.toggle: relay_2
+      #   - switch.toggle: relay_2
       - min_length: 50ms
         max_length: 350ms
         then:
diff --git a/mcu-nspanel-office-j.yaml b/mcu-nspanel-office-j.yaml
index b1e9a0f..d0bf606 100644
--- a/mcu-nspanel-office-j.yaml
+++ b/mcu-nspanel-office-j.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: nspanel-office-j
   name: Office J NSPanel
diff --git a/mcu-nspanel-office-r.yaml b/mcu-nspanel-office-r.yaml
index e54ac37..c401c0f 100644
--- a/mcu-nspanel-office-r.yaml
+++ b/mcu-nspanel-office-r.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: nspanel-office-r
   name: Office R NSPanel
diff --git a/mcu-nspanel-patio.yaml b/mcu-nspanel-patio.yaml
index 1fa9c9d..377a69e 100644
--- a/mcu-nspanel-patio.yaml
+++ b/mcu-nspanel-patio.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: nspanel-patio
   name: Patio NSPanel
diff --git a/mcu-office-r.yaml b/mcu-office-r.yaml
index 86e9d8c..7d2e96c 100644
--- a/mcu-office-r.yaml
+++ b/mcu-office-r.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: office-r
   name: Office R
diff --git a/mcu-patio.yaml b/mcu-patio.yaml
index abb58d2..c97288c 100644
--- a/mcu-patio.yaml
+++ b/mcu-patio.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: patio
   name: Patio
diff --git a/mcu-pow-dishwasher.yaml b/mcu-pow-dishwasher.yaml
index 6ef30d7..1d6094c 100644
--- a/mcu-pow-dishwasher.yaml
+++ b/mcu-pow-dishwasher.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: pow-dishwasher
   name: Dishwasher POW
diff --git a/mcu-pow-washer.yaml b/mcu-pow-washer.yaml
index 424868c..5314a31 100644
--- a/mcu-pow-washer.yaml
+++ b/mcu-pow-washer.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: pow-washer
   name: Washer POW
diff --git a/mcu-rf433.yaml b/mcu-rf433.yaml
index 87178e9..74888fc 100644
--- a/mcu-rf433.yaml
+++ b/mcu-rf433.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: rf433
   name: RF433 Bridge
@@ -28,11 +29,11 @@ remote_transmitter:
   carrier_duty_percent: 100%
 
 binary_sensor:
-# Key Fob remote
-# A: 011110110011101010100010
-# B: 011110110011101010101000
-# C: 011110110011101010100001
-# D: 011110110011101010100100
+  # Key Fob remote
+  # A: 011110110011101010100010
+  # B: 011110110011101010101000
+  # C: 011110110011101010100001
+  # D: 011110110011101010100100
   - platform: remote_receiver
     name: "Keyfob Remote Button A"
     rc_switch_raw:
diff --git a/mcu-rfid-reader.yaml b/mcu-rfid-reader.yaml
index 8edbf2a..b144859 100644
--- a/mcu-rfid-reader.yaml
+++ b/mcu-rfid-reader.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: rfid-reader
   name: RFID Reader
diff --git a/mcu-shed.yaml b/mcu-shed.yaml
index 447de7d..3b6b6ee 100644
--- a/mcu-shed.yaml
+++ b/mcu-shed.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: shed
   name: Shed
@@ -37,18 +38,18 @@ binary_sensor:
       number: 6
       inverted: true
     on_click:
-    - min_length: 50ms
-      max_length: 350ms
-      then:
-        - switch.toggle: shed_light_relay
-    - min_length: 351ms
-      max_length: 1000ms
-      then:
-        - switch.toggle: garden_light_relay
-    - min_length: 1001ms
-      max_length: 10000ms
-      then:
-        - switch.toggle: socket_relay
+      - min_length: 50ms
+        max_length: 350ms
+        then:
+          - switch.toggle: shed_light_relay
+      - min_length: 351ms
+        max_length: 1000ms
+        then:
+          - switch.toggle: garden_light_relay
+      - min_length: 1001ms
+        max_length: 10000ms
+        then:
+          - switch.toggle: socket_relay
 
 switch:
   - platform: gpio
diff --git a/mcu-socket-01.yaml b/mcu-socket-01.yaml
index 81e31f5..cfddc7b 100644
--- a/mcu-socket-01.yaml
+++ b/mcu-socket-01.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: socket-01
   name: Socket 01
@@ -99,8 +100,8 @@ sensor:
     name: Total Daily Power"
     power_id: power
     filters:
-        # Multiplication factor from W to kW is 0.001
-        - multiply: 0.001
+      # Multiplication factor from W to kW is 0.001
+      - multiply: 0.001
     unit_of_measurement: kWh
     icon: mdi:circle-slice-3
 
diff --git a/mcu-socket-02.yaml b/mcu-socket-02.yaml
index 3d0c244..fc3cd9f 100644
--- a/mcu-socket-02.yaml
+++ b/mcu-socket-02.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: socket-02
   device_id: socket_02
@@ -101,8 +102,8 @@ sensor:
     name: Total Daily Power
     power_id: power
     filters:
-        # Multiplication factor from W to kW is 0.001
-        - multiply: 0.001
+      # Multiplication factor from W to kW is 0.001
+      - multiply: 0.001
     unit_of_measurement: kWh
     icon: mdi:circle-slice-3
 
diff --git a/mcu-socket-03.yaml b/mcu-socket-03.yaml
index 3e7bde8..906b9e5 100644
--- a/mcu-socket-03.yaml
+++ b/mcu-socket-03.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: socket-03
   name: Socket 03
@@ -122,8 +123,8 @@ sensor:
     power_id: power
     accuracy_decimals: 5
     filters:
-        # Multiplication factor from W to kW is 0.001
-        - multiply: 0.001
+      # Multiplication factor from W to kW is 0.001
+      - multiply: 0.001
     unit_of_measurement: kWh
     icon: mdi:circle-slice-3
 
diff --git a/mcu-staircase-light.yaml b/mcu-staircase-light.yaml
index bd80236..e78552c 100644
--- a/mcu-staircase-light.yaml
+++ b/mcu-staircase-light.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: staircase-light
   name: Staircase
diff --git a/mcu-tft.yaml b/mcu-tft.yaml
index dcef378..9fa655d 100644
--- a/mcu-tft.yaml
+++ b/mcu-tft.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: tft
   name: TFT
diff --git a/mcu-tracker.yaml b/mcu-tracker.yaml
index 59858e8..3671fad 100644
--- a/mcu-tracker.yaml
+++ b/mcu-tracker.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: tracker
   name: Tracker
@@ -94,11 +95,11 @@ external_components:
       type: git
       url: https://github.com/crossan007/esphome
       ref: "feature/AXP192"
-    components: [ axp192 ]
+    components: [axp192]
   - source: github://pr#6721
-    components: [ network, modem ]
+    components: [network, modem]
   - source: github://pr#9802
-    components: [ modem ]
+    components: [modem]
 
 # packages:
 #   common: !include common/common.yaml
diff --git a/mcu-tv-light.yaml b/mcu-tv-light.yaml
index 605adeb..ba6246f 100644
--- a/mcu-tv-light.yaml
+++ b/mcu-tv-light.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: tv-light
   name: TV Light
diff --git a/mcu-vehicle-honda-pcx125.yaml b/mcu-vehicle-honda-pcx125.yaml
index e52c683..fc8420b 100644
--- a/mcu-vehicle-honda-pcx125.yaml
+++ b/mcu-vehicle-honda-pcx125.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: vehicle-honda-pcx125
   name: Vehicle Honda PCX125
diff --git a/mcu-vehicle-suzuki-dl650.yaml b/mcu-vehicle-suzuki-dl650.yaml
index 0d0c4fe..0450431 100644
--- a/mcu-vehicle-suzuki-dl650.yaml
+++ b/mcu-vehicle-suzuki-dl650.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: vehicle-suzuki-dl650
   name: Vehicle Suzuki DL650
diff --git a/mcu-vehicle-toyota-auris-ts.yaml b/mcu-vehicle-toyota-auris-ts.yaml
index c575f23..98688d1 100644
--- a/mcu-vehicle-toyota-auris-ts.yaml
+++ b/mcu-vehicle-toyota-auris-ts.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: vehicle-toyota-auris-ts
   name: Vehicle Toyota Auris TS
diff --git a/mcu-vehicle-toyota-yaris-cross.yaml b/mcu-vehicle-toyota-yaris-cross.yaml
index 3be866c..3d6f77e 100644
--- a/mcu-vehicle-toyota-yaris-cross.yaml
+++ b/mcu-vehicle-toyota-yaris-cross.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: vehicle-toyota-yaris-cross
   name: Vehicle Toyota Yaris Cross
diff --git a/mcu-waterproof-socket.yaml b/mcu-waterproof-socket.yaml
index f9b707b..99867ba 100644
--- a/mcu-waterproof-socket.yaml
+++ b/mcu-waterproof-socket.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: waterproof-socket
   name: Waterproof Socket
diff --git a/mcu-well.yaml b/mcu-well.yaml
index f49f609..78c4a94 100644
--- a/mcu-well.yaml
+++ b/mcu-well.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device: well
   name: Well