diff --git a/source/_components/light.rfxtrx.markdown b/source/_components/light.rfxtrx.markdown
index e29e43bd8d7..a793421e6a5 100644
--- a/source/_components/light.rfxtrx.markdown
+++ b/source/_components/light.rfxtrx.markdown
@@ -18,8 +18,9 @@ To enable RFXtrx lights in your installation, add the following to your `configu
 light:
   platform: rfxtrx
   devices:
-    ac09c4f1: Bedroom Door
-    ac09c4f2: Kitchen Door
+    living_room:
+      name: Living Room
+      packetid: XXXXX
   automatic_add: True
 ```
 
@@ -27,4 +28,3 @@ Configuration variables:
 
 - **devices** (*Required*): A list of devices with their name to use in the frontend.
 - **automatic_add** (*Optional*): To enable the automatic addition of new lights.
-
diff --git a/source/_components/rfxtrx.markdown b/source/_components/rfxtrx.markdown
index c89aacf93be..e981fbc61cd 100644
--- a/source/_components/rfxtrx.markdown
+++ b/source/_components/rfxtrx.markdown
@@ -25,13 +25,29 @@ Configuration variables:
 - **device** (*Required*): The path to your device, e.g. `/dev/serial/by-id/usb-RFXCOM_RFXtrx433_A1Y0NJGR-if00-port0`
 - **debug** (*Optional*): If you want to receive debug output.
 
+### How to find the packet_id for your devices
 
-## {% linkable_title Building on top of RFXtrx %}
-
- - [RFXtrx Sensor](/components/sensor.rfxtrx.html)
- - [RFXtrx Switch](/components/switch.rfxtrx.html)
- - [RFXtrx Light](/components/light.rfxtrx.html)
+Make sure you have enabled all RFXtrx related platforms. Push your remote and the device will be added
+automatically. After that you can see you device packetid in the state developer tools in the app.
 
+Example for X10 and Chacon DI.O signals, if you see in state developer tools the following entities:
 
+```
+light.123efab1__1b2200000890efab1213f60
+light.a8__0123454041230170
+```
 
+You must add the following to your `configuration.yaml`:
 
+```YAML
+light:
+  platform: rfxtrx
+  automatic_add: True
+  devices:
+    123efab1:
+      name: My DI.0 light device
+      packetid: 1b2200000890efab1213f60
+    a8:
+      name: My X10 light device
+      packetid: 0123454041230170
+```
diff --git a/source/_components/sensor.rfxtrx.markdown b/source/_components/sensor.rfxtrx.markdown
index 998da2753cc..9b8efa6c138 100644
--- a/source/_components/sensor.rfxtrx.markdown
+++ b/source/_components/sensor.rfxtrx.markdown
@@ -9,6 +9,7 @@ sharing: true
 footer: true
 ha_category: Sensor
 ---
+
 The rfxtrx platform support sensors that communicate in the frequency range of 433.92 MHz.
 
 To enable RFXtrx sensors in your installation, add the following to your `configuration.yaml` file:
@@ -17,17 +18,4 @@ To enable RFXtrx sensors in your installation, add the following to your `config
 # Example configuration.yaml entry
 sensor:
   platform: rfxtrx
-  devices:
-    ac09c4f1: Temperature
-    ac09c4f2: Humidity
-  automatic_add: True
 ```
-
-Configuration variables:
-
-- **devices** (*Required*): A list of devices with their name to use in the frontend.
-- **automatic_add** (*Optional*): To enable the automatic addition of new sensors.
-
-
-
-
diff --git a/source/_components/switch.rfxtrx.markdown b/source/_components/switch.rfxtrx.markdown
index 46ba9b00b58..24eea9da287 100644
--- a/source/_components/switch.rfxtrx.markdown
+++ b/source/_components/switch.rfxtrx.markdown
@@ -18,8 +18,9 @@ To enable RFXtrx switches in your installation, add the following to your `confi
 switch:
   platform: rfxtrx
   devices:
-    ac09c4f1: Bedroom Door
-    ac09c4f2: Kitchen Door
+    living_room:
+      name: Living Room
+      packetid: XXXXX
   automatic_add: True
 ```
 
diff --git a/source/components/index.html b/source/components/index.html
index 589df49ef98..5966825f015 100644
--- a/source/components/index.html
+++ b/source/components/index.html
@@ -82,7 +82,7 @@ $(window).load(function(){
 
     if (filter == '') {
       filter = '.featured'
-    } else if (filter == 'all') {
+    } else if (filter == '#all') {
       filter = '*';
     } else {
       filter = '.' + filter.substr(1);