diff --git a/changelog/v1.8.0.rst b/changelog/v1.8.0.rst
index 1a2140921..ed96fb099 100644
--- a/changelog/v1.8.0.rst
+++ b/changelog/v1.8.0.rst
@@ -57,7 +57,7 @@ This release mainly focuses on these new features:
 - NFC/RFID Readers (:doc:`PN532 </components/pn532>` and :doc:`RDM6300 </components/rdm6300>`)
 - New :doc:`ESP32 BLE integrations </components/esp32_ble_tracker>` like :doc:`Xiaomi MiFlora </components/sensor/xiaomi_miflora>`
 - Core Changes like the addition of the :ref:`SPI bus <spi>` and :ref:`UART bus <uart>`
-- Lots of new ::ref:`light effects <light-effects>` and support for cold-white/warm-white lights.
+- Lots of new :ref:`light effects <light-effects>` and support for cold-white/warm-white lights.
 - A LOGO FOR THIS PROJECT!!! Thanks a lot to `@messimore <https://github.com/messismore>`__ for
   this visual masterpiece.
 
diff --git a/components/display/lcd_gpio.rst b/components/display/lcd_gpio.rst
index a1d8fe691..91473b5b1 100644
--- a/components/display/lcd_gpio.rst
+++ b/components/display/lcd_gpio.rst
@@ -60,7 +60,7 @@ Configuration variables:
 Rendering Lambda
 ----------------
 
-The LCD displays has a similar API to the fully fledged ::ref:`display-engine`, but it's only a subset as LCD displays
+The LCD displays has a similar API to the fully fledged :ref:`display-engine`, but it's only a subset as LCD displays
 don't have a concept of individual pixels. In the lambda you're passed a variable called ``it``
 as with all other displays. In this case however, ``it`` is an ``LCDDisplay`` instance.
 
diff --git a/components/sensor/homeassistant.rst b/components/sensor/homeassistant.rst
index 60428dccb..1e65c3e65 100644
--- a/components/sensor/homeassistant.rst
+++ b/components/sensor/homeassistant.rst
@@ -29,7 +29,7 @@ Configuration variables:
 
 - **name** (**Required**, string): The name of the sensor.
 - **entity_id** (**Required**, string): The entity ID to import from Home Assistant.
-- **id** (*Optional*,:ref:`config-id`): Manually specify the ID used for code generation.
+- **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.
 - All other options from :ref:`Sensor <config-sensor>` and :ref:`MQTT Component <config-mqtt-component>`.
 
 See Also
diff --git a/components/sensor/template.rst b/components/sensor/template.rst
index 7681568ca..327b146c0 100644
--- a/components/sensor/template.rst
+++ b/components/sensor/template.rst
@@ -37,7 +37,7 @@ Configuration variables:
   Lambda to be evaluated every update interval to get the new value of the sensor
 - **update_interval** (*Optional*, :ref:`config-time`): The interval to check the
   sensor. Defaults to ``60s``.
-- **id** (*Optional*,:ref:`config-id`): Manually specify the ID used for code generation.
+- **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.
 - All other options from :ref:`Sensor <config-sensor>` and :ref:`MQTT Component <config-mqtt-component>`.
 
 .. note::
diff --git a/components/text_sensor/homeassistant.rst b/components/text_sensor/homeassistant.rst
index 3c079fce8..8774aaab4 100644
--- a/components/text_sensor/homeassistant.rst
+++ b/components/text_sensor/homeassistant.rst
@@ -21,7 +21,7 @@ Configuration variables:
 
 - **name** (**Required**, string): The name of the text sensor.
 - **entity_id** (**Required**, string): The entity ID to import from Home Assistant.
-- **id** (*Optional*,:ref:`config-id`): Manually specify the ID used for code generation.
+- **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.
 - All other options from :ref:`Text Sensor <config-text_sensor>` and :ref:`MQTT Component <config-mqtt-component>`.
 
 See Also
diff --git a/components/text_sensor/template.rst b/components/text_sensor/template.rst
index 94283f863..10dbb1338 100644
--- a/components/text_sensor/template.rst
+++ b/components/text_sensor/template.rst
@@ -33,7 +33,7 @@ Configuration variables:
   Lambda to be evaluated every update interval to get the new value of the text sensor
 - **update_interval** (*Optional*, :ref:`config-time`): The interval to check the
   text sensor. Defaults to ``60s``.
-- **id** (*Optional*,:ref:`config-id`): Manually specify the ID used for code generation.
+- **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.
 - All other options from :ref:`Text Sensor <config-text_sensor>` and :ref:`MQTT Component <config-mqtt-component>`.
 
 See Also