diff --git a/Doxygen b/Doxygen
index efa8444d0..3a2980115 100644
--- a/Doxygen
+++ b/Doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.22.0-dev
+PROJECT_NUMBER         = 2021.9.0-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Makefile b/Makefile
index 52927d8d3..c05ce9e7f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = dev
+ESPHOME_REF = 2021.8.0
 
 .PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png
 
diff --git a/_static/changelog-2021.8.0.png b/_static/changelog-2021.8.0.png
new file mode 100644
index 000000000..78c8436d9
Binary files /dev/null and b/_static/changelog-2021.8.0.png differ
diff --git a/_static/version b/_static/version
index c18483163..4a0109790 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-1.22.0-dev
\ No newline at end of file
+2021.9.0-dev
diff --git a/_templates/layout.html b/_templates/layout.html
index eb07f1a6e..4dbf2eb65 100644
--- a/_templates/layout.html
+++ b/_templates/layout.html
@@ -32,7 +32,7 @@
     A new version has been release since you last visited this page: {{ release }} 🎉
     <div class="footer-button-container">
       <div role="button" id="upgrade-footer-dismiss" class="footer-button">Dismiss</div>
-      <a id="upgrade-footer-changelog" class="footer-button" href="/changelog/v{{ version }}.0.html">View Changelog</a>  
+      <a id="upgrade-footer-changelog" class="footer-button" href="/changelog/{{ version }}.0.html">View Changelog</a>
     </div>
   </div>
   <script>
diff --git a/changelog/2021.8.0.rst b/changelog/2021.8.0.rst
new file mode 100644
index 000000000..b1276ff7b
--- /dev/null
+++ b/changelog/2021.8.0.rst
@@ -0,0 +1,282 @@
+ESPHome 2021.8.0 - 18th August 2021
+===================================
+
+.. seo::
+    :description: Changelog for ESPHome 2021.8.0.
+    :image: /_static/changelog-2021.8.0.png
+    :author: ESPHome
+    :author_twitter: @esphome_
+
+.. imgtable::
+    :columns: 4
+
+    AM43, components/sensor/am43, am43.jpg
+    AM43 Cover, components/cover/am43, am43.jpg
+    Color Temperature Light, components/light/color_temperature, brightness-medium.svg
+    Demo, components/demo, description.svg
+    DSMR, components/sensor/dsmr, dsmr.svg
+    HRXL MaxSonar WR, components/sensor/hrxl_maxsonar_wr, hrxl_maxsonar_wr.jpg
+    PipSolar - compatible PV Inverter, components/pipsolar, pipsolar.jpg
+    PM1006 Sensor, components/sensor/pm1006, pm1006.jpg
+    PMSA003I, components/sensor/pmsa003i, pmsa003i.jpg
+    RGBCT Light, components/light/rgbct, rgbw.png
+    SDP3x, components/sensor/sdp3x, sdp31.jpg
+    Selec Meter, components/sensor/selec_meter, selec_meter_em2m.jpg
+    T6613/15, components/sensor/t6615, t6615.png
+    TLC5947, components/output/tlc5947, tlc5947.jpg
+    Select Core, components/select/index, folder-open.svg
+    Template Select, components/select/template, description.svg
+    TSL2591, components/sensor/tsl2591, tsl2591.jpg
+
+
+Since starting monthly cycles, it just made sense to make this release, **ESPHome 2021.8.0**. From now ESPHome will
+be versioned according to the year and month of the release. We hope that this will not confuse everyone too much =).
+
+There are a bunch of new integrations this release as seen above and a few breaking changes below. Hopefully nothing
+has been missed out.
+
+Also, look at that nice sorted and categorized home page of sensors. Thanks to :ghuser:`patfelst` for doing this.
+
+
+Select Entities
+---------------
+
+ESPHome devices can now create :doc:`Select</components/select/index>` entities in Home Assistant. This allows you to
+not have to create ``input_select`` from HA and then import the current option into ESPHome.
+The chosen option can be updated from both sides and will be reflected accordinlgy.
+
+
+Light Color Modes
+-----------------
+
+:ghuser:`oxan` has been at it working hard on getting the all of the light code up to scratch and working
+really well with the latest changes to Home Assistant. This is mostly an internal change, but ESPHome has
+been updated to properly support Home Assistant's color modes for lights. For the most part it mainly
+fixes issues that have come up with the color mode on Home Assistant not doing what people expected in ESPHome.
+
+
+DSMR
+----
+
+:ghuser:`glmnet` and :ghuser:`zuidwijk` have worked together to bring DSMR support to ESPHome.
+This platform allows you to read your DSMR smart meter via the P1 port. Check out the
+`repo <https://github.com/zuidwijk/dsmr>`_ with more info on the hardware required for this.
+
+
+Thermostat Breaking changes
+---------------------------
+
+:ghuser:`kbx81` Has made a few changes to the :doc:`thermostat</components/climate/thermostat>` climate platform
+in :esphomepr:`2032`, :esphomepr:`2073` and :esphomepr:`2114` to allow for the many different use cases that everyone has.
+Unfortunately this means you might need to make some changes to your YAML configuration to utilize the new code.
+
+ - ``hysteresis`` has been replaced with ``cool_deadband``, ``cool_overrun``, ``heat_deadband`` and ``heat_overrun``.
+ - Climate action timers now govern how quickly climate actions may be called:
+
+   - ``min_idle_time`` is required for all configurations.
+   - ``min_cooling_off_time`` and  ``min_cooling_run_time`` are required where cool_action or dry_action is used.
+   - ``min_heating_off_time`` and ``min_heating_run_time`` are required where heat_action is used.
+   - ``min_fanning_off_time`` and ``min_fanning_run_time`` are required where fan_only_action is used.
+   - ``min_fan_mode_switching_time`` is required where any ``fan_mode`` actions (ex.: ``fan_mode_auto_action``, ``fan_mode_on_action``) are used.
+
+
+Anova Souve
+-----------
+
+There is a change with the :doc:`Anova BLE Souve</components/climate/anova>` climate platform that has a new **required**
+config option: ``unit_of_measurement``.
+
+
+Home Assistant Add-on
+---------------------
+
+For a while there has been an option in the Add-on to allow specifying the ``esphome_version``
+which would allow the addon to download a specific version to use. This has been removed
+in this release as it causes more issues than it solves. It may be added back to the ``development`` addon
+**only** in the future if there is demand, but the stable add-ons should stay stable. If you
+need to downgrade the esphome version because a new version does not work the way you expect, then you
+should be using the snapshot/backup feature built into Home Assistant Supervisor to rollback.
+
+
+Full list of changes
+--------------------
+
+New Features
+^^^^^^^^^^^^
+
+- Allow entities to be disabled by default in HA :esphomepr:`2113` by :ghuser:`jesserockz` (new-feature)
+
+New Components
+^^^^^^^^^^^^^^
+
+- Added support for pvvx_mithermometer sensor :esphomepr:`1546` by :ghuser:`pasiz` (new-integration)
+- Added support for Selec Energy Meter :esphomepr:`1993` by :ghuser:`sourabhjaiswal` (new-integration)
+- pm1006: add rx-only support :esphomepr:`2038` by :ghuser:`Habbie` (new-integration)
+- Add SDP3x sensor :esphomepr:`2064` by :ghuser:`Azimath` (new-integration)
+- Add support for the TLC5947 24-Channel, 12-Bit PWM LED Driver :esphomepr:`2066` by :ghuser:`rnauber` (new-integration)
+- Add T6615 :esphomepr:`1170` by :ghuser:`tylermenezes` (new-integration)
+- Add support for the HRXL MaxSonar WR series sensors :esphomepr:`2020` by :ghuser:`netmikey` (new-integration)
+- Add demo integration :esphomepr:`2085` by :ghuser:`OttoWinter` (new-integration)
+- Add select entities and implement template select :esphomepr:`2067` by :ghuser:`jesserockz` (new-integration) (notable-change)
+- Added support for Hitachi AC424 remote type :esphomepr:`2101` by :ghuser:`sourabhjaiswal` (new-integration)
+- Adds CGPR1 - Qingping Motion & Ambient light sensor support :esphomepr:`1675` by :ghuser:`Tommatheussen` (new-integration)
+- Dsmr component :esphomepr:`1881` by :ghuser:`glmnet` (new-integration)
+- Support component tsl2591 :esphomepr:`2131` by :ghuser:`wjcarpenter` (new-integration)
+- Add support for PMSA003i :esphomepr:`1501` by :ghuser:`sjtrny` (new-integration)
+- Add rgbct and color_temperature light platforms :esphomepr:`2138` by :ghuser:`jesserockz` (new-integration)
+- Feature pipsolar anh :esphomepr:`1664` by :ghuser:`andreashergert1984` (new-integration)
+- Support for AM43 BLE blind motors :esphomepr:`1744` by :ghuser:`buxtronix` (new-integration)
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+
+- Merge build flags from platformio_options :esphomepr:`1651` by :ghuser:`trvrnrth` (breaking-change)
+- Color mode implementation :esphomepr:`2012` by :ghuser:`oxan` (notable-change) (breaking-change)
+- Fix parity bit calculation for ESP8266SoftwareSerial :esphomepr:`1873` by :ghuser:`esev` (breaking-change)
+- Dont force 0 state instead of min_power unless explicit config set :esphomepr:`2107` by :ghuser:`jesserockz` (breaking-change)
+- Anova fahrenheit support :esphomepr:`2126` by :ghuser:`buxtronix` (breaking-change)
+- Tidy HA addon :esphomepr:`1937` by :ghuser:`jesserockz` (breaking-change)
+- Thermostat enhancements 2 :esphomepr:`2114` by :ghuser:`kbx81` (breaking-change)
+
+Beta Fixes
+^^^^^^^^^^
+
+- Always send all light state values in API :esphomepr:`2150` by :ghuser:`oxan`
+- Let sensors announce their state_class via mqtt :esphomepr:`2155` by :ghuser:`puuu`
+- Thermostat delayed fan mode fix :esphomepr:`2158` by :ghuser:`kbx81`
+- Fix native API log level enum values :esphomepr:`2151` by :ghuser:`OttoWinter`
+- Initialize color temperature to value within range if possible :esphomepr:`2168` by :ghuser:`oxan`
+- Add a dummy color temp :esphomepr:`2161` by :ghuser:`DotNetDann`
+- Add Gas device class to DSMR component :esphomepr:`2169` by :ghuser:`frenck`
+- Send dirty states when screen wakes up :esphomepr:`2167` by :ghuser:`jesserockz`
+- Remove specified accuracy_decimals from total_daily_energy :esphomepr:`2174` by :ghuser:`jesserockz`
+- Add new total_increasing state-class for Home Assistant 2021.9+ :esphomepr:`2166` by :ghuser:`jesserockz`
+
+Notable Changes
+^^^^^^^^^^^^^^^
+
+- Color mode implementation :esphomepr:`2012` by :ghuser:`oxan` (notable-change) (breaking-change)
+- Add select entities and implement template select :esphomepr:`2067` by :ghuser:`jesserockz` (new-integration) (notable-change)
+
+All changes
+^^^^^^^^^^^
+
+- Always tick mdns in ethernet component :esphomepr:`2018` by :ghuser:`flacjacket`
+- Bump black from 21.6b0 to 21.7b0 :esphomepr:`2031` by :ghuser:`dependabot[bot]`
+- Convert Arduino boolean to bool :esphomepr:`2042` by :ghuser:`jesserockz`
+- Fix ESP32-C3 using v2.0.0-alpha1 support :esphomepr:`2035` by :ghuser:`agners`
+- Bump pylint from 2.8.2 to 2.9.4 :esphomepr:`2047` by :ghuser:`dependabot[bot]`
+- Bump pylint from 2.9.4 to 2.9.5 :esphomepr:`2050` by :ghuser:`dependabot[bot]`
+- Thermostat fixes+updates 1 :esphomepr:`2032` by :ghuser:`kbx81`
+- Add test5 back to CI :esphomepr:`2052` by :ghuser:`jesserockz`
+- Added support for pvvx_mithermometer sensor :esphomepr:`1546` by :ghuser:`pasiz` (new-integration)
+- Added support for Selec Energy Meter :esphomepr:`1993` by :ghuser:`sourabhjaiswal` (new-integration)
+- Add TAG to all compile units :esphomepr:`2060` by :ghuser:`agners`
+- Fix minor build issues with Arduino ESP32 2.0.0-rc1 :esphomepr:`2057` by :ghuser:`agners`
+- Fix clang-format script behaviour without -i + code cleanup :esphomepr:`2002` by :ghuser:`oxan`
+- Merge build flags from platformio_options :esphomepr:`1651` by :ghuser:`trvrnrth` (breaking-change)
+- Print BLE 128-bit UUIDs according to spec :esphomepr:`2061` by :ghuser:`agners`
+- Support library override using named library with repository :esphomepr:`2056` by :ghuser:`agners`
+- Initial ESP32-C3-DevKitM-1 board support :esphomepr:`2062` by :ghuser:`agners`
+- Fix a bunch of typos :esphomepr:`2058` by :ghuser:`oxan`
+- pm1006: add rx-only support :esphomepr:`2038` by :ghuser:`Habbie` (new-integration)
+- Add sensor monetary device_class :esphomepr:`2083` by :ghuser:`OttoWinter`
+- Make light.addressable_set color parameters behave as documented & consistent with elsewhere :esphomepr:`2009` by :ghuser:`oxan`
+- Bump pylint from 2.9.5 to 2.9.6 :esphomepr:`2087` by :ghuser:`dependabot[bot]`
+- Bump ESPAsyncWebServer-esphome to 1.3.0 :esphomepr:`2075` by :ghuser:`agners`
+- Add SDP3x sensor :esphomepr:`2064` by :ghuser:`Azimath` (new-integration)
+- Add support for the TLC5947 24-Channel, 12-Bit PWM LED Driver :esphomepr:`2066` by :ghuser:`rnauber` (new-integration)
+- Add T6615 :esphomepr:`1170` by :ghuser:`tylermenezes` (new-integration)
+- Add support for the HRXL MaxSonar WR series sensors :esphomepr:`2020` by :ghuser:`netmikey` (new-integration)
+- Pull ESP32 Wifi fixes from arduino-esp32 :esphomepr:`2069` by :ghuser:`OttoWinter`
+- Add demo integration :esphomepr:`2085` by :ghuser:`OttoWinter` (new-integration)
+- Add device class support to MQTT cover :esphomepr:`2092` by :ghuser:`krconv`
+- Color mode implementation :esphomepr:`2012` by :ghuser:`oxan` (notable-change) (breaking-change)
+- Convert more code to async-def syntax :esphomepr:`2095` by :ghuser:`OttoWinter`
+- Fix parity bit calculation for ESP8266SoftwareSerial :esphomepr:`1873` by :ghuser:`esev` (breaking-change)
+- Convert sensor_schema to use kwargs :esphomepr:`2094` by :ghuser:`OttoWinter`
+- Fix MQTT light include :esphomepr:`2104` by :ghuser:`OttoWinter`
+- Fix missing include in light_traits.h :esphomepr:`2105` by :ghuser:`jkl1337`
+- Add select entities and implement template select :esphomepr:`2067` by :ghuser:`jesserockz` (new-integration) (notable-change)
+- pmsx003: add standard particle, particle counts :esphomepr:`1694` by :ghuser:`warthog9`
+- Dont force 0 state instead of min_power unless explicit config set :esphomepr:`2107` by :ghuser:`jesserockz` (breaking-change)
+- Fix import :esphomepr:`2108` by :ghuser:`jesserockz`
+- Thermostat enhancements and code clean-up :esphomepr:`2073` by :ghuser:`kbx81`
+- Bump esptool from 2.8 to 3.1 :esphomepr:`1839` by :ghuser:`dependabot[bot]`
+- Add min_save_interval to total_energy/integration for memory wear :esphomepr:`1665` by :ghuser:`andreashergert1984`
+- Add support for Waveshare E-Paper 4.2" B V2 :esphomepr:`1610` by :ghuser:`brettp`
+- Add SM16703 to supported FastLED chipsets :esphomepr:`1751` by :ghuser:`robgridley`
+- Migrate COLOR constants to Color class & disallow implicit conversions to Color :esphomepr:`2093` by :ghuser:`oxan`
+- Add version argument to ESPDEPRECATED macro :esphomepr:`2116` by :ghuser:`oxan`
+- Fix mixup between ColorMode and ColorCapability :esphomepr:`2121` by :ghuser:`oxan`
+- Various follow-up fixes to color mode changes :esphomepr:`2118` by :ghuser:`oxan`
+- Fix crash when using addressable_set with out-of-range indices :esphomepr:`2120` by :ghuser:`oxan`
+- Add state classes to pvvx_mithermometer :esphomepr:`2125` by :ghuser:`jesserockz`
+- Add support for ESP8266 Arduino v3.0.1 :esphomepr:`2128` by :ghuser:`oxan`
+- Drop legacy esphomeyaml command wrapper code :esphomepr:`2130` by :ghuser:`oxan`
+- Allow multiple unnamed libraries :esphomepr:`2132` by :ghuser:`agners`
+- Don't stop effects if brightness goes to zero :esphomepr:`2134` by :ghuser:`oxan`
+- Added support for Hitachi AC424 remote type :esphomepr:`2101` by :ghuser:`sourabhjaiswal` (new-integration)
+- Anova fahrenheit support :esphomepr:`2126` by :ghuser:`buxtronix` (breaking-change)
+- Tidy HA addon :esphomepr:`1937` by :ghuser:`jesserockz` (breaking-change)
+- Removed unused arguments from rgbww code :esphomepr:`2137` by :ghuser:`jesserockz`
+- Only compile protobuf dumping when very verbose logging is enabled :esphomepr:`2139` by :ghuser:`oxan`
+- Refactor clang-tidy script to use actual compiler flags and includes :esphomepr:`2133` by :ghuser:`oxan`
+- Add Toshiba AC generic IR remote protocol :esphomepr:`2019` by :ghuser:`kbx81`
+- Add new Toshiba AC unit protocol :esphomepr:`1987` by :ghuser:`kbx81`
+- Add Dish Network protocol :esphomepr:`2117` by :ghuser:`ianchi`
+- Fix some issues with deprecated argv syntax detection :esphomepr:`2127` by :ghuser:`OttoWinter`
+- Don't discard cold/warm white brightness in constant brightness mode :esphomepr:`2136` by :ghuser:`oxan`
+- Allow entities to be disabled by default in HA :esphomepr:`2113` by :ghuser:`jesserockz` (new-feature)
+- Adds CGPR1 - Qingping Motion & Ambient light sensor support :esphomepr:`1675` by :ghuser:`Tommatheussen` (new-integration)
+- Don't mark COLOR_* constants as static in header :esphomepr:`2141` by :ghuser:`oxan`
+- RFC: status_led: allow to share single light :esphomepr:`1974` by :ghuser:`ianchi`
+- waveshare_epaper: add support for ttgo t5 b74 variant display :esphomepr:`1869` by :ghuser:`osresearch`
+- Thermostat enhancements 2 :esphomepr:`2114` by :ghuser:`kbx81` (breaking-change)
+- Dsmr component :esphomepr:`1881` by :ghuser:`glmnet` (new-integration)
+- Always abort on allocation when out-of-memory :esphomepr:`2129` by :ghuser:`oxan`
+- Support component tsl2591 :esphomepr:`2131` by :ghuser:`wjcarpenter` (new-integration)
+- Add support for PMSA003i :esphomepr:`1501` by :ghuser:`sjtrny` (new-integration)
+- Increase task wdt timeout for ESP32/ESP32-C3 :esphomepr:`2096` by :ghuser:`agners`
+- Format dev temp idedata :esphomepr:`2142` by :ghuser:`OttoWinter`
+- Add rgbct and color_temperature light platforms :esphomepr:`2138` by :ghuser:`jesserockz` (new-integration)
+- Warn if underscore character is used in hostname :esphomepr:`2079` by :ghuser:`davet2001`
+- Break the Tuya set_datapoint_value method into separate methods per datapoint type :esphomepr:`2059` by :ghuser:`nuttytree`
+- Feature pipsolar anh :esphomepr:`1664` by :ghuser:`andreashergert1984` (new-integration)
+- Add deassert_rts_dtr option to force RTS/DTR low when using miniterm :esphomepr:`2089` by :ghuser:`agners`
+- Support for AM43 BLE blind motors :esphomepr:`1744` by :ghuser:`buxtronix` (new-integration)
+- Fix format warning in Tuya component :esphomepr:`1954` by :ghuser:`agners`
+- Modular light transformers :esphomepr:`2124` by :ghuser:`oxan`
+- Support for the DKE screen version of LilyGo-TTGO-T5 V2.3 :esphomepr:`1969` by :ghuser:`blambov`
+- Support multiple configuration directories for update-all subcommand :esphomepr:`1925` by :ghuser:`oxan`
+- Always send all light state values in API :esphomepr:`2150` by :ghuser:`oxan`
+- Let sensors announce their state_class via mqtt :esphomepr:`2155` by :ghuser:`puuu`
+- Thermostat delayed fan mode fix :esphomepr:`2158` by :ghuser:`kbx81`
+- Fix native API log level enum values :esphomepr:`2151` by :ghuser:`OttoWinter`
+- Initialize color temperature to value within range if possible :esphomepr:`2168` by :ghuser:`oxan`
+- Add a dummy color temp :esphomepr:`2161` by :ghuser:`DotNetDann`
+- Add Gas device class to DSMR component :esphomepr:`2169` by :ghuser:`frenck`
+- Send dirty states when screen wakes up :esphomepr:`2167` by :ghuser:`jesserockz`
+- Remove specified accuracy_decimals from total_daily_energy :esphomepr:`2174` by :ghuser:`jesserockz`
+- Add new total_increasing state-class for Home Assistant 2021.9+ :esphomepr:`2166` by :ghuser:`jesserockz`
+
+Past Changelogs
+---------------
+
+.. toctree::
+    :maxdepth: 1
+
+    v1.20.0
+    v1.19.0
+    v1.18.0
+    v1.17.0
+    v1.16.0
+    v1.15.0
+    v1.14.0
+    v1.13.0
+    v1.12.0
+    v1.11.0
+    v1.10.0
+    v1.9.0
+    v1.8.0
+    v1.7.0
diff --git a/changelog/index.rst b/changelog/index.rst
index 46162d129..e457e2f15 100644
--- a/changelog/index.rst
+++ b/changelog/index.rst
@@ -2,7 +2,7 @@ Changelog
 =========
 
 .. redirect::
-    :url: /changelog/v1.20.0.html
+    :url: /changelog/2021.8.0.html
 
 .. toctree::
     :glob:
diff --git a/components/climate/thermostat.rst b/components/climate/thermostat.rst
index 497152156..239ab383c 100644
--- a/components/climate/thermostat.rst
+++ b/components/climate/thermostat.rst
@@ -54,6 +54,11 @@ modes that Home Assistant offers.
         sensor: my_temperature_sensor
         default_target_temperature_low: 20 °C
         default_target_temperature_high: 22 °C
+        min_cooling_off_time: 300s
+        min_cooling_run_time: 300s
+        min_heating_off_time: 300s
+        min_heating_run_time: 300s
+        min_idle_time: 30s
         cool_action:
           - switch.turn_on: air_cond
         heat_action:
@@ -67,8 +72,12 @@ modes that Home Assistant offers.
     # Example single-point configuration entry (for heating only)
     climate:
       - platform: thermostat
+        name: "Thermostat Climate Controller"
         sensor: my_temperature_sensor
         default_target_temperature_low: 20 °C
+        min_heating_off_time: 300s
+        min_heating_run_time: 300s
+        min_idle_time: 30s
         heat_action:
           - switch.turn_on: heater
         idle_action:
@@ -79,8 +88,12 @@ modes that Home Assistant offers.
     # Example single-point configuration entry (for cooling only)
     climate:
       - platform: thermostat
+        name: "Thermostat Climate Controller"
         sensor: my_temperature_sensor
         default_target_temperature_high: 22 °C
+        min_cooling_off_time: 300s
+        min_cooling_run_time: 300s
+        min_idle_time: 30s
         cool_action:
           - switch.turn_on: air_cond
         idle_action:
@@ -330,7 +343,7 @@ Additional Actions/Behavior
   ``supplemental_cooling_action`` will be called repeatedly at an interval defined by this parameter, as well,
   enabling multiple stages of supplemental (auxiliary/emergency) cooling.
 - **max_heating_run_time** (*Required with* ``supplemental_heating_action``, :ref:`config-time`): Duration after
-  which ``supplemental_heating_action`` will be called when heating is active. Note thermostat
+  which ``supplemental_heating_action`` will be called when heating is active. Note that
   ``supplemental_heating_action`` will be called repeatedly at an interval defined by this parameter, as well,
   enabling multiple stages of supplemental (auxiliary/emergency) heating.
 - **min_cooling_off_time** (*Required with* ``cool_action``, :ref:`config-time`): Minimum duration the cooling action
diff --git a/components/esphome.rst b/components/esphome.rst
index a67077009..7f96ef3d2 100644
--- a/components/esphome.rst
+++ b/components/esphome.rst
@@ -165,7 +165,7 @@ is already set up. You can however change this using the ``priority`` parameter.
     esphome:
       # ...
       on_boot:
-        priority: -10
+        priority: 600
         # ...
         then:
           - switch.turn_off: switch_1
@@ -174,7 +174,7 @@ Configuration variables:
 
 - **priority** (*Optional*, float): The priority to execute your custom initialization code. A higher value
   means a high priority and thus also your code being executed earlier. Please note this is an ESPHome-internal
-  value and any change will not be marked as a breaking change. Defaults to ``-10``. Priorities (you can use any value between them too):
+  value and any change will not be marked as a breaking change. Defaults to ``600``. Priorities (you can use any value between them too):
 
   - ``800.0``: This is where all hardware initialization of vital components is executed. For example setting switches
     to their initial state.
diff --git a/components/images/pipsolar.jpg b/components/images/pipsolar.jpg
index 0dc58e43a..74f00cd30 100644
Binary files a/components/images/pipsolar.jpg and b/components/images/pipsolar.jpg differ
diff --git a/components/mqtt.rst b/components/mqtt.rst
index d0e81dbfe..31a64c7fb 100644
--- a/components/mqtt.rst
+++ b/components/mqtt.rst
@@ -16,7 +16,7 @@ Assistant configuration.
 
     When enabling MQTT and you do *not* use the "native API" for Home Assistant, you must
     remove the ``api:`` line from your ESPHome configuration, otherwise the ESP will
-    reboot every 5 minutes because no client connected to the native API.
+    reboot every 15 minutes because no client connected to the native API.
 
 .. code-block:: yaml
 
diff --git a/components/select/index.rst b/components/select/index.rst
index c3cecc4fd..ec0bb3c5a 100644
--- a/components/select/index.rst
+++ b/components/select/index.rst
@@ -116,7 +116,7 @@ advanced stuff (see the full API Reference for more info).
   .. code-block:: cpp
 
       // For example, create a custom log message when an option is selected:
-      ESP_LOGI("main", "Option of my select: %f", id(my_select).state);
+      ESP_LOGI("main", "Option of my select: %s", id(my_select).state.c_str());
 
 See Also
 --------
diff --git a/components/sensor/images/ikea-vindriktning.jpg b/components/sensor/images/ikea-vindriktning.jpg
index a005cf0a4..f7f20d7c7 100644
Binary files a/components/sensor/images/ikea-vindriktning.jpg and b/components/sensor/images/ikea-vindriktning.jpg differ
diff --git a/components/sensor/images/pmsa003i-full.jpg b/components/sensor/images/pmsa003i-full.jpg
index 07b36532b..9adbd3bbb 100644
Binary files a/components/sensor/images/pmsa003i-full.jpg and b/components/sensor/images/pmsa003i-full.jpg differ
diff --git a/components/sensor/images/sdp31.jpg b/components/sensor/images/sdp31.jpg
index f9a776f8b..b653a8f24 100644
Binary files a/components/sensor/images/sdp31.jpg and b/components/sensor/images/sdp31.jpg differ
diff --git a/components/sensor/images/t6615-pins.png b/components/sensor/images/t6615-pins.png
index 0d8eca0a7..2118392ec 100644
Binary files a/components/sensor/images/t6615-pins.png and b/components/sensor/images/t6615-pins.png differ
diff --git a/components/sensor/images/tsl2591-ui.jpg b/components/sensor/images/tsl2591-ui.jpg
index 44f8344b8..9bb49b017 100644
Binary files a/components/sensor/images/tsl2591-ui.jpg and b/components/sensor/images/tsl2591-ui.jpg differ
diff --git a/components/sensor/images/tsl2591.jpg b/components/sensor/images/tsl2591.jpg
index 63ceaeaa0..099c188eb 100644
Binary files a/components/sensor/images/tsl2591.jpg and b/components/sensor/images/tsl2591.jpg differ
diff --git a/components/uart.rst b/components/uart.rst
index 377f6fbc1..b0a11e4ff 100644
--- a/components/uart.rst
+++ b/components/uart.rst
@@ -34,8 +34,8 @@ In some cases only **TX** or **RX** exists as the device at the other end only a
 
 .. note::
 
-    From ESPHome 1.21.0 the ``ESP8266SoftwareSerial`` UART ``write_byte`` function had the parity bit fixed to be correct
-    for the data being sent. This could cause unexpected issues if you are using the Software Serial and have devices that 
+    From ESPHome 2021.8 the ``ESP8266SoftwareSerial`` UART ``write_byte`` function had the parity bit fixed to be correct
+    for the data being sent. This could cause unexpected issues if you are using the Software Serial and have devices that
     explicity check the parity. Most likely you will need to flip the ``parity`` flag in YAML.
 
 
diff --git a/conf.py b/conf.py
index 63d61d93f..2ad024174 100644
--- a/conf.py
+++ b/conf.py
@@ -67,9 +67,9 @@ author = "Otto Winter"
 # built documents.
 #
 # The short X.Y version.
-version = "1.22"
+version = "2021.9"
 # The full version, including alpha/beta/rc tags.
-release = "1.22.0-dev"
+release = "2021.9.0-dev"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/guides/diy.rst b/guides/diy.rst
index dfd704b37..d8811e959 100644
--- a/guides/diy.rst
+++ b/guides/diy.rst
@@ -36,7 +36,7 @@ Blog Posts & Videos
 - `Automated Bathroom Ventilation <https://www.youtube.com/watch?v=weBDnmrQYOs>`__ by `Intermittent Technology <https://intermit.tech>`__
 - `ESPHome MP3 Sound Machine <https://selfhostedhome.com/esp8266-mp3-sound-machine/>`__ by `Self Hosted Home <https://selfhostedhome.com>`__
 - `ESP32 Camera+ESP8266 PIR <https://www.dopebuild.com/i-am-sorry-dave-i-am-unable-to-do-that/>`__ by `Dave Richer <https://dopebuild.com/>`__
-- `Detecting Sound with ESP8266 <https://thibmaek.com/post/detecting-sound-level-using-esp8266-and-esphome>`__ by `Thibault Maekelbergh <https://thibmaek.com>`__
+- `Detecting Sound with ESP8266 <https://thibmaek.com/posts/detecting-sound-level-using-esp8266-and-esphome>`__ by `Thibault Maekelbergh <https://thibmaek.com>`__
 - `SW420 Vibration Sensor with Remote Notifications <https://github.com/rmooreID/Home-Assistant-Appliance-Monitor/>`__ by :ghuser:`rmooreID`
 - `DIY Irrigation Controller (with Internal Scheduler + Lovelace UI) <https://brianhanifin.com/posts/diy-irrigation-controller-esphome-home-assistant/>`__ by :ghuser:`BrianHanifin`
 - `Smart Intercom <https://frog32.ch/smart-intercom.html>`__ by `Marc Egli <https://frog32.ch/>`__
diff --git a/guides/supporters.rst b/guides/supporters.rst
index 0b62a60fd..0f9c6843d 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -56,7 +56,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>`__
@@ -84,6 +84,7 @@ Contributors
 - `Ben Suffolk (@bensuffolk) <https://github.com/bensuffolk>`__
 - `Bierchermuesli (@Bierchermuesli) <https://github.com/Bierchermuesli>`__
 - `JDavid (@blackhack) <https://github.com/blackhack>`__
+- `Branimir Lambov (@blambov) <https://github.com/blambov>`__
 - `Jim Ekman (@blejdfist) <https://github.com/blejdfist>`__
 - `Bob (@Bmooij) <https://github.com/Bmooij>`__
 - `Mauricio Bonani (@bonanitech) <https://github.com/bonanitech>`__
@@ -182,8 +183,10 @@ Contributors
 - `Robert Resch (@edenhaus) <https://github.com/edenhaus>`__
 - `Niclas Larsson (@edge90) <https://github.com/edge90>`__
 - `Eenoo (@Eenoo) <https://github.com/Eenoo>`__
+- `Eli Fidler (@efidler) <https://github.com/efidler>`__
 - `Erwin Kooi (@egeltje) <https://github.com/egeltje>`__
 - `Eike (@ei-ke) <https://github.com/ei-ke>`__
+- `Elazar Leibovich (@elazarl) <https://github.com/elazarl>`__
 - `electrofun-smart (@electrofun-smart) <https://github.com/electrofun-smart>`__
 - `Elkropac (@Elkropac) <https://github.com/Elkropac>`__
 - `elyorkhakimov (@elyorkhakimov) <https://github.com/elyorkhakimov>`__
@@ -265,6 +268,7 @@ Contributors
 - `Hamish Moffatt (@hmoffatt) <https://github.com/hmoffatt>`__
 - `MoA (@honomoa) <https://github.com/honomoa>`__
 - `Hopperpop (@Hopperpop) <https://github.com/Hopperpop>`__
+- `Yang Hau (@HowJMay) <https://github.com/HowJMay>`__
 - `hreintke (@hreintke) <https://github.com/hreintke>`__
 - `Huub Eikens (@huubeikens) <https://github.com/huubeikens>`__
 - `Petr Urbánek (@HyperReap) <https://github.com/HyperReap>`__
@@ -307,7 +311,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>`__
 - `junnikokuki (@junnikokuki) <https://github.com/junnikokuki>`__
 - `Justahobby01 (@Justahobby01) <https://github.com/Justahobby01>`__
 - `Mike Ryan (@justfalter) <https://github.com/justfalter>`__
@@ -340,7 +344,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>`__
@@ -363,6 +367,7 @@ Contributors
 - `Lumpusz (@Lumpusz) <https://github.com/Lumpusz>`__
 - `Luke Fitzgerald (@lwfitzgerald) <https://github.com/lwfitzgerald>`__
 - `Lewis Juggins (@lwis) <https://github.com/lwis>`__
+- `Alex Peters (@Lx) <https://github.com/Lx>`__
 - `Michael Klamminger (@m1ch) <https://github.com/m1ch>`__
 - `M95D (@M95D) <https://github.com/M95D>`__
 - `Marc-Antoine Courteau (@macourteau) <https://github.com/macourteau>`__
@@ -428,8 +433,11 @@ Contributors
 - `Mynasru (@Mynasru) <https://github.com/Mynasru>`__
 - `Niels Ulrik Andersen (@myplacedk) <https://github.com/myplacedk>`__
 - `Kevin Uhlir (@n0bel) <https://github.com/n0bel>`__
+- `n8detar (@n8detar) <https://github.com/n8detar>`__
 - `Erik Näsström (@Naesstrom) <https://github.com/Naesstrom>`__
 - `Oskar Napieraj (@napieraj) <https://github.com/napieraj>`__
+- `ueno (@nayuta-ueno) <https://github.com/nayuta-ueno>`__
+- `Nazar Mokrynskyi (@nazar-pc) <https://github.com/nazar-pc>`__
 - `Bergont Nicolas (@nbergont) <https://github.com/nbergont>`__
 - `Nebula (@nebula-it) <https://github.com/nebula-it>`__
 - `needspeed (@needspeed) <https://github.com/needspeed>`__
@@ -462,11 +470,13 @@ Contributors
 - `Oncleben31 (@oncleben31) <https://github.com/oncleben31>`__
 - `onde2rock (@onde2rock) <https://github.com/onde2rock>`__
 - `Oscar Bolmsten (@oscar-b) <https://github.com/oscar-b>`__
+- `Trammell Hudson (@osresearch) <https://github.com/osresearch>`__
 - `Otamay (@Otamay) <https://github.com/Otamay>`__
 - `Otto Winter (@OttoWinter) <https://github.com/OttoWinter>`__
 - `Oxan van Leeuwen (@oxan) <https://github.com/oxan>`__
 - `Pack3tL0ss (@Pack3tL0ss) <https://github.com/Pack3tL0ss>`__
 - `Pablo Clemente Maseda (@paclema) <https://github.com/paclema>`__
+- `Derrick Lyndon Pallas (@pallas) <https://github.com/pallas>`__
 - `Panuruj Khambanonda (PK) (@panuruj) <https://github.com/panuruj>`__
 - `Pasi Suominen (@pasiz) <https://github.com/pasiz>`__
 - `Paul Deen (@PaulAntonDeen) <https://github.com/PaulAntonDeen>`__
@@ -496,7 +506,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>`__
 - `Quinn Hosler (@quinnhosler) <https://github.com/quinnhosler>`__
 - `r-jordan (@r-jordan) <https://github.com/r-jordan>`__
@@ -537,6 +547,7 @@ Contributors
 - `RubyBailey (@RubyBailey) <https://github.com/RubyBailey>`__
 - `rudgr (@rudgr) <https://github.com/rudgr>`__
 - `Roberto Wagner (@rwagnervm) <https://github.com/rwagnervm>`__
+- `rweather (@rweather) <https://github.com/rweather>`__
 - `ryanalden (@ryanalden) <https://github.com/ryanalden>`__
 - `Ryan Nazaretian (@ryannazaretian) <https://github.com/ryannazaretian>`__
 - `samnewman86 (@samnewman86) <https://github.com/samnewman86>`__
@@ -598,6 +609,7 @@ Contributors
 - `Mateusz Soszyński (@TheLastGimbus) <https://github.com/TheLastGimbus>`__
 - `Andrew Quested (@thenameiwantedwastaken) <https://github.com/thenameiwantedwastaken>`__
 - `Zixuan Wang (@TheNetAdmin) <https://github.com/TheNetAdmin>`__
+- `Dominik Bruhn (@theomega) <https://github.com/theomega>`__
 - `Simon (@theOzzieRat) <https://github.com/theOzzieRat>`__
 - `Florian Gareis (@TheZoker) <https://github.com/TheZoker>`__
 - `Thomas Klingbeil (@thomasklingbeil) <https://github.com/thomasklingbeil>`__
@@ -615,6 +627,7 @@ Contributors
 - `TomFahey (@TomFahey) <https://github.com/TomFahey>`__
 - `Tommy Kihlstrøm (@tomludd) <https://github.com/tomludd>`__
 - `tomlut (@tomlut) <https://github.com/tomlut>`__
+- `Tom Matheussen (@Tommatheussen) <https://github.com/Tommatheussen>`__
 - `Tom Price (@tomtom5152) <https://github.com/tomtom5152>`__
 - `David Kiliani (@torfbolt) <https://github.com/torfbolt>`__
 - `Torwag (@torwag) <https://github.com/torwag>`__
@@ -633,7 +646,7 @@ Contributors
 - `Thorsten von Eicken (@tve) <https://github.com/tve>`__
 - `Tyler Menezes (@tylermenezes) <https://github.com/tylermenezes>`__
 - `tyomikh (@tyomikh) <https://github.com/tyomikh>`__
-- `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>`__
@@ -669,6 +682,7 @@ Contributors
 - `ZabojnikM (@ZabojnikM) <https://github.com/ZabojnikM>`__
 - `zaluthar (@zaluthar) <https://github.com/zaluthar>`__
 - `San (@zhujunsan) <https://github.com/zhujunsan>`__
+- `ZTX18 (@ZTX18) <https://github.com/ZTX18>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated August 4, 2021.*
+*This page was last updated August 18, 2021.*
diff --git a/images/hero.png b/images/hero.png
index ea0f6a2de..0d9347459 100644
Binary files a/images/hero.png and b/images/hero.png differ
diff --git a/images/pipsolar.jpg b/images/pipsolar.jpg
index 0dc58e43a..74f00cd30 100644
Binary files a/images/pipsolar.jpg and b/images/pipsolar.jpg differ
diff --git a/images/pmsa003i.jpg b/images/pmsa003i.jpg
index e25f34e1a..861eda329 100644
Binary files a/images/pmsa003i.jpg and b/images/pmsa003i.jpg differ
diff --git a/images/sdp31.jpg b/images/sdp31.jpg
index f9a776f8b..b653a8f24 100644
Binary files a/images/sdp31.jpg and b/images/sdp31.jpg differ