diff --git a/source/_components/sensor.bh1750.markdown b/source/_components/sensor.bh1750.markdown
index 4910cdfba0a..b7bae73cf1e 100644
--- a/source/_components/sensor.bh1750.markdown
+++ b/source/_components/sensor.bh1750.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: raspberry-pi.png
-ha_category: Sensor
+ha_category: DIY
 ha_release: 0.48
 ha_iot_class: "Local Push"
 ---
@@ -20,6 +20,7 @@ Tested devices:
 
 - [Raspberry Pi](https://www.raspberrypi.org/)
 
+## {% linkable_title Configuration %}
 
 To use your BH1750 sensor in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.fedex.markdown b/source/_components/sensor.fedex.markdown
index acbdf251d62..00e8a6c1b62 100644
--- a/source/_components/sensor.fedex.markdown
+++ b/source/_components/sensor.fedex.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: fedex.png
-ha_category: Sensor
+ha_category: Postal Service
 ha_release: 0.39
 ha_iot_class: "Cloud Polling"
 ---
 
 The `fedex` platform allows one to track deliveries by [FedEx](http://www.fedex.com/). To use this sensor, you need a [FedEx Delivery Manager](https://www.fedex.com/us/delivery/) account.
 
+## {% linkable_title Configuration %}
+
 To enable this sensor, add the following lines to your `configuration.yaml`:
 
 ```yaml
diff --git a/source/_components/sensor.fints.markdown b/source/_components/sensor.fints.markdown
index 79351f765e3..e871ba3cb97 100644
--- a/source/_components/sensor.fints.markdown
+++ b/source/_components/sensor.fints.markdown
@@ -7,14 +7,16 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: Sensor
-ha_release: 0.70
+ha_category: Finance
+ha_release: "0.70"
 ha_iot_class: "Local Push"
 logo: home-assistant.png
 ---
 
 With the FinTS sensor, you can fetch your account information from your bank. This only works with banks that support the FinTS (aka. HBCI) standard. The FinTS standard used by many German banks. So if you do not have a German bank account, this will most likely not work for you. To find out if your bank supports FinTS, check the bank's website or call their hotline.
 
+## {% linkable_title Configuration %}
+
 For each account you have with the bank, a separate sensor is created. If you have several accounts with a bank, you can select which ones you want to have, and you can also give the accounts a name.
 
 {% raw %}
@@ -70,5 +72,4 @@ To find out the configuration for your bank, check their website or call their h
             description: (optional) Use this field to give the account a meaningful name.
             required: false
             type: string           
-
 {% endconfiguration %}
diff --git a/source/_components/sensor.htu21d.markdown b/source/_components/sensor.htu21d.markdown
index a485fb0c382..fbb513aef4a 100644
--- a/source/_components/sensor.htu21d.markdown
+++ b/source/_components/sensor.htu21d.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: raspberry-pi.png
-ha_category: Sensor
+ha_category: DIY
 ha_release: 0.48
 ha_iot_class: "Local Push"
 ---
@@ -20,6 +20,8 @@ Tested devices:
 
 - [Raspberry Pi](https://www.raspberrypi.org/)
 
+## {% linkable_title Configuration %}
+
 To use your HTU21D sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.imap.markdown b/source/_components/sensor.imap.markdown
index a3b9af23b29..f09956e9648 100644
--- a/source/_components/sensor.imap.markdown
+++ b/source/_components/sensor.imap.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: smtp.png
-ha_category: Sensor
+ha_category: Mailbox
 ha_release: 0.25
 ha_iot_class: "Cloud Push"
 ---
@@ -16,6 +16,8 @@ ha_iot_class: "Cloud Push"
 
 The `imap` sensor platform is observing your [IMAP server](https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol) and reporting the amount of unread emails.
 
+## {% linkable_title Configuration %}
+
 To enable this sensor, add the following lines to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.mhz19.markdown b/source/_components/sensor.mhz19.markdown
index 25cd6405ce7..142eeed155f 100644
--- a/source/_components/sensor.mhz19.markdown
+++ b/source/_components/sensor.mhz19.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: mhz19_logo.png
-ha_category: Sensor
+ha_category: DIY
 ha_release: 0.27
 ha_iot_class: "Local Polling"
 ---
@@ -17,6 +17,8 @@ The MH-Z19 is a small non-dispersive infrared sensor that can measure CO2 level.
 
 Check out the [Open Home Automation web site](https://www.open-homeautomation.com/2016/08/24/monitor-co2-levels-in-your-house/) for a quick guide how to connect the sensor to your PC or Raspberry Pi.
 
+## {% linkable_title Configuration %}
+
 To use this sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.postnl.markdown b/source/_components/sensor.postnl.markdown
index 3fa41230239..0510b0dd14b 100644
--- a/source/_components/sensor.postnl.markdown
+++ b/source/_components/sensor.postnl.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: postnl.png
-ha_category: Sensor
+ha_category: Postal Service
 ha_release: 0.69
 ha_iot_class: "Cloud Polling"
 ---
diff --git a/source/_components/sensor.radarr.markdown b/source/_components/sensor.radarr.markdown
index 94a46655485..8795896f9e7 100644
--- a/source/_components/sensor.radarr.markdown
+++ b/source/_components/sensor.radarr.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: radarr.png
-ha_category: Sensor
+ha_category: Downloading
 ha_release: 0.47
 ---
 
diff --git a/source/_components/sensor.sonarr.markdown b/source/_components/sensor.sonarr.markdown
index 13a4944feaa..93b070adcee 100644
--- a/source/_components/sensor.sonarr.markdown
+++ b/source/_components/sensor.sonarr.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: sonarr.png
-ha_category: Sensor
+ha_category: Downloading
 ha_release: 0.34
 ha_iot_class: "Local Polling"
 ---
diff --git a/source/_components/sensor.spotcrime.markdown b/source/_components/sensor.spotcrime.markdown
index b36d01b4b46..73bda02a894 100644
--- a/source/_components/sensor.spotcrime.markdown
+++ b/source/_components/sensor.spotcrime.markdown
@@ -7,15 +7,19 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: Sensor
+ha_category: Social
 ha_release: 0.65
 ha_iot_class: "Cloud Polling"
 ---
 
 The `spotcrime` sensor allows one to track reported incidents occurring in a given area. Incidents include anything reported to [Spot Crime](http://spotcrime.com). Your regional emergency services may or may not report data. The sensor defaults to counting incidents within one day, but can be customized via configuration.yaml.
 
+## {% linkable_title Setup %}
+
 You will need to request an API key from [Spotcrime](mailto:pyrrhus@spotcrime.com).
 
+## {% linkable_title Configuration %}
+
 To enable this sensor, add the following lines to your `configuration.yaml`. Your `radius` should be of sufficient size to capture incidents in your area. 0.01 = 1 mile.
 
 ```yaml
diff --git a/source/_components/sensor.temper.markdown b/source/_components/sensor.temper.markdown
index 09626f0984e..65fd75fd725 100644
--- a/source/_components/sensor.temper.markdown
+++ b/source/_components/sensor.temper.markdown
@@ -7,13 +7,15 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: Sensor
+ha_category: DIY
 ha_iot_class: "Local Push"
 ha_release: pre 0.7
 ---
 
 This `temper` sensor platform allows you to get the current temperature from a TEMPer device.
 
+## {% linkable_title Configuration %}
+
 To use your TEMPer sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.ups.markdown b/source/_components/sensor.ups.markdown
index 6e1989bfe22..fe1ae61a91a 100644
--- a/source/_components/sensor.ups.markdown
+++ b/source/_components/sensor.ups.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: ups.png
-ha_category: Sensor
+ha_category: Postal Service
 ha_release: 0.39
 ha_iot_class: "Cloud Polling"
 ---
 
 The `ups` platform allows one to track deliveries by the [UPS](https://www.ups.com/). To use this sensor, you need a [My UPS Account](https://www.ups.com/mychoice).
 
+## {% linkable_title Configuration %}
+
 To enable this sensor, add the following lines to your `configuration.yaml`:
 
 ```yaml
diff --git a/source/_components/sensor.uscis.markdown b/source/_components/sensor.uscis.markdown
index 3d214dc818a..8dbedc2a3cb 100644
--- a/source/_components/sensor.uscis.markdown
+++ b/source/_components/sensor.uscis.markdown
@@ -3,7 +3,7 @@ layout: page
 title: USCIS Sensor
 description: "Instructions on how to set up USCIS within Home Assistant."
 date: 2018-03-21 08:00
-sidebar: false
+sidebar: true
 comments: false
 sharing: true
 footer: true
@@ -15,7 +15,9 @@ ha_iot_class: "Cloud Polling"
 
 The `uscis` sensor component allows you get updates on your USCIS case using your case/receipt number. The sensor gets the case information from [USCIS Website]( https://egov.uscis.gov/casestatus/landing.do)
 
-## Example for `configuration.yaml` :
+## {% linkable_title Configuration %}
+
+To use your Sonarr sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 sensor:
@@ -25,7 +27,7 @@ sensor:
 ```
 
 {% configuration %}
-friendly_name:
+name:
   description: Name of the sensor in Home Assistant.
   required: false
   default: USCIS
diff --git a/source/_components/sensor.usps.markdown b/source/_components/sensor.usps.markdown
index 46244107308..89d7029a0a8 100644
--- a/source/_components/sensor.usps.markdown
+++ b/source/_components/sensor.usps.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: usps.png
-ha_category: Sensor
+ha_category: Postal Service
 ha_release: 0.36
 ha_iot_class: "Cloud Polling"
 ---
diff --git a/source/_components/sensor.yahoo_finance.markdown b/source/_components/sensor.yahoo_finance.markdown
index 0e8d12c0fbe..937dc442b44 100644
--- a/source/_components/sensor.yahoo_finance.markdown
+++ b/source/_components/sensor.yahoo_finance.markdown
@@ -20,6 +20,8 @@ ha_release: 0.29
 
 The `yahoo_finance` platform uses [Yahoo Finance](https://finance.yahoo.com/) to monitor the stock market.
 
+## {% linkable_title Configuration %}
+
 To enable the `yahoo_finance` platform, add the following lines to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/usps.markdown b/source/_components/usps.markdown
index 3a7c9a06abe..a95efd919ab 100644
--- a/source/_components/usps.markdown
+++ b/source/_components/usps.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: usps.png
-ha_category: Hub
+ha_category: Postal Service
 ha_release: 0.52
 ha_iot_class: "Cloud Polling"
 ---