diff --git a/addons/index.html b/addons/index.html
index c108c2f935..bf345702c5 100644
--- a/addons/index.html
+++ b/addons/index.html
@@ -67,7 +67,7 @@
     </h1>
   </header>
   <hr class="divider">
-  [Placeholder]
+  <p>Add-ons are extensions for your Home Assistant installation.</p>
 <ul>
   <li><a href='/addons/lets_encrypt/'>Let's Encrypt</a></li>
   <li><a href='/addons/mosquitto/'>Mosquitto MQTT broker</a></li>
@@ -86,8 +86,15 @@
         <a  href='/hassio/'>Hass.io </a>
         <ul>
           <li><a  href='/hassio/installation/'>Installation </a></li>
-          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a class='active' href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/addons/lets_encrypt/index.html b/addons/lets_encrypt/index.html
index d4aff44da5..6d60fce8c9 100644
--- a/addons/lets_encrypt/index.html
+++ b/addons/lets_encrypt/index.html
@@ -91,8 +91,15 @@
         <a  href='/hassio/'>Hass.io </a>
         <ul>
           <li><a  href='/hassio/installation/'>Installation </a></li>
-          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/addons/mosquitto/index.html b/addons/mosquitto/index.html
index 33cf671a90..e7b5bc6bfc 100644
--- a/addons/mosquitto/index.html
+++ b/addons/mosquitto/index.html
@@ -97,8 +97,15 @@
         <a  href='/hassio/'>Hass.io </a>
         <ul>
           <li><a  href='/hassio/installation/'>Installation </a></li>
-          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/addons/samba/index.html b/addons/samba/index.html
index 7359c853b5..b69acec3bd 100644
--- a/addons/samba/index.html
+++ b/addons/samba/index.html
@@ -101,8 +101,15 @@
         <a  href='/hassio/'>Hass.io </a>
         <ul>
           <li><a  href='/hassio/installation/'>Installation </a></li>
-          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/addons/ssh/index.html b/addons/ssh/index.html
index 9d550801f3..a35bd2f103 100644
--- a/addons/ssh/index.html
+++ b/addons/ssh/index.html
@@ -91,8 +91,15 @@
         <a  href='/hassio/'>Hass.io </a>
         <ul>
           <li><a  href='/hassio/installation/'>Installation </a></li>
-          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/atom.xml b/atom.xml
index 10d55612e7..a6f70e5f23 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index a1c9f474a8..907e147f76 100644
--- a/blog/categories/announcements/atom.xml
+++ b/blog/categories/announcements/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Announcements | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/announcements/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 8a4616b66d..0a4ee874bd 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 69b879490f..8d9425a9c5 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 b27f3b9bef..4a7d134561 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 e2fc589d22..9f021e1adc 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 f26a6effb7..7d0178f2ae 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 b6f56ca306..a28ffe4132 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 9bc4f2f377..7b4aa84538 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml
index c4f8c17b3f..a7e23ced86 100644
--- a/blog/categories/merchandise/atom.xml
+++ b/blog/categories/merchandise/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Merchandise | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/merchandise/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 4482cc2eb8..95fcc99e59 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 923691bef5..c84551950b 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 e59341a9a6..03299222dd 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 3108caddad..1eaa639057 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 7b6a909b9c..91e24d923e 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 fce22e995a..386c9865d1 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 2743af477d..4f9c720589 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 668e3e8299..6e4efd80d2 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 f521263ddf..994b24bafc 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 c97440a316..433417b9c6 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 271d897c7e..dd018cdfef 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 3284bf2753..d4a0df2fbe 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+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 dd0c96a277..02aef78e0f 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>2017-05-04T04:20:38+00:00</updated>
+  <updated>2017-05-04T05:55:15+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/hassio/architecture/index.html b/hassio/architecture/index.html
index b4a8dbab6a..29d56ff411 100644
--- a/hassio/architecture/index.html
+++ b/hassio/architecture/index.html
@@ -67,7 +67,23 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>[Placeholder]</p>
+  <p class="img">
+  <a href="/images/hassio/architecture.png"><img src="/images/hassio/architecture.png" alt="Architecture overview of Hass.io" /></a>
+  Architecture overview of Hass.io
+</p>
+<h3><a class="title-link" name="host-control-hc" href="#host-control-hc"></a> Host Control (HC)</h3>
+<p>This is a daemon that runs on the host machine that allows the supervisor to control certain aspects of the host OS:</p>
+<ul>
+  <li>Power cycle (restart, turn off)</li>
+  <li>Manage network settings</li>
+  <li>Update host control</li>
+</ul>
+<h3><a class="title-link" name="host" href="#host"></a> Host</h3>
+<p>The operating system that runs Hass.io. Our pre-build images are based on <a href="https://resinos.io/">ResinOS</a>. Any Linux machine can be turned into a Hass.io host by running <a href="/hassio/installation/#alternative-install-on-generic-linux-server">the installer</a>.</p>
+<h3><a class="title-link" name="supervisor" href="#supervisor"></a> Supervisor</h3>
+<p>The supervisor offers an API to manage the host and the running Docker containers.</p>
+<h3><a class="title-link" name="configuration-panel" href="#configuration-panel"></a> Configuration panel</h3>
+<p>The configuration panel lives inside the supervisor but is accessible via the Home Assistant user interface. The configuration panel allows the user to manage the installation.</p>
 </article>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
@@ -80,8 +96,15 @@
         <a  href='/hassio/'>Hass.io </a>
         <ul>
           <li><a  href='/hassio/installation/'>Installation </a></li>
-          <li><a class='active' href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a class='active' href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/hassio/create_hassio_addon/index.html b/hassio/create_hassio_addon/index.html
index e728ab00c4..2559751dee 100644
--- a/hassio/create_hassio_addon/index.html
+++ b/hassio/create_hassio_addon/index.html
@@ -67,7 +67,7 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>[Placeholder]</p>
+  <p>For now, see the instructions in <a href="https://github.com/home-assistant/hassio-addons">the add-on repository</a>.</p>
 </article>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
@@ -80,8 +80,15 @@
         <a  href='/hassio/'>Hass.io </a>
         <ul>
           <li><a  href='/hassio/installation/'>Installation </a></li>
-          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a class='active' href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/hassio/create_hassio_addon_repository/index.html b/hassio/create_hassio_addon_repository/index.html
index dd7886b70c..eaa9f2d6d7 100644
--- a/hassio/create_hassio_addon_repository/index.html
+++ b/hassio/create_hassio_addon_repository/index.html
@@ -80,8 +80,15 @@
         <a  href='/hassio/'>Hass.io </a>
         <ul>
           <li><a  href='/hassio/installation/'>Installation </a></li>
-          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a class='active' href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/hassio/development/index.html b/hassio/development/index.html
new file mode 100644
index 0000000000..39569db243
--- /dev/null
+++ b/hassio/development/index.html
@@ -0,0 +1,132 @@
+<!doctype html>
+  <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+  <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+  <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+  <!--[if gt IE 8]><!--> <html> <!--<![endif]-->
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Hass.io development - Home Assistant</title>
+    <meta name="author" content="Home Assistant">
+    <meta name="description" content="How to get started with Hass.io development.">
+    <meta name="viewport" content="width=device-width">
+    <link rel="canonical" href="https://home-assistant.io/hassio/development/">
+    <meta property="fb:app_id" content="338291289691179">
+    <meta property="og:title" content="Hass.io development">
+    <meta property="og:site_name" content="Home Assistant">
+    <meta property="og:url" content="https://home-assistant.io/hassio/development/">
+    <meta property="og:type" content="website">
+    <meta property="og:description" content="How to get started with Hass.io development.">
+    <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:site" content="@home_assistant">
+    <meta name="twitter:title" content="Hass.io development">
+    <meta name="twitter:description" content="How to get started with Hass.io development.">
+    <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link rel='shortcut icon' href='/images/favicon.ico' />
+    <link rel='icon' type='image/png' href='/images/favicon-192x192.png' sizes='192x192' />
+  </head>
+  <body >
+    <header>
+      <div class="grid-wrapper">
+  <div class="grid">
+    <div class="grid__item three-tenths lap-two-sixths palm-one-whole ha-title">
+  <a href="/" class="site-title">
+    <img width='40' src='/demo/favicon-192x192.png'>
+    <span>Home Assistant</span>
+  </a>
+</div>
+<div class="grid__item seven-tenths lap-four-sixths palm-one-whole">
+  <nav>
+    <input type="checkbox" id="toggle">
+<label for="toggle" class="toggle" data-open="Main Menu" data-close="Close Menu"></label>
+<ul class="menu pull-right">
+  <li><a href="/getting-started/">Getting started</a></li>
+  <li><a href="/components/">Components</a></li>
+  <li><a href="/docs/">Docs</a></li>
+  <li><a href="/cookbook/">Examples</a></li>
+  <li><a href="/developers/">Developers</a></li>
+  <li><a href="/blog/">Blog</a></li>
+  <li><a href="/help/">Need help?</a></li>
+</ul>
+  </nav>
+</div>
+  </div>
+</div>
+    </header>
+    <div class="grid-wrapper">
+      <div class="grid grid-center">
+        <div class="grid__item two-thirds lap-one-whole palm-one-whole">
+          <article class="page">
+    <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/hassio/development.markdown'>Edit this page on GitHub</a></div>
+  <header>
+    <h1 class="title indent">
+      Hass.io Development
+    </h1>
+  </header>
+  <hr class="divider">
+  <p>Seen all the Hass.io stuff and want to built on top of it? That’s awesome.</p>
+<p>Before you get started with development, get familiar with <a href="/hassio/architecture/">the architecture</a>.</p>
+<p>[Placeholder]</p>
+</article>
+        </div>
+        <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
+          <div class="grid">
+    <section class="aside-module grid__item one-whole lap-one-half">
+  <div class='section'>
+    <h1 class="title delta">Topics</h1>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/'>Hass.io </a>
+        <ul>
+          <li><a  href='/hassio/installation/'>Installation </a></li>
+          <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a class='active' href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
+          <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
+          <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+</section>
+</div>
+        </aside>
+      </div>
+    </div>
+    <footer>
+      <div class="grid-wrapper">
+  <div class="grid">
+    <div class="grid__item">
+      <div class="copyright">
+  <a rel="me" href='https://twitter.com/home_assistant'><i class="icon-twitter"></i></a>
+  <a rel="me" href='https://facebook.com/homeassistantio'><i class="icon-facebook"></i></a>
+  <a rel="me" href='https://plus.google.com/110560654828510104551'><i class="icon-google-plus"></i></a>
+  <a rel="me" href='https://github.com/home-assistant/home-assistant'><i class="icon-github"></i></a>
+  <div class="credit">
+    Contact us at <a href='mailto:hello@home-assistant.io'>hello@home-assistant.io</a>.<br>
+    Website powered by <a href='http://jekyllrb.com/'>Jekyll</a> and the <a href='https://github.com/coogie/oscailte'>Oscalite theme</a>.<br />
+    Hosted by <a href='https://pages.github.com/'>GitHub</a> and served by <a href='https://cloudflare.com'>CloudFlare</a>.
+  </div>
+  <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">home-assistant.io</span> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
+</div>
+    </div>
+  </div>
+</div>
+    </footer>
+    <script>
+  var _gaq=[['_setAccount','UA-57927901-1'],['_trackPageview']];
+  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+  s.parentNode.insertBefore(g,s)}(document,'script'));
+</script>
+  </body>
+</html>
diff --git a/hassio/index.html b/hassio/index.html
index 921bfa50d0..f3fdacec58 100644
--- a/hassio/index.html
+++ b/hassio/index.html
@@ -67,7 +67,7 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>[Placeholder]</p>
+  <p>Hass.io turns your Raspberry Pi (or other device) into the ultimate Home Automation hub. It takes away all the hassle of installing Home Assistant and related applications and keeping them up to date. Updates to the operating system, Home Assistant and any add-ons can be done via the Home Assistant UI with a single click.</p>
 </article>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
@@ -80,8 +80,15 @@
         <a class='active' href='/hassio/'>Hass.io </a>
         <ul>
           <li><a  href='/hassio/installation/'>Installation </a></li>
-          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/hassio/installation/index.html b/hassio/installation/index.html
index a7ca8af0ed..03e3485a2a 100644
--- a/hassio/installation/index.html
+++ b/hassio/installation/index.html
@@ -67,7 +67,15 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>[Placeholder]</p>
+  <p>Hass.io images are available for all available Raspberry Pi platforms. Download the appropriate image for your Raspberry Pi:</p>
+<ul>
+  <li><a href="https://github.com/home-assistant/hassio-build/releases/download/0.7/resinos-hassio-0.7-raspberrypi.img.bz2">Raspberry Pi / Zero</a></li>
+  <li><a href="https://github.com/home-assistant/hassio-build/releases/download/0.7/resinos-hassio-0.7-raspberrypi2.img.bz2">Raspberry Pi 2</a></li>
+  <li><a href="https://github.com/home-assistant/hassio-build/releases/download/0.7/resinos-hassio-0.7-raspberrypi3.img.bz2">Raspberry Pi 3</a></li>
+</ul>
+<p>Once downloaded, write it to an SD card using <a href="https://etcher.io/">Etcher</a>. Then put the SD card into your Raspberry Pi and turn it on. You will be able to reach your installation on <a href="http://hassio.local">http://hassio.local</a>.</p>
+<h3><a class="title-link" name="alternative-install-on-generic-linux-server" href="#alternative-install-on-generic-linux-server"></a> Alternative: install on generic Linux server</h3>
+<p>For advanced users, it is also possible to try Hass.io on your Linux server or inside a VM. To do so, <a href="https://github.com/home-assistant/hassio-build/tree/master/install">follow these instructions</a>.</p>
 </article>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
@@ -80,8 +88,15 @@
         <a  href='/hassio/'>Hass.io </a>
         <ul>
           <li><a class='active' href='/hassio/installation/'>Installation </a></li>
-          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/addons/'>Available add-ons </a></li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <a  href='/hassio/development/'>Development </a>
+        <ul>
+          <li><a  href='/hassio/architecture/'>Architecture </a></li>
           <li><a  href='/hassio/create_hassio_addon/'>Creating add-ons </a></li>
           <li><a  href='/hassio/create_hassio_addon_repository/'>Creating add-on repositories </a></li>
         </ul>
diff --git a/images/hassio/architecture.png b/images/hassio/architecture.png
new file mode 100644
index 0000000000..a89e208cdc
Binary files /dev/null and b/images/hassio/architecture.png differ
diff --git a/sitemap.xml b/sitemap.xml
index 248a5b8632..a143be0ffc 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -573,6 +573,9 @@
 <loc>https://home-assistant.io/developers/development/</loc>
 </url>
 <url>
+<loc>https://home-assistant.io/hassio/development/</loc>
+</url>
+<url>
 <loc>https://home-assistant.io/developers/development_catching_up/</loc>
 </url>
 <url>
@@ -3256,62 +3259,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-05-04T04:19:52+00:00</lastmod>
+<lastmod>2017-05-04T05:54:35+00:00</lastmod>
 </url>
 </urlset>