diff --git a/atom.xml b/atom.xml
index 6fd0146c68..5a3f3f1562 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index e669bd9fed..3e37dec4c0 100644
--- a/blog/categories/announcements/atom.xml
+++ b/blog/categories/announcements/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Announcements | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/announcements/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 5efdd030ec..e67db910f0 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index 632e7e9b66..cd32c98e1c 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index 5b558ce4e5..c689005b80 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 81f83a7461..ecad9b252c 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 96ca3bfb19..7b171dd586 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 9677aca29a..78e23d715f 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index e48c1c8974..f9bd44b176 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml
index ae0db80cb4..6881219af1 100644
--- a/blog/categories/merchandise/atom.xml
+++ b/blog/categories/merchandise/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Merchandise | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/merchandise/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index 6f26f620cc..feb5903a35 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index 42593d54d1..27e19e767b 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index c3d91dde72..6380f19fbd 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index b86ec19200..596692e37c 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index cf30c7611a..e77e082895 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 505e4d1d5b..45334d3ece 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index e66ac0af05..e4ed9eb212 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 0919cdb34e..1e0b8d8013 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index a89ab6626d..dcb620c793 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index bb42b110bb..74687057df 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index e8fb79f9f3..4293ebb866 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index e7e3a1e1e1..de0889c7f3 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index fbe0a522d5..9dfc27dca2 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-07T19:40:50+00:00</updated>
+  <updated>2017-05-07T20:58:01+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/media_player/index.html b/components/media_player/index.html
index b443d83d3a..838912be63 100644
--- a/components/media_player/index.html
+++ b/components/media_player/index.html
@@ -228,6 +228,29 @@
     </tr>
   </tbody>
 </table>
+<h4><a class="title-link" name="service-media_playershuffle_set" href="#service-media_playershuffle_set"></a> Service <code class="highlighter-rouge">media_player/shuffle_set</code></h4>
+<p>Currently only supports Spotify.</p>
+<table>
+  <thead>
+    <tr>
+      <th>Service data attribute</th>
+      <th>Optional</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><code class="highlighter-rouge">entity_id</code></td>
+      <td>no</td>
+      <td>Target a specific media player. For example <code class="highlighter-rouge">media_player.spotify</code></td>
+    </tr>
+    <tr>
+      <td><code class="highlighter-rouge">source</code></td>
+      <td>no</td>
+      <td><code class="highlighter-rouge">true</code>/<code class="highlighter-rouge">false</code> for enabling/disabling shuffle</td>
+    </tr>
+  </tbody>
+</table>
 </article>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/components/plant/index.html b/components/plant/index.html
index b962467607..52f2d7ca2a 100644
--- a/components/plant/index.html
+++ b/components/plant/index.html
@@ -66,8 +66,11 @@
     </h1>
   </header>
   <hr class="divider">
-  <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">plant</span><span class="pi">:</span>
-  <span class="s">simulated_plant</span><span class="pi">:</span>
+  <p>This<code class="highlighter-rouge">plant</code>component lets you merge moisture, conductivity, light intensity, temperature and battery level for a plant into a single UI element. It also supports setting minimum and maximum values for each measurement and will change its state to “problem” if it is not within those limits.</p>
+<p>To use your <code class="highlighter-rouge">plant</code> sensor in your installation, add the following to your <code class="highlighter-rouge">configuration.yaml</code> file:</p>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="c1"># Example configuration.yaml entry</span>
+<span class="s">plant</span><span class="pi">:</span>
+  <span class="s">sunflower</span><span class="pi">:</span>
     <span class="s">sensors</span><span class="pi">:</span>
       <span class="s">moisture</span><span class="pi">:</span> <span class="s">sensor.mqtt_plant_moisture</span>
       <span class="s">battery</span><span class="pi">:</span> <span class="s">sensor.mqtt_plant_battery</span>
@@ -81,8 +84,51 @@
     <span class="s">min_temperature</span><span class="pi">:</span> <span class="s">15</span>
 </code></pre>
 </div>
-<h2>Using plain MQTT sensor to get the data</h2>
-<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">sensor</span><span class="pi">:</span>
+<p>Configuration variables:</p>
+<ul>
+  <li><strong>entity_id</strong> (<em>Required</em>): Set by you and is used by the component as the <code class="highlighter-rouge">entity_id</code>.
+    <ul>
+      <li><strong>sensors</strong> (<em>Required</em>):
+        <ul>
+          <li><strong>moisture</strong> (<em>Optional</em>): Moisture of the plant. Meassured in %. Can have a min and max value set optionally.</li>
+          <li><strong>battery</strong> (<em>Optional</em>): Battery level of the plant sensor. Meassured in %. Can only have a min level set optionally.</li>
+          <li><strong>temperature:</strong> (<em>Optional</em>): Temperaure of the plant. Meassured in degrees Celcius. Can have a min and max value set optionally.</li>
+          <li><strong>conductivity:</strong> (<em>Optional</em>): Conductivity of the plant. Meassured in µS/cm. Can have a min and max value set optionally.</li>
+          <li><strong>brightness:</strong> (<em>Optional</em>): Light exposure of the plant. Meassured in Lux. Can have a min and max value set optionally.</li>
+        </ul>
+      </li>
+      <li><strong>min_moisture</strong> (<em>Optional</em>): Minimum moisture level before triggering a problem.</li>
+      <li><strong>max_moisture</strong> (<em>Optional</em>): Maximum moisture level before triggering a problem.</li>
+      <li><strong>min_battery</strong> (<em>Optional</em>): Minimum battery level before triggering a problem.</li>
+      <li><strong>min_conductivity</strong> (<em>Optional</em>): Minimum conductivity level before triggering a problem.</li>
+      <li><strong>max_conductivity</strong> (<em>Optional</em>): Maximum conductivity level before triggering a problem.</li>
+      <li><strong>min_temperature</strong> (<em>Optional</em>): Minimum temperature before triggering a problem.</li>
+      <li><strong>max_temperature</strong> (<em>Optional</em>): Maximum temperature before triggering a problem.</li>
+      <li><strong>min_brightness</strong> (<em>Optional</em>): Minimum brightness before triggering a problem.</li>
+      <li><strong>max_brightness</strong> (<em>Optional</em>): Maximum brightness before triggering a problem.</li>
+    </ul>
+  </li>
+</ul>
+<h2><a class="title-link" name="examples" href="#examples"></a> Examples</h2>
+<h3>Using plain MQTT sensor to get the data</h3>
+<p>This is a practial example that uses a multiple of <code class="highlighter-rouge">MQTT sensors</code> to supply the readings used by the <code class="highlighter-rouge">plant</code> sensor.
+Another good source of this data would be the <a href="https://home-assistant.io/components/sensor.miflora/">Mi Flora</a> component.</p>
+<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="c1"># Example configuration.yaml entry</span>
+<span class="s">plant</span><span class="pi">:</span>
+  <span class="s">simulated_plant</span><span class="pi">:</span>
+    <span class="s">sensors</span><span class="pi">:</span>
+      <span class="s">moisture</span><span class="pi">:</span> <span class="s">sensor.mqtt_plant_moisture</span>
+      <span class="s">battery</span><span class="pi">:</span> <span class="s">sensor.mqtt_plant_battery</span>
+      <span class="s">temperature</span><span class="pi">:</span> <span class="s">sensor.mqtt_plant_temperature</span>
+      <span class="s">conductivity</span><span class="pi">:</span> <span class="s">sensor.mqtt_plant_conductivity</span>
+      <span class="s">brightness</span><span class="pi">:</span> <span class="s">sensor.mqtt_plant_brightness</span>
+    <span class="s">min_moisture</span><span class="pi">:</span> <span class="s">20</span>
+    <span class="s">max_moisture</span><span class="pi">:</span> <span class="s">60</span>
+    <span class="s">min_battery</span><span class="pi">:</span> <span class="s">17</span>
+    <span class="s">min_conductivity</span><span class="pi">:</span> <span class="s">500</span>
+    <span class="s">min_temperature</span><span class="pi">:</span> <span class="s">15</span>
+    
+<span class="s">sensor</span><span class="pi">:</span>
   <span class="pi">-</span> <span class="s">platform</span><span class="pi">:</span> <span class="s">mqtt</span>
     <span class="s">name</span><span class="pi">:</span> <span class="s">mqtt_plant_moisture</span>
     <span class="s">state_topic</span><span class="pi">:</span> <span class="s">test/simulated_plant</span>
diff --git a/components/vera/index.html b/components/vera/index.html
index 745d70eb03..87efadb54e 100644
--- a/components/vera/index.html
+++ b/components/vera/index.html
@@ -8,7 +8,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Vera - Home Assistant</title>
     <meta name="author" content="Home Assistant">
-    <meta name="description" content="Instructions how to setup Vera hubs within Home Assistant.">
+    <meta name="description" content="Instructions how to setup Vera Z-Wave hubs and configure devices within Home Assistant.">
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="https://home-assistant.io/components/vera/">
     <meta property="fb:app_id" content="338291289691179">
@@ -16,12 +16,12 @@
     <meta property="og:site_name" content="Home Assistant">
     <meta property="og:url" content="https://home-assistant.io/components/vera/">
     <meta property="og:type" content="article">
-    <meta property="og:description" content="Instructions how to setup Vera hubs within Home Assistant.">
+    <meta property="og:description" content="Instructions how to setup Vera Z-Wave hubs and configure devices within Home Assistant.">
     <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:site" content="@home_assistant">
     <meta name="twitter:title" content="Vera">
-    <meta name="twitter:description" content="Instructions how to setup Vera hubs within Home Assistant.">
+    <meta name="twitter:description" content="Instructions how to setup Vera Z-Wave hubs and configure devices within Home Assistant.">
     <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
     <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
     <link href="/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
@@ -68,7 +68,7 @@
   <hr class="divider">
   <p>The <a href="http://getvera.com">Vera</a> hub is a controller mainly connecting to Z-Wave devices.</p>
 <p>Switches, Lights (inc Dimmers), Locks, Sensors and Binary sensors are supported - and will be automatically added when HA connects to your Vera controller.</p>
-<p>To use  Vera devices in your installation, add the following to your configuration.yaml file using the IP and port number of your Vera controller:</p>
+<p>To use Vera devices in your installation, add the following to your configuration.yaml file using the IP and port number of your Vera controller:</p>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">vera</span><span class="pi">:</span>
   <span class="s">vera_controller_url</span><span class="pi">:</span> <span class="s">http://192.168.1.161:3480/</span>
 </code></pre>
@@ -80,9 +80,10 @@
 <p class="note">
   It is recommended to assign a static IP address to your Vera Controller. This ensures that it won’t change IP addresses, so you won’t have to change the <code class="highlighter-rouge">vera_controller_url</code> if it reboots and comes up with a different IP address. See your router’s manual for details on how to set this up. If you need the MAC address of your Vera, check the label on the bottom.
 </p>
+<h3><a class="title-link" name="configure-devices" href="#configure-devices"></a> Configure devices</h3>
 <p>By default your switches will be added to Home Assistant as switches, however if some of them are light switches, you can tell Home Assistant this using the optional <code class="highlighter-rouge">lights</code> parameter as shown below.</p>
-<p>Vera imports detailed zwave devices into Home Assistant. This can include system devices and other devices that you don’t use, you can tell Home Assistant not to load these devices using the <code class="highlighter-rouge">exclude:</code> parameter as shown below.</p>
-<p>You can find the vera device id either by looking at your vera controller or by checking the <code class="highlighter-rouge">Vera Device Id</code> attribute on each device imported into Home Assistant.</p>
+<p>Vera imports detailed Z-Wave devices into Home Assistant. This can include system devices and other devices that you don’t use, you can tell Home Assistant not to load these devices using the <code class="highlighter-rouge">exclude:</code> parameter as shown below.</p>
+<p>You can find the Vera device id either via the advanced properties of the device in the Vera UI or by checking the <code class="highlighter-rouge">Vera Device Id</code> attribute on each device imported into Home Assistant (under the developer tools).</p>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">vera</span><span class="pi">:</span>
   <span class="s">vera_controller_url</span><span class="pi">:</span> <span class="s">http://192.168.1.161:3480/</span>
   <span class="c1"># Optional to exclude devices - this is a list of vera device ids</span>
@@ -91,6 +92,8 @@
   <span class="s">lights</span><span class="pi">:</span> <span class="pi">[</span><span class="nv">15</span><span class="pi">,</span> <span class="nv">17</span><span class="pi">,</span> <span class="nv">19</span><span class="pi">,</span> <span class="nv">21</span><span class="pi">,</span> <span class="nv">22</span><span class="pi">,</span> <span class="nv">24</span><span class="pi">,</span> <span class="nv">26</span><span class="pi">,</span> <span class="nv">43</span><span class="pi">,</span> <span class="nv">64</span><span class="pi">,</span> <span class="nv">70</span><span class="pi">,</span> <span class="nv">87</span><span class="pi">]</span>
 </code></pre>
 </div>
+<h3><a class="title-link" name="using-z-wave-devices-in-automation" href="#using-z-wave-devices-in-automation"></a> Using Z-Wave devices in automation</h3>
+<p>If you want to use a Z-Wave device from the Vera controller in Home Assistant automation, you’ll need the entity id. In the Home Assistant UI you’ll find all entities listed under the <img src="/images/screenshots/developer-tool-states-icon.png" alt="service developer tool icon" class="no-shadow" height="38" /> icon of the Developer Tools section. Look for entities that contain ‘Vera Device Id’ in their attributes, you’ll find the entity id on the left.</p>
 </article>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/sitemap.xml b/sitemap.xml
index 21a6b4937d..aedd719f3f 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3351,62 +3351,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-05-07T19:39:55+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-05-07T19:39:56+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-05-07T19:39:56+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-05-07T19:39:56+00:00</lastmod>
+<lastmod>2017-05-07T20:57:11+00:00</lastmod>
 </url>
 </urlset>