diff --git a/pom.xml b/pom.xml
index 8dde92a..a7ae3ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <packaging>pom</packaging>
     <name>Myfaces Extension Scripting Project</name>
     <version>1.0.4-SNAPSHOT</version>
-    <url>http://myfaces.apache.org/ext-scripting</url>
+    <url>http://myfaces.apache.org/extensions/scripting</url>
     <!-- test -->
     <properties>
         <myfaces12.version>1.2.9</myfaces12.version>
@@ -134,20 +134,43 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <inherited>true</inherited>
-                    <version>2.2</version>
-                    <configuration>
-                        <outputEncoding>UTF-8</outputEncoding>
-                    </configuration>
 
-                </plugin>
                 <plugin>
                     <groupId>org.scala-tools</groupId>
                     <artifactId>maven-scala-plugin</artifactId>
                     <version>${maven-scala-plugin.scalaVersion}</version>
                 </plugin>
+                <!-- SITE GENERATION -->
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.9</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-report-plugin</artifactId>
+                    <version>2.9</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.8</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-jxr-plugin</artifactId>
+                    <version>2.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>taglist-maven-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-changelog-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+
             </plugins>
 
         </pluginManagement>
@@ -251,84 +274,17 @@
     <reporting>
         <plugins>
 
+            <!--
             <plugin>
-
-                <artifactId>maven-changelog-plugin</artifactId>
-                <version>2.1</version>
-                <reportSets>
-                    <reportSet>
-                        <id>dual-report</id>
-                        <configuration>
-                            <type>range</type>
-                            <range>30</range>
-                        </configuration>
-                        <reports>
-                            <report>changelog</report>
-                            <report>file-activity</report>
-                            <report>dev-activity</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.8</version>
+            </plugin>
+            -->
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jxr-maven-plugin</artifactId>
-
-                <!--
-                <configuration>
-                    <aggregate>true</aggregate>
-                </configuration>
-                -->
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-
-                <configuration>
-                    <tags>
-                        <tag>TODO</tag>
-                        <tag>FIXME</tag>
-                        <tag>XXX</tag>
-                        <tag>@deprecated</tag>
-                    </tags>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>surefire-report-maven-plugin</artifactId>
-                <version>2.12</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-
-                <configuration>
-                    <targetJdk>1.5</targetJdk>
-                </configuration>
-            </plugin>
-
-            <!-- cobertura code coverage plugin -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <formats>
-                        <format>html</format>
-                        <format>xml</format>
-                    </formats>
-                </configuration>
-            </plugin>
 
         </plugins>
     </reporting>
@@ -366,7 +322,7 @@
         <site>
             <id>apache-site</id>
             <name>Apache Website</name>
-            <url>scpexe://people.apache.org/www/myfaces.apache.org/ext-scripting/</url>
+            <url>scp://people.apache.org/www/myfaces.apache.org/extensions/scripting/</url>
         </site>
     </distributionManagement>
 
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
index 630b0b6..1dd2cd6 100644
--- a/src/site/apt/download.apt
+++ b/src/site/apt/download.apt
@@ -134,9 +134,60 @@
 Latest source code from SVN repository
 
   If you want to use the latest Apache MyFaces Ext-Scripting features, the source code is under
-  version control with SVN.  Click {{{source-repository.html} here }}
+  version control with SVN.  Click {{{./source-repository.html} here }}
   for information on how to use the ASF MyFaces Ext-Scripting SVN Repository.
 
-  Building instructions can be found under {{{installation.html}Ext-Scripting installation page}}
+  Building instructions can be found under {{{./installation.html}Ext-Scripting installation page}}
 
-  
+Latest source code from SVN repository
+
+    If you want to use the latest Apache MyFaces Test features, the source code is under
+    version control with SVN.  Click {{{source-repository.html} here }}
+    for information on how to use the ASF Test SVN Repository.
+
+Verifying checksums
+
+    It is essential that you verify the integrity of the downloaded
+    files using the PGP and MD5 signatures. MD5 verification ensures the
+    file was not corrupted during the download process. PGP verification
+    ensures that the file came from a certain person.
+
+    To verify the MD5 signature on the files, you need to use a program
+    called <<<md5>>> or <<<md5sum>>>, which is
+    included in many UNIX distributions.  It is also available as part of
+    {{{http://www.gnu.org/software/textutils/textutils.html}GNU Textutils}}.
+    Windows users can get binary md5 programs from {{{http://www.fourmilab.ch/md5/}here}},
+    {{{http://www.pc-tools.net/win32/freeware/console/}here}}, or
+    {{{http://www.slavasoft.com/fsum/}here}}.
+
+Verifying signatures
+
+  	PGP verification ensures that the file came from a certain person.  We strongly recommend
+	  you verify your downloads with both PGP and MD5.
+
+	The PGP signatures can be verified using {{{http://www.pgpi.org/}PGP}} or
+	{{{http://www.gnupg.org/}GPG}}.  First download the Apache MyFaces
+	{{{http://www.apache.org/dist/myfaces/KEYS}KEYS}}	as well as the <<<asc>>> signature file
+	for the particular distribution. It is important that you get these files from the ultimate
+	trusted source - the main ASF distribution site, rather than from a mirror.
+	Then verify the signatures using ...
+
+	  <<<
+	  % pgpk -a KEYS
+	  % pgpv extscript-myfaces20-bundle-1.0.3.jar.asc extscript-myfaces20-bundle-1.0.3.jar
+	  >>>
+
+	  <or>
+
+	  <<<
+	  % pgp -ka KEYS
+	  % pgp extscript-myfaces20-bundle-1.0.3.jar.asc extscript-myfaces20-bundle-1.0.3.jar
+	  >>>
+
+	  <or>
+
+	  <<<
+  	% gpg --import KEYS
+	  % gpg --verify extscript-myfaces20-bundle-1.0.3.jar.asc extscript-myfaces20-bundle-1.0.3.jar
+	  >>>
+
diff --git a/src/site/site.xml b/src/site/site.xml
index ef143fc..a20e68f 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -36,11 +36,17 @@
   <skin>
     <groupId>org.apache.myfaces.maven</groupId>
     <artifactId>myfaces-site-skin</artifactId>
-    <version>2</version>
+    <version>3</version>
   </skin>
   <body>
     <links>
-      <item name="MyFaces" href="http://myfaces.apache.org/"/>
+      <item name="Introduction" href="./index.html"/>
+      <item name="Download" href="./download.html"/>
+      <item name="Installation" href="./installation.html"/>
+      <item name="Users Guide" href="./usersguide.html"/>
+      <item name="Example Configurations" href="./exampleconfig.html"/>
+      <item name="Apache" href="http://www.apache.org"/>
+      <item name="MyFaces" href="http://myfaces.apache.org/index.html"/>
     </links>
 
     <menu name="Download">
@@ -59,14 +65,65 @@
       <item name="Appendix C1: Example Configurations 1.0.2 or earlier" href="exampleconfig_102.html" />
     </menu>
 
+    <menu ref="modules"/>
+    <menu ref="reports"/>
+
+    <menu name="Apache MyFaces" inherit="top">
+       <item name="Overview"       href="http://myfaces.apache.org/index.html"/>
+       <item name="Download"       href="http://myfaces.apache.org/download.html"/>
+     </menu>
+
+     <menu name="MyFaces Projects" inherit="top">
+         <item name="Core JSF-2.1"   href="../core21/index.html" collapse="true">
+           <item name="dummy"        href="dummy"/>
+         </item>
+         <item name="Core JSF-2.0"   href="../core20/index.html" collapse="true">
+           <item name="dummy"        href="dummy"/>
+         </item>
+         <item name="Core JSF-1.2"   href="../core12/index.html" collapse="true">
+           <item name="dummy"        href="dummy"/>
+         </item>
+         <item name="Core JSF-1.1"   href="../core11/index.html" collapse="true">
+           <item name="dummy"        href="dummy"/>
+         </item>
+     </menu>
+
+     <menu name="UI-Component Sets" inherit="top">
+         <item name="Trinidad"       href="../trinidad/index.html"/>
+         <item name="Tobago"         href="../tobago/index.html"/>
+         <item name="Tomahawk"       href="../tomahawk/index.html" collapse="true">
+           <item name="dummy"        href="dummy"/>
+         </item>
+     </menu>
+
+     <menu name="Add-ons and Extensions" inherit="top">
+         <item name="CODI"           href="../extensions/cdi/index.html"/>
+         <item name="Orchestra"      href="../orchestra/index.html"/>
+         <item name="ExtVal"         href="../extensions/validator/index.html"/>
+         <item name="ExtScript"      href="../extensions/scripting/index.html"/>
+
+         <item name="Portlet Bridge" href="../portlet-bridge/index.html"/>
+         <item name="Test"           href="../test/index.html" collapse="false">
+           <item name="Myfaces Test Framework for JSF 1.2 (and 1.1)" href="http://myfaces.apache.org/test/myfaces-test12/index.html"/>
+           <item name="Myfaces Test Framework for JSF 2.0"           href="http://myfaces.apache.org/test/myfaces-test20/index.html"/>
+         </item>
+         <item name="Commons"        href="../commons/index.html"/>
+         <item name="HTML5"          href="../html5/index.html"/>
+         <item name="Sandbox"        href="../sandbox/index.html" collapse="true">
+           <item name="dummy"        href="dummy"/>
+         </item>
+         <item name="Others"         href="../otherProjects.html"/>
+     </menu>
+
+
+
     <menu name="Foundation">
       <item name="ASF" href="http://apache.org/" />
       <item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html" />
       <item name="Thanks" href="http://www.apache.org/foundation/thanks.html" />
     </menu>
 
-    <menu ref="modules"/>
-    <menu ref="reports"/>
+
 
     
   </body>
diff --git a/src/site/xdoc/configentries.xml b/src/site/xdoc/configentries.xml
index 65f4ef8..8c1dd1e 100644
--- a/src/site/xdoc/configentries.xml
+++ b/src/site/xdoc/configentries.xml
@@ -20,16 +20,16 @@
 -->
 <document>
     <section name="Navigation Top">
-        <a href="setup_steps.html">&lt;&lt;Back to the appendix: Setup steps</a>
+        <a href="./setup_steps.html">&lt;&lt;Back to the appendix: Setup steps</a>
         or
-        <a href="exampleconfig.html">On to the appendix: Example Configuration&gt;&gt;</a>
+        <a href="./exampleconfig.html">On to the appendix: Example Configuration&gt;&gt;</a>
     </section>
 
     <section name="Appendix: Configuration Entries">
         <subsection name="General Information">
             <p>
                 This page is a general quick overview over the possible configuration parameters, if you need further
-                details please visit the<a href="installation.html">setup guide</a>.
+                details please visit the<a href="./installation.html">setup guide</a>.
             </p>
         </subsection>
         <table>
@@ -140,9 +140,9 @@
 
 
     <section name="Navigation Bottom">
-        <a href="setup_steps.html">&lt;&lt;Back to the appendix: Setup steps</a>
+        <a href="./setup_steps.html">&lt;&lt;Back to the appendix: Setup steps</a>
         or
-        <a href="exampleconfig.html">On to the appendix: Example Configuration&gt;&gt;</a>
+        <a href="./exampleconfig.html">On to the appendix: Example Configuration&gt;&gt;</a>
     </section>
 
 
diff --git a/src/site/xdoc/configentries_102.xml b/src/site/xdoc/configentries_102.xml
index 673bb4a..721aabb 100644
--- a/src/site/xdoc/configentries_102.xml
+++ b/src/site/xdoc/configentries_102.xml
@@ -20,16 +20,16 @@
 -->
 <document>
     <section name="Navigation Top">
-        <a href="setup_steps.html">&lt;&lt;Back to the appendix: Setup steps</a>
+        <a href="./setup_steps.html">&lt;&lt;Back to the appendix: Setup steps</a>
         or
-        <a href="exampleconfig_102.html">On to the appendix: Example Configuration&gt;&gt;</a>
+        <a href="./exampleconfig_102.html">On to the appendix: Example Configuration&gt;&gt;</a>
     </section>
 
     <section name="Appendix: Configuration Entries">
         <subsection name="General Information">
             <p>
                 This page is a general quick overview over the possible configuration parameters, if you need further
-                details please visit the<a href="installation.html">setup guide</a>.
+                details please visit the<a href="./installation.html">setup guide</a>.
             </p>
         </subsection>
         <table>
@@ -157,14 +157,15 @@
             </filter-mapping>
         ]]>
         </source>            
-        <p>Note for further examples of the configuration go to the section <a href="exampleconfig.html">On to the appendix: Example Configuration&gt;&gt;</a> </p>
+        <p>Note for further examples of the configuration go to the section <a href="./exampleconfig.html">On to the
+            appendix: Example Configuration&gt;&gt;</a> </p>
     </section>
 
 
     <section name="Navigation Bottom">
-        <a href="setup_steps.html">&lt;&lt;Back to the appendix: Setup steps</a>
+        <a href="./setup_steps.html">&lt;&lt;Back to the appendix: Setup steps</a>
         or
-        <a href="exampleconfig.html">On to the appendix: Example Configuration&gt;&gt;</a>
+        <a href="./exampleconfig.html">On to the appendix: Example Configuration&gt;&gt;</a>
     </section>
 
 
diff --git a/src/site/xdoc/exampleconfig.xml b/src/site/xdoc/exampleconfig.xml
index 8a2189e..5dad39e 100644
--- a/src/site/xdoc/exampleconfig.xml
+++ b/src/site/xdoc/exampleconfig.xml
@@ -21,14 +21,14 @@
 
 <document>
     <section name="Navigation Top">
-        <a href="configentries.html">&lt;&lt;appendix Configuration Entries</a>
+        <a href="./configentries.html">&lt;&lt;appendix Configuration Entries</a>
     </section>
     <section name="Appendix: Example Configuration">
         <subsection name="General Information">
             <p>
                 This page gives a detailed example configuration for
                 Ext-Scripting for installation
-                details please visit the<a href="installation.html">setup guide</a>.
+                details please visit the<a href="./installation.html">setup guide</a>.
             </p>
         </subsection>
         <subsection name="Simple Configuration">
@@ -215,6 +215,6 @@
         </subsection>
     </section>
     <section name="Navigation Bottom">
-        <a href="configentries.html">&lt;&lt;appendix Configuration Entries</a>
+        <a href="./configentries.html">&lt;&lt;appendix Configuration Entries</a>
     </section>
 </document>    
\ No newline at end of file
diff --git a/src/site/xdoc/exampleconfig_102.xml b/src/site/xdoc/exampleconfig_102.xml
index 4aaa89c..6836959 100644
--- a/src/site/xdoc/exampleconfig_102.xml
+++ b/src/site/xdoc/exampleconfig_102.xml
@@ -21,14 +21,14 @@
 
 <document>
     <section name="Navigation Top">
-        <a href="configentries.html">&lt;&lt;appendix Configuration Entries</a>
+        <a href="./configentries.html">&lt;&lt;appendix Configuration Entries</a>
     </section>
     <section name="Appendix: Example Configuration">
         <subsection name="General Information">
             <p>
                 This page gives a detailed example configuration for
                 Ext-Scripting for installation
-                details please visit the<a href="installation.html">setup guide</a>.
+                details please visit the<a href="./installation.html">setup guide</a>.
             </p>
         </subsection>
         <subsection name="Simple Configuration">
@@ -233,6 +233,6 @@
         </subsection>
     </section>
     <section name="Navigation Bottom">
-        <a href="configentries.html">&lt;&lt;appendix Configuration Entries</a>
+        <a href="./configentries.html">&lt;&lt;appendix Configuration Entries</a>
     </section>
 </document>    
\ No newline at end of file
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 289fee4..b11fe8e 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -26,7 +26,7 @@
 
     <body>
         <section name="Navigation Top">
-            <a href="installation.html">On to the General Installation Guide&gt;&gt;</a>
+            <a href="./installation.html">On to the General Installation Guide&gt;&gt;</a>
         </section>
 
         <section name="Introduction">
@@ -67,14 +67,14 @@
             <p>
                 Ext-Scripting provides extensive documentation. Feel free
                 to browse our
-                <a href="installation.html">Installation Guide</a>
+                <a href="./installation.html">Installation Guide</a>
                 or
-                <a href="usersguide.html">Users Guide</a>
+                <a href="./usersguide.html">Users Guide</a>
                 for further information.
             </p>
             <p>
                 Also
-                <a href="download.html">download links</a>
+                <a href="./download.html">download links</a>
                 are provided on the left hand side of this page,
                 as well as further information.
             </p>
@@ -116,7 +116,7 @@
         </section>
 
         <section name="Navigation Bottom">
-            <a href="installation.html">On to the General Installation Guide&gt;&gt;</a>
+            <a href="./installation.html">On to the General Installation Guide&gt;&gt;</a>
         </section>
 
 
diff --git a/src/site/xdoc/install_102.xml b/src/site/xdoc/install_102.xml
index f731623..19780c6 100644
--- a/src/site/xdoc/install_102.xml
+++ b/src/site/xdoc/install_102.xml
@@ -25,10 +25,10 @@
 
     <body>
         <section name="Navigation Top">
-            <a href="index.html">&lt;&lt;Back to the Start Page</a>
+            <a href="./index.html">&lt;&lt;Back to the Start Page</a>
             or
 
-            <a href="using_general.html">On to the General Users Guide&gt;&gt;</a>
+            <a href="./using_general.html">On to the General Users Guide&gt;&gt;</a>
         </section>
 
         <section name="General information">
@@ -62,10 +62,10 @@
             </subsection>
             <subsection name="Links">
                 <p>
-                    <ul><a href="setup_steps.html">Appendix: Configuration Setup Steps</a> </ul>
-                    <ul><a href="exampleconfig_102.html">Appendix: Example Configurations for 1.0.2 or earlier</a>
+                    <ul><a href="./setup_steps.html">Appendix: Configuration Setup Steps</a> </ul>
+                    <ul><a href="./exampleconfig_102.html">Appendix: Example Configurations for 1.0.2 or earlier</a>
                     </ul>
-                    <ul><a href="configentries_102.html">Appendix: List of Configuration Options for 1.02 or earlier</a> </ul>
+                    <ul><a href="./configentries_102.html">Appendix: List of Configuration Options for 1.02 or earlier</a> </ul>
                 </p>
             </subsection>
         </section>
@@ -74,7 +74,7 @@
         <section name="Checklist">
             <p>
 
-            For a short checklist of setup steps please follow <b><a href="setup_steps.html"> this link</a></b>. For a detailed
+            For a short checklist of setup steps please follow <b><a href="./setup_steps.html"> this link</a></b>. For a detailed
                 setup guide, please continue reading.
             </p>
         </section>
@@ -88,7 +88,7 @@
                 projects.
             </p>
             <p>
-                For Download information please visit the <a href="download.html"> download  page</a>.
+                For Download information please visit the <a href="./download.html"> download  page</a>.
             </p>
             <p>
                 Once you downloaded the necessary artifacts please check the <a href="#Manual_Setup">manual setup section</a> of this document.
@@ -320,10 +320,10 @@
         </section>
 
         <section name="Navigation Bottom">
-            <a href="index.html">&lt;&lt;Back to the Start Page</a>
+            <a href="./index.html">&lt;&lt;Back to the Start Page</a>
             or
 
-            <a href="using_general.html">On to the General Users Guide&gt;&gt;</a>
+            <a href="./using_general.html">On to the General Users Guide&gt;&gt;</a>
         </section>
 
     </body>
diff --git a/src/site/xdoc/installation.xml b/src/site/xdoc/installation.xml
index f85b39e..adfaa73 100644
--- a/src/site/xdoc/installation.xml
+++ b/src/site/xdoc/installation.xml
@@ -25,10 +25,10 @@
 
     <body>
         <section name="Navigation Top">
-            <a href="index.html">&lt;&lt;Back to the Start Page</a>
+            <a href="./index.html">&lt;&lt;Back to the Start Page</a>
             or
 
-            <a href="using_general.html">On to the General Users Guide&gt;&gt;</a>
+            <a href="./using_general.html">On to the General Users Guide&gt;&gt;</a>
         </section>
 
         <section name="General information">
@@ -55,9 +55,9 @@
             </subsection>
             <subsection name="Links">
                 <p>
-                    <ul><a href="setup_steps.html">Appendix: Configuration Setup Step Overview</a> </ul>
-                    <ul><a href="exampleconfig.html">Appendix: Example Configurations</a> </ul>
-                    <ul><a href="configentries.html">Appendix: List of Configuration Options</a> </ul>
+                    <ul><a href="./setup_steps.html">Appendix: Configuration Setup Step Overview</a> </ul>
+                    <ul><a href="./exampleconfig.html">Appendix: Example Configurations</a> </ul>
+                    <ul><a href="./configentries.html">Appendix: List of Configuration Options</a> </ul>
                 </p>
             </subsection>
         </section>
@@ -66,7 +66,7 @@
         <section name="Checklist">
             <p>
 
-            For a short checklist of setup steps please follow <b><a href="setup_steps.html"> this link</a></b>. For a detailed
+            For a short checklist of setup steps please follow <b><a href="./setup_steps.html"> this link</a></b>. For a detailed
                 setup guide, please continue reading.
             </p>
         </section>
@@ -80,7 +80,7 @@
                 projects.
             </p>
             <p>
-                For Download information please visit the <a href="download.html"> download  page</a>.
+                For Download information please visit the <a href="./download.html"> download  page</a>.
             </p>
             <p>
                 Once you downloaded the necessary artifacts please check the <a href="#Manual_Setup">manual setup section</a> of this document.
@@ -358,7 +358,7 @@
                 </p>
                 This sums up the quick install and setup guide, if you want more detailed setup examples and
                 additional configuration entries
-                go to our <a href="exampleconfig.html">Example Configurations</a> page, which shows
+                go to our <a href="./exampleconfig.html">Example Configurations</a> page, which shows
                 a set of different configurations.
 
 
@@ -387,10 +387,10 @@
         </section>
 
         <section name="Navigation Bottom">
-            <a href="index.html">&lt;&lt;Back to the Start Page</a>
+            <a href="./index.html">&lt;&lt;Back to the Start Page</a>
             or
 
-            <a href="using_general.html">On to the General Users Guide&gt;&gt;</a>
+            <a href="./using_general.html">On to the General Users Guide&gt;&gt;</a>
         </section>
 
     </body>
diff --git a/src/site/xdoc/setup_steps.xml b/src/site/xdoc/setup_steps.xml
index 3d54b67..d7f6ba8 100644
--- a/src/site/xdoc/setup_steps.xml
+++ b/src/site/xdoc/setup_steps.xml
@@ -25,9 +25,9 @@
     <body>
 
         <section name="Navigation Top">
-            <a href="using_netbeans.html">&lt;&lt;Back to the Netbeans Users Guide</a>
+            <a href="./using_netbeans.html">&lt;&lt;Back to the Netbeans Users Guide</a>
             or
-            <a href="configentries.html">On to the configuration entries overview&gt;&gt;</a>
+            <a href="./configentries.html">On to the configuration entries overview&gt;&gt;</a>
         </section>
 
         <section name="Appendix: Setup Steps">
@@ -35,7 +35,7 @@
 
             <subsection name="Short setup overview">
                 <p>This section is only a checklist of things to do at the setup for details follow the explanations
-                    in the <a href="installation.html">page</a>
+                    in the <a href="./installation.html">page</a>
                 </p>
 
                 <p>
@@ -78,9 +78,9 @@
         </section>
 
         <section name="Navigation Bottom">
-                   <a href="using_netbeans.html">&lt;&lt;Back to the Netbeans Users Guide</a>
+                   <a href="./using_netbeans.html">&lt;&lt;Back to the Netbeans Users Guide</a>
                    or
-                   <a href="configentries.html">On to the configuration entries overview&gt;&gt;</a>
+                   <a href="./configentries.html">On to the configuration entries overview&gt;&gt;</a>
         </section>
 
     </body>
diff --git a/src/site/xdoc/usersguide.xml b/src/site/xdoc/usersguide.xml
index f43215d..1e62477 100644
--- a/src/site/xdoc/usersguide.xml
+++ b/src/site/xdoc/usersguide.xml
@@ -25,15 +25,15 @@
 
     <body>
         <section name="Navigation Top">
-            <a href="installation.html">&lt;&lt;Back to the Setup Guide</a> or
-            <a href="using_general.html">On to the General Users Guide&gt;&gt;</a>
+            <a href="./installation.html">&lt;&lt;Back to the Setup Guide</a> or
+            <a href="./using_general.html">On to the General Users Guide&gt;&gt;</a>
         </section>
 
 
         <section name="Users Guide">
             <p>
                 After having set up MyFaces Ext-Scripting (if you do not have done so please go to our<a
-                    href="installation.html">Installation Page</a>), you basically can start editing, and be done with
+                    href="./installation.html">Installation Page</a>), you basically can start editing, and be done with
                 the users
                 guide.
             </p>
@@ -80,27 +80,27 @@
             <p>The Following Chapters should help you to guide you through the usage of Ext-Scripting</p>
             <ul>
                 <li>
-                    <a href="using_general.html">General users guide</a>
+                    <a href="./using_general.html">General users guide</a>
                 </li>
                 <li>
-                    <a href="using_advanced.html">Advanced usage</a>
+                    <a href="./using_advanced.html">Advanced usage</a>
                 </li>
                 <li>
-                    <a href="using_eclipse_.html">Ext-Scripting in Eclipse</a>
+                    <a href="./using_eclipse_.html">Ext-Scripting in Eclipse</a>
                 </li>
                 <li>
-                    <a href="using_intellij.html">Ext-Scripting in Intellij</a>
+                    <a href="./using_intellij.html">Ext-Scripting in Intellij</a>
                 </li>
                 <li>
-                    <a href="using_intellij.html">Ext-Scripting in Netbeans</a>
+                    <a href="./using_intellij.html">Ext-Scripting in Netbeans</a>
                 </li>
             </ul>
         </section>
 
         <section name="Navigation Bottom">
-            <a href="installation.html">&lt;&lt;Back to the Setup Guide</a>  or 
+            <a href="./installation.html">&lt;&lt;Back to the Setup Guide</a>  or
 
-            <a href="using_general.html">On to the General Users Guide&gt;&gt;</a>
+            <a href="./using_general.html">On to the General Users Guide&gt;&gt;</a>
         </section>
 
     </body>
diff --git a/src/site/xdoc/using_advanced.xml b/src/site/xdoc/using_advanced.xml
index b2e634c..eb5109c 100644
--- a/src/site/xdoc/using_advanced.xml
+++ b/src/site/xdoc/using_advanced.xml
@@ -25,10 +25,10 @@
 
     <body>
         <section name="Navigation Top">
-            <a href="using_general.html">&lt;&lt;Back to the General Users Guide</a>
+            <a href="./using_general.html">&lt;&lt;Back to the General Users Guide</a>
             or
 
-            <a href="using_eclipse_.html">On to the Eclipse Users Guide&gt;&gt;</a>
+            <a href="./using_eclipse_.html">On to the Eclipse Users Guide&gt;&gt;</a>
         </section>
 
 
@@ -273,7 +273,7 @@
                     set to a standard value which is <b>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</b>
                 </p>
                 <p>
-                    For further reference please also visit out <a href="configentries.html">Appendix: Configuration Entries Overview</a>
+                    For further reference please also visit out <a href="./configentries.html">Appendix: Configuration Entries Overview</a>
                     page.
                 </p>
             </subsection>
@@ -512,10 +512,10 @@
         </section>
 
         <section name="Navigation Bottom">
-            <a href="using_general.html">&lt;&lt;Back to the General Users Guide</a>
+            <a href="./using_general.html">&lt;&lt;Back to the General Users Guide</a>
             or
 
-            <a href="using_eclipse_.html">On to the Eclipse Users Guide&gt;&gt;</a>
+            <a href="./using_eclipse_.html">On to the Eclipse Users Guide&gt;&gt;</a>
         </section>
 
 
diff --git a/src/site/xdoc/using_eclipse_.xml b/src/site/xdoc/using_eclipse_.xml
index 67e48bb..60e7aad 100644
--- a/src/site/xdoc/using_eclipse_.xml
+++ b/src/site/xdoc/using_eclipse_.xml
@@ -24,10 +24,10 @@
 
     <body>
         <section name="Navigation Top">
-               <a href="using_advanced.html">&lt;&lt;Back to the Advanced Users Guide</a>
+               <a href="./using_advanced.html">&lt;&lt;Back to the Advanced Users Guide</a>
                or
 
-               <a href="using_intellij.html">On to the Intellij Users Guide&gt;&gt;</a>
+               <a href="./using_intellij.html">On to the Intellij Users Guide&gt;&gt;</a>
            </section>
 
 
diff --git a/src/site/xdoc/using_general.xml b/src/site/xdoc/using_general.xml
index 4ec5395..1c6a659 100644
--- a/src/site/xdoc/using_general.xml
+++ b/src/site/xdoc/using_general.xml
@@ -25,9 +25,9 @@
 
     <body>
         <section name="Navigation Top">
-            <a href="usersguide.html">&lt;&lt;Back to the Users Guide Start</a>
+            <a href="./usersguide.html">&lt;&lt;Back to the Users Guide Start</a>
             or
-            <a href="using_advanced.html">On to the Advanced Users Guide&gt;&gt;</a>
+            <a href="./using_advanced.html">On to the Advanced Users Guide&gt;&gt;</a>
         </section>
 
 
@@ -63,9 +63,9 @@
         </section>
 
         <section name="Navigation Bottom">
-            <a href="usersguide.html">&lt;&lt;Back to the Users Guide Start</a>
+            <a href="./usersguide.html">&lt;&lt;Back to the Users Guide Start</a>
             or
-            <a href="using_advanced.html">On to the Advanced Users Guide&gt;&gt;</a>
+            <a href="./using_advanced.html">On to the Advanced Users Guide&gt;&gt;</a>
         </section>
 
     </body>
diff --git a/src/site/xdoc/using_intellij.xml b/src/site/xdoc/using_intellij.xml
index 0bdfdff..789a678 100644
--- a/src/site/xdoc/using_intellij.xml
+++ b/src/site/xdoc/using_intellij.xml
@@ -25,10 +25,10 @@
     <body>
 
         <section name="Navigation Top">
-            <a href="using_eclipse_.html">&lt;&lt;Back to the Eclipse Users Guide</a>
+            <a href="./using_eclipse_.html">&lt;&lt;Back to the Eclipse Users Guide</a>
             or
 
-            <a href="using_netbeans.html">On to the NetBeans Users Guide&gt;&gt;</a>
+            <a href="./using_netbeans.html">On to the NetBeans Users Guide&gt;&gt;</a>
         </section>
 
 
@@ -91,9 +91,9 @@
 
 
         <section name="Navigation Bottom">
-            <a href="using_eclipse_.html">&lt;&lt;Back to the Eclipse Users Guide</a>
+            <a href="./using_eclipse_.html">&lt;&lt;Back to the Eclipse Users Guide</a>
             or
-            <a href="using_netbeans.html">On to the NetBeans Users Guide&gt;&gt;</a>
+            <a href="./using_netbeans.html">On to the NetBeans Users Guide&gt;&gt;</a>
         </section>
 
     </body>
diff --git a/src/site/xdoc/using_netbeans.xml b/src/site/xdoc/using_netbeans.xml
index af915b0..b65c547 100644
--- a/src/site/xdoc/using_netbeans.xml
+++ b/src/site/xdoc/using_netbeans.xml
@@ -25,9 +25,9 @@
     <body>
 
         <section name="Navigation Top">
-            <a href="using_intellij.html">&lt;&lt;Back to the Intellij Users Guide</a>
+            <a href="./using_intellij.html">&lt;&lt;Back to the Intellij Users Guide</a>
             or
-            <a href="setup_steps.html">On to the appendix: Setup Steps&gt;&gt;</a>
+            <a href="./setup_steps.html">On to the appendix: Setup Steps&gt;&gt;</a>
         </section>
 
 
@@ -96,9 +96,9 @@
         </section>
 
         <section name="Navigation Bottom">
-            <a href="using_intellij.html">&lt;&lt;Back to the Intellij Users Guide</a>
+            <a href="./using_intellij.html">&lt;&lt;Back to the Intellij Users Guide</a>
             or
-            <a href="setup_steps.html">On to the appendix: Setup Steps&gt;&gt;</a>
+            <a href="./setup_steps.html">On to the appendix: Setup Steps&gt;&gt;</a>
         </section>
 
     </body>