diff --git a/source/_components/sensor.luftdaten.markdown b/source/_components/sensor.luftdaten.markdown
index ebe3af44f31..5e4b7cde98f 100644
--- a/source/_components/sensor.luftdaten.markdown
+++ b/source/_components/sensor.luftdaten.markdown
@@ -2,12 +2,12 @@
 layout: page
 title: "Luftdaten Sensor"
 description: "Instructions how to setup Luftdaten sensor in Home Assistant."
-date: 2017-11-01 10:00
+date: 2017-11-01 00:00
 sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: home-assistant.png
+logo: luftdaten.png
 ha_category: Health
 ha_release: 0.57
 ha_iot_class: "Cloud Polling"
@@ -35,14 +35,46 @@ sensor:
       - humidity
 ```
 
-Configuration variables:
+{% configuration %}
+  sensorid:
+    description: The ID of the sensor.
+    required: true
+    type: string
+  name:
+    description: Name of the sensor to use in the frontend.
+    required: false
+    default: Luftdaten Sensor
+    type: string
+  resource:
+    description:  The URL of the API endpoint. Usually this has not to be changed.
+    required: false
+    default: https://api.luftdaten.info/v1/sensor/
+    type: string
+  verify_ssl:
+    description: Verify SSL connection.
+    required: false
+    default: true
+    type: boolean
+  monitored_conditions:
+    description: A list of conditions you want to monitor.
+    required: true
+    type: list
+    keys:
+      P1:
+        description: Show the particle sensors (particles 10 microns and below).
+        required: false
+        type: string
+      P2:
+        description: Show the particle sensors (particles 2.5 microns and below).
+        required: false
+        type: string
+      temperature:
+        description: Display the temperature from a weather sensor.
+        required: false
+        type: string
+      humidity:
+        description: Display the humidity from a weather sensor.
+        required: false
+        type: string
+{% endconfiguration %}
 
-- **sensorid** (*Required*): The ID of the sensor.
-- **monitored_conditions** (*Required*): A list of conditions you want to monitor. The following conditions can be monitored:
-  - `P1` for particle sensors (particles 10 microns and below).
-  - `P2` for particle sensors (particles 2.5 microns and below).
-  - `temperature` for weather sensors.
-  - `humidity` for weather sensors.
-- **name** (*Optional*): Name of the sensor to use in the frontend. Defaults to `Luftdaten Sensor`.
-- **resource** (*Optional*): The URL of the API endpoint. Usually this has not to be changed. The default is `https://api.luftdaten.info/v1/sensor/`.
-- **verify_ssl** (*Optional*): Verify SSL connection. Defaults to `true`.
diff --git a/source/_components/sensor.whois.markdown b/source/_components/sensor.whois.markdown
index 215e7aa01e1..7a6937ce33f 100644
--- a/source/_components/sensor.whois.markdown
+++ b/source/_components/sensor.whois.markdown
@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: home-assistant.png
+logo: icann.png
 ha_category: Sensor
 ha_release: "0.57"
 ha_iot_class: "Cloud Polling"
@@ -24,7 +24,15 @@ sensor:
     name: primary
 ```
 
-Configuration variables:
+{% configuration %}
+  domain:
+    description: The domain you want to perform WHOIS lookups against.
+    required: true
+    type: string
+  name:
+    description: Name to use in the frontend.
+    required: false
+    default: Whois
+    type: string
+{% endconfiguration %}
 
-- **domain** (*Required*): The domain you want to perform WHOIS lookups against.
-- **name** (*Optional*): A friendly name to apply to this sensor.
diff --git a/source/images/supported_brands/icann.png b/source/images/supported_brands/icann.png
new file mode 100644
index 00000000000..47c422601d4
Binary files /dev/null and b/source/images/supported_brands/icann.png differ
diff --git a/source/images/supported_brands/luftdaten.png b/source/images/supported_brands/luftdaten.png
new file mode 100644
index 00000000000..16218ae6a76
Binary files /dev/null and b/source/images/supported_brands/luftdaten.png differ