diff --git a/src/data/Web_Basic-Blue.css b/src/data/Web_Basic-Blue.css
index ae7957526..d8cf157bc 100644
--- a/src/data/Web_Basic-Blue.css
+++ b/src/data/Web_Basic-Blue.css
@@ -1,8 +1,8 @@
-/*
+/*
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright 2008-2010 Rob G. Healey <robhealey1@gmail.com>
+# Copyright (C) 2008-2010 Rob G. Healey <robhealey1@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,34 +48,41 @@ Females     Web_Gender_Female.png
  NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- */
 body {
-    background-color :#FFF;
-    color: #000;
+    background-color: #000;
+    color: #FFF;
 }
-div#alphabet, div#navigation, div#subnavigation {
-    border-top: solid 2px #000;
+
+/* Menu Elements
+-------------------------------------------------------------------------------------------- */
+div#alphabet ul, div#navigation ul, div#subnavigation ul {
+    background-color: #000;
+}
+div#alphabet ul li, div#navigation ul li, div#subnavigation ul li {
+    border-color: #13A926;
 }
 div#alphabet ul li a {
-    color: #000;
-}
-div#navigation ul, div#subnavigation ul {
-    border-bottom: solid 2px #000;
+    color: #FFF;
+    font: normal 16px sans;
 }
 div#navigation ul li a, div#subnavigation ul li a {
-    color: #000;
+    color: #FFF;
+    font: normal 14px serif;
 }
 div#navigation ul li.CurrentSection a {
-    background-color: #00029D;
+    background-color: #13A926;
     color: #FFF;
+    font-weight: bold;
+    font-style: italic;
 }
 div#navigation ul li.CurrentSection a:hover {
     background-color: #BCEAF6;
     color: #000;
 }
 div#subnavigation ul li.CurrentSection a {
-    font-weight: bold;
-    font-style: italic;
     background-color: #BCEAF6;
     color: #000;
+    font-weight: bold;
+    font-style: italic;
 }
 div#subnavigation ul li.CurrentSection a:hover {
     background-color: #000;
@@ -109,6 +116,8 @@ img {
     background:none;
 }
 .content {
+    background-color: #FFF;
+    color: #000;
     overflow: auto;
     width:965px;
     margin:0 auto;
@@ -137,13 +146,20 @@ img {
     clear:both;
 }
 
+/* Gramps Styled Notes
+------------------------------------------------------- */
+div#grampsstylednote a {
+    color:  Navy;
+    text-decoration: underline;
+}
+
 /* General Text
 ----------------------------------------------------- */
 h1 {
     font:normal 2em/1.2em serif;
 }
 h2 {
-    font:bold 2em/1.2em sans;
+    display: none;
 }
 h3 {
     font:normal 2em/1.2em serif;
@@ -225,6 +241,7 @@ div#header  {
     border-bottom: solid 8px #13A926;
     height: 65px;
     width: 100%;
+    overflow: hidden;
 }
 #SiteTitle {
     margin:0;
@@ -248,11 +265,11 @@ div#footer {
     clear:both;
     overflow:hidden;
     width:100%;
+    height: 60px;
     font-size:12px;
     line-height:130%;
     color:#FFF;
-    margin:0;
-    padding:15px 0 0 0;
+    margin-top: 0.5cm;
     background-color:#00029D;
     border-top:solid 8px #13A926;
 }
@@ -504,13 +521,22 @@ div#Places {
     padding: 0;
 }
 div#Places table.infolist tbody tr td.ColumnLetter {
-    background-color: #BCEAF6;
+    width: 6%;
 }
 div#Places table.infolist tbody tr td.ColumnLetter a:hover {
     background: none;
 }
-div#Places table.infolist tbody tr td.ColumnName a {
-    padding:.1em 10px .3em 10px;
+div#Places table.infolist tbody tr td.ColumnName {
+    width: 45%;
+}
+div#Places table.infolist tbody tr td.ColumnState {
+    width: 8%;
+}
+div#Places table.infolist tbody tr td.ColumnCountry {
+    width: 8%;
+}
+div#Places table.infolist tbody tr td.ColumnCoordinates {
+    width: 25%;
 }
 
 /* EventList and EventDetail
@@ -522,33 +548,33 @@ div#EventList, div#EventDetail {
 div#events table.eventlist {
     margin-top: .3cm;
 }
-div#events table.eventlist tbody tr td.ColumnEvent a {
-    padding: 2px 100px 2px 10px;
-}
-div#events table.eventlist tbody tr td.ColumnPlace a {
-    padding: 2px 70px 2px 0px;
-}
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    width: 16%;
+    width: 12%;
 }
 table.eventlist tbody tr td.ColumnPlace {
-    width: 35%;
+    width: 25%;
 }
-table.eventlist tbody tr td.ColumnSources {
-    width: 12%;
+table.eventlist tbody tr td.ColumnDescription {
+    width: 15%;
 }
 table.eventlist tbody tr td.ColumnNotes {
     width: 25%;
 }
+table.eventlist tbody tr td.ColumnSources {
+    width: 12%;
+}
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnPartner {
     width: 35%;
 }
+div#EventList table.infolist tbody tr td.ColumnLetter a:hover {
+    background: none;
+}
 div#EventList table.eventlist tbody tr.BeginName {
     border-top: solid 1px #000;
 }
@@ -597,7 +623,6 @@ div#EventDetail table.eventlist tbody tr {
     border-top: dashed 1px #000;
 }
 div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
-    text-transform: uppercase;
     width: 20%;
 }
 div#EventDetail table.eventlist tbody tr td.ColumnDate {
@@ -741,10 +766,9 @@ div#EventDetail table.eventlist tbody tr td.ColumnDate {
 
 /* Download 
 ----------------------------------------------------- */
-
 div#Download { 
     margin: 0;
-    padding: 0px 0px .5em 0px;
+    width: 100%;
 }
 div#Download table.download {
     padding: 0;
@@ -752,9 +776,6 @@ div#Download table.download {
     border: solid 1px #000;
     width: 100%;
 }
-div#Download table.download img {
-    text-align: center;
-}
 div#Download table.download tbody tr#Row02 {
     border-bottom: solid 2px #000;
 }
@@ -762,23 +783,22 @@ div#Download table.download tbody tr td {
     border: solid 1px #000;
     text-align: left;
 }
-div#Download table.download td.Filename {
+div#Download table.download td.ColumnFilename {
     width: 30%;
 }
-div#Download table.download td.Filename a {
+div#Download table.download td.ColumnFilename a {
     font-weight: bold;
     font-style: italic;
-    text-decoration: none;
 }
-div#Download table.download td.Description {
+div#Download table.download td.ColumnDescription {
     width: 45%;
 }
-div#Download table.download td.License {
-    width: 6%;
-}
-div#Download table.download td.Modified {
+div#Download table.download td.ColumnModified {
     width: 17%;
 }
+div#Download p#description a.copyright a img {
+    float: center;
+}
 
 /* Sources
 ----------------------------------------------------- */
@@ -864,7 +884,7 @@ div.subsection table, div.subsection ol, div.subsection p {
     font-size:.9em;
 }
 div.subsection a {
-    text-decoration:none;
+    text-decoration:underline;
 }
 div.subsection a:hover {
     text-decoration:underline;
@@ -894,7 +914,6 @@ div#events h4 {
     font-weight:bold;
     font-size:10px;
     line-height:12px;
-    text-transform:uppercase;
     color: #000;
     padding:6px 0 4px 0;
     background-color: #70B1ED;
@@ -958,9 +977,16 @@ table.attrlist tbody tr td.ColumnAttrSources {
 
 /* Subsections : Parents
 ----------------------------------------------------- */
+div#parents {
+    margin: 0;
+    padding: 0;
+}
 div#parents table.infolist {
     margin-top:.5em;
 }
+div#parents table.infolist tbody tr td {
+    border: none;
+}
 div#parents table.infolist tbody tr td.ColumnAttribute {
     width:19%;
 }
@@ -1367,7 +1393,6 @@ div#pedigree {
     width:100%;
     font-size:2em;
     line-height:100%;
-    text-transform:none;
     color: #542;
     padding:.3em 0 .2em 0;
     background-color: #FFF;
diff --git a/src/data/Web_Navigation-Horizontal.css b/src/data/Web_Navigation-Horizontal.css
index 628c47497..273e5a5e4 100755
--- a/src/data/Web_Navigation-Horizontal.css
+++ b/src/data/Web_Navigation-Horizontal.css
@@ -31,7 +31,7 @@ Style Name: Web_Navigation-Horizontal Stylesheet
 ----------------------------------------------------- */
 body {
     margin: 0 auto;
-    padding: 0 14px 0 14px;
+    padding: 0px 14px 0px 14px;
     width: 965px;
 }
 
@@ -47,54 +47,54 @@ div#alphabet ul {
     height: 24px;
     margin: 0;
     padding: 0px 0px 0px 16px;
-    border-width: 2px 0px 4px 0px;
+    border-width: 2px 0px 2px 0px;
     border-style: solid;
 }
-div#alphabet ul li:after {
-    content: "  |";
-}
 div#alphabet ul li {
+    border-width: 0px 2px 0px 2px;
+    border-style: solid;
     margin: 0;
     float: left;
 }
+div#alphabet ul li:first-child {
+    margin-left: 4px;
+    border-left: none;
+}
 div#alphabet ul li a {
+    font: normal 16px sans;
     display: block;
     padding: 4px 8px 4px 8px;
     float: left;
-    font: bold 16px/100% sans;
     margin: 0;
-    text-decoration: none;
 }
 
-/* Navigation
+/* Navigation/ Subnavigation
 ----------------------------------------------------- */
 div#navigation, div#subnavigation {
     width: 100%;
     margin: 0;
-    padding: 0;
 }
 div#navigation ul, div#subnavigation ul {
     list-style: none;
     min-width: 900px;
     height: 24px;
     margin: 0;
-    padding: 0px 0px 0px 9px;
+    padding: 4px 0px 0px 14px;
+    border-width: 2px 0px 2px 0px;
+    border-style: solid;
 }
 div#navigation ul li, div#subnavigation ul li {
+    border-width: 0px 2px 0px 2px;
+    border-style: solid;
     float: left;
+    padding: 2px 6px 4px 6px;
+    margin: 0;
 }
 div#navigation ul li:first-child, div#subnavigation ul li:first-child {
-    margin-left: 4px;
-    content: "| ";
-}
-div#navigation ul li:after, div#subnavigation ul li:after {
-    content: "| ";
+    border-left: none;
 }
 div#navigation ul li a, div#subnavigation ul li a {
     display: block;
-    padding: 4px;
-    float: left;
-    font: .8em bold italic small-caps verdana, serif;
+    font: normal 12px serif;
     text-decoration: none;
-    margin: 0;
 }