diff --git a/anoncvs.php b/anoncvs.php
index 59f9135df..7f0dbc836 100644
--- a/anoncvs.php
+++ b/anoncvs.php
@@ -2,7 +2,7 @@
 // $Id$
 $_SERVER['BASE_PAGE'] = 'anoncvs.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-commonHeader("Anonymous CVS Access");
+site_header("Anonymous CVS Access");
 ?>
 
 <h1>Anonymous CVS Access</h1>
@@ -152,4 +152,4 @@ diff -u
  <li>autoconf 2.13, automake 1.5 and libtool 1.4</li>
 </ul>
 
-<?php commonFooter(); ?>
+<?php site_footer(); ?>
diff --git a/copyright.php b/copyright.php
index 4a8c20290..382041f69 100644
--- a/copyright.php
+++ b/copyright.php
@@ -2,7 +2,7 @@
 // $Id$
 $_SERVER['BASE_PAGE'] = 'copyright.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-commonheader("Copyright and License");
+site_header("Copyright and License");
 ?>
 
 <h1>Copyright and License</h1>
@@ -11,7 +11,7 @@ commonheader("Copyright and License");
 
 <p>
  For information on the PHP License (i.e. using the PHP language),
- <?php print_link('/license/', 'see our licensing information page'); ?>.
+ <a href="/license/">see our licensing information page</a>.
 </p>
 
 <h2>Website Copyright</h2>
@@ -50,14 +50,14 @@ commonheader("Copyright and License");
 
 <p>
  You can contact the webmaster at 
- <?php print_link('mailto:webmaster@php.net', 'webmaster@php.net'); ?>.
+ <a href="mailto:webmaster@php.net">webmaster@php.net</a>.
  Note that this address is mapped to a mailing list and a newsgroup, so
  every message you send will be stored in public archives.
 </p>
 
 <p>
  For more information on the PHP Group and the PHP project, please see 
- <?php print_link('http://www.php.net/'); ?>.
+ <a href="http://www.php.net/">http://www.php.net/</a>.
 </p>
 
-<?php commonfooter(); ?>
+<?php site_footer(); ?>
diff --git a/cvs-php.php b/cvs-php.php
index 418081c5c..364cbe8ac 100644
--- a/cvs-php.php
+++ b/cvs-php.php
@@ -4,7 +4,7 @@ $_SERVER['BASE_PAGE'] = 'cvs-php.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/email-validation.inc';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/posttohost.inc';
-commonHeader("Using CVS for PHP Development");
+site_header("Using CVS for PHP Development");
 ?>
 
 <h1>Using CVS for PHP Development</h1>
@@ -244,7 +244,7 @@ EOT;
  on and close bugs in our <a href="http://bugs.php.net/">bug database</a>, and
  allows you to modify the documentation notes in the <a href="/manual/">annotated
  manual</a>. Your CVS account also translates into a foo@php.net forwarding email
- address where <b>foo</b> is your CVS user id. Feel free to use it!
+ address where <strong>foo</strong> is your CVS user id. Feel free to use it!
 </p>
 
 <h2>Request a CVS account</h2>
@@ -287,7 +287,7 @@ EOT;
       class="max" value="<?php echo clean($_POST['password']);?>" /></td>
 </tr>
 <?php
-# if checkread is set here, we're redisplaying the form because of an error.
+// if checkread is set here, we're redisplaying the form because of an error.
 if ($_POST['checkread']) {
     echo "<input type=\"hidden\" name=\"checkread\" value=\"1\" />\n";
 }
@@ -306,4 +306,4 @@ else {?>
 </table>
 </form>
 
-<?php commonFooter(); ?>
+<?php site_footer(); ?>
diff --git a/cvsup.php b/cvsup.php
index 9ff4a6ab5..e970da01f 100644
--- a/cvsup.php
+++ b/cvsup.php
@@ -2,7 +2,7 @@
 // $Id$
 $_SERVER['BASE_PAGE'] = 'cvsup.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-commonHeader("Using CVSup to maintain a local CVS repository");
+site_header("Using CVSup to maintain a local CVS repository");
 ?>
 
 <h1>Using CVSup To Maintain A Local CVS Repository</h1>
@@ -52,4 +52,4 @@ php-src
  </li>
 </ol>
 
-<?php commonFooter(); ?>
+<?php site_footer(); ?>
diff --git a/sidebars.php b/sidebars.php
index 6f7b098c3..8a2e53eb4 100644
--- a/sidebars.php
+++ b/sidebars.php
@@ -2,7 +2,7 @@
 // $Id$
 $_SERVER['BASE_PAGE'] = 'sidebars.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-commonHeader("PHP.net Search Bars");
+site_header("PHP.net Search Bars");
 ?>
 <h1>PHP.net Search Bars</h1>
 
@@ -17,7 +17,7 @@ commonHeader("PHP.net Search Bars");
 </p>
 
 <h2>Mozilla 0.9.4 and above</h2>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 function addPanel()
 {
     if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function")) {
@@ -71,4 +71,4 @@ function addPanel()
  more about Opera sidebars on this page</a>.</em>
 </p>
 
-<?php commonFooter(); ?>
+<?php site_footer(); ?>
diff --git a/sitemap.php b/sitemap.php
index 5bd0a5b2f..9b0bea548 100644
--- a/sitemap.php
+++ b/sitemap.php
@@ -2,7 +2,7 @@
 // $Id$
 $_SERVER['BASE_PAGE'] = 'sitemap.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-commonHeader("Sitemap");
+site_header("Sitemap");
 ?>
 
 <h1>PHP.net Sitemap</h1>
@@ -77,4 +77,4 @@ commonHeader("Sitemap");
  </li>
 </ul>
 
-<?php commonFooter(); ?>
+<?php site_footer(); ?>
diff --git a/sites.php b/sites.php
index 74cc9af59..cac1d8366 100644
--- a/sites.php
+++ b/sites.php
@@ -2,7 +2,7 @@
 // $Id$
 $_SERVER['BASE_PAGE'] = 'sites.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-commonHeader("A Tourist's Guide");
+site_header("A Tourist's Guide");
 ?>
 
 <h1>
@@ -166,4 +166,4 @@ commonHeader("A Tourist's Guide");
  development sources.
 </p>
 
-<?php commonFooter(); ?>
+<?php site_footer(); ?>
diff --git a/sitewide.css b/sitewide.css
index 8883e2043..2345f9a1b 100644
--- a/sitewide.css
+++ b/sitewide.css
@@ -35,10 +35,29 @@ h2 { font-size: 125%; }
 h3 { font-size: 110%; }
 h4 { font-size: 100%; }
 
+input.max, textarea.max, select.max {
+	width: 100%;
+}
+
 img {
 	border: 0px;
 }
 
+div.tip {
+	border: 1px solid #0000cc;
+	color: #000066;
+	background-color: #eeeeff;
+	padding: 0px 8px;
+}
+
+p.formerror, div.warn {
+	border: 1px solid #666600;
+	color: #660000;
+	background-color: #ffeeee;
+	margin: 4px;
+	padding: 6px;
+}
+
 /* Content are styles ----------------------------------------------------- */
 #content {
 	padding: 10px;
@@ -159,3 +178,22 @@ div.phpcode span.string {
 	color: #DD0000;
 	background-color: transparent;
 }
+
+/* Standard tables -------------------------------------------------------- */
+table.standard td {
+	background-color: #eeeeee;
+	color: inherit;
+}
+table.standard th {
+	background-color: #cccccc;
+	color: inherit;
+}
+table.standard td.sub, table.standard th.sub,
+table.standard th.subr {
+	background-color: #dddddd;
+	color: inherit;
+}
+table.standard th.subr {
+	text-align: right;
+	vertical-align: top;
+}