diff --git a/trac/htdocs/common/css/trac.css b/trac/htdocs/common/css/trac.css
index fef7157..5230471 100644
--- a/trac/htdocs/common/css/trac.css
+++ b/trac/htdocs/common/css/trac.css
@@ -3,8 +3,24 @@ body {
     color:#000;
     margin:10px;
     padding:0;
+    width:80%;
+    margin: auto;
+    font-size: 12px;
 }
 
+:link, :visited { 
+    color: #224422;
+}
+:link:hover, :visited:hover { 
+    color: #945973;
+}
+body, th, td {
+    font-family: 'Bitstream Vera Serif',times,serif;
+}
+
+h1, h2, h3, h4 {
+    font-family: 'Bitstream Vera Serif',times,serif;
+}
 body,th,td {
     font:normal 13px Verdana,Arial,'Bitstream Vera Sans',Helvetica,sans-serif;
 }
@@ -16,19 +32,37 @@ h1,h2,h3,h4 {
     page-break-after:avoid;
 }
 
+h1, h2, h3 {
+    text-indent: 0.5em;
+    border-style: solid;
+    border-color: #88aa77;
+    background-color: inherit;    
+}
+
 h1 {
-    font-size:19px;
-    margin:.15em 1em .5em 0;
+  font-size: 1.6em;
+  font-variant: small-caps;
+  color: #002200;
+  border-width: 0 0 2px 0;
 }
 
 h2 {
-    font-size:16px;
+  font-size: 1.3em;
+  font-variant: small-caps;
+  color: #224422;
+  border-width: 0 0 2px 0;
 }
 
 h3 {
-    font-size:14px;
+  font-size: 1.1em;
+  color: #335533;
+  border-width: 0 0 1px 0;
 }
 
+p {
+  text-indent: 1em;
+  text-align: inherit;
+}
 hr {
     border:none;
     border-top:1px solid #ccb;
@@ -291,6 +325,13 @@ label.disabled {
     background:url(../dots.gif) 0 0 no-repeat;
     padding:.2em 20px;
     font-weight: bold;
+    padding-left: 8px;
+    padding-right: 8px;
+    color: white;
+}
+#mainnav :link:hover, #mainnav :visited:hover {
+    color: white;
+    background: #945973;
 }
 #mainnav .active :link, #mainnav .active :visited {
     background: #88AA77;
@@ -302,6 +343,7 @@ label.disabled {
 #mainnav .active :link:hover, #mainnav .active :visited:hover  {
     border: none;
     background: #224422;
+
 }
 * html #mainnav :link,* html #mainnav :visited {
     background-position:1px 0;
diff --git a/trac/htdocs/main.css b/trac/htdocs/main.css
index c7dff27..ca93e46 100644
--- a/trac/htdocs/main.css
+++ b/trac/htdocs/main.css
@@ -1,62 +1,6 @@
-body {
-    width:80%;
-    margin: auto;
-    font-size: 12px;
-}
 
-:link, :visited { 
-    color: #224422;
-}
-:link:hover, :visited:hover { 
-    color: #945973;
-}
-body, th, td {
-    font-family: 'Bitstream Vera Serif',times,serif;
-}
 
-h1, h2, h3, h4 {
-    font-family: 'Bitstream Vera Serif',times,serif;
-}
-#mainnav :link, #mainnav :visited {
-    padding-left: 8px;
-    padding-right: 8px;
-    color: white;
-}
-#mainnav :link:hover, #mainnav :visited:hover {
-    color: white;
-    background: #945973;
-}
-h1, h2, h3 {
-    text-indent: 0.5em;
-    border-style: solid;
-    border-color: #88aa77;
-    background-color: inherit;    
-}
-
-h1 {
-  font-size: 1.6em;
-  font-variant: small-caps;
-  color: #002200;
-  border-width: 0 0 2px 0;
-}
-
-h2 {
-  font-size: 1.3em;
-  font-variant: small-caps;
-  color: #224422;
-  border-width: 0 0 2px 0;
-}
-
-h3 {
-  font-size: 1.1em;
-  color: #335533;
-  border-width: 0 0 1px 0;
-}
 
-p {
-  text-indent: 1em;
-  text-align: inherit;
-}
 
 
 #footer {