diff --git a/source/_components/arcam_fmj.markdown b/source/_components/arcam_fmj.markdown
index bfe85d9dc49..4071981ddad 100644
--- a/source/_components/arcam_fmj.markdown
+++ b/source/_components/arcam_fmj.markdown
@@ -1,12 +1,6 @@
 ---
-layout: page
 title: "Arcam FMJ Receivers"
 description: "Instructions on how to integrate Arcam FMJ Receivers into Home Assistant."
-date: 2019-04-28 13:59 +0200
-sidebar: true
-comments: false
-sharing: true
-footer: true
 logo: arcam.svg
 ha_category: Media Player
 ha_release: 0.96
diff --git a/source/_components/aurora_abb_powerone.markdown b/source/_components/aurora_abb_powerone.markdown
index ac40f5dab11..2ae6e0370b6 100644
--- a/source/_components/aurora_abb_powerone.markdown
+++ b/source/_components/aurora_abb_powerone.markdown
@@ -1,12 +1,6 @@
 ---
-layout: page
 title: "Aurora ABB Powerone PV Inverter Sensor"
 description: "Instructions on how to integrate an Aurora ABB Powerone solar inverter within Home Assistant."
-date: 2019-06-27 23:30
-sidebar: true
-comments: false
-sharing: true
-footer: true
 logo: powerone.png
 ha_category:
   - Sensor
diff --git a/source/_components/notion.markdown b/source/_components/notion.markdown
index e9dcc8ca8d1..20c601549d2 100644
--- a/source/_components/notion.markdown
+++ b/source/_components/notion.markdown
@@ -1,10 +1,6 @@
 ---
-layout: page
 title: "Notion"
 description: "How to integrate Notion kits within Home Assistant."
-date: 2019-06-19 20:52
-sidebar: true
-comments: false
 logo: notion.png
 ha_category:
   - Hub
diff --git a/source/_components/trafikverket_train.markdown b/source/_components/trafikverket_train.markdown
index 7237bcb4b86..0c78712b0c4 100644
--- a/source/_components/trafikverket_train.markdown
+++ b/source/_components/trafikverket_train.markdown
@@ -1,12 +1,6 @@
 ---
-layout: page
 title: "Trafikverket Train"
 description: "Instructions how to integrate Trafikverket Train within Home Assistant."
-date: 2019-04-27 16:32
-sidebar: true
-comments: false
-sharing: true
-footer: true
 logo: trafikverket.png
 ha_category:
   - Transport
@@ -34,7 +28,7 @@ Data that is retrieved:
 - Other information / additional texts.
 - Deviations.
 
-## {% linkable_title Configuration %}
+## Configuration
 
 To enable this sensor, use the following format in your `configuration.yaml`.
 
@@ -86,15 +80,15 @@ trains:
       default: "[mon, tue, wed, thu, fri, sat, sun]"
 {% endconfiguration %}
 
-## {% linkable_title Obtaining API key %}
+## Obtaining API key
 
 Please click [here](https://api.trafikinfo.trafikverket.se/) and register to obtain the API key.
 
-## {% linkable_title Train station names %}
+## Train station names
 
 Click [here](https://www.trafikverket.se/trafikinformation/tag/?ArrDep=departure&) to see an example of train station names.
 
-## {% linkable_title Examples %}
+## Examples
 
 ```yaml
 sensor:
diff --git a/source/_components/vacuum.template.markdown b/source/_components/vacuum.template.markdown
index 7c0f00796a2..0b705d7f27c 100644
--- a/source/_components/vacuum.template.markdown
+++ b/source/_components/vacuum.template.markdown
@@ -1,12 +1,6 @@
 ---
-layout: page
 title: "Template Vacuum"
 description: "Instructions how to setup Template vacuums within Home Assistant."
-date: 2019-05-20 16:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
 ha_category: Vacuum
 ha_release: 0.96
 ha_iot_class: Local Push
@@ -87,9 +81,9 @@ vacuum:
         type: [string, list]
 {% endconfiguration %}
 
-## {% linkable_title Examples %}
+## Examples
 
-### {% linkable_title Control vacuum with Harmony Hub %}
+### Control vacuum with Harmony Hub
 
 This example shows how you can use a Template Vacuum to control an IR vacuum cleaner using the [Harmony Hub Remote component](/components/remote.harmony/).
 
@@ -118,7 +112,7 @@ vacuum:
               device: 52840686
 ```
 
-### {% linkable_title Vacuum with state %}
+### Vacuum with state
 
 This example shows how to use templates to specify the state of the vacuum.
 
diff --git a/source/_components/vallox.markdown b/source/_components/vallox.markdown
index c5bfc7e7e99..577cf87fe9f 100644
--- a/source/_components/vallox.markdown
+++ b/source/_components/vallox.markdown
@@ -1,12 +1,6 @@
 ---
-layout: page
 title: "Vallox Ventilation Units"
 description: "Instructions on how to integrate Vallox ventilation units into Home Assistant."
-date: 2019-06-19 20:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
 logo: vallox.png
 ha_category:
   - Fan
@@ -26,7 +20,7 @@ The **fan** platform of this integration allows you to either turn on/off the co
 
 Also, there is a **sensor** platform that exposes a number of relevant metrics like fan speed, various air temperatures and humidity.
 
-### {% linkable_title Configuration %}
+## Configuration
 
 ```yaml
 vallox:
@@ -45,7 +39,7 @@ name:
   type: string
 {% endconfiguration %}
 
-## {% linkable_title Profile Switching %}
+## Profile Switching
 
 For convenient switching of ventilation profiles in the GUI, consider using an [input_select](../input_select) hooked to an automation, for example:
 
@@ -73,9 +67,9 @@ automation:
 ```
 {% endraw %}
 
-## {% linkable_title Fan Services %}
+## Fan Services
 
-### {% linkable_title Service `vallox.set_profile` %}
+### Service `vallox.set_profile`
 
 Set the ventilation profile.
 
@@ -83,7 +77,7 @@ Set the ventilation profile.
 |------------------------|----------|------------------------------------------------------|
 | `profile`              |       no | Allowed values: `Home`, `Away`, `Boost`, `Fireplace` |
 
-### {% linkable_title Service `vallox.set_profile_fan_speed_home` %}
+### Service `vallox.set_profile_fan_speed_home`
 
 Set the fan speed of the `Home` profile.
 
@@ -91,8 +85,7 @@ Set the fan speed of the `Home` profile.
 |------------------------|----------|-------------------------------------------------|
 | `fan_speed`            |       no | Fan speed in %. `Integer`, between 0 and 100.   |
 
-
-### {% linkable_title Service `vallox.set_profile_fan_speed_away` %}
+### Service `vallox.set_profile_fan_speed_away`
 
 Set the fan speed of the `Away` profile.
 
@@ -100,7 +93,7 @@ Set the fan speed of the `Away` profile.
 |------------------------|----------|-------------------------------------------------|
 | `fan_speed`            |       no | Fan speed in %. `Integer`, between 0 and 100.   |
 
-### {% linkable_title Service `vallox.set_profile_fan_speed_boost` %}
+### Service `vallox.set_profile_fan_speed_boost`
 
 Set the fan speed of the `Boost` profile.
 
diff --git a/source/_components/wwlln.markdown b/source/_components/wwlln.markdown
index 23c4dab3b00..b7f083447f9 100644
--- a/source/_components/wwlln.markdown
+++ b/source/_components/wwlln.markdown
@@ -1,12 +1,6 @@
 ---
-layout: page
 title: "World Wide Lightning Location Network (WWLLN)"
 description: "Instructions on how to integrate WWLLN within Home Assistant."
-date: 2019-07-06 23:17
-sidebar: true
-comments: false
-sharing: true
-footer: true
 logo: wwlln.jpg
 ha_category: Geolocation
 ha_release: 0.96
@@ -70,7 +64,6 @@ the standard ones:
 | external_id        | The external ID used in the feed to identify the earthquake in the feed. |
 | publication_date   | Date and time when this event occurred. |
 
-
 ## Full Configuration
 
 ```yaml
diff --git a/source/_docs/configuration/templating.markdown b/source/_docs/configuration/templating.markdown
index 471f93846dc..018c7a5bedc 100644
--- a/source/_docs/configuration/templating.markdown
+++ b/source/_docs/configuration/templating.markdown
@@ -142,11 +142,11 @@ With strings:
 ```
 {% endraw %}
 
-### {% linkable_title Working with Groups %}
+### Working with Groups
 
 The `expand` function and filter can be used to sort entities and expand groups. It outputs a sorted array of entities with no duplicates.
 
-#### {% linkable_title Expand examples %}
+#### Expand examples
 
 {% raw %}
 ```text
@@ -200,7 +200,7 @@ These can also be combined in any combination:
 ```
 {% endraw %}
 
-#### {% linkable_title Closest examples %}
+#### Closest examples
 
 The closest function and filter will find the closest entity to the Home Assisant location:
 
diff --git a/source/_posts/2019-07-17-release-96.markdown b/source/_posts/2019-07-17-release-96.markdown
index 78a8187402a..b292bb7e327 100644
--- a/source/_posts/2019-07-17-release-96.markdown
+++ b/source/_posts/2019-07-17-release-96.markdown
@@ -1,12 +1,10 @@
 ---
-layout: post
 title: "0.96: Notion, updated sidebar, advanced mode"
 description: "We have cleaned up the climate integration and the UI."
 date: 2019-07-17 00:11:03
 date_formatted: "July 17, 2019"
 author: Paulus Schoutsen
 author_twitter: balloob
-comments: true
 categories: Release-Notes
 og_image: /images/blog/2019-07-release-96/demo-sidebar.png
 ---