diff --git a/_config.yml b/_config.yml
index cc0608494f..fa78c57c15 100644
--- a/_config.yml
+++ b/_config.yml
@@ -63,6 +63,10 @@ default_asides: [post/sharing.html, asides/recent_posts.html, asides/github.html
 # post_asides:
 # page_asides:
 
+collections:
+  components:
+    output: true
+
 # ----------------------- #
 #   3rd Party Settings    #
 # ----------------------- #
diff --git a/sass/custom/_paulus.scss b/sass/custom/_paulus.scss
index da1dba53ca..49b72efe3c 100644
--- a/sass/custom/_paulus.scss
+++ b/sass/custom/_paulus.scss
@@ -256,3 +256,84 @@ p.note {
     margin-top: 30px;
   }
 }
+
+#components-page {
+  .isotope-item {
+      z-index: 2;
+  }
+  .isotope-hidden.isotope-item {
+      pointer-events: none;
+      z-index: 1;
+  }
+  .isotope,
+  .isotope .isotope-item {
+      -webkit-transition-duration: 0.8s;
+      -moz-transition-duration: 0.8s;
+      transition-duration: 0.8s;
+  }
+  .isotope {
+      -webkit-transition-property: height, width;
+      -moz-transition-property: height, width;
+      transition-property: height, width;
+  }
+  .isotope .isotope-item {
+      -webkit-transition-property: -webkit-transform, opacity;
+      -moz-transition-property: -moz-transform, opacity;
+      transition-property: transform, opacity;
+  }
+
+  .filter-button-group {
+    margin-bottom: 16px;
+
+    .btn {
+      margin-right: 8px;
+      margin-bottom: 8px;
+      text-decoration: none;
+
+      &.current {
+        background-color: #3A5561;
+        background-image: linear-gradient(to bottom, #3A5561,#3F6B7D);
+      }
+    }
+  }
+
+  #componentContainer {
+    a {
+      display: inline-block;
+      width: 200px;
+      height: 142px;
+      background-color: #fefefe;
+      margin-right: 8px;
+      margin-bottom: 8px;
+      border-radius: 2px;
+      box-shadow: rgba(0, 0, 0, 0.098) 0px 2px 4px, rgba(0, 0, 0, 0.098) 0px 0px 3px;
+      padding: 8px;
+
+      .img-container {
+        height: 50px;
+        text-align: center;
+        margin-bottom: 8px;
+
+        img {
+          max-width: 100%;
+          max-height: 50px;
+          box-shadow: none;
+          border: none;
+        }
+      }
+
+      .title {
+        text-decoration: none;
+        font-size: 18px;
+        color: #000;
+        line-height: 1.3em;
+        height: 2.6em;
+      }
+
+      .category {
+        font-size: 14px;
+        color: #AAA;
+      }
+    }
+  }
+}
diff --git a/source/components/alarm_control_panel.manual.markdown b/source/_components/alarm_control_panel.manual.markdown
similarity index 98%
rename from source/components/alarm_control_panel.manual.markdown
rename to source/_components/alarm_control_panel.manual.markdown
index 8b23255ab8..4196f4c0ed 100644
--- a/source/components/alarm_control_panel.manual.markdown
+++ b/source/_components/alarm_control_panel.manual.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Alarm Control Panel
 ---
 
 <img src='/images/supported_brands/preferences-system-privacy.png' class='brand pull-right' />
diff --git a/source/components/alarm_control_panel.markdown b/source/_components/alarm_control_panel.markdown
similarity index 100%
rename from source/components/alarm_control_panel.markdown
rename to source/_components/alarm_control_panel.markdown
diff --git a/source/components/alarm_control_panel.mqtt.markdown b/source/_components/alarm_control_panel.mqtt.markdown
similarity index 97%
rename from source/components/alarm_control_panel.mqtt.markdown
rename to source/_components/alarm_control_panel.mqtt.markdown
index 80acf97cf8..300be40c12 100644
--- a/source/components/alarm_control_panel.mqtt.markdown
+++ b/source/_components/alarm_control_panel.mqtt.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mqtt.png
+ha_category: "Alarm Control Panel"
 ---
 
 <img src='/images/supported_brands/mqtt.png' class='brand pull-right' />
diff --git a/source/components/arduino.markdown b/source/_components/arduino.markdown
similarity index 97%
rename from source/components/arduino.markdown
rename to source/_components/arduino.markdown
index 651b051718..891d7d3750 100644
--- a/source/components/arduino.markdown
+++ b/source/_components/arduino.markdown
@@ -7,6 +7,10 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arduino.png
+ha_category: DIY
+logo: arduino.png
+ha_category: Hub
 ---
 
 <img src='/images/supported_brands/arduino.png' class='brand pull-right' />
diff --git a/source/components/automation.markdown b/source/_components/automation.markdown
similarity index 100%
rename from source/components/automation.markdown
rename to source/_components/automation.markdown
diff --git a/source/components/browser.markdown b/source/_components/browser.markdown
similarity index 97%
rename from source/components/browser.markdown
rename to source/_components/browser.markdown
index bd3cb1bff9..6d9b505546 100644
--- a/source/components/browser.markdown
+++ b/source/_components/browser.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Other
 ---
 
 <img src='/images/supported_brands/web-browser.png' class='brand pull-right' />
diff --git a/source/components/camera.foscam.markdown b/source/_components/camera.foscam.markdown
similarity index 96%
rename from source/components/camera.foscam.markdown
rename to source/_components/camera.foscam.markdown
index 846adb3947..7ade338212 100644
--- a/source/components/camera.foscam.markdown
+++ b/source/_components/camera.foscam.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: foscam.png
+ha_category: Camera
 ---
 
 <img src='/images/supported_brands/foscam.png' class='brand pull-right' />
diff --git a/source/components/camera.generic.markdown b/source/_components/camera.generic.markdown
similarity index 98%
rename from source/components/camera.generic.markdown
rename to source/_components/camera.generic.markdown
index 2474afd5f3..6ab31c9a80 100644
--- a/source/components/camera.generic.markdown
+++ b/source/_components/camera.generic.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Camera
 ---
 <img src='/images/supported_brands/camera-web.png' class='brand pull-right' />
 
diff --git a/source/components/configurator.markdown b/source/_components/configurator.markdown
similarity index 100%
rename from source/components/configurator.markdown
rename to source/_components/configurator.markdown
diff --git a/source/components/conversation.markdown b/source/_components/conversation.markdown
similarity index 100%
rename from source/components/conversation.markdown
rename to source/_components/conversation.markdown
diff --git a/source/components/device_sun_light_trigger.markdown b/source/_components/device_sun_light_trigger.markdown
similarity index 100%
rename from source/components/device_sun_light_trigger.markdown
rename to source/_components/device_sun_light_trigger.markdown
diff --git a/source/components/device_tracker.actiontec.markdown b/source/_components/device_tracker.actiontec.markdown
similarity index 96%
rename from source/components/device_tracker.actiontec.markdown
rename to source/_components/device_tracker.actiontec.markdown
index bfc42b9b88..561fd9820b 100644
--- a/source/components/device_tracker.actiontec.markdown
+++ b/source/_components/device_tracker.actiontec.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: actiontec.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/actiontec.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.aruba.markdown b/source/_components/device_tracker.aruba.markdown
similarity index 96%
rename from source/components/device_tracker.aruba.markdown
rename to source/_components/device_tracker.aruba.markdown
index 4e43c3fe5a..f98cd55c1f 100644
--- a/source/components/device_tracker.aruba.markdown
+++ b/source/_components/device_tracker.aruba.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: aruba.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/aruba.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.asuswrt.markdown b/source/_components/device_tracker.asuswrt.markdown
similarity index 96%
rename from source/components/device_tracker.asuswrt.markdown
rename to source/_components/device_tracker.asuswrt.markdown
index 028a94daea..fd8fb6bc88 100644
--- a/source/components/device_tracker.asuswrt.markdown
+++ b/source/_components/device_tracker.asuswrt.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: asus.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/asus.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.ddwrt.markdown b/source/_components/device_tracker.ddwrt.markdown
similarity index 95%
rename from source/components/device_tracker.ddwrt.markdown
rename to source/_components/device_tracker.ddwrt.markdown
index b24aa7ef52..11c6f9a8a6 100644
--- a/source/components/device_tracker.ddwrt.markdown
+++ b/source/_components/device_tracker.ddwrt.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: ddwrt.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/ddwrt.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.geofancy.markdown b/source/_components/device_tracker.geofancy.markdown
similarity index 92%
rename from source/components/device_tracker.geofancy.markdown
rename to source/_components/device_tracker.geofancy.markdown
index 045a8db5bb..3531d6a364 100644
--- a/source/components/device_tracker.geofancy.markdown
+++ b/source/_components/device_tracker.geofancy.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: geofancy.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/geofancy.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.luci.markdown b/source/_components/device_tracker.luci.markdown
similarity index 95%
rename from source/components/device_tracker.luci.markdown
rename to source/_components/device_tracker.luci.markdown
index c56fdadcdc..7e11db5b12 100644
--- a/source/components/device_tracker.luci.markdown
+++ b/source/_components/device_tracker.luci.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: openwrt.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/openwrt.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.markdown b/source/_components/device_tracker.markdown
similarity index 100%
rename from source/components/device_tracker.markdown
rename to source/_components/device_tracker.markdown
diff --git a/source/components/device_tracker.mqtt.markdown b/source/_components/device_tracker.mqtt.markdown
similarity index 94%
rename from source/components/device_tracker.mqtt.markdown
rename to source/_components/device_tracker.mqtt.markdown
index 9b4d93962c..4f64b9bd60 100644
--- a/source/components/device_tracker.mqtt.markdown
+++ b/source/_components/device_tracker.mqtt.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mqtt.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/mqtt.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.netgear.markdown b/source/_components/device_tracker.netgear.markdown
similarity index 95%
rename from source/components/device_tracker.netgear.markdown
rename to source/_components/device_tracker.netgear.markdown
index f37594ac95..ecc0f59814 100644
--- a/source/components/device_tracker.netgear.markdown
+++ b/source/_components/device_tracker.netgear.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: netgear.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/netgear.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.nmap_scanner.markdown b/source/_components/device_tracker.nmap_scanner.markdown
similarity index 97%
rename from source/components/device_tracker.nmap_scanner.markdown
rename to source/_components/device_tracker.nmap_scanner.markdown
index dcc4526381..9728a65f91 100644
--- a/source/components/device_tracker.nmap_scanner.markdown
+++ b/source/_components/device_tracker.nmap_scanner.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/network-workgroup.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.owntracks.markdown b/source/_components/device_tracker.owntracks.markdown
similarity index 95%
rename from source/components/device_tracker.owntracks.markdown
rename to source/_components/device_tracker.owntracks.markdown
index 815c9163bf..6099f7d717 100644
--- a/source/components/device_tracker.owntracks.markdown
+++ b/source/_components/device_tracker.owntracks.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: owntracks.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/owntracks.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.snmp.markdown b/source/_components/device_tracker.snmp.markdown
similarity index 97%
rename from source/components/device_tracker.snmp.markdown
rename to source/_components/device_tracker.snmp.markdown
index bdef4acbbf..fe25f4b4a2 100644
--- a/source/components/device_tracker.snmp.markdown
+++ b/source/_components/device_tracker.snmp.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: network-snmp.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/network-snmp.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.thomson.markdown b/source/_components/device_tracker.thomson.markdown
similarity index 95%
rename from source/components/device_tracker.thomson.markdown
rename to source/_components/device_tracker.thomson.markdown
index 9e65bde956..042db7f9d9 100644
--- a/source/components/device_tracker.thomson.markdown
+++ b/source/_components/device_tracker.thomson.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: technicolor.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/technicolor.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.tomato.markdown b/source/_components/device_tracker.tomato.markdown
similarity index 97%
rename from source/components/device_tracker.tomato.markdown
rename to source/_components/device_tracker.tomato.markdown
index b32a7e4f31..4204b0c1b3 100644
--- a/source/components/device_tracker.tomato.markdown
+++ b/source/_components/device_tracker.tomato.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/network-wired-disconnected.png' class='brand pull-right' />
diff --git a/source/components/device_tracker.tplink.markdown b/source/_components/device_tracker.tplink.markdown
similarity index 96%
rename from source/components/device_tracker.tplink.markdown
rename to source/_components/device_tracker.tplink.markdown
index 61c246fe1e..2bfd3fecdf 100644
--- a/source/components/device_tracker.tplink.markdown
+++ b/source/_components/device_tracker.tplink.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: tp-link.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/tp-link.png' class='brand pull-right' />
diff --git a/source/components/discovery.markdown b/source/_components/discovery.markdown
similarity index 100%
rename from source/components/discovery.markdown
rename to source/_components/discovery.markdown
diff --git a/source/components/downloader.markdown b/source/_components/downloader.markdown
similarity index 97%
rename from source/components/downloader.markdown
rename to source/_components/downloader.markdown
index 8aba1451e2..cbe326a5a2 100644
--- a/source/components/downloader.markdown
+++ b/source/_components/downloader.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Other
 ---
 
 <img src='/images/supported_brands/emblem-downloads.png' class='brand pull-right' />
diff --git a/source/components/group.markdown b/source/_components/group.markdown
similarity index 100%
rename from source/components/group.markdown
rename to source/_components/group.markdown
diff --git a/source/components/history.markdown b/source/_components/history.markdown
similarity index 100%
rename from source/components/history.markdown
rename to source/_components/history.markdown
diff --git a/source/components/ifttt.manything.markdown b/source/_components/ifttt.manything.markdown
similarity index 100%
rename from source/components/ifttt.manything.markdown
rename to source/_components/ifttt.manything.markdown
diff --git a/source/components/ifttt.markdown b/source/_components/ifttt.markdown
similarity index 98%
rename from source/components/ifttt.markdown
rename to source/_components/ifttt.markdown
index a3a1c218e7..e390da00ff 100644
--- a/source/components/ifttt.markdown
+++ b/source/_components/ifttt.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: ifttt.png
+ha_category: Other
 ---
 <img src='/images/supported_brands/ifttt.png' class='brand pull-right' />
 [IFTTT](https://ifttt.com) is a web service that allows users to create chains of simple conditional
diff --git a/source/components/isy994.markdown b/source/_components/isy994.markdown
similarity index 99%
rename from source/components/isy994.markdown
rename to source/_components/isy994.markdown
index 032faf6ab1..40b2ebe8a0 100644
--- a/source/components/isy994.markdown
+++ b/source/_components/isy994.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Hub
 ---
 
 ### Basic Configuration ###
diff --git a/source/components/keyboard.markdown b/source/_components/keyboard.markdown
similarity index 98%
rename from source/components/keyboard.markdown
rename to source/_components/keyboard.markdown
index ff5b96a1bc..d4dbd94228 100644
--- a/source/components/keyboard.markdown
+++ b/source/_components/keyboard.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Other
 ---
 
 <img src='/images/supported_brands/input-keyboard.png' class='brand pull-right' />
diff --git a/source/components/light.blinksticklight.markdown b/source/_components/light.blinksticklight.markdown
similarity index 95%
rename from source/components/light.blinksticklight.markdown
rename to source/_components/light.blinksticklight.markdown
index 4ba32af055..6305a14662 100644
--- a/source/components/light.blinksticklight.markdown
+++ b/source/_components/light.blinksticklight.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: blinkstick.png
+ha_category: Light
 ---
 
 <img src='/images/supported_brands/blinkstick.png' class='brand pull-right' />
diff --git a/source/components/light.hue.markdown b/source/_components/light.hue.markdown
similarity index 94%
rename from source/components/light.hue.markdown
rename to source/_components/light.hue.markdown
index b8906e7129..f7b8d3dcc5 100644
--- a/source/components/light.hue.markdown
+++ b/source/_components/light.hue.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: philips_hue.png
+ha_category: Light
 ---
 
 <img src='/images/supported_brands/philips_hue.png' class='brand pull-right' />
diff --git a/source/components/light.limitlessled.markdown b/source/_components/light.limitlessled.markdown
similarity index 98%
rename from source/components/light.limitlessled.markdown
rename to source/_components/light.limitlessled.markdown
index 4e17c2e85d..96c94b5656 100644
--- a/source/components/light.limitlessled.markdown
+++ b/source/_components/light.limitlessled.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Light
 ---
 
 <img src='/images/supported_brands/dialog-information.png' class='brand pull-right' />
diff --git a/source/components/light.markdown b/source/_components/light.markdown
similarity index 100%
rename from source/components/light.markdown
rename to source/_components/light.markdown
diff --git a/source/components/light.rfxtrx.markdown b/source/_components/light.rfxtrx.markdown
similarity index 97%
rename from source/components/light.rfxtrx.markdown
rename to source/_components/light.rfxtrx.markdown
index b01836d3ae..c8f9c82773 100644
--- a/source/components/light.rfxtrx.markdown
+++ b/source/_components/light.rfxtrx.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Light
 ---
 The rfxtrx platform support lights that communicate in the frequency range of 433.92 MHz.
 
diff --git a/source/components/logbook.markdown b/source/_components/logbook.markdown
similarity index 100%
rename from source/components/logbook.markdown
rename to source/_components/logbook.markdown
diff --git a/source/components/media_player.cast.markdown b/source/_components/media_player.cast.markdown
similarity index 94%
rename from source/components/media_player.cast.markdown
rename to source/_components/media_player.cast.markdown
index a75f2b25cd..9da3f019c0 100644
--- a/source/components/media_player.cast.markdown
+++ b/source/_components/media_player.cast.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: google_cast.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/google_cast.png' class='brand pull-right' />
diff --git a/source/components/media_player.denon.markdown b/source/_components/media_player.denon.markdown
similarity index 96%
rename from source/components/media_player.denon.markdown
rename to source/_components/media_player.denon.markdown
index 4fe302ec54..5043395315 100644
--- a/source/components/media_player.denon.markdown
+++ b/source/_components/media_player.denon.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: denon.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/denon.png' class='brand pull-right' />
diff --git a/source/components/media_player.itunes.markdown b/source/_components/media_player.itunes.markdown
similarity index 96%
rename from source/components/media_player.itunes.markdown
rename to source/_components/media_player.itunes.markdown
index 524bd23f39..e1e020381d 100644
--- a/source/components/media_player.itunes.markdown
+++ b/source/_components/media_player.itunes.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: itunes.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/itunes.png' class='brand pull-right' />
diff --git a/source/components/media_player.kodi.markdown b/source/_components/media_player.kodi.markdown
similarity index 95%
rename from source/components/media_player.kodi.markdown
rename to source/_components/media_player.kodi.markdown
index a01f00fe74..8b141d8b88 100644
--- a/source/components/media_player.kodi.markdown
+++ b/source/_components/media_player.kodi.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: kodi.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/kodi.png' class='brand pull-right' />
diff --git a/source/components/media_player.markdown b/source/_components/media_player.markdown
similarity index 100%
rename from source/components/media_player.markdown
rename to source/_components/media_player.markdown
diff --git a/source/components/media_player.mpd.markdown b/source/_components/media_player.mpd.markdown
similarity index 97%
rename from source/components/media_player.mpd.markdown
rename to source/_components/media_player.mpd.markdown
index 8fc399ede0..cbdfe46d61 100644
--- a/source/components/media_player.mpd.markdown
+++ b/source/_components/media_player.mpd.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mpd.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/mpd.png' class='brand pull-right' />
diff --git a/source/components/media_player.plex.markdown b/source/_components/media_player.plex.markdown
similarity index 95%
rename from source/components/media_player.plex.markdown
rename to source/_components/media_player.plex.markdown
index ba1e48be29..5ec12c8723 100644
--- a/source/components/media_player.plex.markdown
+++ b/source/_components/media_player.plex.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: plex.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/plex.png' class='brand pull-right' />
diff --git a/source/components/media_player.sonos.markdown b/source/_components/media_player.sonos.markdown
similarity index 94%
rename from source/components/media_player.sonos.markdown
rename to source/_components/media_player.sonos.markdown
index 6632add1ea..df18532595 100644
--- a/source/components/media_player.sonos.markdown
+++ b/source/_components/media_player.sonos.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: sonos.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/sonos.png' class='brand pull-right' />
diff --git a/source/components/media_player.squeezebox.markdown b/source/_components/media_player.squeezebox.markdown
similarity index 95%
rename from source/components/media_player.squeezebox.markdown
rename to source/_components/media_player.squeezebox.markdown
index c890f9eda3..0c6dab8fc0 100644
--- a/source/components/media_player.squeezebox.markdown
+++ b/source/_components/media_player.squeezebox.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: logitech.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/logitech.png' class='brand pull-right' />
diff --git a/source/components/modbus.markdown b/source/_components/modbus.markdown
similarity index 97%
rename from source/components/modbus.markdown
rename to source/_components/modbus.markdown
index 73f3abf631..634f4543cc 100644
--- a/source/components/modbus.markdown
+++ b/source/_components/modbus.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: modbus.png
+ha_category: Hub
 ---
 
 <img src='/images/supported_brands/modbus.png' class='brand pull-right' />
diff --git a/source/components/mqtt.markdown b/source/_components/mqtt.markdown
similarity index 100%
rename from source/components/mqtt.markdown
rename to source/_components/mqtt.markdown
diff --git a/source/components/notify.file.markdown b/source/_components/notify.file.markdown
similarity index 98%
rename from source/components/notify.file.markdown
rename to source/_components/notify.file.markdown
index 701e879d3f..5c1a46bd91 100644
--- a/source/components/notify.file.markdown
+++ b/source/_components/notify.file.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/text-x-generic.png' class='brand pull-right' />
diff --git a/source/components/notify.instapush.markdown b/source/_components/notify.instapush.markdown
similarity index 98%
rename from source/components/notify.instapush.markdown
rename to source/_components/notify.instapush.markdown
index 97d257f08a..9c04e002ca 100644
--- a/source/components/notify.instapush.markdown
+++ b/source/_components/notify.instapush.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: instapush.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/instapush.png' class='brand pull-right' />
diff --git a/source/components/notify.markdown b/source/_components/notify.markdown
similarity index 100%
rename from source/components/notify.markdown
rename to source/_components/notify.markdown
diff --git a/source/components/notify.nma.markdown b/source/_components/notify.nma.markdown
similarity index 97%
rename from source/components/notify.nma.markdown
rename to source/_components/notify.nma.markdown
index b848db5cca..918cd87eea 100644
--- a/source/components/notify.nma.markdown
+++ b/source/_components/notify.nma.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: nma.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/nma.png' class='brand pull-right' />
diff --git a/source/components/notify.pushbullet.markdown b/source/_components/notify.pushbullet.markdown
similarity index 96%
rename from source/components/notify.pushbullet.markdown
rename to source/_components/notify.pushbullet.markdown
index 50d4e94454..4ae29290b4 100644
--- a/source/components/notify.pushbullet.markdown
+++ b/source/_components/notify.pushbullet.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: pushbullet.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/pushbullet.png' class='brand pull-right' />
diff --git a/source/components/notify.pushover.markdown b/source/_components/notify.pushover.markdown
similarity index 97%
rename from source/components/notify.pushover.markdown
rename to source/_components/notify.pushover.markdown
index 5efd0303f5..22cf5d5212 100644
--- a/source/components/notify.pushover.markdown
+++ b/source/_components/notify.pushover.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: pushover.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/pushover.png' class='brand pull-right' />
diff --git a/source/components/notify.slack.markdown b/source/_components/notify.slack.markdown
similarity index 97%
rename from source/components/notify.slack.markdown
rename to source/_components/notify.slack.markdown
index cb4078e3e6..17a8c8dbe6 100644
--- a/source/components/notify.slack.markdown
+++ b/source/_components/notify.slack.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: slack.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/slack.png' class='brand pull-right' />
diff --git a/source/components/notify.smtp.markdown b/source/_components/notify.smtp.markdown
similarity index 98%
rename from source/components/notify.smtp.markdown
rename to source/_components/notify.smtp.markdown
index 00fcdb506a..29785ae871 100644
--- a/source/components/notify.smtp.markdown
+++ b/source/_components/notify.smtp.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: smtp.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/smtp.png' class='brand pull-right' />
diff --git a/source/components/notify.syslog.markdown b/source/_components/notify.syslog.markdown
similarity index 99%
rename from source/components/notify.syslog.markdown
rename to source/_components/notify.syslog.markdown
index 87ac0f0a71..b1cedf3dea 100644
--- a/source/components/notify.syslog.markdown
+++ b/source/_components/notify.syslog.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/applications-system.png' class='brand pull-right' />
diff --git a/source/components/notify.telegram.markdown b/source/_components/notify.telegram.markdown
similarity index 97%
rename from source/components/notify.telegram.markdown
rename to source/_components/notify.telegram.markdown
index 79d866f744..30dccc2223 100644
--- a/source/components/notify.telegram.markdown
+++ b/source/_components/notify.telegram.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: telegram.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/telegram.png' class='brand pull-right' />
diff --git a/source/components/notify.xmpp.markdown b/source/_components/notify.xmpp.markdown
similarity index 97%
rename from source/components/notify.xmpp.markdown
rename to source/_components/notify.xmpp.markdown
index 8576656a0d..6750c66b80 100644
--- a/source/components/notify.xmpp.markdown
+++ b/source/_components/notify.xmpp.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: xmpp.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/xmpp.png' class='brand pull-right' />
diff --git a/source/components/rfxtrx.markdown b/source/_components/rfxtrx.markdown
similarity index 98%
rename from source/components/rfxtrx.markdown
rename to source/_components/rfxtrx.markdown
index f18f488b27..e3d9ed1a72 100644
--- a/source/components/rfxtrx.markdown
+++ b/source/_components/rfxtrx.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Hub
 ---
 The rfxtrx component supports RFXtrx devices by [RFXCOM](http://www.rfxcom.com) which communicate in the frequency range of 433.92 MHz.
 
diff --git a/source/components/scene.markdown b/source/_components/scene.markdown
similarity index 100%
rename from source/components/scene.markdown
rename to source/_components/scene.markdown
diff --git a/source/components/script.markdown b/source/_components/script.markdown
similarity index 89%
rename from source/components/script.markdown
rename to source/_components/script.markdown
index 7dc662b1c7..636179704a 100644
--- a/source/components/script.markdown
+++ b/source/_components/script.markdown
@@ -27,14 +27,14 @@ script:
           entity_id: device_tracker.paulus
           domain: light
       - alias: Bedroom lights on
-        execute_service: light.turn_on
-        service_data:
+        service: light.turn_on
+        data:
           entity_id: group.bedroom
       - delay:
           # supports seconds, milliseconds, minutes, hours, etc.
           minutes: 1
       - alias: Living room lights on
-        execute_service: light.turn_on
-        service_data:
+        service: light.turn_on
+        data:
           entity_id: group.living_room
 ```
diff --git a/source/components/sensor.arduino.markdown b/source/_components/sensor.arduino.markdown
similarity index 96%
rename from source/components/sensor.arduino.markdown
rename to source/_components/sensor.arduino.markdown
index 1ff731d845..cb8b990bbe 100644
--- a/source/components/sensor.arduino.markdown
+++ b/source/_components/sensor.arduino.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arduino.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/arduino.png' class='brand pull-right' />
diff --git a/source/components/sensor.arest.markdown b/source/_components/sensor.arest.markdown
similarity index 98%
rename from source/components/sensor.arest.markdown
rename to source/_components/sensor.arest.markdown
index 2b6dbaebce..a46c77c9c5 100644
--- a/source/components/sensor.arest.markdown
+++ b/source/_components/sensor.arest.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arest.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/arest.png' class='brand pull-right' />
diff --git a/source/components/sensor.bitcoin.markdown b/source/_components/sensor.bitcoin.markdown
similarity index 98%
rename from source/components/sensor.bitcoin.markdown
rename to source/_components/sensor.bitcoin.markdown
index 00f44a15ee..01f80ee89a 100644
--- a/source/components/sensor.bitcoin.markdown
+++ b/source/_components/sensor.bitcoin.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: bitcoin.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/bitcoin.png' class='brand pull-right' />
diff --git a/source/components/sensor.command_sensor.markdown b/source/_components/sensor.command_sensor.markdown
similarity index 99%
rename from source/components/sensor.command_sensor.markdown
rename to source/_components/sensor.command_sensor.markdown
index 07650d6263..dbcfba335f 100644
--- a/source/components/sensor.command_sensor.markdown
+++ b/source/_components/sensor.command_sensor.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/utilities-terminal.png' class='brand pull-right' />
diff --git a/source/components/sensor.cpuspeed.markdown b/source/_components/sensor.cpuspeed.markdown
similarity index 96%
rename from source/components/sensor.cpuspeed.markdown
rename to source/_components/sensor.cpuspeed.markdown
index 11cf455165..f4ec5e9cd5 100644
--- a/source/components/sensor.cpuspeed.markdown
+++ b/source/_components/sensor.cpuspeed.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/utilities-system-monitor.png' class='brand pull-right' />
diff --git a/source/components/sensor.dht.markdown b/source/_components/sensor.dht.markdown
similarity index 97%
rename from source/components/sensor.dht.markdown
rename to source/_components/sensor.dht.markdown
index 3a7df9c5a3..30f1dddfe1 100644
--- a/source/components/sensor.dht.markdown
+++ b/source/_components/sensor.dht.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: dht.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/dht.png' class='brand pull-right' />
diff --git a/source/components/sensor.efergy.markdown b/source/_components/sensor.efergy.markdown
similarity index 97%
rename from source/components/sensor.efergy.markdown
rename to source/_components/sensor.efergy.markdown
index 80d36973ff..658e0112c1 100644
--- a/source/components/sensor.efergy.markdown
+++ b/source/_components/sensor.efergy.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: efergy.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/efergy.png' class='brand pull-right' />
diff --git a/source/components/sensor.forecast.markdown b/source/_components/sensor.forecast.markdown
similarity index 99%
rename from source/components/sensor.forecast.markdown
rename to source/_components/sensor.forecast.markdown
index 2219852bea..32fa9b775f 100644
--- a/source/components/sensor.forecast.markdown
+++ b/source/_components/sensor.forecast.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Weather
 ---
 
 <img src='/images/supported_brands/weather-few-clouds.png' class='brand pull-right' />
diff --git a/source/components/sensor.glances.markdown b/source/_components/sensor.glances.markdown
similarity index 98%
rename from source/components/sensor.glances.markdown
rename to source/_components/sensor.glances.markdown
index 205f179fcf..72938aaa81 100644
--- a/source/components/sensor.glances.markdown
+++ b/source/_components/sensor.glances.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: glances.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/glances.png' class='brand pull-right' />
diff --git a/source/components/sensor.mqtt.markdown b/source/_components/sensor.mqtt.markdown
similarity index 96%
rename from source/components/sensor.mqtt.markdown
rename to source/_components/sensor.mqtt.markdown
index 442d53b404..96af798f00 100644
--- a/source/components/sensor.mqtt.markdown
+++ b/source/_components/sensor.mqtt.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mqtt.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/mqtt.png' class='brand pull-right' />
diff --git a/source/components/sensor.mysensors.markdown b/source/_components/sensor.mysensors.markdown
similarity index 95%
rename from source/components/sensor.mysensors.markdown
rename to source/_components/sensor.mysensors.markdown
index 2566cc3fa4..05b87323c8 100644
--- a/source/components/sensor.mysensors.markdown
+++ b/source/_components/sensor.mysensors.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mysensors.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/mysensors.png' class='brand pull-right' />
diff --git a/source/components/sensor.openweathermap.markdown b/source/_components/sensor.openweathermap.markdown
similarity index 97%
rename from source/components/sensor.openweathermap.markdown
rename to source/_components/sensor.openweathermap.markdown
index 4695ee6d5a..7f57723fe1 100644
--- a/source/components/sensor.openweathermap.markdown
+++ b/source/_components/sensor.openweathermap.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: openweathermap.png
+ha_category: Weather
 ---
 
 <img src='/images/supported_brands/openweathermap.png' class='brand pull-right' />
diff --git a/source/components/sensor.rest.markdown b/source/_components/sensor.rest.markdown
similarity index 99%
rename from source/components/sensor.rest.markdown
rename to source/_components/sensor.rest.markdown
index c2b16a56c3..751d8bcfee 100644
--- a/source/components/sensor.rest.markdown
+++ b/source/_components/sensor.rest.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/rest.png' class='brand pull-right' />
diff --git a/source/components/sensor.rfxtrx.markdown b/source/_components/sensor.rfxtrx.markdown
similarity index 97%
rename from source/components/sensor.rfxtrx.markdown
rename to source/_components/sensor.rfxtrx.markdown
index b62bb54e04..b16929b364 100644
--- a/source/components/sensor.rfxtrx.markdown
+++ b/source/_components/sensor.rfxtrx.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 The rfxtrx platform support sensors that communicate in the frequency range of 433.92 MHz.
 
diff --git a/source/components/sensor.rpi_gpio.markdown b/source/_components/sensor.rpi_gpio.markdown
similarity index 96%
rename from source/components/sensor.rpi_gpio.markdown
rename to source/_components/sensor.rpi_gpio.markdown
index 77e86d7814..42f89b86f7 100644
--- a/source/components/sensor.rpi_gpio.markdown
+++ b/source/_components/sensor.rpi_gpio.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: raspberry-pi.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/raspberry-pi.png' class='brand pull-right' />
diff --git a/source/components/sensor.sabnzbd.markdown b/source/_components/sensor.sabnzbd.markdown
similarity index 97%
rename from source/components/sensor.sabnzbd.markdown
rename to source/_components/sensor.sabnzbd.markdown
index cbf01870e4..37fd6279cf 100644
--- a/source/components/sensor.sabnzbd.markdown
+++ b/source/_components/sensor.sabnzbd.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: sabnzbd.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/sabnzbd.png' class='brand pull-right' />
diff --git a/source/components/sensor.swiss_public_transport.markdown b/source/_components/sensor.swiss_public_transport.markdown
similarity index 98%
rename from source/components/sensor.swiss_public_transport.markdown
rename to source/_components/sensor.swiss_public_transport.markdown
index 838c3df7a6..fc336ebe57 100644
--- a/source/components/sensor.swiss_public_transport.markdown
+++ b/source/_components/sensor.swiss_public_transport.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/appointment-new.png' class='brand pull-right' />
diff --git a/source/components/sensor.systemmonitor.markdown b/source/_components/sensor.systemmonitor.markdown
similarity index 99%
rename from source/components/sensor.systemmonitor.markdown
rename to source/_components/sensor.systemmonitor.markdown
index df30c897b3..a8030984fc 100644
--- a/source/components/sensor.systemmonitor.markdown
+++ b/source/_components/sensor.systemmonitor.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/utilities-system-monitor.png' class='brand pull-right' />
diff --git a/source/components/sensor.temper.markdown b/source/_components/sensor.temper.markdown
similarity index 96%
rename from source/components/sensor.temper.markdown
rename to source/_components/sensor.temper.markdown
index c90a13e46c..df1295abc1 100644
--- a/source/components/sensor.temper.markdown
+++ b/source/_components/sensor.temper.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 This temper sensor platform allows you to get the current temperature from a TEMPer device.
diff --git a/source/components/sensor.time_date.markdown b/source/_components/sensor.time_date.markdown
similarity index 97%
rename from source/components/sensor.time_date.markdown
rename to source/_components/sensor.time_date.markdown
index 142f0bb1b3..85d463a045 100644
--- a/source/components/sensor.time_date.markdown
+++ b/source/_components/sensor.time_date.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/clock.png' class='brand pull-right' />
diff --git a/source/components/sensor.transmission.markdown b/source/_components/sensor.transmission.markdown
similarity index 98%
rename from source/components/sensor.transmission.markdown
rename to source/_components/sensor.transmission.markdown
index d886ea22b2..5f2a6a2933 100644
--- a/source/components/sensor.transmission.markdown
+++ b/source/_components/sensor.transmission.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: transmission.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/transmission.png' class='brand pull-right' />
diff --git a/source/components/sensor.worldclock.markdown b/source/_components/sensor.worldclock.markdown
similarity index 98%
rename from source/components/sensor.worldclock.markdown
rename to source/_components/sensor.worldclock.markdown
index 1f587ee1b5..e0109630a8 100644
--- a/source/components/sensor.worldclock.markdown
+++ b/source/_components/sensor.worldclock.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/clock.png' class='brand pull-right' />
diff --git a/source/components/shell_command.markdown b/source/_components/shell_command.markdown
similarity index 96%
rename from source/components/shell_command.markdown
rename to source/_components/shell_command.markdown
index 0697fbef7e..a52a8fbdf0 100644
--- a/source/components/shell_command.markdown
+++ b/source/_components/shell_command.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Other
 ---
 
 <img src='/images/supported_brands/utilities-terminal.png' class='brand pull-right' />
diff --git a/source/components/simple_alarm.markdown b/source/_components/simple_alarm.markdown
similarity index 100%
rename from source/components/simple_alarm.markdown
rename to source/_components/simple_alarm.markdown
diff --git a/source/components/sun.markdown b/source/_components/sun.markdown
similarity index 98%
rename from source/components/sun.markdown
rename to source/_components/sun.markdown
index 2e7ee4f3d6..572f461a94 100644
--- a/source/components/sun.markdown
+++ b/source/_components/sun.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Weather
 ---
 
 <img src='/images/supported_brands/weather-clear.png' class='brand pull-right' />
diff --git a/source/components/switch.arduino.markdown b/source/_components/switch.arduino.markdown
similarity index 97%
rename from source/components/switch.arduino.markdown
rename to source/_components/switch.arduino.markdown
index 9c01242026..ce05d59322 100644
--- a/source/components/switch.arduino.markdown
+++ b/source/_components/switch.arduino.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arduino.png
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/arduino.png' class='brand pull-right' />
diff --git a/source/components/switch.arest.markdown b/source/_components/switch.arest.markdown
similarity index 97%
rename from source/components/switch.arest.markdown
rename to source/_components/switch.arest.markdown
index cb98989534..0481789d8a 100644
--- a/source/components/switch.arest.markdown
+++ b/source/_components/switch.arest.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arest.png
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/arest.png' class='brand pull-right' />
diff --git a/source/components/switch.command_switch.markdown b/source/_components/switch.command_switch.markdown
similarity index 99%
rename from source/components/switch.command_switch.markdown
rename to source/_components/switch.command_switch.markdown
index 71136d95be..6e54084591 100644
--- a/source/components/switch.command_switch.markdown
+++ b/source/_components/switch.command_switch.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/utilities-terminal.png' class='brand pull-right' />
diff --git a/source/components/switch.edimax.markdown b/source/_components/switch.edimax.markdown
similarity index 96%
rename from source/components/switch.edimax.markdown
rename to source/_components/switch.edimax.markdown
index 95c0a26692..3823d4dc2e 100644
--- a/source/components/switch.edimax.markdown
+++ b/source/_components/switch.edimax.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: edimax.png
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/edimax.png' class='brand pull-right' />
diff --git a/source/components/switch.hikvision.markdown b/source/_components/switch.hikvision.markdown
similarity index 96%
rename from source/components/switch.hikvision.markdown
rename to source/_components/switch.hikvision.markdown
index 1480804be5..401a459835 100644
--- a/source/components/switch.hikvision.markdown
+++ b/source/_components/switch.hikvision.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: hikvision.png
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/hikvision.png' class='brand pull-right' />
diff --git a/source/components/switch.markdown b/source/_components/switch.markdown
similarity index 100%
rename from source/components/switch.markdown
rename to source/_components/switch.markdown
diff --git a/source/components/switch.mqtt.markdown b/source/_components/switch.mqtt.markdown
similarity index 98%
rename from source/components/switch.mqtt.markdown
rename to source/_components/switch.mqtt.markdown
index ac0ff005e9..d44a87d24c 100644
--- a/source/components/switch.mqtt.markdown
+++ b/source/_components/switch.mqtt.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mqtt.png
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/mqtt.png' class='brand pull-right' />
diff --git a/source/components/switch.rfxtrx.markdown b/source/_components/switch.rfxtrx.markdown
similarity index 97%
rename from source/components/switch.rfxtrx.markdown
rename to source/_components/switch.rfxtrx.markdown
index 6164f3b8a9..d6fae1f339 100644
--- a/source/components/switch.rfxtrx.markdown
+++ b/source/_components/switch.rfxtrx.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Switch
 ---
 The rfxtrx platform support switches that communicate in the frequency range of 433.92 MHz.
 
diff --git a/source/components/switch.rpi_gpio.markdown b/source/_components/switch.rpi_gpio.markdown
similarity index 95%
rename from source/components/switch.rpi_gpio.markdown
rename to source/_components/switch.rpi_gpio.markdown
index f7dea1d627..60c711acfc 100644
--- a/source/components/switch.rpi_gpio.markdown
+++ b/source/_components/switch.rpi_gpio.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: raspberry-pi.png
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/raspberry-pi.png' class='brand pull-right' />
diff --git a/source/components/switch.transmission.markdown b/source/_components/switch.transmission.markdown
similarity index 93%
rename from source/components/switch.transmission.markdown
rename to source/_components/switch.transmission.markdown
index 259172fd88..4e703e2397 100644
--- a/source/components/switch.transmission.markdown
+++ b/source/_components/switch.transmission.markdown
@@ -7,10 +7,12 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: transmission.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/transmission.png' class='brand pull-right' />
-The transmission platform allows you to control your [Transmission](http://www.transmissionbt.com/) client from within Home Assistant. The platform enables you switch to your 'Alternative Speed Limits' (aka 'Turtle mode') setting. 
+The transmission platform allows you to control your [Transmission](http://www.transmissionbt.com/) client from within Home Assistant. The platform enables you switch to your 'Alternative Speed Limits' (aka 'Turtle mode') setting.
 
 To add Transmission to your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/components/switch.wemo.markdown b/source/_components/switch.wemo.markdown
similarity index 93%
rename from source/components/switch.wemo.markdown
rename to source/_components/switch.wemo.markdown
index 11e0903b2f..d5878eec30 100644
--- a/source/components/switch.wemo.markdown
+++ b/source/_components/switch.wemo.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: belkin_wemo.png
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/belkin_wemo.png' class='brand pull-right' />
diff --git a/source/components/tellstick.markdown b/source/_components/tellstick.markdown
similarity index 94%
rename from source/components/tellstick.markdown
rename to source/_components/tellstick.markdown
index c15ef78ba5..f63cba4d3a 100644
--- a/source/components/tellstick.markdown
+++ b/source/_components/tellstick.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: telldus_tellstick.png
+ha_category: Hub
 ---
 
 <img src='/images/supported_brands/telldus_tellstick.png' class='brand pull-right' />
diff --git a/source/components/thermostat.heat_control.markdown b/source/_components/thermostat.heat_control.markdown
similarity index 98%
rename from source/components/thermostat.heat_control.markdown
rename to source/_components/thermostat.heat_control.markdown
index 1ad58b1425..37a69b6fa7 100644
--- a/source/components/thermostat.heat_control.markdown
+++ b/source/_components/thermostat.heat_control.markdown
@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Thermostat
 ---
 
 Specify a start time, end time and a target temperature.
diff --git a/source/components/thermostat.markdown b/source/_components/thermostat.markdown
similarity index 100%
rename from source/components/thermostat.markdown
rename to source/_components/thermostat.markdown
diff --git a/source/components/thermostat.nest.markdown b/source/_components/thermostat.nest.markdown
similarity index 93%
rename from source/components/thermostat.nest.markdown
rename to source/_components/thermostat.nest.markdown
index a2705c4388..6f347b41e7 100644
--- a/source/components/thermostat.nest.markdown
+++ b/source/_components/thermostat.nest.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: nest_thermostat.png
+ha_category: Thermostat
 ---
 
 <img src='/images/supported_brands/nest_thermostat.png' class='brand pull-right' />
diff --git a/source/components/vera.markdown b/source/_components/vera.markdown
similarity index 95%
rename from source/components/vera.markdown
rename to source/_components/vera.markdown
index 910e7e9638..c66220716d 100644
--- a/source/components/vera.markdown
+++ b/source/_components/vera.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: vera.png
+ha_category: Hub
 ---
 
 <img src='/images/supported_brands/vera.png' class='brand' />
diff --git a/source/components/verisure.markdown b/source/_components/verisure.markdown
similarity index 97%
rename from source/components/verisure.markdown
rename to source/_components/verisure.markdown
index c5c3524d20..4e29467b8b 100644
--- a/source/components/verisure.markdown
+++ b/source/_components/verisure.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: verisure.png
+ha_category: Hub
 ---
 
 <img src='/images/supported_brands/verisure.png' class='brand pull-right' />
diff --git a/source/components/wink.markdown b/source/_components/wink.markdown
similarity index 98%
rename from source/components/wink.markdown
rename to source/_components/wink.markdown
index 7acbdad4a4..5bce06c41c 100644
--- a/source/components/wink.markdown
+++ b/source/_components/wink.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: wink.png
+ha_category: Hub
 ---
 
 <img src='/images/supported_brands/wink.png' class='brand pull-right' />
diff --git a/source/components/zone.markdown b/source/_components/zone.markdown
similarity index 100%
rename from source/components/zone.markdown
rename to source/_components/zone.markdown
diff --git a/source/components/zwave.markdown b/source/_components/zwave.markdown
similarity index 97%
rename from source/components/zwave.markdown
rename to source/_components/zwave.markdown
index 35114010f8..3b2ba53af4 100644
--- a/source/components/zwave.markdown
+++ b/source/_components/zwave.markdown
@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: z-wave.png
+ha_category: Hub
 ---
 
 <p class='note warning'>
diff --git a/source/components/index.markdown b/source/components/index.markdown
index 892b6d0c2f..d5bdaa8e8c 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -8,133 +8,65 @@ comments: false
 sharing: true
 footer: true
 is_homepage: true
+body_id: components-page
 ---
 
-<head>
-
-<script src="http://code.jquery.com/jquery-2.1.4.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.isotope/2.2.2/isotope.pkgd.js"></script>
-
-
-<style>
-img {
-    margin:5px;
-}
-
-.isotope-item {
-    z-index: 2;
-}
-.isotope-hidden.isotope-item {
-    pointer-events: none;
-    z-index: 1;
-}
-.isotope,
-.isotope .isotope-item {
-    -webkit-transition-duration: 0.8s;
-    -moz-transition-duration: 0.8s;
-    transition-duration: 0.8s;
-}
-.isotope {
-    -webkit-transition-property: height, width;
-    -moz-transition-property: height, width;
-    transition-property: height, width;
-}
-.isotope .isotope-item {
-    -webkit-transition-property: -webkit-transform, opacity;
-    -moz-transition-property: -moz-transform, opacity;
-    transition-property: transform, opacity;
-}
-</style>
-
-<script type="text/javascript">
-$(window).load(function(){
-    var $container = $('.componentContainer');
-    $container.isotope({
-        filter: '*',
-        animationOptions: {
-            duration: 750,
-            easing: 'linear',
-            queue: false
-        }
-    });
- 
-    $('.filter-button-group').on('click', 'button', function() {
-        $('.componentFilter .current').removeClass('current');
-        $(this).addClass('current');
- 
-        var selector = $(this).attr('data-filter');
-        $container.isotope({
-            filter: selector,
-            animationOptions: {
-                duration: 750,
-                easing: 'linear',
-                queue: false
-            }
-         });
-         return false;
-    });
-
-});
-</script>
-
-</head>
-
 Components add support for devices, automation, and much much more to Home Assistant. The following things are supported out-of-the-box.
 
 ## {% linkable_title Entities %}
 
 Entities are things that you want to observe within Home Assistant. Support for these things are provided by the entity components [Light](/components/light.html), [Switch](/components/switch.html), [Thermostat](/components/thermostat.html), [Media player](/components/media_player.html), [Device tracker](/components/device_tracker.html), and [Sun](/components/sun.html).
 
-<div class="button-group filter-button-group">
-	<button class="btn" data-filter="*">All</button>
-	<button class="btn" data-filter=".light">Light</button>
-	<button class="btn" data-filter=".sensor">Sensor</button>
-	<button class="btn" data-filter=".switch">Switch</button>
-	<button class="btn" data-filter=".media">Media player</button>
-	<button class="btn" data-filter=".presence">Presence</button>
-	<button class="btn" data-filter=".notify">Notify</button>
-</div>
-
-<script type="text/javascript">
-$(document).on('ready',function(){
-
-var data = [
-    {"name": "Raspberry", "type": "switch", "image": "raspberry-pi.png", "details": "switch.rpi_gpio.html"},
-    {"name": "LimitlessLED", "type": "light", "image": "dialog-information.png", "details": "light.limitlessled.html"},
-    {"name": "Insteon", "type": "switch", "image": "insteon.png", "details": "isy994.html"},
-    {"name": "Owntracks", "type": "presence", "image": "owntracks.png", "details": "device_tracker.owntracks.html"},
-    {"name": "Kodi", "type": "media", "image": "kodi.png", "details": "media_player.kodi.html"},
-    {"name": "Philips Hue", "type": "light", "image": "philips_hue.png", "details": "light.hue.html"},
-    {"name": "MPD", "type": "media", "image": "mpd.png", "details": "media_player.mpd.html"},
-    {"name": "Arduino sensor", "type": "sensor", "image": "arduino.png", "details": "sensor.arduino.html"},
-    {"name": "Arduino switch", "type": "switch", "image": "arduino.png", "details": "switch.arduino.html"},
-    {"name": "MQTT sensor", "type": "sensor", "image": "mqtt.png", "details": "sensor.mqtt.html"},
-    {"name": "Sonos", "type": "media", "image": "sonos.png", "details": "media_player.sonos.html"},
-    {"name": "MySensors", "type": "sensor", "image": "mysensors.png", "details": "sensor.mysensors.html"},
-    {"name": "MQTT switch", "type": "switch", "image": "mqtt.png", "details": "switch.mqtt.html"},
-    {"name": "Telegram", "type": "notify", "image": "telegram.png", "details": "notify.telegram.html"},
-    {"name": "Blinkstick", "type": "light", "image": "blinkstick.png", "details": "light.blinksticklight.html"},
-    {"name": "TP-Link", "type": "presence", "image": "tp-link.png", "details": "device_tracker.tplink.html"},
-    {"name": "PushOver", "type": "notify", "image": "pushover.png", "details": "notify.pushover.html"},
-    {"name": "XMPP", "type": "notify", "image": "xmpp.png", "details": "notify.xmpp.html"},
-    {"name": "PushBullet", "type": "notify", "image": "pushbullet.png", "details": "notify.pushbullet.html"},
-    ];
-
-$.map(data, function(component, index) {
-
-$("div.componentContainer").append(
-    '<div style="width:120px;height:110px;margin:3px;padding:5px;border:1px solid #8c8c8c;background-color:#f7f7f7;border-radius: 5px 5px 5px 5px;-moz-border-radius: 5px 5px 5px 5px;-webkit-border-radius: 5px 5px 5px 5px;" class="' + component.type + '">' + '<a href="/components/' + component.details + '"><img src="/images/supported_brands/' + component.image + '" class="brand overview" />' + 
-'<a href="/components/' + component.details + '">' + component.name + '</a></div>');
-});
-});
-</script>
-
-<div class="componentContainer"></div>
-<br />
 <p class='note'>
 Support for these services is provided by the Home Assistant community and not the service providers.
 </p>
 
+{% assign components = site.components | sort: 'title' %}
+{% assign categories = components | sort: 'ha_category' | map: 'ha_category' %}
+
+<div class="filter-button-group">
+  <a href='#' class="btn current" data-filter="*">All</a>
+
+  {% comment %} Jekyll 2.5.2 does not support the uniq filter :/ {% endcomment %}
+  {% assign category_printed = '' %}
+
+  {% for category in categories %}
+    {% if category and category != 'Other' %}
+      {% unless category_printed contains category %}
+        <a href='#' class="btn" data-filter=".{{ category | slugify }}">{{ category }}</a>
+        {% assign category_printed = category_printed | append: ',' | append: category %}
+      {% endunless %}
+    {% endif %}
+  {% endfor %}
+
+  <a href='#' class="btn" data-filter=".{{ 'Other' | slugify }}">Other</a>
+</div>
+
+<div id="componentContainer">
+  {% for component in components %}
+    {% if component.ha_category %}
+      <a href='{{ component.url }}' class='{{ component.ha_category | slugify }}'>
+        <div class='img-container'>
+          {% if component.logo %}
+            <img src='/images/supported_brands/{{ component.logo }}'>
+          {% endif %}
+        </div>
+        <div class='title'>{{ component.title }}</div>
+        <div class='category'>{{ component.ha_category }}</div>
+      </a>
+    {% endif %}
+  {% endfor %}
+</div>
+
+## Not done yet
+
+{% for component in components %}
+  {% unless component.ha_category %}
+<p>{{ component.title }}</p>
+  {% endunless %}
+{% endfor %}
+
+
 ## {% linkable_title Organization %}
 | Type | Description
 | ---- | -----------
@@ -156,3 +88,37 @@ Support for these services is provided by the Home Assistant community and not t
 | Type | Description
 | ---- | -----------
 | [Configurator](/components/configurator.html) | Component used by other components to get configuration from the user.
+
+
+<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.isotope/2.2.2/isotope.pkgd.js"></script>
+<script type="text/javascript">
+$(window).load(function(){
+    var $container = $('#componentContainer');
+    $container.isotope({
+        filter: '*',
+        animationOptions: {
+            duration: 750,
+            easing: 'linear',
+            queue: false
+        }
+    });
+
+    $('.filter-button-group a').click(function() {
+        $('.filter-button-group .current').removeClass('current');
+        $(this).addClass('current');
+
+        var selector = $(this).attr('data-filter');
+        $container.isotope({
+            filter: selector,
+            animationOptions: {
+                duration: 750,
+                easing: 'linear',
+                queue: false
+            }
+         });
+         return false;
+    });
+
+});
+</script>