diff --git a/atom.xml b/atom.xml
index d5e7ffaa2f..e5bcdfa283 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 ee454f8fb8..cd7f039d37 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 e6085cd92c..b044516822 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 0f658c87bb..95492706a4 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 43d4f5ea2c..88c5103c7c 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 04dd6492e3..5ff13f0708 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 cf10b07fab..82a3c649b2 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 9970121598..f0eca05983 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 132889f612..9dde307c28 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 4c662eaca0..2b2929cafb 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 87f3c458c0..2a14dca0b1 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 00a470f5fb..8055d92ed3 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 4d561e1588..1aef44ed9a 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 971ccb42c6..42c7d36b9b 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 0ef2becfe2..963409d79b 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 866b79b134..9cd5dad5b5 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 cd97790b8c..e1620302e1 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 697a327126..3d7f630684 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 6c22cf4688..30af51c389 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+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 15f5e459a2..e1b3d69b1f 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-08-14T20:08:54+00:00</updated>
+  <updated>2016-08-14T20:11:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/browser/index.html b/components/browser/index.html
index d76a4dc0cb..f35ec2ef69 100644
--- a/components/browser/index.html
+++ b/components/browser/index.html
@@ -192,9 +192,6 @@
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/configurator/index.html b/components/configurator/index.html
index 90cca6f067..304ac7d832 100644
--- a/components/configurator/index.html
+++ b/components/configurator/index.html
@@ -166,9 +166,6 @@ This component is intended for developers.
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/demo/index.html b/components/demo/index.html
index a7e37ade14..c53861fb40 100644
--- a/components/demo/index.html
+++ b/components/demo/index.html
@@ -184,9 +184,6 @@
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/discovery/index.html b/components/discovery/index.html
index cb8ab03ec8..ce7976bc09 100644
--- a/components/discovery/index.html
+++ b/components/discovery/index.html
@@ -190,9 +190,6 @@ If you see <code>Not initializing discovery because could not install dependency
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/downloader/index.html b/components/downloader/index.html
index fbd00bdebb..3716a5d86d 100644
--- a/components/downloader/index.html
+++ b/components/downloader/index.html
@@ -201,9 +201,6 @@
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/feedreader/index.html b/components/feedreader/index.html
index a55ff26e20..bb45ed7802 100644
--- a/components/feedreader/index.html
+++ b/components/feedreader/index.html
@@ -199,9 +199,6 @@ hass.bus.listen(EVENT_FEEDREADER, event_listener)
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/foursquare/index.html b/components/foursquare/index.html
index bfab543d1c..e64d5ec63d 100644
--- a/components/foursquare/index.html
+++ b/components/foursquare/index.html
@@ -211,9 +211,6 @@
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/http/index.html b/components/http/index.html
index 52756619fc..1c266998e3 100644
--- a/components/http/index.html
+++ b/components/http/index.html
@@ -203,9 +203,6 @@ It’s HIGHLY recommended that you set the <code>api_password</code>, especially
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/index.html b/components/index.html
index 3690ba549f..74425a63fb 100644
--- a/components/index.html
+++ b/components/index.html
@@ -124,7 +124,7 @@ Support for these components is provided by the Home Assistant community.
     
   
     
-      <a href='#frontend' class="btn">Frontend</a>
+      <a href='#front-end' class="btn">Front end</a>
     
   
     
@@ -2943,7 +2943,7 @@ Support for these components is provided by the Home Assistant community.
   
     
       <a href='/components/panel_custom/'
-         class='frontend'
+         class='front-end'
          style='display: none'>
         <div class='img-container'>
           
@@ -2951,13 +2951,13 @@ Support for these components is provided by the Home Assistant community.
           
         </div>
         <div class='title'>Panel Custom</div>
-        <div class='category'>Frontend</div>
+        <div class='category'>Front end</div>
       </a>
     
   
     
       <a href='/components/panel_iframe/'
-         class='frontend'
+         class='front-end'
          style='display: none'>
         <div class='img-container'>
           
@@ -2965,7 +2965,7 @@ Support for these components is provided by the Home Assistant community.
           
         </div>
         <div class='title'>Panel iFrame</div>
-        <div class='category'>Frontend</div>
+        <div class='category'>Front end</div>
       </a>
     
   
@@ -4495,13 +4495,13 @@ Support for these components is provided by the Home Assistant community.
   
     
       <a href='/components/weblink/'
-         class='other'
+         class='front-end'
          style='display: none'>
         <div class='img-container'>
           
         </div>
         <div class='title'>Weblink</div>
-        <div class='category'>Other</div>
+        <div class='category'>Front end</div>
       </a>
     
   
diff --git a/components/introduction/index.html b/components/introduction/index.html
index 40f86b7e15..0f16d51b3c 100644
--- a/components/introduction/index.html
+++ b/components/introduction/index.html
@@ -163,9 +163,6 @@
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/logger/index.html b/components/logger/index.html
index 6a00011180..842feffc5b 100644
--- a/components/logger/index.html
+++ b/components/logger/index.html
@@ -196,9 +196,6 @@
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/mqtt_eventstream/index.html b/components/mqtt_eventstream/index.html
index 54dc605084..6a2b52d81d 100644
--- a/components/mqtt_eventstream/index.html
+++ b/components/mqtt_eventstream/index.html
@@ -174,9 +174,6 @@
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/panel_custom/index.html b/components/panel_custom/index.html
index dfba1f9b6a..e397a0771e 100644
--- a/components/panel_custom/index.html
+++ b/components/panel_custom/index.html
@@ -139,7 +139,7 @@
     Introduced in release: 0.26
     </div>
     <div class='section'>
-    <h1 class="title delta">Category Frontend</h1>
+    <h1 class="title delta">Category Front end</h1>
     <ul class='divided'>
         <li>
             Panel Custom
@@ -147,6 +147,9 @@
         <li>
             <a href='/components/panel_iframe/'>Panel iFrame</a>
         </li>
+        <li>
+            <a href='/components/weblink/'>Weblink</a>
+        </li>
     </ul>
     </div>
 </section>
diff --git a/components/panel_iframe/index.html b/components/panel_iframe/index.html
index cb3d8be2a0..7cef72075c 100644
--- a/components/panel_iframe/index.html
+++ b/components/panel_iframe/index.html
@@ -143,7 +143,7 @@
     Introduced in release: 0.25
     </div>
     <div class='section'>
-    <h1 class="title delta">Category Frontend</h1>
+    <h1 class="title delta">Category Front end</h1>
     <ul class='divided'>
         <li>
             <a href='/components/panel_custom/'>Panel Custom</a>
@@ -151,6 +151,9 @@
         <li>
             Panel iFrame
         </li>
+        <li>
+            <a href='/components/weblink/'>Weblink</a>
+        </li>
     </ul>
     </div>
 </section>
diff --git a/components/persistent_notification/index.html b/components/persistent_notification/index.html
index e83097c830..bd10147bed 100644
--- a/components/persistent_notification/index.html
+++ b/components/persistent_notification/index.html
@@ -221,9 +221,6 @@
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/updater/index.html b/components/updater/index.html
index 2238fb819e..35b3140129 100644
--- a/components/updater/index.html
+++ b/components/updater/index.html
@@ -169,9 +169,6 @@
         <li>
             Updater
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/upnp/index.html b/components/upnp/index.html
index cc3b6c93aa..7c093ccc63 100644
--- a/components/upnp/index.html
+++ b/components/upnp/index.html
@@ -178,9 +178,6 @@ $ sudo make installpythonmodule3
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
         </li>
diff --git a/components/weblink/index.html b/components/weblink/index.html
index 9de6e0cdbb..6edf31590e 100644
--- a/components/weblink/index.html
+++ b/components/weblink/index.html
@@ -134,56 +134,17 @@
     Introduced in release: 0.13
     </div>
     <div class='section'>
-    <h1 class="title delta">Category Other</h1>
+    <h1 class="title delta">Category Front end</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/browser/'>Browser</a>
+            <a href='/components/panel_custom/'>Panel Custom</a>
         </li>
         <li>
-            <a href='/components/configurator/'>Configurator</a>
-        </li>
-        <li>
-            <a href='/components/demo/'>Demo platforms</a>
-        </li>
-        <li>
-            <a href='/components/discovery/'>Discovery</a>
-        </li>
-        <li>
-            <a href='/components/downloader/'>Downloader</a>
-        </li>
-        <li>
-            <a href='/components/feedreader/'>Feedreader</a>
-        </li>
-        <li>
-            <a href='/components/foursquare/'>Foursquare</a>
-        </li>
-        <li>
-            <a href='/components/http/'>HTTP</a>
-        </li>
-        <li>
-            <a href='/components/introduction/'>Introduction</a>
-        </li>
-        <li>
-            <a href='/components/logger/'>Logger</a>
-        </li>
-        <li>
-            <a href='/components/mqtt_eventstream/'>MQTT Eventstream</a>
-        </li>
-        <li>
-            <a href='/components/persistent_notification/'>Persistent notification</a>
-        </li>
-        <li>
-            <a href='/components/upnp/'>UPnP</a>
-        </li>
-        <li>
-            <a href='/components/updater/'>Updater</a>
+            <a href='/components/panel_iframe/'>Panel iFrame</a>
         </li>
         <li>
             Weblink
         </li>
-        <li>
-            <a href='/components/zeroconf/'>Zeroconf/Avahi/Bonjour</a>
-        </li>
     </ul>
     </div>
 </section>
diff --git a/components/zeroconf/index.html b/components/zeroconf/index.html
index be0f7ab49f..b8fe747780 100644
--- a/components/zeroconf/index.html
+++ b/components/zeroconf/index.html
@@ -163,9 +163,6 @@
         <li>
             <a href='/components/updater/'>Updater</a>
         </li>
-        <li>
-            <a href='/components/weblink/'>Weblink</a>
-        </li>
         <li>
             Zeroconf/Avahi/Bonjour
         </li>
diff --git a/sitemap.xml b/sitemap.xml
index 25844f5ca4..d043c49517 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2081,62 +2081,62 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-08-14T20:08:10+00:00</lastmod>
+    <lastmod>2016-08-14T20:11:07+00:00</lastmod>
   </url>
 </urlset>