diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a981cd420fc..e041b33ae3c 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -6,6 +6,9 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Use Bash as the default shell
 ENV SHELL=/bin/bash 
 
+# Set an environment variable to be able to detect we are in dev container
+ENV DEVCONTAINER=true
+
 # Locale env vars
 ENV \
     LANG=en_US.UTF-8 \
diff --git a/Rakefile b/Rakefile
index 20aba5bf915..860f95e79c4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -89,6 +89,7 @@ end
 desc "preview the site in a web browser"
 task :preview, :listen do |t, args|
   listen_addr = args[:listen] || '127.0.0.1'
+  listen_addr = '0.0.0.0' unless ENV['DEVCONTAINER'].nil?
   raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." unless File.directory?(source_dir)
   puts "Starting to watch source with Jekyll and Compass. Starting Rack on port #{server_port}"
   system "compass compile --css-dir #{source_dir}/stylesheets" unless File.exist?("#{source_dir}/stylesheets/screen.css")
diff --git a/_config.yml b/_config.yml
index d5ce920282a..a0df0693e03 100644
--- a/_config.yml
+++ b/_config.yml
@@ -99,8 +99,8 @@ social:
 # Home Assistant release details
 current_major_version: 0
 current_minor_version: 96
-current_patch_version: 0
-date_released: 2019-07-17
+current_patch_version: 1
+date_released: 2019-07-18
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.
diff --git a/source/_components/aprs.markdown b/source/_components/aprs.markdown
index 8dc6cf88e8d..6e6e1993ab2 100644
--- a/source/_components/aprs.markdown
+++ b/source/_components/aprs.markdown
@@ -17,7 +17,7 @@ To enable APRS tracking in Home Assistant, add the following section to `configu
 # Example configuration.yaml entry
 device_tracker:
   - platform: aprs
-    username: FO0BAR
+    username: FO0BAR  # or FO0BAR-1 to FO0BAR-15
     callsigns:
       - 'XX0FOO*'
       - 'YY0BAR-1'
@@ -25,7 +25,7 @@ device_tracker:
 
 {% configuration %}
 username:
-  description: Your callsign. This is used to connect to the host.
+  description: "Your callsign (or callsign-SSID combination). This is used to connect to the host. Note: Do not use the same callsign or callsign-SSID combination as a device you intend to track: the APRS-IS network will not route the packets to Home Assistant. This is a known limitation of APRS packet routing."
   required: true
   type: string
 password:
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/bbox.markdown b/source/_components/bbox.markdown
index 48e36e05bd8..336f31c4f19 100644
--- a/source/_components/bbox.markdown
+++ b/source/_components/bbox.markdown
@@ -13,7 +13,7 @@ redirect_from:
  - /components/device_tracker.bbox/
 ---
 
-The `bbox` platform uses the [Bbox Modem Router](https://fr.wikipedia.org/wiki/Bbox/) from the French Internet provider Bouygues Telecom. Sensors are mainly bandwidth measures.
+The `bbox` platform uses the [Bbox Modem Router](https://www.bouyguestelecom.fr/offres-internet/bbox-fit) from the French Internet provider Bouygues Telecom. Sensors are mainly bandwidth measures.
 
 There is currently support for the following device types within Home Assistant:
 
@@ -26,7 +26,7 @@ Due to third party limitation, the sensors will only be available if Home Assist
 
 ## Presence Detection
 
-The `bbox` platform offers presence detection by looking at connected devices to a [Bbox](https://fr.wikipedia.org/wiki/Bbox) based router from [Bouygues](https://www.bouyguestelecom.fr/), which is one of the main Internet provider in France.
+The `bbox` platform offers presence detection by looking at connected devices to a [Bbox](https://www.bouyguestelecom.fr/offres-internet/bbox-fit) based router from [Bouygues](https://www.bouyguestelecom.fr/), which is one of the main Internet provider in France.
 
 Bbox is a generic name for different hardware routers. The platform has been tested with the following devices:
 
@@ -90,4 +90,4 @@ monitored_variables:
       description: Instant measure of the current used bandwidth for download.
     current_up_bandwidth:
       description: Instant measure of the current used bandwidth for upload.
-{% endconfiguration %}
\ No newline at end of file
+{% endconfiguration %}
diff --git a/source/_components/bh1750.markdown b/source/_components/bh1750.markdown
index a4e62649851..3d407b30fea 100644
--- a/source/_components/bh1750.markdown
+++ b/source/_components/bh1750.markdown
@@ -10,7 +10,7 @@ redirect_from:
  - /components/sensor.bh1750/
 ---
 
-The `bh1750` sensor platform allows you to read the ambient light level in Lux from a [BH1750FVI sensor](http://cpre.kmutnb.ac.th/esl/learning/bh1750-light-sensor/bh1750fvi-e_datasheet.pdf) connected via [I2c](https://en.wikipedia.org/wiki/I²C) bus (SDA, SCL pins). It allows you to use all the resolution modes of the sensor described in its datasheet.
+The `bh1750` sensor platform allows you to read the ambient light level in Lux from a [BH1750FVI sensor](https://www.mouser.com/ds/2/348/bh1750fvi-e-186247.pdf) connected via [I2c](https://en.wikipedia.org/wiki/I²C) bus (SDA, SCL pins). It allows you to use all the resolution modes of the sensor described in its datasheet.
 
 Tested devices:
 
diff --git a/source/_components/camera.mqtt.markdown b/source/_components/camera.mqtt.markdown
index 68a06eb5659..76d52029349 100644
--- a/source/_components/camera.mqtt.markdown
+++ b/source/_components/camera.mqtt.markdown
@@ -10,7 +10,7 @@ ha_iot_class: Configurable
 
 The `mqtt` camera platform allows you to integrate the content of an image file sent through MQTT into Home Assistant as a camera. Every time a message under the `topic` in the configuration is received, the image displayed in Home Assistant will also be updated.
 
-This can be used with an application or a service capable of sending images through MQTT, for example [Zanzito](https://play.google.com/store/apps/details?id=it.barbaro.zanzito).
+This can be used with an application or a service capable of sending images through MQTT.
 
 ## Configuration
 
diff --git a/source/_components/cppm.markdown b/source/_components/cppm.markdown
index 0414c51f099..d30b472ec27 100644
--- a/source/_components/cppm.markdown
+++ b/source/_components/cppm.markdown
@@ -16,7 +16,7 @@ Supported platforms (tested):
 
 <div class='note warning'>
 
-You must first create an API client [here](https://clearpass.server.com/guest/api_clients.php).
+You must first create an API client [here](https://www.arubanetworks.com/techdocs/ClearPass/6.6/Guest/Content/AdministrationTasks1/CreateEditAPIclient.htm).
 
 </div>
 
diff --git a/source/_components/ddwrt.markdown b/source/_components/ddwrt.markdown
index 291a84d867e..720d8ec511c 100644
--- a/source/_components/ddwrt.markdown
+++ b/source/_components/ddwrt.markdown
@@ -9,7 +9,7 @@ redirect_from:
  - /components/device_tracker.ddwrt/
 ---
 
-This platform offers presence detection by looking at connected devices to a [DD-WRT](http://www.dd-wrt.com/site/index) based router.
+This platform offers presence detection by looking at connected devices to a [DD-WRT](https://dd-wrt.com/) based router.
 
 To use a DD-WRT router in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/ecobee.markdown b/source/_components/ecobee.markdown
index 3fe50fb3ce6..004ac5f2633 100644
--- a/source/_components/ecobee.markdown
+++ b/source/_components/ecobee.markdown
@@ -142,7 +142,7 @@ auto, and off.
 
 ## Services
 
-The following extra services are provided by the Ecobee Thermostat: `resume_program`.
+Besides the standard services provided by the Home Assistant [Climate](https://www.home-assistant.io/components/climate/) integration, the following extra service is provided by the Ecobee Thermostat: `resume_program`.
 
 ### Service `resume_program`
 
diff --git a/source/_components/freebox.markdown b/source/_components/freebox.markdown
index 04327b4e502..d1ec96b5197 100644
--- a/source/_components/freebox.markdown
+++ b/source/_components/freebox.markdown
@@ -45,9 +45,9 @@ port:
   type: string
 {% endconfiguration %}
 
-You can find out your Freebox host and port by opening
-[this address](http://mafreebox.freebox.fr/api_version) in your browser. The
+You can find out your Freebox host and port by opening the address mafreebox.freebox.fr/api_version in your browser. The
 returned json should contain an api_domain (`host`) and a https_port (`port`).
+Please consult the [api documentation](https://dev.freebox.fr/sdk/os/) for more information.
 
 ### Initial setup
 
diff --git a/source/_components/frontier_silicon.markdown b/source/_components/frontier_silicon.markdown
index d71ce1e1d33..e44058fe4c7 100644
--- a/source/_components/frontier_silicon.markdown
+++ b/source/_components/frontier_silicon.markdown
@@ -100,8 +100,8 @@ The Frontier Silicon API does not provide a multi-user environment. There is alw
 [Medion Radios]: http://internetradio.medion.com/
 [IR110]: https://www.hama.com/00054823/hama-ir110-internet-radio-internet-radio-multi-room-app-control
 [DIR3110]: https://www.hama.com/00054824/hama-digitalradio-dir3110-internetradio-dab+-fm-multiroom-app-steuerung
-[MD 87466]: https://www.medion.com/de/shop/internet-dab-radios-medion-kuechen-internetradio-medion-p83302-md-87466-50051273a1.html
-[SIRD 14 C2]: https://www.lidl.de/de/silvercrest-stereo-internetradio-sird-14-c2/p233545
+[MD 87466]: https://www.medion.com/gb/service/start/_product.php?msn=50051273&gid=14
+[SIRD 14 C2]: https://www.silvercrest-multiroom.de/fileadmin/user_upload/pdf/handbucher/Bedienungsanleitungen/IR/279398_SIRD_14_C2_ML4_V1.1_GB_CZ_SK_DE.pdf
 [fsapi]: https://github.com/zhelev/python-fsapi
 [UNDOK]: http://www.frontier-silicon.com/undok
 [flammy]: https://github.com/flammy/fsapi/
diff --git a/source/_components/generic_thermostat.markdown b/source/_components/generic_thermostat.markdown
index 348c8911ae2..ce18077f285 100644
--- a/source/_components/generic_thermostat.markdown
+++ b/source/_components/generic_thermostat.markdown
@@ -73,7 +73,7 @@ keep_alive:
   required: false
   type: [time, integer]
 initial_hvac_mode:
-  description: Set the initial HVAC mode. Valid values are `heat`, `cool` or `auto`. Value has to be double quoted. If this parameter is not set, it is preferable to set a *keep_alive* value. This is helpful to align any discrepancies between *generic_thermostat* and *heater* state.
+  description: Set the initial HVAC mode. Valid values are `off`, `heat` or `cool`. Value has to be double quoted. If this parameter is not set, it is preferable to set a *keep_alive* value. This is helpful to align any discrepancies between *generic_thermostat* and *heater* state.
   required: false
   type: string
 away_temp:
diff --git a/source/_components/geo_location.markdown b/source/_components/geo_location.markdown
index b115262e62b..a4ef666e619 100644
--- a/source/_components/geo_location.markdown
+++ b/source/_components/geo_location.markdown
@@ -15,11 +15,12 @@ The [Geolocation trigger](/docs/automation/trigger/#geolocation-trigger) can be
 
 | Platform                                          | Source                        |
 |---------------------------------------------------|-------------------------------|
-| GeoJSON Events                                    | `geo_json_events`             |
-| IGN Sismología                                    | `ign_sismologia`              |
-| NSW Rural Fire Service Incidents                  | `nsw_rural_fire_service_feed` |
-| Queensland Bushfire Alert                         | `qld_bushfire`                |
-| U.S. Geological Survey Earthquake Hazards Program | `usgs_earthquakes_feed`       |
+| GeoJSON Events                                    | `geo_json_events`               |
+| IGN Sismología                                    | `ign_sismologia`                |
+| NSW Rural Fire Service Incidents                  | `nsw_rural_fire_service_feed`   |
+| Queensland Bushfire Alert                         | `qld_bushfire`                  |
+| U.S. Geological Survey Earthquake Hazards Program | `usgs_earthquakes_feed`         |
+| The World Wide Lightning Location Network         | `wwlln`                         |
 
 Conditions can be used to further filter entities, for example by inspecting their state attributes.
 
diff --git a/source/_components/google_assistant.markdown b/source/_components/google_assistant.markdown
index ab4f6bdaec0..4f2d5aba68e 100644
--- a/source/_components/google_assistant.markdown
+++ b/source/_components/google_assistant.markdown
@@ -29,7 +29,7 @@ To use Google Assistant, your Home Assistant configuration has to be [externally
 ## Migrate to release 0.80 and above
 <div class='note'>
 
-If this is the first time setting up your Google Assistant integration, you can skip this section and continue with the [maual setup instructions](#first-time-setup) below.
+If this is the first time setting up your Google Assistant integration, you can skip this section and continue with the [manual setup instructions](#first-time-setup) below.
 
 </div>
 
diff --git a/source/_components/heatmiser.markdown b/source/_components/heatmiser.markdown
index d63a58764fc..57514e613bb 100644
--- a/source/_components/heatmiser.markdown
+++ b/source/_components/heatmiser.markdown
@@ -10,7 +10,7 @@ redirect_from:
  - /components/climate.heatmiser/
 ---
 
-The `heatmiser` climate platform let you control [Heatmiser DT/DT-E/PRT/PRT-E](https://www.heatmisershop.co.uk/thermostats) thermostats from Heatmiser. The module itself is currently setup to work over a RS232 -> RS485 converter, therefore it connects over IP.
+The `heatmiser` climate platform let you control [Heatmiser DT/DT-E/PRT/PRT-E](https://www.heatmisershop.co.uk/room-thermostats/) thermostats from Heatmiser. The module itself is currently setup to work over a RS232 -> RS485 converter, therefore it connects over IP.
 
 Further work would be required to get this setup to connect over Wifi, but the HeatmiserV3 python module being used is a full implementation of the V3 protocol.
 
diff --git a/source/_components/hydrawise.markdown b/source/_components/hydrawise.markdown
index ff00aee162c..07abf835472 100644
--- a/source/_components/hydrawise.markdown
+++ b/source/_components/hydrawise.markdown
@@ -45,7 +45,7 @@ scan_interval:
   default: 30
 {% endconfiguration %}
 
-To get your API access token log into your [Hydrawise account](https://app.hydrawise.com/config/account) and in the 'My Account Details' section under Account Settings click 'Generate API Key'. Enter that key in your configuration file as the `API_KEY`.
+To get your API access token log into your [Hydrawise account](https://app.hydrawise.com/config/login) and in the 'My Account Details' section under Account Settings click 'Generate API Key'. Enter that key in your configuration file as the `API_KEY`.
 
 ## Binary Sensor
 
@@ -141,4 +141,4 @@ switch:
 switch:
   - platform: hydrawise
     monitored_conditions: manual_watering
-```
\ No newline at end of file
+```
diff --git a/source/_components/ifttt.markdown b/source/_components/ifttt.markdown
index 3a0a2eb4be5..36d15bcdfad 100644
--- a/source/_components/ifttt.markdown
+++ b/source/_components/ifttt.markdown
@@ -81,7 +81,7 @@ ifttt:
 
 ### Testing your trigger
 
-You can use the **Developer tools** to test your [Webhooks](https://ifttt.com/maker_webhooks) trigger. To do this, open the Home Assistant frontend, open the sidebar, click on the first icon in the developer tools. This should get you to the **Call Service** screen. Fill in the following values:
+You can use **Developer Tools** to test your [Webhooks](https://ifttt.com/maker_webhooks) trigger. To do this, open the Home Assistant sidebar, click on Developer Tools, and then the **Services** tab. Fill in the following values:
 
 Field | Value
 ----- | -----
diff --git a/source/_components/input_datetime.markdown b/source/_components/input_datetime.markdown
index 7332b6205c2..406575ab317 100644
--- a/source/_components/input_datetime.markdown
+++ b/source/_components/input_datetime.markdown
@@ -21,13 +21,16 @@ add the following lines to your `configuration.yaml`:
 input_datetime:
   both_date_and_time:
     name: Input with both date and time
-    has_    has_time: true
+    has_date: true
+    has_time: true
   only_date:
     name: Input with only date
-    has_    has_time: false
+    has_date: true
+    has_time: false
   only_time:
     name: Input with only time
-    has_    has_time: true
+    has_date: false
+    has_time: true
 ```
 
 {% configuration %}
diff --git a/source/_components/kwb.markdown b/source/_components/kwb.markdown
index 9443bb92505..ebee98cdf92 100644
--- a/source/_components/kwb.markdown
+++ b/source/_components/kwb.markdown
@@ -10,7 +10,7 @@ redirect_from:
  - /components/sensor.kwb/
 ---
 
-The `kwb` integration integrates the sensors of KWB Easyfire pellet central heating units with the Comfort3 controller (<http://www.kwbheizung.de/de/produkte/kwb-comfort-3.html>) into Home Assistant.
+The `kwb` integration integrates the sensors of KWB Easyfire pellet central heating units with the Comfort3 controller (https://www.kwb.net/produkte/) into Home Assistant.
 
 Direct connection via serial (RS485) or via telnet terminal server is supported. The serial cable has to be attached to the control unit port 25 (which is normally used for detached control terminals).
 
diff --git a/source/_components/lcn.markdown b/source/_components/lcn.markdown
index 8153567d862..3b8dc83ea94 100644
--- a/source/_components/lcn.markdown
+++ b/source/_components/lcn.markdown
@@ -423,7 +423,7 @@ If the control is set lockable, the regulator can be turned on/off.
 
 <div class='note'>
 
-If you intend to leave the regulation to home assistant, you should consider using the [Generic Thermostat](climate.generic_thermostat) in conjuction with [LCN Sensor](#sensor) and [LCN Switch](#switch).
+If you intend to leave the regulation to home assistant, you should consider using the [Generic Thermostat](/components/generic_thermostat/) in conjuction with [LCN Sensor](#sensor) and [LCN Switch](#switch).
 
 </div>
 
diff --git a/source/_components/miflora.markdown b/source/_components/miflora.markdown
index 966f30e9eb6..f7e519135eb 100644
--- a/source/_components/miflora.markdown
+++ b/source/_components/miflora.markdown
@@ -119,7 +119,8 @@ sensor:
   - platform: miflora
     mac: 'xx:xx:xx:xx:xx:xx'
     name: Flower 1
-    force_up    median: 3
+    force_update: true    
+    median: 3
     monitored_conditions:
       - moisture
       - light
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/panel_iframe.markdown b/source/_components/panel_iframe.markdown
index 503645da64f..0d79abffc6d 100644
--- a/source/_components/panel_iframe.markdown
+++ b/source/_components/panel_iframe.markdown
@@ -64,6 +64,6 @@ panel_iframe:
 
 <div class='note warning'>
 
-Do **not** create one that are named `lovelace` it will overwrite lovelace causing it to never load.
+Do **not** create one that is named `lovelace` it will overwrite lovelace causing it to never load.
 
 </div>
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/weblink.markdown b/source/_components/weblink.markdown
index b5119a3e823..3cb968fb35f 100644
--- a/source/_components/weblink.markdown
+++ b/source/_components/weblink.markdown
@@ -10,6 +10,10 @@ ha_qa_scale: internal
 
 The `weblink` integration allows you to display links in the Home Assistant frontend.
 
+<div class='note'>
+The below documentation applies to the classic "States" user interface. Starting with Home Assistant 0.86, Lovelace is the new default interface. For information on configuring weblinks in Lovelace please follow [these instructions](/lovelace/entities/#weblink) instead.
+</div>
+
 ## Configuration
 
 To use this integration in your installation, add something like the following to your `configuration.yaml` file:
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/state_object.markdown b/source/_docs/configuration/state_object.markdown
index f05e85d5f07..8699d0220c6 100644
--- a/source/_docs/configuration/state_object.markdown
+++ b/source/_docs/configuration/state_object.markdown
@@ -29,9 +29,9 @@ Attribute | Description
 --------- | -----------
 `friendly_name` | Name of the entity. Example: `Kitchen Ceiling`.
 `icon` | Icon to use for the entity in the frontend. Example: `mdi:home`.
-`hidden` | Boolean if the entity should not be shown in the frontend. Example: `true`.
 `entity_picture` | URL to a picture that should be used instead of showing the domain icon. Example: `http://example.com/picture.jpg`.
 `assumed_state` | Boolean if the current state is an assumption. [More info](/blog/2016/02/12/classifying-the-internet-of-things/#classifiers) Example: `True`.
 `unit_of_measurement` | The unit of measurement the state is expressed in. Used for grouping graphs or understanding the entity. Example: `°C`.
+`hidden` | Boolean if the entity should not be shown in the frontend. Example: `true`. This does not apply to the Lovelace UI, and is only relevant for the old `states` UI.
 
 When an attribute contains spaces, you can retrieve it like this: `states.sensor.livingroom.attributes["Battery numeric"]`.
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/2017-07-25-introducing-hassio.markdown b/source/_posts/2017-07-25-introducing-hassio.markdown
index 3e70998feb9..b1b01878ff2 100644
--- a/source/_posts/2017-07-25-introducing-hassio.markdown
+++ b/source/_posts/2017-07-25-introducing-hassio.markdown
@@ -91,5 +91,4 @@ We use [Pivotal Tracker] to track things that are in progress and what we might
 [Duck DNS]: /addons/duckdns/
 [advanced-install]: /hassio/installation/#alternative-install-on-generic-linux-server
 [Pivotal Tracker]: https://www.pivotaltracker.com/n/projects/2020851
-[run-local]: /hassio/run_local/
 [Resin.io]: https://resin.io
diff --git a/source/_posts/2019-07-17-release-96.markdown b/source/_posts/2019-07-17-release-96.markdown
index 94a77dfed9e..851a5934e84 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
 ---
@@ -112,6 +110,42 @@ The Home Assistant Podcast has published [episode 53](https://hasspodcast.io/ha0
 - [climate] Add water_heater to evohome ([@zxdavb] - [#25035]) ([evohome docs]) (beta fix) (new-platform)
 - [Climate] Hive Add water heater Component post the refresh of the climate component. ([@KJonline] - [#25148]) ([hive docs]) (beta fix) (new-platform)
 
+## Release 0.96.1 - July 18
+
+- Show off value ([@pvizeli] - [#25236])
+- Fix eq3btsmart ([@pvizeli] - [#25238]) ([eq3btsmart docs])
+- Make presets prettier ([@cgtobi] - [#25245]) ([netatmo docs])
+- Fix the unit of measurement for ecobee climate ([@cgtobi] - [#25246]) ([ecobee docs])
+- ecobee Preset Fix ([@geekofweek] - [#25256]) ([ecobee docs])
+- Update CT80 Humidity call ([@zombielinux] - [#25258]) ([radiotherm docs])
+- Restore SmartThings A/C on/off services ([@andrewsayre] - [#25259]) ([smartthings docs])
+- Add hvac modes back to opentherm ([@balloob] - [#25268]) ([opentherm_gw docs])
+- Added states and modes for zwave climate ([@stboch] - [#25274]) ([zwave docs])
+
+[#25236]: https://github.com/home-assistant/home-assistant/pull/25236
+[#25238]: https://github.com/home-assistant/home-assistant/pull/25238
+[#25245]: https://github.com/home-assistant/home-assistant/pull/25245
+[#25246]: https://github.com/home-assistant/home-assistant/pull/25246
+[#25256]: https://github.com/home-assistant/home-assistant/pull/25256
+[#25258]: https://github.com/home-assistant/home-assistant/pull/25258
+[#25259]: https://github.com/home-assistant/home-assistant/pull/25259
+[#25268]: https://github.com/home-assistant/home-assistant/pull/25268
+[#25274]: https://github.com/home-assistant/home-assistant/pull/25274
+[@andrewsayre]: https://github.com/andrewsayre
+[@balloob]: https://github.com/balloob
+[@cgtobi]: https://github.com/cgtobi
+[@geekofweek]: https://github.com/geekofweek
+[@pvizeli]: https://github.com/pvizeli
+[@stboch]: https://github.com/stboch
+[@zombielinux]: https://github.com/zombielinux
+[ecobee docs]: /components/ecobee/
+[eq3btsmart docs]: /components/eq3btsmart/
+[netatmo docs]: /components/netatmo/
+[opentherm_gw docs]: /components/opentherm_gw/
+[radiotherm docs]: /components/radiotherm/
+[smartthings docs]: /components/smartthings/
+[zwave docs]: /components/zwave/
+
 ## If you need help...
 
 ...don't hesitate to use our very active [forums](https://community.home-assistant.io/) or join us for a little [chat](https://discord.gg/c5DvZ4e).
@@ -155,6 +189,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 - __Velbus__ - Added autodicovery for covers in velbus and bumped the python velbus version ([@Cereal2nd] - [#24877]) ([velbus docs])
 - __ZHA__ - ZHA entities are being removed and battery sensors are being added. We have been asked several times to remove the ZHA domain entities because they do not follow the HA standards. They were originally used to show device online / offline status, rssi, lqi and last seen. They were eventually expanded to hold battery information as well because many Zigbee devices have several power configuration clusters. Online and offline handling, rssi, lqi last seen and the handling of device availability have all been moved to the device object and battery information has been split back out into its own sensor. Any users that created template sensors that leveraged the data in the ZHA entities will be affected by this change. ([@dmulcahey] - [#24909]) ([zha docs])
 - __Netatmo__ - If the module type can not be determined the climate device will default to the type "valve" as it implements a subset of "thermostat". Consequently those devices wont be able to be turned off. This should not be a major issue and should only happen when there are issues with the data retrieved form the Netatmo API. ([@cgtobi] - [#25029]) ([netatmo docs])
+- __Netatmo__ - The configuration of individual monitored conditions has been removed so that now all conditions are available per module by default. ([@cgtobi] - [#24944]) (netatmo docs)
 - __GeoJSON Events__ - Update geojson_client library to version 0.4.This changes the access to the external feed from HTTP to HTTPS for the nsw_rural_fire_service_feed platform. This should normally not make any difference to anyone consuming this feed. Only if for example you have set up a template sensor or automation that reads the external_id attribute of a geo_location entity and compare it against a pattern, would you need to change this. ([@exxamalte] - [#25039]) ([geo_json_events docs]) ([nsw_rural_fire_service_feed docs]) ([usgs_earthquakes_feed docs])
 
 ## Beta Fixes
diff --git a/source/_posts/2019-07-19-piwheels.markdown b/source/_posts/2019-07-19-piwheels.markdown
new file mode 100644
index 00000000000..899e6a94fa0
--- /dev/null
+++ b/source/_posts/2019-07-19-piwheels.markdown
@@ -0,0 +1,68 @@
+---
+title: "Piwheel issues with older versions of Raspbian/Hassbian"
+description: "How to fix issues with piwheels on older versions of Hassbian/Raspbian"
+date: 2019-07-19 12:00:00
+date_formatted: "July 19, 2019"
+author: Joakim Sørensen
+categories: Announcements
+---
+
+_If you are using [Hass.io](https://www.home-assistant.io/hassio/installation/), [Docker](https://www.home-assistant.io/docs/installation/docker/) or a distro based on Debian Buster this does not apply to you._
+
+After upgrading to Home Assistant version 0.96.0, some users started seeing errors like this:
+
+```text
+ImportError: /usr/lib/arm-linux-gnueabihf/libssl.so.1.1: version `OPENSSL_1_1_1' not found (required by /srv/homeassistant/lib/python3.7/site-packages/cryptography/hazmat/bindings/_openssl.abi3.so
+```
+
+And all integrations that communicated with SSL (https) stopped working.
+
+This applies if you have one of these installations with a manual installation or with Hassbian:
+
+- Raspbian Jessie
+- Raspbian Stretch
+
+The reason for this, is the way piwheels determines the OS version you have by looking at the Python version that is in use.
+
+[@frenck](https://github.com/frenck) added a writeup of the issue and potential solutions to [this issue](https://github.com/home-assistant/hassbian-scripts/issues/307#issuecomment-512963048).
+
+There are two potential solutions for this issue, where option 1 are considered the best of them.
+
+## Option 1
+
+Upgrade your distribution to Debian Buster.
+
+**NB!: This option will upgrade your entire system and _might_ negatively affect other things you might have running.**
+
+Before you continue with this, you should make sure that you have a recent backup of your system.
+
+### Steps
+
+1. Change `stretch` or `jessie` to `buster` in these files:
+   - `/etc/apt/sources.list`
+   - `/etc/apt/sources.list.d/raspi.list`
+   - `/etc/apt/sources.list.d/hassbian.list`
+2. Run `sudo apt-get update`
+3. Run `sudo apt-get -y dist-upgrade`
+4. Run `sudo reboot`
+
+## Option 2
+
+Disable piwheels prebuilt packages.
+
+This option is a faster method initially, but it has the huge drawback of having to compile the packages locally.
+You should only use this option if you run other things on your system that will not work if you use the first option.
+
+### Steps
+
+1. edit `/etc/pip.conf` and comment out the line containing piwheels, like this:
+
+      ```text
+      [global]
+      # extra-index-url=https://www.piwheels.org/simple
+      ```
+
+2. Run `source /srv/homeassistant/bin/activate`
+3. Run `pip uninstall cryptography`
+4. Run `pip install --no-cache cryptography==2.7`
+5. Run `deactivate`