Index: whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
===================================================================
--- whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css	(revision 377098)
+++ whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css	(working copy)
@@ -15,38 +15,6 @@
 * limitations under the License.
 */
 
-.breadtrail {
-    background: #CEDFEF;
-    color: #0F3660;
-    border-bottom: solid 1px white;
-    padding: 3px 10px;
-    font-size: 75%;
-}
-.breadtrail a:link { color: #0F3660; }
-.breadtrail a:visited { color: #0F3660; }
-.breadtrail a:hover { color: #000066; }
-
-#page .breadtrail {
-    clear:both;
-    position: relative;
-    border-bottom: solid 1px black;
-    border-top: solid 1px black;
-    padding: 0px 200px;
-    z-index:10;
-}
-
-#branding-tagline-name {
-    display: none;
-}
-
-#branding-tagline-tagline {
-    display: none;
-}
-
-a:link { color: #0F3660; } 
-a:visited { color: #009999; } 
-a:hover { color: #000066; } 
-
 body { 
     margin: 0px 0px 0px 0px; font-family: Verdana, Helvetica, sans-serif;
     background-color: #FFFFFF;
@@ -54,6 +22,15 @@
     font-size: 12px;
 }
 
+p {
+  line-height: 120%;
+  text-align: left;
+  margin-top: .5em;
+  margin-bottom: 1em;
+}
+
+h1, h2, h3, h4, h5, h6 { font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; }
+
 h1     { font-size : 160%; margin: 0px 0px 0px 0px;  padding: 0px; }
 h2     { font-size : 140%; margin: 0.9em 0px 0px 0px; padding: 0px; font-weight : bold;}
 h3     { font-size : 120%; margin: 0.8em 0px 0px 0px; padding: 0px; font-weight : bold; }
@@ -63,9 +40,66 @@
 h4.faq { font-size : 100%; margin: 18px 0px 0px 0px; padding: 0px; font-weight : bold;   text-align: left; }
 h5     { font-size : 80%; margin: 14px 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
 
+#content h1 { margin-bottom: .5em; }
+
+#menu h1 {
+  margin: 0;
+  padding: 10px;
+  background: #336699;
+  color: white;
+}
+
+#content {
+    padding: 20px 20px 20px 200px;
+    margin: 0;
+    font : small Verdana, Helvetica, sans-serif;
+    font-size: 100%;
+}
+
+#content ul {
+    margin: 0;
+    padding: 0 25px;
+}
+#content li {
+    padding: 0 5px;
+}
+#content li, #content th, #content td {
+  line-height: 110%;  
+  margin-top: .1em;
+  margin-bottom: .1em;
+}
+
+#content .attribution {
+  text-align: right;
+  font-style: italic;
+  font-size: 85%;
+  margin-top: 1em;
+}
+
 /**
-* table
+* Content table related
 */
+
+#content table {
+	border: 0;
+	width: 100%;
+}
+
+* html #content table { margin-left: -3px; }
+
+#content th, #content td {
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+}
+
+.codefrag {
+  font-family: "Courier New", Courier, monospace;
+  font-size: 110%;
+}
+
+/* Table related generic */
+
 table .title { background-color: #000000; }
 .ForrestTable {
     color: #ffffff;
@@ -79,13 +113,14 @@
     color: #000000;
     text-align: left;
     font-weight: bold;
-    background-color: #E5E4D9;
+    background-color: #4C6C8F;
 }
 .ForrestTable td {
     color: black;
     background-color: #F0F0FF;
 }
 .ForrestTable th { text-align: center; }
+
 /**
  * Page Header
  */
@@ -119,7 +154,7 @@
     white-space: nowrap;
     text-align: right;
     color: #000000;
-    background-color: #E5E4D9;
+    background-color: #4C6C8F;
     z-index:0;
     bottom: 18px; /* compensate for IE rendering issue */
 }
@@ -131,39 +166,42 @@
 #header .round-top-left-small {
   background-repeat: no-repeat;
   background-position: top left;
-  background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
   } 
 #header .round-top-right-small {
   background-repeat: no-repeat;
   background-position: top right;
-  background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
   }
 .round-bottom-left-small {
   background-repeat: no-repeat;
   background-position: bottom left;
-  background-image: url(../themes/images/roundcorner-b-l-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-b-l-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
   } 
 .round-bottom-right-small {
   background-repeat: no-repeat;
   background-position: bottom right;
-  background-image: url(../themes/images/roundcorner-b-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-b-r-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
   }
 .round-bottom-left-big {
   background-repeat: no-repeat;
   background-position: bottom left;
-  background-image: url(../themes/images/roundcorner-b-l-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-b-l-15-bgffffff-stroke4C6C8F-fg4C6C8F.png);
   } 
 .round-bottom-right-big {
   background-repeat: no-repeat;
   background-position: bottom right;
-  background-image: url(../themes/images/roundcorner-b-r-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-b-r-15-bgffffff-stroke4C6C8F-fg4C6C8F.png);
   }
 
 #header .search-field {
     float: left;
 }
 
+/* Navigation - Top Horizontal Tabbed Navigation */
+
 #nav-main {
+    /* font-size:90% -- Transfered from pelt.basic.css but do not use as it messes up tab positions */
     clear: both;
     padding-left: 10px;
     margin: 0;
@@ -172,10 +210,10 @@
 
 #nav-main li {
     float: left;
-    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeF5F4E9-fgF5F4E9.png);
+    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
-    background-color: #F5F4E9;
+    background-color: #4C6C8F;
     margin: 0 3px 0 0;
     padding: 0;
 }
@@ -187,7 +225,7 @@
     text-decoration: none;
     color: black;
     white-space: nowrap;
-    background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-strokeF5F4E9-fgF5F4E9.png);
+    background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top left;
     padding: 5px 15px 4px;
@@ -204,8 +242,8 @@
 /* End IE5-Mac hack */
 
 #nav-main .current {
-    background-color: #E5E4D9;
-    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-color: #4C6C8F;
+    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
@@ -213,7 +251,7 @@
     font-weight: bold;
     padding-bottom: 5px;
     color: #000000;
-    background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top left;
 }
@@ -224,7 +262,7 @@
 
 #publishedStrip {
     position: relative;
-    background: #E5E4D9;
+    background: #4C6C8F;
     clear:both;
     padding-right: 10px;
     padding-left: 20px;
@@ -241,7 +279,7 @@
     margin: 0;
     float:left;
     position:relative;
-    /*background-color: #4A6D8C ;*/
+    background-color: #4C6C8F ;
 }
 #level2tabs a{padding-right: 5px;}
 #level2tabs a:link {  color: #000000; }
@@ -260,19 +298,19 @@
 * Round corner
 */
 #roundtop {
-    background-image: url(../themes/images/roundcorner-t-r-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-t-r-15-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
 
 #roundbottom {
-    background-image: url(../themes/images/roundcorner-b-r-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-b-r-15-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
 
 #roundbottomLeft {
-    background-image: url(../themes/images/roundcorner-b-l-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-b-l-15-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: bottom left;
 }
@@ -285,13 +323,13 @@
 }
 
 .roundtopsmall {
-    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
 
 #roundbottomsmall {
-    background-image: url(../themes/images/roundcorner-b-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-b-r-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
@@ -302,9 +340,15 @@
    border: none;
    display: block !important;
 }
-/**
- * Side menu
- */
+
+/* Navigation - Left Side Vertical Navigation */
+
+#nav-section ul {
+    list-style: none;
+    margin: 0px;
+    padding: 0px;
+}
+
 #leftbar a {  font-weight: normal;}
 #leftbar a:link { color: #000000; }
 #leftbar a:visited { color: #000000; }
@@ -322,16 +366,11 @@
     left:10px;
     z-index: 20;
     border-color: #000000; 
-    background-color: #E5E4D9;
+    background-color: #4C6C8F;
     font-size : 90%;
     color: #000000;
 }
 
-#nav-section ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px;
-}
 
 .pagegroup ul {
     list-style: none;
@@ -418,7 +457,7 @@
         border-right: 1px solid ;
         margin-right: 10px;
         border-color: #999999;
-        background-color: #E5E4D9;
+        background-color: #4C6C8F;
 }
 
 #nav-section .menupageitem {
@@ -431,7 +470,7 @@
 #nav-section .menupageitem a:link { color: #000000;}
 #nav-section .menupageitem a:visited { color: #000000;}
 #nav-section .menupageitem a:hover {
-        background-color: #E5E4D9;
+        background-color: #4C6C8F;
         color: #000000;
 }
 
@@ -454,19 +493,6 @@
     margin: 0;
 }
 
-#content {
-    padding: 20px 20px 20px 200px;
-    margin: 0;
-    font : small Verdana, Helvetica, sans-serif;
-}
-
-#content ul {
-    margin: 0;
-    padding: 0 25px;
-}
-#content li {
-    padding: 0 5px;
-}
 #feedback {
     color: black;
     background: #CFDCED;
@@ -481,20 +507,20 @@
     clear: both;
     position: relative; /* IE bugfix (http://www.dracos.co.uk/web/css/ie6floatbug/) */
     width: 100%;
-    background-color: #E5E4D9;
-    border-top: solid 1px #4C6C8F;
+    background-color: #CFDCED;
+    border-top: solid 1px #CFDCED;
     color: black;
 }
 #footer .copyright {
     position: relative; /* IE bugfix cont'd */
     padding: 5px;
     margin: 0;
-    width: 45%;
+    width: 75%;
 }
 #footer .lastmodified {
     position: relative; /* IE bugfix cont'd */
     float: right;
-    width: 45%;
+    width: 35%;
     padding: 5px;
     margin: 0;
     text-align: right;
@@ -511,9 +537,9 @@
  */
 
 acronym { cursor: help; }
-.boxed          { background-color: #E5E4D9;}
-.underlined_5   { border-bottom: solid 5px #E5E4D9;}
-.underlined_10  { border-bottom: solid 10px #E5E4D9;}
+.boxed          { background-color: #4C6C8F;}
+.underlined_5   { border-bottom: solid 5px #4C6C8F;}
+.underlined_10  { border-bottom: solid 10px #4C6C8F;}
 .code           { border-color: #CFDCED;} 
 
 
@@ -605,3 +631,97 @@
   list-style-position: outside;
   margin-left: 2em;
 } 
+
+.breadtrail {
+    background: #CEDFEF;
+    color: #0F3660;
+    border-bottom: solid 1px white;
+    padding: 3px 10px;
+    font-size: 75%;
+}
+.breadtrail a:link { color: #0F3660; }
+.breadtrail a:visited { color: #0F3660; }
+.breadtrail a:hover { color: #000066; }
+
+#page .breadtrail {
+    clear:both;
+    position: relative;
+    border-bottom: solid 1px black;
+    border-top: solid 1px black;
+    padding: 0px 200px;
+    z-index:10;
+}
+
+#branding-tagline-name {
+    display: none;
+}
+
+#branding-tagline-tagline {
+    display: none;
+}
+
+a:link { color: #0F3660; } 
+a:visited { color: #009999; } 
+a:hover { color: #000066; }
+
+/* This stuff was in pelt.basic.css. Any duplicate code or other code that
+could be combined have been added above */
+
+img { border: 0; }
+
+.clearboth {
+  clear: both;
+}
+
+.frame {
+  border: solid black 1px;
+  margin: 1em 3em;
+}
+
+.frame .label {
+  background: #369;
+  color: white;
+  font-weight: bold;
+  padding: 5px 10px;
+}
+.frame .content {
+  padding: 5px 10px;
+  background: #F0F0FF;
+  color: black;
+  line-height: 120%;
+  font-size: 90%;
+}
+/*
+ * Notes, Warnings, Fixme ...
+ */
+.note, .warning, .fixme {
+  border: solid black 1px;
+  margin: 1em 3em;
+}
+.fixme    { border-color: #CC6600;} 
+.note     { border-color: #006699;} 
+.warning  { border-color: #990000;} 
+
+/* Label */
+.note    .label { background: #336699; }
+.warning .label { background: #CC0000; }
+.fixme   .label { background: #C6C600; }
+
+.note .label, .warning .label, .fixme .label {
+  color: white;
+  font-weight: bold;
+  padding: 5px 10px;
+}
+
+/* Content */
+.note    .content { background: #F0F0FF; }
+.warning .content { background: #FFF0F0; }
+.fixme   .content { background: #FFFFBF; }
+
+.note .content, .warning .content, .fixme .content {
+  color: black;
+  line-height: 120%;
+  font-size: 90%;
+  padding: 5px 10px;
+}
+