diff --git a/atom.xml b/atom.xml
index bb61cf22a8..5781b676ec 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
@@ -42,7 +42,7 @@
   <li>Media Player: <a href="https://home-assistant.io/components/media_player.lg_netcast/">LG Netcast TVs</a> now supported (<a href="https://github.com/wokar">@wokar</a>)</li>
   <li>Media Player: Allow enqueuing media on Sonos (<a href="https://github.com/shaftoe">@shaftoe</a>)</li>
   <li>Notify: <a href="https://home-assistant.io/components/notify.ecobee/">Ecobee thermostats</a> now supported (<a href="https://github.com/nkgilley">@nkgilley</a>)</li>
-  <li>Sensor: <a href="https://home-assistant.io/components/sensor.moldindicator/">mold indicator</a> added (<a href="https://github.com/xifle">@xifle</a>)</li>
+  <li>Sensor: <a href="https://home-assistant.io/components/sensor.moldindicator/">Mold indicator</a> added (<a href="https://github.com/xifle">@xifle</a>)</li>
   <li>Export to <a href="https://home-assistant.io/components/logentries/">Logentries</a> support added (<a href="https://github.com/omgapuppy">@omgapuppy</a>)</li>
   <li>Group more info dialog allows control of group domain if available (<a href="https://github.com/fignuts">@fignuts</a>)</li>
 </ul>
@@ -50,14 +50,17 @@
 <h3><a class="title-link" name="breaking-changes" href="#breaking-changes"></a> Breaking changes</h3>
 
 <ul>
-  <li>Asus WRT will now default to SSH with Telnet being an option<br />
-<code>yaml
-device_tracker:
-platform: asuswrt
-protocol: telnet
-</code></li>
+  <li>Asus WRT will now default to SSH with Telnet being an option</li>
 </ul>
 
+<div class="highlighter-coderay"><div class="CodeRay">
+  <div class="code"><pre><span class="key">device_tracker</span>:
+  <span class="key">platform</span>: <span class="string"><span class="content">asuswrt</span></span>
+  <span class="key">protocol</span>: <span class="string"><span class="content">telnet</span></span>
+</pre></div>
+</div>
+</div>
+
 ]]></content>
   </entry>
   
diff --git a/blog/2016/05/21/release-020/index.html b/blog/2016/05/21/release-020/index.html
index da2d4a6df7..b88f97dd08 100644
--- a/blog/2016/05/21/release-020/index.html
+++ b/blog/2016/05/21/release-020/index.html
@@ -87,7 +87,7 @@
   <div class="meta clearfix">
     <time datetime="2016-05-21T18:06:00+00:00" pubdate data-updated="true"><i class="icon-calendar"></i> May 21, 2016</time>
     <span class="byline author vcard"><i class='icon-user'></i> Paulus Schoutsen</span>
-    <span><i class='icon-time'></i> 1 minute reading time</span>
+    <span><i class='icon-time'></i> two minutes reading time</span>
     <span>
     <i class="icon-tags"></i>
     <ul class="tags unstyled">
@@ -132,7 +132,7 @@
   <li>Media Player: <a href="/components/media_player.lg_netcast/">LG Netcast TVs</a> now supported (<a href="https://github.com/wokar">@wokar</a>)</li>
   <li>Media Player: Allow enqueuing media on Sonos (<a href="https://github.com/shaftoe">@shaftoe</a>)</li>
   <li>Notify: <a href="/components/notify.ecobee/">Ecobee thermostats</a> now supported (<a href="https://github.com/nkgilley">@nkgilley</a>)</li>
-  <li>Sensor: <a href="/components/sensor.moldindicator/">mold indicator</a> added (<a href="https://github.com/xifle">@xifle</a>)</li>
+  <li>Sensor: <a href="/components/sensor.moldindicator/">Mold indicator</a> added (<a href="https://github.com/xifle">@xifle</a>)</li>
   <li>Export to <a href="/components/logentries/">Logentries</a> support added (<a href="https://github.com/omgapuppy">@omgapuppy</a>)</li>
   <li>Group more info dialog allows control of group domain if available (<a href="https://github.com/fignuts">@fignuts</a>)</li>
 </ul>
@@ -140,13 +140,16 @@
 <h3><a class="title-link" name="breaking-changes" href="#breaking-changes"></a> Breaking changes</h3>
 
 <ul>
-  <li>Asus WRT will now default to SSH with Telnet being an option<br />
-<code>yaml
-device_tracker:
-platform: asuswrt
-protocol: telnet
-</code></li>
+  <li>Asus WRT will now default to SSH with Telnet being an option</li>
 </ul>
+
+<div class="highlighter-coderay"><div class="CodeRay">
+  <div class="code"><pre><span class="key">device_tracker</span>:
+  <span class="key">platform</span>: <span class="string"><span class="content">asuswrt</span></span>
+  <span class="key">protocol</span>: <span class="string"><span class="content">telnet</span></span>
+</pre></div>
+</div>
+</div>
 </article>
 
 
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index e14dc9da7a..b278e85a38 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 707561d266..fa0da71666 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 3bcb1376ae..d2fec45b73 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 898de2dcb6..6dfdd1cb36 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 e26a2e8fc2..64a15d7cc2 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 492cb941b5..413168492a 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 c559110886..199622b6b0 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 cd497f5025..5f1d14554c 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 fba9063d8f..5a60ad7b32 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 c10ff71536..5290c58639 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 30e354ed84..5c7f01c9d4 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
@@ -42,7 +42,7 @@
   <li>Media Player: <a href="/components/media_player.lg_netcast/">LG Netcast TVs</a> now supported (<a href="https://github.com/wokar">@wokar</a>)</li>
   <li>Media Player: Allow enqueuing media on Sonos (<a href="https://github.com/shaftoe">@shaftoe</a>)</li>
   <li>Notify: <a href="/components/notify.ecobee/">Ecobee thermostats</a> now supported (<a href="https://github.com/nkgilley">@nkgilley</a>)</li>
-  <li>Sensor: <a href="/components/sensor.moldindicator/">mold indicator</a> added (<a href="https://github.com/xifle">@xifle</a>)</li>
+  <li>Sensor: <a href="/components/sensor.moldindicator/">Mold indicator</a> added (<a href="https://github.com/xifle">@xifle</a>)</li>
   <li>Export to <a href="/components/logentries/">Logentries</a> support added (<a href="https://github.com/omgapuppy">@omgapuppy</a>)</li>
   <li>Group more info dialog allows control of group domain if available (<a href="https://github.com/fignuts">@fignuts</a>)</li>
 </ul>
@@ -50,14 +50,17 @@
 <h3><a class='title-link' name='breaking-changes' href='#breaking-changes'></a> Breaking changes </h3>
 
 <ul>
-  <li>Asus WRT will now default to SSH with Telnet being an option<br />
-<code>yaml
-device_tracker:
-platform: asuswrt
-protocol: telnet
-</code></li>
+  <li>Asus WRT will now default to SSH with Telnet being an option</li>
 </ul>
 
+<div class="highlighter-coderay"><div class="CodeRay">
+  <div class="code"><pre><span class="key">device_tracker</span>:
+  <span class="key">platform</span>: <span class="string"><span class="content">asuswrt</span></span>
+  <span class="key">protocol</span>: <span class="string"><span class="content">telnet</span></span>
+</pre></div>
+</div>
+</div>
+
 ]]></content>
   </entry>
   
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 49c5a0fcd3..d2cc450301 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 eee1d85301..d8c11a178b 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 0182cb7b1b..e9c0edeedb 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 f6c8a3b852..c069735d6a 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 53a4527391..a0a7e5d144 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+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 67f425923f..31a4088489 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-21T22:10:20+00:00</updated>
+  <updated>2016-05-21T22:22:24+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/index.html b/blog/index.html
index 806bc16409..bc4f961858 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -90,7 +90,7 @@
   <div class="meta clearfix">
     <time datetime="2016-05-21T18:06:00+00:00" pubdate data-updated="true"><i class="icon-calendar"></i> May 21, 2016</time>
     <span class="byline author vcard"><i class='icon-user'></i> Paulus Schoutsen</span>
-    <span><i class='icon-time'></i> 1 minute reading time</span>
+    <span><i class='icon-time'></i> two minutes reading time</span>
     <span>
     <i class="icon-tags"></i>
     <ul class="tags unstyled">
@@ -136,7 +136,7 @@
   <li>Media Player: <a href="/components/media_player.lg_netcast/">LG Netcast TVs</a> now supported (<a href="https://github.com/wokar">@wokar</a>)</li>
   <li>Media Player: Allow enqueuing media on Sonos (<a href="https://github.com/shaftoe">@shaftoe</a>)</li>
   <li>Notify: <a href="/components/notify.ecobee/">Ecobee thermostats</a> now supported (<a href="https://github.com/nkgilley">@nkgilley</a>)</li>
-  <li>Sensor: <a href="/components/sensor.moldindicator/">mold indicator</a> added (<a href="https://github.com/xifle">@xifle</a>)</li>
+  <li>Sensor: <a href="/components/sensor.moldindicator/">Mold indicator</a> added (<a href="https://github.com/xifle">@xifle</a>)</li>
   <li>Export to <a href="/components/logentries/">Logentries</a> support added (<a href="https://github.com/omgapuppy">@omgapuppy</a>)</li>
   <li>Group more info dialog allows control of group domain if available (<a href="https://github.com/fignuts">@fignuts</a>)</li>
 </ul>
@@ -144,14 +144,17 @@
 <h3><a class="title-link" name="breaking-changes" href="#breaking-changes"></a> Breaking changes</h3>
 
 <ul>
-  <li>Asus WRT will now default to SSH with Telnet being an option<br />
-<code>yaml
-device_tracker:
-platform: asuswrt
-protocol: telnet
-</code></li>
+  <li>Asus WRT will now default to SSH with Telnet being an option</li>
 </ul>
 
+<div class="highlighter-coderay"><div class="CodeRay">
+  <div class="code"><pre><span class="key">device_tracker</span>:
+  <span class="key">platform</span>: <span class="string"><span class="content">asuswrt</span></span>
+  <span class="key">protocol</span>: <span class="string"><span class="content">telnet</span></span>
+</pre></div>
+</div>
+</div>
+
 
     
   </div>
diff --git a/components/index.html b/components/index.html
index 9a0f36ba75..bc0b63f75d 100644
--- a/components/index.html
+++ b/components/index.html
@@ -1160,7 +1160,7 @@ Support for these components is provided by the Home Assistant community.
             <img src='/images/supported_brands/gpmdp.png'>
           
         </div>
-        <div class='title'>Google Play Music Desktop Player (GPMDP)</div>
+        <div class='title'>Google Play Music Desktop Player</div>
         <div class='category'>Media Player</div>
       </a>
     
diff --git a/components/media_player.cast/index.html b/components/media_player.cast/index.html
index ef17eb93ee..95ad39a602 100644
--- a/components/media_player.cast/index.html
+++ b/components/media_player.cast/index.html
@@ -141,7 +141,7 @@
             Google Cast
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.denon/index.html b/components/media_player.denon/index.html
index ba70e2d494..f84429fbec 100644
--- a/components/media_player.denon/index.html
+++ b/components/media_player.denon/index.html
@@ -160,7 +160,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.firetv/index.html b/components/media_player.firetv/index.html
index 8c0f77938e..8c58ce90c8 100644
--- a/components/media_player.firetv/index.html
+++ b/components/media_player.firetv/index.html
@@ -180,7 +180,7 @@ Note that python-firetv has support for multiple Amazon Fire TV devices. If you
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.gpmdp/index.html b/components/media_player.gpmdp/index.html
index 9b07cf907d..d8bcd1bb8d 100644
--- a/components/media_player.gpmdp/index.html
+++ b/components/media_player.gpmdp/index.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Google Play Music Desktop Player (GPMDP) - Home Assistant</title>
+    <title>Google Play Music Desktop Player - Home Assistant</title>
     <meta name="author" content="Paulus Schoutsen">
     <meta name="description" content="Instructions how to integrate GPMDP into Home Assistant.">
     
@@ -15,7 +15,7 @@
     <link rel="canonical" href="https://home-assistant.io/components/media_player.gpmdp/">
 
     <meta property="fb:app_id" content="338291289691179">
-    <meta property="og:title" content="Google Play Music Desktop Player (GPMDP)">
+    <meta property="og:title" content="Google Play Music Desktop Player">
     <meta property="og:site_name" content="Home Assistant">
     <meta property="og:url" content="https://home-assistant.io/components/media_player.gpmdp/">
     <meta property="og:type" content="article">
@@ -25,7 +25,7 @@
     <meta name="twitter:card" content="summary">
     <meta name="twitter:site" content="@home_assistant">
     
-    <meta name="twitter:title" content="Google Play Music Desktop Player (GPMDP)">
+    <meta name="twitter:title" content="Google Play Music Desktop Player">
     <meta name="twitter:description" content="Instructions how to integrate GPMDP into Home Assistant.">
     <meta name="twitter:image" content="https://home-assistant.io/images/home-assistant-logo-2164x2164.png">
 
@@ -83,7 +83,7 @@
   
   <header>
     <h1 class="title indent">
-      Google Play Music Desktop Player (GPMDP)
+      Google Play Music Desktop Player
     </h1>
   </header>
   <hr class="divider">
@@ -152,7 +152,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            Google Play Music Desktop Player (GPMDP)
+            Google Play Music Desktop Player
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.itunes/index.html b/components/media_player.itunes/index.html
index f9ad16b7b1..4d538bdca7 100644
--- a/components/media_player.itunes/index.html
+++ b/components/media_player.itunes/index.html
@@ -149,7 +149,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.kodi/index.html b/components/media_player.kodi/index.html
index 1950dc08cb..f209a5b485 100644
--- a/components/media_player.kodi/index.html
+++ b/components/media_player.kodi/index.html
@@ -152,7 +152,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             Kodi
diff --git a/components/media_player.lg_netcast/index.html b/components/media_player.lg_netcast/index.html
index 5db0640789..009685a8e0 100644
--- a/components/media_player.lg_netcast/index.html
+++ b/components/media_player.lg_netcast/index.html
@@ -160,7 +160,7 @@ The access token will not change until you factory reset your TV.
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.mpd/index.html b/components/media_player.mpd/index.html
index 1b21429d1d..a016b6db76 100644
--- a/components/media_player.mpd/index.html
+++ b/components/media_player.mpd/index.html
@@ -153,7 +153,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.onkyo/index.html b/components/media_player.onkyo/index.html
index e874cca8de..6d6530c69e 100644
--- a/components/media_player.onkyo/index.html
+++ b/components/media_player.onkyo/index.html
@@ -210,7 +210,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.panasonic_viera/index.html b/components/media_player.panasonic_viera/index.html
index 0cfd086f68..e8b42d8cb1 100644
--- a/components/media_player.panasonic_viera/index.html
+++ b/components/media_player.panasonic_viera/index.html
@@ -157,7 +157,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.pioneer/index.html b/components/media_player.pioneer/index.html
index 057e344c25..bb5674d66c 100644
--- a/components/media_player.pioneer/index.html
+++ b/components/media_player.pioneer/index.html
@@ -147,7 +147,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.plex/index.html b/components/media_player.plex/index.html
index 4e47954175..518265f8dc 100644
--- a/components/media_player.plex/index.html
+++ b/components/media_player.plex/index.html
@@ -155,7 +155,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.roku/index.html b/components/media_player.roku/index.html
index d4255a1614..623b9c314c 100644
--- a/components/media_player.roku/index.html
+++ b/components/media_player.roku/index.html
@@ -144,7 +144,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.samsungtv/index.html b/components/media_player.samsungtv/index.html
index c4fe4b5c73..6aaa5b9cbc 100644
--- a/components/media_player.samsungtv/index.html
+++ b/components/media_player.samsungtv/index.html
@@ -164,7 +164,7 @@ The two letters at the beginning of the model number represent the region, UE is
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.snapcast/index.html b/components/media_player.snapcast/index.html
index fcebaf9274..15d0f8767f 100644
--- a/components/media_player.snapcast/index.html
+++ b/components/media_player.snapcast/index.html
@@ -136,7 +136,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.sonos/index.html b/components/media_player.sonos/index.html
index 94fa390ae3..af8dabda69 100644
--- a/components/media_player.sonos/index.html
+++ b/components/media_player.sonos/index.html
@@ -149,7 +149,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.squeezebox/index.html b/components/media_player.squeezebox/index.html
index fd7d797424..f21382aded 100644
--- a/components/media_player.squeezebox/index.html
+++ b/components/media_player.squeezebox/index.html
@@ -151,7 +151,7 @@ This lets you control Squeezebox hardware like the Classic, Transporter, Duet, B
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.universal/index.html b/components/media_player.universal/index.html
index c4a6a0bb4f..e7754cce4d 100644
--- a/components/media_player.universal/index.html
+++ b/components/media_player.universal/index.html
@@ -214,7 +214,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.webostv/index.html b/components/media_player.webostv/index.html
index 0e4f1ba215..4e34c455fe 100644
--- a/components/media_player.webostv/index.html
+++ b/components/media_player.webostv/index.html
@@ -161,7 +161,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player.yamaha/index.html b/components/media_player.yamaha/index.html
index 9ac2d4686d..bb586a7482 100644
--- a/components/media_player.yamaha/index.html
+++ b/components/media_player.yamaha/index.html
@@ -162,7 +162,7 @@
             <a href='/components/media_player.cast/'>Google Cast</a>
         </li>
         <li>
-            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player (GPMDP)</a>
+            <a href='/components/media_player.gpmdp/'>Google Play Music Desktop Player</a>
         </li>
         <li>
             <a href='/components/media_player.kodi/'>Kodi</a>
diff --git a/components/media_player/index.html b/components/media_player/index.html
index 7a51f72040..63a0150e77 100644
--- a/components/media_player/index.html
+++ b/components/media_player/index.html
@@ -241,7 +241,7 @@
             Google Cast
           </a></li>
           <li><a href='/components/media_player.gpmdp/'>
-            Google Play Music Desktop Player (GPMDP)
+            Google Play Music Desktop Player
           </a></li>
           <li><a href='/components/media_player.kodi/'>
             Kodi
diff --git a/sitemap.xml b/sitemap.xml
index 69e5dc7418..b7d679f1b8 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1674,26 +1674,26 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-05-21T22:09:28+00:00</lastmod>
+    <lastmod>2016-05-21T22:21:42+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-05-21T22:09:28+00:00</lastmod>
+    <lastmod>2016-05-21T22:21:42+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-05-21T22:09:28+00:00</lastmod>
+    <lastmod>2016-05-21T22:21:42+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-05-21T22:09:28+00:00</lastmod>
+    <lastmod>2016-05-21T22:21:42+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-05-21T22:09:28+00:00</lastmod>
+    <lastmod>2016-05-21T22:21:42+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-05-21T22:09:28+00:00</lastmod>
+    <lastmod>2016-05-21T22:21:42+00:00</lastmod>
   </url>
 </urlset>