diff --git a/source/_components/binary_sensor.enocean.markdown b/source/_components/binary_sensor.enocean.markdown
index fe4ea3dd681..ff59c3f8e06 100644
--- a/source/_components/binary_sensor.enocean.markdown
+++ b/source/_components/binary_sensor.enocean.markdown
@@ -30,11 +30,21 @@ binary_sensor:
     id: [0x01,0x90,0x84,0x3C]
 ```
 
-Configuration variables:
-
-- **id** (*Required*): The ID of the device. This is the 4 bytes long number written on the dimmer.
-- **name** (*Optional*): An identifier for the switch in the frontend.
-- **device_class** (*Optional*): The [type/class](/components/binary_sensor/) of the sensor to set the icon in the frontend.
+{% configuration %}
+id:
+  description: The ID of the device. This is the 4 bytes long number written on the dimmer.
+  required: true
+  type: list
+name:
+  description: An identifier for the switch in the frontend.
+  required: false
+  default: EnOcean binary sensor
+  type: string
+device_class:
+  description: The [type/class](/components/binary_sensor/) of the sensor to set the icon in the frontend.
+  required: false
+  type: device_class
+{% endconfiguration %}
 
 EnOcean binary sensors only generate 'button_pressed' events. The event data has following four fields:
 
diff --git a/source/_components/enocean.markdown b/source/_components/enocean.markdown
index 4e38d204446..e22c07ec2af 100644
--- a/source/_components/enocean.markdown
+++ b/source/_components/enocean.markdown
@@ -41,6 +41,9 @@ enocean:
   device: /dev/ttyUSB0
 ```
 
-Configuration variables:
-
-- **device** (*Required*): The port where your device is connected to your Home Assistant host.
+{% configuration %}
+device:
+  description: The port where your device is connected to your Home Assistant host.
+  required: true
+  type: string
+{% endconfiguration %}
diff --git a/source/_components/light.enocean.markdown b/source/_components/light.enocean.markdown
index 9203497d937..1933e8f4390 100644
--- a/source/_components/light.enocean.markdown
+++ b/source/_components/light.enocean.markdown
@@ -26,8 +26,18 @@ light:
     sender_id: [0xFF,0xC6,0xEA,0x04]
 ```
 
-Configuration variables:
-
-- **id** (*Required*): The ID of the device. This is the 4 bytes long number written on the dimmer.
-- **sender_id** (*Required*): The Sender ID of the device. This is a 4 bytes long number.
-- **name** (*Optional*): An identifier for the Ligh in the frontend.
+{% configuration %}
+id:
+  description: The ID of the device. This is the 4 bytes long number written on the dimmer.
+  required: true
+  type: list
+sender_id:
+  description: The Sender ID of the device. This is a 4 bytes long number.
+  required: true
+  type: list
+name:
+  description: An identifier for the Ligh in the frontend.
+  required: false
+  default: EnOcean Light
+  type: string
+{% endconfiguration %}
diff --git a/source/_components/sensor.enocean.markdown b/source/_components/sensor.enocean.markdown
index 669c07825aa..d75ef524801 100644
--- a/source/_components/sensor.enocean.markdown
+++ b/source/_components/sensor.enocean.markdown
@@ -21,13 +21,19 @@ To use your EnOcean device, you first have to set up your [EnOcean hub](../enoce
 ```yaml
 # Example configuration.yaml entry
 sensor:
-  - name: Television
-    platform: enocean
+  - platform: enocean
+    name: Television
     id: [0x01,0x90,0x84,0x3C]
 ```
 
-Configuration variables:
-
-- **id** (*Required*): The ID of the device. This is a 4 bytes long number.
-- **platform** (*Required*): Set to `enocean`.
-- **name** (*Required*): An identifier for the switch
+{% configuration %}
+id:
+  description: The ID of the device. This is a 4 bytes long number.
+  required: true
+  type: list
+name:
+  description: An identifier for the switch
+  required: true
+  default: EnOcean sensor
+  type: string
+{% endconfiguration %}
diff --git a/source/_components/switch.enocean.markdown b/source/_components/switch.enocean.markdown
index 2676b51dbae..f891b939306 100644
--- a/source/_components/switch.enocean.markdown
+++ b/source/_components/switch.enocean.markdown
@@ -24,11 +24,22 @@ switch:
     id: [0x01,0x90,0x84,0x3C]
 ```
 
-Configuration variables:
-
-- **id** (*Required*): The ID of the device. This is a 4 bytes long number.
-- **name** (*Optional*): An identifier for the switch. Default to `EnOcean Switch`.
-- **channel** (*Optional*): The number of the channel (typically 0 or 1) for the output channel to switch. Default to `0`.
+{% configuration %}
+id:
+  description: The ID of the device. This is a 4 bytes long number.
+  required: true
+  type: list
+name:
+  description: An identifier for the switch.
+  required: false
+  default: EnOcean Switch
+  type: string
+channel:
+  description: The number of the channel (typically 0 or 1) for the output channel to switch.
+  required: false
+  default: 0
+  type: integer
+{% endconfiguration %}
 
 ```yaml
 # Example entries for a switch with 2 outputs (channels), e.g., the Nod On SIN-2-1-01