diff --git a/xos/tosca/doctemplates/html/node_type.html b/xos/tosca/doctemplates/html/node_type.html
index 2793cf3..95e8b7b 100644
--- a/xos/tosca/doctemplates/html/node_type.html
+++ b/xos/tosca/doctemplates/html/node_type.html
@@ -1,4 +1,5 @@
-<h2>{{ node_type.node_type_name }}</h2>
+<hr>
+<h2 id="{{ node_type.node_type_name }}">{{ node_type.node_type_name }}</h2>
 <blockquote>
 
 <h3>Description:</h3>
diff --git a/xos/tosca/doctemplates/html/toscadoctemplate.html b/xos/tosca/doctemplates/html/toscadoctemplate.html
index 0087c27..8568d33 100644
--- a/xos/tosca/doctemplates/html/toscadoctemplate.html
+++ b/xos/tosca/doctemplates/html/toscadoctemplate.html
@@ -1,5 +1,5 @@
 <html><head>
-<title>Tosca Documentation</title>
+<title>XOS TOSCA Reference</title>
 
 <style>
 .properties {
@@ -13,7 +13,8 @@
   font-size: 1.1em;
   padding-top: 5px;
   padding-bottom: 4px;
-  background-color: #A7C942;
+  oldbackground-color: #A7C942;
+  background-color: #2d6ca2;
   color: #ffffff;
 }
 .helptext {
@@ -25,16 +26,33 @@
 </head>
 <body>
 
-This documentation is autogenerated from the XOS Tosca custom_types
+<h1>XOS TOSCA Reference</h1>
+
+<p>This documentation is autogenerated from the XOS Tosca custom_types
 specification (xos/tosca/custom_types/xos.m4).
 
+Table of Contents:
+<ul>
+<li>Node Types
+<ul>
+{% for node_type in node_types %}
+  {% if node_type.node_type_kind == "node" %}
+    <li><a href="#{{ node_type.node_type_name }}">{{ node_type.node_type_name }}</a></li>
+  {% endif %}
+{% endfor %}
+</li>
+</ul>
+<li><a href="#xos_relationships">Relationships</a></li>
+<li><a href="#xos_capabilities">Capabilities</a></li>
+</ul>
+
 {% for node_type in node_types %}
   {% if node_type.node_type_kind == "node" %}
     {% include 'node_type.html' %}
   {% endif %}
 {% endfor %}
 
-<h3>XOS Relationships</h3>
+<h3 id="xos_relationships">XOS Relationships</h3>
 <blockquote>
 <table class="properties">
 <tr><th>name</th><th>target_types</th></tr>
@@ -46,7 +64,7 @@
 </table>
 </blockquote>
 
-<h3>XOS Capabilities</h3>
+<h3 id="xos_capabilities">XOS Capabilities</h3>
 <blockquote>
 <table class="properties">
 <tr><th>name</th></tr>