diff --git a/_static/disqus.js b/_static/disqus.js
new file mode 100644
index 000000000..ce9c941e8
--- /dev/null
+++ b/_static/disqus.js
@@ -0,0 +1,13 @@
+(function() {
+  var d = document, s = d.createElement('script');
+  s.src = 'https://esphomelib.disqus.com/embed.js';
+  s.setAttribute('data-timestamp', +new Date());
+  (d.head || d.body).appendChild(s);
+})();
+
+var disqus_config = function () {
+  let disqusThread = document.getElementById("disqus_thread");
+  if (disqusThread === null)
+    return;
+  this.page.identifier = disqusThread.getAttribute('data-disqus-identifier');
+};
diff --git a/changelog/v1.10.0.rst b/changelog/v1.10.0.rst
index d12d28d91..13b4b5f4c 100644
--- a/changelog/v1.10.0.rst
+++ b/changelog/v1.10.0.rst
@@ -249,3 +249,5 @@ Past Changelogs
     v1.9.0
     v1.8.0
     v1.7.0
+
+.. disqus::
diff --git a/changelog/v1.11.0.rst b/changelog/v1.11.0.rst
index b1df15f34..dcc0d4fc4 100644
--- a/changelog/v1.11.0.rst
+++ b/changelog/v1.11.0.rst
@@ -293,3 +293,5 @@ Past Changelogs
     v1.9.0
     v1.8.0
     v1.7.0
+
+.. disqus::
diff --git a/changelog/v1.7.0.rst b/changelog/v1.7.0.rst
index cb8a3fa0a..618a3a0d4 100644
--- a/changelog/v1.7.0.rst
+++ b/changelog/v1.7.0.rst
@@ -192,3 +192,5 @@ for using esphomeyaml to create a simple wireless doorbell:
 
     <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/xCQoOZNdaGY"
             frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+.. disqus::
diff --git a/changelog/v1.8.0.rst b/changelog/v1.8.0.rst
index 6dc36a9b4..61e1046af 100644
--- a/changelog/v1.8.0.rst
+++ b/changelog/v1.8.0.rst
@@ -228,3 +228,5 @@ Changes in 1.8.2
 - esphomedocs: WiFi: Add power save mode option `#41 <https://github.com/OttoWinter/esphomedocs/pull/41>`__
 - esphomedocs: Add SSD1306 64x48 Display `#27 <https://github.com/OttoWinter/esphomedocs/pull/27>`__
 - esphomeyaml: WiFi: Add power save mode option `#150 <https://github.com/OttoWinter/esphomeyaml/pull/150>`__
+
+.. disqus::
diff --git a/changelog/v1.9.0.rst b/changelog/v1.9.0.rst
index da0ef4f34..56edc5752 100644
--- a/changelog/v1.9.0.rst
+++ b/changelog/v1.9.0.rst
@@ -336,3 +336,5 @@ Past Changelogs
 
     v1.8.0
     v1.7.0
+
+.. disqus::
diff --git a/components/api.rst b/components/api.rst
index 3ade06dc7..62a699890 100644
--- a/components/api.rst
+++ b/components/api.rst
@@ -180,3 +180,5 @@ See Also
 
 - :apiref:`api/api_server.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/custom.rst b/components/binary_sensor/custom.rst
index 0bed6c817..40f34e6c3 100644
--- a/components/binary_sensor/custom.rst
+++ b/components/binary_sensor/custom.rst
@@ -70,3 +70,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/esp32_ble_tracker.rst b/components/binary_sensor/esp32_ble_tracker.rst
index 6107df403..193a1bce7 100644
--- a/components/binary_sensor/esp32_ble_tracker.rst
+++ b/components/binary_sensor/esp32_ble_tracker.rst
@@ -65,3 +65,5 @@ See Also
 - :apiref:`esp32_ble_tracker.h`
 - `ESP32 BLE for Arduino <https://github.com/nkolban/ESP32_BLE_Arduino>`__ by `Neil Kolban <https://github.com/nkolban>`__.
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/esp32_touch.rst b/components/binary_sensor/esp32_touch.rst
index 19f2ed8fa..b80c00e21 100644
--- a/components/binary_sensor/esp32_touch.rst
+++ b/components/binary_sensor/esp32_touch.rst
@@ -158,3 +158,5 @@ See Also
 - :apiref:`binary_sensor/esp32_touch_binary_sensor.h`
 - `esp-idf Touch Sensor API <https://esp-idf.readthedocs.io/en/latest/api-reference/peripherals/touch_pad.html>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/gpio.rst b/components/binary_sensor/gpio.rst
index fb40d1612..6fe700a6d 100644
--- a/components/binary_sensor/gpio.rst
+++ b/components/binary_sensor/gpio.rst
@@ -100,3 +100,5 @@ See Also
 - :ref:`config-pin_schema`
 - :apiref:`binary_sensor/gpio_binary_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/homeassistant.rst b/components/binary_sensor/homeassistant.rst
index 450709669..f936aa76a 100644
--- a/components/binary_sensor/homeassistant.rst
+++ b/components/binary_sensor/homeassistant.rst
@@ -30,3 +30,5 @@ See Also
 - :ref:`automation`
 - :apiref:`binary_sensor/homeassistant_binary_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/index.rst b/components/binary_sensor/index.rst
index 7b056e79c..9a79a7ff2 100644
--- a/components/binary_sensor/index.rst
+++ b/components/binary_sensor/index.rst
@@ -340,3 +340,5 @@ See Also
     :glob:
 
     *
+
+.. disqus::
diff --git a/components/binary_sensor/nextion.rst b/components/binary_sensor/nextion.rst
index b49df0152..8d950ff5e 100644
--- a/components/binary_sensor/nextion.rst
+++ b/components/binary_sensor/nextion.rst
@@ -40,3 +40,5 @@ See Also
 - :doc:`index`
 - :apiref:`display/nextion.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/pn532.rst b/components/binary_sensor/pn532.rst
index c2818d6ec..a32d3b623 100644
--- a/components/binary_sensor/pn532.rst
+++ b/components/binary_sensor/pn532.rst
@@ -144,3 +144,5 @@ See Also
 - :doc:`rdm6300`
 - :apiref:`binary_sensor/pn532_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/rdm6300.rst b/components/binary_sensor/rdm6300.rst
index 6faab6c39..e52722038 100644
--- a/components/binary_sensor/rdm6300.rst
+++ b/components/binary_sensor/rdm6300.rst
@@ -106,3 +106,5 @@ See Also
 - :doc:`/components/binary_sensor/index`
 - :apiref:`binary_sensor/rdm6300_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/remote_receiver.rst b/components/binary_sensor/remote_receiver.rst
index 3def3ed33..7c9fde913 100644
--- a/components/binary_sensor/remote_receiver.rst
+++ b/components/binary_sensor/remote_receiver.rst
@@ -125,3 +125,5 @@ See Also
 - `IRRemoteESP8266 <https://github.com/markszabo/IRremoteESP8266/>`__ by `Mark Szabo-Simon <https://github.com/markszabo>`__
 - :apiref:`remote/remote_receiver.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/status.rst b/components/binary_sensor/status.rst
index a889ef50a..1911086b4 100644
--- a/components/binary_sensor/status.rst
+++ b/components/binary_sensor/status.rst
@@ -33,3 +33,5 @@ See Also
 - :doc:`/components/mqtt`
 - :apiref:`binary_sensor/status_binary_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/binary_sensor/template.rst b/components/binary_sensor/template.rst
index fac7d8b00..0a39012f7 100644
--- a/components/binary_sensor/template.rst
+++ b/components/binary_sensor/template.rst
@@ -92,3 +92,5 @@ See Also
 - :ref:`automation`
 - :apiref:`binary_sensor/template_binary_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/cover/index.rst b/components/cover/index.rst
index 90bf8dc69..382dababe 100644
--- a/components/cover/index.rst
+++ b/components/cover/index.rst
@@ -109,3 +109,5 @@ See Also
     :glob:
 
     *
+
+.. disqus::
diff --git a/components/cover/template.rst b/components/cover/template.rst
index 5ac4c16e5..39bcf552e 100644
--- a/components/cover/template.rst
+++ b/components/cover/template.rst
@@ -115,3 +115,5 @@ See Also
 - :doc:`/cookbook/garage-door`
 - :apiref:`cover/template_cover.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/debug.rst b/components/debug.rst
index 5e0768bba..40664858d 100644
--- a/components/debug.rst
+++ b/components/debug.rst
@@ -30,3 +30,5 @@ See Also
 - :doc:`logger`
 - :apiref:`debug_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/deep_sleep.rst b/components/deep_sleep.rst
index 8e910b19a..754f7b793 100644
--- a/components/deep_sleep.rst
+++ b/components/deep_sleep.rst
@@ -130,3 +130,5 @@ See Also
 - :ref:`automation`
 - :apiref:`deep_sleep_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/display/index.rst b/components/display/index.rst
index 1ce22271f..a5f8d8010 100644
--- a/components/display/index.rst
+++ b/components/display/index.rst
@@ -429,3 +429,5 @@ See Also
     :glob:
 
     *
+
+.. disqus::
diff --git a/components/display/lcd_display.rst b/components/display/lcd_display.rst
index 58e1e6e73..0e5582ed6 100644
--- a/components/display/lcd_display.rst
+++ b/components/display/lcd_display.rst
@@ -167,3 +167,5 @@ See Also
 - :apiref:`display/lcd_display.h`
 - `Arduino LiquidCrystal Library <https://www.arduino.cc/en/Reference/LiquidCrystal>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/display/max7219.rst b/components/display/max7219.rst
index cf55be878..09c234c2f 100644
--- a/components/display/max7219.rst
+++ b/components/display/max7219.rst
@@ -333,3 +333,5 @@ See Also
 - :apiref:`display/max7219.h`
 - `MAX7219 Library <https://github.com/nickgammon/MAX7219>`__ by `Nick Gammon <https://github.com/nickgammon>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/display/nextion.rst b/components/display/nextion.rst
index b2c4d1e6f..47e0c3668 100644
--- a/components/display/nextion.rst
+++ b/components/display/nextion.rst
@@ -86,3 +86,5 @@ See Also
 - `Simple Nextion Library <https://github.com/bborncr/nextion>`__ by `Bentley Born <https://github.com/bborncr>`__
 - `Official Nextion Library <https://github.com/itead/ITEADLIB_Arduino_Nextion>`__ by `iTead <https://www.itead.cc/>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/display/ssd1306.rst b/components/display/ssd1306.rst
index fb594ef5c..da9ec08e0 100644
--- a/components/display/ssd1306.rst
+++ b/components/display/ssd1306.rst
@@ -148,3 +148,5 @@ See Also
 - :apiref:`display/ssd1306.h`
 - `SSD1306 Library <https://github.com/adafruit/Adafruit_SSD1306>`__ by `Adafruit <https://www.adafruit.com/>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/display/waveshare_epaper.rst b/components/display/waveshare_epaper.rst
index 0041c11a9..09a13b03d 100644
--- a/components/display/waveshare_epaper.rst
+++ b/components/display/waveshare_epaper.rst
@@ -102,3 +102,5 @@ See Also
 - :apiref:`display/waveshare_epaper.h`
 - `Arduino Waveshare E-Paper library <https://github.com/soonuse/epd-library-arduino>`__ by `Yehui (@soonuse) <https://github.com/soonuse>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/esp32_ble_beacon.rst b/components/esp32_ble_beacon.rst
index a147dc200..04b175f8e 100644
--- a/components/esp32_ble_beacon.rst
+++ b/components/esp32_ble_beacon.rst
@@ -76,3 +76,5 @@ See Also
 - :apiref:`esp32_ble_beacon.h`
 - `ESP32 BLE for Arduino <https://github.com/nkolban/ESP32_BLE_Arduino>`__ by `Neil Kolban <https://github.com/nkolban>`__.
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/esp32_ble_tracker.rst b/components/esp32_ble_tracker.rst
index 16f55ea08..cd91aca1d 100644
--- a/components/esp32_ble_tracker.rst
+++ b/components/esp32_ble_tracker.rst
@@ -68,3 +68,5 @@ See Also
 - :apiref:`esp32_ble_tracker.h`
 - `ESP32 BLE for Arduino <https://github.com/nkolban/ESP32_BLE_Arduino>`__ by `Neil Kolban <https://github.com/nkolban>`__.
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/esphome.rst b/components/esphome.rst
index 92ab14172..cd07661bf 100644
--- a/components/esphome.rst
+++ b/components/esphome.rst
@@ -265,3 +265,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/ethernet.rst b/components/ethernet.rst
index 37e1104c2..971fe0bb0 100644
--- a/components/ethernet.rst
+++ b/components/ethernet.rst
@@ -89,3 +89,5 @@ See Also
 
 - :apiref:`wifi_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/fan/binary.rst b/components/fan/binary.rst
index 7cf5ba982..6e444067b 100644
--- a/components/fan/binary.rst
+++ b/components/fan/binary.rst
@@ -39,3 +39,5 @@ See Also
 - :doc:`/components/fan/index`
 - :apiref:`fan/fan_state.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/fan/index.rst b/components/fan/index.rst
index e76c74a16..a1995959e 100644
--- a/components/fan/index.rst
+++ b/components/fan/index.rst
@@ -106,3 +106,5 @@ Full Fan Index
     :glob:
 
     *
+
+.. disqus::
diff --git a/components/fan/speed.rst b/components/fan/speed.rst
index e2d336b55..98581d81f 100644
--- a/components/fan/speed.rst
+++ b/components/fan/speed.rst
@@ -50,3 +50,5 @@ See Also
 - :doc:`/components/output/pca9685`
 - :apiref:`fan/fan_state.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/i2c.rst b/components/i2c.rst
index 61ddd97e0..acd3c1bc8 100644
--- a/components/i2c.rst
+++ b/components/i2c.rst
@@ -44,3 +44,5 @@ See Also
 
 - :apiref:`i2c_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/light/binary.rst b/components/light/binary.rst
index 31793a316..f7024b5ac 100644
--- a/components/light/binary.rst
+++ b/components/light/binary.rst
@@ -44,3 +44,5 @@ See Also
 - :doc:`/components/power_supply`
 - :apiref:`light/light_state.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/light/cwww.rst b/components/light/cwww.rst
index c99f63b06..baa9bfefe 100644
--- a/components/light/cwww.rst
+++ b/components/light/cwww.rst
@@ -56,3 +56,5 @@ See Also
 - :doc:`/components/output/pca9685`
 - :apiref:`light/light_state.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/light/fastled.rst b/components/light/fastled.rst
index fb9e4d68c..c33034012 100644
--- a/components/light/fastled.rst
+++ b/components/light/fastled.rst
@@ -175,3 +175,5 @@ See Also
 - :apiref:`light/fastled_light_output.h`
 - `Arduino FastLED library <https://github.com/FastLED/FastLED>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/light/index.rst b/components/light/index.rst
index 7a5bffd72..d6d27dc8d 100644
--- a/components/light/index.rst
+++ b/components/light/index.rst
@@ -554,3 +554,5 @@ See Also
     :glob:
 
     *
+
+.. disqus::
diff --git a/components/light/monochromatic.rst b/components/light/monochromatic.rst
index e871ba0a3..9b2bb2c4d 100644
--- a/components/light/monochromatic.rst
+++ b/components/light/monochromatic.rst
@@ -67,3 +67,5 @@ See Also
 - :doc:`/components/output/my9231`
 - :apiref:`light/light_state.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/light/neopixelbus.rst b/components/light/neopixelbus.rst
index d68b94833..7c4065335 100644
--- a/components/light/neopixelbus.rst
+++ b/components/light/neopixelbus.rst
@@ -99,3 +99,5 @@ See Also
 - :apiref:`light/neo_pixel_light_output.h`
 - `NeoPixelBus library <https://github.com/Makuna/NeoPixelBus/wiki/ESP8266-NeoMethods>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/light/partition.rst b/components/light/partition.rst
index a81e14e25..00ed09381 100644
--- a/components/light/partition.rst
+++ b/components/light/partition.rst
@@ -65,3 +65,5 @@ See Also
 - :doc:`/components/light/neopixelbus`
 - :apiref:`light/addressable_light.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/light/rgb.rst b/components/light/rgb.rst
index 417be8c43..5a730ac19 100644
--- a/components/light/rgb.rst
+++ b/components/light/rgb.rst
@@ -70,3 +70,5 @@ See Also
 - :doc:`/components/output/my9231`
 - :apiref:`light/light_state.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/light/rgbw.rst b/components/light/rgbw.rst
index 9efa8ffb2..4c442e110 100644
--- a/components/light/rgbw.rst
+++ b/components/light/rgbw.rst
@@ -50,3 +50,5 @@ See Also
 - :doc:`/components/output/my9231`
 - :apiref:`light/light_state.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/light/rgbww.rst b/components/light/rgbww.rst
index e3c35f182..253fd50df 100644
--- a/components/light/rgbww.rst
+++ b/components/light/rgbww.rst
@@ -61,3 +61,5 @@ See Also
 - :doc:`/components/output/my9231`
 - :apiref:`light/light_state.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/logger.rst b/components/logger.rst
index 625f43c47..48fe6826a 100644
--- a/components/logger.rst
+++ b/components/logger.rst
@@ -159,3 +159,5 @@ See Also
 - :doc:`/components/uart`
 - :apiref:`log_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/mqtt.rst b/components/mqtt.rst
index f9fff8ed0..949cfcc25 100644
--- a/components/mqtt.rst
+++ b/components/mqtt.rst
@@ -499,3 +499,5 @@ See Also
 
 - :apiref:`mqtt/mqtt_client_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/ota.rst b/components/ota.rst
index c525e02e2..21df1fad1 100644
--- a/components/ota.rst
+++ b/components/ota.rst
@@ -65,3 +65,5 @@ See Also
 
 - :apiref:`ota_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/output/custom.rst b/components/output/custom.rst
index 8e5c473d5..af84ed036 100644
--- a/components/output/custom.rst
+++ b/components/output/custom.rst
@@ -90,3 +90,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/output/esp8266_pwm.rst b/components/output/esp8266_pwm.rst
index f6e1f47fc..b8939008e 100644
--- a/components/output/esp8266_pwm.rst
+++ b/components/output/esp8266_pwm.rst
@@ -44,3 +44,5 @@ See Also
 - :doc:`/components/power_supply`
 - :apiref:`output/esp8266_pwm_output.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/output/gpio.rst b/components/output/gpio.rst
index 16ee9b805..98255ad60 100644
--- a/components/output/gpio.rst
+++ b/components/output/gpio.rst
@@ -42,3 +42,5 @@ See Also
 - :doc:`/components/power_supply`
 - :apiref:`output/gpio_binary_output_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/output/index.rst b/components/output/index.rst
index be3e0f3f3..c19c0eefb 100644
--- a/components/output/index.rst
+++ b/components/output/index.rst
@@ -132,3 +132,5 @@ Full Output Index
     :glob:
 
     *
+
+.. disqus::
diff --git a/components/output/ledc.rst b/components/output/ledc.rst
index 3297d12a7..a7420f528 100644
--- a/components/output/ledc.rst
+++ b/components/output/ledc.rst
@@ -51,3 +51,5 @@ See Also
 - :apiref:`output/ledc_output_component.h`
 - `esp-idf LEDC API docs <https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/peripherals/ledc.html>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/output/my9231.rst b/components/output/my9231.rst
index e585006b6..9408cb6f9 100644
--- a/components/output/my9231.rst
+++ b/components/output/my9231.rst
@@ -184,3 +184,5 @@ See Also
 - :apiref:`output/my9231_output_component.h`
 - `MY92XX LED driver library for Arduino AVR and ESP8266 <https://github.com/xoseperez/my92xx>`__ by `@xoseperez <https://github.com/xoseperez>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/output/pca9685.rst b/components/output/pca9685.rst
index 1cc26c9c8..6231a30f0 100644
--- a/components/output/pca9685.rst
+++ b/components/output/pca9685.rst
@@ -93,3 +93,5 @@ See Also
 - :apiref:`output/pca9685_output_component.h`
 - `PCA9685 Arduino Library <https://github.com/NachtRaveVL/PCA9685-Arduino>`__ by `@NachtRaveVL <https://github.com/NachtRaveVL>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/pcf8574.rst b/components/pcf8574.rst
index f0013d947..1f71c3386 100644
--- a/components/pcf8574.rst
+++ b/components/pcf8574.rst
@@ -64,3 +64,5 @@ See Also
 - `PCF8574 Arduino Library <https://github.com/skywodd/pcf8574_arduino_library>`__ by `Fabien Batteix <https://github.com/skywodd>`__
 - :apiref:`io/pcf8574_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/power_supply.rst b/components/power_supply.rst
index e268a2111..15690bf9c 100644
--- a/components/power_supply.rst
+++ b/components/power_supply.rst
@@ -71,3 +71,5 @@ See Also
 - :doc:`output/index`
 - :apiref:`power_supply_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/adc.rst b/components/sensor/adc.rst
index d9ec0f08c..899829d09 100644
--- a/components/sensor/adc.rst
+++ b/components/sensor/adc.rst
@@ -82,3 +82,5 @@ See Also
 - :doc:`max6675`
 - :apiref:`sensor/adc.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/ads1115.rst b/components/sensor/ads1115.rst
index 5da9efe89..cc3362c89 100644
--- a/components/sensor/ads1115.rst
+++ b/components/sensor/ads1115.rst
@@ -122,3 +122,5 @@ See Also
 - :apiref:`sensor/ads1115_component.h`
 - `i2cdevlib <https://github.com/jrowberg/i2cdevlib>`__ by `Jeff Rowberg <https://github.com/jrowberg>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/apds9960.rst b/components/sensor/apds9960.rst
index 0527084bc..dcdeafe2b 100644
--- a/components/sensor/apds9960.rst
+++ b/components/sensor/apds9960.rst
@@ -82,3 +82,5 @@ See Also
 - :ref:`sensor-filters`
 - :apiref:`sensor/apds9960.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/bh1750.rst b/components/sensor/bh1750.rst
index 75fb614c1..41d48821c 100644
--- a/components/sensor/bh1750.rst
+++ b/components/sensor/bh1750.rst
@@ -56,3 +56,5 @@ See Also
 - :apiref:`sensor/bh7150_sensor.h`
 - `BH1750 Library <https://github.com/claws/BH1750>`__ by `@claws <https://github.com/claws>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/ble_rssi.rst b/components/sensor/ble_rssi.rst
index dbf4ddc52..be8a1bebb 100644
--- a/components/sensor/ble_rssi.rst
+++ b/components/sensor/ble_rssi.rst
@@ -37,3 +37,5 @@ See Also
 - :doc:`/components/sensor/index`
 - :apiref:`esp32_ble_tracker.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/bme280.rst b/components/sensor/bme280.rst
index 55fdf7c32..9cf1c5514 100644
--- a/components/sensor/bme280.rst
+++ b/components/sensor/bme280.rst
@@ -95,3 +95,5 @@ See Also
 - `Adafruit BME280 Library <https://github.com/adafruit/Adafruit_BME280_Library>`__ by `Adafruit <https://www.adafruit.com/>`__
 - `Sparkfun BME280 Library <https://github.com/sparkfun/SparkFun_BME280_Arduino_Library>`__ by `Sparkfun <https://www.sparkfun.com/>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/bme680.rst b/components/sensor/bme680.rst
index ffc7a804e..e0caf1ede 100644
--- a/components/sensor/bme680.rst
+++ b/components/sensor/bme680.rst
@@ -112,3 +112,5 @@ See Also
 - :apiref:`sensor/bme680_component.h`
 - `BME680 Sensor API <https://github.com/BoschSensortec/BME680_driver>`__ by `Bosch Sensortec <https://www.bosch-sensortec.com/>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/bmp085.rst b/components/sensor/bmp085.rst
index ac27d0593..a3f33f792 100644
--- a/components/sensor/bmp085.rst
+++ b/components/sensor/bmp085.rst
@@ -65,3 +65,5 @@ See Also
 - :apiref:`sensor/bmp085_component.h`
 - `i2cdevlib <https://github.com/jrowberg/i2cdevlib>`__ by `Jeff Rowberg <https://github.com/jrowberg>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/bmp280.rst b/components/sensor/bmp280.rst
index 61b23450c..60e50def6 100644
--- a/components/sensor/bmp280.rst
+++ b/components/sensor/bmp280.rst
@@ -91,3 +91,5 @@ See Also
 - :apiref:`sensor/bmp280_component.h`
 - `BMP280 Library <https://github.com/adafruit/Adafruit_BMP280_Library>`__ by `Adafruit <https://www.adafruit.com/>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/cse7766.rst b/components/sensor/cse7766.rst
index 8f544804b..e0f415c23 100644
--- a/components/sensor/cse7766.rst
+++ b/components/sensor/cse7766.rst
@@ -58,3 +58,5 @@ See Also
 - :ref:`sensor-filters`
 - :apiref:`sensor/cse7766.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/custom.rst b/components/sensor/custom.rst
index 39bd1939d..b37c618ff 100644
--- a/components/sensor/custom.rst
+++ b/components/sensor/custom.rst
@@ -371,3 +371,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/dallas.rst b/components/sensor/dallas.rst
index f0a4d0b31..fe8516ec7 100644
--- a/components/sensor/dallas.rst
+++ b/components/sensor/dallas.rst
@@ -153,3 +153,5 @@ See Also
   by `Miles Burton <https://github.com/milesburton>`__
 - :apiref:`sensor/dallas_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/dht.rst b/components/sensor/dht.rst
index 3350669f5..aafdc98de 100644
--- a/components/sensor/dht.rst
+++ b/components/sensor/dht.rst
@@ -86,3 +86,5 @@ See Also
 - :apiref:`sensor/dht_component.h`
 - `Arduino DHTLib <https://playground.arduino.cc/Main/DHTLib>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/dht12.rst b/components/sensor/dht12.rst
index 05871e9d7..514db6d9b 100644
--- a/components/sensor/dht12.rst
+++ b/components/sensor/dht12.rst
@@ -62,3 +62,5 @@ See Also
 - :apiref:`sensor/dht12_component.h`
 - `DHT12 Library <https://github.com/dplasa/dht>`__ by `Daniel Plasa <https://github.com/dplasa>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/duty_cycle.rst b/components/sensor/duty_cycle.rst
index 77ff19294..07443e21d 100644
--- a/components/sensor/duty_cycle.rst
+++ b/components/sensor/duty_cycle.rst
@@ -39,3 +39,5 @@ See Also
 - :ref:`sensor-filters`
 - :apiref:`sensor/duty_cycle_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/esp32_hall.rst b/components/sensor/esp32_hall.rst
index 5e84c348e..11c33efe2 100644
--- a/components/sensor/esp32_hall.rst
+++ b/components/sensor/esp32_hall.rst
@@ -53,3 +53,5 @@ See Also
 - :doc:`/devices/esp32`
 - :apiref:`sensor/esp32_hall_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/hdc1080.rst b/components/sensor/hdc1080.rst
index c56086dcf..f66ce9c4c 100644
--- a/components/sensor/hdc1080.rst
+++ b/components/sensor/hdc1080.rst
@@ -69,3 +69,5 @@ See Also
 - :apiref:`sensor/hdc1080_component.h`
 - `HDC1080 Library <https://github.com/closedcube/ClosedCube_HDC1080_Arduino>`__ by `ClosedCube <https://www.tindie.com/stores/closedcube/>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/hlw8012.rst b/components/sensor/hlw8012.rst
index 6c8df149e..71932345f 100644
--- a/components/sensor/hlw8012.rst
+++ b/components/sensor/hlw8012.rst
@@ -65,3 +65,5 @@ See Also
 - :apiref:`sensor/hlw8012.h`
 - `HLW8012 Library <https://github.com/xoseperez/hlw8012>`__ by `Xose Pérez <https://github.com/xoseperez>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/hmc5883l.rst b/components/sensor/hmc5883l.rst
index 5af1b5b75..bb0e85906 100644
--- a/components/sensor/hmc5883l.rst
+++ b/components/sensor/hmc5883l.rst
@@ -56,3 +56,5 @@ See Also
 - :apiref:`sensor/hmc5883l.h`
 - `HMC5883L Library <https://github.com/jarzebski/Arduino-HMC5883L>`__ by `Korneliusz Jarzębski <https://github.com/jarzebski>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/homeassistant.rst b/components/sensor/homeassistant.rst
index 5fa5e977c..f52dbb9c4 100644
--- a/components/sensor/homeassistant.rst
+++ b/components/sensor/homeassistant.rst
@@ -39,3 +39,5 @@ See Also
 - :ref:`automation`
 - :apiref:`sensor/homeassistant_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/htu21d.rst b/components/sensor/htu21d.rst
index f52284ff4..eaf005e41 100644
--- a/components/sensor/htu21d.rst
+++ b/components/sensor/htu21d.rst
@@ -67,3 +67,5 @@ See Also
 - :apiref:`sensor/htu21d_component.h`
 - `i2cdevlib <https://github.com/jrowberg/i2cdevlib>`__ by `Jeff Rowberg <https://github.com/jrowberg>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/hx711.rst b/components/sensor/hx711.rst
index 8af2c91de..aa86a927b 100644
--- a/components/sensor/hx711.rst
+++ b/components/sensor/hx711.rst
@@ -84,3 +84,5 @@ See Also
 - :apiref:`sensor/hx711.h`
 - `HX711 Library <https://github.com/bogde/HX711>`__ by `@bogde <https://github.com/bogde>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/ina219.rst b/components/sensor/ina219.rst
index 0479aa99a..37400419a 100644
--- a/components/sensor/ina219.rst
+++ b/components/sensor/ina219.rst
@@ -73,3 +73,5 @@ See Also
 - :apiref:`sensor/ina219.h`
 - `INA291 Arduino Library <https://github.com/adafruit/Adafruit_INA219>`__ by `Adafruit <https://www.adafruit.com/>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/ina3221.rst b/components/sensor/ina3221.rst
index 4b6b328a3..cdedaf442 100644
--- a/components/sensor/ina3221.rst
+++ b/components/sensor/ina3221.rst
@@ -84,3 +84,5 @@ See Also
 - :apiref:`sensor/ina3221.h`
 - `INA3221 Arduino Library <https://github.com/switchdoclabs/SDL_Arduino_INA3221>`__ by `SwitchDoc Labs <https://github.com/switchdoclabs>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/index.rst b/components/sensor/index.rst
index 1b2da7676..76e1e41e0 100644
--- a/components/sensor/index.rst
+++ b/components/sensor/index.rst
@@ -440,3 +440,5 @@ See Also
     :glob:
 
     *
+
+.. disqus::
diff --git a/components/sensor/max31855.rst b/components/sensor/max31855.rst
index 750f55451..b4160c59f 100644
--- a/components/sensor/max31855.rst
+++ b/components/sensor/max31855.rst
@@ -55,3 +55,5 @@ See Also
 - `MAX31855 Library <https://github.com/adafruit/Adafruit-MAX31855-library>`__ by `Adafruit <https://www.adafruit.com/>`__
 - :apiref:`sensor/max31855_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/max6675.rst b/components/sensor/max6675.rst
index 8f7914435..ae7228d14 100644
--- a/components/sensor/max6675.rst
+++ b/components/sensor/max6675.rst
@@ -62,3 +62,5 @@ See Also
 - `MAX6675 Library <https://github.com/adafruit/MAX6675-library>`__ by `Adafruit <https://www.adafruit.com/>`__
 - :apiref:`sensor/max6675_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/mhz19.rst b/components/sensor/mhz19.rst
index 9e9ed81fa..f25134aab 100644
--- a/components/sensor/mhz19.rst
+++ b/components/sensor/mhz19.rst
@@ -74,3 +74,5 @@ See Also
 - `MH-Z19 library <https://github.com/nara256/mhz19_uart>`__ by `@nara356 <https://github.com/nara256>`__
 - :apiref:`sensor/mhz19_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/mpu6050.rst b/components/sensor/mpu6050.rst
index a00f9f6de..f8833f177 100644
--- a/components/sensor/mpu6050.rst
+++ b/components/sensor/mpu6050.rst
@@ -81,3 +81,5 @@ See Also
 - :apiref:`sensor/mpu6050_component.h`
 - `i2cdevlib <https://github.com/jrowberg/i2cdevlib>`__ by `Jeff Rowberg <https://github.com/jrowberg>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/mqtt_subscribe.rst b/components/sensor/mqtt_subscribe.rst
index a668dfa63..7a5b4125b 100644
--- a/components/sensor/mqtt_subscribe.rst
+++ b/components/sensor/mqtt_subscribe.rst
@@ -38,3 +38,5 @@ See Also
 - :ref:`sensor-filters`
 - :apiref:`sensor/mqtt_subscribe_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/ms5611.rst b/components/sensor/ms5611.rst
index 381f8dbf9..f10326413 100644
--- a/components/sensor/ms5611.rst
+++ b/components/sensor/ms5611.rst
@@ -66,3 +66,5 @@ See Also
 - `Arduino MS5611 Library <https://github.com/jarzebski/Arduino-MS5611>`__ by `Korneliusz Jarzębski <https://github.com/jarzebski>`__
 - :apiref:`sensor/ms5611.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/pmsx003.rst b/components/sensor/pmsx003.rst
index 1f32bca7f..3015c69fc 100644
--- a/components/sensor/pmsx003.rst
+++ b/components/sensor/pmsx003.rst
@@ -61,3 +61,5 @@ See Also
 - :ref:`sensor-filters`
 - :apiref:`sensor/pmsx003.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/pulse_counter.rst b/components/sensor/pulse_counter.rst
index 4db3d7234..95ea83040 100644
--- a/components/sensor/pulse_counter.rst
+++ b/components/sensor/pulse_counter.rst
@@ -76,3 +76,5 @@ See Also
 - `esp-idf Pulse Counter API <https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/peripherals/pcnt.html>`__.
 - :apiref:`sensor/pulse_counter.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/rotary_encoder.rst b/components/sensor/rotary_encoder.rst
index 24efe55bf..3eb85b19d 100644
--- a/components/sensor/rotary_encoder.rst
+++ b/components/sensor/rotary_encoder.rst
@@ -87,3 +87,5 @@ See Also
 - `Mechanical Input Library <https://github.com/jkDesignDE/MechInputs>`__ by `Jochen Krapf <https://github.com/JK-de>`__
 - :apiref:`sensor/rotary_encoder.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/sht3xd.rst b/components/sensor/sht3xd.rst
index 7a0088721..26e8bdb03 100644
--- a/components/sensor/sht3xd.rst
+++ b/components/sensor/sht3xd.rst
@@ -59,3 +59,5 @@ See Also
 - :doc:`htu21d`
 - :apiref:`sensor/sht3xd_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/tcs34725.rst b/components/sensor/tcs34725.rst
index fc63a4194..c01fbdd21 100644
--- a/components/sensor/tcs34725.rst
+++ b/components/sensor/tcs34725.rst
@@ -75,3 +75,5 @@ See Also
 - `TCS34725 library <https://github.com/adafruit/Adafruit_TCS34725>`__ by `Adafruit <https://www.adafruit.com/>`__
 - :apiref:`sensor/tcs34725.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/template.rst b/components/sensor/template.rst
index cd8d0ef6c..96d312ff1 100644
--- a/components/sensor/template.rst
+++ b/components/sensor/template.rst
@@ -88,3 +88,5 @@ See Also
 - :ref:`automation`
 - :apiref:`sensor/template_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/total_daily_energy.rst b/components/sensor/total_daily_energy.rst
index 0c7ab0f58..52546af53 100644
--- a/components/sensor/total_daily_energy.rst
+++ b/components/sensor/total_daily_energy.rst
@@ -68,3 +68,5 @@ See Also
 - :doc:`/cookbook/power_meter`
 - :apiref:`sensor/total_daily_energy.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/tsl2561.rst b/components/sensor/tsl2561.rst
index 7e83da1f9..9a7444ae8 100644
--- a/components/sensor/tsl2561.rst
+++ b/components/sensor/tsl2561.rst
@@ -60,3 +60,5 @@ See Also
 - `SparkFun TSL2561 Arduino Library <https://github.com/sparkfun/SparkFun_TSL2561_Arduino_Library>`__ by `Sparkfun <https://sparkfun.com/>`__
 - :apiref:`sensor/tsl2561_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/ultrasonic.rst b/components/sensor/ultrasonic.rst
index 9722bd42b..6d5f96084 100644
--- a/components/sensor/ultrasonic.rst
+++ b/components/sensor/ultrasonic.rst
@@ -88,3 +88,5 @@ See Also
 - :doc:`template`
 - :apiref:`sensor/ultrasonic_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/uptime.rst b/components/sensor/uptime.rst
index d13f3e406..7c20c2699 100644
--- a/components/sensor/uptime.rst
+++ b/components/sensor/uptime.rst
@@ -29,3 +29,5 @@ See Also
 - :ref:`sensor-filters`
 - :apiref:`sensor/uptime_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/wifi_signal.rst b/components/sensor/wifi_signal.rst
index 2b42f2bb9..eb169d9b5 100644
--- a/components/sensor/wifi_signal.rst
+++ b/components/sensor/wifi_signal.rst
@@ -44,3 +44,5 @@ See Also
 - :doc:`/components/wifi`
 - :apiref:`sensor/wifi_signal_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/xiaomi_miflora.rst b/components/sensor/xiaomi_miflora.rst
index 711f302e4..3cd2b7dcb 100644
--- a/components/sensor/xiaomi_miflora.rst
+++ b/components/sensor/xiaomi_miflora.rst
@@ -100,3 +100,5 @@ See Also
 - :apiref:`esp32_ble_tracker.h`
 - `OpenMQTTGateway <https://github.com/1technophile/OpenMQTTGateway>`__ by `@1technophile <https://github.com/1technophile>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/sensor/xiaomi_mijia.rst b/components/sensor/xiaomi_mijia.rst
index 96aac0755..d66286fea 100644
--- a/components/sensor/xiaomi_mijia.rst
+++ b/components/sensor/xiaomi_mijia.rst
@@ -95,3 +95,5 @@ See Also
   by `@mspider65 <https://github.com/mspider65>`__
 - `OpenMQTTGateway <https://github.com/1technophile/OpenMQTTGateway>`__ by `@1technophile <https://github.com/1technophile>`__
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/spi.rst b/components/spi.rst
index 93fa9fa68..4ac1b66a2 100644
--- a/components/spi.rst
+++ b/components/spi.rst
@@ -47,3 +47,5 @@ See Also
 
 - :apiref:`spi_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/status_led.rst b/components/status_led.rst
index 67a091d28..c092525ca 100644
--- a/components/status_led.rst
+++ b/components/status_led.rst
@@ -45,3 +45,5 @@ See Also
 
 - :apiref:`status_led.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/stepper/index.rst b/components/stepper/index.rst
index 61739d56c..56aac90d1 100644
--- a/components/stepper/index.rst
+++ b/components/stepper/index.rst
@@ -200,3 +200,5 @@ See Also
 
 - :apiref:`stepper/stepper.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/switch/custom.rst b/components/switch/custom.rst
index 0083cc1b2..ec72997c2 100644
--- a/components/switch/custom.rst
+++ b/components/switch/custom.rst
@@ -68,3 +68,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/switch/gpio.rst b/components/switch/gpio.rst
index c9752c8df..2d733c318 100644
--- a/components/switch/gpio.rst
+++ b/components/switch/gpio.rst
@@ -145,3 +145,5 @@ See Also
 - :doc:`/cookbook/garage-door`
 - :apiref:`switch_/gpio_switch.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/switch/index.rst b/components/switch/index.rst
index 78fe4cce5..acae71637 100644
--- a/components/switch/index.rst
+++ b/components/switch/index.rst
@@ -178,3 +178,5 @@ See Also
     :glob:
 
     *
+
+.. disqus::
diff --git a/components/switch/output.rst b/components/switch/output.rst
index fcf3d69db..a4e4f98a6 100644
--- a/components/switch/output.rst
+++ b/components/switch/output.rst
@@ -37,3 +37,5 @@ See Also
 - :doc:`/components/output/index`
 - :apiref:`switch_/output_switch.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/switch/remote_transmitter.rst b/components/switch/remote_transmitter.rst
index 92cfe5a99..6801ea3ad 100644
--- a/components/switch/remote_transmitter.rst
+++ b/components/switch/remote_transmitter.rst
@@ -431,3 +431,5 @@ See Also
 - `IRRemoteESP8266 <https://github.com/markszabo/IRremoteESP8266/>`__ by `Mark Szabo-Simon <https://github.com/markszabo>`__
 - :apiref:`remote/remote_transmitter.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/switch/restart.rst b/components/switch/restart.rst
index 44663c424..ef13ea6de 100644
--- a/components/switch/restart.rst
+++ b/components/switch/restart.rst
@@ -33,3 +33,5 @@ See Also
 - :doc:`template`
 - :apiref:`switch_/restart_switch.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/switch/shutdown.rst b/components/switch/shutdown.rst
index f09de8230..01e28aa71 100644
--- a/components/switch/shutdown.rst
+++ b/components/switch/shutdown.rst
@@ -35,3 +35,5 @@ See Also
 - :doc:`template`
 - :apiref:`switch_/shutdown_switch.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/switch/template.rst b/components/switch/template.rst
index 3a76d2b48..1ccbd46a4 100644
--- a/components/switch/template.rst
+++ b/components/switch/template.rst
@@ -103,3 +103,5 @@ See Also
 - :doc:`/components/binary_sensor/index`
 - :apiref:`switch_/template_switch.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/switch/uart.rst b/components/switch/uart.rst
index f7749108e..ad749ac3a 100644
--- a/components/switch/uart.rst
+++ b/components/switch/uart.rst
@@ -39,3 +39,5 @@ See Also
 - :doc:`/components/uart`
 - :apiref:`switch_/uart_switch.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/text_sensor/custom.rst b/components/text_sensor/custom.rst
index 12d7ae31f..d938b03df 100644
--- a/components/text_sensor/custom.rst
+++ b/components/text_sensor/custom.rst
@@ -67,3 +67,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/text_sensor/homeassistant.rst b/components/text_sensor/homeassistant.rst
index a7ad870d6..07abd9bb8 100644
--- a/components/text_sensor/homeassistant.rst
+++ b/components/text_sensor/homeassistant.rst
@@ -31,3 +31,5 @@ See Also
 - :ref:`automation`
 - :apiref:`text_sensor/homeassistant_text_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/text_sensor/index.rst b/components/text_sensor/index.rst
index 994928a63..8e34d8a5c 100644
--- a/components/text_sensor/index.rst
+++ b/components/text_sensor/index.rst
@@ -94,3 +94,5 @@ See Also
     :glob:
 
     *
+
+.. disqus::
diff --git a/components/text_sensor/mqtt_subscribe.rst b/components/text_sensor/mqtt_subscribe.rst
index f3e6f23d4..2a0b7de5e 100644
--- a/components/text_sensor/mqtt_subscribe.rst
+++ b/components/text_sensor/mqtt_subscribe.rst
@@ -55,3 +55,5 @@ See Also
 
 - :apiref:`text_sensor/mqtt_subscribe_text_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/text_sensor/template.rst b/components/text_sensor/template.rst
index a52b011ca..fc4aafa7b 100644
--- a/components/text_sensor/template.rst
+++ b/components/text_sensor/template.rst
@@ -83,3 +83,5 @@ See Also
 - :ref:`automation`
 - :apiref:`text_sensor/template_text_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/text_sensor/version.rst b/components/text_sensor/version.rst
index 3aa26df39..fb082f313 100644
--- a/components/text_sensor/version.rst
+++ b/components/text_sensor/version.rst
@@ -31,3 +31,5 @@ See Also
 
 - :apiref:`text_sensor/version_text_sensor.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/time.rst b/components/time.rst
index 87405b80b..0ffc1ec79 100644
--- a/components/time.rst
+++ b/components/time.rst
@@ -313,3 +313,5 @@ See Also
 
 - :apiref:`time/rtc_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/uart.rst b/components/uart.rst
index c36188460..cf416fd04 100644
--- a/components/uart.rst
+++ b/components/uart.rst
@@ -74,3 +74,5 @@ See Also
 - :doc:`/components/logger`
 - :apiref:`uart_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/web_server.rst b/components/web_server.rst
index 7e25611fd..68d5e768d 100644
--- a/components/web_server.rst
+++ b/components/web_server.rst
@@ -49,3 +49,5 @@ See Also
 
 - :apiref:`web_server.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/components/wifi.rst b/components/wifi.rst
index ea54ea5e1..5f8b5f7e9 100644
--- a/components/wifi.rst
+++ b/components/wifi.rst
@@ -173,3 +173,5 @@ See Also
 
 - :apiref:`wifi_component.h`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/conf.py b/conf.py
index fe301a854..bb2d56556 100644
--- a/conf.py
+++ b/conf.py
@@ -41,6 +41,7 @@ sys.path.append(os.path.abspath('.'))
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'disqus',
     'github',
     'seo',
     'sitemap',
diff --git a/cookbook/bme280_environment.rst b/cookbook/bme280_environment.rst
index ddbfc1bf9..bea9513c9 100644
--- a/cookbook/bme280_environment.rst
+++ b/cookbook/bme280_environment.rst
@@ -115,3 +115,5 @@ See Also
 - :doc:`/components/sensor/template`
 - :doc:`/components/sensor/bme280`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/cookbook/bruh.rst b/cookbook/bruh.rst
index c89dc62f7..b5f58081b 100644
--- a/cookbook/bruh.rst
+++ b/cookbook/bruh.rst
@@ -86,3 +86,5 @@ See Also
 - :doc:`/components/sensor/adc`
 - :doc:`/components/binary_sensor/gpio`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/cookbook/display_time_temp_oled.rst b/cookbook/display_time_temp_oled.rst
index 115b66d2c..5fa26f0fb 100644
--- a/cookbook/display_time_temp_oled.rst
+++ b/cookbook/display_time_temp_oled.rst
@@ -163,3 +163,5 @@ See Also
 - :doc:`/components/display/index`
 - :doc:`/components/sensor/homeassistant`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/cookbook/dual-r2-cover.rst b/cookbook/dual-r2-cover.rst
index 817a3fb00..bc118b02d 100644
--- a/cookbook/dual-r2-cover.rst
+++ b/cookbook/dual-r2-cover.rst
@@ -111,3 +111,5 @@ See Also
 - :doc:`/components/cover/template`
 - :doc:`/devices/sonoff`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/cookbook/garage-door.rst b/cookbook/garage-door.rst
index 47ffb4b16..e23d6162f 100644
--- a/cookbook/garage-door.rst
+++ b/cookbook/garage-door.rst
@@ -50,3 +50,5 @@ See Also
 - :doc:`/components/switch/gpio`
 - :doc:`/components/cover/template`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/cookbook/h801.rst b/cookbook/h801.rst
index 691344cf3..deddf0059 100644
--- a/cookbook/h801.rst
+++ b/cookbook/h801.rst
@@ -101,3 +101,5 @@ See Also
 - :doc:`/components/light/rgbw`
 - :doc:`/components/output/esp8266_pwm`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/cookbook/pir.rst b/cookbook/pir.rst
index 2e81d6fe0..0410ebd3a 100644
--- a/cookbook/pir.rst
+++ b/cookbook/pir.rst
@@ -64,3 +64,5 @@ See Also
 - :doc:`/components/binary_sensor/gpio`
 - :doc:`bruh`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/cookbook/power_meter.rst b/cookbook/power_meter.rst
index b67186154..c52a92659 100644
--- a/cookbook/power_meter.rst
+++ b/cookbook/power_meter.rst
@@ -66,3 +66,5 @@ See Also
 
 - :doc:`/components/sensor/pulse_counter`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/cookbook/relay.rst b/cookbook/relay.rst
index bc841f7e6..751c81daf 100644
--- a/cookbook/relay.rst
+++ b/cookbook/relay.rst
@@ -49,3 +49,5 @@ See Also
 - :doc:`/cookbook/garage-door`
 - `How do relays work <https://www.explainthatstuff.com/howrelayswork.html>`__.
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/cookbook/sonoff-fishpond-pump.rst b/cookbook/sonoff-fishpond-pump.rst
index bae89fd3e..9ccc1647b 100644
--- a/cookbook/sonoff-fishpond-pump.rst
+++ b/cookbook/sonoff-fishpond-pump.rst
@@ -217,3 +217,5 @@ See Also
 - :doc:`/devices/sonoff_basic`
 - `Flashing sonoff basic <https://randomnerdtutorials.com/how-to-flash-a-custom-firmware-to-sonoff/>`__.
 - `Adding ESPHome to Home Assistant <https://www.home-assistant.io/components/esphome/>`__.
+
+.. disqus::
diff --git a/cookbook/temt6000.rst b/cookbook/temt6000.rst
index d49baaac9..766dc03de 100644
--- a/cookbook/temt6000.rst
+++ b/cookbook/temt6000.rst
@@ -71,3 +71,5 @@ See Also
 - `TEMT6000 datasheet <https://www.sparkfun.com/datasheets/Sensors/Imaging/TEMT6000.pdf>`__
 - :doc:`bruh`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/custom/custom_component.rst b/custom/custom_component.rst
index 5fafde97e..e4c05ca8f 100644
--- a/custom/custom_component.rst
+++ b/custom/custom_component.rst
@@ -106,3 +106,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/custom/i2c.rst b/custom/i2c.rst
index 23cfc0a44..c025140df 100644
--- a/custom/i2c.rst
+++ b/custom/i2c.rst
@@ -34,3 +34,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/custom/spi.rst b/custom/spi.rst
index f24d6ad41..1d7b627f0 100644
--- a/custom/spi.rst
+++ b/custom/spi.rst
@@ -35,3 +35,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/custom/uart.rst b/custom/uart.rst
index 1ca52eeb9..1110565f8 100644
--- a/custom/uart.rst
+++ b/custom/uart.rst
@@ -55,3 +55,5 @@ See Also
 --------
 
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/devices/esp32.rst b/devices/esp32.rst
index 374f57bf9..9782c825b 100644
--- a/devices/esp32.rst
+++ b/devices/esp32.rst
@@ -51,3 +51,5 @@ See Also
 
 - :doc:`nodemcu_esp32`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/devices/esp8266.rst b/devices/esp8266.rst
index d8264e399..4125beebc 100644
--- a/devices/esp8266.rst
+++ b/devices/esp8266.rst
@@ -195,3 +195,5 @@ See Also
 
 - :doc:`nodemcu_esp8266`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/devices/nodemcu_esp32.rst b/devices/nodemcu_esp32.rst
index 882b7459b..577d69e56 100644
--- a/devices/nodemcu_esp32.rst
+++ b/devices/nodemcu_esp32.rst
@@ -62,3 +62,5 @@ See Also
 - :doc:`esp32`
 - :doc:`nodemcu_esp8266`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/devices/nodemcu_esp8266.rst b/devices/nodemcu_esp8266.rst
index f8d7de9fb..baa98bb4e 100644
--- a/devices/nodemcu_esp8266.rst
+++ b/devices/nodemcu_esp8266.rst
@@ -74,3 +74,5 @@ See Also
 - :doc:`esp8266`
 - :doc:`nodemcu_esp32`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/devices/sonoff.rst b/devices/sonoff.rst
index b75aa99d5..e1d808b6b 100644
--- a/devices/sonoff.rst
+++ b/devices/sonoff.rst
@@ -335,3 +335,5 @@ See Also
 - :doc:`sonoff_basic`
 - :doc:`esp8266`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/devices/sonoff_4ch.rst b/devices/sonoff_4ch.rst
index d7ce347a2..bb6380145 100644
--- a/devices/sonoff_4ch.rst
+++ b/devices/sonoff_4ch.rst
@@ -318,3 +318,5 @@ See Also
 - :doc:`sonoff`
 - :doc:`sonoff_s20`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/devices/sonoff_basic.rst b/devices/sonoff_basic.rst
index 16364e371..c4b77a140 100644
--- a/devices/sonoff_basic.rst
+++ b/devices/sonoff_basic.rst
@@ -271,3 +271,5 @@ See Also
 - :doc:`sonoff_s20`
 - `GPIO locations <https://github.com/arendst/Sonoff-Tasmota/wiki/GPIO-Locations>`__
 - `Edit this page on GitHub <https://github.com/OttoWinter/esphomedocs/blob/current/esphomeyaml/devices/sonoff_basic.rst>`__
+
+.. disqus::
diff --git a/devices/sonoff_s20.rst b/devices/sonoff_s20.rst
index e0edd6337..2b4685c17 100644
--- a/devices/sonoff_s20.rst
+++ b/devices/sonoff_s20.rst
@@ -317,3 +317,5 @@ See Also
 - :doc:`sonoff`
 - :doc:`sonoff_4ch`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/devices/sonoff_t1_uk_3gang_v1.1.rst b/devices/sonoff_t1_uk_3gang_v1.1.rst
index e9e353d67..64c5202b9 100644
--- a/devices/sonoff_t1_uk_3gang_v1.1.rst
+++ b/devices/sonoff_t1_uk_3gang_v1.1.rst
@@ -315,3 +315,5 @@ See Also
 - :doc:`sonoff_4ch`
 - :doc:`sonoff_s20`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/disqus.py b/disqus.py
new file mode 100644
index 000000000..20775241d
--- /dev/null
+++ b/disqus.py
@@ -0,0 +1,50 @@
+# Based on https://github.com/rmk135/sphinxcontrib-disqus
+from docutils import nodes
+from docutils.parsers.rst import Directive
+
+
+class DisqusNode(nodes.General, nodes.Element):
+    def __init__(self, disqus_identifier):
+        super(DisqusNode, self).__init__()
+        self.disqus_identifier = disqus_identifier
+
+
+def disqus_visit(self, node):
+    html_attrs = {
+        'ids': ['disqus_thread'],
+        'data-disqus-identifier': node.disqus_identifier,
+    }
+    self.body.append(self.starttag(node, 'div', '', **html_attrs))
+
+
+def disqus_depart(self, _):
+    self.body.append('</div>')
+
+
+class DisqusDirective(Directive):
+    option_spec = dict(identifier=str)
+
+    def get_identifier(self):
+        if 'identifier' in self.options:
+            return self.options['identifier']
+
+        env = self.state.document.settings.env
+        return env.docname.replace('/', '-')
+
+    def run(self):
+        disqus_identifier = self.get_identifier()
+        return [DisqusNode(disqus_identifier)]
+
+
+def event_html_page_context(app, pagename, templatename, context, doctree):
+    if not doctree or 'script_files' not in context:
+        return
+    if any(hasattr(n, 'disqus_identifier') for n in doctree.traverse()):
+        context['script_files'] = context['script_files'][:] + ['_static/disqus.js']
+
+
+def setup(app):
+    app.add_directive('disqus', DisqusDirective)
+    app.add_node(DisqusNode, html=(disqus_visit, disqus_depart))
+    app.connect('html-page-context', event_html_page_context)
+    return {'version': '1.0'}
diff --git a/guides/automations.rst b/guides/automations.rst
index 39c287b5a..9bf0076ad 100644
--- a/guides/automations.rst
+++ b/guides/automations.rst
@@ -611,3 +611,5 @@ See Also
 - :doc:`configuration-types`
 - :doc:`faq`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/guides/configuration-types.rst b/guides/configuration-types.rst
index 8a41d7be9..6baac1b04 100644
--- a/guides/configuration-types.rst
+++ b/guides/configuration-types.rst
@@ -207,3 +207,5 @@ See Also
 - :doc:`getting_started_command_line`
 - :doc:`faq`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/guides/contributing.rst b/guides/contributing.rst
index ab89e0ac4..3b67867c9 100644
--- a/guides/contributing.rst
+++ b/guides/contributing.rst
@@ -480,3 +480,5 @@ See Also
 - :doc:`ESPHome index </index>`
 - :doc:`faq`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/guides/faq.rst b/guides/faq.rst
index 58471b4d5..24743eeff 100644
--- a/guides/faq.rst
+++ b/guides/faq.rst
@@ -280,3 +280,5 @@ See Also
 - :doc:`ESPHome index </index>`
 - :doc:`contributing`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/guides/getting_started_command_line.rst b/guides/getting_started_command_line.rst
index dc74b6875..6e0258b1c 100644
--- a/guides/getting_started_command_line.rst
+++ b/guides/getting_started_command_line.rst
@@ -186,3 +186,5 @@ See Also
 - :doc:`ESPHome index </index>`
 - :doc:`getting_started_hassio`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/guides/getting_started_hassio.rst b/guides/getting_started_hassio.rst
index 018da346a..5e59b1cc0 100644
--- a/guides/getting_started_hassio.rst
+++ b/guides/getting_started_hassio.rst
@@ -159,3 +159,5 @@ See Also
 - :doc:`ESPHome index </index>`
 - :doc:`getting_started_command_line`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/guides/migrate_espeasy.rst b/guides/migrate_espeasy.rst
index 3f6793280..4f9ccb2ce 100644
--- a/guides/migrate_espeasy.rst
+++ b/guides/migrate_espeasy.rst
@@ -56,3 +56,5 @@ See Also
 - :doc:`migrate_espurna`
 - :doc:`migrate_sonoff_tasmota`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/guides/migrate_espurna.rst b/guides/migrate_espurna.rst
index 07818bc77..1487b5eb8 100644
--- a/guides/migrate_espurna.rst
+++ b/guides/migrate_espurna.rst
@@ -60,3 +60,5 @@ See Also
 - :doc:`migrate_espeasy`
 - :doc:`migrate_sonoff_tasmota`
 - :ghedit:`Edit`
+
+.. disqus::
diff --git a/guides/migrate_sonoff_tasmota.rst b/guides/migrate_sonoff_tasmota.rst
index 14784228d..e4663c8b6 100644
--- a/guides/migrate_sonoff_tasmota.rst
+++ b/guides/migrate_sonoff_tasmota.rst
@@ -62,3 +62,5 @@ See Also
 - :doc:`migrate_espurna`
 - :doc:`migrate_espeasy`
 - :ghedit:`Edit`
+
+.. disqus::