diff --git a/atom.xml b/atom.xml
index 6163af6fd1..d49d84e72f 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index bbfa24afb5..387dc28897 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index e98b24d38c..e00915533f 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 9f4a3695f7..d4a2d63c79 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 5b06861a5a..49e43d9c92 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index f3ecc824da..ea9df8784a 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index 8d364a2cb2..a01405d405 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index e83ca4afc4..d27ebb7971 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 8749914308..43ab85f789 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 8f66c346ae..4bdc9b18ff 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 120f38b9d2..02cdb33680 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 5492a5771e..7d1471ee84 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index c049399357..a9f14a6c70 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 1975ead979..8ffb350a2f 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index df631086eb..8fda512d96 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 7c0f2737f9..3045c32718 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index d4d7aac019..8061ae440c 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index acf8ca5a74..3ecf19d584 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>2016-05-25T14:09:11+00:00</updated>
+  <updated>2016-05-25T19:46:13+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/components/sensor.systemmonitor/index.html b/components/sensor.systemmonitor/index.html
index 811ca9c15b..145081ae08 100644
--- a/components/sensor.systemmonitor/index.html
+++ b/components/sensor.systemmonitor/index.html
@@ -122,14 +122,14 @@
 <table>
   <thead>
     <tr>
-      <th style="text-align: left">Type (- type:)</th>
-      <th style="text-align: left">Argument (arg:)</th>
+      <th style="text-align: left">Type (<code>- type:</code>)</th>
+      <th style="text-align: left">Argument (<code>arg:</code>)</th>
     </tr>
   </thead>
   <tbody>
     <tr>
       <td style="text-align: left">disk_use_percent</td>
-      <td style="text-align: left">Path, eg. ‘/’</td>
+      <td style="text-align: left">Path, eg. <code>/</code></td>
     </tr>
     <tr>
       <td style="text-align: left">disk_use</td>
@@ -165,35 +165,35 @@
     </tr>
     <tr>
       <td style="text-align: left">network_in</td>
-      <td style="text-align: left">Interface, eg. ‘eth0’</td>
+      <td style="text-align: left">Interface, eg. <code>eth0</code></td>
     </tr>
     <tr>
       <td style="text-align: left">network_out</td>
-      <td style="text-align: left">Interface, eg. ‘eth0’</td>
+      <td style="text-align: left">Interface, eg. <code>eth0</code></td>
     </tr>
     <tr>
       <td style="text-align: left">packets_in</td>
-      <td style="text-align: left">Interface, eg. ‘eth0’</td>
+      <td style="text-align: left">Interface, eg. <code>eth0</code></td>
     </tr>
     <tr>
       <td style="text-align: left">packets_out</td>
-      <td style="text-align: left">Interface, eg. ‘eth0’</td>
+      <td style="text-align: left">Interface, eg. <code>eth0</code></td>
     </tr>
     <tr>
       <td style="text-align: left">ipv4_address</td>
-      <td style="text-align: left">Interface, eg. ‘eth0’</td>
+      <td style="text-align: left">Interface, eg. <code>eth0</code></td>
     </tr>
     <tr>
       <td style="text-align: left">ipv6_address</td>
-      <td style="text-align: left">Interface, eg. ‘eth0’</td>
+      <td style="text-align: left">Interface, eg. <code>eth0</code></td>
     </tr>
     <tr>
       <td style="text-align: left">processor_use</td>
-      <td style="text-align: left">Interface, eg. ‘eth0’</td>
+      <td style="text-align: left"> </td>
     </tr>
     <tr>
       <td style="text-align: left">process</td>
-      <td style="text-align: left">Binary, eg. ‘octave-cli’</td>
+      <td style="text-align: left">Binary, eg. <code>octave-cli</code></td>
     </tr>
     <tr>
       <td style="text-align: left">last_boot</td>
diff --git a/sitemap.xml b/sitemap.xml
index b009731062..31bd906f5c 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1681,26 +1681,26 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-05-25T14:08:27+00:00</lastmod>
+    <lastmod>2016-05-25T19:45:33+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-05-25T14:08:27+00:00</lastmod>
+    <lastmod>2016-05-25T19:45:33+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-05-25T14:08:27+00:00</lastmod>
+    <lastmod>2016-05-25T19:45:33+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-05-25T14:08:27+00:00</lastmod>
+    <lastmod>2016-05-25T19:45:33+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-05-25T14:08:27+00:00</lastmod>
+    <lastmod>2016-05-25T19:45:33+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-05-25T14:08:27+00:00</lastmod>
+    <lastmod>2016-05-25T19:45:34+00:00</lastmod>
   </url>
 </urlset>