diff --git a/source/_components/binary_sensor.mysensors.markdown b/source/_components/binary_sensor.mysensors.markdown
index 6138b927af7..814f79d9b6c 100644
--- a/source/_components/binary_sensor.mysensors.markdown
+++ b/source/_components/binary_sensor.mysensors.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: Binary Sensor
+ha_category: DIY
 ha_release: 0.14
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/climate.mysensors.markdown b/source/_components/climate.mysensors.markdown
index 6f5379449b0..f7cc81bec3e 100644
--- a/source/_components/climate.mysensors.markdown
+++ b/source/_components/climate.mysensors.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: Climate
+ha_category: DIY
 ha_release: 0.29
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/cover.mysensors.markdown b/source/_components/cover.mysensors.markdown
index b4ded3e1b4b..2731b5c9a3c 100644
--- a/source/_components/cover.mysensors.markdown
+++ b/source/_components/cover.mysensors.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: Cover
+ha_category: DIY
 ha_release: "0.30"
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/device_tracker.mysensors.markdown b/source/_components/device_tracker.mysensors.markdown
index 5366c68ea78..0a886e1a2c6 100644
--- a/source/_components/device_tracker.mysensors.markdown
+++ b/source/_components/device_tracker.mysensors.markdown
@@ -8,8 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: Presence Detection
-featured: false
+ha_category: DIY
 ha_release: "0.38"
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/light.blinksticklight.markdown b/source/_components/light.blinksticklight.markdown
index c11da280aca..d5cc53a99fc 100644
--- a/source/_components/light.blinksticklight.markdown
+++ b/source/_components/light.blinksticklight.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: blinkstick.png
-ha_category: Light
+ha_category: DIY
 ha_release: 0.7.5
 ha_iot_class: "Local Polling"
 ---
@@ -16,6 +16,8 @@ ha_iot_class: "Local Polling"
 
 The `blinkstick` platform lets you control your [Blinkstick](https://www.blinkstick.com/) lights from within Home Assistant.
 
+## {% linkable_title Configuration %}
+
 To add blinkstick to your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
@@ -23,10 +25,18 @@ To add blinkstick to your installation, add the following to your `configuration
 light:
   - platform: blinksticklight
     serial: BS000795-1.1
-    name: Living Room
 ```
 
-Configuration variables:
+{% configuration %}
+serial:
+  description: The serial number of your stick.
+  required: true
+  default: 640
+  type: string
+name:
+  description: Name of the stick.
+  required: false
+  type: string
+  default: Blinkstick
+{% endconfiguration %}
 
-- **serial** (*Required*): The serial number of your stick.
-- **name** (*Required*): Name of the stick.
diff --git a/source/_components/light.blinkt.markdown b/source/_components/light.blinkt.markdown
index ad2d6200f87..69b72eb1d13 100644
--- a/source/_components/light.blinkt.markdown
+++ b/source/_components/light.blinkt.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: raspberry-pi.png
-ha_category: Light
+ha_category: DIY
 ha_iot_class: "Local Push"
 ha_release: 0.44
 ---
 
 The `blinkt` light platform lets you control the [Blinkt!](https://shop.pimoroni.com/products/blinkt) board, featuring eight super-bright RGB LEDs.
 
+## {% linkable_title Configuration %}
+
 To enable `blinkt` in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
@@ -22,3 +24,4 @@ To enable `blinkt` in your installation, add the following to your `configuratio
 light:
   - platform: blinkt
 ```
+
diff --git a/source/_components/light.mysensors.markdown b/source/_components/light.mysensors.markdown
index 5f91aa43fe1..4e62f705bcd 100644
--- a/source/_components/light.mysensors.markdown
+++ b/source/_components/light.mysensors.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: Light
+ha_category: DIY
 ha_release: 0.13
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/light.sensehat.markdown b/source/_components/light.sensehat.markdown
index 7c7a4d0b378..30d9eb88c8d 100644
--- a/source/_components/light.sensehat.markdown
+++ b/source/_components/light.sensehat.markdown
@@ -8,20 +8,20 @@ comments: false
 sharing: true
 footer: true
 logo: sense-hat.png
-ha_category: Light
+ha_category: DIY
 ha_iot_class: "Assumed State"
 ha_release: 0.44
 ---
 
 The `sensehat` light platform lets you control the [Sense HAT](https://www.raspberrypi.org/products/sense-hat/) board's 8x8 RGB LED matrix on your Raspberry Pi from within Home Assistant.
 
-To add `sensehat` to your installation, add the following to your `configuration.yaml` file:
+## {% linkable_title Configuration %}
+
+To add `sensehat` light to your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
 light:
-  platform: sensehat
-  name: SenseHAT
+  - platform: sensehat
 ```
 
-For setting up the Sense HAT sensors, please see the [Sense HAT sensor component](/components/sensor.sensehat/).
diff --git a/source/_components/mysensors.markdown b/source/_components/mysensors.markdown
index 3cd360e2d26..97a48746a27 100644
--- a/source/_components/mysensors.markdown
+++ b/source/_components/mysensors.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: Hub
+ha_category: DIY
 featured: true
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/notify.mysensors.markdown b/source/_components/notify.mysensors.markdown
index 3dab5bc10dd..085f9b87cfc 100644
--- a/source/_components/notify.mysensors.markdown
+++ b/source/_components/notify.mysensors.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: Notifications
+ha_category: DIY
 ha_release: 0.36
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/sensor.mysensors.markdown b/source/_components/sensor.mysensors.markdown
index a6e8657014a..ae77bb096eb 100644
--- a/source/_components/sensor.mysensors.markdown
+++ b/source/_components/sensor.mysensors.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: Sensor
+ha_category: DIY
 featured: false
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/sensor.sense.markdown b/source/_components/sensor.sense.markdown
index e13e45dd937..f894c5312e2 100644
--- a/source/_components/sensor.sense.markdown
+++ b/source/_components/sensor.sense.markdown
@@ -15,6 +15,9 @@ ha_release: 0.65
 
 
 Integrate your [Sense](https://sense.com) meter information into Home Assistant. 
+
+## {% linkable_title Configuration %}
+
 To enable this sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
@@ -31,9 +34,9 @@ sensor:
 ```
 
 Two types of sensors can be monitored and will be created with the following names:
+
 - **Active Usage/Production**: Current active power usage/production in Watts. Updated every 30 seconds.
 - **Daily Usage/Production**: Daily power usage/production in kWh. Updated every 5 minutes.
-- ...
 
 Weekly, Monthly and Yearly variants are also available.
 
@@ -52,23 +55,23 @@ monitored_conditions:
   type: list
   keys:
     active_usage:
-      description: The current power usage in W
+      description: The current power usage in W.
     active_production:
-      description: The current solar production in W
+      description: The current solar production in W.
     daily_usage:
-      description: Total power used for current day in kWh
+      description: Total power used for current day in kWh.
     daily_production:
-      description: Total power produced for current day in kWh
+      description: Total power produced for current day in kWh.
     weekly_usage:
-      description: Total power used for current week in kWh
+      description: Total power used for current week in kWh.
     weekly_production:
-      description: Total power produced for current week in kWh
+      description: Total power produced for current week in kWh.
     monthly_usage:
-      description: Total power used for current month in kWh
+      description: Total power used for current month in kWh.
     monthly_production:
-      description: Total power produced for current month in kWh
+      description: Total power produced for current month in kWh.
     yearly_usage:
-      description: Total power used for current year in kWh
+      description: Total power used for current year in kWh.
     yearly_production:
-      description: Total power produced for current year in kWh
+      description: Total power produced for current year in kWh.
 {% endconfiguration %}
diff --git a/source/_components/sensor.sensehat.markdown b/source/_components/sensor.sensehat.markdown
index 640ea7b1a52..a2236c2fb5f 100644
--- a/source/_components/sensor.sensehat.markdown
+++ b/source/_components/sensor.sensehat.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: sense-hat.png
-ha_category: Sensor
+ha_category: DIY
 ha_release: 0.35
 ha_iot_class: "Local Push"
 ---
@@ -16,6 +16,8 @@ ha_iot_class: "Local Push"
 
 The `sensehat` sensor platform allows you to display information collected by a [Sense HAT](https://www.raspberrypi.org/products/sense-hat/) add-on board for Raspberry Pi.
 
+## {% linkable_title Configuration %}
+
 To add this platform to your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
@@ -23,9 +25,9 @@ To add this platform to your installation, add the following to your `configurat
 sensor:
   - platform: sensehat
     display_options:
-        - temperature
-        - humidity
-        - pressure
+      - temperature
+      - humidity
+      - pressure
 ```
 
 Configuration variables:
diff --git a/source/_components/switch.mysensors.markdown b/source/_components/switch.mysensors.markdown
index a0fffa84e36..91d5c2e17aa 100644
--- a/source/_components/switch.mysensors.markdown
+++ b/source/_components/switch.mysensors.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: Switch
+ha_category: DIY
 featured: false
 ha_iot_class: "Local Push"
 ---