diff --git a/Templates.md b/Templates.md
index ac1c6bad..6b4a4b26 100644
--- a/Templates.md
+++ b/Templates.md
@@ -110,9 +110,9 @@ The four properties with UPPERCASE property names have the following functionali
 Property name | Property value description
 --------------|-----------------------------------------------------------------------------------------------------------
 NAME          | Up to 14 characters for the Module name
-GPIO          | Up to 13 decimal numbers from 0 to 255 representing GPIO0 to GPIO5, GPIO09, GPIO10 and GPIO12 to GPIO16
-FLAG          | 8 bit mask flag register
-BASE          | Module number of a hard-coded device to be used when device specific functionality is needed
+[GPIO](#gpio) | Up to 13 decimal numbers from 0 to 255 representing GPIO0 to GPIO5, GPIO09, GPIO10 and GPIO12 to GPIO16
+[FLAG](#flag) | 8 bit mask flag register
+[BASE}(#base) | Module number of a hard-coded device to be used when device specific functionality is needed
 
 ## GPIO