diff --git a/source/_components/sensor.zigbee.markdown b/source/_components/sensor.zigbee.markdown
index c8a3e450797..db03ea55bcf 100644
--- a/source/_components/sensor.zigbee.markdown
+++ b/source/_components/sensor.zigbee.markdown
@@ -13,12 +13,12 @@ ha_category: Sensor
 
 There are two types of ZigBee sensor available to Home Assistant:
 
-- Analog input pin
-- Temperature sensor (XBee Pro)
+- [Analog input pin](#analog-input-pin)
+- [Temperature sensor](#temperature-sensor) (XBee Pro)
 
-## Analog Input Pin
+## {% linkable_title Analog Input Pin %}
 
-The analog input pins on an XBee (non-pro) will read 0-1.2 Volts. This is translated by the [xbee-helper](https://github.com/flyte/xbee-helper) library into a percentage. The maximum voltage your ZigBee device will read is configurable using the `max_volts` configuration variable.
+The analog input pins on an XBee (non-Pro) will read 0V to 1.2V. This is translated by the [xbee-helper](https://github.com/flyte/xbee-helper) library into a percentage. The maximum voltage your ZigBee device will read is configurable using the `max_volts` configuration variable.
 
 To configure an analog input pin sensor, use the following variables:
 
@@ -27,19 +27,22 @@ To configure an analog input pin sensor, use the following variables:
 - **type** (*Required*): Set to `analog`.
 - **pin** (*Required*): The number identifying which pin to sample.
 - **address**: The long 64bit address of the remote ZigBee device whose analog input pin you'd like to sample. Do not include this variable if you want to sample the local ZigBee device's pins.
+- **max_volts**: The maximum voltage which the analog input pin is able to read. Default: `1.2`
 
 #### Example
 
-    sensor:
-      - name: My Analog Input
-        platform: zigbee
-        type: analog
-        pin: 0
-        address: 0013A2004233D138
+```yaml
+sensor:
+  - name: My Analog Input
+    platform: zigbee
+    type: analog
+    pin: 0
+    address: 0013A2004233D138
+```
 
 See the [Digi knowledge base](http://knowledge.digi.com/articles/Knowledge_Base_Article/Digital-and-analog-sampling-using-XBee-radios) for more XBee sampling details.
 
-## Temperature Sensor
+## {% linkable_title Temperature Sensor %}
 
 The XBee Pro (and perhaps other third party modules) contains a thermometer device which can be read by using the `TP` AT command. To set this up as a temperature sensor device in Home Assistant use the following config variables:
 
diff --git a/source/_components/zigbee.markdown b/source/_components/zigbee.markdown
index 115bbbb4818..51ae3f4fae0 100644
--- a/source/_components/zigbee.markdown
+++ b/source/_components/zigbee.markdown
@@ -15,10 +15,10 @@ ha_category: DIY
 
 There is currently support for the following device types within Home Assistant:
 
-- Binary Sensor (digital input pins)
-- Sensor (analog input pins and temperature sensor)
-- Light (digital output pins)
-- Switch (digital output pins)
+- [Binary Sensor](../binary_sensor.zigbee) (digital input pins)
+- [Sensor](../sensor.zigbee) (analog input pins and temperature sensor)
+- [Light](../light.zigbee) (digital output pins)
+- [Switch](../switch.zigbee) (digital output pins)
 
 The local ZigBee device (assuming XBee) must have an up to date Router or Coordinator API firmware installed.