diff --git a/atom.xml b/atom.xml
index 6af03b0b03..8d3ce4c93e 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 f682b5850a..d30d5b87e8 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 5d20d2ca4c..541d8ec8e6 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 80c93838f6..bfc474c708 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 35c61847b1..6ff86b9ee2 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 ca413a38b6..c15317fb65 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 75d1af8591..fecb5ddf0b 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 1fcd6c2957..0a464892ae 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00:55+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 2df91d2d15..bb186ea0d5 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 fd11bc49ab..9f30b06210 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 315ca061f4..64e7e4ebf8 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 27990a28a6..cac7852089 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 c147fa532f..5cc69e45c5 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 24bd689e2a..6b092d82a4 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 338b3b7936..c1b9dae791 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 8faf5b9554..f3324edb9d 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 8fcb9d78c6..9c3fcd0e01 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 1d4b7d70b2..fa61ca3ba4 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 bead501bce..d1fbbe211d 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 ad461ff002..5a7e471514 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00: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 b9188ff173..3e528c262f 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-10-25T15:14:51+00:00</updated>
+  <updated>2016-10-25T18:00:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/cookbook/configuration_yaml_by_bah2830/index.html b/cookbook/configuration_yaml_by_bah2830/index.html
index 09021f33d1..30f593c4fa 100644
--- a/cookbook/configuration_yaml_by_bah2830/index.html
+++ b/cookbook/configuration_yaml_by_bah2830/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_by_brusc/index.html b/cookbook/configuration_yaml_by_brusc/index.html
index 92ec41f0a3..45ec7f90cc 100644
--- a/cookbook/configuration_yaml_by_brusc/index.html
+++ b/cookbook/configuration_yaml_by_brusc/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_by_carlo_costanzo/index.html b/cookbook/configuration_yaml_by_carlo_costanzo/index.html
index 5131a9c8db..b2a5c787b5 100644
--- a/cookbook/configuration_yaml_by_carlo_costanzo/index.html
+++ b/cookbook/configuration_yaml_by_carlo_costanzo/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_by_cbulock/index.html b/cookbook/configuration_yaml_by_cbulock/index.html
index e480f66823..b568ebd11f 100644
--- a/cookbook/configuration_yaml_by_cbulock/index.html
+++ b/cookbook/configuration_yaml_by_cbulock/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_by_danichispa/index.html b/cookbook/configuration_yaml_by_danichispa/index.html
index 035d86852f..3553cc7adb 100644
--- a/cookbook/configuration_yaml_by_danichispa/index.html
+++ b/cookbook/configuration_yaml_by_danichispa/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_by_geekofweek/index.html b/cookbook/configuration_yaml_by_geekofweek/index.html
index 4c852fcf45..0cb162eb1e 100644
--- a/cookbook/configuration_yaml_by_geekofweek/index.html
+++ b/cookbook/configuration_yaml_by_geekofweek/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_by_greenturtwig/index.html b/cookbook/configuration_yaml_by_greenturtwig/index.html
index 73a37c86e2..93f6a239f3 100644
--- a/cookbook/configuration_yaml_by_greenturtwig/index.html
+++ b/cookbook/configuration_yaml_by_greenturtwig/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_by_gstevenson/index.html b/cookbook/configuration_yaml_by_gstevenson/index.html
index 4b54c0f60a..d08734ee1e 100644
--- a/cookbook/configuration_yaml_by_gstevenson/index.html
+++ b/cookbook/configuration_yaml_by_gstevenson/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_by_happyleavesaoc/index.html b/cookbook/configuration_yaml_by_happyleavesaoc/index.html
index e1ac04b812..ea6ca80a03 100644
--- a/cookbook/configuration_yaml_by_happyleavesaoc/index.html
+++ b/cookbook/configuration_yaml_by_happyleavesaoc/index.html
@@ -146,6 +146,9 @@
           <li>
               Configuration.yaml by happyleavesaoc
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_by_instagraeme/index.html b/cookbook/configuration_yaml_by_instagraeme/index.html
index 4a729d3379..c5b51444db 100644
--- a/cookbook/configuration_yaml_by_instagraeme/index.html
+++ b/cookbook/configuration_yaml_by_instagraeme/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/configuration_yaml_by_mertenats/index.html b/cookbook/configuration_yaml_by_mertenats/index.html
similarity index 56%
rename from configuration_yaml_by_mertenats/index.html
rename to cookbook/configuration_yaml_by_mertenats/index.html
index 82f0be2958..d8c4af70fd 100644
--- a/configuration_yaml_by_mertenats/index.html
+++ b/cookbook/configuration_yaml_by_mertenats/index.html
@@ -12,13 +12,13 @@
     <meta name="description" content="">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="https://home-assistant.io/configuration_yaml_by_mertenats/">
+    <link rel="canonical" href="https://home-assistant.io/cookbook/configuration_yaml_by_mertenats/">
 
     <meta property="fb:app_id" content="338291289691179">
     <meta property="og:title" content="Configuration.yaml by mertenats">
     <meta property="og:site_name" content="Home Assistant">
-    <meta property="og:url" content="https://home-assistant.io/configuration_yaml_by_mertenats/">
-    <meta property="og:type" content="website">
+    <meta property="og:url" content="https://home-assistant.io/cookbook/configuration_yaml_by_mertenats/">
+    <meta property="og:type" content="article">
     <meta property="og:description" content="">
     <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
     
@@ -79,8 +79,6 @@
           <article class="page">
   
   
-    <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/configuration_yaml_by_mertenats.markdown'>Edit this page on GitHub</a></div>
-  
 
   
   <header>
@@ -105,81 +103,55 @@
   
   
     <section class="aside-module grid__item one-whole lap-one-half">
-  <h1 class="title delta">About Home Assistant</h1>
-  <ul class="divided">
-    <li>
-      Home Assistant is an open-source home automation platform running on Python 3. Track and control all devices at home and automate control.
-    </li>
-    <li><a href='/getting-started/'>Get started with Home Assistant</a></li>
-    <li><a href='/demo/'>Try the online demo</a></li>
-    <li><a class="twitter-follow-button" href="https://twitter.com/Home_Assistant">Follow Home Assistant on Twitter</a></li>
-    <li><div class="fb-like" data-href="https://www.facebook.com/homeassistantio/" data-layout="standard" data-action="like" data-size="small" data-show-faces="true" data-share="false"></div></li>
-  </ul>
+  <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_cookbook/configuration_yaml_by_mertenats.markdown'>Edit this page on GitHub</a></div>
+  <div class='section'>
+    <a href='/cookbook'>Back to the cookbook</a>
+  </div>
+  <div class='section'>
+    <h1 class="title delta">Example configuration.yaml</h1>
+    <ul class='divided'>
+          <li>
+              <a href='https://github.com/CCOSTAN/Home-AssistantConfig'>Configuration.yaml by Carlo Costanzo <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='https://github.com/danichispa/hass'>Configuration.yaml by Danichispa <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='https://github.com/GreenTurtwig/personal-home-automation/tree/master/Home%20Assistant'>Configuration.yaml by GreenTurtwig <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='https://github.com/Instagraeme/Home-Assistant-Configuration'>Configuration.yaml by InstaGraeme <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='https://github.com/Teagan42/HomeAssistantConfig'>Configuration.yaml by Teagan42 <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='https://github.com/bah2830/Home-Assistant-Configs'>Configuration.yaml by bah2830 <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='/cookbook/configuration_yaml_from_bassclarinetl2/'>Configuration.yaml by bassclarinetl2</a>
+          </li>
+          <li>
+              <a href='https://github.com/brusc/Home-Assistant-Configuration'>Configuration.yaml by brusc <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='https://github.com/cbulock/home-assistant-configs'>Configuration.yaml by cbulock <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='https://github.com/geekofweek/homeassistant'>Configuration.yaml by geekofweek <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='https://github.com/gstevenson/ha-config'>Configuration.yaml by gstevenson <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
+          </li>
+          <li>
+              Configuration.yaml by mertenats
+          </li>
+    </ul>
+  </div>
 </section>
-<div id="fb-root"></div>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.async=true;js.src='//platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-<script>(function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(d.getElementById(id)){return;}js=d.createElement(s);js.id=id;js.async=true;js.src="//connect.facebook.net/en_US/all.js#appId=338291289691179&xfbml=1";fjs.parentNode.insertBefore(js,fjs);}(document,'script','facebook-jssdk'));</script>
-
-    
-      <section class="sharing aside-module grid__item one-whole lap-one-half">
-  <h1 class="title delta">Share this post</h1>
-  
-  <a href="//twitter.com/share"
-     class="twitter-share-button"
-     data-via="home_assistant"
-     data-related="home_assistant"
-     data-url="https://home-assistant.io/configuration_yaml_by_mertenats/"
-     data-counturl="https://home-assistant.io/configuration_yaml_by_mertenats/" >Tweet</a>
-  
-  
-    <div class="fb-share-button" style='top: -6px;'
-         data-href="https://home-assistant.io/configuration_yaml_by_mertenats/"
-         data-layout="button_count">
-    </div>
-  
-  
-  <div class="g-plusone" data-size="standard"></div>
-  
-</section>
-
-<script src="https://apis.google.com/js/platform.js" async defer></script>
-      <section id="recent-posts" class="aside-module grid__item one-whole lap-one-half">
-  <h1 class="title delta">Recent Posts</h1>
-  <ul class="divided">
-    
-      
-        <li class="post">
-          <a href="/blog/2016/10/25/explaining-the-updater/">Explaining the Updater</a>
-        </li>
-      
-    
-      
-        <li class="post">
-          <a href="/blog/2016/10/22/flash-briefing-updater-hacktoberfest/">0.31: Reading you the news, some serious business, spooky hackery and a breaking Z-Wave change</a>
-        </li>
-      
-    
-      
-        <li class="post">
-          <a href="/blog/2016/10/08/hassbian-rest-digital-ocean/">0.30: More Async, HASSbian, Digital Ocean, statistics, REST</a>
-        </li>
-      
-    
-      
-        <li class="post">
-          <a href="/blog/2016/10/02/hacktoberfest/">Participating in Hacktoberfest</a>
-        </li>
-      
-    
-      
-        <li class="post">
-          <a href="/blog/2016/10/01/we-have-raspberry-image-now/">We have a Raspberry Pi image now</a>
-        </li>
-      
-    
-  </ul>
-</section>
-    
   
 </div>
         </aside>
diff --git a/cookbook/configuration_yaml_by_teagan42/index.html b/cookbook/configuration_yaml_by_teagan42/index.html
index ba687cf1b1..beba93afba 100644
--- a/cookbook/configuration_yaml_by_teagan42/index.html
+++ b/cookbook/configuration_yaml_by_teagan42/index.html
@@ -146,6 +146,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/configuration_yaml_from_bassclarinetl2/index.html b/cookbook/configuration_yaml_from_bassclarinetl2/index.html
index 5c39fdd781..447b274f15 100644
--- a/cookbook/configuration_yaml_from_bassclarinetl2/index.html
+++ b/cookbook/configuration_yaml_from_bassclarinetl2/index.html
@@ -593,6 +593,9 @@
           <li>
               <a href='https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant'>Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a>
           </li>
+          <li>
+              <a href='https://github.com/mertenats/open-home-automation/tree/master/openhome'>Configuration.yaml by mertenats <i class="icon-external-link"></i></a>
+          </li>
     </ul>
   </div>
 </section>
diff --git a/cookbook/index.html b/cookbook/index.html
index f04698b5d8..c4803ab2d5 100644
--- a/cookbook/index.html
+++ b/cookbook/index.html
@@ -199,6 +199,9 @@
   <li>
     <p><a href="https://github.com/happyleavesaoc/my-home-automation/tree/master/homeassistant">Configuration.yaml by happyleavesaoc <i class="icon-external-link"></i></a></p>
   </li>
+  <li>
+    <p><a href="https://github.com/mertenats/open-home-automation/tree/master/openhome">Configuration.yaml by mertenats <i class="icon-external-link"></i></a></p>
+  </li>
 </ul>
 
 <h3><a class="title-link" name="infrastructure" href="#infrastructure"></a> Infrastructure</h3>
diff --git a/getting-started/securing/index.html b/getting-started/securing/index.html
index 355ffc7c39..1092bbf6c8 100644
--- a/getting-started/securing/index.html
+++ b/getting-started/securing/index.html
@@ -104,7 +104,7 @@
 <p>Additional points if you want to allow remote access:</p>
 
 <ul>
-  <li>Protect your communication with <a href="blog/2015/12/13/setup-encryption-using-lets-encrypt/">TLS</a></li>
+  <li>Protect your communication with <a href="/blog/2015/12/13/setup-encryption-using-lets-encrypt/">TLS</a></li>
   <li>Protect your communication with <a href="/cookbook/tor_configuration/">Tor</a></li>
   <li>Use a <a href="/cookbook/apache_configuration/">proxy</a></li>
 </ul>
diff --git a/sitemap.xml b/sitemap.xml
index 5fb9f63622..ad9b09caac 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -453,9 +453,6 @@
 <loc>https://home-assistant.io/getting-started/configuration/</loc>
 </url>
 <url>
-<loc>https://home-assistant.io/configuration_yaml_by_mertenats/</loc>
-</url>
-<url>
 <loc>https://home-assistant.io/developers/creating_components/</loc>
 </url>
 <url>
@@ -2223,6 +2220,9 @@
 <loc>https://home-assistant.io/cookbook/tls_self_signed_certificate/</loc>
 </url>
 <url>
+<loc>https://home-assistant.io/cookbook/configuration_yaml_by_mertenats/</loc>
+</url>
+<url>
 <loc>https://home-assistant.io/cookbook/configuration_yaml_by_carlo_costanzo/</loc>
 </url>
 <url>
@@ -2254,62 +2254,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2016-10-25T15:14:13+00:00</lastmod>
+<lastmod>2016-10-25T18:00:09+00:00</lastmod>
 </url>
 </urlset>