commit a first pass at an actual complete-ish site!

17 files changed, 671 insertions, 473 deletions

diff --git a/about.html b/about.html
index eeb70e2..86e3e89 100644
--- a/about.html
+++ b/about.html
@@ -4,11 +4,10 @@
 <title>About Freeside Internet Services, Inc.</title>
 { include('elements/header.html'); }
 
-<div id="header3"></div>
-<div id="content1">
- <h6>About Freeside Internet Services, Inc. and the Freeside project</h6>
+<div id="content">
+ <center><h6>About Freeside Internet Services, Inc. and the Freeside project</h6></center>
  <img src="imgs/freesideworld.gif" width="229" height="256" class="rightFloat">
-  <p>Freeside had its start as an internal application for a large regional ISP in 1996 and 1997.  In 1998, after obtaining copyright to the code from his former employer, Ivan Kohler releaesd the first open-source verson of the code.
+  <p>Freeside had its start as an internal application for a large regional ISP in 1996.  In 1998, after obtaining copyright to the code from his former employer, Ivan Kohler releaesd the first open-source verson of the code.
   Growing demand for commercial support and services prompted him to start providing Freeside consulting full-time in 2001.
   <p>Freeside Internet Services, Inc. was incorporated in 2005 and now has a full-time staff of several programmers.  The company provides consulting services, pre-configured hardware, support, customization and training for the Freeside billing system and other aspects of ISP and network operations.  Freeside Internet Services, Inc. is a privately held California corporation.
   <p>
diff --git a/contact.html b/contact.html
index fdcdc5a..086d1a3 100644
--- a/contact.html
+++ b/contact.html
@@ -6,35 +6,43 @@
 
 <div id="header3"></div>
 
-<div id="content1"> 
-  <h6>Contact a Freeside Representative.</h6>
-  <p><b><img src="imgs/phone.gif" alt="Let us help you with your questions" width="145" height="135" align="left" class="leftFloat">Sales 
-    Support : Questions about buying a Freeside product? Unsure which system you 
-    need?<br>
-    <br>
-    Customer Service : Get help with account maintenance, orders, delivery, and 
-    rebates.<br>
-    <br>
-    Technical Support : For Technical Support or for Software &amp; Technical 
-    questions.<br>
-    <br>
-    Financing Support: Find answers to financing questions, obtain a statement 
-    copy and make a payment.</b></p>
-  <table width="359" border="0" cellpadding="10">
+<div id="content"> 
+  <center><h6>Contact us</h6></center>
+
+  <p>
+  
+  <img src="imgs/phone.gif" alt="" width="145" height="135" align="left" class="rightFloat">
+
+  <table>
     <tr>
-      <td width="50" height="18" align="right" valign="top"><b>Contact: </b></td>
-      <td width="208" align="left" valign="top"><b>Ivan Kohler</b><br>
-        Email: ivan@sisd.com<br>
-        Phone: +1 415 462 1624 </td>
+
+      <td valign="top" STYLE="padding-right:64px">
+
+        <h4>Phone</h4>
+          +1&nbsp;415&nbsp;462&nbsp;1624<br><br>
+
+        <h4>Fax</h4>
+          +1&nbsp;866&nbsp;491&nbsp;2775<br><br>
+
+        <h4>Mailing&nbsp;address</h4>
+          Freeside&nbsp;Internet&nbsp;Services,&nbsp;Inc.<br>
+          12515&nbsp;Northwoods&nbsp;Blvd.<br>
+          Unit&nbsp;#1<br>
+          Truckee,&nbsp;CA&nbsp;&nbsp;96161<br>
+
+      </td>
+
+      <td valign="top">
+
+        <h4>Sales</h4>
+          <a href="mailto:sales@sisd.com">sales@sisd.com</a><br><br>
+
+        <h4>Support</h4>
+          <a href="mailto:freeside-support@sisd.com">freeside-support@sisd.com</a><br><br>
+
     </tr>
   </table>
-  <p>&nbsp;</p>
-  <p>&nbsp;</p>
-  <p>&nbsp;</p>
-  <p>&nbsp;</p>
-  <p>&nbsp;</p>
-  <p><br>
-  </p>
+
 </div>
 
 { include('elements/footer.html'); }
diff --git a/css/cssfreeside2.css b/css/cssfreeside2.css
index 778fb74..43eb5a6 100644
--- a/css/cssfreeside2.css
+++ b/css/cssfreeside2.css
@@ -45,7 +45,7 @@
 #header2 { /*main navigation*/
 	clear: both;
 	margin: 0;
-	padding-top: .5em;
+	padding-top: .25em;
 	padding-bottom: .5em;
 	background: #959494;
 	border-bottom: 1px solid black;
@@ -78,19 +78,6 @@
 
  
 
-#header3 { /*sub navigation*/
-	clear: both;
-	margin: 0;
-	padding-top: .5em;
-	padding-bottom: .5em;
-	background: #5E355D;
-	border-bottom: 1px solid black;
-	border-right: 0;
-	border-left: 0;
-	text-align: left;
-	} 
-
-
 #nav_sub {
 	color: #ffffff;
 	text-align: left;
@@ -143,9 +130,9 @@ letter-spacing: 0.02em;
 
 * { /*global content*/
 
-	font-family: Verdana, Arial, Sans-serif;
+	font-family: Verdana, Arial, sans-serif;
 	font-color: #666666;
-	font-size: 11px;
+	font-size: 12px;
 	padding: 0;
 	
 	}
@@ -160,9 +147,8 @@ ul {
 	margin-left: 1.8em;
 }
 
-
-
-
+#content_none {
+}
 
 #content1 {
 	clear: both;
@@ -171,13 +157,10 @@ ul {
 	padding-right: 10px;
 	padding-left: 10px;
 	padding-bottom: .5em;
-	border-bottom: 1px solid black;
 	border-right: 0;
 	border-left: 0;
-	text-align: left;
-	background-image: ;
-	background-repeat: repeat-y;
-	background-position: right;
+	/* text-align: left; */
+	text-align: center;
 }
 
 #content_prd {
@@ -187,15 +170,23 @@ ul {
 	padding-right: 10px;
 	padding-left: 10px;
 	padding-bottom: .5em;
-	border-bottom: 1px solid black;
 	border-right: 0;
 	border-left: 0;
 	text-align: center;
-	background-image: ;
-	background-repeat: repeat-y;
-	background-position: right;
 }
 
+#content {
+	clear: both;
+	margin: 0;
+	padding-top: .5em;
+	padding-right: 10px;
+	padding-left: 10px;
+	padding-bottom: .5em;
+	border-right: 0;
+	border-left: 0;
+	/* text-align: left; */
+	text-align: left;
+}
 
 
 .crossout {
@@ -206,8 +197,8 @@ ul {
 
 #footer  {
 	clear: both;
-	border-top: 1px solid #333;
-	padding: .5em;
+	border-top: 1px solid black;
+	padding: .25em;
 	margin: 0;
 	margin-top: 2px;
 	text-align: center;
@@ -314,7 +305,7 @@ b.h4 {
 
 	}
 
-h5 {
+/* h5 {
 	font: Verdana, Arial, sans-serif;
         font-weight: bold;
 	font-size: 120%;
@@ -323,6 +314,25 @@ h5 {
 	margin: 5px;
 	margin-left: 10px;
 }
+*/
+
+b.h5 {
+ color: #401D4B;
+
+}
+
+h5 { 
+	font: Verdana, Arial, sans-serif;
+        font-weight: bold;
+	font-size: 200%;
+	color: #5E355D;
+	padding: 0;
+	margin: .5em;
+	margin-left: 0em;
+	/* line-height: 1.4em */
+	
+
+	}
 
 b.h6 {
  color: #401D4B;
@@ -336,9 +346,9 @@ h6 {
 	color: #5E355D;
 	padding: 0;
 	margin: .5em;
-	margin-left: .2em;
+	margin-left: 0em;
 	margin-right: .5em;
-	line-height: 1.4em
+	/* line-height: 1.4em */
 	
 
 	}
@@ -399,8 +409,8 @@ body {
 
 
 table.tblprod {
-	width: 900px;
-	height: 992px;
+	/* width: 900px; */
+	/* height: 992px; */
 	border-width: thin thin thin thin;
 	border-spacing: 15px;
 	border-style: none;
@@ -408,8 +418,7 @@ table.tblprod {
 	border-collapse: collapse;
 	align: center;
 	
-	background-image: url(../imgs/bk/dkgrysq.gif);
-	background-repeat: no-repeat;
+        background-color: #A3A3A3;
 	-moz-border-radius: 30px 30px 30px 30px;
 }
 table.tblprod th {
@@ -427,23 +436,24 @@ table.tblprod th {
 table.tblprod td {
 	border-width: 1px 1px 1px 1px;
 	padding: 5px 5px 5px 5px;
-	border-style: none ;
+	border-style: none;
 	border-color: gray gray gray gray;
-	background-color: ;
+	/* background-color: ; */
 	
 }
 
 table.tblprod_insd {
-	width: 864px;
-	height: 950px;
+	/* width: 864px; */
+	/* height: 950px; */
 	border-width: thin thin thin thin;
 	border-spacing: 15px;
 	border-style: none;
 	border-color: none gray none gray;
 	border-collapse: collapse;
 
-	margin-top: 15px;
-	background-image: url(../imgs/bk/whitesq.gif);
+	/* margin-top: 15px; */
+	/* background-image: url(../imgs/bk/whitesq.gif); */
+        background-color: #ffffff;
 	background-repeat: no-repeat;
 	-moz-border-radius: 30px 30px 30px 30px;
 }
@@ -469,7 +479,7 @@ table.tblprod_insd td {
 }
 
 table.tblprod_insdlist {
-	width: 800px;
+	/* width: 800px; */
 	border-width: thin thin thin thin;
 	border-spacing: 15px;
 	border-style: none;
@@ -477,13 +487,13 @@ table.tblprod_insdlist {
 	border-collapse: collapse;
 
 	margin-top: 10px;
-	
+	margin-bottom: 10px;
 	background-repeat: no-repeat;
 	
 }
 table.tblprod_insdlist th {
 	border-width: 1px 1px 1px 1px;
-	padding: 3px 10px 10px 10px;
+	/* padding: 3px 10px 10px 10px; */
 	border-style: none none none none;
 	border-color: #999 gray #999 gray;
 	background-color: none;
@@ -495,7 +505,7 @@ table.tblprod_insdlist th {
 
 table.tblprod_insdlist td {
 	border-width: 2px 2px 2px 2px;
-	padding: 10px 10px 10px 10px;
+	/* padding: 10px 10px 10px 10px; */
 	border-style: none none none solid;
 	border-color: #fff;
 	background-color: ;
@@ -552,22 +562,20 @@ table.servteal th {
 	padding: 10px 10px 10px 10px;
 	border-style: none none none none;
 	border-color: #999 gray #999 gray;
-	background-image: url(../imgs/bk/grad1.gif);
-	background-repeat: repeat-y;
-margin-left: 10px;
+        margin-left: 10px;
 	text-align: left bottom;
 }
 
 table.servpurp{
 	width: 100%;
 	border-width: thin thin thin thin;
-	border-spacing: 10px;
+	border-spacing: 4px;
 	border-style: none;
 
 	border-collapse: seperate;
 
 	margin-left:0px;
-	margin-top: 10px
+	/* margin-top: 10px */
 }
 
 table.serv {
@@ -598,8 +606,7 @@ table.servpurp th {
 	padding: 1px 1px 1px 1px;
 	border-style: none none none none;
 	border-color: #999 gray #999 gray;
-	background-image: url(../imgs/bk/grad2.gif);
-	background-repeat: repeat-y;
+        background-color: #60385F;
 
 	text-align: left bottom;
 }
@@ -610,9 +617,8 @@ table.servpurp td {
 	padding: 5px 5px 5px 5px;
 	border-style: none none none solid;
 	border-color: gray gray gray gray;
-	background-color: none;
-	background-image: url(../imgs/bk/grad3.gif);
-	background-repeat: repeat-y;
+        /* background-color: #919090; */
+        background-color: #ffffff;
 }
 
 table.demo {
@@ -625,8 +631,9 @@ table.demo {
 	border-collapse: seperate;
 	background-color: ;
 	margin-left:30px;
-	background-image: url(../imgs/bk/s.gif);
+	/* background-image: url(../imgs/bk/s.gif);
 	background-repeat: no-repeat;
+        */
 }
 table.demo th {
 	border-width: 1px 1px 1px 1px;
@@ -636,6 +643,7 @@ table.demo th {
 	background-color: ;
 	-moz-border-radius: 6px 6px 6px 6px;
 	text-align: left bottom;
+        font-weight: normal;
 }
 
 
@@ -651,22 +659,18 @@ table.demo td {
 table.dev {
 
 	border-width: thin thin thin thin;
-	border-spacing: 10px;
+	/* border-spacing: 10px; */
 	border-style: none;
 	border-color: gray gray gray gray;
-	border-collapse: seperate;
-	background-color: ;
-	margin-left:30px
+ 	border-collapse: seperate;
 }
 table.dev th {
-	border-width: 1px 1px 1px 1px;
+/*	border-width: 1px 1px 1px 1px;
 	padding: 5px 5px 5px 5px;
 	border-style: solid none none none;
 	border-color: #999 gray #999 gray;
-	background-color: #B6B5B5;
-	background-image: url(../imgs/bk/grad1_sm.gif);
-	background-repeat: repeat-y;
-
+        */
+	background-color: #60385F;
 	text-align: left bottom;
 }
 
@@ -674,8 +678,7 @@ table.dev th {
 table.dev td {
 	border-width: 1px 1px 1px 1px;
 	padding: 5px 5px 5px 5px;
-	border-style: none solid none solid;
+	border-style: none solid solid solid;
 	border-color: gray gray gray gray;
-	background-color: #ccc;
-
+	background-color: #ffffff;
 }
diff --git a/cvs.html b/cvs.html
new file mode 100644
index 0000000..6333e3c
--- /dev/null
+++ b/cvs.html
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>Anonymous CVS access</title>
+
+{ include('elements/header.html'); }
+
+<div id="content">
+
+<h6>Anonymous CVS access</h6>
+
+<table bgcolor="#eeeeee">
+<tr><td>
+<i><b>Jun 30 2005</b> Note: the CVS tree has moved from <b>pouncequick.420.am</b> to <b>cvs.420.am</b>.
+To convert an existing checkout, change to the freeside directory
+and use this command: </i>
+<pre>
+  for a in `find . -name Root -depth -print`; do
+    perl -pi -e 's/pouncequick\.420\.am/cvs.420.am/;' $a
+  done
+</pre>
+</td></tr>
+</table>
+
+<br>
+<table bgcolor="#eeeeee">
+<tr><td>
+<i><b>Jan 24 2006</b> Active branches are now HEAD and FREESIDE_1_5_BRANCH.  Users accustomed to the relative stability of CVS HEAD in the last few years may wish to make sure they move from HEAD to FREESIDE_1_5_BRANCH: </i>
+<pre>
+  cd freeside
+  cvs update -r FREESIDE_1_5_BRANCH -d -P
+</pre>
+</td></tr>
+</table>
+
+<p>Anonymous <a href="http://www.cvshome.org">CVS</a> access to development
+versions of the Freeside source code is available.  You need CVS version 1.10
+or higher.
+
+<p>There are two active branches at this time: the default HEAD and
+FREESIDE_1_5_BRANCH.  You can specify the FREESIDE_1_5_BRANCH with the <code>-r FREESIDE_1_5_BRANCH</code> option to <code>cvs checkout</code>.
+
+<p>Your CVSROOT should be set to:
+<pre>
+:pserver:anonymous@cvs.420.am:/home/cvs/cvsroot
+</pre>
+<p>The password for the user `anonymous' is `anonymous'.  The current tree is
+available as module `freeside'. 
+
+<p>So, to check out the current tree, you would do (sh/bash/ksh/zsh/etc.):
+<pre>
+$ export CVSROOT=":pserver:anonymous@cvs.420.am:/home/cvs/cvsroot"
+$ cvs login
+(Logging in to anonymous@cvs.420.am)
+CVS password:
+$ cvs checkout -r FREESIDE_1_5_BRANCH freeside
+</pre>
+or (csh/tcsh/etc.):
+<pre>
+% setenv CVSROOT ":pserver:anonymous@cvs.420.am:/home/cvs/cvsroot"
+$ cvs login
+(Logging in to anonymous@cvs.420.am)
+CVS password:
+$ cvs checkout -r FREESIDE_1_5_BRANCH freeside
+</pre>
+
+</div>
+
+{ include('elements/footer.html'); }
diff --git a/demo.html b/demo.html
index 143aee1..0b123c3 100644
--- a/demo.html
+++ b/demo.html
@@ -6,51 +6,81 @@
 
 <div id="header3"></div>
 <div id="content1"> 
-  <h6>Check Out Freeside's Web Demos</h6>
-  <table width="85%" align="center"   cellpadding="0" cellspacing="0" background="imgs/bk/s.gif"    class="demo">
-    <tr> 
-      <th height="50"  valign="middle">&nbsp;</th>
+  <h6>Online and downloadable demos</h6>
+
+  <!-- <table width="85%" align="center"   cellpadding="0" cellspacing="0" background="imgs/bk/s.gif" class="demo"> -->
+  <table width="85%" align="center"   cellpadding="0" cellspacing="0" class="demo">
+
     <tr> 
-      <th  valign="middle"><table cellspacing="0" cellpadding="0">
+      <th valign="middle">
+        <table cellspacing="0" cellpadding="0">
           <tr> 
-            <th align="right" valign="top"><img src="imgs/webdemo/backoffice_shd.gif"></td> 
-            <th height="*" align="left" valign="top" > <h5>Back Office:</h5>
-              <p> An easy to use sign up form for convience is provided by freeside 
-                software. Straight forward and familiar.</p>
-              <p><a href="http://webdemo.sisd.com/selfserv/signup.cgi" target="_top">Check 
-                it out!</a> </p></th>
+            <td align="right" valign="top"><a href="http://webdemo.sisd.com:81/freeside/" target="_top"><img border=0 src="imgs/webdemo/backoffice_shd.gif"></a></td> 
+            <th align="left" valign="top">
+              <h5>Back office</h5>
+              <h6>Billing, ticketing, reporting and configuration for employees and resellers</h6>
+              <p>The majority of Freeside's functionality is accessed from here.  The back office interface includes searching and viewing of customers, invoices, trouble tickets and services, as well as reporting, configuration, per-user access control, resellser virtualization and more.</p>
+              <p>Log on with Username: <b>guest</b> and Password: <b>guest</b> when prompted
+              <p><a href="http://webdemo.sisd.com:81/freeside/" target="_top">Check 
+                it out!</a> </p>
+            </td>
           </tr>
-        </table></th>
+        </table>
+      </th>
+    </tr>
+
     <tr> 
-      <th  valign="middle"><table cellspacing="0" cellpadding="0">
+      <th valign="middle">
+        <table cellspacing="0" cellpadding="0">
           <tr> 
-            <th width="753" align="left"> <h5>Self-Service: </h5>
-              <p><a href="http://webdemo.sisd.com/selfserv/selfservice.cgi" target="_top">Check 
-                it out!</a> </p></th>
-            <th align="left" valign="top" > <p> <img src="imgs/webdemo/selfservice.gif"></p></th>
+            <td align="left" valign="top" ><a href="http://webdemo.sisd.com/selfserv/selfservice.cgi" target="_top"><img border=0 src="imgs/webdemo/selfservice.gif"></a></td>
+            <th align="left" valign="top">
+              <h5>Self-Service</h5>
+              <h6>Template-able customer self-care interface and API</h6>
+              <p>Customer self-care including invoice viewing, one-time and recurring payments, adding and removing services, and password changes.
+              <p><a href="http://webdemo.sisd.com/selfserv/selfservice.cgi" target="_top">Check it out!</a> </p>
+            </th>
           </tr>
-        </table></th>
-    <tr> 
-      <th height="80"><img src="imgs/bk/spacer.gif" width="1" height="100"></th>
+        </table>
+      </th>
+    </tr>
+
     <tr> 
-      <th  valign="middle"><table cellspacing="0" cellpadding="0">
+      <th valign="middle">
+        <table cellspacing="0" cellpadding="0">
           <tr> 
-            <th align="right" valign="top"><img src="imgs/webdemo/signup_shd.gif"></th>
-            <th height="*" align="left" valign="top" > <h5>Sign-Up:</h5>
-              <p> An easy to use sign up form for convience is provided by freeside 
-                software. Straight forward and familiar.</p>
+            <td align="right" valign="top"><a href="http://webdemo.sisd.com/selfserv/signup.cgi" target="_top"><img border=0 src="imgs/webdemo/signup_shd.gif"></a></td>
+            <th align="left" valign="top"><h5>Sign-Up</h5>
+            <h6>Template-able online signup page and API</h6>
+              <p>Customer signup page with immediate credit card authorization and provisioning</p>
               <p><a href="http://webdemo.sisd.com/selfserv/signup.cgi" target="_top">Check 
-                it out!</a> </p></th>
+                it out!</a> </p>
+            </th>
           </tr>
-        </table></th>
-    <tr>
-      <th height="80"  valign="middle">&nbsp;</th>
-    
+        </table>
+      </th>
+    </tr>
+
+    <tr> 
+      <th valign="middle">
+        <table cellspacing="0" cellpadding="0">
+          <tr> 
+            <td align="right" valign="top"><img border=0 src="imgs/webdemo/vmware_shd.gif"></td>
+            <th align="left" valign="top"><h5>Downloadable demo</h5>
+            <h6>A downloadable VMWare virtual appliance</h6>
+              <ul>
+                <li><a href="http://www.vmware.com/download/player/">VMWare player</a> for Windows or Linux is required (free download)<br><br>
+                <li><b>Freeside-Appliance-1.7.2.zip</b>&nbsp;(302mb)<br><a href="Freeside-Appliance-1.7.2.zip">direct&nbsp;download</a> or <a href="Freeside-Appliance-1.7.2.zip.torrent">bittorrent download</a><br><br>
+                <!-- <li>Minimum 512m RAM, 1.5Ghz processor recommended -->
+              </ul>
+            </th>
+          </tr>
+        </table>
+      </th>
+    </tr>
+
   </table>
-  <br><br>
-  <br>
-  <br>
-  <br>
+
 </div>
 
 { include('elements/footer.html'); }
diff --git a/developers.html b/developers.html
index 1ba67e8..209141c 100644
--- a/developers.html
+++ b/developers.html
@@ -4,93 +4,122 @@
 <title>Freeside Developers and Open-Source Community</title>
 { include('elements/header.html'); }
 
-<div id="header3"></div>
 <div id="content1"> 
   
- 
-  <table width="100%" border="0" cellpadding="0" cellspacing="0" >
-    <tr>
-      <td align="left" valign="top"><h6>Developers Welcome!</h6></td>
-      <td align="left" valign="top">&nbsp;</td>
-      <td align="right" valign="bottom">&nbsp;</td>
-    </tr>
+  <h6>Developers and Open-Source Community</h6>
+
+  <table width="100%" border="0" cellpadding="0" cellspacing="16" >
     <tr> 
-      <td width="31%" align="left" valign="top"> <table  cellpadding="0" cellspacing="0"  class="dev">
+      <td align="left" valign="top" rowspan=2>
+
+        <table width="100%" cellpadding="0" cellspacing="0"  class="dev">
           <tr> 
             <th align="left"> 
-              <h3>RESOURCES</h3></th>
+              <h3>DOWNLOADS</h3></th>
           </tr>
           <tr> 
-            <td align="left" valign="top" bgcolor="#CCCCCC"> <ul>
-                <li> 
-                  <!--a href="http://pouncequick.420.am:81/rt/"-->
-                  Feature/bug database <i> (temporarily offline)</i> 
-                  <!--  <tr><td><ul><li>Feature/bug database (down for relocation until Nov. 18th) -->
-                <li><A HREF="/cgi-bin/viewcvs.cgi/freeside">Browse the CVS tree 
-                  via viewcvs</A> 
-                <li><A HREF="cvs.html">Instructions on accessing the development 
-                  tree with CVS</A> 
-                <li> 
-                  <!--a href="search-devel-list-archive.html"-->
-                  Search <i> (temporarily offline)</i> or <a href="/pipermail/freeside-devel/">browse</a> 
-                  the developer mailing list archive. 
-                <li>Subscribe to the development list (<b>not for user support!</b>) 
-                  by sending a blank message to <a href="mailto:freeside-devel-subscribe@sisd.com">freeside-devel-subscribe@sisd.com</a> 
-                  <!--  <li>#freeside on <a href="http://openprojects.net/irc_servers.shtml">Open Projects IRC network</a>-->
-                <li>#freeside on <a href="http://www.oftc.net/oftc/infrastructure/">OFTC</a> 
-              </ul></td>
+            <td align="left" valign="top">
+              Source code
+                <ul>
+                  <li>Current: <a href="freeside-1.7.2.tar.gz">freeside-1.7.2.tar.gz</a></li>
+                  <li>Maintenance: <a href="freeside-1.5.8.tar.gz">freeside-1.5.8.tar.gz</a></li>
+                  <li>CVS snapshot: <a href="/cgi-bin/viewcvs.cgi/freeside.tar.gz?view=tar">freeside-snapshot.tar.gz</a></li>
+                </ul>
+              
+              Virtual appliance
+                <ul>
+                  <li><a href="http://www.vmware.com/download/player/">VMWare player</a> for Windows or Linux is required (free download)<br><br>
+                  <li><b>Freeside-Appliance-1.7.2.zip</b>&nbsp;(302mb)<br><i>Full demo verison including browser</i><br><a href="Freeside-Appliance-1.7.2.zip">direct&nbsp;download</a> or <a href="Freeside-Appliance-1.7.2.zip.torrent">bittorrent download</a><br><br>
+                  <li><b>Freeside-Appliance-Headless-1.7.2.zip</b>&nbsp;(206mb)<br><i>Console-only without X window system or browser</i><br><a href="Freeside-Appliance-Headless-1.7.2.zip">direct&nbsp;download</a> or <a href="Freeside-Appliance-Headless-1.7.2.zip.torrent">bittorrent download</a>
+                </ul>
+                
+              </td>
           </tr>
         </table>
-        <br> <table  cellpadding="0" cellspacing="0"  class="dev">
+        <br>
+
+        <table width="100%" cellpadding="0" cellspacing="0"  class="dev">
           <tr> 
             <th align="left"> 
-              <h3>DOWNLOADS</h3></th>
+              <h3>DEVELOPERS</h3></th>
           </tr>
           <tr> 
-            <td align="left" valign="top" bgcolor="#CCCCCC"> <ul>
-                <li>Maintenance: <a href="http://www.sisd.com/freeside/freeside-1.5.8.tar.gz" target="_blank">freeside-1.5.8.tar.gz</a></li>
-              </ul><br></td>
+            <td align="left" valign="top">
+              CVS
+                <ul>
+                  <li><A HREF="/cgi-bin/viewcvs.cgi/freeside">Browse the CVS tree via viewcvs</A> 
+                  <li><A HREF="cvs.html">Instructions on accessing the development tree with CVS</A> 
+                </ul>
+              Developer mailing list
+                <ul> 
+                  <li><a href="/cgi-bin/search.cgi">Search</a> the developer mailing list
+
+                  <li><a href="/pipermail/freeside-devel/">Browse</a> the developer mailing list archive
+                  <li><a href="/listinfo/freeside-devel/">Subscribe</a> to the development list (<b>not for user support!</b>) 
+                </ul>
+              CVS commits mailing list
+                <ul> 
+                  <li><a href="/cgi-bin/search.cgi">Search</a> the CVS commits mailing list
+
+                  <li><a href="/pipermail/freeside-commits/">Browse</a> the CVS commits mailing list archive
+                  <li><a href="/listinfo/freeside-commits/">Subscribe</a> to the CVS commits list
+                </ul>
+              IRC
+                <ul>
+                  <li>#freeside on <a href="http://www.oftc.net/">irc.oftc.net</a> 
+                </ul>
+            </td>
           </tr>
         </table>
-        <br> </td>
-      <td width="32%" align="left" valign="top"><table  cellpadding="0" cellspacing="0"  class="dev">
+
+      </td>
+      <td align="left" valign="top">
+        <table width="100%" cellpadding="0" cellspacing="0"  class="dev">
           <tr> 
             <th align="left"> 
-              <h3>SUPPORT</h3></th>
+              <h3>COMMUNITY SUPPORT</h3></th>
           </tr>
           <tr> 
-            <td align="left" valign="top" bgcolor="#CCCCCC"> <ul>
-                <li><a href="http://www.sisd.com/pipermail/freeside-users/" target="_self">Commercial 
-                  support services are available</a>.</li>
-                <li> <b>New!</b> <a href="/forum">Web forums</A>
-                <li> <a href="support.html" target="_top">Browse</a> the user 
-                  mailing list archive.</li>
-                <li> Subscribe to the user list: first, <a href="http://www.sisd.com/cgi-bin/wiki.pl?Mailing_List_Guidelines" target="_blank">read 
-                  this</a>, then send a blank message to <A HREF="mailto:freeside-users-subscribe@sisd.com">freeside-users-subscribe@sisd.com</A></li>
-                <li> #freeside on <a href="http://www.oftc.net" target="_blank">OFTC</a> 
-                </li>
-              </ul><br></td>
+            <td align="left" valign="top">
+              <b>New!</b>
+                <ul>
+                  <li><a href="/forum">Web forums</A>
+                </ul>
+              User mailing list
+                <ul>
+                  <li><a href="/cgi-bin/search.cgi">Search</a> the user mailing list
+                  <li><a href="/pipermail/freeside-users/">Browse</a> the user 
+                  mailing list archive</li>
+                  <li><a href="/cgi-bin/wiki.pl?Mailing_List_Guidelines">Posting guidelines</a>
+                  <li><a HREF="/listinfo/freeside-users/">Subscribe</a> to the user mailng list</li>
+                </ul>
+              IRC
+                <ul>
+                  <li>#freeside on <a href="http://www.oftc.net">irc.oftc.net</a> 
+                </ul>
+              <br>
+            </td>
           </tr>
         </table>
         <br>
-        <table  cellpadding="0" cellspacing="0"  class="dev">
+        <table width="100%" cellpadding="0" cellspacing="0" class="dev">
           <tr> 
             <th align="left"> 
               <h3>DOCUMENTATION</h3></th>
           </tr>
           <tr> 
-            <td align="left" valign="top" bgcolor="#CCCCCC"> <ul>
-                <li>Current: <a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation" target="_blank">1.7 
-                  documentation</a> (now in the wiki)</li>
-                <li><a href="http://www.sisd.com/mediawiki/index.php/Main_Page" target="_blank">Main 
-                  Wiki page</a>. There is still some useful information in the 
-                  <a href="http://www.sisd.com/cgi-bin/wiki.pl" target="_blank">old 
+            <td align="left" valign="top"> <ul>
+                <li><a href="/mediawiki/index.php/Main_Page" target="_blank">Main Wiki page</a>
+                <li>There is still some useful information in the 
+                  <a href="/cgi-bin/wiki.pl" target="_blank">old 
                   wiki</a> that has not yet been moved over; please feel free 
                   to help with that.</li>
               </ul><br></td>
           </tr>
         </table></td>
-      <td width="37%" align="right" valign="bottom"><img src="imgs/happyprg.gif"></td>
+    </tr>
+    <tr>
+      <td align="center" valign="bottom"><img src="imgs/happyprg.gif"></td>
     </tr>
   </table>
 
diff --git a/elements/footer.html b/elements/footer.html
index 55cf8f8..27d4913 100644
--- a/elements/footer.html
+++ b/elements/footer.html
@@ -1,11 +1,18 @@
 <div id="footer"> 
   <table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
     <tr> 
-      <td align="center" valign="middle"> <div id="footernav" > <a href="index.html">Home</a> 
-          | <a href="products.html">Products</a> | <a href="services.html">Services</a> 
-          | <a href="demo.html">Demo</a> | <a href="developers.html" >Developers</a> 
-          | <a href="about.html">About</a> | <a href="contact.html">Contact</a> 
-        </div></td>
+      <td align="center" valign="middle">
+        <div id="footernav">
+          <a href="index.html">Home</a> |
+          <a href="products.html">Products</a> |
+          <a href="services.html">Services</a> |
+          <a href="demo.html">Demo</a> |
+          <a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation">Documentation</a> |
+          <a href="developers.html" >Developers</a> |
+          <a href="about.html">About</a> | 
+          <a href="contact.html">Contact</a> 
+        </div>
+      </td>
     </tr>
   </table>
 </div></body>
diff --git a/elements/header.html b/elements/header.html
index e58dbc3..f9f51e4 100644
--- a/elements/header.html
+++ b/elements/header.html
@@ -1,5 +1,5 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="Description" content="Open-source billing, trouble ticketing and automation software for ISPs, VOIP providers and online businesses.">
+<meta name="Description" content="Open-source billing, trouble ticketing and automation software for ISPs, VoIP providers and online businesses.">
 <meta name="Keywords" content="billing, open source, ISP, trouble ticketing, VoIP">
 
 <link href="css/cssfreeside2.css" rel="stylesheet" type="text/css" media="screen">
@@ -15,16 +15,24 @@
       <td width="100%" align="left" valign="center">
         <h1>Open-source billing, trouble ticketing 
           and automation</h1><br>
-        <h2>for ISPs, VoIP, service and content providers
+        <h2>for ISPs, VoIP, hosting, service and content providers
           and online businesses</h2>
       </td>
     </tr>
   </table>
 </div>
+
 <div id="header2"> 
-	
-  <div id="nav"> <a href="index.html" id="nav">Home</a> | <a href="products.html" id="nav">Products</a> 
-    | <a href="services.html" id="nav">Services</a> | <a href="demo.html" id="nav">Demo</a> | <a href="developers.html" id="nav">Developers 
-    </a> | <a href="about.html" id="nav">About</a> | <a href="contact.html" id="nav">Contact</a>&nbsp;&nbsp;</div>
+  <div id="nav">
+    <a href="index.html" id="nav">Home</a> |
+    <a href="products.html" id="nav">Products</a> |
+    <a href="services.html" id="nav">Services</a> |
+    <a href="demo.html" id="nav">Demo</a> |
+    <a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation" id="nav">Documentation</a> |
+    <a href="developers.html" id="nav">Developers</a> |
+    <a href="about.html" id="nav">About</a> |
+    <a href="contact.html" id="nav">Contact</a>
+    &nbsp;&nbsp;
+  </div>
 </div>
 
diff --git a/imgs/bk/dkgrysq.gif b/imgs/bk/dkgrysq.gif
deleted file mode 100644
index b87f939..0000000
--- a/imgs/bk/dkgrysq.gif
+++ /dev/null
diff --git a/imgs/bk/grad1.gif b/imgs/bk/grad1.gif
deleted file mode 100644
index d14a821..0000000
--- a/imgs/bk/grad1.gif
+++ /dev/null
diff --git a/imgs/bk/grad1_sm.gif b/imgs/bk/grad1_sm.gif
deleted file mode 100644
index c8b207c..0000000
--- a/imgs/bk/grad1_sm.gif
+++ /dev/null
diff --git a/imgs/bk/grad2.gif b/imgs/bk/grad2.gif
deleted file mode 100644
index 5483900..0000000
--- a/imgs/bk/grad2.gif
+++ /dev/null
diff --git a/imgs/bk/grad3.gif b/imgs/bk/grad3.gif
deleted file mode 100644
index e9509a1..0000000
--- a/imgs/bk/grad3.gif
+++ /dev/null
diff --git a/imgs/bk/whitesq.gif b/imgs/bk/whitesq.gif
deleted file mode 100644
index 49583d6..0000000
--- a/imgs/bk/whitesq.gif
+++ /dev/null
diff --git a/index.html b/index.html
index baff6c1..f6a06db 100644
--- a/index.html
+++ b/index.html
@@ -4,13 +4,12 @@
 <title>Freeside billing and trouble ticketing</title>
 { include('elements/header.html'); }
 	
-<div id="header3"> 
- </div>
-<div id="content">
+<div id="content_none">
  
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr> 
-    <td width="420" align="center" valign="top" bgcolor="#BEBDBD">
+
+    <td width="420" align="center" valign="top" bgcolor="#BEBDBD" STYLE="padding:4px">
 	
       <table width="385" height="*" border="0" cellpadding="0" cellspacing="0">
         <tr> 
@@ -27,17 +26,20 @@
         <tr> 
           <td width="9" height="*" bgcolor="#A5A3A3">&nbsp;</td>
           <td height="*" align="center" valign="top" bgcolor="#A5A3A3"><table width="100%" border="0" cellpadding="2" cellspacing="5">
-<!--              <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b>Feb 7 2007:</b></td>
-                <td width="*">1.6.0 and 1.7.2 released</td>
-              </tr>
--->
               <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b>Feb 7 2007:</b></td>
+                <td width="115" align="right" valign="top"><b>Feb 19 2007:</b></td>
                 <td width="*">New web site!</td>
               </tr>
               <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b>Nov 7-9 2006:</b></td>
+                <td width="115" align="right" valign="top"><b>Feb 16 2007:</b></td>
+                <td width="*">1.7.2 released</td>
+              </tr>
+              <tr align="left" valign="top"> 
+                <td width="115" align="right" valign="top"><b>Feb 9 2007:</b></td>
+                <td width="*">Web demo updated to 1.7.2</td>
+              </tr>
+              <tr align="left" valign="top"> 
+                <td width="115" align="right" valign="top"><b>Nov&nbsp;7-9&nbsp;2006:</b></td>
                 <td width="*">Exhibited at <a href="http://www.ispcon.com/" target="_blank" id="teal">ISPCON</a>, 
                   booth 311</td>
               </tr>
@@ -46,14 +48,14 @@
                 <td width="*">Web demo updated to 1.7.1</td>
               </tr>
               <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b>July 17-19 2006:</b> 
+                <td width="115" align="right" valign="top"><b>July&nbsp;17-19&nbsp;2006:</b> 
                 </td>
                 <td width="*">Exhibited at <a href="http://www.hostingcon.com/" target="_blank" id="teal">HostingCon</a>, 
                   booth 618</td>
               </tr>
               <tr align="left" valign="top"> 
                 <td width="115" align="right" valign="top"><b>May 22 2006:</b></td>
-                <td width="*"><a href="http://www.sisd.com/pipermail/freeside-users/2006-May/005134.html" target="_blank" id="teal">1.5.8 
+                <td width="*"><a href="/pipermail/freeside-users/2006-May/005134.html" target="_blank" id="teal">1.5.8 
                   released</a></td>
               </tr>
               <tr align="left" valign="top"> 
@@ -61,15 +63,10 @@
                 <td width="*">Web demo and documentation updated to 1.7.0</td>
               </tr>
               <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b>May 16-18 2006:</b></td>
+                <td width="115" align="right" valign="top"><b>May&nbsp;16-18&nbsp;2006:</b></td>
                 <td width="*">Exhibited at <a href="http://www.ispcon.com/Spring2006/" target="_blank" id="teal">ISPCON</a>, 
                   booth 110-F</td>
               </tr>
-              <tr align="left" valign="top"> 
-                <td width="115" align="right" valign="top"><b>Apr 28 2006:</b></td>
-                <td width="*"><a href="products.html" target="_self" id="teal">Preinstalled 
-                  appliances</a> now available!</td>
-              </tr>
             </table></td>
           <td width="9" height="*" bgcolor="#A5A3A3">&nbsp;</td>
         </tr>
@@ -79,32 +76,61 @@
           <td width="9" height="18" align="left" valign="top"><img src="imgs/bk/corners/grey_rt.gif"></td>
         </tr>
       </table> 
+
+      <br>
+      <table width="100%" border="0" cellpadding="10">
+        <tr> 
+          <td width="384" bgcolor="#BEBDBD"><br> 
+            <h4>Freeside offers business solutions:</h4>
+            <p><a href="products.html">Billing and ticketing server appliances</a>: A complete solution including hardware, software and support.  Starting at $2950 shipped!<br>
+              <br>
+              <a href="services.html#install">Installation service</a>: Installation on your hardware and complete support to get you up and running.<br>
+              <br>
+              <a href="services.html#support">Support</a>: Support contracts offer trouble-free upgrades, customizations for your specific business needs and the ongoing help you need to make the most effective use of the software and your time.<br>
+              <br>
+              <a href="services.html#customization">Customization</a>: Is Freeside missing a feature crucial to you?  We offer cost-effective customization and integration services.<br>
+              <br>
+              <a href="services.html#training">On-site training</a>: A one or three day curriculum tailored to your needs.
+              <br>
+              <br>
+          </td>
+        </tr>
+      </table>
+
+      <br>
+      <img src="imgs/freedom.gif" alt=" "> 
+
     </td>
-    <td width="3" rowspan="3" align="left" valign="top" background="imgs/bk/grblkline.gif">&nbsp;</td>
-    <td width="*" rowspan="3" align="left" valign="top"> <h4>It Slices, It Dices, 
-        It's OPEN SOURCE!</h4>
-      <p>Freeside's open source licensing frees you from licensing costs, proprietary 
-        databases and black-box applications. <a href="webdemo.html">SEE FOR YOUR 
-        SELF</a> why hundreds of companies have come to rely upon the Freeside 
+
+    <td width="*" align="left" valign="top" STYLE="padding:4px;border-left:1px solid black"><h6>OPEN SOURCE FOR YOUR BUSINESS</h6>
+      <p>Freeside is the premier open-source billing, trouble ticketing and provisioning automation software for wired and wireless ISPs, VoIP, hosting, service and content providers and other online businesses.
+      <p>Check out our online or downloadable <a href="demo.html">demo</a> and see for yourself why hundreds of companies have come to rely upon the Freeside 
         software for their automation needs.<br>
         <br>
         For complete, easy deployment and maintenance, Freeside is available on 
-        a variety of server appliances. <a href="services.html">Remote installation 
-        service</a> is also available.<br>
+        a variety of <a href="products.html">server appliances</a>.  Or, for customers with existing hardware, <a href="services.html">installation service</a> is also available.<br>
+<!--
         <br>
-        <b>Freeside's 100% web-based</b> user interface requires no 
+<b>Freeside's 100% web-based</b> user interface requires no 
         client installation of any kind. Comprehensive customer <b></b>self-care 
         and reseller interfaces empower your customers and resellers, and reduce 
         your staffing costs.<b></b><b></b></p>
-      <h4><b></b><b><a href="webdemo.html"><img src="imgs/screen3.gif" alt="web demo" border="0" align="right" class="rightFloat"></a></b>BILLING</h4>
+-->
+
+      <a href="webdemo.html"><img src="imgs/screen3.gif" alt="web demo" border="0" align="right" class="rightFloat"></a>
+      
+      <h6>KEY FEATURES</h6>
+
+      <h4><b></b>BILLING</h4>
+
       <ul>
         <li> Flexible pricing and rating plans including anniversary billing, 
-          pro-rating, usage based billing and more. Plug-in system allows easy 
+          pro-rating, usage based billing and more.  Plug-in system allows easy 
           addition of new pricing plans. </li>
         <li> VoIP rating and billing, including DID inventory, rate plans, free 
           minutes, caps, and 800# billing.</li>
         <li> Real-time credit card and electronic check processing with all major 
-          processing gateways. Email, fax, printed and online invoicing</div> </li> 
+          processing gateways.  Email, fax, printed and online invoicing.</div> </li> 
       </ul>
       <h4>TICKETING</h4>
       <ul>
@@ -130,41 +156,9 @@
           own customers.</li>
         <li>Flexible, fine-grained access control<br>
         </li>
-      </ul></td>
-  </tr>
-  <tr> 
-    <td width="420" height="120" align="center" valign="middle" bgcolor="#BEBDBD"><img src="imgs/freedom.gif" alt=" "> 
-    </td>
-  </tr>
-  <tr> 
-    <td align="left" valign="top" bgcolor="#BEBDBD"> 
-      <table width="100%" border="0" cellpadding="10">
-        <tr> 
-          <td width="384" bgcolor="#BEBDBD"><br> 
-            <h4>Freeside offers business solutions:</h4>
-            <p><b>Billing and ticketing server appliances: </b>A <a href="products.html">complete 
-              solution</a> including hardware, software and support starting at 
-              $2950 shipped!<br>
-              <br>
-              <b>Installation services:</b> There is a solution for every level 
-              of expertise and or budget. Work with our represenatives to make 
-              your business go with ease.<br>
-              <br>
-              <b>On-site training: </b>We will happily come to you. If it is more 
-              convient and more worth your time and money for us to train you 
-              on site we offer that option.<br>
-              <br>
-              <b>Support</b> is very important. Who wants to be left in the dark 
-              with no-one to turn to in a time of need. Not with Freeside though, 
-              we offer options for your needs. <a href="support.html" target="_self">Check 
-              them out!</a><br>
-              <br>
-              <b>Customization:</b> Is Freeside missing a feature crucial to you? 
-              Customizations and extensions to the software are quoted on an individual 
-              basis. Send a detailed description of your needs.</p></td>
-        </tr>
-      </table>
+      </ul>
     </td>
+
   </tr>
 </table>
 
diff --git a/products.html b/products.html
index c9d51e3..05b6af2 100644
--- a/products.html
+++ b/products.html
@@ -4,153 +4,189 @@
 <title>Freeside Products</title>
 { include('elements/header.html'); }
 
-<div id="header3"></div>
-
 <div id="content_prd"> 
  
-  <h6>Preinstalled server appliances!</h6>
-  <h4> What could be easier? Simply attach ethernet and connect to the web interface 
-    with your browser!</h4>
-  <br><br>
+  <h6>Preinstalled server appliances</h6>
+  <h4>What could be easier? Simply attach ethernet and connect to the web interface with your browser!</h4>
+  <br>
   <table align="center" cellpadding="0" cellspacing="0" class="tblprod">
     <tr>
       <td align="center" valign="top"> 
-        <table width="869" cellpadding="0" cellspacing="0" class="tblprod_insd">
-          <tr> 
-            <td height="44"><h4>Which is right for you?</h4></td>
-          </tr>
+        <table cellpadding="0" cellspacing="0" class="tblprod_insd">
           <tr> 
             <td align="center">
 <table class="tblprod_insdlist" cellspacing="0" cellpadding="0">
                 <tr class="tblprod_insd"> 
-                  <td>&nbsp;</td>
+                  <td align="left" valign="top"><h5>FS-54</h5>
+                    <b>Entry-level essentials</b></td>
+                  <td align="left" valign="top"><h5>FS-330</h5>
+                    <b>Powerful dual-core workhorse</b></td>
+                  <td align="left" valign="top"><h5>FS-1100</h5>
+                    <b>Uncompromised scalability and performance</b></td>
+                </tr>
+                <tr class="tblprod_insd"> 
                   <td align="center"><img src="imgs/products/FS-54_sm.jpg" width="224" height="107"></td>
                   <td align="center"><img src="imgs/products/FS-320_sm.jpg" width="224" height="105"></td>
                   <td align="center"><img src="imgs/products/FS-1000_sm.jpg" width="224" height="105"></td>
                 </tr>
                 <tr class="tblprod_insd"> 
-                  <td align="left" valign="top"><h5>Model</h5></td>
-                  <td align="left" valign="top"><b>FS-54<br>
-                    Entry-level essentials</b></td>
-                  <td align="left" valign="top"><b>FS-320<br>
-                    Powerful dual-core workhorse</b></td>
-                  <td align="left" valign="top"><b>FS-1000<br>
-                    Uncompromised scalability and performance</b></td>
+                  <td align="center" valign="top"><h6>USD <strike>$2950</strike> $2750</h6>
+                    Free shipping (North America)<br>
+                  </td>
+                  <td align="center" valign="top"><h6>USD $4400</h6>
+                    Free shipping (North America)</td>
+                  <td align="center" valign="top"><h6>USD $7900</h6>
+                    Free shipping (North America)</td>
+                </tr>
+                <tr> 
+                  <td colspan=3 align="center" valign="middle">
+                    <br><b>For orders, a quotation or 
+                      more information, contact <a href="mailto:sales@sisd.com">sales@sisd.com</a> or phone +1 415 462 1624 </b><br><br></td>
                 </tr>
+<!--
+    <td align="center">
+      <form name="order1" method="POST" action="http://wavetail.sisd.com/selfservice/signup.cgi?promo_code=FS54">
+      <input type="submit" value="Generate quote or Buy now">
+      </form>
+    </td>
+    <td align="center">
+      <form name="order1" method="POST" action="http://wavetail.sisd.com/selfservice/signup.cgi?promo_code=FS32">
+      <input type="submit" value="Generate quote or Buy now">
+      </form>
+    </td>
+    <td align="center">
+      <form name="order1" method="POST" action="http://wavetail.sisd.com/selfservice/signup.cgi?promo_code=FS1K">
+      <input type="submit" value="Generate quote or Buy now">
+      </form>
+    </td>
+-->
                 <tr class="tblprod_insd"> 
-                  <td align="left" valign="top">&nbsp;</td>
-                  <td align="left" valign="top">A value-priced small appliance 
+                  <td align="left" valign="top" bgcolor="#E9EFEC" >A value-priced small appliance 
                     that doesn't compromise on the essentials, including SATA 
                     RAID1 storage for reliability and a fast AMD 64-bit processor 
-                    for performance.</td>
-                  <td align="left" valign="top">Turnkey billing and ticketing 
+                    for performance.<br><br>
+                  </td>
+                  <td align="left" valign="top" bgcolor="#D0DADA">Turnkey billing and ticketing 
                     in a powerful dual-core 1U rackmount appliance. An Opteron 
-                    processor provides dual 64-bit processing power and hotswap 
-                    RAID1 ensures maximum uptime.</td>
-                  <td align="left" valign="top">Extreme performance and reliability, 
-                    including four independent CPU cores and four 10k RPM drives 
-                    in a hotswap RAID5 array.</td>
+                    processor provides dual-core 64-bit processing power and hotswap 
+                    RAID1 ensures maximum uptime.<br><br>
+                  </td>
+                  <td align="left" valign="top" bgcolor="#B6C9C9">Extreme performance and reliability, 
+                    including four independent CPU cores and a hotswap RAID5 array.<br><br>
+                  </td>
                 </tr>
                 <tr class="tblprod_insd"> 
-                  <td align="left" valign="top"><h5>Price</h5></td>
-                  <td  align="left" valign="top"  bgcolor="#E9EFEC" class="tblprod" >USD 
-                    <span class="crossout">$3200</span> $2950 introductory price 
-                    free shipping (north america)</td>
-                  <td align="left" valign="top" bgcolor="#D0DADA"> USD <span class="crossout">$4900</span> 
-                    $4400 introductory price<br>
-                    free shipping (north america) </td>
-                  <td align="left" valign="top" bgcolor="#B6C9C9">USD <span class="crossout">$8900</span> 
-                    $7900 introductory price<br>
-                    free shipping (north america) </td>
+                  <td align="left" valign="top"><b>Software</b><br>
+                    &nbsp;&nbsp;Freeside billing system<br>
+                    &nbsp;&nbsp;RT trouble ticketing<br>
+                    &nbsp;&nbsp;PostgreSQL database<br>
+                    &nbsp;&nbsp;Debian OS<br><br>
+                  </td>
+                  <td align="left" valign="top"><b>Software</b><br>
+                    &nbsp;&nbsp;Freeside billing system<br>
+                    &nbsp;&nbsp;RT trouble ticketing<br>
+                    &nbsp;&nbsp;PostgreSQL database<br>
+                    &nbsp;&nbsp;Debian OS<br><br>
+                  </td>
+                  <td align="left" valign="top"><b>Software</b><br>
+                    &nbsp;&nbsp;Freeside billing system<br>
+                    &nbsp;&nbsp;RT trouble ticketing<br>
+                    &nbsp;&nbsp;PostgreSQL database<br>
+                    &nbsp;&nbsp;Debian OS<br><br>
+                  </td>
                 </tr>
                 <tr class="tblprod_insd"> 
-                  <td align="left" valign="top"><h5>Software</h5></td>
-                  <td align="left" valign="top">Freeside billing system<br>
-                    RT trouble ticketing<br>
-                    PostgreSQL database<br>
-                    Debian OS software</td>
-                  <td align="left" valign="top">Freeside billing system<br>
-                    RT trouble ticketing<br>
-                    PostgreSQL database<br>
-                    Debian OS software</td>
-                  <td align="left" valign="top">Freeside billing system<br>
-                    RT trouble ticketing<br>
-                    PostgreSQL database<br>
-                    Debian OS software</td>
+                  <td align="left" valign="top" bgcolor="#E9EFEC"><b>Intergration Service</b></br>
+                    &nbsp;&nbsp;Credit card / E-check gateway<br>
+                    &nbsp;&nbsp;Server provisioning <br>
+                    &nbsp;&nbsp;Ticketing email gateway<br>
+                    &nbsp;&nbsp;Live cutover<br><br>
+                  </td>
+                  <td align="left" valign="top" bgcolor="#D0DADA"><b>Intergration Service</b></br>
+                    &nbsp;&nbsp;Credit card / E-check gateway<br>
+                    &nbsp;&nbsp;Server provisioning <br>
+                    &nbsp;&nbsp;Ticketing email gateway<br>
+                    &nbsp;&nbsp;Live cutover<br><br>
+                  </td>
+                  <td align="left" valign="top" bgcolor="#B6C9C9"><b>Intergration Service</b></br>
+                    &nbsp;&nbsp;Credit card / E-check gateway<br>
+                    &nbsp;&nbsp;Server provisioning <br>
+                    &nbsp;&nbsp;Ticketing email gateway<br>
+                    &nbsp;&nbsp;Live cutover<br><br>
+                  </td>
                 </tr>
                 <tr class="tblprod_insd"> 
-                  <td align="left" valign="top"><h5>Intergration Service</h5></td>
-                  <td align="left" valign="top" bgcolor="#E9EFEC">Credit card 
-                    / E-check gateway<br>
-                    Server provisioning <br>
-                    Ticketing email gateway<br>
-                    Live cutover </td>
-                  <td align="left" valign="top" bgcolor="#D0DADA">Credit card 
-                    / E-check gateway<br>
-                    Server provisioning <br>
-                    Ticketing email gateway<br>
-                    Live cutover </td>
-                  <td align="left" valign="top" bgcolor="#B6C9C9">Credit card 
-                    / E-check gateway<br>
-                    Server provisioning <br>
-                    Ticketing email gateway<br>
-                    Live cutover </td>
+                  <td align="left" valign="top"><b>Support</b></br>
+                    &nbsp;&nbsp;2 months telephone, IM 
+                    and email support<br><br>
+                  </td>
+                  <td align="left" valign="top"><b>Support</b></br>
+                    &nbsp;&nbsp;4 months telephone, IM 
+                    and email support<br>
+                    &nbsp;&nbsp;6 hours of code customization work<br><br>
+                  </td>
+                  <td align="left" valign="top"><b>Support</b></br>
+                    &nbsp;&nbsp;6 months priority telephone, IM 
+                    and email support<br>
+                    &nbsp;&nbsp;12 hours of code customization work<br><br>
+                  </td>
                 </tr>
                 <tr class="tblprod_insd"> 
-                  <td align="left" valign="top"><h5>Support</h5></td>
-                  <td align="left" valign="top">1 months priority telephone, IM 
-                    and email support</td>
-                  <td align="left" valign="top">2 months priority telephone, IM 
-                    and email support</td>
-                  <td align="left" valign="top">3 months priority telephone, IM 
-                    and email support</td>
+                  <td align="left" valign="top" bgcolor="#E9EFEC"><b>Security Updates</b><br>
+                  &nbsp;&nbsp;1 years all software<br><br>
+                  </td>
+                  <td align="left" valign="top" bgcolor="#D0DADA"><b>Security Updates</b><br>
+                  &nbsp;&nbsp;3 years all software<br><br>
+                  </td>
+                  <td align="left" valign="top" bgcolor="#B6C9C9"><b>Security Updates</b><br>
+                  &nbsp;&nbsp;5 years all software<br><br>
+                  </td>
                 </tr>
                 <tr class="tblprod_insd"> 
-                  <td align="left" valign="top"><h5>Security Updates</h5></td>
-                  <td align="left" valign="top" bgcolor="#E9EFEC">1 years all 
-                    software</td>
-                  <td align="left" valign="top" bgcolor="#D0DADA">3 years all 
-                    software</td>
-                  <td align="left" valign="top" bgcolor="#B6C9C9">5 years all 
-                    software</td>
-                </tr>
-                <tr class="tblprod_insd"> 
-                  <td align="left" valign="top"><h5>Hadware</h5></td>
-                  <td align="left" valign="top">1U rackmount short-depth (14&quot; 
+                  <td align="left" valign="top"><b>Hardware</b><br>
+                    &nbsp;&nbsp;1U rackmount short-depth (14&quot; 
                     deep)<br>
-                    80gb RAID1 SATA (2x 80gb 7200rpm)<br>
-                    Athlon 64 2Ghz<br>
-                    1Gb RAM hardware</td>
-                  <td align="left" valign="top">1U rackmount (22.6&quot; deep)<br>
-                    160gb Hotswap RAID1 SATA (2x 160gb 7200rpm)<br>
-                    Dual-core&nbsp;Opteron 170 (2x2Ghz)<br>
-                    2Gb ECC RAM hardware</td>
-                  <td align="left" valign="top">1U rackmount (25.6&quot; deep) 
-                    222gb Hotswap RAID5 SATA (4x 74gb 10000rpm) <br>
-                    Two dual-core Opteron 270 (4x2Ghz) 4Gb ECC RAM</td>
+                    &nbsp;&nbsp;80gb RAID1<br>
+                    &nbsp;&nbsp;Athlon 64<br>
+                    &nbsp;&nbsp;1Gb RAM<br>
+                    &nbsp;&nbsp;100baseT ethernet<br><br>
+                  </td>
+                  <td align="left" valign="top"><b>Hardware</b><br>
+                    &nbsp;&nbsp;1U rackmount (22.6&quot; deep)<br>
+                    &nbsp;&nbsp;160gb Hotswap RAID1<br>
+                    &nbsp;&nbsp;Dual-core&nbsp;Opteron 1212<br>
+                    &nbsp;&nbsp;2Gb ECC RAM<br>
+                    &nbsp;&nbsp;Dual gigabit ethernet<br>
+                    &nbsp;&nbsp;IPMI controller<br><br>
+                  </td>
+                  <td align="left" valign="top"><b>Hardware</b><br>
+                    &nbsp;&nbsp;1U rackmount (25.6&quot; deep)<br>
+                    &nbsp;&nbsp;222gb Hotswap RAID5<br>
+                    &nbsp;&nbsp;Two dual-core Opteron 2212<br>
+                    &nbsp;&nbsp;4Gb ECC RAM<br>
+                    &nbsp;&nbsp;Dual gigabit ethernet<br>
+                    &nbsp;&nbsp;IPMI controller<br><br>
+                  </td>
                 </tr>
                 <tr class="tblprod_insd"> 
-                  <td align="left" valign="top"><h5>Warrenty</h5></td>
-                  <td align="left" valign="top" bgcolor="#E9EFEC">1 year (hard 
-                    drives 3 yr mfr. warranty) warranty</td>
-                  <td align="left" valign="top" bgcolor="#D0DADA">3 years (hard 
-                    drives 3 yr mfr. warranty) warranty</td>
-                  <td align="left" valign="top" bgcolor="#B6C9C9">3 years (hard 
-                    drives 3 yr mfr. warranty) warranty</td>
-                </tr>
-              </table>
-			  <table width="550" border="0" cellpadding="0" cellspacing="0">
-                <tr> 
-                  <td width="90"><img src="imgs/products/phone_sm.gif"></td>
-                  <td width="*" align="left"> <p><b>For orders, a quotation or 
-                      more information, contact:<br>
-                      </b><b>Ivan Kohler &lt;ivan@sisd.com&gt; or phone +1 415 
-                      462 1624 </b></p></td>
+                  <td align="left" valign="top" bgcolor="#E9EFEC"><b>Warranty</b><br>
+                    &nbsp;&nbsp;1 year (hard 
+                    drives 3 yr mfr. warranty)<br>
+                  </td>
+                  <td align="left" valign="top" bgcolor="#D0DADA"><b>Warranty</b><br>
+                    &nbsp;&nbsp;3 years<br>
+                  </td>
+                  <td align="left" valign="top" bgcolor="#B6C9C9"><b>Warranty</b><br>
+                    &nbsp;&nbsp;3 years<br>
+                  </td>
                 </tr>
+                
               </table>
+
             </td>
           </tr>
-        </table>      </td>
+        </table>
+      </td>
     </tr>
   </table>
 </div>
diff --git a/services.html b/services.html
index 4c0b707..59dbfc7 100644
--- a/services.html
+++ b/services.html
@@ -4,144 +4,159 @@
 <title>Freeside Services</title>
 { include('elements/header.html'); }
 
-<div id="header3"></div>
-
 <div id="content1"> 
-  <h6>Freeside Commercial Services</h6>
+
+  <h6>Services</h6>
+
+<!--
   <table cellpadding="0" cellspacing="0" class="servteal">
     <tr> 
       <th  align="left"> For orders, a quotation or more information, <span class="blkbold">contact 
         Ivan Kohler &lt;ivan@sisd.com&gt; or phone +1 415 462 1624 </span> </th>
     </tr>
   </table>
-  <table width="100%" cellspacing="0" cellpadding="0" class="serv">
+-->
+
+<table align="center" cellpadding="0" cellspacing="0" class="tblprod">
+  <tr><td align="center" valign="top">
+
+  <table width="100%" cellspacing="0" cellpadding="0" class="servpurp">
     <tr> 
-      <td  align="left" valign="top"><img src="imgs/bk/servman.gif" width="230" height="248" class="leftFloat"> 
-        <h4>Installation service - your hardware </h4>
-      
-          <p><b class="h4">$2000 </b>- Installation service<br>
-            <br>
-            Prefer your own hardware? This covers everything in the instructions, 
-            including writing an interface to your credit card and/or ACH processor, 
-            integration with your provisioning systems, setup of the signup server 
-            and self-service interface, and support through bringing the software 
-            live into a full production state.<br>
-            <br>
-            <b class="h4">$1000</b> - Installation of the Request Tracker ticketing 
-            system.<br>
-            This covers complete installation and configuration of the open-source, 
-            enterprise-grade Request Tracker ticketing system.</p>
-       
-        <h6>Additional Installation service</h6>
-     
-          <p><b class="h6">$750</b> - Installation of FreeRADIUS server with MySQL 
-            or PostgreSQL backend.<br>
+      <th align="left" valign="top"><a name="install"><h3>Installation service</h3></a></th>
+    </tr>
+    <tr> 
+      <td align="left" valign="top" STYLE="-moz-border-radius:30px 30px 30px 30px">
+
+          <p><b>Freeside and RT Installation service</b> - <b class="h6">$2000</b><br>
+            Prefer your own hardware?  This service includes complete installation and configuration the Freeside billing software and integrated Request Tracker ticketing system, integration with your credit card and/or ACH gateway, setup of the signup and self-service interfaces, integration with your public servers for provisioning of mailboxes, RADIUS, etc., and support through bringing the software live into a full production state and the first two months of usage.
             <br>
-            This covers complete installation, configuration, and integration 
+          </p>
+
+      </td>
+    </tr>
+  </table>
+
+</td></tr></table>
+<br>
+<table align="center" cellpadding="0" cellspacing="0" class="tblprod">
+  <tr><td align="center" valign="top">
+
+  <table width="100%" cellspacing="0" cellpadding="0" class="servpurp">
+    <tr> 
+      <th align="left" valign="top"><h3>Additional installation services</h3>
+      </th>
+    </tr>
+    <tr>
+      <td align="left" valign="top" STYLE="-moz-border-radius:30px 30px 30px 30px">
+ 
+          <p><b>Installation of FreeRADIUS server with MySQL or PostgreSQL backend</b> - <b class="h6">$750</b><br>
+            This service include complete installation, configuration, and integration 
             of the advanced, open-source FreeRADIUS RADIUS server, as well as 
             migration from your previous RADIUS configuration.</p>
-          <p><b class="h6">$2500</b> - Complete mail server (including migration 
-            from current mail server), or<br>
-            <br>
-            <b class="h6">$1750</b> - Complete mail server (new ISPs - no migration)<br>
-            <br>
-            This covers installation and configuration of a complete mail server 
+          <p>
+            <b>Complete mail server (including migration from current mail server) - </b><b class="h6">$2500</b>, or<br>
+            <b>Complete mail server (new ISPs - no migration)</b> - <b class="h6">$1750</b><br>
+            This service includes installation and configuration of a complete mail server 
             solution, including SMTP, POP/IMAP (with SSL support), webmail, virus 
             filtering, user-configurable spam filtering, virtual domain capability, 
             Freeside integration and migration from your current mail server. 
             Typical timeframe is two weeks.<br>
             <br>
-            <b class="h6">$2500</b> (est.) - Legacy data import from QuickBooks 
-            or Rodopi, or<br>
-            <br>
-            <b class="h6">$3000</b> (est.) - Legacy data import from any other 
-            system<br>
-            <br>
-          This covers writing a custom script to import your legacy data and running 
+            <b>Legacy data import from QuickBooks or Rodopi</b> - (est.) <b class="h6">$2500</b>, or<br>
+            <b>Legacy data import from any other 
+            system</b> - (est.) <b class="h6">$3000</b><br>
+          Service includes writing a custom script to import your legacy data and running 
           test billings concurrently with your live billing to ensure trouble-free 
           cut-over. </P>
       </td>
     </tr>
   </table>
- 
-     
+
+</td></tr></table>
+<br>
+<table align="center" cellpadding="0" cellspacing="0" class="tblprod">
+  <tr><td align="center" valign="top">
+
   <table width="118%" cellpadding="0" cellspacing="0" class="servpurp">
     <tr> 
-      <th align="left" valign="top" > <h3>Training</h3></tr>
-    <tr> 
-      <td align="left" valign="top"><blockquote> 
-          <p><b>$1000</b> - One day on-site training<br>
-            <br>
-            Half-day course for your sales and support representatives; time spent 
-            as-needed with system administrators and bookkeeper/collections folks.<br>
-            <br>
-            <b>$3000</b> - Three day on-site visit (two days training, one day 
-            live cutover)<br>
-            <br>
-            Typical training sessions consist of a half-day course for your system 
-            administrators, a half-day course for your bookkeeper/collections 
-            folks, and a full day course (or two half-day courses) for your sales 
-            and support representatives.</p>
-        </blockquote></td>
-    </tr>
-    <tr> 
-      <th align="left" valign="top" > <h3>Support Contracts</h3></th>
+      <th align="left" valign="top"><a name="support"><h3>Support Contracts</h3></th>
     </tr>
     <tr> 
-      <td align="left" valign="top"> <blockquote> 
-          <p><b>$150/month</b> - Email support, emergency phone support<br>
-            <br>
-            Non-emergency support by email only; 24/7 emergency support via telephone 
-            or pager. Includes upgrades and optional offsite backup. Fixes for 
-            any problems caused by a bug in the Freeside software itself are included 
-            at no extra charge.<br>
-            <br>
-            <b>$300/month</b> - Email, IM and phone support with minor customizations<br>
-            <br>
+      <td align="left" valign="top" STYLE="-moz-border-radius:30px 30px 30px 30px">
+            <p>All support contracts include quarterly upgrades, optional offsite backup, and fixes for any bugs in the Freeside software itself.
+            <br><br>
+            <b>Bronze</b> - <b class="h6">$150/month</b> - Email support<br>
+            Non-emergency support via email; 24/7 emergency support via telephone
+            or pager.<br>
+            <br>
+            <b>Silver</b> - <b class="h6">$300/month</b> - Email, IM and phone support with minor customizations<br>
             Email, instant messenger and phone support during business hours; 
             24/7 emergency support via telephone or pager, for up to five incidents/month. 
-            Includes upgrades, optional offsite backup, and 3 hours/month of customizations. 
-            Fixes for any problems caused by a bug in the Freeside software itself 
-            are included and not counted against the five incidents/month.<br>
-            <br>
-            <b>$750/month </b>- Unlimited email, IM and phone support with significant 
-            customizations<br>
+            Includes 3 hours/month of customizations.<br>
             <br>
+            <b>Gold</b> - <b class="h6">$750/month</b> - Unlimited email, IM and phone support with customizations<br>
             Email, instant messenger and phone support during business hours; 
             24/7 emergency support via telephone or pager, for an unlimited number 
-            of incidents. Includes upgrades, optional offsite backup, and 12 hours/month 
+            of incidents. Includes 12 hours/month 
             of customizations.<br>
             <br>
-            <b>$1500/month</b> - Sponsorship and unlimited support with major 
-            customizations<br>
-            <br>
-            Unlimited support as above, plus 32 hours/month of customizations.<br>
-            All support contracts include remote upgrades (as desired, or scheduled 
-            regularly).<br>
-            All support contracts include optional offsite backup service: Nightly, 
-            your database will be backup up, encrypted with your PGP/GPG public 
-            key, and transmitted to storage here. Your customer information is 
-            secure and can only be decrypted with your PGP/GPG private key.</p>
-        </blockquote></td>
+            <b>Platinum</b> - <b class="h6">$1500/month</b> - Sponsorship and unlimited support with major customizations<br>
+            Unlimited support as above, plus 30 hours/month of customizations.<br>
+            </p>
+        </td>
     </tr>
+
+   </tr>
+  </table>
+
+</td></tr></table>
+<br>
+<table align="center" cellpadding="0" cellspacing="0" class="tblprod">
+  <tr><td align="center" valign="top">
+     
+  <table width="118%" cellpadding="0" cellspacing="0" class="servpurp">
     <tr> 
-      <th align="left" valign="top" > <h3>Custimization</h3></th>
+      <th align="left" valign="top"><a name="training"><h3>Training</h3></a></th>
     </tr>
     <tr> 
-      <td align="left" valign="top" > <blockquote> 
-          <p><b>Customizations and extensions to the software are quoted on an 
-            individual basis. Is Freeside missing a feature crucial to you? Send 
-            a detailed description of your needs.</b></p>
-        </blockquote></td>
+      <td align="left" valign="top" STYLE="-moz-border-radius:30px 30px 30px 30px">
+          <p><b>One day on-site training</b> - <b class="h6">$1600</b><br>
+            Half-day course for your sales and support representatives; time spent 
+            as-needed with system administrators and bookkeeper/collections folks.<br>
+            <br>
+            <b>Three day on-site visit (two days training, one day live cutover)</b> - <b class="h6">$3200</b><br>
+            Typical training sessions consist of a half-day course for your system 
+            administrators, a half-day course for your bookkeeper/collections 
+            folks, and a full day course (or two half-day courses) for your sales 
+            and support representatives.</p>
+        </td>
     </tr>
   </table>
-  <table cellpadding="0" cellspacing="0" class="servteal">
+
+</td></tr></table>
+<br>
+<table align="center" cellpadding="0" cellspacing="0" class="tblprod">
+  <tr><td align="center" valign="top">
+
+  <table width="118%" cellpadding="0" cellspacing="0" class="servpurp">
+
     <tr> 
-      <th  align="left"> For orders, a quotation or more information, <span class="blkbold">contact 
-        Ivan Kohler &lt;ivan@sisd.com&gt; or phone +1 415 462 1624 </span> </th>
+      <th align="left" valign="top"><a name="customization"><h3>Customization</h3></a></th>
+    </tr>
+    <tr> 
+      <td align="left" valign="top" STYLE="-moz-border-radius:30px 30px 30px 30px">
+          <p>Customizations and extensions to the software are quoted on an 
+            individual basis. Is Freeside missing a feature crucial to you?  Contact us to discuss your needs.</b></p>
+        </td>
     </tr>
   </table>
-  <p>&nbsp;</p>
+
+</td></tr></table>
+<br>
+
+<b>For orders, a quotation or more information, contact <a href="mailto:sales@sisd.com">sales@sisd.com</a> or phone +1 415 462 1624</b>
+<br><br>
+
 </div>
 
 { include('elements/footer.html'); }