--- a/src/source/index.rst	Tue Dec 18 11:48:01 2018 +0100
+++ b/src/source/index.rst	Tue Dec 18 18:31:17 2018 +0100
@@ -19,6 +19,7 @@
    :maxdepth: 2
 
    Overview <overview>
+   Introduction <introduction>
    Quickstart <quickstart>
    Glossary <glossary>
 
@@ -51,12 +52,13 @@
    :maxdepth: 2
    :caption:  Developer Guide
 
+   Introduction <dev_guide/intro-dev>
    Understanding the Zope Component Architecture <dev_guide/zca>
    Understanding PyAMS internals <dev_guide/internals>
    Creating new PyAMS Packages <dev_guide/new-package>
    Overriding PyAMS features <dev_guide/overring-feature>
    Customizing site appearance <dev_guide/custom-skin>
-   Understanding PyAMS forms <dev_guide/new_form>
+   Understanding PyAMS forms <dev_guide/new-form>
    Creating new Paragraph (or blocks) <dev_guide/howto-paragraph>
    Creating new Portlet <dev_guide/howto-portlet>
    Creating new Content type <dev_guide/howto-content>
@@ -71,7 +73,7 @@
 
    PyAMS packages layout <ref_guide/package_layout>
    PyAMS packages references <ref_guide/packages>
-   PyAMs Test <ref_guide/test>
+   PyAMs Test <ref_guide/tests>
 
 
 .. toctree::