diff --git a/changelog/2021.10.0.rst b/changelog/2021.10.0.rst
index 7eed6a92f..2662fd4d3 100644
--- a/changelog/2021.10.0.rst
+++ b/changelog/2021.10.0.rst
@@ -143,6 +143,19 @@ Release 2021.10.2 - October 22
 - Fix ESP8266 OTA compression only starting framework v2.7.0 :esphomepr:`2610` by :ghuser:`OttoWinter`
 - Bugfix tca9548a and idf refactor anh :esphomepr:`2612` by :ghuser:`andreashergert1984`
 
+Release 2021.10.3 - October 27
+------------------------------
+
+- fixed dependency for pca9685 component :esphomepr:`2614` by :ghuser:`andreashergert1984`
+- Bump platform-espressif8266 from 2.6.2 to 2.6.3 :esphomepr:`2620` by :ghuser:`OttoWinter`
+- Autodetect flash size :esphomepr:`2615` by :ghuser:`agners`
+- Teleinfo ptec :esphomepr:`2599` by :ghuser:`0hax`
+- Fix glue code missing micros() :esphomepr:`2623` by :ghuser:`OttoWinter`
+- Remove power and energy from sensors that are not true power :esphomepr:`2628` by :ghuser:`jesserockz`
+- fix modbus output :esphomepr:`2630` by :ghuser:`martgras`
+- Fix pin number validation for sn74hc595 :esphomepr:`2621` by :ghuser:`sairon`
+- Fix select.set using lambda :esphomepr:`2633` by :ghuser:`jesserockz`
+
 Full list of changes
 --------------------
 
diff --git a/components/binary_sensor/gpio.rst b/components/binary_sensor/gpio.rst
index 7c856bd67..7c869459f 100644
--- a/components/binary_sensor/gpio.rst
+++ b/components/binary_sensor/gpio.rst
@@ -44,7 +44,9 @@ you can do so with the :ref:`Pin Schema <config-pin_schema>`.
       - platform: gpio
         pin:
           number: D2
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
         name: ...
 
 Inverting Values
diff --git a/components/climate/ir_climate.rst b/components/climate/ir_climate.rst
index b4e8b0f04..4152dfa6e 100755
--- a/components/climate/ir_climate.rst
+++ b/components/climate/ir_climate.rst
@@ -126,7 +126,9 @@ IR receiver.
       pin:
         number: GPIO14
         inverted: true
-        mode: INPUT_PULLUP
+        mode:
+          input: true
+          pullup: true
       # high 55% tolerance is recommended for some remote control units
       tolerance: 55%
 
diff --git a/components/display/st7789v.rst b/components/display/st7789v.rst
index a31af4619..a0b52a5ee 100644
--- a/components/display/st7789v.rst
+++ b/components/display/st7789v.rst
@@ -201,7 +201,9 @@ appropriate lines of C code in the lambda to hide or show the image or text as y
         pin:
           number: GPIO0
           inverted: true
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
         name: "T-Display Button Input 0"
         id: tdisplay_button_input_0
       - platform: gpio
diff --git a/components/esphome.rst b/components/esphome.rst
index 5a413afa5..43d3dcfbb 100644
--- a/components/esphome.rst
+++ b/components/esphome.rst
@@ -42,7 +42,7 @@ Advanced options:
   to include in the project. See `platformio lib install <https://docs.platformio.org/en/latest/userguide/lib/cmd_install.html>`__.
   The ``<name>=<source>`` syntax can be used to override the source used for a library that is included by a component.
 - **comment** (*Optional*, string): Additional text information about this node. Only for display in UI.
-- **name_add_mac_suffix** (*Optional*, boolean): Appends the last 6 bytes of the mac address of the device to
+- **name_add_mac_suffix** (*Optional*, boolean): Appends the last 3 bytes of the mac address of the device to
   the name in the form ``<name>-aabbcc``. Defaults to ``false``.
   See :ref:`esphome-mac_suffix`.
 
diff --git a/components/mcp230xx.rst b/components/mcp230xx.rst
index fe9300dd3..bd6b00dc4 100644
--- a/components/mcp230xx.rst
+++ b/components/mcp230xx.rst
@@ -36,7 +36,8 @@ The MCP23008 component (`datasheet <http://ww1.microchip.com/downloads/en/device
           mcp23xxx: mcp23008_hub
           # Use pin number 0
           number: 0
-          mode: OUTPUT
+          mode:
+            output: true
           inverted: false
 
     # Individual inputs
@@ -48,7 +49,8 @@ The MCP23008 component (`datasheet <http://ww1.microchip.com/downloads/en/device
           # Use pin number 1
           number: 1
           # One of INPUT or INPUT_PULLUP
-          mode: INPUT
+          mode:
+            input: true
           inverted: false
 
 Configuration variables:
@@ -98,7 +100,8 @@ has 16 GPIOs and can be configured the same way than the other variants.
           mcp23016: mcp23016_hub
           # Use pin number 0
           number: 0
-          mode: OUTPUT
+          mode:
+            output: true
           inverted: false
 
     # Individual inputs
@@ -109,7 +112,8 @@ has 16 GPIOs and can be configured the same way than the other variants.
           mcp23016: mcp23016_hub
           # Use pin number 1
           number: 1
-          mode: INPUT
+          mode:
+            input: true
           inverted: false
 
 
@@ -157,7 +161,8 @@ binary sensor or GPIO switch.
           mcp23xxx: mcp23017_hub
           # Use pin number 0
           number: 0
-          mode: OUTPUT
+          mode:
+            output: true
           inverted: false
 
     # Individual inputs
@@ -169,7 +174,9 @@ binary sensor or GPIO switch.
           # Use pin number 1
           number: 1
           # One of INPUT or INPUT_PULLUP
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: false
 
 Configuration variables:
diff --git a/components/mcp23Sxx.rst b/components/mcp23Sxx.rst
index ef65b79d5..88aa2853f 100644
--- a/components/mcp23Sxx.rst
+++ b/components/mcp23Sxx.rst
@@ -38,7 +38,8 @@ The MCP23S08 component (`datasheet <http://ww1.microchip.com/downloads/en/Device
           # Use pin number 0
           number: 0
           # One of INPUT, INPUT_PULLUP or OUTPUT
-          mode: OUTPUT
+          mode:
+            output: true
           inverted: false
 
     # Individual inputs
@@ -50,7 +51,8 @@ The MCP23S08 component (`datasheet <http://ww1.microchip.com/downloads/en/Device
           # Use pin number 1
           number: 1
           # One of INPUT or INPUT_PULLUP
-          mode: INPUT
+          mode:
+            input: true
           inverted: false
 
 Configuration variables:
@@ -103,7 +105,8 @@ binary sensor or GPIO switch.
           mcp23xxx: mcp23s17_hub
           # Use pin number 0
           number: 0
-          mode: OUTPUT
+          mode:
+            output: true
           inverted: false
 
     # Individual inputs
@@ -115,7 +118,9 @@ binary sensor or GPIO switch.
           # Use pin number 1
           number: 1
           # One of INPUT or INPUT_PULLUP
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: false
 
 Configuration variables:
diff --git a/components/output/ac_dimmer.rst b/components/output/ac_dimmer.rst
index 91940421b..e17580e32 100644
--- a/components/output/ac_dimmer.rst
+++ b/components/output/ac_dimmer.rst
@@ -37,7 +37,8 @@ for example the `RobotDyn dimmer
         gate_pin: D7
         zero_cross_pin:
           number: D6
-          mode: INPUT
+          mode:
+            input: true
           inverted: yes
 
     light:
diff --git a/components/pcf8574.rst b/components/pcf8574.rst
index 4a72600a1..6467d2d5f 100644
--- a/components/pcf8574.rst
+++ b/components/pcf8574.rst
@@ -43,7 +43,8 @@ not work.
           # Use pin number 0
           number: 0
           # One of INPUT or OUTPUT
-          mode: OUTPUT
+          mode:
+            output: true
           inverted: false
 
 Configuration variables:
diff --git a/components/remote_receiver.rst b/components/remote_receiver.rst
index bb57937e3..9e2c21dce 100644
--- a/components/remote_receiver.rst
+++ b/components/remote_receiver.rst
@@ -51,7 +51,7 @@ Configuration variables:
 - **memory_blocks** (*Optional*, int): The number of RMT memory blocks used. Only used on ESP32 platform. Defaults to
   ``3``.
 - **filter** (*Optional*, :ref:`time <config-time>`): Filter any pulses that are shorter than this. Useful for removing
-  glitches from noisy signals. Defaults to ``10us``.
+  glitches from noisy signals. Defaults to ``50us``.
 - **idle** (*Optional*, :ref:`time <config-time>`): The amount of time that a signal should remain stable (i.e. not
   change) for it to be considered complete. Defaults to ``10ms``.
 - **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation. Use this if you have
@@ -260,7 +260,9 @@ Remote code selection (exactly one of these has to be included):
           pin:
             number: D4
             inverted: true
-            mode: INPUT_PULLUP
+            mode:
+              input: true
+              pullup: true
           dump: all
 
 
diff --git a/components/sx1509.rst b/components/sx1509.rst
index 126b01dba..751bd70ba 100644
--- a/components/sx1509.rst
+++ b/components/sx1509.rst
@@ -151,7 +151,9 @@ The outputs can in turn be used to add PWM-enabled lights like the monochromatic
           sx1509: sx1509_hub1
           # Use pin number 0 on the SX1509
           number: 0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
 
     # Individual binary outputs
@@ -163,7 +165,8 @@ The outputs can in turn be used to add PWM-enabled lights like the monochromatic
           # Use pin number 1 on the SX1509
           number: 1
           # use as output for switch
-          mode: OUTPUT
+          mode:
+            output: true
           inverted: false
 
     # Individual outputs
diff --git a/components/tuya.rst b/components/tuya.rst
index 6d4a3dd52..1ea533f78 100644
--- a/components/tuya.rst
+++ b/components/tuya.rst
@@ -68,5 +68,6 @@ See Also
 - :doc:`/components/switch/tuya`
 - :doc:`/components/climate/tuya`
 - :doc:`/components/binary_sensor/tuya`
+- :doc:`/components/sensor/tuya`
 - :apiref:`tuya/tuya.h`
 - :ghedit:`Edit`
diff --git a/cookbook/brilliant-mirabella-genio-smart-plugs.rst b/cookbook/brilliant-mirabella-genio-smart-plugs.rst
index ee85021d7..9cf84c026 100644
--- a/cookbook/brilliant-mirabella-genio-smart-plugs.rst
+++ b/cookbook/brilliant-mirabella-genio-smart-plugs.rst
@@ -147,7 +147,9 @@ which these adaptions created by `@cryptelli <https://community.home-assistant.i
       - platform: gpio
         pin:
           number: 14
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Power Button"
         on_press:
@@ -202,7 +204,9 @@ which these adaptions created by `@cryptelli <https://community.home-assistant.i
       - platform: gpio
         pin:
           number: GPIO13
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Power Button"
         on_press:
@@ -321,7 +325,9 @@ Check the following page for calibrating the measurements: :ref:`sensor-filter-c
       - platform: gpio
         pin:
           number: 14
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Power Button"
         on_press:
@@ -398,13 +404,13 @@ Check the following page for calibrating the measurements: :ref:`sensor-filter-c
         name: "${plug_name}_Relay"
         pin: GPIO14
         restore_mode: ALWAYS_ON
-        id: relay    
+        id: relay
 
         on_turn_on:
-          - switch.turn_on: red_led    
+          - switch.turn_on: red_led
 
         on_turn_off:
-          - switch.turn_off: red_led      
+          - switch.turn_off: red_led
 
     sensor:
       - platform: hlw8012
@@ -474,7 +480,9 @@ Check the following page for calibrating the measurements: :ref:`sensor-filter-c
       - platform: gpio
         pin:
           number: 14
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "${item_name}_button"
         on_press:
@@ -513,7 +521,7 @@ Check the following page for calibrating the measurements: :ref:`sensor-filter-c
       - platform: wifi_signal
         name: "${item_name}_wifi_signal"
         update_interval: 60s
-        
+
 
 4. Adding to Home Assistant
 ---------------------------
diff --git a/cookbook/esw01-eu.rst b/cookbook/esw01-eu.rst
index ee4c0070e..54aaf8387 100644
--- a/cookbook/esw01-eu.rst
+++ b/cookbook/esw01-eu.rst
@@ -57,7 +57,7 @@ and calculating the current with `Ohm's law <https://en.wikipedia.org/wiki/Ohm%2
     # D7 GPIO13 | HLW8012/CF  | cf_pin
 
     status_led:
-      pin: 
+      pin:
         number: GPIO5
 
     output:
@@ -83,7 +83,9 @@ and calculating the current with `Ohm's law <https://en.wikipedia.org/wiki/Ohm%2
         id: button1
         pin:
           number: GPIO14
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         on_press:
           - switch.toggle: switch1
diff --git a/cookbook/ilonda-wifi-smart-fish-feeder.rst b/cookbook/ilonda-wifi-smart-fish-feeder.rst
index b2eb5cbd9..888053688 100644
--- a/cookbook/ilonda-wifi-smart-fish-feeder.rst
+++ b/cookbook/ilonda-wifi-smart-fish-feeder.rst
@@ -13,7 +13,7 @@ firmware can be uploaded allowing you to control the Wifi Smart Fish Feeder via
 Wifi Smart Fish Feeder Configuration
 ------------------------------------
 
-Thanks to the amazing `Tasmota template <https://templates.blakadder.com/ilonda_L88.html>`__, 
+Thanks to the amazing `Tasmota template <https://templates.blakadder.com/ilonda_L88.html>`__,
 managed to build a fully working esphome configuration. This assumes you have a secret.yaml with ssid and password keys.
 
 .. code-block:: yaml
@@ -39,7 +39,9 @@ managed to build a fully working esphome configuration. This assumes you have a
         id: button
         pin:
           number: GPIO4
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: True
         name: 'Switch feeder'
         on_press:
diff --git a/cookbook/sonoff-basic-light-switch.rst b/cookbook/sonoff-basic-light-switch.rst
index 5103ecb36..6fa6bab26 100644
--- a/cookbook/sonoff-basic-light-switch.rst
+++ b/cookbook/sonoff-basic-light-switch.rst
@@ -117,7 +117,9 @@ Now you have a pair of wires from the GPIO and 0V to your retractive switch lets
       - platform: gpio
         pin:
           number: GPIO14
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button_1
         on_press:
diff --git a/cookbook/sonoff-dual-light-switch.rst b/cookbook/sonoff-dual-light-switch.rst
index 506530a98..60a224058 100644
--- a/cookbook/sonoff-dual-light-switch.rst
+++ b/cookbook/sonoff-dual-light-switch.rst
@@ -97,7 +97,9 @@ The R1 version of the Dual controls the relays via the UART, so the code gets a
       - platform: gpio
         pin:
           number: GPIO4
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button_1
         on_press:
@@ -107,7 +109,9 @@ The R1 version of the Dual controls the relays via the UART, so the code gets a
       - platform: gpio
         pin:
           number: GPIO14
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button_2
         on_press:
@@ -196,7 +200,9 @@ It's basically the same as the :doc:`T2 </cookbook/sonoff-t1-3>`
       - platform: gpio
         pin:
           number: GPIO0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button
         on_press:
@@ -206,7 +212,9 @@ It's basically the same as the :doc:`T2 </cookbook/sonoff-t1-3>`
       - platform: gpio
         pin:
           number: GPIO14
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button
         on_press:
diff --git a/cookbook/sonoff-fishpond-pump.rst b/cookbook/sonoff-fishpond-pump.rst
index 2be2e66b1..8091a8228 100644
--- a/cookbook/sonoff-fishpond-pump.rst
+++ b/cookbook/sonoff-fishpond-pump.rst
@@ -115,7 +115,9 @@ Here is the configuration with the basic operations outlined above.
         name: "esp_fishpond_gpio14"
         pin:
           number: 14
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
         on_press:
           - switch.turn_off: esp_fishpond_pump
 
diff --git a/cookbook/sonoff-t1-3.rst b/cookbook/sonoff-t1-3.rst
index 371a54dd0..1306409f9 100644
--- a/cookbook/sonoff-t1-3.rst
+++ b/cookbook/sonoff-t1-3.rst
@@ -36,7 +36,9 @@ T1
       - platform: gpio
         pin:
           number: GPIO0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button_1
         on_press:
@@ -99,7 +101,9 @@ T2
       - platform: gpio
         pin:
           number: GPIO0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button_1
         on_press:
@@ -109,7 +113,9 @@ T2
       - platform: gpio
         pin:
           number: GPIO9
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button_2
         on_press:
@@ -170,7 +176,9 @@ T3
       - platform: gpio
         pin:
           number: GPIO0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button_1
         on_press:
@@ -180,7 +188,9 @@ T3
       - platform: gpio
         pin:
           number: GPIO9
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button_2
         on_press:
@@ -190,7 +200,9 @@ T3
       - platform: gpio
         pin:
           number: GPIO10
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         id: button_3
         on_press:
@@ -241,4 +253,3 @@ See Also
 - :doc:`/cookbook/sonoff-light-switch`
 - :doc:`/guides/automations`
 - :doc:`/devices/sonoff_t1_uk_3gang_v1.1`
-
diff --git a/devices/sonoff_4ch.rst b/devices/sonoff_4ch.rst
index 596c02df9..2db0f062d 100644
--- a/devices/sonoff_4ch.rst
+++ b/devices/sonoff_4ch.rst
@@ -243,25 +243,33 @@ of the basic functions.
       - platform: gpio
         pin:
           number: GPIO0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff 4CH Button 1"
       - platform: gpio
         pin:
           number: GPIO9
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff 4CH Button 2"
       - platform: gpio
         pin:
           number: GPIO10
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff 4CH Button 3"
       - platform: gpio
         pin:
           number: GPIO14
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff 4CH Button 4"
       - platform: status
diff --git a/devices/sonoff_4ch.yaml b/devices/sonoff_4ch.yaml
index 5c000e019..b76025555 100644
--- a/devices/sonoff_4ch.yaml
+++ b/devices/sonoff_4ch.yaml
@@ -17,7 +17,9 @@ binary_sensor:
 - platform: gpio
   pin:
     number: GPIO0
-    mode: INPUT_PULLUP
+    mode:
+      input: true
+      pullup: true
     inverted: true
   name: "Sonoff 4CH Button 1"
   on_press:
@@ -25,7 +27,9 @@ binary_sensor:
 - platform: gpio
   pin:
     number: GPIO9
-    mode: INPUT_PULLUP
+    mode:
+      input: true
+      pullup: true
     inverted: true
   name: "Sonoff 4CH Button 2"
   on_press:
@@ -33,7 +37,9 @@ binary_sensor:
 - platform: gpio
   pin:
     number: GPIO10
-    mode: INPUT_PULLUP
+    mode:
+      input: true
+      pullup: true
     inverted: true
   name: "Sonoff 4CH Button 3"
   on_press:
@@ -41,7 +47,9 @@ binary_sensor:
 - platform: gpio
   pin:
     number: GPIO14
-    mode: INPUT_PULLUP
+    mode:
+      input: true
+      pullup: true
     inverted: true
   name: "Sonoff 4CH Button 4"
   on_press:
diff --git a/devices/sonoff_basic.rst b/devices/sonoff_basic.rst
index a0d330536..f9d1c2bfe 100644
--- a/devices/sonoff_basic.rst
+++ b/devices/sonoff_basic.rst
@@ -70,7 +70,9 @@ exposes all of the basic functions.
       - platform: gpio
         pin:
           number: GPIO0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff Basic Button"
         on_press:
diff --git a/devices/sonoff_s20.rst b/devices/sonoff_s20.rst
index 8559f8f12..6ee9ff0fd 100644
--- a/devices/sonoff_s20.rst
+++ b/devices/sonoff_s20.rst
@@ -225,7 +225,9 @@ of the basic functions.
       - platform: gpio
         pin:
           number: GPIO0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff S20 Button"
       - platform: status
diff --git a/devices/sonoff_s20.yaml b/devices/sonoff_s20.yaml
index 0e4e00b50..64f886cad 100644
--- a/devices/sonoff_s20.yaml
+++ b/devices/sonoff_s20.yaml
@@ -18,7 +18,9 @@ binary_sensor:
 - platform: gpio
   pin:
     number: GPIO0
-    mode: INPUT_PULLUP
+    mode:
+      input: true
+      pullup: true
     inverted: true
   name: "Sonoff S20 Button"
   on_press:
diff --git a/devices/sonoff_t1_uk_3gang_v1.1.rst b/devices/sonoff_t1_uk_3gang_v1.1.rst
index a81d1568d..5ddb0b08d 100644
--- a/devices/sonoff_t1_uk_3gang_v1.1.rst
+++ b/devices/sonoff_t1_uk_3gang_v1.1.rst
@@ -246,19 +246,25 @@ of the basic functions.
       - platform: gpio
         pin:
           number: GPIO0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff T1 UK 3 Gang Touchpad 1"
       - platform: gpio
         pin:
           number: GPIO9
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff T1 UK 3 Gang Touchpad 2"
       - platform: gpio
         pin:
           number: GPIO10
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff T1 UK 3 Gang Touchpad 3"
       - platform: status
diff --git a/devices/sonoff_t1_uk_3gang_v1.1.yaml b/devices/sonoff_t1_uk_3gang_v1.1.yaml
index 1a1abc9b8..4bb865f58 100644
--- a/devices/sonoff_t1_uk_3gang_v1.1.yaml
+++ b/devices/sonoff_t1_uk_3gang_v1.1.yaml
@@ -24,7 +24,9 @@ binary_sensor:
   - platform: gpio
     pin:
       number: GPIO0
-      mode: INPUT_PULLUP
+      mode:
+        input: true
+        pullup: true
       inverted: true
     name: "Sonoff T1 UK 3 Gang Touchpad 1"
     on_press:
@@ -32,7 +34,9 @@ binary_sensor:
   - platform: gpio
     pin:
       number: GPIO9
-      mode: INPUT_PULLUP
+      mode:
+        input: true
+        pullup: true
       inverted: true
     name: "Sonoff T1 UK 3 Gang Touchpad 2"
     on_press:
@@ -40,7 +44,9 @@ binary_sensor:
   - platform: gpio
     pin:
       number: GPIO10
-      mode: INPUT_PULLUP
+      mode:
+        input: true
+        pullup: true
       inverted: true
     name: "Sonoff T1 UK 3 Gang Touchpad 3"
     on_press:
diff --git a/devices/sonoff_t3_eu_3gang_v1.0.rst b/devices/sonoff_t3_eu_3gang_v1.0.rst
index e870c5be7..f2e654da5 100644
--- a/devices/sonoff_t3_eu_3gang_v1.0.rst
+++ b/devices/sonoff_t3_eu_3gang_v1.0.rst
@@ -250,19 +250,25 @@ of the basic functions.
       - platform: gpio
         pin:
           number: GPIO0
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff T3 EU 3 Gang Touchpad 1"
       - platform: gpio
         pin:
           number: GPIO9
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff T3 EU 3 Gang Touchpad 2"
       - platform: gpio
         pin:
           number: GPIO10
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
           inverted: true
         name: "Sonoff T3 EU 3 Gang Touchpad 3"
       - platform: status
diff --git a/devices/sonoff_t3_eu_3gang_v1.0.yaml b/devices/sonoff_t3_eu_3gang_v1.0.yaml
index 0e0a6b190..eb31cc0b3 100644
--- a/devices/sonoff_t3_eu_3gang_v1.0.yaml
+++ b/devices/sonoff_t3_eu_3gang_v1.0.yaml
@@ -24,7 +24,9 @@ binary_sensor:
   - platform: gpio
     pin:
       number: GPIO0
-      mode: INPUT_PULLUP
+      mode:
+        input: true
+        pullup: true
       inverted: true
     name: "Sonoff T3 EU 3 Gang Touchpad 1"
     on_press:
@@ -32,7 +34,9 @@ binary_sensor:
   - platform: gpio
     pin:
       number: GPIO9
-      mode: INPUT_PULLUP
+      mode:
+        input: true
+        pullup: true
       inverted: true
     name: "Sonoff T3 EU 3 Gang Touchpad 2"
     on_press:
@@ -40,7 +44,9 @@ binary_sensor:
   - platform: gpio
     pin:
       number: GPIO10
-      mode: INPUT_PULLUP
+      mode:
+        input: true
+        pullup: true
       inverted: true
     name: "Sonoff T3 EU 3 Gang Touchpad 3"
     on_press:
diff --git a/devices/teckin.yaml b/devices/teckin.yaml
index b31395912..05d48bd4b 100644
--- a/devices/teckin.yaml
+++ b/devices/teckin.yaml
@@ -21,7 +21,9 @@ binary_sensor:
     name: "Teckin Button"
     pin:
       number: GPIO1
-      mode: INPUT_PULLUP
+      mode:
+        input: true
+        pullup: true
       inverted: true
     on_press:
       - switch.toggle: relay
diff --git a/guides/creators.rst b/guides/creators.rst
index 2da40be36..6c3027be3 100644
--- a/guides/creators.rst
+++ b/guides/creators.rst
@@ -12,8 +12,12 @@ Example configuration
 
 .. code-block:: yaml
 
+    # These substitutions allow the end user to override certain values
+    substitutions:
+      name: "jesses-temperature-monitor"
+
     esphome:
-      ...
+      name: "${name}"
       # Automatically add the mac address to the name
       # so you can use a single firmware for all devices
       name_add_mac_suffix: true
@@ -26,13 +30,13 @@ Example configuration
 
     # This should point to the public location of this yaml file.
     dashboard_import:
-      package_import_url: github://jesserockz/dummy-esphome-configs@v1/temperature-monitor.yaml
+      package_import_url: github://jesserockz/dummy-esphome-configs/temperature-monitor.yaml@v6
 
     wifi:
       # Set up a wifi access point
       ap:
         ssid: jesses_temperature_monitor
-        password: 12345678
+        password: "12345678"
 
     # In combination with the `ap` this allows the user
     # to provision wifi credentials to the device.
diff --git a/guides/getting_started_command_line.rst b/guides/getting_started_command_line.rst
index 5d836b884..525696804 100644
--- a/guides/getting_started_command_line.rst
+++ b/guides/getting_started_command_line.rst
@@ -19,7 +19,7 @@ Installing ESPHome is very easy. All you need to do is have `Python
 .. note::
 
     Python 3.7 or above is required to install ESPHome 1.18.0 or above.
-    
+
 
 .. code-block:: bash
 
@@ -127,7 +127,9 @@ Sensor </components/binary_sensor/gpio>`.
         pin:
           number: 16
           inverted: true
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
 
 This is an advanced feature of ESPHome. Almost all pins can
 optionally have a more complicated configuration schema with options for
diff --git a/guides/getting_started_hassio.rst b/guides/getting_started_hassio.rst
index 07bf3d071..00f8643ab 100644
--- a/guides/getting_started_hassio.rst
+++ b/guides/getting_started_hassio.rst
@@ -133,7 +133,9 @@ Sensor </components/binary_sensor/gpio>`.
         pin:
           number: 16
           inverted: true
-          mode: INPUT_PULLUP
+          mode:
+            input: true
+            pullup: true
 
 This time when installing, you don’t need to have the device plugged in
 through USB again. The upload will happen wirelessly (:doc:`"over the air" </components/ota>`).
diff --git a/guides/supporters.rst b/guides/supporters.rst
index bc02e754c..940438e72 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -61,7 +61,7 @@ Contributors
 - `Andrzej (@andriej) <https://github.com/andriej>`__
 - `Andreas (@anduchs) <https://github.com/anduchs>`__
 - `anekinloewe (@anekinloewe) <https://github.com/anekinloewe>`__
-- `Angel Nunez Mencias (@angelnu) <https://github.com/angelnu>`__
+- `Vegetto (@angelnu) <https://github.com/angelnu>`__
 - `Sergey Anisimov (@anisimovsergey) <https://github.com/anisimovsergey>`__
 - `ankycooper (@ankycooper) <https://github.com/ankycooper>`__
 - `Nikolay Vasilchuk (@Anonym-tsk) <https://github.com/Anonym-tsk>`__
@@ -121,6 +121,7 @@ Contributors
 - `Christian Taedcke (@chrta) <https://github.com/chrta>`__
 - `Pavel Skuratovich (@Chupaka) <https://github.com/Chupaka>`__
 - `John (@CircuitSetup) <https://github.com/CircuitSetup>`__
+- `Colby Rome (@cisasteelersfan) <https://github.com/cisasteelersfan>`__
 - `Chris Debenham (@cjd) <https://github.com/cjd>`__
 - `CODeRUS (@CODeRUS) <https://github.com/CODeRUS>`__
 - `Cody James (@codyjamestechnical) <https://github.com/codyjamestechnical>`__
@@ -337,7 +338,7 @@ Contributors
 - `Jonathan Adams (@jonathanadams) <https://github.com/jonathanadams>`__
 - `Jonathan Treffler (@JonathanTreffler) <https://github.com/JonathanTreffler>`__
 - `JonnyaiR (@jonnyair) <https://github.com/jonnyair>`__
-- `Joppy Furr (@JoppyFurr) <https://github.com/JoppyFurr>`__
+- `Joppy (@JoppyFurr) <https://github.com/JoppyFurr>`__
 - `jsuanet (@jsuanet) <https://github.com/jsuanet>`__
 - `junnikokuki (@junnikokuki) <https://github.com/junnikokuki>`__
 - `Justahobby01 (@Justahobby01) <https://github.com/Justahobby01>`__
@@ -372,7 +373,7 @@ Contributors
 - `Kodey Converse (@krconv) <https://github.com/krconv>`__
 - `krikk (@krikk) <https://github.com/krikk>`__
 - `KristopherMackowiak (@KristopherMackowiak) <https://github.com/KristopherMackowiak>`__
-- `Stefan Rado (@kroimon) <https://github.com/kroimon>`__
+- `kroimon (@kroimon) <https://github.com/kroimon>`__
 - `krunkel (@krunkel) <https://github.com/krunkel>`__
 - `Kendell R (@KTibow) <https://github.com/KTibow>`__
 - `Jakub Šimo (@kubik369) <https://github.com/kubik369>`__
@@ -550,7 +551,7 @@ Contributors
 - `Leandro Puerari (@puerari) <https://github.com/puerari>`__
 - `puuu (@puuu) <https://github.com/puuu>`__
 - `Qc (@qc24) <https://github.com/qc24>`__
-- `qqgg231 (@qqgg231) <https://github.com/qqgg231>`__
+- `Karol Zlot (@qqgg231) <https://github.com/qqgg231>`__
 - `Tommy Jonsson (@quazzie) <https://github.com/quazzie>`__
 - `Quentin Stafford-Fraser (@quentinsf) <https://github.com/quentinsf>`__
 - `Quinn Hosler (@quinnhosler) <https://github.com/quinnhosler>`__
@@ -628,7 +629,6 @@ Contributors
 - `Luca Zimmermann (@soundstorm) <https://github.com/soundstorm>`__
 - `Sourabh Jaiswal (@sourabhjaiswal) <https://github.com/sourabhjaiswal>`__
 - `Philip Allgaier (@spacegaier) <https://github.com/spacegaier>`__
-- `spattinson (@spattinson) <https://github.com/spattinson>`__
 - `Stephan Peijnik-Steinwender (@speijnik) <https://github.com/speijnik>`__
 - `spilin (@spilin) <https://github.com/spilin>`__
 - `square99 (@square99) <https://github.com/square99>`__
@@ -696,7 +696,7 @@ Contributors
 - `Seppel Hardt (@tuxBurner) <https://github.com/tuxBurner>`__
 - `Thorsten von Eicken (@tve) <https://github.com/tve>`__
 - `Tyler Menezes (@tylermenezes) <https://github.com/tylermenezes>`__
-- `wuuker (@ukewea) <https://github.com/ukewea>`__
+- `ukewea (@ukewea) <https://github.com/ukewea>`__
 - `Vc (@Valcob) <https://github.com/Valcob>`__
 - `Nad (@valordk) <https://github.com/valordk>`__
 - `Víctor Ferrer García (@vicfergar) <https://github.com/vicfergar>`__
@@ -734,4 +734,4 @@ Contributors
 - `ZTX18 (@ZTX18) <https://github.com/ZTX18>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated October 22, 2021.*
+*This page was last updated October 27, 2021.*