diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 76dc3dc6548..6823c57eef2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Check out files from GitHub
         uses: actions/checkout@v2.3.4
       - name: Setting up Ruby 2.6
-        uses: ruby/setup-ruby@v1.78.0
+        uses: ruby/setup-ruby@v1.79.0
         with:
           ruby-version: 2.6
       - name: Setup Ruby Gems cache
diff --git a/Gemfile b/Gemfile
index bef93375399..45ec8205d48 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ group :jekyll_plugins do
 end
 
 gem 'sinatra', '2.1.0'
-gem 'nokogiri', '1.11.7'
+gem 'nokogiri', '1.12.0'
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
 # and associated library
diff --git a/Gemfile.lock b/Gemfile.lock
index 82d62738ad2..7cc3df49d7f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,14 +70,14 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.5.3)
+    mini_portile2 (2.6.1)
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.0)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.11.7-x64-mingw32)
+    nokogiri (1.12.0-x64-mingw32)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
@@ -130,7 +130,7 @@ DEPENDENCIES
   jekyll-sitemap (= 1.4.0)
   jekyll-time-to-read (= 0.1.2)
   jekyll-toc (= 0.17.1)
-  nokogiri (= 1.11.7)
+  nokogiri (= 1.12.0)
   rake (= 13.0.6)
   sass-globbing (= 1.1.5)
   sassc (= 2.1.0)
diff --git a/_config.yml b/_config.yml
index 7ad17af55ab..af8df207535 100644
--- a/_config.yml
+++ b/_config.yml
@@ -8,7 +8,10 @@ title: Home Assistant
 subtitle: Open source home automation that puts local control and privacy first.
 author: Home Assistant
 simple_search: https://www.google.com/search
-description: Open source home automation that puts local control and privacy first.
+description: >-
+  Open source home automation that puts local control and privacy first.
+  Powered by a worldwide community of tinkerers and DIY enthusiasts.
+  Perfect to run on a Raspberry Pi or a local server.
 
 # Default date format is "ordinal" (resulting in "July 22nd 2007")
 # You can customize the format as defined in
diff --git a/source/_docs/automation/yaml.markdown b/source/_docs/automation/yaml.markdown
index 36c3368ebcf..3d0ad65144b 100644
--- a/source/_docs/automation/yaml.markdown
+++ b/source/_docs/automation/yaml.markdown
@@ -118,12 +118,12 @@ automation:
 
 ### Number of debug traces stored
 
-When using YAML you can configure the number of debugging traces stored for an automation. This is controlled with the `stored_traces` option under `traces`. Set `stored_traces` to the number of traces you wish to store for the particular automation. If not specified the default value of 5 will be used.
+When using YAML you can configure the number of debugging traces stored for an automation. This is controlled with the `stored_traces` option under `trace`. Set `stored_traces` to the number of traces you wish to store for the particular automation. If not specified the default value of 5 will be used.
 
 ```yaml
 automation:
   - alias: "Automation Name"
-    traces:
+    trace:
       stored_traces: 10
     trigger:
       - platform: ...
diff --git a/source/_includes/asides/about.html b/source/_includes/asides/about.html
index e4a12f32618..f5e5c5ddae4 100644
--- a/source/_includes/asides/about.html
+++ b/source/_includes/asides/about.html
@@ -2,7 +2,7 @@
   <h1 class="title delta">About Home Assistant</h1>
   <ul class="divided">
     <li>
-      Home Assistant is an open-source home automation platform running on Python 3. Track and control all devices at home and automate control.
+      {{ site.description }}
     </li>
     <li><a href='/getting-started/'>Get started with Home Assistant</a></li>
     <li><a href='https://demo.home-assistant.io'>Try the online demo</a></li>
diff --git a/source/_includes/asides/component_navigation.html b/source/_includes/asides/component_navigation.html
index 48e12ec653e..0d33e833122 100644
--- a/source/_includes/asides/component_navigation.html
+++ b/source/_includes/asides/component_navigation.html
@@ -1,4 +1,5 @@
-{% assign percentage = 100.0 | times: site.data.analytics_data.integrations[page.ha_domain] | divided_by: site.data.analytics_data.reports_integrations | round: 1 %}
+{% assign active_installations = site.data.analytics_data.integrations[page.ha_domain] | default: 0 %}
+{% assign percentage = 100.0 | times: active_installations | divided_by: site.data.analytics_data.reports_integrations | round: 1 %}
 <section class="aside-module grid__item one-whole lap-one-half">
   <div class='brand-logo-container section'>
     {%- if page.logo -%}
@@ -17,7 +18,7 @@
     and it's used by <a title="Open analytics.home-assistant.io" href="https://analytics.home-assistant.io/#integrations" target="_blank" rel="noopener">
     
     {% if percentage < 1 %}
-      {{ site.data.analytics_data.integrations[page.ha_domain] }}</a> active installations.
+      {{ active_installations }}</a> active installations.
     {% else %}
       {{ percentage | remove: ".0" }}%</a> of the active installations.
     {% endif %}
diff --git a/source/_includes/custom/welcome.html b/source/_includes/custom/welcome.html
index 2f3c2a73673..0f40cac8780 100644
--- a/source/_includes/custom/welcome.html
+++ b/source/_includes/custom/welcome.html
@@ -1,6 +1,6 @@
- <h1>Awaken your home</h1>
- <p class="lead">
-Open source home automation that puts local control and privacy first. Powered by a worldwide community of tinkerers and DIY enthusiasts. Perfect to run on a Raspberry Pi or a local server.
+<h1>Awaken your home</h1>
+<p class="lead">
+  {{ site.description }}
 </p>
 
 <p class='hero-buttons'>
diff --git a/source/_integrations/edl21.markdown b/source/_integrations/edl21.markdown
index 31805194240..196d4b080be 100644
--- a/source/_integrations/edl21.markdown
+++ b/source/_integrations/edl21.markdown
@@ -24,6 +24,7 @@ Compatible transceivers:
 Tested smart meters:
 
 - APATOR Norax 3D (enable InF Mode as described in manual to retrieve full data)
+- DZG DWS76 (enable InF as described in manual to retrieve full data)
 - Iskraemeco MT175 (ISKRA MT175-D2A51-V22-K0t)
 
 ## Configuration
diff --git a/source/_integrations/hikvision.markdown b/source/_integrations/hikvision.markdown
index d69de480cbe..cfb480fb517 100644
--- a/source/_integrations/hikvision.markdown
+++ b/source/_integrations/hikvision.markdown
@@ -66,6 +66,7 @@ and has been confirmed to work with the following models:
 This platform also was confirmed to work with the following Hikvison-based NVRS
 
 - N46PCK (Annke H800 4K NVR)
+- N48PAW (Annke 4K NVR)
 
 ## Configuration
 
diff --git a/source/_integrations/light.markdown b/source/_integrations/light.markdown
index 03a0f492050..659c2b75b87 100644
--- a/source/_integrations/light.markdown
+++ b/source/_integrations/light.markdown
@@ -53,7 +53,7 @@ Most lights do not support all attributes. You can check the integration documen
 | `brightness_pct`| yes | Alternatively, you can specify brightness in percent (a number between 0 and 100), where 0 means the light is off, 1 is the minimum brightness and 100 is the maximum brightness supported by the light.
 | `brightness_step` | yes | Change brightness by an amount. Should be between -255..255.
 | `brightness_step_pct` | yes | Change brightness by a percentage. Should be between -100..100.
-| `white` | yes | Set the light to white mode and change its brightness, where 0 means the light is off, 1 is the minimum brightness and 255 is the maximum brightness supported by the light.
+| `white` | yes | Set the light to white mode and change its brightness, where 0 means the light is off, 1 is the minimum brightness and 255 is the maximum brightness supported by the light. Note that `white` does not have a corresponding state attribute, the `color_mode` state attribute will to `white` and the `brightness` state attribute will be set to the requested brightness.
 | `flash` | yes | Tell light to flash, can be either value `short` or `long`.
 | `effect`| yes | Applies an effect such as `colorloop` or `random`.
 
diff --git a/source/_integrations/scene.markdown b/source/_integrations/scene.markdown
index 6ce6fcf82ca..e3b44220cf8 100644
--- a/source/_integrations/scene.markdown
+++ b/source/_integrations/scene.markdown
@@ -12,7 +12,7 @@ ha_domain: scene
 
 You can create scenes that capture the states you want certain entities to be. For example, a scene can specify that light A should be turned on and light B should be bright red.
 
-Scenes can be created and managed via the user interface using the [Scene Editor](/docs/scene/editor/). They can also be configured via `configuration.yaml`:
+Scenes can be created and managed via the user interface using the [Scene Editor](/docs/scene/editor/). They can also be manually configured via `configuration.yaml`. Note that the entity data is not service call parameters, it's a representation of the wanted state:
 
 ```yaml
 # Example configuration.yaml entry
@@ -23,17 +23,26 @@ scene:
       light.tv_back_light: "on"
       light.ceiling:
         state: "on"
-        xy_color: [0.33, 0.66]
         brightness: 200
+        color_mode: "xy"
+        xy_color: [0.33, 0.66]
   - name: Movies
     entities:
       light.tv_back_light:
         state: "on"
         brightness: 125
-      light.ceiling: off
+      light.ceiling: "off"
       media_player.sony_bravia_tv:
         state: "on"
         source: HDMI 1
+  - name: Standard
+    entities:
+      light.tv_back_light:
+        state: "off"
+      light.ceiling:
+        state: "on"
+        brightness: 125
+        color_mode: "white"
 ```
 
 {% configuration %}
diff --git a/source/_integrations/tplink.markdown b/source/_integrations/tplink.markdown
index a34f5d0e740..5dfb8ed248a 100644
--- a/source/_integrations/tplink.markdown
+++ b/source/_integrations/tplink.markdown
@@ -166,7 +166,7 @@ sensor:
         value_template: "{{ state_attr('switch.my_tp_switch','current_a') }}"
         unit_of_measurement: "A"
       my_tp_switch_watts:
-        friendly_name_template: "{{ state_attr('switch.my_tp_switch','friendly_name') }} Current Consumption"
+        friendly_name_template: "{{ state_attr('switch.my_tp_switch','friendly_name') }} Power"
         value_template: "{{ state_attr('switch.my_tp_switch','current_power_w') }}"
         unit_of_measurement: "W"
       my_tp_switch_total_kwh:
diff --git a/source/index.html b/source/index.html
index 7903ffd15a8..c0dec86e595 100644
--- a/source/index.html
+++ b/source/index.html
@@ -5,8 +5,6 @@ hero_unit: true
 is_homepage: true
 regenerate: true
 feedback: false
-description:
-  Open source home automation that puts local control and privacy first.
 ---
 
 <div class="frontpage">