diff --git a/doc/tor-doc-osx.html b/doc/tor-doc-osx.html
index e0d5f57b1d..cce1a592d5 100644
--- a/doc/tor-doc-osx.html
+++ b/doc/tor-doc-osx.html
@@ -1,26 +1,58 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-<title>Tor Mac OS X Install Instructions</title>
-<meta name="Author" content="Thomas Hardly">
-<meta name="Author" content="Roger Dingledine">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="stylesheet" type="text/css" href="tor-doc.css">
+  <title>Tor SwitchProxy Install Instructions</title>
+  <meta name="Author" content="Roger Dingledine" />
+  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+  <link rel="stylesheet" type="text/css" href="http://tor.eff.org/stylesheet.css" />
+  <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
 </head>
 
 <body>
 
-<h1>Running the <a href="http://tor.eff.org/">Tor</a> client on Mac OS X</h1>
+<!-- TITLE BAR & NAVIGATION -->
+
+<table class="banner" border="0" cellpadding="0" cellspacing="0">
+    <tr>
+        <td class="banner-left"></td>
+        <td class="banner-middle">
+            <a href="/index.html">Home</a>
+          | <a href="/howitworks.html">How It Works</a>
+          | <a href="/download.html">Download</a>
+          | <a href="/documentation.html">Docs</a>
+          | <a href="/users.html">Users</a>
+          | <a href="/faq.html">FAQs</a>
+          | <a href="/volunteer.html">Volunteer</a>
+          | <a href="/developers.html">Developers</a>
+          | <a href="/research.html">Research</a>
+          | <a href="/people.html">People</a>
+        </td>
+        <td class="banner-right"></td>
+    </tr>
+</table>
+ 
+<!-- END TITLE BAR & NAVIGATION -->
+
+<div class="center">
+
+<div class="main-column">
+
+<h1>Running the <a href="http://tor.eff.org/">Tor</a> client on Mac OS X</h1>
+<br />
 
-<a name="installing"></a>
-<h2>Step One: Download and Install Tor</h2>
 <p>
-<b>Note that these are the installation instructions for running a client on
+<b>Note that these are the installation instructions for running a Tor client on
   Mac OS X. If you want to run a server (please do), read the "Configuring a
   server" section at <a href="tor-doc.html#server">tor-doc.html</a>.</b>
 </p>
+
+<hr />
+<a id="installing"></a>
+<h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>
+<br />
+
 <p>
 The latest beta release of Tor for Macintosh OS X is <a
 href="http://tor.eff.org/dist/osx/Tor 0.1.1.2-alpha Bundle.dmg">0.1.1.2-alpha</a>.
@@ -61,8 +93,10 @@ is restarted.
 configuration for Tor has been installed as part of the installer package.
 </p>
 
-<a name="using"></a>
-<h2>Step Two: Configure your applications to use Tor</h2>
+<hr />
+<a id="using"></a>
+<h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
+<br />
 
 <p>After installing Tor and Privoxy, you need to configure your
 applications to use them. The first step is to set up web browsing.</p>
@@ -133,8 +167,10 @@ href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a> or
 HOWTO</a>.
 </p>
 
-<a name="verify"></a>
-<h2>Step Three: Make sure it's working</h2>
+<hr />
+<a id="verify"></a>
+<h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2>
+<br />
 
 <p>
 <a href="http://ipid.shat.net">ipid.shat.net</a> and
@@ -165,8 +201,10 @@ FAQ entry</a>.
 href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">this
 FAQ entry</a> for hints.</p>
 
-<a name="uninstall"></a>
-<h2>How To Uninstall Tor and Privoxy</h2>
+<hr />
+<a id="uninstall"></a>
+<h2><a class="anchor" href="#uninstall">How To Uninstall Tor and Privoxy</a></h2>
+<br />
 
 <p>The Tor 0.1.0.x series does not come with an uninstaller; this feature
   will be added in the 0.1.1.x series.  If you want to remove Tor on OSX,
@@ -204,8 +242,12 @@ FAQ entry</a> for hints.</p>
 them on <a href="http://bugs.noreply.org/tor">our bugtracker</a> in the
 website category. Thanks!</p>
 
-<p>$Id$</p>
-
+  </div><!-- #main -->
+</div>
+  <div class="bottom" id="bottom">
+     <i><a href="mailto:tor-webmaster@freehaven.net"
+     class="smalllink">Webmaster</a></i> - $Id$
+  </div>
 </body>
 </html>
 
diff --git a/doc/tor-doc-win32.html b/doc/tor-doc-win32.html
index a93e8756fe..7841af07fa 100644
--- a/doc/tor-doc-win32.html
+++ b/doc/tor-doc-win32.html
@@ -40,18 +40,20 @@
 <div class="main-column">
 
 <h1>Running the <a href="http://tor.eff.org/">Tor</a> client on MS Windows</h1>
+<br />
+
+<p>
+<b>Note that these are the installation instructions for running a Tor
+client on MS Windows (98, 98SE, NT4, 2000, XP, Server)
+If you want to run a server (please do), read the "Configuring a server" section at
+<a href="tor-doc.html#server">tor-doc.html</a>.</b>
+</p>
 
 <hr />
 <a id="installing"></a>
 <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>
 <br />
 
-<p>
-<b>Note that these are the installation instructions for running a
-client on MS Windows (98, 98SE, NT4, 2000, XP, Server)
-If you want to run a server (please do), read the "Configuring a server" section at
-<a href="tor-doc.html#server">tor-doc.html</a>.</b>
-</p>
 <p>
 The latest beta release of Tor for MS Windows is
 <a href="http://tor.eff.org/dist/win32/tor-0.1.1.2-alpha-win32.exe">0.1.1.2-alpha</a>.
@@ -262,8 +264,7 @@ website category. Thanks!</p>
 </div>
   <div class="bottom" id="bottom">
      <i><a href="mailto:tor-webmaster@freehaven.net"
-     class="smalllink">Webmaster</a></i> - $Id: overview.html,v 1.37
-     2005/07/15 22:19:37 arma Exp $
+     class="smalllink">Webmaster</a></i> - $Id$
   </div>
 </body>
 </html>
diff --git a/doc/tor-hidden-service.html b/doc/tor-hidden-service.html
index 44ba948224..dd0302e4b7 100644
--- a/doc/tor-hidden-service.html
+++ b/doc/tor-hidden-service.html
@@ -53,8 +53,9 @@ website.
 </p>
 
 <hr />
-<a name="zero"></a>
-<h3>Step Zero: Get Tor and Privoxy working</h3>
+<a id="zero"></a>
+<h2><a class="anchor" href="#zero">Step Zero: Get Tor and Privoxy working</a></h2>
+<br />
 
 <p>Before you start, you need to make sure 1) Tor is up and running,
 2) Privoxy is up and running, 3) Privoxy is configured to point
@@ -81,8 +82,9 @@ FAQ entry</a> for some help.
 </p>
 
 <hr />
-<a name="one"></a>
-<h3>Step One: Configure an example hidden service</h3>
+<a id="one"></a>
+<h2><a class="anchor" href="#one">Step One: Configure an example hidden service</a></h2>
+<br />
 
 <p>In this step, you're going to configure a hidden service that points
 to www.google.com. This way we can make sure you have this step
@@ -179,8 +181,9 @@ look in your logs for some hints, and keep playing with it until it works.
 </p>
 
 <hr />
-<a name="two"></a>
-<h3>Step Two: Now install a web server locally</h3>
+<a id="two"></a>
+<h2><a class="anchor" href="#two">Step Two: Now install a web server locally</a></h2>
+<br />
 
 <p>Now that you have hidden services working on Tor, you need to
 set up your web server locally. Setting up a web server is tricky,
@@ -225,8 +228,9 @@ the site.
 </p>
 
 <hr />
-<a name="three"></a>
-<h3>Step Three: Connect your web server to your hidden service</h3>
+<a id="three"></a>
+<h2><a class="anchor" href="#three">Step Three: Connect your web server to your hidden service</a></h2>
+<br />
 
 <p>This part is very simple. Open up your torrc again, and change the
 HiddenServicePort line from "www.google.com:80" to "localhost:5222".
@@ -237,8 +241,9 @@ service hostname in your browser.
 </p>
 
 <hr />
-<a name="four"></a>
-<h3>Step Four: More advanced tips</h3>
+<a id="four"></a>
+<h2><a class="anchor" href="#four">Step Four: More advanced tips</a></h2>
+<br />
 
 <p>If you plan to keep your service available for a long time, you might
 want to make a backup copy of the private_key file somewhere.
@@ -294,8 +299,7 @@ href="mailto:tor-bugs@freehaven.net">send them to us</a>. Thanks!</p>
 </div>
   <div class="bottom" id="bottom">
      <i><a href="mailto:tor-webmaster@freehaven.net"
-     class="smalllink">Webmaster</a></i> - $Id: overview.html,v 1.37
-     2005/07/15 22:19:37 arma Exp $
+     class="smalllink">Webmaster</a></i> - $Id$
   </div>
 </body>
 </html>
diff --git a/doc/tor-switchproxy.html b/doc/tor-switchproxy.html
index f84f14f607..516aa47247 100644
--- a/doc/tor-switchproxy.html
+++ b/doc/tor-switchproxy.html
@@ -55,8 +55,9 @@ SwitchProxy works anywhere Firefox works. Hopefully everybody else can
 follow along just fine.</p>
 
 <hr />
-<a name="zero"></a>
-<h3>Step Zero: Download and Install Tor and Privoxy</h3>
+<a id="zero"></a>
+<h2><a class="anchor" href="#zero">Step Zero: Download and Install Tor and Privoxy</a></h2>
+<br />
 
 <p>Before you start, you need to make sure 1) Tor is up and running,
 2) Privoxy is up and running, and 3) Privoxy is configured to point
@@ -71,8 +72,9 @@ one</a> of OS X Tor installation howto, since our OS X package includes
 Privoxy and configures it already.</p>
 
 <hr />
-<a name="one"></a>
-<h3>Step One: Download and Install SwitchProxy</h3>
+<a id="one"></a>
+<h2><a class="anchor" href="#one">Step One: Download and Install SwitchProxy</a></h2>
+<br />
 
 <p>SwitchProxy is a Firefox plugin, so you need to go through
 the process of installing a new plugin. First, go to the <a
@@ -97,8 +99,9 @@ windows and restart Firefox.</p>
 src="http://tor.eff.org/img/screenshot-switchproxy-plugin-finished.jpg" />
 
 <hr />
-<a name="two"></a>
-<h3>Step Two: Configure SwitchProxy</h3>
+<a id="two"></a>
+<h2><a class="anchor" href="#two">Step Two: Configure SwitchProxy</a></h2>
+<br />
 
 <p>When you restart Firefox, you'll notice there's a new toolbar
 that lets you control your proxies. Now we're going to set up a proxy
@@ -148,8 +151,9 @@ to get a German exit node</a>:</p>
 src="http://tor.eff.org/img/screenshot-switchproxy-german.jpg" />
 
 <hr />
-<a name="two"></a>
-<h3>Step Three: Check if it works</h3>
+<a id="three"></a>
+<h2><a class="anchor" href="#three">Step Step Three: Check if it works</a></h2>
+<br />
 
 <p>Now Firefox is using Privoxy as an HTTP proxy, Privoxy is using Tor as
 a socks4a proxy, and Tor is making your connections to the Internet.</p>
@@ -171,8 +175,7 @@ href="mailto:tor-bugs@freehaven.net">send them to us</a>. Thanks!</p>
 </div>
   <div class="bottom" id="bottom">
      <i><a href="mailto:tor-webmaster@freehaven.net"
-     class="smalllink">Webmaster</a></i> - $Id: overview.html,v 1.37
-     2005/07/15 22:19:37 arma Exp $
+     class="smalllink">Webmaster</a></i> - $Id$
   </div>
 </body>
 </html>
