diff --git a/rivet/html/about.html b/rivet/html/about.html
index c3f030c..9f0964e 100644
--- a/rivet/html/about.html
+++ b/rivet/html/about.html
@@ -90,75 +90,48 @@
 
             <div class="sidebar">
                 <ul>
-                    <li id="news">
-    <h4>News</h4>
-    <ul class="blocklist">
-        <li class="navitem">
-            <a href="rn%2d2%2d3.html">11 Nov 2017: Rivet 2.3.5 released</a>
-        </li>
-        <li class="navitem">
-            <a href="rn%2d3%2d0.html">18 Nov 2018: Rivet 3.0.3 released</a>
-        </li>
-    </ul>
-</li>
- 
+                     
                 </ul> 
                 <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="A home for Rivet" href="../index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
-            <a title="Getting Rivet" href="download.html">Getting Rivet</a>
-        </li>
-        <li class="navitem">
-            <a title="Hello World!" href="hello%5fworld.html">Examples</a>
-        </li>
-        <li class="navitem">
-            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
-        </li>
-    </ul>
-</li>
-<li id="tcl">
-    <h4>Tcl/Tk</h4>
-    <ul class="blocklist">
-        <li class="navitem">
-            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">
-                The Tcl/Tk Language
-                </a>
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
         </li>
         <li class="navitem">
             <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
         </li>
     </ul>
 </li>
-<li id="manual">
-    <h4>Documentation</h4>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a title="Getting Rivet" href="download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
+            <a href="release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
-<li id="support">
-    <h4>Support</h4>
+<li id="documentation">
+    <h4>Documentation</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
+            <a href="hello%5fworld.html">Examples</a>
+        </li>
+        <li class="navitem">
+            <a href="manuals.html">Manuals</a>
         </li>
     </ul>
 </li>
diff --git a/rivet/html/ajax.html b/rivet/html/ajax.html
index ec60348..a612efb 100644
--- a/rivet/html/ajax.html
+++ b/rivet/html/ajax.html
@@ -180,47 +180,52 @@
 
             <div class="sidebar">
                 <ul>
-                     
-                </ul> 
-                <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="A home for Rivet" href="../index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
+        </li>
+        <li class="navitem">
+            <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
+        </li>
+    </ul>
+</li>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
+    <ul class="blocklist">
+        <li class="navitem">
             <a title="Getting Rivet" href="download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Hello World!" href="hello%5fworld.html">Examples</a>
+            <a href="release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
-<li id="manual">
+<li id="documentation">
     <h4>Documentation</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a href="hello%5fworld.html">Examples</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+            <a href="manuals.html">Manuals</a>
         </li>
     </ul>
 </li>
-<li id="rivetexamples">
+ 
+                </ul> 
+                <ul>
+                    <li id="rivetexamples">
     <h4>Examples</h4>
     <ul class="blocklist">
         <li class="navitem">
diff --git a/rivet/html/calendar.html b/rivet/html/calendar.html
index 8054844..29e8e71 100644
--- a/rivet/html/calendar.html
+++ b/rivet/html/calendar.html
@@ -88,47 +88,52 @@
 
             <div class="sidebar">
                 <ul>
-                     
-                </ul> 
-                <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="A home for Rivet" href="../index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
+        </li>
+        <li class="navitem">
+            <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
+        </li>
+    </ul>
+</li>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
+    <ul class="blocklist">
+        <li class="navitem">
             <a title="Getting Rivet" href="download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Hello World!" href="hello%5fworld.html">Examples</a>
+            <a href="release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
-<li id="manual">
+<li id="documentation">
     <h4>Documentation</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a href="hello%5fworld.html">Examples</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+            <a href="manuals.html">Manuals</a>
         </li>
     </ul>
 </li>
-<li id="rivetexamples">
+ 
+                </ul> 
+                <ul>
+                    <li id="rivetexamples">
     <h4>Examples</h4>
     <ul class="blocklist">
         <li class="navitem">
diff --git a/rivet/html/colorful_table.html b/rivet/html/colorful_table.html
index a266974..0706353 100644
--- a/rivet/html/colorful_table.html
+++ b/rivet/html/colorful_table.html
@@ -77,47 +77,52 @@
 
             <div class="sidebar">
                 <ul>
-                     
-                </ul> 
-                <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="A home for Rivet" href="../index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
+        </li>
+        <li class="navitem">
+            <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
+        </li>
+    </ul>
+</li>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
+    <ul class="blocklist">
+        <li class="navitem">
             <a title="Getting Rivet" href="download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Hello World!" href="hello%5fworld.html">Examples</a>
+            <a href="release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
-<li id="manual">
+<li id="documentation">
     <h4>Documentation</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a href="hello%5fworld.html">Examples</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+            <a href="manuals.html">Manuals</a>
         </li>
     </ul>
 </li>
-<li id="rivetexamples">
+ 
+                </ul> 
+                <ul>
+                    <li id="rivetexamples">
     <h4>Examples</h4>
     <ul class="blocklist">
         <li class="navitem">
diff --git a/rivet/html/download.html b/rivet/html/download.html
index b54a0a5..534f80a 100644
--- a/rivet/html/download.html
+++ b/rivet/html/download.html
@@ -107,75 +107,48 @@
 
             <div class="sidebar">
                 <ul>
-                    <li id="news">
-    <h4>News</h4>
-    <ul class="blocklist">
-        <li class="navitem">
-            <a href="rn%2d2%2d3.html">11 Nov 2017: Rivet 2.3.5 released</a>
-        </li>
-        <li class="navitem">
-            <a href="rn%2d3%2d0.html">18 Nov 2018: Rivet 3.0.3 released</a>
-        </li>
-    </ul>
-</li>
- 
+                     
                 </ul> 
                 <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="A home for Rivet" href="../index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
-            <a title="Getting Rivet" href="download.html">Getting Rivet</a>
-        </li>
-        <li class="navitem">
-            <a title="Hello World!" href="hello%5fworld.html">Examples</a>
-        </li>
-        <li class="navitem">
-            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
-        </li>
-    </ul>
-</li>
-<li id="tcl">
-    <h4>Tcl/Tk</h4>
-    <ul class="blocklist">
-        <li class="navitem">
-            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">
-                The Tcl/Tk Language
-                </a>
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
         </li>
         <li class="navitem">
             <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
         </li>
     </ul>
 </li>
-<li id="manual">
-    <h4>Documentation</h4>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a title="Getting Rivet" href="download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
+            <a href="release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
-<li id="support">
-    <h4>Support</h4>
+<li id="documentation">
+    <h4>Documentation</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
+            <a href="hello%5fworld.html">Examples</a>
+        </li>
+        <li class="navitem">
+            <a href="manuals.html">Manuals</a>
         </li>
     </ul>
 </li>
diff --git a/rivet/html/file_download.html b/rivet/html/file_download.html
index db624f6..fb424d2 100644
--- a/rivet/html/file_download.html
+++ b/rivet/html/file_download.html
@@ -121,47 +121,52 @@
 
             <div class="sidebar">
                 <ul>
-                     
-                </ul> 
-                <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="A home for Rivet" href="../index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
+        </li>
+        <li class="navitem">
+            <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
+        </li>
+    </ul>
+</li>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
+    <ul class="blocklist">
+        <li class="navitem">
             <a title="Getting Rivet" href="download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Hello World!" href="hello%5fworld.html">Examples</a>
+            <a href="release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
-<li id="manual">
+<li id="documentation">
     <h4>Documentation</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a href="hello%5fworld.html">Examples</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+            <a href="manuals.html">Manuals</a>
         </li>
     </ul>
 </li>
-<li id="rivetexamples">
+ 
+                </ul> 
+                <ul>
+                    <li id="rivetexamples">
     <h4>Examples</h4>
     <ul class="blocklist">
         <li class="navitem">
diff --git a/rivet/html/file_upload.html b/rivet/html/file_upload.html
index 97afde6..7a1cbe8 100644
--- a/rivet/html/file_upload.html
+++ b/rivet/html/file_upload.html
@@ -81,47 +81,52 @@
 
             <div class="sidebar">
                 <ul>
-                     
-                </ul> 
-                <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="A home for Rivet" href="../index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
+        </li>
+        <li class="navitem">
+            <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
+        </li>
+    </ul>
+</li>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
+    <ul class="blocklist">
+        <li class="navitem">
             <a title="Getting Rivet" href="download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Hello World!" href="hello%5fworld.html">Examples</a>
+            <a href="release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
-<li id="manual">
+<li id="documentation">
     <h4>Documentation</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a href="hello%5fworld.html">Examples</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+            <a href="manuals.html">Manuals</a>
         </li>
     </ul>
 </li>
-<li id="rivetexamples">
+ 
+                </ul> 
+                <ul>
+                    <li id="rivetexamples">
     <h4>Examples</h4>
     <ul class="blocklist">
         <li class="navitem">
diff --git a/rivet/html/hello_world.html b/rivet/html/hello_world.html
index bb44f65..894eba8 100644
--- a/rivet/html/hello_world.html
+++ b/rivet/html/hello_world.html
@@ -81,47 +81,52 @@
 
             <div class="sidebar">
                 <ul>
-                     
-                </ul> 
-                <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="A home for Rivet" href="../index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
+        </li>
+        <li class="navitem">
+            <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
+        </li>
+    </ul>
+</li>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
+    <ul class="blocklist">
+        <li class="navitem">
             <a title="Getting Rivet" href="download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Hello World!" href="hello%5fworld.html">Examples</a>
+            <a href="release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
-<li id="manual">
+<li id="documentation">
     <h4>Documentation</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a href="hello%5fworld.html">Examples</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+            <a href="manuals.html">Manuals</a>
         </li>
     </ul>
 </li>
-<li id="rivetexamples">
+ 
+                </ul> 
+                <ul>
+                    <li id="rivetexamples">
     <h4>Examples</h4>
     <ul class="blocklist">
         <li class="navitem">
diff --git a/rivet/html/manuals.html b/rivet/html/manuals.html
new file mode 100644
index 0000000..e9fe6eb
--- /dev/null
+++ b/rivet/html/manuals.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Apache Rivet Manuals</title>
+    <link rel="stylesheet" href="../templates/wondrous/styles.css" type="text/css" />
+</head>
+
+<body>
+    <div id="container">
+        <div id="header">
+            <h1><a href="../index.html">Rivet</a></h1>
+            <h2 id="slogan">Webscripting for Tcl'ers</h2>
+            <div class="clear"></div>
+        </div>
+        <div id="body">
+            <div id="content">
+                <h2>Apache Rivet Manuals</h2>
+                <p>
+				Latest Rivet versions
+			</p>
+
+<ul>
+    <li>
+        <a href="http://tcl.apache.org/rivet/manual2.4/">Rivet 2.4</a>
+    </li>
+    <li>
+        <a href="http://tcl.apache.org/rivet/manual3.1/">Rivet 3.1</a>
+    </li>
+</ul>
+
+<p>
+				Other Rivet versions
+			</p>
+
+<ul>
+    <li>
+        <a href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+    </li>
+    <li>
+        <a href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
+    </li>
+    <li>
+        <a href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
+    </li>
+    <li>
+        <a href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+    </li>
+</ul>
+
+
+
+                <div class="contentbottom">
+                    
+                </div>
+            </div>
+
+            <div class="sidebar">
+                <ul>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
+    <ul class="blocklist">
+        <li class="navitem">
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
+        </li>
+        <li class="navitem">
+            <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
+        </li>
+        <li class="navitem">
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
+        </li>
+        <li class="navitem">
+            <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
+        </li>
+    </ul>
+</li>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
+    <ul class="blocklist">
+        <li class="navitem">
+            <a title="Getting Rivet" href="download.html">Getting Rivet</a>
+        </li>
+        <li class="navitem">
+            <a href="release%2dnotes.html">Release Notes</a>
+        </li>
+        <li class="navitem">
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
+        </li>
+    </ul>
+</li>
+<li id="documentation">
+    <h4>Documentation</h4>
+    <ul class="blocklist">
+        <li class="navitem">
+            <a href="hello%5fworld.html">Examples</a>
+        </li>
+        <li class="navitem">
+            <a href="manuals.html">Manuals</a>
+        </li>
+    </ul>
+</li>
+ 
+                </ul> 
+                <ul>
+                     
+                </ul> 
+                <ul>
+                    <li id="manual">
+    <h4>Documentation</h4>
+    <ul class="blocklist">
+        <li class="navitem">
+            <a title="Rivet 3.1" target="rivetman3.1" href="http://tcl.apache.org/rivet/manual3.1/">Rivet 3.1</a>
+        </li>
+        <li class="navitem">
+            <a title="Rivet 2.4" target="rivetman2.4" href="http://tcl.apache.org/rivet/manual2.4/">Rivet 2.4</a>
+        </li>
+    </ul>
+</li>
+ 
+                </ul> 
+            </div>
+            <div class="clear"></div>
+        </div>
+    </div>
+    <div id="footer">
+        <div class="footer-content">
+            <p><a href="http://www.apache.org/">Apache Software Foundation</a> | Design by <a href="http://www.spyka.net">Free CSS Templates</a> | <a href="http://www.justfreetemplates.com">Free Web Templates</a></p>
+        </div>
+    </div>
+    <div style="text-align: center; font-size: 0.75em;">Design downloaded from <a href="http://www.freewebtemplates.com/">free website templates</a>.</div></body>
+</html>
+
diff --git a/rivet/html/release-notes.html b/rivet/html/release-notes.html
new file mode 100644
index 0000000..b3cf73c
--- /dev/null
+++ b/rivet/html/release-notes.html
@@ -0,0 +1,307 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Apache Rivet Release Notes</title>
+    <link rel="stylesheet" href="../templates/wondrous/styles.css" type="text/css" />
+</head>
+
+<body>
+    <div id="container">
+        <div id="header">
+            <h1><a href="../index.html">Rivet</a></h1>
+            <h2 id="slogan">Webscripting for Tcl'ers</h2>
+            <div class="clear"></div>
+        </div>
+        <div id="body">
+            <div id="content">
+                <h2>Apache Rivet Release Notes</h2>
+                <p>Apache Rivet current stable version is 3.1.0</p>
+
+<dl>
+    <dt>Rivet 3.1</dt>
+    <dd>
+        <ul>
+            <li>Rivet 3.1.0 is a bug fix release of Rivet 3.0.3. The decision of
+        		releasing a new point release has been suggested by the nature of the fix that,
+        		even though unlikely, in principle might break existing code developed on 
+        		wrong assumptions about the behavior of commands 
+        		<b>::rivet::var_ps</b>
+
+ and <b>::rivet::var_post</b>
+            </li>
+        </ul>
+    </dd>
+    <dt>Rivet 3.0 release notes</dt>
+    <dd>
+        <h4>Rivet 3.0.3</h4>
+        <ul>
+            <li>Packages in DIO are not assuming anymore the rivet command set has
+                            been imported into the global namespace</li>
+            <li>A minor change to ::rivet::xml provides a new form to 
+                            generate self closing elements</li>
+        </ul>
+        <h4>Rivet 3.0.2</h4>
+        <ul>
+            <li>Fixed a bug in the default error handler</li>
+            <li>Other minor changes only relevant to mod_rivet code and with
+ 							no interest at the application level (see the Changelog file to know more)
+ 							</li>
+        </ul>
+        <h4>Rivet 3.0.1</h4>
+        <ul>
+            <li>rivet Namespace determination in librivet has been revised to
+   							 avoid to check for the module globals and therefore avoiding
+   							 the inclusion of mod_rivet.h
+   						</li>
+            <li>A few details in the worker bridge have been fixed, including
+							a thread root interpreter initialization</li>
+            <li>the lazy bridge has been extensively commented</li>
+            <li>documentation has been expanded and corrected in various sections</li>
+        </ul>
+    </dd>
+    <dt>Rivet 2.4</dt>
+    <dd>
+        <h4>Rivet 2.4.0</h4>
+        <ul>
+            <li>Rivet 2.4.0 is a bug fix release of Rivet 2.3.5. The new point
+        				release was done on the same ground of 3.1.0: marking the fact that this version
+        				could potentially (though unlikely) create regressions if commands <b>::rivet::var_post</b>
+
+
+        				and <b>::rivet::var_qs</b>
+
+ are improperly used
+        				                            </li>
+        </ul>
+    </dd>
+    <dt>Rivet 2.3</dt>
+    <dd>
+        <h4>Rivet 2.3.5</h4>
+        <p>
+						Rivet 2.3.5 is a bug fix release for rivet 2.3. Rivet 2.3.5 received contributions
+						from Ronnie Brunner and Jeff Lawson 
+						<ul>
+                <li>Fixed server initialization procedure. ServerInitScript is now executed only once, the second time
+							the server initialization callback is called</li>
+                <li>Fixed test suite problem with virtual host handling in certain installations</li>
+                <li>Mysql DIO connector now handles also the special value NULL for a column</li>
+                <li>Fixed buffer overflow bug in libWWW</li>
+                <li>Tcl environment now can be loaded also from outside mod_rivet</li>
+                <li>Command <strong>::rivet::redirect</strong>
+
+ now accepts integer status code
+							to control redirection. This enables the command to emit status codes other than
+							301 and 302                                    </li>
+            </ul>
+        </p>
+        <h4>Rivet 2.3.4</h4>
+        <p>
+            <ul>
+                <li>Fixed buffer allocation size in command <strong>::rivet::escape_sgml_chars</strong>
+
+
+							(fixes bug #61353)                                    </li>
+                <li>Random number generator is re-seeded for each interpreter thus to guarantee they
+							will output different sequences</li>
+                <li>package <strong>formbroker</strong>
+
+ now handles also boolean type of data                                    </li>
+                <li>invocation of rivet commands has been fully qualified with the <strong>::rivet</strong>
+
+ namespace                                    </li>
+            </ul>
+        </p>
+        <h4>Rivet 2.3.3</h4>
+        <ul>
+            <li>DIO: String quoting of the Posgresql connector was incorrect and has been fixed (closes bug #60378)</li>
+            <li>
+							New package <strong>formbroker</strong>
+
+: this package is a form response broker and validator,
+							still experimental but usable
+						                            </li>
+            <li>Fixed typo in manual page</li>
+            <li>
+							Change in mod_rivet internals: as a content generator mod_rivet has to figure out
+							when a request has to be handled or passed on to other modules. 
+							The request type is now determined more correctly from
+							the field <q>header</q>
+
+ of the <strong>request_rec</strong>
+
+ (previosly was
+							<q>content_type</q>
+
+)
+						                            </li>
+        </ul>
+        <h4>Rivet 2.3.2</h4>
+        <p>
+            <ul>
+                <li>The test suite now requires Apache 2.4</li>
+                <li>Commands <strong>::rivet::try</strong>
+
+ and <strong>::rivet::catch</strong>
+
+
+								have been fixed. Under some circumstances they failed to properly evaluate
+								the code they are supposed to guard and control                                    </li>
+                <li>A new utility command <strong>::rivet::url_query</strong>
+
+ 
+								composes the query part of an URL from a list of parameter-value pairs                                    </li>
+            </ul>
+        </p>
+        <h4>Rivet 2.3.1</h4>
+        <p>
+						Rivet 2.3.1 is a bug fix release for package rivet 2.3. Method 'file' which was
+						to print an HTML5 <pre class="programlisting">&lt;input type="file" name="...."/&gt;</pre>
+
+ 
+						was actually printing an email form field. This problem was not serious but affected any serious 
+						development of forms using rivet's form package
+					                    </p>
+        <h4>Rivet 2.3.0</h4>
+        <p>
+               	Rivet 2.3.0 consolidates the 2.2.x module series with several improvements in the way 
+                  the command export was handled. This will be the last 2.x version series in preparation
+                  of the newly developed 3.0 module.
+               </p>
+        <p>
+                  Rivet 2.3.0 introduces the command <b>::rivet::try</b>
+
+ and <b>::rivet::catch</b>
+
+
+                  as a wrappers of the Tcl core 
+                  language <b>try</b>
+
+ and <b>catch</b>
+
+ commands. These commands are not exported to 
+                  the global namespace even when
+                  mod_rivet is build with the <i>--enable-rivet-commands-export</i>
+
+ and they should be
+                  used within Rivet scripts to protect any <b>::rivet::abort_page</b>
+
+ and
+                  <b>::rivet::exit</b>
+
+ execution. These commands interrupt code execution by
+                  raising a Tcl error with reserved error codes (respectively ABORTPAGE and EXITPAGE) to
+                  signal the module to fire the AbortScript Tcl script with special codes accessible
+                  through the <b>::rivet::abort_code</b>
+
+ command
+		   		                     </p>
+        <p>
+                  Execution of <b>::rivet::try</b>
+
+ fails if mod_rivet is not built with Tcl &gt;= 8.6
+                                    </p>
+        <p>
+                    Command <b>::rivet::exit</b>
+
+ was also introduced to give the command
+                    <b>exit</b>
+
+ a more sensible behaviour within the context of the Apache HTTP Web Server. 
+                    In fact the core command has become an alias of <b>::rivet::exit</b>
+
+ which interrupts 
+                    the script execution and hands control on to an AbortScript. Then it completes the 
+                    request and just before returning to the web server framework it terminates the child
+                    process by calling <b>Tcl_Exit</b>
+        </p>
+        <p>
+                    This command replaces the <b>exit</b>
+
+ core command and it's provided as a way
+                    to give it a meaning within the Rivet and Apache context but the
+                    programmer should avoid to use it and instead adopt proper software design
+                    to bring about sudden process termination
+                                    </p>
+    </dd>
+</dl>
+
+
+
+                <div class="contentbottom">
+                    
+                </div>
+            </div>
+
+            <div class="sidebar">
+                <ul>
+                     
+                </ul> 
+                <ul>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
+    <ul class="blocklist">
+        <li class="navitem">
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
+        </li>
+        <li class="navitem">
+            <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
+        </li>
+        <li class="navitem">
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
+        </li>
+        <li class="navitem">
+            <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
+        </li>
+    </ul>
+</li>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
+    <ul class="blocklist">
+        <li class="navitem">
+            <a title="Getting Rivet" href="download.html">Getting Rivet</a>
+        </li>
+        <li class="navitem">
+            <a href="release%2dnotes.html">Release Notes</a>
+        </li>
+        <li class="navitem">
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
+        </li>
+    </ul>
+</li>
+<li id="documentation">
+    <h4>Documentation</h4>
+    <ul class="blocklist">
+        <li class="navitem">
+            <a href="hello%5fworld.html">Examples</a>
+        </li>
+        <li class="navitem">
+            <a href="manuals.html">Manuals</a>
+        </li>
+    </ul>
+</li>
+ 
+                </ul> 
+                <ul>
+                    <li id="acknowledgments">
+    <h4>Acknowledgments</h4>
+    <ul class="blocklist">
+        <li class="navitem">
+            <a href="http://www.apache.org/foundation/thanks.html">ASF Sponsorship</a>
+        </li>
+    </ul>
+</li>
+ 
+                </ul> 
+            </div>
+            <div class="clear"></div>
+        </div>
+    </div>
+    <div id="footer">
+        <div class="footer-content">
+            <p><a href="http://www.apache.org/">Apache Software Foundation</a> | Design by <a href="http://www.spyka.net">Free CSS Templates</a> | <a href="http://www.justfreetemplates.com">Free Web Templates</a></p>
+        </div>
+    </div>
+    <div style="text-align: center; font-size: 0.75em;">Design downloaded from <a href="http://www.freewebtemplates.com/">free website templates</a>.</div></body>
+</html>
+
diff --git a/rivet/html/var_access.html b/rivet/html/var_access.html
index ddf5b27..9b66344 100644
--- a/rivet/html/var_access.html
+++ b/rivet/html/var_access.html
@@ -135,47 +135,52 @@
 
             <div class="sidebar">
                 <ul>
-                     
-                </ul> 
-                <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="A home for Rivet" href="../index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
+        </li>
+        <li class="navitem">
+            <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
+        </li>
+    </ul>
+</li>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
+    <ul class="blocklist">
+        <li class="navitem">
             <a title="Getting Rivet" href="download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Hello World!" href="hello%5fworld.html">Examples</a>
+            <a href="release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="The Rivet development team" href="about.html">About Us - Contact</a>
+            <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
-<li id="manual">
+<li id="documentation">
     <h4>Documentation</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a href="hello%5fworld.html">Examples</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
+            <a href="manuals.html">Manuals</a>
         </li>
     </ul>
 </li>
-<li id="rivetexamples">
+ 
+                </ul> 
+                <ul>
+                    <li id="rivetexamples">
     <h4>Examples</h4>
     <ul class="blocklist">
         <li class="navitem">
diff --git a/rivet/index.html b/rivet/index.html
index a51472b..ddf3e36 100644
--- a/rivet/index.html
+++ b/rivet/index.html
@@ -23,7 +23,7 @@
  is a powerful, flexible, consistent,
 		  		fast, and robust solution to creating web applications:
 			            </p>
-    <img src="../picts/Rivetlogo_tiny.png" class="floatright"/>
+    <img src="picts/Rivetlogo_tiny.png" class="floatright"/>
     <p>
         <b>Powerful</b>
 
@@ -95,81 +95,54 @@
 
             <div class="sidebar">
                 <ul>
-                    <li id="news">
-    <h4>News</h4>
+                    <li id="tclstuff">
+    <h4>Rivet &amp; Tcl</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a href="html/rn%2d2%2d3.html">11 Nov 2017: Rivet 2.3.5 released</a>
-        </li>
-        <li class="navitem">
-            <a href="html/rn%2d3%2d0.html">18 Nov 2018: Rivet 3.0.3 released</a>
-        </li>
-    </ul>
-</li>
- 
-                </ul> 
-                <ul>
-                    <li id="home">
-    <h4>Rivet</h4>
-    <ul class="blocklist">
-        <li class="navitem">
-            <a title="A home for Rivet" href="index.html">Rivet Homepage</a>
+            <a title="The Rivet development team" href="html/about.html">About Us - Contact</a>
         </li>
         <li class="navitem">
             <a title="Home of Apache Tcl related stuff" target="asf" href="http://tcl.apache.org/">Apache Tcl Home</a>
         </li>
         <li class="navitem">
-            <a title="Getting Rivet" href="html/download.html">Getting Rivet</a>
-        </li>
-        <li class="navitem">
-            <a title="Hello World!" href="html/hello%5fworld.html">Examples</a>
-        </li>
-        <li class="navitem">
-            <a title="The Rivet development team" href="html/about.html">About Us - Contact</a>
-        </li>
-    </ul>
-</li>
-<li id="tcl">
-    <h4>Tcl/Tk</h4>
-    <ul class="blocklist">
-        <li class="navitem">
-            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">
-                The Tcl/Tk Language
-                </a>
+            <a title="The Tcl Developer Xchange" target="tclxchange" class="extern" href="http://www.tcl.tk/">The Tcl/Tk Language</a>
         </li>
         <li class="navitem">
             <a title="Tcl community wiki site" target="tclwiki" class="extern" href="http://wiki.tcl.tk/">Tcl'ers Wiki</a>
         </li>
     </ul>
 </li>
-<li id="manual">
-    <h4>Documentation</h4>
+<li id="rivetstuff">
+    <h4>Getting Rivet to Work</h4>
     <ul class="blocklist">
         <li class="navitem">
-            <a title="Rivet 2.1 Manual" target="rivetman2.1" href="http://tcl.apache.org/rivet/manual2.1/">Rivet 2.1</a>
+            <a title="Getting Rivet" href="html/download.html">Getting Rivet</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.2 Manual" target="rivetman2.2" href="http://tcl.apache.org/rivet/manual2.2/">Rivet 2.2</a>
+            <a href="html/release%2dnotes.html">Release Notes</a>
         </li>
         <li class="navitem">
-            <a title="Rivet 2.3 Manual" target="rivetman2.3" href="http://tcl.apache.org/rivet/manual2.3/">Rivet 2.3</a>
-        </li>
-        <li class="navitem">
-            <a title="Rivet 3.0 Manual" target="rivetman3.0" href="http://tcl.apache.org/rivet/manual3.0/">Rivet 3.0</a>
-        </li>
-    </ul>
-</li>
-<li id="support">
-    <h4>Support</h4>
-    <ul class="blocklist">
-        <li class="navitem">
             <a title="Apache Rivet Bugzilla" class="extern" href="https://issues.apache.org/bugzilla/buglist.cgi?quicksearch=Rivet">Bug Reports</a>
         </li>
     </ul>
 </li>
+<li id="documentation">
+    <h4>Documentation</h4>
+    <ul class="blocklist">
+        <li class="navitem">
+            <a href="html/hello%5fworld.html">Examples</a>
+        </li>
+        <li class="navitem">
+            <a href="html/manuals.html">Manuals</a>
+        </li>
+    </ul>
+</li>
  
                 </ul> 
                 <ul>
+                     
+                </ul> 
+                <ul>
                     <li id="acknowledgments">
     <h4>Acknowledgments</h4>
     <ul class="blocklist">
diff --git a/rivet/templates/wondrous/external-link-16.png b/rivet/templates/wondrous/external-link-16.png
new file mode 100644
index 0000000..34f54d6
--- /dev/null
+++ b/rivet/templates/wondrous/external-link-16.png
Binary files differ
diff --git a/rivet/templates/wondrous/link-16-white.png b/rivet/templates/wondrous/link-16-white.png
new file mode 100644
index 0000000..9d94601
--- /dev/null
+++ b/rivet/templates/wondrous/link-16-white.png
Binary files differ
diff --git a/rivet/templates/wondrous/picts/bodybg.jpg b/rivet/templates/wondrous/picts/bodybg.jpg
new file mode 100644
index 0000000..28a812d
--- /dev/null
+++ b/rivet/templates/wondrous/picts/bodybg.jpg
Binary files differ
diff --git a/rivet/templates/wondrous/picts/h4-bg.png b/rivet/templates/wondrous/picts/h4-bg.png
new file mode 100644
index 0000000..d8d1b78
--- /dev/null
+++ b/rivet/templates/wondrous/picts/h4-bg.png
Binary files differ
diff --git a/rivet/templates/wondrous/styles.css b/rivet/templates/wondrous/styles.css
index 0dbf8ba..426fc15 100644
--- a/rivet/templates/wondrous/styles.css
+++ b/rivet/templates/wondrous/styles.css
@@ -1,5 +1,5 @@
 body {
-	background: #480E0E url('../../picts/wondrous/bodybg.jpg') repeat-x scroll top left;
+	background: #480E0E url('picts/bodybg.jpg') repeat-x scroll top left;
 	margin:0;
 	padding:0;
 	font-family: Arial, Helvetica, sans-serif;
@@ -25,7 +25,7 @@
 th {
 	color: #fff;
 	font-weight: normal;
-	background: transparent url(../../picts/wondrous/h4-bg.png) repeat-x scroll left top;
+	background: transparent url('picts/h4-bg.png') repeat-x scroll left top;
 }
 
 td {
@@ -97,7 +97,7 @@
 
 form input.formbutton {
 	border: none;
-	background:transparent url(../../picts/wondrous/h4-bg.png) repeat-x scroll center;
+	background:transparent url('picts/h4-bg.png') repeat-x scroll center;
 	color: #ffffff;
 	font-weight: bold;
 	padding: 6px 10px;
@@ -264,10 +264,11 @@
 
 .sidebar li ul.blocklist li a {
 	display: block;
-	padding: 7px 8px;
+	padding: 7px 8px 7px 20px;
 	margin: 0 7px;
 	text-decoration: none;
 	border-bottom: 1px solid #5F1311;
+    background:     transparent url(link-16-white.png) center left no-repeat;
 }
 
 .sidebar li ul.blocklist li a:hover {
@@ -281,7 +282,7 @@
 .sidebar h4 {
 	color: #fff;
 	font-family: Arial, Helvetica, sans-serif;
-	background:transparent url('../../picts/wondrous/h4-bg.png') repeat-x scroll top left;
+	background:transparent url('picts/h4-bg.png') repeat-x scroll top left;
 	font-size: 12px;
 	letter-spacing: 0;
 	text-transform: uppercase;
@@ -349,7 +350,14 @@
 }
 
 .sidebar li ul.blocklist li a.extern {
-    display:        inline-block;
+    display:        block;
     padding-left:   20px;
-    background:     transparent url(external-link-grey.png) center left no-repeat;
+    background:     transparent url(external-link-16.png) center left no-repeat;
+}
+
+dt {
+    border-bottom:  1px solid black;
+    margin-bottom:  1em;
+    font-size:      110%;
+    font-weight:    bold;
 }