diff --git a/atom.xml b/atom.xml
index 4da0e3b314..0da2345f85 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 0b2aa94204..33abc2de02 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 9bbfe3d64d..c954312457 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>2016-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 e2aa715969..c083ee4941 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 f261fba430..9bdef91744 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 011e82033d..16f34aad45 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 7e09e18659..ddd1943c7a 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 0ba6146b6f..a599d42c51 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>2016-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 1c4a9d5a8d..67d062cdc9 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>2016-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 1ea641c8b0..b33834f94e 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 53d51543fc..92407d535e 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 96fe85d74e..24769ab5c2 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 f06ecc28b9..4a7c41a5c4 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 393586124f..49a21d4110 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 e2f7bbf520..01a92dd448 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 09267a567d..c5983724f6 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 044c4260e7..2353e6c5df 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 92ce5358d6..f47cae1eec 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 ec0ec4b274..c64210878e 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 09c479b036..97e1277fd6 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+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 6e5f1f3855..adb241a095 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-11-15T07:40:23+00:00</updated>
+  <updated>2016-11-15T07:43:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/binary_sensor.digital_ocean/index.html b/components/binary_sensor.digital_ocean/index.html
index 45d56b3bf3..37473b2e10 100644
--- a/components/binary_sensor.digital_ocean/index.html
+++ b/components/binary_sensor.digital_ocean/index.html
@@ -153,9 +153,15 @@
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             Digital Ocean Binary Sensor
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/index.html b/components/index.html
index 64d4f9deea..23783bbe7a 100644
--- a/components/index.html
+++ b/components/index.html
@@ -314,14 +314,7 @@ Support for these components is provided by the Home Assistant community.
         
           <a href='#system-monitor' class="btn">
             System Monitor
-            (13)
-          </a>
-        
-      
-        
-          <a href='#system-monitoring' class="btn">
-            System Monitoring
-            (2)
+            (15)
           </a>
         
       
@@ -948,7 +941,7 @@ Support for these components is provided by the Home Assistant community.
       
       
         <a href='/components/sensor.cups/'
-           class='system-monitoring added_in_current_version'
+           class='system-monitor added_in_current_version'
            style='display: none'>
           <div class='img-container'>
             
@@ -956,7 +949,7 @@ Support for these components is provided by the Home Assistant community.
             
           </div>
           <div class='title'>CUPS Sensor</div>
-          <div class='category'>System Monitoring</div>
+          <div class='category'>System Monitor</div>
         </a>
       
     
@@ -1358,7 +1351,7 @@ Support for these components is provided by the Home Assistant community.
       
       
         <a href='/components/sensor.dovado/'
-           class='system-monitoring added_in_current_version'
+           class='system-monitor added_in_current_version'
            style='display: none'>
           <div class='img-container'>
             
@@ -1366,7 +1359,7 @@ Support for these components is provided by the Home Assistant community.
             
           </div>
           <div class='title'>Dovado</div>
-          <div class='category'>System Monitoring</div>
+          <div class='category'>System Monitor</div>
         </a>
       
     
diff --git a/components/sensor.cpuspeed/index.html b/components/sensor.cpuspeed/index.html
index 9c0d8b0704..b4a753c5ff 100644
--- a/components/sensor.cpuspeed/index.html
+++ b/components/sensor.cpuspeed/index.html
@@ -134,9 +134,15 @@
         <li>
             CPU speed
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.cups/index.html b/components/sensor.cups/index.html
index 6dcb6f6b92..7f3347a4dd 100644
--- a/components/sensor.cups/index.html
+++ b/components/sensor.cups/index.html
@@ -142,14 +142,53 @@ You will need to install the <code class="highlighter-rouge">python3-dev</code>
     Introduced in release: 0.32
     </div>
     <div class='section'>
-    <h1 class="title delta">Category System Monitoring</h1>
+    <h1 class="title delta">Category System Monitor</h1>
     <ul class='divided'>
+        <li>
+            <a href='/components/sensor.cpuspeed/'>CPU speed</a>
+        </li>
         <li>
             CUPS Sensor
         </li>
+        <li>
+            <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
+        </li>
         <li>
             <a href='/components/sensor.dovado/'>Dovado</a>
         </li>
+        <li>
+            <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
+        </li>
+        <li>
+            <a href='/components/sensor.fastdotcom/'>Fast.com</a>
+        </li>
+        <li>
+            <a href='/components/sensor.glances/'>Glances</a>
+        </li>
+        <li>
+            <a href='/components/sensor.hddtemp/'>HDDTemp</a>
+        </li>
+        <li>
+            <a href='/components/sensor.hp_ilo/'>HP ILO</a>
+        </li>
+        <li>
+            <a href='/components/sensor.linux_battery/'>Linux Battery</a>
+        </li>
+        <li>
+            <a href='/components/sensor.pi_hole/'>Pi-Hole Sensor</a>
+        </li>
+        <li>
+            <a href='/components/sensor.snmp/'>SNMP</a>
+        </li>
+        <li>
+            <a href='/components/sensor.speedtest/'>Speedtest.net</a>
+        </li>
+        <li>
+            <a href='/components/sensor.supervisord/'>Supervisord</a>
+        </li>
+        <li>
+            <a href='/components/sensor.systemmonitor/'>System Monitor</a>
+        </li>
     </ul>
     </div>
 </section>
diff --git a/components/sensor.dovado/index.html b/components/sensor.dovado/index.html
index a27ddc95a2..89b9d66bea 100644
--- a/components/sensor.dovado/index.html
+++ b/components/sensor.dovado/index.html
@@ -145,14 +145,53 @@
     Introduced in release: 0.32
     </div>
     <div class='section'>
-    <h1 class="title delta">Category System Monitoring</h1>
+    <h1 class="title delta">Category System Monitor</h1>
     <ul class='divided'>
+        <li>
+            <a href='/components/sensor.cpuspeed/'>CPU speed</a>
+        </li>
         <li>
             <a href='/components/sensor.cups/'>CUPS Sensor</a>
         </li>
+        <li>
+            <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
+        </li>
         <li>
             Dovado
         </li>
+        <li>
+            <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
+        </li>
+        <li>
+            <a href='/components/sensor.fastdotcom/'>Fast.com</a>
+        </li>
+        <li>
+            <a href='/components/sensor.glances/'>Glances</a>
+        </li>
+        <li>
+            <a href='/components/sensor.hddtemp/'>HDDTemp</a>
+        </li>
+        <li>
+            <a href='/components/sensor.hp_ilo/'>HP ILO</a>
+        </li>
+        <li>
+            <a href='/components/sensor.linux_battery/'>Linux Battery</a>
+        </li>
+        <li>
+            <a href='/components/sensor.pi_hole/'>Pi-Hole Sensor</a>
+        </li>
+        <li>
+            <a href='/components/sensor.snmp/'>SNMP</a>
+        </li>
+        <li>
+            <a href='/components/sensor.speedtest/'>Speedtest.net</a>
+        </li>
+        <li>
+            <a href='/components/sensor.supervisord/'>Supervisord</a>
+        </li>
+        <li>
+            <a href='/components/sensor.systemmonitor/'>System Monitor</a>
+        </li>
     </ul>
     </div>
 </section>
diff --git a/components/sensor.fastdotcom/index.html b/components/sensor.fastdotcom/index.html
index edb96aa46d..1c3abb20b9 100644
--- a/components/sensor.fastdotcom/index.html
+++ b/components/sensor.fastdotcom/index.html
@@ -153,9 +153,15 @@ Currently fast.com only supports measuring download bandwidth. If you want to me
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.fritzbox_callmonitor/index.html b/components/sensor.fritzbox_callmonitor/index.html
index dc5291f83e..76bb98d802 100644
--- a/components/sensor.fritzbox_callmonitor/index.html
+++ b/components/sensor.fritzbox_callmonitor/index.html
@@ -138,9 +138,15 @@ on TCP port 1012. It will assume the values <code class="highlighter-rouge">idle
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             FRITZ!Box
         </li>
diff --git a/components/sensor.glances/index.html b/components/sensor.glances/index.html
index 97dba937d3..e4c7a7ba9d 100644
--- a/components/sensor.glances/index.html
+++ b/components/sensor.glances/index.html
@@ -187,9 +187,15 @@ Glances web server started on http://0.0.0.0:61208/
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.hddtemp/index.html b/components/sensor.hddtemp/index.html
index 78d3e1c653..d0bc4ea002 100644
--- a/components/sensor.hddtemp/index.html
+++ b/components/sensor.hddtemp/index.html
@@ -142,9 +142,15 @@
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.hp_ilo/index.html b/components/sensor.hp_ilo/index.html
index 8471516092..b80bc328e3 100644
--- a/components/sensor.hp_ilo/index.html
+++ b/components/sensor.hp_ilo/index.html
@@ -177,9 +177,15 @@
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.linux_battery/index.html b/components/sensor.linux_battery/index.html
index 4f473f11d5..205c816617 100644
--- a/components/sensor.linux_battery/index.html
+++ b/components/sensor.linux_battery/index.html
@@ -136,9 +136,15 @@
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.pi_hole/index.html b/components/sensor.pi_hole/index.html
index fbeda270b0..8d0e910b0a 100644
--- a/components/sensor.pi_hole/index.html
+++ b/components/sensor.pi_hole/index.html
@@ -137,9 +137,15 @@
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.snmp/index.html b/components/sensor.snmp/index.html
index 71ed0e1332..a916c10451 100644
--- a/components/sensor.snmp/index.html
+++ b/components/sensor.snmp/index.html
@@ -165,9 +165,15 @@ laLoad.1 <span class="o">=</span> STRING: 0.19
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.speedtest/index.html b/components/sensor.speedtest/index.html
index cab6d6968d..750ddf1d0c 100644
--- a/components/sensor.speedtest/index.html
+++ b/components/sensor.speedtest/index.html
@@ -194,9 +194,15 @@
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.supervisord/index.html b/components/sensor.supervisord/index.html
index 5351d446d2..c656151fa1 100644
--- a/components/sensor.supervisord/index.html
+++ b/components/sensor.supervisord/index.html
@@ -132,9 +132,15 @@
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/components/sensor.systemmonitor/index.html b/components/sensor.systemmonitor/index.html
index 612745afcf..9efe3f9fff 100644
--- a/components/sensor.systemmonitor/index.html
+++ b/components/sensor.systemmonitor/index.html
@@ -234,9 +234,15 @@
         <li>
             <a href='/components/sensor.cpuspeed/'>CPU speed</a>
         </li>
+        <li>
+            <a href='/components/sensor.cups/'>CUPS Sensor</a>
+        </li>
         <li>
             <a href='/components/binary_sensor.digital_ocean/'>Digital Ocean Binary Sensor</a>
         </li>
+        <li>
+            <a href='/components/sensor.dovado/'>Dovado</a>
+        </li>
         <li>
             <a href='/components/sensor.fritzbox_callmonitor/'>FRITZ!Box</a>
         </li>
diff --git a/sitemap.xml b/sitemap.xml
index abb5578f88..24418c9fdf 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2309,62 +2309,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2016-11-15T07:39:41+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-11-15T07:39:42+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-11-15T07:39:42+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2016-11-15T07:39:42+00:00</lastmod>
+<lastmod>2016-11-15T07:43:05+00:00</lastmod>
 </url>
 </urlset>