diff --git a/source/_components/alarm_control_panel.wink.markdown b/source/_components/alarm_control_panel.wink.markdown
index f2ea46016e..e8e394b8d1 100644
--- a/source/_components/alarm_control_panel.wink.markdown
+++ b/source/_components/alarm_control_panel.wink.markdown
@@ -20,7 +20,7 @@ The Wink alarm platform allows you to control your [Wink](http://www.wink.com/)
 The requirement is that you have setup [Wink](/components/wink/).
 
 
-### Supported devices
+### {% linkable_title Supported devices %}
 
 - Canary all-in-one security camera
 
diff --git a/source/_components/binary_sensor.wink.markdown b/source/_components/binary_sensor.wink.markdown
index c7101054e6..aaff7d4e45 100644
--- a/source/_components/binary_sensor.wink.markdown
+++ b/source/_components/binary_sensor.wink.markdown
@@ -19,7 +19,7 @@ The Wink binary sensor platform allows you to get data from your [Wink](http://w
 The requirement is that you have setup [Wink](/components/wink/).
 
 
-### Supported Binary sensor devices
+### {% linkable_title Supported Binary sensor devices %}
 
 - Smoke and CO detectors (No Wink hub required for Nest)
 - Window/Door sensors
diff --git a/source/_components/climate.wink.markdown b/source/_components/climate.wink.markdown
index 5f666b5d25..d7fac5462f 100644
--- a/source/_components/climate.wink.markdown
+++ b/source/_components/climate.wink.markdown
@@ -19,7 +19,7 @@ The Wink climate platform allows you to get data from your [Wink](http://www.win
 The requirement is that you have setup [Wink](/components/wink/).
 
 
-### Supported climate devices:
+### {% linkable_title Supported climate devices %}
 
 - Nest (No wink hub required)
 - Ecobee (No wink hub required)
diff --git a/source/_components/cover.wink.markdown b/source/_components/cover.wink.markdown
index 6be519c755..10cbe4f98e 100644
--- a/source/_components/cover.wink.markdown
+++ b/source/_components/cover.wink.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: wink.png
 ha_category: Cover
 ha_release: 0.13
+ha_iot_class: "Cloud Polling"
 ---
 
 Wink cover/garage door functionality depends on the product you're using.  With GoControl/Linear Home Assistant can open, close, and view state.  Chamberlain is currently limited to view only.  Meaning Home Assistant will only show the current state of the door and control has been disabled (by Chamberlain).  If you have a Chamberlain garage door, and would like to control it via Home Assistant, please contact Chamberlain and request that they re-enabled third-party control.
@@ -21,7 +22,7 @@ The following quote is from Wink.
 The requirement is that you have setup [Wink](/components/wink/).
 
 
-### Supported cover devices
+### {% linkable_title Supported cover devices %}
 
 - Bali window treatments
 - Lutron shades
diff --git a/source/_components/fan.wink.markdown b/source/_components/fan.wink.markdown
index b0b8e197d9..df8fa5a455 100644
--- a/source/_components/fan.wink.markdown
+++ b/source/_components/fan.wink.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: wink.png
 ha_category: Fan
 ha_release: 0.36
+ha_iot_class: "Cloud Polling"
 ---
 
 
@@ -18,7 +19,7 @@ The Wink fan platform allows you to control your [Wink](http://www.wink.com/) fa
 The requirement is that you have setup [Wink](/components/wink/).
 
 
-### Supported fan devices
+### {% linkable_title Supported fan devices %}
 
 - Gardinier
 
diff --git a/source/_components/light.wink.markdown b/source/_components/light.wink.markdown
index 37d90d9846..1c9f721bd6 100644
--- a/source/_components/light.wink.markdown
+++ b/source/_components/light.wink.markdown
@@ -9,6 +9,8 @@ sharing: true
 footer: true
 logo: wink.png
 ha_category: Light
+ha_iot_class: "Cloud Polling"
+ha_release: pre 0.7
 ---
 
 
@@ -17,7 +19,7 @@ The wink light platform allows you to use your [Wink](http://www.wink.com/) ligh
 The requirement is that you have setup [Wink](/components/wink/).
 
 
-### Supported light devices
+### {% linkable_title Supported light devices %}
 
 - Z-wave switches with dimming
 - Hue
diff --git a/source/_components/lock.wink.markdown b/source/_components/lock.wink.markdown
index 3ede52cd1d..cc13cda757 100644
--- a/source/_components/lock.wink.markdown
+++ b/source/_components/lock.wink.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: wink.png
 ha_category: Lock
 ha_release: 0.9
+ha_iot_class: "Cloud Polling"
 ---
 
 
diff --git a/source/_components/sensor.wink.markdown b/source/_components/sensor.wink.markdown
index b5d3343f22..402a92dba7 100644
--- a/source/_components/sensor.wink.markdown
+++ b/source/_components/sensor.wink.markdown
@@ -9,6 +9,8 @@ sharing: true
 footer: true
 logo: wink.png
 ha_category: Sensor
+ha_iot_class: "Cloud Polling"
+ha_release: pre 0.7
 ---
 
 
diff --git a/source/_components/switch.wink.markdown b/source/_components/switch.wink.markdown
index 56dadcf37e..ad03fe065b 100644
--- a/source/_components/switch.wink.markdown
+++ b/source/_components/switch.wink.markdown
@@ -9,6 +9,8 @@ sharing: true
 footer: true
 logo: wink.png
 ha_category: Switch
+ha_release: pre 0.7
+ha_iot_class: "Cloud Polling"
 ---
 
 
diff --git a/source/_components/wink.markdown b/source/_components/wink.markdown
index f4b36b0e00..561af63275 100644
--- a/source/_components/wink.markdown
+++ b/source/_components/wink.markdown
@@ -10,6 +10,8 @@ footer: true
 logo: wink.png
 ha_category: Hub
 featured: true
+ha_iot_class: "Cloud Polling"
+ha_release: pre 0.7
 ---
 
 [Wink](http://www.wink.com/) is a home automation hub that can control a whole wide range of devices on the market. Or, as they say in their own words: