diff --git a/source/_components/switch.knx.markdown b/source/_components/switch.knx.markdown
index c1892cf4a88..ab15243bc07 100644
--- a/source/_components/switch.knx.markdown
+++ b/source/_components/switch.knx.markdown
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "KNX Switches"
+title: "KNX Switch"
 description: "Instructions on how to integrate KXN switches with Home Assistant."
 date: 2016-06-24 12:00
 sidebar: true
@@ -13,17 +13,20 @@ ha_release: 0.24
 ---
 
 
-The KNX switch component is used as in interface to switching actuators.
+The `knx` switch component is used as in interface to switching actuators.
+
+To use your KNX switch in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 switch:
-  platform: knx
-  name: KNX Switch
-  address: 0/0/1
-  state_address: 0/0/3
+  - platform: knx
+    name: KNX Switch
+    address: 0/0/1
+    state_address: 0/0/3
 ```
 
 - **name** (*Optional*): A name for this devices used within Home assistant
 - **address** (*Required*): The KNX group address that is used to turn on/off this actuator channel
-- **state_address** (*Optional*): Some KNX devices can change their state internally without any messages on the KXN bus, e.g. if you configure a timer on a channel. The optional state_address can be used to inform Home assistant about these state changes. If a KNX message is seen on the bus addressed to the given state address, this wil overwrite the state of the switch object.
-For switching actuators that are only controlled by a single group address and can't change their state internally, you don't have to configrue the state address
+- **state_address** (*Optional*): Some KNX devices can change their state internally without any messages on the KXN bus, e.g. if you configure a timer on a channel. The optional `state_address` can be used to inform Home Assistant about these state changes. If a KNX message is seen on the bus addressed to the given state address, this wil overwrite the state of the switch object.
+For switching actuators that are only controlled by a single group address and can't change their state internally, you don't have to configrue the state address.
+
diff --git a/source/_components/thermostat.knx.markdown b/source/_components/thermostat.knx.markdown
index 79e5db0f1d9..484aa85c6c2 100644
--- a/source/_components/thermostat.knx.markdown
+++ b/source/_components/thermostat.knx.markdown
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "KNX Thermostats"
+title: "KNX Thermostat"
 description: "Instructions on how to integrate KXN thermostats with Home Assistant."
 date: 2016-06-24 12:00
 sidebar: true
@@ -13,16 +13,18 @@ ha_release: 0.25
 ---
 
 
-The KNX thermostat component is used as in interface with KNX thermostats.
+The `knx` thermostat platform is used as in interface with KNX thermostats.
 
 KNX thermostats use at least 2 group addresses: one for the current temperature and one for the target temperature (named set-point in KNX terms).
 
+To use your KNX thermostats in your installation, add the following to your `configuration.yaml` file:
+
 ```yaml
 thermostat:
-  platform: knx
-  name: KNX Thermostat
-  temperature_address: 0/1/1
-  setpoint_address: 0/1/0
+  - platform: knx
+    name: KNX Thermostat
+    temperature_address: 0/1/1
+    setpoint_address: 0/1/0
 ```
 
 - **name** (*Optional*): A name for this devices used within Home assistant