diff --git a/Shorewall-Website/Shorewall_index_frame.htm b/Shorewall-Website/Shorewall_index_frame.htm
index 254bf6614..68c0e07ca 100644
--- a/Shorewall-Website/Shorewall_index_frame.htm
+++ b/Shorewall-Website/Shorewall_index_frame.htm
@@ -16,7 +16,7 @@
 <ul class="menu">
 
    <li> <a href="index.htm" target="_top">Home</a></li>
-   <li> <a href="News.htm">News and Announcements</a></li>
+   <li> <a href="News.htm">News&nbsp;and&nbsp;Announcements</a></li>
    <li> <a href="Introduction.html">Introduction</a> </li>
    <li> <a href="shorewall_prerequisites.htm">Requirements</a> </li>
    <li> <a href="shorewall_features.htm">Features</a></li>
@@ -28,7 +28,7 @@
    <li> <a href="errata.htm">Errata</a></li>
    <li> <a href="upgrade_issues.htm">Upgrade&nbsp;Issues</a></li>
    <li> <a href="troubleshoot.htm">Troubleshooting</a></li>
-   <li> <a href="support.htm">Getting Help</a></li>
+   <li> <a href="support.htm">Getting&nbsp;Help</a></li>
 
 </ul>
 
@@ -46,18 +46,18 @@
 
 <p class="copyright">
 
-<a href="copyright.htm">Copyright&copy; 2001-2004<br />
+<a href="copyright.htm">Copyright&copy;&nbsp;2001-2005<br />
 Thomas&nbsp;M.&nbsp;Eastep</a>
 
 </p>
 
 <!-- shorewall logo -->
 
-<img src="images/ProtectedBy.png" width="144" height="30" align="left" border="0" /></br><br />
+<img src="images/ProtectedBy.png" width="144" height="30" align="left" border="0" /><br /><br />
 
 <p class="copyright">
+
 Please&nbsp;report&nbsp;errors&nbsp;<br />on&nbsp;this&nbsp;site&nbsp;to 
 <a href="mailto:webmaster@shorewall.net?subject=Website%20Comments">the&nbsp;Webmaster</a></p>
-
 </body>
 </html>
diff --git a/Shorewall-Website/Shorewall_sfindex_frame.htm b/Shorewall-Website/Shorewall_sfindex_frame.htm
index 007193da7..d606a9415 100644
--- a/Shorewall-Website/Shorewall_sfindex_frame.htm
+++ b/Shorewall-Website/Shorewall_sfindex_frame.htm
@@ -1,108 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-  <meta content="en-us" http-equiv="Content-Language">
-  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-  <title>Shorewall Index</title>
-  <base target="main">
+
+<title>Shorewall</title>
+<meta name="author" content="Cristian Rodriguez R." />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="./shorewall.css" title="Default" media="screen" />
+<base target="main">
 </head>
-<body style="background-color: rgb(51, 102, 255); color: rgb(0, 0, 0);"
- alink="#0000ee" link="#0000ee" vlink="#551a8b">
-<a href="index.htm" target="_top" style="font-weight: bold;"><font
- color="#ffffff">1. Home</font></a><font color="#ffffff"><br>
-<a href="News.htm" style="font-weight: bold;"><font color="#ffffff">2.
-News
-and Announcements</font></a><br>
-<a href="Introduction.html" style="color: rgb(255, 255, 255);"><span
- style="font-weight: bold;">3. Introduction</span></a><br>
-<a href="download.htm" style="font-weight: bold;"><font color="#ffffff">4.
-Download</font></a><font color="#ffffff"><br>
-<a href="Install.htm"><span style="font-weight: bold;"><font
- color="#ffffff">5. Installation</font></span></a>
-<font color="#ffffff"><br>
-<b><a href="Documentation_Index.html"><font color="#ffffff">6.
-Documentation</font></a></b><font color="#ffffff"><br>
-<a href="FAQ.htm"><font color="#ffffff"><span style="font-weight: bold;">7.
-FAQ</span>s</font></a><br>
-<a href="troubleshoot.htm"><font color="#ffffff"><span
- style="font-weight: bold;">8. Troubleshooting</span></font></a><font
- color="#ffffff"><br>
-<a href="support.htm"><font color="#ffffff"><span
- style="font-weight: bold;">9. Support</span></font></a> (Read this
-before
-asking for help)<br>
-<font color="#ffffff"><br>
-<a href="shoreline.htm"><font color="#ffffff">A. About the Author</font></a><font
- color="#ffffff"> <br>
-<a target="_top" href="http://sourceforge.net/cvs/?group_id=22587"><font
- color="#ffffff">B. CVS
-Repository</font></a><font color="#ffffff"><br>
-<a href="shorewall_index.htm#Donations"><font color="#ffffff">C.
-Donations</font></a><font color="#ffffff"><br>
-<a href="errata.htm"><font color="#ffffff">D. Errata</font></a><font
- color="#ffffff"><br>
-<a href="shorewall_features.htm"><font color="#ffffff">E. Features</font></a><font
- color="#ffffff"> <font color="#ffffff"><br>
-<a href="LinuxFest.pdf"><font color="#ffffff">F. LinuxFest NW 2005
-Presentation</font></a><font color="#ffffff"> <font color="#ffffff"><br>
-<a href="shorewall_mirrors.htm"><font color="#ffffff">G. Mirrors</font></a><font
- color="#ffffff"> <br>
-<a href="News.htm"><font color="#ffffff">H. News Archive</font></a><font
- color="#ffffff"><br>
-<a href="quotes.htm"><font color="#ffffff">I. Quotes from Users</font></a><font
- color="#ffffff"><br>
-<a href="shorewall_prerequisites.htm"><font color="#ffffff">J.
-Requirements</font></a><font color="#ffffff"><br>
-<a href="upgrade_issues.htm"><font color="#ffffff">K. Upgrade
-Issues</font></a><font color="#ffffff"><br>
-<a href="useful_links.html"><font color="#ffffff">L. Useful Links</font></a><font
- color="#ffffff"><br>
-<a href="Shorewall_Doesnt.html"><font color="#ffffff">M. What it
-Cannot Do</font></a>
-</font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font>
-<ul>
+
+<body>
+
+<ul class="menu">
+
+   <li> <a href="index.htm" target="_top">Home</a></li>
+   <li> <a href="News.htm">News&nbsp;and&nbsp;Announcements</a></li>
+   <li> <a href="Introduction.html">Introduction</a> </li>
+   <li> <a href="shorewall_prerequisites.htm">Requirements</a> </li>
+   <li> <a href="shorewall_features.htm">Features</a></li>
+   <li> <a href="Shorewall_Doesnt.html">What&nbsp;it&nbsp;Cannot&nbsp;Do&nbsp;</a></li>
+   <li> <a href="download.htm">Download</a></li>
+   <li> <a href="Install.html">Installation/<br />Upgrade</a></li>    
+   <li> <a href="FAQ.htm"> FAQs </a></li>
+   <li> <a href="Documentation_Index.html">Documentation</a></li>
+   <li> <a href="errata.htm">Errata</a></li>
+   <li> <a href="upgrade_issues.htm">Upgrade&nbsp;Issues</a></li>
+   <li> <a href="troubleshoot.htm">Troubleshooting</a></li>
+   <li> <a href="support.htm">Getting&nbsp;Help</a></li>
+
 </ul>
-<p><font color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><a href="copyright.htm"><font
- size="2"><font color="#ffffff">Copyright ©
-2001-2004</font></font></a><font size="2"><br>
-<a href="copyright.htm"><font size="2"><font color="#ffffff">Thomas
-M. Eastep.</font></font></a><font size="2"><br>
-</font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></p>
-<div style="text-align: left;">
-<div style="text-align: left;">
-<h1 align="center"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font =""><b><a href="http://www.sf.net"><img
- alt="SourceForge Logo"
- src="http://sourceforge.net/sflogo.php?group_id=22587&amp;type=1" title=""
- style="border: 0px solid ; width: 88px; height: 31px;" align="left"></a></b><br>
-</font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></h1>
-</div>
-</div>
-<p><font color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
- size="2">Please report errors&nbsp; on this site
-to <a href="mailto:webmaster@shorewall.net"
- style="color: rgb(255, 255, 255);">the Webmaster.</a><br>
-<a href="copyright.htm"> </a> </font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></p>
+
+<ul class="submenu">
+ 
+   <li> <a href="shoreline.htm">About&nbsp;The&nbsp;Author</a></li>
+   <li> <a href="http://sourceforge.net/cvs/?group_id=22587" target="_blank">CVS&nbsp;Repository</a></li>
+   <li> <a href="shorewall_mirrors.htm">Mirrors</a></li>
+   <li> <a href="shorewall_index.htm#Donations">Donations</a></li>
+   <li> <a href="quotes.htm"> Quotes&nbsp;from&nbsp;Users</a></li>
+   <li> <a href="LinuxFest.pdf">LinuxFest&nbsp;NW&nbsp;2005<br />Presentation</a> </li>
+   <li> <a href="useful_links.html">Useful&nbsp;Links</a></li>
+
+</ul>
+
+<p class="copyright">
+
+<a href="copyright.htm">Copyright&copy;&nbsp;2001-2005<br />
+Thomas&nbsp;M.&nbsp;Eastep</a>
+
+</p>
+
+<!-- sourceforge logo -->
+
+<img src="http://sourceforge.net/sflogo.php?group_id=22587&amp;type=1" width="88" height="31" align="left" border="0" /><br /><br />
+
+<p class="copyright">
+
+Please&nbsp;report&nbsp;errors&nbsp;<br />on&nbsp;this&nbsp;site&nbsp;to 
+<a href="mailto:webmaster@shorewall.net?subject=Website%20Comments">the&nbsp;Webmaster</a></p>
 </body>
 </html>
