diff --git a/src/data/Web_Basic-Ash.css b/src/data/Web_Basic-Ash.css
index 573c53993..14682a92e 100644
--- a/src/data/Web_Basic-Ash.css
+++ b/src/data/Web_Basic-Ash.css
@@ -1,32 +1,38 @@
 /*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2008 Jason M. Simanek
-# Copyright 2009 Stephane Charette
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
+**************************************************************************************************
+Copyright Holder and License
 **************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic-Ash Stylesheet
 Style Author: Jason M. Simanek (2008)
 Note: Adapted from GRAMPS original Modern Style stylesheet
 **************************************************************************************************
+This website was created with GRAMPS <http://www.gramps-project.org/>
+--------------------------------------------------------------------------------------------------
+GRAMPS is a Free Software Project for Genealogy, offering a professional
+
+genealogy program, and a wiki open to all. It is a community project, created,
+developed and governed by genealogists.
+
+Go to <http://gramps-project.org/> to learn more!
+
+--------------------------------------------------------------------------------------------------
+Copyright 2008 Jason M. Simanek
+Copyright 2009 Stephane Charette
+
+This file is part of the GRAMPS program.
+
+GRAMPS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 of the License.
+
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GRAMPS. If not, see <http://www.gnu.org/licenses/>.
+--------------------------------------------------------------------------------------------------
 
 Color Palette
 --------------------------------------------------------------------------------------------------
@@ -39,17 +45,19 @@ gray very light         #EEE
 white                   #FFF
 --------------------------------------------------------------------------------------------------
 
-# $Id $
+# $Id$
 
  NarrativeWeb Styles
------------------------------------------------------------------------------------------------- */
+------------------------------------------------------------------------------------------------ 
 
-/*  General Elements
+ General Elements
 ----------------------------------------------------- */
+
 body {
     font-family:sans-serif;
     color:#000;
     margin:0;
+    padding:0;
     background-color:#FFF;
 }
 div {
@@ -155,7 +163,7 @@ a:visited {
 
 /* Header
 ----------------------------------------------------- */
-div#header {
+#header {
     padding:15px 15px 2px 15px;
     margin:0;
     background-color:#EEE;
@@ -164,73 +172,21 @@ div#header {
     color:#333;
     margin:0 0 3px 0;
 }
-div#header p {
+#header p {
     font-size:1em;
     font-weight:bold;
     color:#999;
     margin:0;
 }
 
-/* Footer
------------------------------------------------------ */
-div#footer {
-    clear:both;
-    overflow:hidden;
-    width:100%;
-    font-size:12px;
-    line-height:130%;
-    color:#333;
-    margin:0;
-    padding:15px 0 0 0;
-    background-color:#CCC;
-    border-top:solid 1px #333;
-}
-div#footer a, div#footer a:visited {
-    text-decoration:none;
-    color:#333;
-}
-div#footer a:hover {
-    text-decoration:underline;
-}
-div#footer img {
-    border:0;
-    margin:0 auto;
-    vertical-align:middle;
-}
-div#footer p#createdate {
-    float:left;
-    width:40%;
-    text-align:left;
-    margin-left:10px;
-}
-div#footer p#copyright {
-    float:right;
-    width:40%;
-    text-align:right;
-    margin-right:10px;
-}
-div#footer p#copyright img {
-    margin-right:10px;
-}
-#user_footer {
-    width:70%;
-    float:left;
-    margin:1em;
-}
-#user_footer p {
-    font:normal 1em/1.2em serif;
-    margin:0;
-    padding:0;
-}
-
 /* Navigation
 ----------------------------------------------------- */
-div#navigation, div#subnavigation {
+#navigation, #subnavigation {
     margin:0;
     padding:4px 0 0 0;
     background-color:#EEE;
 }
-div#navigation ul, div#subnavigation ul {
+#navigation ul, #subnavigation ul {
     list-style:none;
     min-width:770px;
     height:22px;
@@ -238,12 +194,12 @@ div#navigation ul, div#subnavigation ul {
     padding:0 0 0 12px;
     border-bottom:1px solid #999;
 }
-div#navigation ul li, div#subnavigation ul li {
+#navigation ul li, #subnavigation ul li {
     margin:0;
     padding:0;
     float:left;
 }
-div#navigation ul li a, div#subnavigation ul li a {
+#navigation ul li a, #subnavigation ul li a {
     display:block;
     font-size:12px;
     line-height:100%;
@@ -253,11 +209,11 @@ div#navigation ul li a, div#subnavigation ul li a {
     padding:5px 5px;
     background-color:#EEE;
 }
-div#navigation ul li a:hover, div#subnavigation ul li a:hover {
+#navigation ul li a:hover, #subnavigation ul li a:hover {
     background-color:#CCC;
     border-bottom:solid 1px #000;
 }
-div#navigation ul li.CurrentSection a, div#subnavigation ul li.CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
     padding-bottom:4px;
     border-top:solid 1px #999;
     border-right:solid 1px #999;
@@ -265,14 +221,14 @@ div#navigation ul li.CurrentSection a, div#subnavigation ul li.CurrentSection a
     border-bottom:solid 1px #FFF;
     background-color:#FFF;
 }
-div#navigation ul li.CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
     background-color:#FFF;
 }
-div#subnavigation ul li.CurrentSection a {
+#subnavigation ul li.CurrentSection a {
     border-width:0 0 1px 0;
 }
 
-/* Alphabet Navigation Bar
+/* Alphabet Navigation
 ----------------------------------------------------- */
 div#alphabet {
     width: 100%;
@@ -297,7 +253,7 @@ div#alphabet ul li {
     float:left;
 }
 div#alphabet ul li a {
-    display:block;
+    display: block;
     padding: 4px 8px 4px 8px;
     float:left;
     font:bold 16px/100% sans;
@@ -314,7 +270,7 @@ div#alphabet ul li a:hover {
 ----------------------------------------------------- */
 table {
     font-size:14px;
-    margin:0;
+    margin:0 15px;
     padding:0;
     border:none;
     border-collapse:collapse;
@@ -480,10 +436,23 @@ table.individuallist tbody tr td.ColumnName a {
 table.individuallist tbody tr td.ColumnName a:hover {
     background-color:#CCC;
 }
-#IndividualDetail div table.infolist tr td, #Individuals div table.infolist tr td p {
+#Individuals div table.infolist tr td p {
     vertical-align:top;
 }
-#IndividualDetail div table.infolist tr td a, #Individuals div table.infolist tr td p a {
+#Individuals div table.infolist tr td p a {
+    display:inline;
+}
+
+/* IndividualDetail
+------------------------------------------------------ */
+#IndividualDetail {
+    background-color:#EEE;
+}
+#IndividualDetail div table.infolist tr td {
+    font:normal .9em/1.2em sans-serif;
+    vertical-align:top;
+}
+#IndividualDetail div table.infolist tr td a {
     display:inline;
 }
 #IndividualDetail table.infolist tr td a:hover {
@@ -491,8 +460,10 @@ table.individuallist tbody tr td.ColumnName a:hover {
 }
 #IndividualDetail table.infolist tbody tr td.ColumnAttribute {
     width:10%;
-    color:#999;
-    padding-left:5px;
+    color:#696969;
+}
+#IndividualDetail div.subsection table tr td:first-child {
+    padding-left:20px;
 }
 
 /* Sources
@@ -519,99 +490,6 @@ table.individuallist tbody tr td.ColumnName a:hover {
     padding:.1em 10px .3em 10px;
 }
 
-/* EventList and EventDetail
------------------------------------------------------ */
-
-div#EventList, div#EventDetail { }
-
-div#events table.eventlist {
-    margin-top: .3cm;
-}
-table.eventlist tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-table.eventlist tbody tr td.ColumnEvent {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnDate {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnPlace {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnDescription {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-table.eventlist tbody tr td.ColumnPerson {
-    width: 30%;
-}
-table.eventlist tbody tr td.ColumnPartner {
-    width: 35%;
-}
-div#EventList table.eventlist tbody tr.BeginName {
-    border-top: solid 1px #000;
-}
-div#EventList table.eventlist tbody tr td.ColumnEvent a,
-div#EventList table.eventlist tbody tr td.ColumnPerson a,
-div#EventList table.eventlist tbody tr td.ColumnPartner a {
-    display: block;
-    padding: .9em 10px;
-}
-div#EventList table.alphaevent {
-    padding: .3em 0 .3em 0;
-    margin: 0;
-}
-div#EventList table.alphaevent tbody tr.BeginEvent {
-    border-top: solid 1px #000;
-}
-div#EventList table.alphaevent tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType {
-    width: 15%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType a:hover {
-    background: none;
-}
-div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID {
-    width: 12%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnDate {
-    width: 20%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson {
-    width: 60%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.father, 
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
-    display:block;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
-    content:"+ ";
-}
-div#EventDetail h3 {
-    font-size: 1.4em;
-}
-div#EventDetail table.eventlist {
-    margin: .5cm 0 .3cm 1.5cm;
-    width: 800px;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
-    border-top: solid 1px #000;
-    font-weight: bold;
-    text-transform: uppercase;
-    width: 20%;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnEvent {
-    border-top: solid 1px #000;
-}
-
 /* Gallery
 ----------------------------------------------------- */
 #Gallery table.infolist tbody tr td.ColumnRowLabel, #Gallery table.infolist tbody tr td.ColumnDate {
@@ -689,53 +567,6 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
     border-color:#CCC;
 }
 
-/* Download 
------------------------------------------------------ */
-
-#Download {
-    margin: 0;
-    padding: .5em 0 .5em 0;
-}
-table.download {
-    padding: 0;
-    margin: .5em 0 .5em 0;
-    border: solid 1px #000;
-    width: 100%;
-    background-color: #CCC;
-}
-table.download img {
-    /* float:center; */
-}
-table.download tbody tr#Row02 {
-    border-bottom:solid 1px #000;
-}
-table.download tbody tr td { 
-    border-style:solid;
-    border-color: #000;
-    border-width: 0px 2px 2px 2px;
-    text-align:left;
-}
-table.download td.ColumnFilename {
-    width:30%;
-    background-color: #FFF;
-}
-table.download td.ColumnFilename a {
-    display:block;
-    padding:10px;
-    font-weight:bold;
-    font-style: italic;
-    text-decoration:none;
-}
-table.download td.ColumnDescription {
-    width:45%;
-}
-table.download td.ColumnLicense {
-    width:6%;
-}
-table.download td.ColumnModified {
-    width:17%;
-}
-
 /* Contact
 ----------------------------------------------------- */
 #Contact #summaryarea {
@@ -781,70 +612,61 @@ table.download td.ColumnModified {
     text-decoration:underline;
 }
 
-/* Repositories
------------------------------------------------------- */
-div#RepositoryList { }
-
-div#RepositoryList table.repolist tbody tr td {
-    background-color: #CCC;
+/* Download 
+----------------------------------------------------- */
+#Download { 
+    padding:1cm;
+    height:396px;
 }
-div#RepositoryList table.repolist tbody tr td a {
-    display: block;
-    padding: .3em 10px;
+table.download {
+    border:solid 2px #000;
+    width:100%;
 }
-div#RepositoryList table.repolist tbody tr td.ColumnRowLabel {
-    width: 9%;
+table.download img {
+    float:center;
 }
-div#RepositoryList table.repolist tbody tr td.ColumnType {
-    width: 15%;
+table.download thead tr th {
+    text-align:center;
+    border:solid 2px #000;
+    color: #000;
+    text-transform:uppercase;
 }
-div#RepositoryList table.repolist tbody tr td.ColumnName {
-    background-color: #FFF;
+table.download tbody tr#Row02 {
+    border-bottom:solid 2px #000;
 }
-
-/* Address Book
------------------------------------------------------- */
-div#AddressBookList, AddressBookDetail {
-    margin: 0;
-    padding: 0;
+table.download thead tr th, table.download tbody tr td { 
+    padding-left:10px;
+    padding-top:20px;
+    border-style:solid;
+    border-color:#000;
+    border-width:0 2px 2px 2px;
+    text-align:left;
 }
-div#AddressBookList table.addressbook {
-    margin: .3em 0 .3em 0;
+table.download td.Description {
+    width: 50%;
 }
-div#AddressBookList tble.addressbook tbody tr.Totals td {
-    text-align: left;
-    background-color: #EEE;
+table.download td.License {
+    width:8%;
 }
-div#AddressBookList table.addressbook tbody tr td {
-    background-color: #CCC;
-    text-align: center;
-    border: solid 1px #000;
+table.download td.Filename {
+    width:30%;
 }
-div#AddressBookList table.addressbook tbody tr td.ColumnRowLabel {
-    width: 4%;
+table.download td.Filename a {
+    font-weight:bold;
+    font-style: italic;
+    text-decoration:none;
 }
-div#AddressBookList table.addressbook tbody tr td.ColumnName {
-    background-color: #FFF;
-    text-align: left;
-    width: 70%;
+table.download td.Filename a:hover {
+    text-decoration:underline;
 }
-div#AddressBookList table.addressbook tbody tr td.ColumnName a {
-    display: block;
-    padding: 6px 0px 6px 0px;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnAddress {
-    width: 8%;
-}
-div#AddressBookList table.adressbook tbody tr td.ColumnResidence {
-    width: 8%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
-    width: 8%;
+table.download td.Modified {
+    width:12%;
+    font-weight:bold;
 }
 
 /* Subsections
 ----------------------------------------------------- */
-#Home, #Introduction, #Contact {
+#Home, #Introduction,  #Contact {
     padding:1.5em 0 3em 0;
 }
 #Home p, #Introduction p, #Contact p {
@@ -979,46 +801,6 @@ div#addresses table.infolist tbody tr td.ColumnValue {
 
 /* Subsections : Attributes
 ----------------------------------------------------- */
-div#attributes {
-    margin: 0;
-    padding: 0;
-}
-table.attrlist {
-    width: 100%;
-}
-table.attrlist thead tr th.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist thead tr th.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td {
-    background-color: #EEE;
-    border-bottom: dashed 1px #000;
-}
-table.attrlist tbody tr td.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttrType {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrValue {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrNotes {
-    width: 45%;
-}
-table.attrlist tbody tr td.ColumnAttrSources {
-    background-color: #FFF;
-    width: 15%;
-}
 
 /* Subsections : Gallery
 ----------------------------------------------------- */
@@ -1080,25 +862,6 @@ div#sourcerefs ol li ol {
 
 /* Subsections : Weblinks
 ----------------------------------------------------- */
-div#WebLinks {
-    margin : 0 auto;
-    padding: 0;
-}
-
-table.weblinks tr td {
-    background-color: #EEE;
-    border-bottom: dashed 1px #000;
-}
-table.weblinks tr td.ColumnRowLabel {
-    width: 6%;
-}
-table.weblinks tr td.ColumnType {
-    width: 30%;
-}
-table.weblinks tr td.ColumnDescription {
-    background-color: #FFF;
-    width: 30%;
-}
 
 /* Subsections : Pedigree
 ----------------------------------------------------- */
@@ -1169,17 +932,11 @@ table.weblinks tr td.ColumnDescription {
     color:#000;
     width:118px;
     padding:5px 20px 7px 20px;
+    margin-top:-25px;
     margin-left:16px;
     background-color:#EEE;
     border:solid 1px #999;
 }
-#treeContainer div.boxbg a.noThumb, 
-#treeContainer div.AncCol3 a, 
-#treeContainer div.AncCol4 a,
-#treeContainer div.AncCol3 span.unlinked, 
-#treeContainer div.AncCol4 span.unlinked {
-    margin-top:10px;
-}
 #treeContainer div.boxbg a:hover {
     position:relative;
     z-index:999;
@@ -1193,6 +950,13 @@ table.weblinks tr td.ColumnDescription {
 #treeContainer div.boxbg a:hover, #treeContainer div.AncCol3 a:hover, #treeContainer div.AncCol4 a:hover {
     margin-top:-44px;
 }
+#treeContainer div.boxbg a.noThumb, 
+#treeContainer div.AncCol3 a, 
+#treeContainer div.AncCol4 a,
+#treeContainer div.AncCol3 span.unlinked, 
+#treeContainer div.AncCol4 span.unlinked {
+    margin-top:10px;
+}
 #treeContainer div.boxbg a.noThumb:hover {
     margin-top:0;
 }
@@ -1204,14 +968,12 @@ table.weblinks tr td.ColumnDescription {
 }
 #treeContainer div.boxbg span.thumbnail {
     display:block;
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
     padding:4px 0;
 }
 #treeContainer div.boxbg span.thumbnail img {
-	max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
 }
 #treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
@@ -1274,6 +1036,57 @@ table.weblinks tr td.ColumnDescription {
     background-color:#EEE;
 }
 
+/* Footer
+----------------------------------------------------- */
+#footer {
+    clear:both;
+    width:100%;
+    font-size:12px;
+    line-height:130%;
+    color:#333;
+    margin:0;
+    padding:15px 0 0 0;
+    background-color:#CCC;
+    border-top:solid 1px #333;
+}
+#footer a, #footer a:visited {
+    text-decoration:none;
+    color:#333;
+}
+#footer a:hover {
+    text-decoration:underline;
+}
+#footer img {
+    border:0;
+    margin:0 auto;
+    vertical-align:middle;
+}
+#footer p#createdate {
+    float:left;
+    width:40%;
+    text-align:left;
+    margin-left:10px;
+}
+#footer p#copyright {
+    float:right;
+    width:40%;
+    text-align:right;
+    margin-right:10px;
+}
+#footer p#copyright img {
+    margin-right:10px;
+}
+#user_footer {
+    width:70%;
+    float:left;
+    margin:1em;
+}
+#user_footer p {
+    font:normal 1em/1.2em serif;
+    margin:0;
+    padding:0;
+}
+
 /* Calendar Styles
 -------------------------------------------------------------------------------------------- */
 /* Calendar : General */
@@ -1442,27 +1255,3 @@ body#fullyearlinked table.calendar thead tr th.monthName {
 body#fullyearlinked table.calendar tbody tr td {
     height:3em;
 }
-
-/* Calendar: OneDay 
---------------------------------------------------------------------------------- */
-body#OneDay h3 {
-    color: #000;
-    font-weight: bold;
-    text-align: center;
-}
-table.oneday {
-    margin: .3em 0 .3em 0;
-    padding: 0;
-}
-table.oneday tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-table.oneday tbody tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.oneday tbody tr td.ColumnText {
-    width: 85%;
-}
-table.oneday tbody tr td.ColumnEvent {
-    width: 10%;
-}
diff --git a/src/data/Web_Basic-Cypress.css b/src/data/Web_Basic-Cypress.css
index a6a0aaf0c..ac7cbf0f9 100644
--- a/src/data/Web_Basic-Cypress.css
+++ b/src/data/Web_Basic-Cypress.css
@@ -1,32 +1,37 @@
 /*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2008 Jason M. Simanek
-# Copyright 2009 Stephane Charette
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
+**************************************************************************************************
+Copyright Holder and License
 **************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic - Cypress
 Style Author: Jason Simanek (2008)
 Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the original 'Tranquil' stylesheet
 **************************************************************************************************
+This website was created with GRAMPS <http://www.gramps-project.org/>
+--------------------------------------------------------------------------------------------------
+GRAMPS is a Free Software Project for Genealogy, offering a professional
+genealogy program, and a wiki open to all. It is a community project, created,
+developed and governed by genealogists.
+
+Go to <http://gramps-project.org/> to learn more!
+
+--------------------------------------------------------------------------------------------------
+Copyright 2008 Jason M. Simanek
+Copyright 2009 Stephane Charette
+
+This file is part of the GRAMPS program.
+
+GRAMPS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 of the License.
+
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GRAMPS. If not, see <http://www.gnu.org/licenses/>.
+--------------------------------------------------------------------------------------------------
 
 Color Palette
 --------------------------------------------------------------------------------------------------
@@ -40,17 +45,16 @@ white                   #FFF
 
 # $Id$
 
- NarrativeWeb Styles
---------------------------------------------------------------------------------------------  */
-body#NarrativeWeb {
-    font-family: sans-serif;
-    color: #000;
-    background-color: #FFF;
-}
-
-/* General Elements
+ General Elements
 ----------------------------------------------------- */
 
+body {
+    font-family:sans-serif;
+    color:#000;
+    margin:0;
+    padding:0;
+    background-color:#FFF;
+}
 div {
     margin:0;
     padding:0;
@@ -63,7 +67,7 @@ img {
     background:none;
 }
 .content {
-    padding-top: .5cm;
+    padding-top: 1cm;
     background-color:#FFF;
 }
 .content div.snapshot {
@@ -152,18 +156,15 @@ a:visited {
 
 /* Header
 ----------------------------------------------------- */
-div#header {
+#header {
+    padding:15px 15px 15px 15px;
+    margin:0;
     background-color:#454;
-}
-div#header a {
-    color: #FFF;
+    height: 1cm;
 }
 #SiteTitle {
-    margin:0;
-    padding:.5em 0 0.5em 10px;
-    font-size: 40px;
     color:#E0E6E0;
-    font-style: italic;
+    margin:0 0 3px 0;
 }
 #header p {
     font-size:1em;
@@ -172,67 +173,14 @@ div#header a {
     margin:0;
 }
 
-/* Footer
------------------------------------------------------ */
-div#footer {
-    clear:both;
-    overflow:hidden;
-    width:100%;
-    font-size:12px;
-    line-height:130%;
-    color:#E8E6E8;
-    margin:0;
-    padding:15px 0 0 0;
-    border-top: solid 1px #454;
-    background-color: #454;
-}
-#footer a, #footer a:visited {
-    text-decoration:none;
-    color:#E0E6E0;
-}
-#footer a:hover {
-    text-decoration:underline;
-    background:none;
-}
-#footer img {
-    border:0;
-    margin:0 auto;
-    vertical-align:middle;
-}
-#footer p#createdate {
-    float:left;
-    width:40%;
-    text-align:left;
-    margin-left:10px;
-}
-#footer p#copyright {
-    float:right;
-    width:40%;
-    text-align:right;
-    margin-right:10px;
-}
-#footer p#copyright img {
-    margin-right:10px;
-}
-#user_footer {
-    width:70%;
-    float:left;
-    margin:1em;
-}
-#user_footer p {
-    font:normal 1em/1.2em serif;
-    margin:0;
-    padding:0;
-}
-
 /* Navigation
 ----------------------------------------------------- */
-#navigation {
+#navigation, #subnavigation {
     margin:0;
     padding:4px 0 0 0;
     background-color:#454;
 }
-#navigation ul {
+#navigation ul, #subnavigation ul {
     list-style:none;
     min-width:770px;
     height:22px;
@@ -240,12 +188,12 @@ div#footer {
     padding:0 0 0 12px;
     border-bottom:1px solid #7C8F7C;
 }
-#navigation ul li {
+#navigation ul li, #subnavigation ul li {
     margin:0;
     padding:0;
     float:left;
 }
-#navigation ul li a {
+#navigation ul li a, #subnavigation ul li a {
     display:block;
     font-size:12px;
     line-height:100%;
@@ -256,14 +204,14 @@ div#footer {
     padding:5px 5px;
     background-color:#454;
 }
-#navigation ul li a:hover {
+#navigation ul li a:hover, #subnavigation ul li a:hover {
     color:#FFF;
     padding-top:4px;
     background-color:#9DBF9D;
     border-top:solid 1px #454;
     border-bottom:solid 1px #000;
 }
-#navigation ul li.CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
     color:#454;
     padding-bottom:4px;
     border-top:solid 1px #7C8F7C;
@@ -272,7 +220,7 @@ div#footer {
     border-bottom:solid 1px #FFF;
     background-color:#FFF;
 }
-#navigation ul li.CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover, #subnavigation ul li.CurrentSection a:hover {
     padding-top:5px;
     background-color:#FFF;
 }
@@ -292,11 +240,10 @@ div#alphabet ul {
     padding: 0px 0px 0px 16px;
     border-width: 2px 0px 4px 0px;
     border-style: solid;
-    border-color: #000;
+    border-color: #FFF;
 }
 div#alphabet ul li:after {
     content:"  |";
-    color: #FFF;
 }
 div#alphabet ul li {
     margin:0;
@@ -320,7 +267,7 @@ div#alphabet ul li a:hover {
 ----------------------------------------------------- */
 table {
     font-size:14px;
-    margin:0;
+    margin:0 15px;
     padding:0;
     border:none;
     border-collapse:collapse;
@@ -540,99 +487,6 @@ table.individuallist tbody tr td.ColumnName a:hover {
     padding:.1em 10px .3em 10px;
 }
 
-/* EventList and EventDetail
------------------------------------------------------ */
-div#EventList, div#EventDetail { }
-
-div#events table.eventlist {
-    margin-top: .3cm;
-}
-table.eventlist tbody tr.BeginName {
-    border-bottom: solid 1px #000;
-}
-table.eventlist tbody tr td {
-    padding: 4px 0px 4px 0px;
-    border-bottom: dashed 1px #000;
-}
-table.eventlist tbody tr td.ColumnEvent {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnDate {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnPlace {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnDescription {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-table.eventlist tbody tr td.ColumnPerson {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnPartner {
-    width: 35%;
-}
-div#EventList table.eventlist tbody tr td.ColumnEvent a,
-div#EventList table.eventlist tbody tr td.ColumnPerson a,
-div#EventList table.eventlist tbody tr td.ColumnPartner a {
-    display: block;
-    padding: .9em 10px;
-}
-div#EventList table.alphaevent {
-    padding: .3em 0 .3em 0;
-    margin: 0;
-}
-div#EventList table.alphaevent tbody tr.BeginEvent {
-    border-top: solid 1px #000;
-}
-div#EventList table.alphaevent tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType {
-    width: 15%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType a:hover {
-    background: none;
-}
-div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID {
-    width: 12%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnDate {
-    width: 20%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson {
-    width: 60%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.father, 
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
-    display:block;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
-    content:"+ ";
-}
-div#EventDetail h3 {
-    font-size: 1em;
-}
-div#EventDetail table.eventlist {
-    margin: .5cm 0 .3cm 1.5cm;
-    width: 800px;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
-    border-top: solid 1px #000;
-    font-weight: bold;
-    text-transform: uppercase;
-    width: 20%;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnEvent {
-    border-top: solid 1px #000;
-}
-
 /* Gallery
 ----------------------------------------------------- */
 #Gallery table.infolist tbody tr td.ColumnRowLabel, #Gallery table.infolist tbody tr td.ColumnDate {
@@ -766,7 +620,7 @@ table.download {
     width:100%;
 }
 table.download img {
-    text-align:center;
+    float:center;
 }
 table.download thead tr th {
     text-align:center;
@@ -807,71 +661,9 @@ table.download td.Modified {
     font-weight:bold;
 }
 
-/* Repositories
------------------------------------------------------- */
-div#RepositoryList {
-    margin: 0;
-    padding: 0;
-}
-div#RepositoryList table.repolist tbody tr td {
-}
-div#RepositoryList table.repolist tbody tr td a {
-    display: block;
-    padding: .3em 10px;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnRowLabel {
-    width: 9%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnType {
-    width: 15%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnName {
-    background-color: #FFF;
-}
-
-/* Address Book
------------------------------------------------------- */
-div#AddressBookList, AddressBookDetail {
-    margin: 0;
-    padding: 0;
-}
-div#AddressBookList table.addressbook {
-    margin: .3em 0 .3em 0;
-}
-div#AddressBookList tble.addressbook tbody tr.Totals td {
-    text-align: left;
-    background-color: #E0E0E6;
-}
-div#AddressBookList table.addressbook tbody tr td {
-    background-color: #9DBF9D;
-    text-align: center;
-    border: solid 1px #000;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnRowLabel {
-    width: 4%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName {
-    background-color: #FFF;
-    text-align: left;
-    width: 70%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName a {
-    display: block;
-    padding: 6px 0px 6px 0px;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnAddress {
-    width: 8%;
-}
-div#AddressBookList table.adressbook tbody tr td.ColumnResidence {
-    width: 8%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
-    width: 8%;
-}
-
 /* Subsections
 ----------------------------------------------------- */
-#Home, #Introduction {
+#Home, #Introduction, {
     padding:1.5em 0 3em 0;
 }
 #Home p, #Introduction p, #Contact p {
@@ -1006,45 +798,6 @@ div#addresses table.infolist tbody tr td.ColumnValue {
 
 /* Subsections : Attributes
 ----------------------------------------------------- */
-div#attributes {
-    margin: 0;
-    padding: 0;
-}
-table.attrlist {
-    width: 100%;
-}
-table.attrlist thead tr th.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist thead tr th.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td {
-    background-color: #E6E6E0;
-    border-bottom: dashed 1px #000;
-}
-table.attrlist tbody tr td.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttrType {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrValue {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrNotes {
-    width: 45%;
-}
-table.attrlist tbody tr td.ColumnAttrSources {
-    width: 15%;
-}
 
 /* Subsections : Gallery
 ----------------------------------------------------- */
@@ -1106,25 +859,6 @@ div#sourcerefs ol li ol {
 
 /* Subsections : Weblinks
 ----------------------------------------------------- */
-div#WebLinks {
-    margin : 0 auto;
-    padding: 0;
-}
-
-table.weblinks tr td {
-    background-color: #E0E6E0;
-    border-bottom: dashed 1px #000;
-}
-table.weblinks tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.weblinks tr td.ColumnType {
-    width: 30%;
-}
-table.weblinks tr td.ColumnDescription {
-    background-color: #FFF;
-    width: 30%;
-}
 
 /* Subsections : Pedigree
 ----------------------------------------------------- */
@@ -1171,7 +905,7 @@ table.weblinks tr td.ColumnDescription {
     page-break-before:always;
     margin:0;
     padding:0;
-    background:none;
+    background-color: #FFF;
 }
 #treeContainer {
     position:relative;
@@ -1195,17 +929,11 @@ table.weblinks tr td.ColumnDescription {
     color:#000;
     width:118px;
     padding:5px 20px 7px 20px;
+    margin-top:-25px;
     margin-left:16px;
     background-color:#E0E6E0;
     border:solid 1px #7C8F7C;
 }
-#treeContainer div.boxbg a.noThumb, 
-#treeContainer div.AncCol3 a, 
-#treeContainer div.AncCol4 a,
-#treeContainer div.AncCol3 span.unlinked, 
-#treeContainer div.AncCol4 span.unlinked {
-    margin-top:10px;
-}
 #treeContainer div.boxbg a:hover {
     position:relative;
     z-index:999;
@@ -1219,6 +947,13 @@ table.weblinks tr td.ColumnDescription {
 #treeContainer div.boxbg a:hover, #treeContainer div.AncCol3 a:hover, #treeContainer div.AncCol4 a:hover {
     margin-top:-44px;
 }
+#treeContainer div.boxbg a.noThumb, 
+#treeContainer div.AncCol3 a, 
+#treeContainer div.AncCol4 a,
+#treeContainer div.AncCol3 span.unlinked, 
+#treeContainer div.AncCol4 span.unlinked {
+    margin-top:10px;
+}
 #treeContainer div.boxbg a.noThumb:hover {
     margin-top:0;
 }
@@ -1230,14 +965,12 @@ table.weblinks tr td.ColumnDescription {
 }
 #treeContainer div.boxbg span.thumbnail {
     display:block;
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
     padding:4px 0;
 }
 #treeContainer div.boxbg span.thumbnail img {
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
 }
 #treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
@@ -1300,6 +1033,58 @@ table.weblinks tr td.ColumnDescription {
     background-color:#E0E6E0;
 }
 
+/* Footer
+----------------------------------------------------- */
+#footer {
+    clear:both;
+    width:100%;
+    font-size:12px;
+    line-height:130%;
+    color:#E0E6E0;
+    margin:0;
+    padding:0;
+    background-color:#454;
+    border-top:solid 1px #454;
+}
+#footer a, #footer a:visited {
+    text-decoration:none;
+    color:#E0E6E0;
+}
+#footer a:hover {
+    text-decoration:underline;
+    background:none;
+}
+#footer img {
+    border:0;
+    margin:0 auto;
+    vertical-align:middle;
+}
+#footer p#createdate {
+    float:left;
+    width:40%;
+    text-align:left;
+    margin-left:10px;
+}
+#footer p#copyright {
+    float:right;
+    width:40%;
+    text-align:right;
+    margin-right:10px;
+}
+#footer p#copyright img {
+    margin-right:10px;
+}
+#user_footer {
+    width:70%;
+    float:left;
+    margin:1em;
+}
+#user_footer p {
+    font:normal 1em/1.2em serif;
+    margin:0;
+    padding:0;
+}
+
 /* Calendar Styles
 -------------------------------------------------------------------------------------------- */
 /* Calendar : General */
@@ -1450,27 +1235,3 @@ body#WebCal #CreatorInfo a, body#WebCal #CreatorInfo a:hover {
     color:#9DBF9D;
     background-color:#E0E6E0;
 }
-
-/* Calendar: OneDay 
---------------------------------------------------------------------------------- */
-body#OneDay h3 {
-    color: #000;
-    font-weight: bold;
-    text-align: center;
-}
-table.oneday {
-    margin: .3em 0 .3em 0;
-    padding: 0;
-}
-table.oneday tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-table.oneday tbody tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.oneday tbody tr td.ColumnText {
-    width: 85%;
-}
-table.oneday tbody tr td.ColumnEvent {
-    width: 10%;
-}
diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css
index f564a1ab2..86b99edd1 100644
--- a/src/data/Web_Basic-Lilac.css
+++ b/src/data/Web_Basic-Lilac.css
@@ -1,32 +1,37 @@
 /*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2008 Jason M. Simanek
-# Copyright 2009 Stephane Charette
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
+**************************************************************************************************
+Copyright Holder and License
 **************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic - Lilac
 Style Author: Jason M. Simanek (2008)
 Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the original 'Business' stylesheet
 **************************************************************************************************
+This website was created with GRAMPS <http://www.gramps-project.org/>
+--------------------------------------------------------------------------------------------------
+GRAMPS is a Free Software Project for Genealogy, offering a professional
+genealogy program, and a wiki open to all. It is a community project, created,
+developed and governed by genealogists.
+
+Go to <http://gramps-project.org/> to learn more!
+
+--------------------------------------------------------------------------------------------------
+Copyright 2008 Jason M. Simanek
+Copyright 2009 Stephane Charette
+
+This file is part of the GRAMPS program.
+
+GRAMPS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 of the License.
+
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GRAMPS. If not, see <http://www.gnu.org/licenses/>.
+--------------------------------------------------------------------------------------------------
 
 Color Palette
 --------------------------------------------------------------------------------------------------
@@ -65,7 +70,7 @@ img {
     background:none;
 }
 .content {
-    padding-top: .5cm;    
+    padding-top: 1cm;
     background-color:#FAFAFF;
 }
 .content div.snapshot {
@@ -226,7 +231,7 @@ a:visited {
 div#alphabet {
     width: 100%;
     margin: 0;
-    background-color: #E8E0F9;
+    background-color: #E0E0E9;
 }
 div#alphabet ul {
     list-style:none;
@@ -263,7 +268,7 @@ div#alphabet ul li a:hover {
 ----------------------------------------------------- */
 table {
     font-size:14px;
-    margin:0;
+    margin:0 15px;
     padding:0;
     border:none;
     border-collapse:collapse;
@@ -483,101 +488,6 @@ table.individuallist tbody tr td.ColumnName a:hover {
     padding:.1em 10px .3em 10px;
 }
 
-/* EventList and EventDetail
------------------------------------------------------ */
-div#EventList, div#EventDetail {
-    padding: 0;
-    margin: 0 auto;
-}
-div#events table.eventlist {
-    margin-top: .3cm;
-}
-table.eventlist tbody tr.BeginName {
-    border-bottom: solid 1px #5D835F;
-}
-table.eventlist tbody tr td {
-    padding: 4px 0px 4px 0px;
-    border-bottom: dashed 1px #000;
-}
-table.eventlist tbody tr td.ColumnEvent {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnDate {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnPlace {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnDescription {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-table.eventlist tbody tr td.ColumnPerson {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnPartner {
-    width: 35%;
-}
-div#EventList table.eventlist tbody tr td.ColumnEvent a,
-div#EventList table.eventlist tbody tr td.ColumnPerson a,
-div#EventList table.eventlist tbody tr td.ColumnPartner a {
-    display: block;
-    padding: .9em 10px;
-}
-div#EventList table.alphaevent {
-    padding: .3em 0 .3em 0;
-    margin: 0;
-}
-div#EventList table.alphaevent tbody tr.BeginEvent {
-    border-top: solid 1px #000;
-}
-div#EventList table.alphaevent tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType {
-    width: 15%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType a:hover {
-    background: none;
-}
-div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID {
-    width: 12%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnDate {
-    width: 20%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson {
-    width: 60%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.father, 
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
-    display:block;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
-    content:"+ ";
-}
-div#EventDetail h3 {
-    font-size: 1em;
-}
-div#EventDetail table.eventlist {
-    margin: .5cm 0 .3cm 1.5cm;
-    width: 800px;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
-    border-top: solid 1px #5D835F;
-    font-weight: bold;
-    text-transform: uppercase;
-    width: 20%;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnEvent {
-    border-top: solid 1px #000;
-}
-
 /* Gallery
 ----------------------------------------------------- */
 #Gallery table.infolist tbody tr td.ColumnRowLabel, #Gallery table.infolist tbody tr td.ColumnDate {
@@ -703,16 +613,15 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
 /* Download 
 ----------------------------------------------------- */
 #Download { 
-    padding: 1cm;
+    padding:1cm;
     height:396px;
 }
 table.download {
-    padding-top: .5cm;
-    border:solid 1px #000;
+    border:solid 2px #000;
     width:100%;
 }
 table.download img {
-    text-align:center;
+    float:center;
 }
 table.download thead tr th {
     text-align:center;
@@ -753,69 +662,6 @@ table.download td.Modified {
     font-weight:bold;
 }
 
-/* Repositories
------------------------------------------------------- */
-div#RepositoryList {
-    margin: 0;
-    padding: 0;
-}
-div#RepositoryList table.repolist tbody tr td {
-    background-color: #D8F3D6;
-}
-div#RepositoryList table.repolist tbody tr td a {
-    display: block;
-    padding: .3em 10px;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnRowLabel {
-    width: 9%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnType {
-    width: 15%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnName {
-    background-color: #FFF;
-}
-
-/* Address Book
------------------------------------------------------- */
-div#AddressBookList, AddressBookDetail {
-    margin: 0;
-    padding: 0;
-}
-div#AddressBookList table.addressbook {
-    margin: .3em 0 .3em 0;
-}
-div#AddressBookList tble.addressbook tbody tr.Totals td {
-    text-align: left;
-    background-color: #E0E0E9;
-}
-div#AddressBookList table.addressbook tbody tr td {
-    background-color: #B4B4CB;
-    text-align: center;
-    border: solid 1px #000;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnRowLabel {
-    width: 4%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName {
-    background-color: #FFF;
-    text-align: left;
-    width: 70%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName a {
-    display: block;
-    padding: 6px 0px 6px 0px;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnAddress {
-    width: 8%;
-}
-div#AddressBookList table.adressbook tbody tr td.ColumnResidence {
-    width: 8%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
-    width: 8%;
-}
-
 /* Subsections
 ----------------------------------------------------- */
 #Home, #Introduction, #Contact {
@@ -953,45 +799,6 @@ div#addresses table.infolist tbody tr td.ColumnValue {
 
 /* Subsections : Attributes
 ----------------------------------------------------- */
-div#attributes {
-    margin: 0;
-    padding: 0;
-}
-table.attrlist {
-    width: 100%;
-}
-table.attrlist thead tr th.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist thead tr th.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td {
-    background-color: #E0E0E9;
-    border-bottom: dashed 1px #000;
-}
-table.attrlist tbody tr td.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttrType {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrValue {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrNotes {
-    width: 45%;
-}
-table.attrlist tbody tr td.ColumnAttrSources {
-    width: 15%;
-}
 
 /* Subsections : Gallery
 ----------------------------------------------------- */
@@ -1053,25 +860,6 @@ div#sourcerefs ol li ol {
 
 /* Subsections : Weblinks
 ----------------------------------------------------- */
-div#WebLinks {
-    margin : 0 auto;
-    padding: 0;
-}
-
-table.weblinks tr td {
-    background-color: #E6E0E9;
-    border-bottom: dashed 1px #000;
-}
-table.weblinks tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.weblinks tr td.ColumnType {
-    width: 30%;
-}
-table.weblinks tr td.ColumnDescription {
-    background-color: #FFF;
-    width: 30%;
-}
 
 /* Subsections : Pedigree
 ----------------------------------------------------- */
@@ -1142,17 +930,11 @@ table.weblinks tr td.ColumnDescription {
     color:#000;
     width:118px;
     padding:5px 20px 7px 20px;
+    margin-top:-25px;
     margin-left:16px;
     background-color:#E0E0E9;
     border:solid 1px #669;
 }
-#treeContainer div.boxbg a.noThumb, 
-#treeContainer div.AncCol3 a, 
-#treeContainer div.AncCol4 a,
-#treeContainer div.AncCol3 span.unlinked, 
-#treeContainer div.AncCol4 span.unlinked {
-    margin-top:10px;
-}
 #treeContainer div.boxbg a:hover {
     position:relative;
     z-index:999;
@@ -1166,6 +948,13 @@ table.weblinks tr td.ColumnDescription {
 #treeContainer div.boxbg a:hover, #treeContainer div.AncCol3 a:hover, #treeContainer div.AncCol4 a:hover {
     margin-top:-44px;
 }
+#treeContainer div.boxbg a.noThumb, 
+#treeContainer div.AncCol3 a, 
+#treeContainer div.AncCol4 a,
+#treeContainer div.AncCol3 span.unlinked, 
+#treeContainer div.AncCol4 span.unlinked {
+    margin-top:10px;
+}
 #treeContainer div.boxbg a.noThumb:hover {
     margin-top:0;
 }
@@ -1177,14 +966,12 @@ table.weblinks tr td.ColumnDescription {
 }
 #treeContainer div.boxbg span.thumbnail {
     display:block;
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
     padding:4px 0;
 }
 #treeContainer div.boxbg span.thumbnail img {
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
 }
 #treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
@@ -1249,9 +1036,8 @@ table.weblinks tr td.ColumnDescription {
 
 /* Footer
 ----------------------------------------------------- */
-div#footer {
+#footer {
     clear:both;
-    overflow:hidden;
     width:100%;
     font-size:12px;
     line-height:130%;
@@ -1467,27 +1253,3 @@ body#fullyearlinked table.calendar thead tr th.monthName {
 body#fullyearlinked table.calendar tbody tr td {
     height:3em;
 }
-
-/* Calendar: OneDay 
---------------------------------------------------------------------------------- */
-body#OneDay h3 {
-    color: #000;
-    font-weight: bold;
-    text-align: center;
-}
-table.oneday {
-    margin: .3em 0 .3em 0;
-    padding: 0;
-}
-table.oneday tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-table.oneday tbody tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.oneday tbody tr td.ColumnText {
-    width: 85%;
-}
-table.oneday tbody tr td.ColumnEvent {
-    width: 10%;
-}
diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css
index d7dd82258..2973736fe 100644
--- a/src/data/Web_Basic-Peach.css
+++ b/src/data/Web_Basic-Peach.css
@@ -1,27 +1,6 @@
 /*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2008 Jason M. Simanek
-# Copyright 2009 Stephane Charette
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
+**************************************************************************************************
+Copyright Holder and License
 **************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic-Peach Stylesheet
@@ -29,7 +8,30 @@ Style Author: Jason M. Simanek (2008)
 Note: Adapted from GRAMPS original Modern Style stylesheet with a new orange color scheme.
 
 **************************************************************************************************
+This website was created with GRAMPS <http://www.gramps-project.org/>
+--------------------------------------------------------------------------------------------------
+GRAMPS is a Free Software Project for Genealogy, offering a professional
+genealogy program, and a wiki open to all. It is a community project, created,
+developed and governed by genealogists.
 
+Go to <http://gramps-project.org/> to learn more!
+
+--------------------------------------------------------------------------------------------------
+Copyright 2008 Jason M. Simanek
+Copyright 2009 Stephane Charette
+
+This file is part of the GRAMPS program.
+
+GRAMPS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 of the License.
+
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GRAMPS. If not, see <http://www.gnu.org/licenses/>.
 --------------------------------------------------------------------------------------------------
 
 Color Palette
@@ -69,7 +71,7 @@ img {
     background:none;
 }
 .content {
-    padding-top: .5cm;
+    padding-top: 1cm;
     background-color:#FFFBE7;
 }
 .content div.snapshot {
@@ -163,7 +165,7 @@ a:visited {
 #header {
     padding:15px 15px 2px 15px;
     margin:0;
-    background-color: #FFE09F;
+    background-color:#FFE09F;
 }
 #SiteTitle {
     color:#EA8414;
@@ -267,7 +269,7 @@ div#alphabet ul li a:hover {
 ----------------------------------------------------- */
 table {
     font-size:14px;
-    margin:0;
+    margin:0 15px;
     padding:0;
     border:none;
     border-collapse:collapse;
@@ -487,101 +489,6 @@ table.individuallist tbody tr td.ColumnName a:hover {
     padding:.1em 10px .3em 10px;
 }
 
-/* EventList and EventDetail
------------------------------------------------------ */
-div#EventList, div#EventDetail {
-    padding: 0;
-    margin: 0 auto;
-}
-div#events table.eventlist {
-    margin-top: .3cm;
-}
-table.eventlist tbody tr.BeginName {
-    border-bottom: solid 1px #000;
-}
-table.eventlist tbody tr td {
-    padding: 4px 0px 4px 0px;
-    border-bottom: dashed 1px #000;
-}
-table.eventlist tbody tr td.ColumnEvent {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnDate {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnPlace {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnDescription {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-table.eventlist tbody tr td.ColumnPerson {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnPartner {
-    width: 35%;
-}
-div#EventList table.eventlist tbody tr td.ColumnEvent a,
-div#EventList table.eventlist tbody tr td.ColumnPerson a,
-div#EventList table.eventlist tbody tr td.ColumnPartner a {
-    display: block;
-    padding: .9em 10px;
-}
-div#EventList table.alphaevent {
-    padding: .3em 0 .3em 0;
-    margin: 0;
-}
-div#EventList table.alphaevent tbody tr.BeginEvent {
-    border-top: solid 1px #000;
-}
-div#EventList table.alphaevent tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType {
-    width: 15%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType a:hover {
-    background: none;
-}
-div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID {
-    width: 12%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnDate {
-    width: 20%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson {
-    width: 60%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.father, 
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
-    display:block;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
-    content:"+ ";
-}
-div#EventDetail h3 {
-    font-size: 1em;
-}
-div#EventDetail table.eventlist {
-    margin: .5cm 0 .3cm 1.5cm;
-    width: 800px;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
-    border-top: solid 1px #000;
-    font-weight: bold;
-    text-transform: uppercase;
-    width: 20%;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnEvent {
-    border-top: solid 1px #000;
-}
-
 /* Gallery
 ----------------------------------------------------- */
 #Gallery table.infolist tbody tr td.ColumnRowLabel, #Gallery table.infolist tbody tr td.ColumnDate {
@@ -715,7 +622,7 @@ table.download {
     width:100%;
 }
 table.download img {
-    text-align:center;
+    float:center;
 }
 table.download thead tr th {
     text-align:center;
@@ -756,69 +663,6 @@ table.download td.Modified {
     font-weight:bold;
 }
 
-/* Repositories
------------------------------------------------------- */
-div#RepositoryList {
-    margin: 0;
-    padding: 0;
-}
-div#RepositoryList table.repolist tbody tr td {
-    background-color: #FFE09F;
-}
-div#RepositoryList table.repolist tbody tr td a {
-    display: block;
-    padding: .3em 10px;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnRowLabel {
-    width: 9%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnType {
-    width: 15%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnName {
-    background-color: #FFF;
-}
-
-/* Address Book
------------------------------------------------------- */
-div#AddressBookList, AddressBookDetail {
-    margin: 0;
-    padding: 0;
-}
-div#AddressBookList table.addressbook {
-    margin: .3em 0 .3em 0;
-}
-div#AddressBookList tble.addressbook tbody tr.Totals td {
-    text-align: left;
-    background-color: #FFE09F;
-}
-div#AddressBookList table.addressbook tbody tr td {
-    background-color: #FFE09F;
-    text-align: center;
-    border: solid 1px #000;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnRowLabel {
-    width: 4%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName {
-    background-color: #FFF;
-    text-align: left;
-    width: 70%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName a {
-    display: block;
-    padding: 6px 0px 6px 0px;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnAddress {
-    width: 8%;
-}
-div#AddressBookList table.adressbook tbody tr td.ColumnResidence {
-    width: 8%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
-    width: 8%;
-}
-
 /* Subsections
 ----------------------------------------------------- */
 #Home, #Introduction, #Contact {
@@ -956,45 +800,6 @@ div#addresses table.infolist tbody tr td.ColumnValue {
 
 /* Subsections : Attributes
 ----------------------------------------------------- */
-div#attributes {
-    margin: 0;
-    padding: 0;
-}
-table.attrlist {
-    width: 100%;
-}
-table.attrlist thead tr th.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist thead tr th.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td {
-    background-color: #FFE09F;
-    border-bottom: dashed 1px #000;
-}
-table.attrlist tbody tr td.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttrType {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrValue {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrNotes {
-    width: 45%;
-}
-table.attrlist tbody tr td.ColumnAttrSources {
-    width: 15%;
-}
 
 /* Subsections : Gallery
 ----------------------------------------------------- */
@@ -1056,25 +861,6 @@ div#sourcerefs ol li ol {
 
 /* Subsections : Weblinks
 ----------------------------------------------------- */
-div#WebLinks {
-    margin : 0 auto;
-    padding: 0;
-}
-
-table.weblinks tr td {
-    background-color: #FFE09F;
-    border-bottom: dashed 1px #000;
-}
-table.weblinks tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.weblinks tr td.ColumnType {
-    width: 30%;
-}
-table.weblinks tr td.ColumnDescription {
-    background-color: #FFF;
-    width: 30%;
-}
 
 /* Subsections : Pedigree
 ----------------------------------------------------- */
@@ -1145,17 +931,11 @@ table.weblinks tr td.ColumnDescription {
     color:#36220B;
     width:118px;
     padding:5px 20px 7px 20px;
+    margin-top:-25px;
     margin-left:16px;
     background-color:#FFE09F;
     border:solid 1px #8C581C;
 }
-#treeContainer div.boxbg a.noThumb, 
-#treeContainer div.AncCol3 a, 
-#treeContainer div.AncCol4 a,
-#treeContainer div.AncCol3 span.unlinked, 
-#treeContainer div.AncCol4 span.unlinked {
-    margin-top:10px;
-}
 #treeContainer div.boxbg a:hover {
     position:relative;
     z-index:999;
@@ -1169,6 +949,13 @@ table.weblinks tr td.ColumnDescription {
 #treeContainer div.boxbg a:hover, #treeContainer div.AncCol3 a:hover, #treeContainer div.AncCol4 a:hover {
     margin-top:-44px;
 }
+#treeContainer div.boxbg a.noThumb, 
+#treeContainer div.AncCol3 a, 
+#treeContainer div.AncCol4 a,
+#treeContainer div.AncCol3 span.unlinked, 
+#treeContainer div.AncCol4 span.unlinked {
+    margin-top:10px;
+}
 #treeContainer div.boxbg a.noThumb:hover {
     margin-top:0;
 }
@@ -1180,14 +967,12 @@ table.weblinks tr td.ColumnDescription {
 }
 #treeContainer div.boxbg span.thumbnail {
     display:block;
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
     padding:4px 0;
 }
 #treeContainer div.boxbg span.thumbnail img {
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
 }
 #treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
@@ -1252,9 +1037,8 @@ table.weblinks tr td.ColumnDescription {
 
 /* Footer
 ----------------------------------------------------- */
-div#footer {
+#footer {
     clear:both;
-    overflow:hidden;
     width:100%;
     font-size:12px;
     line-height:130%;
@@ -1470,27 +1254,3 @@ body#fullyearlinked table.calendar thead tr th.monthName {
 body#fullyearlinked table.calendar tbody tr td {
     height:3em;
 }
-
-/* Calendar: OneDay 
---------------------------------------------------------------------------------- */
-body#OneDay h3 {
-    color: #000;
-    font-weight: bold;
-    text-align: center;
-}
-table.oneday {
-    margin: .3em 0 .3em 0;
-    padding: 0;
-}
-table.oneday tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-table.oneday tbody tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.oneday tbody tr td.ColumnText {
-    width: 85%;
-}
-table.oneday tbody tr td.ColumnEvent {
-    width: 10%;
-}
diff --git a/src/data/Web_Basic-Spruce.css b/src/data/Web_Basic-Spruce.css
index f86310032..2af3f2c3b 100644
--- a/src/data/Web_Basic-Spruce.css
+++ b/src/data/Web_Basic-Spruce.css
@@ -1,33 +1,37 @@
 /*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2008 Jason M. Simanek
-# Copyright 2009 Stephane Charette
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
+**************************************************************************************************
+Copyright Holder and License
 **************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic-Spruce Stylesheet
 Style Author: Jason M. Simanek (2008)
 Note: Adapted from GRAMPS original Modern Style stylesheet with a new blue color scheme.
-**************************************************************************************************
 
+**************************************************************************************************
+This website was created with GRAMPS <http://www.gramps-project.org/>
+--------------------------------------------------------------------------------------------------
+GRAMPS is a Free Software Project for Genealogy, offering a professional
+genealogy program, and a wiki open to all. It is a community project, created,
+developed and governed by genealogists.
+
+Go to <http://gramps-project.org/> to learn more!
+
+--------------------------------------------------------------------------------------------------
+Copyright 2008 Jason M. Simanek
+Copyright 2009 Stephane Charette
+
+This file is part of the GRAMPS program.
+
+GRAMPS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 of the License.
+
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GRAMPS. If not, see <http://www.gnu.org/licenses/>.
 --------------------------------------------------------------------------------------------------
 
 Color Palette
@@ -67,7 +71,7 @@ img {
     background:none;
 }
 .content {
-    padding-top: .5cm;
+    padding-top: 1cm;
     background-color:#FFF;
 }
 .content div.snapshot {
@@ -228,7 +232,7 @@ a:visited {
 div#alphabet {
     width: 100%;
     margin: 0;
-    background-color: #EAFFE4;
+    background-color: #EAFFF4;
 }
 div#alphabet ul {
     list-style:none;
@@ -265,7 +269,7 @@ div#alphabet ul li a:hover {
 ----------------------------------------------------- */
 table {
     font-size:14px;
-    margin:0;
+    margin:0 15px;
     padding:0;
     border:none;
     border-collapse:collapse;
@@ -485,101 +489,6 @@ table.individuallist tbody tr td.ColumnName a:hover {
     padding:.1em 10px .3em 10px;
 }
 
-/* EventList and EventDetail
------------------------------------------------------ */
-div#EventList, div#EventDetail {
-    padding: 0;
-    margin: 0 auto;
-}
-div#events table.eventlist {
-    margin-top: .3cm;
-}
-table.eventlist tbody tr.BeginName {
-    border-bottom: solid 1px #000;
-}
-table.eventlist tbody tr td {
-    padding: 4px 0px 4px 0px;
-    border-bottom: dashed 1px #000;
-}
-table.eventlist tbody tr td.ColumnEvent {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnDate {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnPlace {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnDescription {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-table.eventlist tbody tr td.ColumnPerson {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnPartner {
-    width: 35%;
-}
-div#EventList table.eventlist tbody tr td.ColumnEvent a,
-div#EventList table.eventlist tbody tr td.ColumnPerson a,
-div#EventList table.eventlist tbody tr td.ColumnPartner a {
-    display: block;
-    padding: .9em 10px;
-}
-div#EventList table.alphaevent {
-    padding: .3em 0 .3em 0;
-    margin: 0;
-}
-div#EventList table.alphaevent tbody tr.BeginEvent {
-    border-top: solid 1px #000;
-}
-div#EventList table.alphaevent tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType {
-    width: 15%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType a:hover {
-    background: none;
-}
-div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID {
-    width: 12%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnDate {
-    width: 20%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson {
-    width: 60%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.father, 
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
-    display:block;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
-    content:"+ ";
-}
-div#EventDetail h3 {
-    font-size: 1em;
-}
-div#EventDetail table.eventlist {
-    margin: .5cm 0 .3cm 1.5cm;
-    width: 800px;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
-    border-top: solid 1px #000;
-    font-weight: bold;
-    text-transform: uppercase;
-    width: 20%;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnEvent {
-    border-top: solid 1px #000;
-}
-
 /* Gallery
 ----------------------------------------------------- */
 #Gallery table.infolist tbody tr td.ColumnRowLabel, #Gallery table.infolist tbody tr td.ColumnDate {
@@ -713,7 +622,7 @@ table.download {
     width:100%;
 }
 table.download img {
-    text-align:center;
+    float:center;
 }
 table.download thead tr th {
     text-align:center;
@@ -754,69 +663,6 @@ table.download td.Modified {
     font-weight:bold;
 }
 
-/* Repositories
------------------------------------------------------- */
-div#RepositoryList {
-    margin: 0;
-    padding: 0;
-}
-div#RepositoryList table.repolist tbody tr td {
-    background-color: #EAFFE4;
-}
-div#RepositoryList table.repolist tbody tr td a {
-    display: block;
-    padding: .3em 10px;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnRowLabel {
-    width: 9%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnType {
-    width: 15%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnName {
-    background-color: #FFF;
-}
-
-/* Address Book
------------------------------------------------------- */
-div#AddressBookList, AddressBookDetail {
-    margin: 0;
-    padding: 0;
-}
-div#AddressBookList table.addressbook {
-    margin: .3em 0 .3em 0;
-}
-div#AddressBookList tble.addressbook tbody tr.Totals td {
-    text-align: left;
-    background-color: #BFD0EA;
-}
-div#AddressBookList table.addressbook tbody tr td {
-    background-color: #BFD0EA;
-    text-align: center;
-    border: solid 1px #000;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnRowLabel {
-    width: 4%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName {
-    background-color: #FFF;
-    text-align: left;
-    width: 70%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName a {
-    display: block;
-    padding: 6px 0px 6px 0px;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnAddress {
-    width: 8%;
-}
-div#AddressBookList table.adressbook tbody tr td.ColumnResidence {
-    width: 8%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
-    width: 8%;
-}
-
 /* Subsections
 ----------------------------------------------------- */
 #Home, #Introduction, #Contact {
@@ -954,45 +800,6 @@ div#addresses table.infolist tbody tr td.ColumnValue {
 
 /* Subsections : Attributes
 ----------------------------------------------------- */
-div#attributes {
-    margin: 0;
-    padding: 0;
-}
-table.attrlist {
-    width: 100%;
-}
-table.attrlist thead tr th.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist thead tr th.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td {
-    background-color: #EAEEF4;
-    border-bottom: dashed 1px #000;
-}
-table.attrlist tbody tr td.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttrType {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrValue {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrNotes {
-    width: 45%;
-}
-table.attrlist tbody tr td.ColumnAttrSources {
-    width: 15%;
-}
 
 /* Subsections : Gallery
 ----------------------------------------------------- */
@@ -1054,24 +861,6 @@ div#sourcerefs ol li ol {
 
 /* Subsections : Weblinks
 ----------------------------------------------------- */
-div#WebLinks {
-    margin : 0 auto;
-    padding: 0;
-}
-
-table.weblinks tr td {
-    border-bottom: dashed 1px #000;
-}
-table.weblinks tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.weblinks tr td.ColumnType {
-    width: 30%;
-}
-table.weblinks tr td.ColumnDescription {
-    background-color: #FFF;
-    width: 30%;
-}
 
 /* Subsections : Pedigree
 ----------------------------------------------------- */
@@ -1142,17 +931,11 @@ table.weblinks tr td.ColumnDescription {
     color:#000;
     width:118px;
     padding:5px 20px 7px 20px;
+    margin-top:-25px;
     margin-left:16px;
     background-color:#EAEEF4;
     border:solid 1px #7CA3DD;
 }
-#treeContainer div.boxbg a.noThumb, 
-#treeContainer div.AncCol3 a, 
-#treeContainer div.AncCol4 a,
-#treeContainer div.AncCol3 span.unlinked, 
-#treeContainer div.AncCol4 span.unlinked {
-    margin-top:10px;
-}
 #treeContainer div.boxbg a:hover {
     position:relative;
     z-index:999;
@@ -1166,6 +949,13 @@ table.weblinks tr td.ColumnDescription {
 #treeContainer div.boxbg a:hover, #treeContainer div.AncCol3 a:hover, #treeContainer div.AncCol4 a:hover {
     margin-top:-44px;
 }
+#treeContainer div.boxbg a.noThumb, 
+#treeContainer div.AncCol3 a, 
+#treeContainer div.AncCol4 a,
+#treeContainer div.AncCol3 span.unlinked, 
+#treeContainer div.AncCol4 span.unlinked {
+    margin-top:10px;
+}
 #treeContainer div.boxbg a.noThumb:hover {
     margin-top:0;
 }
@@ -1177,14 +967,12 @@ table.weblinks tr td.ColumnDescription {
 }
 #treeContainer div.boxbg span.thumbnail {
     display:block;
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
     padding:4px 0;
 }
 #treeContainer div.boxbg span.thumbnail img {
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
 }
 #treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
@@ -1249,16 +1037,15 @@ table.weblinks tr td.ColumnDescription {
 
 /* Footer
 ----------------------------------------------------- */
-div#footer {
+#footer {
     clear:both;
-    overflow:hidden;
     width:100%;
     font-size:12px;
     line-height:130%;
     color:#204D91;
     margin:0;
     padding:15px 0 0 0;
-    background-color: #BFD0EA;
+    background-color:#BFD0EA;
     border-top:solid 1px #204D91;
 }
 #footer a, #footer a:visited {
@@ -1467,27 +1254,3 @@ body#fullyearlinked table.calendar thead tr th.monthName {
  body#fullyearlinked table.calendar tbody tr td {
     height:3em;
 }
-
-/* Calendar: OneDay
---------------------------------------------------------------------------------- */
-body#OneDay h3 {
-    color: #000;
-    font-weight: bold;
-    text-align: center;
-}
-table.oneday {
-    margin: .3em 0 .3em 0;
-    padding: 0;
-}
-table.oneday tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-table.oneday tbody tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.oneday tbody tr td.ColumnText {
-    width: 85%;
-}
-table.oneday tbody tr td.ColumnEvent {
-    width: 10%;
-}
diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css
index 77192170d..ab802342f 100644
--- a/src/data/Web_Mainz.css
+++ b/src/data/Web_Mainz.css
@@ -3,27 +3,33 @@
 GRAMPS Cascading Style Sheet
 Style Name: Mainz
 Style Author: Jason Simanek (2008)
-----------------------------------------------------------------------------
 
+----------------------------------------------------------------------------
 This website was created with GRAMPS
 ----------------------------------------------------------------------------
-GRAMPS is a Free Software Project for Genealogy, offering a professional genealogy program, 
-and a wiki open to all. It is a community project, created, developed and governed by genealogists.
+GRAMPS is a Free Software Project for Genealogy, offering a professional
+genealogy program, and a wiki open to all. It is a community project, created,
+developed and governed by genealogists.
 
-Go to www.gramps-project.org to learn more!
+Go to <http://gramps-project.org/> to learn more!
 
 License
 ----------------------------------------------------------------------------
 Copyright 2008 Jason M. Simanek
+Copyright 2009 Stephane Charette
+
 This file is part of the GRAMPS program.
 
-GRAMPS is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by 
-the Free Software Foundation, version 2 of the License.
+GRAMPS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 of the License.
 
-GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along with GRAMPS. If not, see <http://www.gnu.org/licenses/>.
+You should have received a copy of the GNU General Public License along with
+GRAMPS. If not, see <http://www.gnu.org/licenses/>.
 ----------------------------------------------------------------------------
 
 
@@ -45,13 +51,15 @@ Header                  images/Web_Mainz_Header.png
 Middle                  images/Web_Mainz_Mid.png
 Middle Light            images/Web_Mainz_MidLight.png
 ----------------------------------------------------------------------------
-*/
 
-/* NarrativeWeb Styles
--------------------------------------------------------------------------------------------- */
+# $Id$
 
-/* General Elements
+ NarrativeWeb Styles
+-------------------------------------------------------------------------------------------- 
+
+ General Elements
 ----------------------------------------------------- */
+
 body {
     font-family:Georgia, serif;
     color:#7D5925;
@@ -73,9 +81,8 @@ img {
 .content {
     width:965px;
     margin:0 auto;
-    padding-bottom:.5em;
+    padding: 1cm 0px .5em 0px;
     background:url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
-    overflow: hidden;
 }
 .content div.snapshot {
     margin:0;
@@ -106,6 +113,7 @@ h1 {
     font-size:1.8em;
     font-weight:normal;
     font-style:italic;
+    margin:0;
 }
 h2 {
     display:none;
@@ -137,6 +145,7 @@ h5, h6 {
 p {
     font-size:14px;
     line-height:17px;
+    margin:0;
 }
 p#description {
     padding:0 15px 1em 15px;
@@ -181,7 +190,7 @@ a:visited {
     color:#7D5925;
     margin:0 0 7px 50px;
 }
-#Header p {
+#header p {
     font-size:1em;
     font-weight:bold;
     font-style:italic;
@@ -191,26 +200,26 @@ a:visited {
 
 /* Navigation
 ----------------------------------------------------- */
-#navigation {
+#navigation, #subnavigation {
     font-family:sans-serif;
     width:965px;
     margin:0 auto;
     padding:0;
     background:url(../images/Web_Mainz_MidLight.png) #FFF2C6;
 }
-#navigation ul {
+#navigation ul, #subnavigation ul {
     list-style:none;
     min-width:770px;
-    height:24px;
+    height:23px;
     margin:0;
     padding:0 0 0 12px;
 }
-#navigation ul li {
+#navigation ul li, #subnavigation ul li {
     margin:0;
     padding:0;
     float:left;
 }
-#navigation ul li a {
+#navigation ul li a, #subnavigation ul li a {
     display:block;
     font-size:12px;
     line-height:100%;
@@ -220,21 +229,26 @@ a:visited {
     margin:0;
     padding:6px 8px 5px 8px;
 }
-#navigation ul li a:hover {
+#navigation ul li a:hover, #subnavigation ul li a:hover {
     background-color:#FFFFE7;
 }
-#navigation ul li#CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
     font-family:Georgia, serif;
     font-weight:bold;
     font-style:italic;
     padding:5px 15px 5px 15px;
-    border-top:solid 1px yellow;
-    border-bottom:solid 1px yellow;
+    background-image:url(../images/Web_Mainz_Mid.png);
     border-style:dashed;
-    border-width:1px;
+    border-width:1px 1px 0 1px;
     border-color:#7D5925;
 }
-#navigation ul li#CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
+}
+#subnavigation {
+    background-image:url(../images/Web_Mainz_Mid.png);
+}
+#subnavigation ul li.CurrentSection a {
+    border-width:0 0 1px 0;
 }
 
 /* Alphabet Navigation
@@ -242,9 +256,10 @@ a:visited {
 div#alphabet {
     width: 965px;
     margin: 0;
-    background-color: #FFF2C5;
+    background-color: #FFF2C6;
 }
 div#alphabet ul {
+    padding: 0px 25px 0px 25px;
     list-style:none;
     min-width:770px;
     height:24px;
@@ -431,10 +446,23 @@ table.individuallist tbody tr td.ColumnName a {
     padding:.6em 10px;
     vertical-align:middle;
 }
-#IndividualDetail div table.infolist tr td, #Individuals div table.infolist tr td p {
+ #Individuals div table.infolist tr td p {
     vertical-align:top;
 }
-#IndividualDetail div table.infolist tr td a, #Individuals div table.infolist tr td p a {
+#Individuals div table.infolist tr td p a {
+    display:inline;
+}
+
+/* IndividualDetail
+------------------------------------------------------ */
+#IndividualDetail {
+    background:url(../images/Web_Mainz_MidLight.png) #FFF2C6;
+}
+#IndividualDetail div table.infolist tr td {
+    font:normal .9em/1.2em sans-serif;
+    vertical-align:top;
+}
+#IndividualDetail div table.infolist tr td a {
     display:inline;
 }
 #IndividualDetail table.infolist tr td a:hover {
@@ -442,8 +470,10 @@ table.individuallist tbody tr td.ColumnName a {
 }
 #IndividualDetail table.infolist tbody tr td.ColumnAttribute {
     width:10%;
-    color:#767D25;
-    padding-left:5px;
+    color:#696969;
+}
+#IndividualDetail div.subsection table tr td:first-child {
+    padding-left:20px;
 }
 
 /* Sources
@@ -522,11 +552,15 @@ table.individuallist tbody tr td.ColumnName a {
     font-weight:normal;
 }
 #GalleryDisplay {
+    margin:0 auto;
+    padding:0;
+    position:relative;
+    overflow:hidden;
     text-align:center;
+    border:solid 1px #7D5925;
 }
 #GalleryDisplay img {
     margin:0 auto;
-    border:solid 1px #7D5925;
 }
 #GalleryDetail div#summaryarea{
     margin:0;
@@ -588,17 +622,69 @@ table.individuallist tbody tr td.ColumnName a {
     text-decoration:underline;
 }
 
+/* Download 
+----------------------------------------------------- */
+#Download { 
+    padding:1cm;
+    height:396px;
+}
+table.download {
+    border:solid 2px #000;
+    width:100%;
+}
+table.download img {
+    float:center;
+}
+table.download thead tr th {
+    text-align:center;
+    border:solid 2px #000;
+    color: #000;
+    text-transform:uppercase;
+}
+table.download tbody tr#Row02 {
+    border-bottom:solid 2px #000;
+}
+table.download thead tr th, table.download tbody tr td { 
+    padding-left:10px;
+    padding-top:20px;
+    border-style:solid;
+    border-color:#000;
+    border-width:0 2px 2px 2px;
+    text-align:left;
+}
+table.download td.Description {
+    width: 50%;
+}
+table.download td.License {
+    width:8%;
+}
+table.download td.Filename {
+    width:30%;
+}
+table.download td.Filename a {
+    font-weight:bold;
+    font-style: italic;
+    text-decoration:none;
+}
+table.download td.Filename a:hover {
+    text-decoration:underline;
+}
+table.download td.Modified {
+    width:12%;
+    font-weight:bold;
+}
+
 /* SubSection
 ----------------------------------------------------- */
-#Home, #Introduction, #Download, #Contact {
+#Home, #Introduction, #Contact {
     min-height:500px;
     padding:1.5em 0 3em 0;
 }
-#Home p, #Introduction p, #Surnames p, #Individuals p, #Sources p, #Places p, #Gallery p, #Download p, #Contact p {
+#Home p, #Introduction p, #Surnames p, #Individuals p, #Sources p, #Places p, #Gallery p, {
     margin:0 20px 1em 20px;
     padding-top:1em;
 }
-#Home img, #Introduction img, #Download img {
+#Home img, #Introduction img {
     float:right;
     margin:0;
     padding:0 20px 3em 20px;
@@ -627,26 +713,6 @@ div.subsection table.infolist {
     padding-left:20px;
 }
 
-/*                Download Page
------------------------------------------------------ */
-#Download table.infolist {
-    width: 97%;
-    float: center;
-    border: solid 1px #000;
-}
-#Download table.infolist td {
-    padding: 4px 0px 4px 0px;
-}
-#Download td.ColumnFilename {
-    width: 20%;
-}
-#Download td.ColumnDescription {
-    width: 40%;
-}
-#Download td.ColumnModified {
-    width: 30%;
-}
-
 /* SubSection : Summary Area
 ----------------------------------------------------- */
 div#summaryarea {
@@ -840,57 +906,175 @@ div#sourcerefs ol li ol {
     font-weight:bold;
 }
 
+/* SubSection : Ancestors Tree
+----------------------------------------------------- */
+#tree {
+    page-break-before:always;
+    margin:0;
+    padding:0;
+}
+#treeContainer {
+    position:relative;
+    z-index:1;
+    padding-bottom:1.4em;
+}
+#treeContainer div.boxbg {
+    position:absolute;
+    margin:0;
+    padding:0;
+    background:none;
+}
+#treeContainer div.boxbg a,
+#treeContainer div.boxbg span.unlinked {
+    position:relative;
+    z-index:10;
+    display:block;
+    font:normal .8em/1.4em sans-serif;
+    text-align:center;
+    text-decoration:none;
+    color:#7D5925;
+    width:118px;
+    padding:5px 20px 7px 20px;
+    margin-top:-25px;
+    margin-left:16px;
+    background-color:#FFFFE7;
+    border:dotted 2px #7D5925;
+}
+#treeContainer div.boxbg a:hover {
+    position:relative;
+    z-index:999;
+    font-size:1em;
+    text-decoration:none;
+    color:#7D5925;
+    width:190px;
+    margin-left:-20px;
+    padding:10px 25px 12px 25px;
+    border:solid 2px #7D5925;
+}
+#treeContainer div.boxbg a:hover, #treeContainer div.AncCol3 a:hover, #treeContainer div.AncCol4 a:hover {
+    margin-top:-44px;
+}
+#treeContainer div.boxbg a.noThumb, 
+#treeContainer div.AncCol3 a, 
+#treeContainer div.AncCol4 a,
+#treeContainer div.AncCol3 span.unlinked, 
+#treeContainer div.AncCol4 span.unlinked {
+    margin-top:10px;
+}
+#treeContainer div.boxbg a.noThumb:hover {
+    margin-top:0;
+}
+#treeContainer div.AncCol0 a:hover {
+    margin-left:12px;
+}
+#treeContainer div.AncCol4 a:hover {
+    margin-left:-60px;
+}
+#treeContainer div.boxbg span.thumbnail {
+    display:block;
+    height:65px;
+    margin:0 auto;
+    padding:4px 0;
+}
+#treeContainer div.boxbg span.thumbnail img {
+    height:65px;
+    margin:0 auto;
+}
+#treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
+    height:80px;
+}
+#treeContainer div.AncCol3 span.thumbnail, #treeContainer div.AncCol4 span.thumbnail {
+    display:none;
+}
+#treeContainer div.boxbg a:hover span.thumbnail {
+    display:block;
+}
+#treeContainer div.male a, 
+#treeContainer div.male span.unlinked, 
+#treeContainer div.female a ,
+#treeContainer div.female span.unlinked {
+    background-position:top right;
+    background-repeat:no-repeat;
+}
+#treeContainer div.male a,
+#treeContainer div.male span.unlinked {
+    background-image:url(../images/Web_Gender_Male.png);
+}
+#treeContainer div.female a, 
+#treeContainer div.female span.unlinked {
+    background-image:url(../images/Web_Gender_Female.png);
+}
+.shadow {
+    display:none;
+}
+#tree div div.bvline {
+    position:absolute;
+    z-index:2;
+    height:2px;
+    margin:2px 0 0 16px;
+    padding:0;
+    background-color:#D8C19F;
+}
+#tree div div.bhline {
+    position:absolute;
+    z-index:2;
+    width:1px;
+    margin:2px 0 0 16px;
+    padding:0;
+    background-color:#D8C19F;
+}
+.ghline, .gvline {
+    display:none;
+}
+
 /* Footer
 ----------------------------------------------------- */
 #footer {
-    clear: both;
-    width: 965px;
-    font-size: 12px;
-    line-height: 130%;
-    font-family: sans-serif;
-    margin: 0 auto;
-    padding: 0;
-    background-image: url(../images/Web_Mainz_MidLight.png);
-    background-repeat: repeat;
-    border-top: dashed 1px #7D5925;
-    overflow: hidden;
+    clear:both;
+    width:965px;
+    font-size:12px;
+    line-height:130%;
+    font-family:sans-serif;
+    margin:0 auto;
+    padding:15px 0 0 0;
+    background:url(../images/Web_Mainz_MidLight.png) #FFF2C6;
+    border-top:dashed 1px #7D5925;
 }
 #footer a, #footer a:visited {
-    text-decoration: none;
+    text-decoration:none;
 }
 #footer a:hover {
-    text-decoration: underline;
+    text-decoration:underline;
 }
 #footer img {
-    border: 0;
-    margin: 0;
-    vertical-align: middle;
-    horizontal-align: center;
+    border:0;
+    margin:0 auto;
+    vertical-align:middle;
 }
 #footer p#createdate {
-    float: left;
-    width: 50%;
-    text-align: left;
-    margin-left: 10px;
+    float:left;
+    width:40%;
+    text-align:left;
+    margin-left:10px;
 }
 #footer p#copyright {
-    float: right;
-    width: 40%;
-    text-align: right;
-    margin-right: 10px;
+    float:right;
+    width:40%;
+    text-align:right;
+    margin-right:10px;
 }
 #footer p#copyright img {
-    margin-right: 10px;
+    margin-right:10px;
 }
 #user_footer {
-    width: 70%;
-    float: left;
-    margin: 1em;
+    width:70%;
+    float:left;
+    margin:1em;
 }
 #user_footer p {
-    font: normal 1em/1.2em serif;
-    margin: 0;
-    padding: 0;
+    font:normal 1em/1.2em serif;
+    margin:0;
+    padding:0;
 }
 
 /* Calendar Styles
@@ -935,8 +1119,7 @@ div#sourcerefs ol li ol {
     padding:.7em 5% 1em 5%;
     border-top:double 4px #7D5925;
 }
-.calendar tfoot tr td.note {
-    height:1cm;
+.calendar tfoot tr td {
     vertical-align:middle;
     color:#7D5925;
     background:url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
@@ -975,7 +1158,7 @@ div#sourcerefs ol li ol {
 .calendar tbody tr td.saturday {
 
  }
-.calendar tbody tr td.sunday {
+.calendar tbody tr td:first-child {
     border-left:none;
 }
 .calendar tbody tr:first-child td {
@@ -1026,3 +1209,27 @@ div#sourcerefs ol li ol {
     color:#D8C19F;
     background:url(../images/Web_Mainz_MidLight.png) #FFF2C6 repeat;
 }
+
+/* Calendar : Full Year */
+body#fullyearlinked div.content {
+    width:963px;
+    margin:0 auto;
+    padding:15px 0 2px 2px;
+    background:url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
+}
+body#fullyearlinked table.calendar {
+    float:left;
+    width:320px;
+    height:18em;
+    border:solid 1px #7D5925;
+}
+body#fullyearlinked table.calendar thead tr th {
+    height:2em;
+}
+body#fullyearlinked table.calendar thead tr th.monthName {
+    font-size:1.2em;
+    padding:2px 0;
+}
+body#fullyearlinked table.calendar tbody tr td {
+    height:3em;
+}
diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css
index 371c2a020..0a35a3c81 100644
--- a/src/data/Web_Nebraska.css
+++ b/src/data/Web_Nebraska.css
@@ -1,32 +1,36 @@
 /*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2008 Jason M. Simanek
-# Copyright 2009 Stephane Charette
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
+**************************************************************************************************
+Copyright Holder and License
 **************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Nebraska Default Stylesheet
 Style Author: Jason M. Simanek (2008)
-**************************************************************************************************
 
+**************************************************************************************************
+This website was created with GRAMPS <http://www.gramps-project.org/>
+--------------------------------------------------------------------------------------------------
+GRAMPS is a Free Software Project for Genealogy, offering a professional
+genealogy program, and a wiki open to all. It is a community project, created,
+developed and governed by genealogists.
+
+Go to <http://gramps-project.org/> to learn more!
+
+--------------------------------------------------------------------------------------------------
+Copyright 2008 Jason M. Simanek
+Copyright 2009 Stephane Charette
+
+This file is part of the GRAMPS program.
+
+GRAMPS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 of the License.
+
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GRAMPS. If not, see <http://www.gnu.org/licenses/>.
 --------------------------------------------------------------------------------------------------
 
 Color Palette
@@ -79,6 +83,7 @@ img {
     background:none;
 }
 .content {
+    padding-top: 1cm;
     background-color:#FFF;
 }
 .content div.snapshot {
@@ -199,7 +204,7 @@ p#user_header {
     background-color:#542;
 }
 
-/* Navigation / SubNavigation
+/* Navigation
 ----------------------------------------------------- */
 div#navigation, div#subnavigation {
     width: 100%;
@@ -208,44 +213,44 @@ div#navigation, div#subnavigation {
 }
 div#navigation ul, div#subnavigation ul {
     list-style:none;
-    height: 24px;
+    min-width: 900px;
+    height: 40px;
     margin:0;
-    padding: 0px 0px 0px 9px;
-    border-bottom: solid 2px #000;
+    padding: 0px 0px 0px 16px;
+    border-bottom: solid 2px #5D835F;
 }
 div#navigation ul li, div#subnavigation ul li {
-    float: left;
-}
-div#navigation ul li:first-child, div#subnavigation ul li:first-child {
-    margin-left: 10px;
-}
-div#navigation ul li:after, div#subnavigation ul li:after {
-    content: "| ";
+    float:left;
 }
 div#navigation ul li a, div#subnavigation ul li a {
-    background-color: #A97;
     display: block;
-    padding: 4px 8px 4px 8px;
-    float: left;
+    padding: 12px 16px 14px 1px;
+    float:left;
     font: .8em bold italic small-caps verdana, serif;
     color: #000;
     text-decoration:none;
     margin:0;
 }
 div#navigation ul li a:hover, div#subnavigation ul li a:hover {
-   background-color: #FFF;
-    color: #453619;
-}
-div#navigation ul li.CurrentSection a,
-div#subnavigation ul li.CurrentSection a {
     background-color: #C1B398;
-    color: #000;
 }
-div#navigation ul li.CurrentSection a:hover,
-div#subnavigation ul li.CurrentSection a:hover {
-    background-color: #000;
-    color: #FFF;
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
+    font-size:19px;
+    margin-top:-6px;
+    padding-top:11px;
+    padding-bottom:8px;
+    border-right:solid 1px #542;
+    border-left:solid 1px #542;
+    border-bottom:solid 1px #FFF;
+    background-color:#FFF;
 }
+#navigation ul li.CurrentSection a:hover {
+    background-color:#FFF;
+}
+#subnavigation ul li.CurrentSection a {
+    border-width:0 0 1px 0;
+}
+
 /* Alphabet Navigation
 ----------------------------------------------------- */
 div#alphabet {
@@ -255,6 +260,7 @@ div#alphabet {
 }
 div#alphabet ul {
     list-style:none;
+    min-width:770px;
     height:24px;
     margin:0;
     padding: 0px 0px 0px 16px;
@@ -305,6 +311,7 @@ table.infolist tr th a:hover {
 table.infolist tr td {
     font:normal 1.1em/1.4em serif;
     vertical-align:middle;
+    padding:.1em 10px;
 }
 table.infolist tr td a {
     display:block;
@@ -337,12 +344,6 @@ table.infolist tbody tr td.ColumnType {
 }
 table.infolist tbody tr td.ColumnPartner {
     font-size:.9em;
-    background-color:#FFF;
-}
-table.infolist tbody tr td.ColumnPartner a:hover {
-    display:block;
-    padding:15px;
-    background-color:#C1B398;
 }
 table.infolist tbody tr td.ColumnParents {
     font-size:.9em;
@@ -495,7 +496,6 @@ table.individuallist tbody tr td.ColumnName a:hover {
 }
 #Sources table.infolist tbody tr td.ColumnName {
     padding:0;
-    background-color:#FFF;
 }
 #Sources table.infolist tbody tr td.ColumnName a {
     font-size:.9em;
@@ -513,7 +513,6 @@ table.individuallist tbody tr td.ColumnName a:hover {
 #Places {  }
 #Places table.infolist tbody tr td.ColumnName {
     padding:0;
-    background-color:#FFF;
 }
 #Places table.infolist tbody tr td.ColumnName a {
     padding:.1em 10px .3em 10px;
@@ -522,101 +521,6 @@ table.individuallist tbody tr td.ColumnName a:hover {
     background-color:#C1B398;
 }
 
-/* EventList and EventDetail
------------------------------------------------------ */
-div#EventList, div#EventDetail {
-    padding: 0;
-    margin: 0 auto;
-}
-div#events table.eventlist {
-    margin-top: .3cm;
-}
-table.eventlist tbody tr.BeginName {
-    border-bottom: solid 1px #000;
-}
-table.eventlist tbody tr td {
-    padding: 4px 0px 4px 0px;
-    border-bottom: dashed 1px #000;
-}
-table.eventlist tbody tr td.ColumnEvent {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnDate {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnPlace {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnDescription {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-table.eventlist tbody tr td.ColumnPerson {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnPartner {
-    width: 35%;
-}
-div#EventList table.eventlist tbody tr td.ColumnEvent a,
-div#EventList table.eventlist tbody tr td.ColumnPerson a,
-div#EventList table.eventlist tbody tr td.ColumnPartner a {
-    display: block;
-    padding: .9em 10px;
-}
-div#EventList table.alphaevent {
-    padding: .3em 0 .3em 0;
-    margin: 0;
-}
-div#EventList table.alphaevent tbody tr.BeginEvent {
-    border-top: solid 1px #000;
-}
-div#EventList table.alphaevent tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType {
-    width: 15%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType a:hover {
-    background: none;
-}
-div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID {
-    width: 12%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnDate {
-    width: 20%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson {
-    width: 60%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.father, 
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
-    display:block;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
-    content:"+ ";
-}
-div#EventDetail h3 {
-    font-size: 1em;;
-}
-div#EventDetail table.eventlist {
-    margin: .5cm 0 .3cm 1.5cm;
-    width: 800px;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
-    border-top: solid 1px #000;
-    font-weight: bold;
-    text-transform: uppercase;
-    width: 20%;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnEvent {
-    border-top: solid 1px #000;
-}
-
 /* Gallery
 ----------------------------------------------------- */
 #Gallery {  }
@@ -625,7 +529,6 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
 }
 #Gallery table.infolist tbody tr td.ColumnName {
     padding:0;
-    background-color:#FFF;
 }
 #Gallery table.infolist tbody tr td.ColumnName a {
     padding:.1em 10px .3em 10px;
@@ -721,22 +624,22 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
     margin-right:.4em;
 }
 #streetaddress {
-    width: 100%;
+    width:85%;
 }
 #city:after {
-    content: ",";
+    content:",";
 }
 #country {
-    clear: left;
+    clear:left;
 }
 #email {
-    clear: left;
+    clear:left;
 }
 #email a {
-    text-decoration: none;
+    text-decoration:none;
 }
 #email a:hover {
-    text-decoration: underline;
+    text-decoration:underline;
 }
 
 /* Download 
@@ -750,7 +653,7 @@ table.download {
     width:100%;
 }
 table.download img {
-    text-align:center;
+    float:center;
 }
 table.download thead tr th {
     text-align:center;
@@ -791,69 +694,6 @@ table.download td.Modified {
     font-weight:bold;
 }
 
-/* Repositories
------------------------------------------------------- */
-div#RepositoryList {
-    margin: 0;
-    padding: 0;
-}
-div#RepositoryList table.repolist tbody tr td {
-    background-color: #C1B398;
-}
-div#RepositoryList table.repolist tbody tr td a {
-    display: block;
-    padding: .3em 10px;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnRowLabel {
-    width: 9%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnType {
-    width: 15%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnName {
-    background-color: #FFF;
-}
-
-/* Address Book
------------------------------------------------------- */
-div#AddressBookList, div#AddressBookDetail {
-    margin: 0;
-    padding: 0;
-}
-div#AddressBookList table.addressbook {
-    margin: .3em 0 .3em 0;
-}
-div#AddressBookList table.addressbook tbody tr.BeginName {
-    border-top: solid 1px #000;
-}
-div#AddressBookList table.addressbook tbody tr.Totals td {
-    background-color: #F6F2EE;
-}
-div#AddressBookList table.addressbook tbody tr td {
-    background-color: #FFF;
-    border-bottom: dashed 1px #000;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnRowLabel {
-    background-color: #F6F2EE;
-    width: 4%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName {
-    width: 70%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName a {
-    display: block;
-    padding: 6px 0px 6px 0px;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnAddress {
-    width: 8%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnResidence {
-    width: 8%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
-    width: 8%;
-}
-
 /* Subsections
 ----------------------------------------------------- */
 #Home, #Introduction, #Contact {
@@ -932,45 +772,6 @@ table.infolist tbody tr td.ColumnValue p {
 
 /* Subsections : Attributes
 ----------------------------------------------------- */
-div#attributes {
-    margin: 0;
-    padding: 0;
-}
-table.attrlist {
-    width: 100%;
-}
-table.attrlist thead tr th.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist thead tr th.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td {
-    background-color: #F6F2EE;
-    border-bottom: dashed 1px #000;
-}
-table.attrlist tbody tr td.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttrType {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrValue {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrNotes {
-    width: 45%;
-}
-table.attrlist tbody tr td.ColumnAttrSources {
-    width: 15%;
-}
 
 /* Subsections : Parents
 ----------------------------------------------------- */
@@ -1102,25 +903,6 @@ div#summaryarea table.infolist tbody tr td.ColumnAttribute {
 
 /* Subsections : Weblinks
 ----------------------------------------------------- */
-div#WebLinks {
-    margin : 0 auto;
-    padding: 0;
-}
-
-table.weblinks tr td {
-    background-color: #F6F2EE;
-    border-bottom: dashed 1px #000;
-}
-table.weblinks tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.weblinks tr td.ColumnType {
-    width: 30%;
-}
-table.weblinks tr td.ColumnDescription {
-    background-color: #FFF;
-    width: 30%;
-}
 
 /* Subsections : Pedigree
 ----------------------------------------------------- */
@@ -1174,7 +956,7 @@ div#pedigree {
     page-break-before:always;
     margin:0;
     padding:0;
-    background-color: #FFF;
+    background:none;
 }
 #treeContainer {
     position:relative;
@@ -1197,17 +979,11 @@ div#pedigree {
     color:#542;
     width:118px;
     padding:5px 20px 7px 20px;
+    margin-top:-25px;
     margin-left:16px;
     background-color:#F6F2EE;
     border:solid 1px #542;
 }
-#treeContainer div.boxbg a.noThumb, 
-#treeContainer div.AncCol3 a, 
-#treeContainer div.AncCol4 a,
-#treeContainer div.AncCol3 span.unlinked, 
-#treeContainer div.AncCol4 span.unlinked {
-    margin-top:10px;
-}
 #treeContainer div.boxbg a:hover {
     position:relative;
     z-index:999;
@@ -1222,6 +998,13 @@ div#pedigree {
 #treeContainer div.boxbg a:hover, #treeContainer div.AncCol3 a:hover, #treeContainer div.AncCol4 a:hover {
     margin-top:-44px;
 }
+#treeContainer div.boxbg a.noThumb, 
+#treeContainer div.AncCol3 a, 
+#treeContainer div.AncCol4 a,
+#treeContainer div.AncCol3 span.unlinked, 
+#treeContainer div.AncCol4 span.unlinked {
+    margin-top:10px;
+}
 #treeContainer div.boxbg a.noThumb:hover {
     margin-top:0;
 }
@@ -1233,14 +1016,12 @@ div#pedigree {
 }
 #treeContainer div.boxbg span.thumbnail {
     display:block;
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
     padding:4px 0;
 }
 #treeContainer div.boxbg span.thumbnail img {
-    max-width:80px;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
 }
 #treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
@@ -1292,9 +1073,8 @@ div#pedigree {
 
 /* Footer
 ----------------------------------------------------- */
-div#footer {
+#footer {
     clear:both;
-    overflow:hidden;
     width:100%;
     font-size:12px;
     line-height:130%;
@@ -1508,27 +1288,3 @@ body#fullyearlinked table.calendar thead tr th.monthName {
 body#fullyearlinked table.calendar tbody tr td {
     height:3em;
 }
-
-/* Calendar: OneDay
---------------------------------------------------------------------------------- */
-body#OneDay h3 {
-    color: #000;
-    font-weight: bold;
-    text-align: center;
-}
-table.oneday {
-    margin: .3em 0 .3em 0;
-    padding: 0;
-}
-table.oneday tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-table.oneday tbody tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.oneday tbody tr td.ColumnText {
-    width: 85%;
-}
-table.oneday tbody tr td.ColumnEvent {
-    width: 10%;
-}
diff --git a/src/data/Web_Print-Default.css b/src/data/Web_Print-Default.css
index fb52be871..fd0a54b6d 100644
--- a/src/data/Web_Print-Default.css
+++ b/src/data/Web_Print-Default.css
@@ -1,97 +1,86 @@
-/*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
+/*
+**************************************************************************************************
+Copyright Holder and License
 **************************************************************************************************
 GRAMPS Cascading Style Sheet
-Style Name: Web_Default-Print.css Stylesheet
-***************************************************************************************************
+Style Name: Print Style Sheet
+Style Author: Jason M. Simanek (2008)
+Modified by Rob G. Healey, July 2008
+
+**************************************************************************************************
+This website was created with GRAMPS <http://www.gramps-project.org/>
+--------------------------------------------------------------------------------------------------
+GRAMPS is a Free Software Project for Genealogy, offering a professional
+genealogy program, and a wiki open to all. It is a community project, created,
+developed and governed by genealogists.
+
+'Go to <http://gramps-project.org/> to learn more!
 
 --------------------------------------------------------------------------------------------------
+Copyright 2008 Rob G. Healey
+
+This file is part of the GRAMPS program.
+
+GRAMPS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 of the License.
+
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GRAMPS. If not, see <http://www.gnu.org/licenses/>.
+--------------------------------------------------------------------------------------------------
+
 Color Palette
 --------------------------------------------------------------------------------------------------
-Black		#000
-White		#FFF;
+gray            #A7A7A7
+red             #520
+black           #000
+white           #FFF
+---------------------------------------------------------------------------------------------------
 
 # $Id$
 
  NarrativeWeb Styles
--------------------------------------------------------------------------------------------- */
-body {
-    background-color :#FFF;
-    color: #000;
-    padding: 0 14px 0 14px;
-    width: 965px;
-}
+-------------------------------------------------------------------------------------------- 
 
-div#alphabet, div#navigation, div#subnavigation {
-    display: none;
-}
-
-/* General Elements
+ General Elements 
 ----------------------------------------------------- */
-div {
+
+body {
+    color:#000;
     margin:0;
     padding:0;
+    background-color:#FFF;
 }
-table {
-    border:none;
-    border-collapse:collapse;
-}
-th {
-    font-weight:bold;
-    text-align:left;
-    padding:1px 3em 1px 0.5em;
-}
-td {
-    vertical-align:top;
+div {
+    margin:0;
     padding:0;
 }
 img {
     border:none;
     margin:0;
 }
-.content {
-    overflow: auto;
-    width:965px;
-    margin:0 auto;
-    padding-bottom: .2em;
-}
+.content {  }
 .content div.snapshot {
-    margin: 0;
-    padding: 0;
-    background: none;
+    float:right;
+    margin:1.6em;
+    padding-top: .5cm;
+    background:none;
 }
 .content div.snapshot div.thumbnail {
-    margin: 0;
-    padding: 2em 0 0 0;
-    background: none;
+    margin:0;
+    padding:0;
+    background:none;
 }
-.content div.snapshot div.thumbnail a {
-    display: block;
-    width: 96px;
-    margin: 0 auto;
+.content .thumbnail a:link:after, .content .thumbnail a:visited:after {
+    content:"";
 }
 .fullclear {
     width:100%;
-    height:1px;
+    height:1pt;
     margin:0;
     padding:0;
     clear:both;
@@ -100,48 +89,58 @@ img {
 /* General Text
 ----------------------------------------------------- */
 h1 {
-    font:normal 2em/1.2em serif;
+    font:normal 16pt/18pt serif;
+    margin:0;
+    padding:0;
 }
 h2 {
-    font:bold 2em/1.2em sans;
+    font:normal 18pt/23pt serif;
+    display:inline;
+    margin:0;
+    padding:0;
 }
 h3 {
-    font:normal 2em/1.2em serif;
-    text-align:center;
-    margin:0;
-    padding:.5em 20px .2em 20px;
-    border-bottom: double 4px #000;
+    font:normal 18pt/23pt serif;
+    text-align:left;
+    display:inline;
+    margin:0 0 0 8pt;
+    padding:0;
 }
 h4 {
-    font: normal 1.2em/1.2em serif;
-    color: #000;
-    margin-top: .3cm;
-    padding:.2em 0 .2em 20px;
-    background-color: #FFF;
-    border-width: 4px 0px 4px 0px;
-    border-style: solid;
-    border-color: #000;
+    display:block;
+    clear:both;
+    font:normal 14pt/16pt serif;
+    margin:8pt 0 0 0;
+    padding:8pt 0 1pt 0;
+    border-top:solid .5pt #A7A7A7
 }
 h5, h6 {
-    font:normal 1em/1.2em serif;
+    font:normal 14pt/16pt serif;
     font-style:italic;
-    margin:1.3em 0 .5em 1em;
+    margin:0;
+    padding:0;
+}
+p {
+    font:normal 11pt/14pt serif;
 }
 p#description {
-    max-width:800px;
-    margin:0;
-    padding:1em 20px;
+    margin:0 0 14pt 0;
 }
-p#description:first-letter {
-    color: #000;
-    font-size: 36px;
-    font-weight: bold;
-    font-style: italic;
-}
-p a {
-    color: #000;
+a:link, a:visited {
+    color:#520;
     text-decoration:underline;
 }
+.content a:link:after, content a:visited:after {
+    font-size:70%;
+    font-family:sans-serif;
+    content:" (" attr(href) ") ";
+}
+.content ol li a:link {
+    text-decoration:none;
+}
+.content ol li a:link:after, .content ol li a:visited:after {
+    content:"";
+}
 sup {
     line-height:0;
 }
@@ -152,391 +151,149 @@ ol {
     padding-top:.5em;
     padding-bottom:0;
 }
-ol li a {
-    text-decoration:none;
-}
-a {
-    color: #000;
-}
-a:visited {
-    color: #000;
-}
-span.preposition {
-    padding-left:1em;
-    padding-right:1em;
-}
-.grampsid {
-    font:normal .8em/1.2em monospace;
-    color: #000;
-}
 
 /* Header
 ----------------------------------------------------- */
-div#header  {
-    background-color: #FFF;
-    height: 65px;
-    width: 100%;
-    border-width: 1px 0 4px 0;
-    border-style: solid;
-    border-color: #000;
+#Header {
+    padding:0 0 8pt 0;
+    margin:0 0 8pt 0;
+    border-bottom:solid .5pt #000;
 }
 #SiteTitle {
+    text-align:center;
     margin:0;
-    padding:.5em 0 0.5em 10px;
-    font-size: 28px;
-    font-weight: bold;
-    color: #000;
-    font-style: italic;
+    padding:0;
 }
-p#user_header {
-    font-size:1.3em;
-    text-align:left;
-    color: #000;
+#user_header {
+    font-style:italic;
+    text-align:center;
     margin:0;
-    padding:.2em 0 .6em 20px;
+    padding:0
+}
+.grampsid {
+    font-size:60%;
+    font-family:monospace;
+    color:#A7A7A7
 }
 
-/* Footer
+/* Navigation
 ----------------------------------------------------- */
-div#footer {
-    clear:both;
-    overflow:hidden;
-    width:100%;
-    font-size:12px;
-    line-height:130%;
-    color:#000;
-    margin:0;
-    background-color:#FFF;
-    border-width:4px 0 1px 0;
-    border-style:solid;
-    border-color:#000;
-}
-div#footer p#createdate {
-    float: left;
-    width: 60%;
-    text-align: left;
-    margin-left: 10px;
-}
-div#footer p#copyright {
-    float: right;
-    text-align: right;
-    margin: 10px 10px 0px 0px;
-}
-#user_footer {
-    width: 70%;
-    float: left;
-    margin: 1em;
-     color: #000;
-}
-#user_footer p {
-    font: normal 1em/1.2em serif;
-    margin: 0;
-    padding: 0;
-}
+#alphabet, #navigation, #subnavigation { display:none; }
 
 /* Main Table
 ----------------------------------------------------- */
-table.infolist {
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    font-size: 12px;
+table {
+    width:100%;
+    margin:0;
+    padding:0;
+    border:none;
+    border-collapse:collapse;
+    border-bottom:solid .5pt #FFF;
 }
-table.infolist thead tr th {
-    font: normal 1.1em/1.2em serif;
-    color: #000;
-    margin: 0;
-    padding: .2em 10px;
-    background-color: #FFF;
-    border: solid 1px #000;
+table thead tr th {
+    text-align:left;
+    font:normal 11pt/13pt serif;
+    color:#000;
+    margin:0;
+    padding:0;
+    padding-bottom:1pt;
+    border-bottom:solid .5pt #000;
 }
-table.infolist tr td {
-    font: normal 1.1em/1.4em serif;
-    vertical-align: middle;
-    border-bottom: dashed 1px #000;
-    background-color: #FFF;
-    padding: 6px 0 6px 10px;
+.content table thead tr th a {
+    text-decoration:none;
 }
-table.infolist tr.BeginLetter td, table.infolist tr.BeginSurname td {
-    border-top: solid 1px #000;
+.content table thead tr th a:link:after, .content table thead tr th a:visited:after {
+    content:"";
 }
-table.infolist tr td.ColumnLetter {
-    width: 3%;
-    text-align: center;
+table tbody tr td {
+    font:normal 9pt/11pt sans-serif;
+    vertical-align:middle;
+    padding:2pt 6pt 1pt 0;
+    border-bottom:dashed .5pt #A7A7A7;
 }
-table.infolist tbody tr td.ColumnBirth {
-    font-size:.9em;
-    width: 10%;
+.content table tbody tr td a {
+    text-decoration:none;
 }
-table.infolist tbody tr td.ColumnDeath {
-    font-size:.9em;
-    width: 10%;
+.content table tbody tr td a:link:after, .content table tbody tr td a:visited:after {
+    content:"";
 }
-table.infolist tbody tr td.ColumnRowLabel {
-    width: 6%;
-    padding-left: 20px;
+table tr.BeginLetter td, table.infolist tr.BeginSurname td {
+    border-top:solid .5pt #A7A7A7;
 }
-table.infolist tbody tr td.ColumnType {
-    width: 6%;
-    padding-left: 20px;
+table tbody tr td.ColumnRowLabel {
+    width:2%;
+    color:#A7A7A7;
+    text-align:center;
 }
-table.infolist tbody tr td.ColumnPartner {
-    font-size:.9em;
+table tr td.ColumnLetter {
+    width:3%;
+    text-align:center;
 }
-table.infolist tbody tr td.ColumnParents {
-    font-size: .9em;
+table tr td.ColumnAttribute {
+    width:10%;
 }
-table.infolist tbody tr td.ColumnParents span.father, 
-table.infolist tbody tr td.ColumnParents span.mother {
-    display: block;
+.content table tbody tr td.ColumnName a {
+    text-decoration:none;
 }
-table.infolist tbody tr td.ColumnParents span.mother:before {
-    content: "+ ";
+table tbody tr td.ColumnBirth {
+    width:10%;
+}
+table tbody tr td.ColumnDeath {
+    width:10%;
+    text-decoration:underline;
+}
+table tbody tr td.ColumnParents {
+    font-size:70%;
+}
+table tbody tr td.ColumnParents span.mother:before {
+    content:"+ ";
+}
+
+/* Home/Welcome
+----------------------------------------------------- */
+#Home p {
+    margin:0 0 9pt 0;
+}
+#Home img {
+    float:right;
+    margin:0;
+    padding:0 0 9pt 9pt;
+}
+
+/* Introduction
+----------------------------------------------------- */
+#Introduction p {
+    margin:0 0 9pt 0;
+}
+#Introduction img {
+    float:right;
+    margin:0;
+    padding:0 0 9pt 9pt;
 }
 
 /* Surnames
 ----------------------------------------------------- */
-#Surnames {
-    margin: 0;
-    padding: 0;
-}
-#SurnameDetail p#description {
-    padding-top:0;
-}
-table.surnamelist thead tr th.ColumnSurname, 
-#Surnames table.surnamelist tbody tr td.ColumnSurname {
+#Surnames {  }
+table.surnamelist tr thead th.ColumnSurname, #Surnames table.surnamelist tbody tr td.ColumnSurname {
     width:50%;
 }
-table.surnamelist thead tr th {
-    padding:0;
-}
-table.surnamelist thead tr th.ColumnLetter {
-    padding: 0px 10px 0px 20px;
-}
-table.surnamelist tbody tr td.ColumnLetter a {
-    background: none;
-}
-table#SortByName thead tr th.ColumnSurname, 
-table#SortByCount thead tr th.ColumnQuantity {
-    background-color: #FFF;
-    color: #000;
-}
-table#SortByName thead tr th.ColumnSurname a:after, 
-table#SortByCount thead tr th.ColumnQuantity a:after {
+table#SortByName thead tr th.ColumnSurname a:after, table#SortByCount thead tr th.ColumnQuantity a:after {
     content:" ↓";
 }
-table#SortByName tbody tr td.ColumnSurname {
-    padding:0;
-}
-table#SortByName tbody tr td.ColumnSurname a {
-    display:block;
-    padding:.1em 10px .3em 10px;
-}
-table.surname {
-    border-bottom: solid 1px #000;
-}
-table.surname thead tr th.ColumnName {
-    width:20%;
-    padding-left:20px;
-}
-table.surname tbody tr td.ColumnName {
-    width:20%;
-    padding:0;
-}
-table.surname tbody tr td.ColumnName a span.grampsid {
-    color: #000;
-}
-table.surname thead tr th.ColumnParents, 
-table.surname tbody tr td.ColumnParents {
-    width:25%;
+table.surname thead tr th.ColumnParents, table.surname tbody tr td.ColumnParents {
+    width:35%;
 }
 
 /* Individuals
 ----------------------------------------------------- */
-div#Individuals {
-    margin: 0;
-    padding: 0;
-}
-div#Individuals table.individuallist {
-    border-bottom: solid 1px #000;
-}
-div#Individuals table.individuallist tbody tr td a {
-    display: block;
-    padding: .6em 10px;
-}
-div#Individuals table.individuallist tbody tr td.ColumnSurname a:hover, 
-div#Individuals table.individuallist tbody tr td.ColumnSurname a:active {
-    cursor: default;
-    color: #000;
-    background: none;
-}
-div#Individuals table.individuallist tbody tr td.ColumnName a {
-    vertical-align: middle;
-}
-div#Individuals div table.infolist tr td p {
-    font:normal .9em/1.2em sans-serif;
-    vertical-align: top;
-}
-div#Individuals div table.infolist tr td p a {
-    display: inline;
-}
-div#IndividualDetail {
-    padding: 0;
-    margin: 0;
-}
-#IndividualDetail div table.infolist tr td {
-    font: normal .9em/1.2em sans-serif;
-    vertical-align: top;
-}
-div#IndividualDetail div table.infolist tr td a {
-    display: inline;
-}
-div#IndividualDetail table.infolist tbody tr td.ColumnAttribute {
-    width: 10%;
-}
-div#IndividualDetail div.subsection table tr td:first-child {
-    padding-left: 20px;
-}
 
-/* Places
------------------------------------------------------ */
-div#Places {
-    margin: 0;
-    padding: 0;
-}
-
-/* EventList and EventDetail
------------------------------------------------------ */
-div#EventList, div#EventDetail {
-    margin: 0;
-    padding: 0;
-}
-div#events table.eventlist {
-    margin-top: .3cm;
-}
-table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnDate {
-    width: 16%;
-}
-table.eventlist tbody tr td.ColumnPlace {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnSources {
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
-}
-table.eventlist tbody tr td.ColumnPerson {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnPartner {
-    width: 35%;
-}
-div#EventList table.eventlist tbody tr.BeginName {
-    border-top: solid 1px #000;
-}
-div#EventList table.eventlist tbody tr td {
-    padding: 4px 0px 4px 0px;
-}
-div#EventList table.alphaevent {
-    padding: .3em 0 .3em 0;
-    margin: 0;
-}
-div#EventList table.alphaevent tbody tr.BeginEvent {
-    border-top: solid 1px #000;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType {
-    width: 15%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID {
-    width: 10%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnDate {
-    width: 20%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson {
-    width: 50%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.father, 
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
-    display:block;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
-    content:"+ ";
-}
-div#EventDetail h3 {
-    font-size: 28px;
-}
-div#EventDetail h3:first-letter {
-    color: #903;
-}
-div#EventDetail table.eventlist {
-    width: 100%;
-}
-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 {
-    border-top: solid 1px #000;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnPerson {
-    background-color: #000;
-}
-    
 /* Gallery
 ----------------------------------------------------- */
-#Gallery {
-    margin: 0;
-    padding: 0;
-}
-#Gallery table.infolist tbody tr td.ColumnRowLabel {
-    padding-bottom: 0;
-}
-#Gallery table.infolist tbody tr td.ColumnName {
-    width: 50%;
-}
-#Gallery table.infolist tbody tr td.ColumnName a {
-    display: block;
-    padding: .2em 10px .4em 10px;
-}
-#Gallery table.infolist tbody tr td.ColumnDate {
-    width: 20%;
-}
-#Gallery table.infolist tbody tr td.ColumnMime {
-    width: 20%;
+#GalleryDetail h2 {
+    display:none;
 }
 #GalleryNav {
-    font:normal 1em/1em sans-serif;
-    margin:1em 0 0 0;
-    padding:1.2em 0 1.4em 0;
-    text-align:center;
-}
-#GalleryNav a {
-    font-weight:bold;
-    text-decoration:none;
-    border: solid 1px #000;
-}
-#GalleryNav a#Previous {
-    padding:.5em .7em .3em .7em;
-}
-#GalleryNav a#Next {
-    padding:.5em 1.9em .3em 1.9em;
-}
-#GalleryPages {
-    margin:0 1em;
-}
-#GalleryCurrent {
-    font:bold 1.2em/1em sans-serif;
-}
-#GalleryTotal {
-    font-weight:normal;
+    display:none;
 }
 #GalleryDisplay {
     margin:0 auto;
@@ -544,405 +301,74 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson {
     position:relative;
     overflow:hidden;
     text-align:center;
-    border: solid 1px #000;
 }
 #GalleryDisplay img {
     margin:0 auto;
+    border:solid 1pt #542;
 }
-#GalleryDetail div#summaryarea{
-    margin:0;
-    padding:2em 0 0 0;
-}
-#GalleryDetail div#summaryarea h3 {
-    font:normal 1.2em/1.2em serif;
+#GalleryDetail h3 {
+    display:block;
     text-align:center;
-}
-#GalleryDetail div h4 {
-    margin-top:0;
-}
-#GalleryDetail div#summaryarea table.gallery {
-    padding-bottom:0;
-    margin: 1.5em 0 0 0;
-    border-style: solid;
-    border-width: 2px 0 1px 0;
-    border-color: #000;
-}
-#GalleryDetail table.exifdata {
-    margin: .2em 0 .2em 0;
-    width: 100%;
-}
-#GalleryDetail table.exifdata tbody tr {
-    border-top: solid 1px #000;
-}
-#GalleryDetail table.exifdata tbody tr td.ColumnExifKeys {
-    width: 60%;
-}
-#GalleryDetail table.exifdata tbody tr td.ColumnMetaData {
-    width: 40%;
+    margin:2pt 0 8pt 0;
 }
 
-/* Contact
+/* Download
 ----------------------------------------------------- */
-#Contact #summaryarea {
-    width: 500px;
-    margin: 0 auto;
-    padding: 3em;
-    border: double 4px #000;
-    background-color: #FFF;
+#Download p {
+    margin:0 0 9pt 0;
 }
-#Contact #summaryarea img {
-    float: right;
-    margin: 0;
-}
-#researcher {
-    font: normal 1.5em/1.4em serif;
-    margin-top: .3em;
-}
-#researcher h3 {
-    font: normal 1.2em/1.4em serif;
-    padding: 0;
-    text-align: left;
-}
-#researcher span {
-    float: left;
-    display: block;
-    font: normal .9em/1.4em serif;
-    margin-right: .4em;
-}
-#streetaddress {
-    width: 100%;
-}
-#city:after {
-    content: ",";
-}
-#country {
-    clear: left;
-}
-#email {
-    clear: left;
-}
-#email a {
-    text-decoration: none;
-}
-
-/* Download 
------------------------------------------------------ */
-
-div#Download { 
-    margin: 0;
-    padding: 0px 0px .5em 0px;
-}
-div#Download table.download {
-    padding: 0;
-    margin: .5em 0 .5em 0;
-    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;
-}
-div#Download table.download tbody tr td { 
-    border: solid 1px #000;
-    text-align: left;
-}
-div#Download table.download td.Filename {
-    width: 30%;
-}
-div#Download table.download td.Filename a {
-    font-weight: bold;
-    font-style: italic;
-    text-decoration: none;
-}
-div#Download table.download td.Description {
-    width: 45%;
-}
-div#Download table.download td.License {
-    width: 6%;
-}
-div#Download table.download td.Modified {
-    width: 17%;
-}
-
-/* Sources
------------------------------------------------------ */
-#Sources {
-    margin: 0;
-    padding: 0;
-}
-div#Sources table.infolist tbody tr td.ColumnRowLabel {
-    padding-bottom:0;
-}
-div#Sources table.infolist tbody tr td.ColumnName {
-    padding:0;
-}
-div#Sources table.infolist tbody tr td.ColumnName a {
-    font-size:.9em;
-    padding:.1em 10px .3em 10px;
-}
-div#SourceDetail div#references ol li {
-    padding-bottom:.5em;
-}
-
-
-/* Repositories
------------------------------------------------------- */
-div#RepositoryList, RepositoryDetail {
-    margin: 0;
-    padding: 0;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnType {
-    width: 15%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnName {
-    width: 80%;
-}
-
-/* Address Book
------------------------------------------------------- */
-div#AddressBookList, AddressBookDetail {
-    margin: 0;
-    padding: 0;
-}
-div#AddressBookList table.addressbook tbody tr td {
-    text-align: center;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName {
-    text-align: left;
-    width: 65%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnAddress {
-    width: 10%;
-}
-div#AddressBookList table.adressbook tbody tr td.ColumnResidence {
-    width: 10%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
-    width: 10%;
-}
-
-/* Subsections
------------------------------------------------------ */
-#Home, #Introduction, #Contact {
-    padding:2em 0 3em 0;
-}
-#Home p, #Introduction p {
-    margin:0 20px 1em 20px;
-}
-#Home img, #Introduction img {
+#Download img {
     float:right;
     margin:0;
-    padding:0 20px 3em 2em;
+    padding:0 0 9pt 9pt;
 }
-div.subsection {
-    padding-bottom:.5em;
+
+/* Contact 
+----------------------------------------------------- */
+#researcher {
+    margin:16pt 0 0 0;
 }
-div.subsection h4 {
-    margin-bottom:.5em;
+#Contact img {
+    float:right;
+    margin:0;
+    padding:0 0 9pt 9pt;
 }
-div.subsection table, div.subsection ol, div.subsection p {
-    font-size:.9em;
-}
-div.subsection a {
-    text-decoration:none;
-}
-div.subsection table.infolist {
-    width:100%;
+#researcher h3 {
     margin:0;
 }
+#researcher span {
+    font:normal .9em/1.4em serif;
+    display:block;
+    float:left;
+    margin-right:.4em;
+}
+#city {
+    clear:left;
+}
+#city:after {
+    content:",";
+}
+#email {
+    clear:left;
+}
 
-/* Subsections : Events
+/* Subsections 
 ----------------------------------------------------- */
-div#events {
-    padding-bottom:0;
-}
-div#events h4 {
-    margin-bottom:0;
-    border:none;
-}
-#IndividualDetail {
-    background-color: #FFF;
-}
-#IndividualDetail div#events table.eventtable {
-    width:100%;
-    padding-top:15px;
-}
-#IndividualDetail div#events table.infolist tbody tr td {
-    padding: .4em 0 .8em 0;
-}
-#IndividualDetail div#events table.infolist tbody tr td.ColumnAttribute {
-    border-bottom: solid 1px #000;
-}
-#IndividualDetail div#events table.infolist tbody tr td.ColumnValue {
-    border-bottom:solid 1px #000;
-}
-table.infolist tbody tr td.ColumnValue p {
-    font-family:sans-serif;
-    color: #696969;
-    margin:.2em 0 0 2em;
+#Home, #Introduction, #Download, #Contact {
+    padding:3em 20px;
 }
 
-/* Subsections : Attributes
+/* Subsections : Events 
 ----------------------------------------------------- */
-div#attributes {
-    margin: 0;
-    padding: 0;
+#IndividualDetail .ColumnValue {
+    padding:4pt 0;
 }
-table.attrlist {
-    width: 100%;
-}
-table.attrlist thead tr th.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist thead tr th.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td {
-    border: solid 1px #000;
-}
-table.attrlist tbody tr td.ColumnAttrType {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrValue {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrNotes {
-    width: 45%;
-}
-table.attrlist tbody tr td.ColumnAttrSources {
-    width: 15%;
+.ColumnValue p {
+    font:normal 9pt/11pt sans-serif;
+    margin:1pt 0 0 18pt;
 }
 
-/* Subsections : Parents
------------------------------------------------------ */
-div#parents table.infolist {
-    margin-top:.5em;
-}
-div#parents table.infolist tbody tr td.ColumnAttribute {
-    width:19%;
-}
-div#parents table.infolist tbody tr td.ColumnValue ol {
-    margin:0;
-    padding-top:0;
-}
-div#parents table.infolist tbody tr td.ColumnValue ol li {
-    padding-bottom:.2em;
-}
-
-/* Subsections : Families
------------------------------------------------------ */
-div#families {
-    background-color: #FFF;
-    margin: 0;
-    padding: 0;
-}
-div#families table.infolist {
-    margin: .3cm 0 .3cm 0;
-}
-div#families table.infolist tbody tr td.ColumnValue p {
-    margin-top:0;
-}
-div#families table.infolist tbody tr td.ColumnValue ol {
-    margin:0;
-    padding-top:0;
-}
-div#families table.infolist tbody tr td.ColumnValue ol li {
-    padding-bottom:.2em;
-}
-
-/* Subsection: LDS Ordinance
------------------------------------------------------- */
-div#LDSOrdinance {
-    margin: 0;
-    padding: 0;
-}
-div#LDSOrdinance table.ldsordlist {
-    font-size:.35cm;
-}
-table.ldsordlist {
-    margin-bottom:.5em;
-}
-table.ldsordlist tbody tr td.ColumnLDSType {
-    width:12%;
-}
-table.ldsordlist tbody tr td.ColumnLDSDate {
-    width:15%;
-}
-table.ldsordlist tbody tr td.ColumnLDSTemple {
-    width:10%;
-}
-table.ldsordlist tbody tr td.ColumnLDSPlace {
-    width:35%;
-}
-table.ldsordlist tbody tr td.ColumnLDSStatus {
-    width:8;
-}
-table.ldsordlist tbody tr td.ColumnLDSSealed {
-    width:25%;
-}
-table.ldsordlist tbody tr td.ColumnLDSSources {
-    width:7%;
-    margin-top:.2cm;
-}
-
-/* Subsections : Addresses
------------------------------------------------------ */
-div#Addresses {
-    margin: 0;
-    padding: 0;
-}
-div#Addresses table.infolist {
-    font-size: 10px;
-    background-color: #70B1ED;
-}
-div#Addresses table.infolist tbody tr td.ColumnDate {
-    width: 15%;
-}
-div#Addresses table.infolist tbody tr td.ColumnStreetAddress {
-    width: 30%;
-}
-div#Addresses table.infolist tbody tr td.ColumnCity {
-    width: 8%;
-}
-div#Addresses table.infolist tbody tr td.ColumnCounty {
-    width: 8%;
-}
-div#Addresses table.infolist tbody tr td.ColumnState {
-    width: 8%;
-}
-div#Addresses table.infolist tbody tr td.ColumnCntry {
-    width: 5%;
-}
-div#Addresses table.infolist tbody tr td.ColumnPostalcode {
-    width: 10%;
-}
-div#Addresses table.infolist tbody tr td.ColumnPhone {
-    width: 12%;
-}
-
-/* SubSection: Residence
------------------------------------------------------ */
-div#Residence {
-    margin: 0;
-    padding: 0;
-}
-div#Residence table.infolist tr td {
-    border-top: dashed 1px #000;
-}
-
-/* Subsections : Gallery
+/* Subsections : Gallery 
 ----------------------------------------------------- */
 #indivgallery h4 {
     margin-bottom:1em;
@@ -954,113 +380,47 @@ div#Residence table.infolist tr td {
     height:150px;
     text-align:center;
 }
-#indivgallery div.thumbnail a {
+#indivgallery .thumbnail a {
     display:block;
     margin:0;
     padding:0;
     background:none;
 }
-#indivgallery div.thumbnail a img {
-    margin-bottom:.5cm;
+#indivgallery .thumbnail a img {
+    margin:0;
     padding:0;
-    border: solid 1px #000;
+    border:solid .5pt #000;
 }
 #indivgallery div.thumbnail p {
-    font:normal .7em/1.4em sans-serif;
+    font:normal 7pt/9pt sans-serif;
     text-align:center;
     width:80%;
     margin:0 auto;
     padding:0;
 }
 
-/* Subsections : Narrative
+/* Subsections : Pedigree 
 ----------------------------------------------------- */
-div#narrative {
-    padding-bottom:0;
-}
-#narrative p {
-    font:normal .9em/1.4em sans-serif;
-    margin-top:.5em;
-    margin-bottom:0;
-    padding:0 20px 1em 20px;
-}
-
-/* Subsections : References
------------------------------------------------------ */
-
-/* Subsections : Source References
------------------------------------------------------ */
-div#sourcerefs {
-    padding: 0;
-    margin: 0 auto;
-}
-div#sourcerefs ol {
-    list-style-type:decimal;
-}
-div#sourcerefs ol li ol {
-    list-style-type:lower-alpha;
-}
-
-/* Subsections : Summary Area
------------------------------------------------------ */
-div#summaryarea {
-    background-color: #FFF;
-}
-div#summaryarea table.infolist {
-    margin:0;
-    padding:0;
-    background:#FFF;
-    border-bottom: solid .7em #000;
-}
-div#summaryarea table.infolist tr td, div#summaryarea table.infolist tr td p {
-    font:normal .9em/1.2em sans-serif;
-    vertical-align:top;
-}
-div#summaryarea table.infolist tr td a, div#summaryarea table.infolist tr td p a {
-    display:inline;
-}
-div#summaryarea table.infolist tbody tr td.ColumnAttribute {
-    width:14%;
-    color: #696969;
-    padding-left:20px;
-}
-
-/* Subsections : Weblinks
------------------------------------------------------ */
-div#WebLinks {
-    margin : 0 auto;
-    padding: 0;
-}
-div#WebLinks table.Weblinks tbody tr td.ColumnType {
-    width: 20%;
-}
-div#WebLinks table.Weblinks tbody tr td.ColumnDescription {
-    width: 90%;
-}
-
-/* Subsections : Pedigree
------------------------------------------------------ */
-div#pedigree {
-    padding-bottom:1.2em;
-}
 #pedigree a {
     text-decoration:none;
-    color: #000;
+}
+.content #pedigree a:link:after, .content #pedigree a:visited:after {
+    content:"";
 }
 .pedigreegen {
-    font:normal .9em/1.2em sans-serif;
+    font:normal 10pt/12pt sans-serif;
     list-style:none;
-    margin:.5em 0 0 0;
+    margin:8pt 0 0 0;
     padding:0 0 0 20px;
 }
 .pedigreegen li ol {
     list-style:none;
-    margin-left:.5em;
+    margin-left:16pt;
 }
 .pedigreegen li ol li ol {
-    font:normal 1em/1.4em sans-serif;
+    font:normal 9pt/11pt sans-serif;
     list-style:decimal;
-    margin-left:1.6em;
+    margin-left:16pt;
 }
 .pedigreegen li ol li ol li ol.spouselist {
     list-style:none;
@@ -1068,12 +428,11 @@ div#pedigree {
 }
 .spouselist li.spouse ol {
     list-style:decimal;
-    margin-left:1.6em;
+    margin-left:16pt;
 }
 .spouse a {
     font-weight:normal;
     font-style:normal;
-    color: #000;
 }
 .spouse:before {
     content: "+ ";
@@ -1082,200 +441,195 @@ div#pedigree {
     font-weight:bold;
 }
 
-/* Subsections : Ancestors Tree
+/* Subsections : Ancestors Tree 
 ----------------------------------------------------- */
 #tree {
     page-break-before:always;
     margin:0;
     padding:0;
-    background:none;
 }
 #treeContainer {
     position:relative;
     z-index:1;
 }
-#treeContainer div.boxbg {
+#treeContainer div.boxbg a:link:after, #treeContainer div.boxbg a:visited:after {
+    font-size:70%;
+    font-family:sans-serif;
+    content:"";
+}
+.boxbg {
     position:absolute;
     margin:0;
     padding:0;
     background:none;
 }
-#treeContainer div.boxbg a,
-#treeContainer div.boxbg span.unlinked {
+#treeContainer div.boxbg span.thumbnail {
+    display:block;
+    margin:0 auto;
+}
+.boxbg a {
     position:relative;
     z-index:10;
     display:block;
     font:normal .7em/1.4em sans-serif;
     text-align:center;
     text-decoration:none;
-    color: #00029D;
-    width:118px;
-    padding:5px 20px 7px 20px;
-    margin-left:16px;
-    background-color: #FFF;
-    border: solid 1px #000;
-}
-#treeContainer div.boxbg a.noThumb,
-#treeContainer div.AncCol3 a, 
-#treeContainer div.AncCol4 a, 
-#treeContainer div.AncCol3 span.unlinked, 
-#treeContainer div.AncCol4 span.unlinked {
-    margin-top:10px;
-}
-#treeContainer div.boxbg a.noThumb:hover {
-    margin-top:0;
-}
-#treeContainer div.boxbg span.thumbnail {
-    display:block;
-    max-width:80px;
-    max-height:65px;
-    margin:0 auto;
-    padding:4px 0;
-}
-#treeContainer div.boxbg span.thumbnail img {
-    max-width:80px;
-    max-height:65px;
-    margin:0 auto;
-}
-#treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
-    height:80px;
+    width:50pt;
+    padding:5pt 8pt;
+    margin:5pt 0 0 0;
+    background-color:#FFF;
+    border:solid 1pt #000;
 }
 #treeContainer div.AncCol3 span.thumbnail, #treeContainer div.AncCol4 span.thumbnail {
     display:none;
 }
-#treeContainer div.boxbg a:hover span.thumbnail {
-    display:block;
-}
-#treeContainer div.male a,
-#treeContainer div.male span.unlinked {
-    background:url(../images/Web_Gender_Male.png) no-repeat top right;
-}
-#treeContainer div.female a, 
-#treeContainer div.female span.unlinked {
-    background:url(../images/Web_Gender_Female.png) no-repeat top right;
-}
-#treeContainer div.unknown a,
-#treeContainer div.unknown span.unlinked {
-    background-color: #000;
-    color: #FFF;
-}
 .shadow {
     display:none;
 }
 #tree div div.bvline {
     position:absolute;
     z-index:2;
-    height:1px;
-    margin:0 0 0 16px;
+    height:1pt;
+    margin:0;
     padding:0;
-    background-color: #00029D;
+    background-color:#FFF;
+    border-bottom:solid .5pt #A7A7A7
 }
 #tree div div.bhline {
     position:absolute;
     z-index:2;
-    width:1px;
-    margin:0 0 0 16px;
+    width:1pt;
+    margin:0;
     padding:0;
-    background-color: #00029D;
+    background-color:#FFF;
+    border-right:solid .5pt #A7A7A7
 }
 .ghline, .gvline {
     display:none;
 }
 
-/* Calendar Styles
+/* Footer
+----------------------------------------------------- */
+#footer {
+    width:100%;
+    margin:0;
+    padding:.1in 0 0 0;
+    clear:both;
+    border-top:solid .5pt #000;
+}
+#user_footer {
+    float:left;
+    width:70%;
+}
+#user_footer p {
+    font-style:italic;
+}
+p#createdate {
+    float:left;
+    width:3in;
+    font:normal 9pt/10pt sans-serif;
+    margin:0;
+}
+#copyright {
+    float:right;
+    width:4in;
+    margin:0;
+    font:normal 9pt/10pt sans-serif;
+    text-align:right;
+}
+p#quality {
+    display:none;
+}
+
+/* Calendar Styles 
 -------------------------------------------------------------------------------------------- */
 /* Calendar : General */
+body#WebCal h1#SiteTitle {
+    float:left;
+    font-size:14pt;
+    line-height:16pt;
+    padding-bottom:.1in;
+}
 .calendar {
+    clear:both;
     empty-cells:show;
     width:100%;
-    font-size:1em;
+    font-size:14pt;
     font-weight:normal;
     margin:0;
     padding:0;
     border:none;
     border-collapse:collapse;
 }
+.calendar thead, .calendar tbody {
+    border-style:solid;
+    border-width:2pt 2pt 2pt 2pt;
+    border-color:#000;
+}
+.calendar tbody {
+    border-top:none;
+}
 .calendar thead tr th {
-    width:14%;
-    font-weight:normal;
-    font-size:18px;
-    line-height:18px;
+    width:12%;
+    font-family:sans-serif;
+    font-size:10pt;
+    font-weight:bold;
     text-align:center;
     text-transform:uppercase;
-    padding:2px 0;
+    padding:.2em 0 .1em 0;
 }
 .calendar thead tr th.monthName {
     width:100%;
-    font-size:2em;
+    font-size:20pt;
     line-height:100%;
     text-transform:none;
-    color: #542;
-    padding:.3em 0 .2em 0;
-    background-color: #FFF;
+    padding:5pt;
+    border-width:0;
 }
 #CreatorInfo {
     float:right;
-    color: #FFF;
-    margin:-24px 10px 0 0;
+    margin:0 10px 0 0;
 }
-#CreatorInfo a {
-    color: #FFF;
+body#WebCal a {
+    text-decoration:none;
+    color:#000;
 }
-#CreatorInfo a:hover {
-    color: #FFF;
-}
-.calendar thead tr th.weekend, 
-.calendar thead tr th.weekday {
-    font-style:italic;
-    color: #000;
-    background-color: #BCEAF6;
-    border: solid 2px #000;
+.calendar tfoot {
+    border:none;
 }
 .calendar tfoot tr td {
+    font-size:12pt;
+    font-style:italic;
     padding:.7em 5% 1em 5%;
-    border-top:solid 2px #000;
-    vertical-align:middle;
-    color: #000;
-    background-color: #D8F3D6;
 }
 
 /* Calendar : Date Numeral */
-.calendar tbody tr td div.date {
+.calendar td div.date {
     float:right;
     display:block;
-    width:1.8em;
-    font-size:1.2em;
+    font-size:16pt;
     line-height:100%;
+    font-weight:bold;
     text-align:center;
-    color: #542;
+    color:#000;
     margin:0 0 0 .5em;
-    padding:.2em 0;
-    background-color: #D8F3D6;
+    padding:7pt;
+}
+.calendar td.highlight div.date {
+    color:#F00;
 }
 
 /* Calendar : Date Container */
 .calendar tbody tr td {
     vertical-align:top;
-    height:10em;
+    height:4em;
     padding:0;
     border-width:1px 0 0 1px;
     border-style:solid;
-    border-color: #000;
-}
-.calendar tbody tr td.weekday {
-    background-color: #FFF;
-}
-.calendar tbody tr td.weekend {
-    background-color: #D8F3D6;
-}
-.calendar tbody tr td.saturday {
-    border-right: solid 1px #000;
- }
-.calendar tbody tr td.sunday {
-    border-left: solid 1px #000;
+    border-color:#999;
 }
 .calendar tbody tr td:first-child {
-    border-left: solid 1px #000;
+    border-left:none;
 }
 .calendar tbody tr:first-child td {
     border-top:none;
@@ -1285,8 +639,8 @@ div#pedigree {
 .calendar tbody tr td ul {
     list-style:none;
     font-family:sans-serif;
-    font-size:1em;
-    margin:2.3em 0 .3em 0;
+    font-size:8pt;
+    margin:30pt 0 5pt 0;
     padding:0;
 }
 .calendar tbody tr td ul li {
@@ -1294,25 +648,17 @@ div#pedigree {
     width:92%;
     margin:0 4%;
     padding:.2em 0 .3em 0;
-    border-top: dashed 1px #000;
+    border-top:dashed .5pt #999;
 }
 .calendar tbody tr td ul li:first-child {
     border:none;
 }
-
-/* Calendar : Birthday, Anniversary, Highlight */
 .calendar tbody tr td ul li em {
     font-style:normal;
-    color: #0A65B5;
+    color:#000;
 }
 .calendar tbody tr td ul li span.yearsmarried em {
-    color: #228A22;
-}
-.calendar tbody tr td.highlight { }
-
-.calendar tbody tr td.highlight div.date {
-    color: #0A65B5;
-    background-color: #C2E1FE;
+    color:#000;
 }
 
 /* Calendar : Previous-Next Month */
@@ -1320,14 +666,11 @@ div#pedigree {
 .calendar tbody tr td.next, 
 .calendar tbody tr td.previous div.date, 
 .calendar tbody tr td.next div.date {
-    color: #333;
-    background-color: #D8F3D6;
+    font-weight:normal;
+    font-size:12pt;
+    color:#999;
 }
-
 /* Calendar : Full Year */
-body#fullyearlinked {
-    background-color: #FFF;
-}
 body#fullyearlinked div.content {
     width:963px;
     margin:0 auto;
@@ -1341,45 +684,11 @@ body#fullyearlinked table.calendar {
 }
 body#fullyearlinked table.calendar thead tr th {
     height:2em;
-    border-width: 1px 1px 0px 0px;
-    border-color: #000;
-    text-align: center;
 }
 body#fullyearlinked table.calendar thead tr th.monthName {
     font-size:1.2em;
     padding:2px 0;
-    border-bottom: solid 1px #000;
 }
 body#fullyearlinked table.calendar tbody tr td {
     height:3em;
 }
-body#fullyearlinked table.calendar tbody tr td.emptyDays {
-    background-color: #FFF;
-}
-body#fullyearlinked table.calendar tbody tr td.saturday {
-    border-right:solid 2px #000;
-}
-body#fullyearlinked able.calendar tbody tr td.sunday {
-    border:solid 2px #000;
-}
-
-/* Calendar: OneDay
---------------------------------------------------------------------------------- */
-body#OneDay h3 {
-    color: #228A22;
-    font-weight: bold;
-    text-align: center;
-}
-table.oneday {
-    margin: .3em 0 .3em 0;
-    padding: 0;
-}
-table.oneday tbody tr td {
-    border-bottom: dashed 1px #000;
-}
-table.oneday tbody tr td.ColumnText {
-    width: 85%;
-}
-table.oneday tbody tr td.ColumnEvent {
-    width: 10%;
-}
diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css
index f13fbbdde..3f91fe740 100644
--- a/src/data/Web_Visually.css
+++ b/src/data/Web_Visually.css
@@ -1,39 +1,42 @@
-/*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2008-2010 Rob G. Healey <robhealey1@gmail.com>
-# Copyright 2009      Stephane Charette
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
+/*
+ **************************************************************************************************
+Copyright Holder and License
 **************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Visually Impaired Stylesheet
 Style Author: Jason M. Simanek (2008)
-***************************************************************************************************
+**************************************************************************************************
+This website was created with GRAMPS
+http://www.gramps-project.org
+--------------------------------------------------------------------------------------------------
+GRAMPS is a Free Software Project for Genealogy, offering a professional genealogy program, 
+and a wiki open to all. It is a community project, created, developed and governed by genealogists.
 
+Go to http://gramps-project.org to learn more!
+
+--------------------------------------------------------------------------------------------------
+Copyright 2008 Rob G. Healey
+Copyright 2009 Stephane Charette
+
+This file is part of the GRAMPS program.
+
+GRAMPS is free software: you can redistribute it and/or modify it under the terms of the GNU General
+Public License as published by the Free Software Foundation, version 2 of the License.
+
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with GRAMPS. If not,
+see <http://www.gnu.org/licenses/>.
 --------------------------------------------------------------------------------------------------
 Color Palette
 --------------------------------------------------------------------------------------------------
-brown dark      #453619, #542
+brown darkest   #453619
+brown dark      #542
 brown light     #C1B398
 gray            #696969
-green dark	#228A22
-green           #6AF364, #5D835F
+green           #6AF364
 green lighter   #D8F3D6
 
 ===== Ancestor Graph Color Scheme =====
@@ -48,20 +51,17 @@ Females     Web_Gender_Female.png
 # $Id$
 
  NarrativeWeb Styles
---------------------------------------------------------------------------------------------  */
-div#alphabet ul li {
-    background-color: #6AF364;
-}
-div#navigation ul li.CurrentSection a {
-    background-color: #000;
-    color: #FFF;
-}
-div#navigation ul li.CurrentSection a:hover {
-    background-color: 696969;
-}
+-------------------------------------------------------------------------------------------- 
 
-/* General Elements
+ General Elements
 ----------------------------------------------------- */
+
+body {
+    color:#000;
+    margin:0;
+    padding:0;
+    background-color:#FFF;
+}
 div {
     margin:0;
     padding:0;
@@ -71,6 +71,7 @@ table {
     border-collapse:collapse;
 }
 th {
+    color:#000;
     font-weight:bold;
     text-align:left;
     padding:1px 3em 1px 0.5em;
@@ -86,26 +87,31 @@ img {
 .thumbnail a:hover {
     background:none;
 }
+.content:first-letter {
+    color:#FF0000;
+    font:xx-large;
+}
 .content {
-    overflow: auto;
     width:965px;
     margin:0 auto;
-    padding-bottom: .2em;
+    padding-bottom:.5em;
+    background-color:#FFF;
+    color:#000;
 }
 .content div.snapshot {
-    margin: 0;
-    padding: 0;
-    background: none;
+    margin:0;
+    padding:0;
+    background:none;
 }
 .content div.snapshot div.thumbnail {
-    margin: 0;
-    padding: 2em 0 0 0;
-    background: none;
+    margin:0;
+    padding:2em 0 0 0;
+    background:none;
 }
 .content div.snapshot div.thumbnail a {
-    display: block;
-    width: 96px;
-    margin: 0 auto;
+    display:block;
+    width:96px;
+    margin:0 auto;
 }
 .fullclear {
     width:100%;
@@ -121,43 +127,42 @@ h1 {
     font:normal 2em/1.2em serif;
 }
 h2 {
-    font:bold 2em/1.2em sans;
+    display:none;
 }
 h3 {
     font:normal 2em/1.2em serif;
     text-align:center;
     margin:0;
     padding:.5em 20px .2em 20px;
-    border-bottom: double 4px #5D835F;
+    border-bottom:double 4px #000;
 }
 h4 {
-    font: normal 1.2em/1.2em serif;
-    color: #FFF;
-    margin-top: .3cm;
+    font:normal 1.2em/1.2em serif;
+    color:#FFF;
+    margin:0;
     padding:.2em 0 .2em 20px;
-    background-color: #453619;
-    border-width: 4px 0px 4px 0px;
-    border-style: solid;
-    border-color: #5D835F;
+    background-color:#453619;
+    border-bottom:solid 2px #6AF364;
 }
 h5, h6 {
     font:normal 1em/1.2em serif;
     font-style:italic;
     margin:1.3em 0 .5em 1em;
 }
+
+#description:first-letter {
+    color:#FF0000;
+    font:20px;
+}
 p#description {
+    color:#000;
     max-width:800px;
     margin:0;
     padding:1em 20px;
-}
-p#description:first-letter {
-    color: #903;
-    font-size: 36px;
-    font-weight: bold;
-    font-style: italic;
+    background-color:#FFF;
 }
 p a {
-    color: #FFF;
+    color:#FFF;
     text-decoration:underline;
 }
 sup {
@@ -174,18 +179,17 @@ ol li a {
     text-decoration:none;
 }
 ol li a:hover {
-    text-decoration: none;
+    text-decoration:underline;
 }
 a {
-    color: #542;
+    color:#542;
 }
 a:visited {
-    color: #542;
+    color:#542;
 }
 a:hover {
-    color: #000;
-    background-color: #C1B398;
-    text-decoration: none;
+    color:#542;
+    text-decoration:underline;
 }
 span.preposition {
     padding-left:1em;
@@ -193,120 +197,213 @@ span.preposition {
 }
 .grampsid {
     font:normal .8em/1.2em monospace;
-    color: #000;
+    color:#696969;
 }
 
 /* Header
 ----------------------------------------------------- */
-div#header  {
-    background-color: #542;
-    border-bottom: solid 8px #5D835F;
+#header  {
+    margin:0;
     height: 60px;
-    width: 100%;
+    padding:0 0 .9em 0;
+    background-color:#542;
+    border-bottom:solid 2px #6AF364;
 }
 #SiteTitle {
+    color:#FFF;
     margin:0;
-    padding:.5em 0 0.5em 10px;
-    font-size: 28px;
-    color: #FFF;
-    font-style: italic;
+    padding:.5em 0 0 20px;
+    font-style:italic;
 }
 p#user_header {
     font-size:1.3em;
     text-align:left;
-    color: #6AF364;
+    color:#6AF364;
     margin:0;
     padding:.2em 0 .6em 20px;
+    background-color:#542;
 }
 
 /* Footer
 ----------------------------------------------------- */
-div#footer {
+#footer {
     clear:both;
-    overflow:hidden;
+    height:1.5cm;
     width:100%;
     font-size:12px;
     line-height:130%;
+    font-family:sans-serif;
     color:#FFF;
     margin:0;
+    padding:0;
     background-color:#542;
-    border-top:solid 8px #5D835F;
+    border-top:solid 2px #6AF364;
 }
-div#footer a, div#footer a:visited {
+#footer a, #footer a:visited {
     text-decoration:none;
-    color: #FFF;
+    color:#FFF;
 }
-div#footer a:hover {
-    color: #000;
-    text-decoration: none;
+#footer a:hover {
+    text-decoration:underline;
 }
-div#footer img {
+#footer img {
     border:0;
     margin:0 auto;
     vertical-align:middle;
 }
-div#footer p#createdate {
+#footer p:first-letter {
+    color:yellow;
+    font:x-large;
+}
+#footer p#createdate {
     float:left;
-    width:60%;
+    width:40%;
     text-align:left;
     margin-left:10px;
+    color:#FFF;
 }
-div#footer p#copyright {
+#footer p#copyright {
     float:right;
+    width:40%;
     text-align:right;
-    color: #FFF;
-    margin: 10px 10px 0px 0px;
+    color:#FFF;
+    margin-right:10px;
 }
-div#footer p#copyright img {
-    float:right;
-    margin-right: 10px;
+#footer p#copyright img {
+    margin-right:10px;
 }
 #user_footer {
     width:70%;
     float:left;
     margin:1em;
-     color: #6AF364;
 }
 #user_footer p {
     font:normal 1em/1.2em serif;
+    color:#6AF364;
     margin:0;
     padding:0;
 }
 
+/* Navigation
+----------------------------------------------------- */
+div#navigation, div#subnavigation {
+    width: 100%;
+}
+div#navigation ul, div#subnavigation ul {
+    list-style:none;
+    min-width:770px;
+    height: 42px;
+    margin:0;
+    padding: 0px 0px 0px 20px;
+    border-bottom: solid 2px #5D835F;
+}
+div#navigation ul li, div#subnavigation ul li {
+    float:left;
+}
+body#WebCal divdiv#navigation ul li a {
+    color: #FFF;
+}
+div#navigation ul li a, div#subnavigation ul li a {
+    display: block;
+    padding: 12px 10px 14px 1px;
+    float:left;
+    font:normal 16px/100% serif;
+    color: #000;
+    text-decoration:none;
+    margin:0;
+}
+div#navigation ul li a:hover, div#subnavigation ul li a:hover {
+    background-color: #C1B398;
+    color: #000;
+}
+div#navigation ul li.CurrentSection a, div#subnavigation ul li.CurrentSection a {
+    font-weight:bold;
+    font-style: italic;
+    background-color: #CCC;
+    color: #000;
+}
+div#navigation ul li.CurrentSection a:hover {
+    background-color: #000;
+    color: #FFF;
+}
+div#subnavigation ul li.CurrentSection a {
+    border-width: 0px 0px 2px 0px;
+    border-color: #FFF;
+}
+
+/* Alphabet Navigation
+----------------------------------------------------- */
+div#alphabet {
+    width: 100%;
+    margin: 0;
+    background-color: #6AF364;
+}
+div#alphabet ul {
+    list-style:none;
+    min-width:770px;
+    height:24px;
+    margin:0;
+    padding: 0px 0px 0px 16px;
+    border-width: 2px 0px 4px 0px;
+    border-style: solid;
+    border-color: #000;
+}
+div#alphabet ul li:after {
+    content:"  |";
+}
+div#alphabet ul li {
+    margin:0;
+    float:left;
+}
+div#alphabet ul li a {
+    display:block;
+    padding: 4px 8px 4px 8px;
+    float:left;
+    font:bold 16px/100% sans;
+    margin:0;
+    text-decoration:none;
+    color: #000;
+}
+div#alphabet ul li a:hover {
+    background-color: #000;
+    color: #FFF;
+}
+
 /* Main Table
 ----------------------------------------------------- */
 table.infolist {
     width:100%;
-    margin: 0;
-    padding: 0;
-    font-size: 12px;
+    margin:0;
+    padding:0;
+    background-color:#FFF;
 }
 table.infolist thead tr th {
     font:normal 1.1em/1.2em serif;
-    color: #000;
+    color:#000;
     margin:0;
     padding:.2em 10px;
-    background-color: #6AF364;
-    border: solid 1px #5D835F;
+    background-color:#6AF364;
+    border-bottom:solid 1px #000;
 }
 table.infolist thead tr th a {
-    color: #000;
+    background-color:#6AF364;
+    color:#000;
 }
 table.infolist thead tr th a:hover {
-    background-color: #C1B398;
+    background-color:#C1B398;
 }
 table.infolist tr td {
     font:normal 1.1em/1.4em serif;
     vertical-align:middle;
-    padding: 6px 0 6px 10px;
+    padding:.1em 10px;
+    background-color:#D8F3D6;
 }
 table.infolist tr td a {
     display:block;
     text-decoration:none;
-    color: #000;
 }
 table.infolist tr.BeginLetter td, table.infolist tr.BeginSurname td {
-    border-top: solid 1px #5D835F;
+    border-top:solid 1px #453619;
 }
 table.infolist tr td.ColumnLetter {
     width:3%;
@@ -314,6 +411,7 @@ table.infolist tr td.ColumnLetter {
 }
 table.infolist tbody tr td.ColumnBirth {
     font-size:.9em;
+    color:#000;
     width:10%;
 }
 table.infolist tbody tr td.ColumnDeath {
@@ -322,6 +420,7 @@ table.infolist tbody tr td.ColumnDeath {
 }
 table.infolist tbody tr td.ColumnRowLabel {
     width:2%;
+    color:#696969;
     padding-left:20px;
 }
 table.infolist tbody tr td.ColumnType {
@@ -330,18 +429,14 @@ table.infolist tbody tr td.ColumnType {
 }
 table.infolist tbody tr td.ColumnPartner {
     font-size:.9em;
-    background-color: #FFF;
 }
 table.infolist tbody tr td.ColumnPartner a {
-    display:block;
-    padding:.6em 10px;
-    vertical-align:middle;
+    background-color:#FFF;
 }
 table.infolist tbody tr td.ColumnParents {
     font-size:.9em;
 }
-table.infolist tbody tr td.ColumnParents span.father, 
-table.infolist tbody tr td.ColumnParents span.mother {
+table.infolist tbody tr td.ColumnParents span.father, table.infolist tbody tr td.ColumnParents span.mother {
     display:block;
 }
 table.infolist tbody tr td.ColumnParents span.mother:before {
@@ -350,15 +445,9 @@ table.infolist tbody tr td.ColumnParents span.mother:before {
 
 /* Surnames
 ----------------------------------------------------- */
-#Surnames {
-    margin: 0;
-    padding: 0;
-}
-#SurnameDetail p#description {
-    padding-top:0;
-}
-table.surnamelist thead tr th.ColumnSurname, 
-#Surnames table.surnamelist tbody tr td.ColumnSurname {
+#Surnames {  }
+#SurnameDetail p#description { padding-top:0; }
+table.surnamelist thead tr th.ColumnSurname, #Surnames table.surnamelist tbody tr td.ColumnSurname {
     width:50%;
 }
 table.surnamelist thead tr th {
@@ -370,294 +459,183 @@ table.surnamelist thead tr th a, table.surnamelist thead tr th a:visited {
     text-decoration:none;
     padding:.2em 10px;
 }
+table.surnamelist tr th:hover {
+    background-color:#C1B398;
+}
 table.surnamelist thead tr th.ColumnLetter {
-    padding: 0px 10px 0px 20px;
+    padding-left:20px;
+    padding-right:10px;
 }
-table.surnamelist tbody tr td {
-    background-color: #D8F3D6;
+table#SortByName thead tr th.ColumnSurname, table#SortByCount thead tr th.ColumnQuantity {
+    background-color:#C1B398;
 }
-table.surnamelist tbody tr td.ColumnLetter a {
-    background: none;
-}
-table.surnamelist tbody tr td.ColumnSurname {
-    background-color: #FFF;
-}
-table#SortByName thead tr th.ColumnSurname, 
-table#SortByCount thead tr th.ColumnQuantity {
-    background-color: #C1B398;
-}
-table#SortByName thead tr th.ColumnSurname a:after, 
-table#SortByCount thead tr th.ColumnQuantity a:after {
+table#SortByName thead tr th.ColumnSurname a:after, table#SortByCount thead tr th.ColumnQuantity a:after {
     content:" ↓";
 }
 table#SortByName tbody tr td.ColumnSurname {
     padding:0;
+    background-color:#FFF;
 }
 table#SortByName tbody tr td.ColumnSurname a {
     display:block;
     padding:.1em 10px .3em 10px;
 }
-table.surnamelist tbody tr td.ColumnSurname:hover,
- table#SortByName tbody tr td.ColumnSurname:hover {
-    background-color: #C1B398;
+table#SortByCount tbody tr td.ColumnQuantity {
+    background-color:#FFF;
+}
+table.surnamelist tbody tr td.ColumnSurname:hover, table#SortByName tbody tr td.ColumnSurname:hover {
+    background-color:#C1B398;
 }
 table.surname {
-    border-bottom: solid 1px #5D835F;
+    border-bottom:solid 1px #000;
+}
+table.surname tbody tr td {
+    border-bottom:dashed 1px #000;
 }
 table.surname thead tr th.ColumnName {
     width:20%;
     padding-left:20px;
 }
-table.surname tbody tr td {
-    border-bottom: dashed 1px #5D835F;
-    background-color: #D8F3D6;
-}
 table.surname tbody tr td.ColumnName {
-    background-color: #FFF;
     width:20%;
     padding:0;
+    background-color:#FFF;
 }
 table.surname tbody tr td.ColumnName a {
     display:block;
     padding:.6em 10px .6em 20px;
 }
-table.surname tbody tr td.ColumnName a span.grampsid {
-    color: #000;
-}
+table.surname tbody tr td.ColumnName a span.grampsid { }
+
 table.surname tbody tr td.ColumnName:hover {
-    background-color: #C1B398;
+    background-color:#C1B398;
 }
-table.surname tbody tr td.ColumnPartner {
-    background-color: #FFF;
-}
-table.surname tbody tr td.ColumnPartner a {
-    display:block;
-    padding:.6em 10px .6em 0px;
-}
-table.surname thead tr th.ColumnParents, 
-table.surname tbody tr td.ColumnParents {
+table.surname thead tr th.ColumnParents, table.surname tbody tr td.ColumnParents {
     width:25%;
 }
 
 /* Individuals
 ----------------------------------------------------- */
-div#Individuals {
-    margin: 0;
-    padding: 0;
+#Individuals {  }
+#Individuals table.individuallist {
+    border-bottom:solid 1px #453619;
 }
-div#Individuals table.individuallist {
-    border-bottom: solid 1px #5D835F;
+#Individuals table.individuallist tbody tr td {
+    border-bottom:dashed 1px #453619;
 }
-div#Individuals table.individuallist tbody tr td {
-    border-bottom: dashed 1px #5D835F;
-    background-color: #D8F3D6;
+#Individuals table.individuallist tbody tr td a:hover {
+    text-decoration:none;
 }
-div#Individuals table.individuallist tbody tr td a {
-    display: block;
-    padding: .6em 10px;
-}
-div#Individuals table.individuallist tbody tr td.ColumnSurname a:hover, 
-div#Individuals table.individuallist tbody tr td.ColumnSurname a:active {
+table.individuallist tbody tr td.ColumnSurname a:hover, table.individuallist tbody tr td.ColumnSurname a:active {
     cursor:default;
-    color: #000;
+    color:black;
     background:none;
 }
-div#Individuals table.individuallist tbody tr td.ColumnName {
-    background-color: #FFF;
+table.individuallist tbody tr td.ColumnName {
+    padding:0;
+    background-color:#FFF;
 }
-div#Individuals table.individuallist tbody tr td.ColumnName a {
+table.individuallist tbody tr td.ColumnName a {
+    display:block;
+    padding:.6em 10px;
     vertical-align:middle;
 }
-div#Individuals table.individuallist tbody tr td.ColumnPartner {
-    background-color: #FFF;
+table.individuallist tbody tr td.ColumnName a:hover {
+    background-color:#C1B398;
 }
-div#Individuals div table.infolist tr td p {
+table.individuallist tbody tr td.ColumnPartner {
+    padding:0;
+    background-color:#FFF;
+}
+table.individuallist tbody tr td.ColumnPartner a {
+    display:block;
+    padding:.6em 10px;
+    vertical-align:middle;
+}
+table.individuallist tbody tr td.ColumnPartner a:hover {
+    background-color:#C1B398;
+}
+#Individuals div table.infolist tr td p {
     font:normal .9em/1.2em sans-serif;
     vertical-align:top;
 }
-div#Individuals div table.infolist tr td p a {
+#Individuals div table.infolist tr td p a {
     display:inline;
 }
-div#IndividualDetail {
-    padding: 0;
-    margin: 0;
+
+/* IndividualDetail
+------------------------------------------------------ */
+#IndividualDetail {
+    background-color:#C1B398;
 }
 #IndividualDetail div table.infolist tr td {
     font:normal .9em/1.2em sans-serif;
     vertical-align:top;
 }
-div#IndividualDetail div table.infolist tr td a {
+#IndividualDetail div table.infolist tr td a {
     display:inline;
 }
-div#IndividualDetail table.infolist tr td a:hover {
-    text-decoration: none;
+#IndividualDetail table.infolist tr td a:hover {
+    text-decoration:underline;
 }
-div#IndividualDetail table.infolist tbody tr td.ColumnAttribute {
+#IndividualDetail table.infolist tbody tr td.ColumnAttribute {
     width:10%;
+    color:#696969;
 }
-div#IndividualDetail div.subsection table tr td:first-child {
+#IndividualDetail div.subsection table tr td:first-child {
     padding-left:20px;
 }
 
+/* Sources
+----------------------------------------------------- */
+#Sources {  }
+#Sources table.infolist tbody tr td.ColumnRowLabel {
+    padding-bottom:0;
+}
+#Sources table.infolist tbody tr td.ColumnName {
+    padding:0;
+}
+#Sources table.infolist tbody tr td.ColumnName a {
+    font-size:.9em;
+    padding:.1em 10px .3em 10px;
+    background-color:#FFF;
+}
+#Sources table.infolist tbody tr td.ColumnName a:hover {
+    background-color:#C1B398;
+}
+#SourceDetail div#references ol li {
+    padding-bottom:.5em;
+}
+
 /* Places
 ----------------------------------------------------- */
-#Places {
-    margin: 0;
-    padding: 0;
-}
-#Places table.infolist tbody tr td.ColumnLetter {
-    background-color: #D8F3D6;
-}
-#Places table.infolist tbody tr td.ColumnLetter a:hover {
-    background: none;
-}
+#Places {  }
 #Places table.infolist tbody tr td.ColumnName {
-    background-color: #FFF;
+    padding:0;
 }
 #Places table.infolist tbody tr td.ColumnName a {
     padding:.1em 10px .3em 10px;
+    background-color:#FFF;
+}
+#Places table.infolist tbody tr td.ColumnName a:hover {
+    background-color:#C1B398;
 }
 
-/* EventList and EventDetail
------------------------------------------------------ */
-div#EventList, div#EventDetail {
-    margin: 0;
-    padding: 0;
-}
-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 {
-    background-color: #FFF;
-    border-bottom: dashed 1px #5D835F;
-}
-table.eventlist tbody tr td.ColumnEvent {
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnDate {
-    background-color: #D8F3D6;
-    width: 10%;
-}
-table.eventlist tbody tr td.ColumnPlace {
-    background-color: #FFF;
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnDescription {
-    width: 20%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    background-color: #D8F3D6;
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnSources {
-    background-color: #FFF;
-    width: 5%;
-}
-table.eventlist tbody tr td.ColumnPerson {
-    width: 35%;
-}
-table.eventlist tbody tr td.ColumnPartner {
-    width: 35%;
-}
-div#EventList table.eventlist tbody tr.BeginName {
-    border-top: solid 1px #5D835F;
-}
-div#EventList table.eventlist tbody tr td {
-    padding: 4px 0px 4px 0px;
-}
-div#EventList table.alphaevent {
-    padding: .3em 0 .3em 0;
-    margin: 0;
-}
-div#EventList table.alphaevent tbody tr.BeginEvent {
-    border-top: solid 1px #5D835F;
-}
-div#EventList table.alphaevent tbody tr td {
-    background-color: #D8F3D6;
-    border-bottom: dashed 1px #5D835F;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType {
-    width: 15%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnType a:hover {
-    background: none;
-}
-div#EventList table.alphaevent tbody tr td.ColumnGRAMPSID {
-    background-color: #FFF;
-    width: 12%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnDate {
-    width: 20%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson {
-    width: 60%;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.father, 
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
-    display:block;
-}
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
-    content:"+ ";
-}
-div#EventDetail h3 {
-    font-size: 28px;
-}
-div#EventDetail h3:first-letter {
-    color: #903;
-}
-div#EventDetail table.eventlist {
-    width: 100%;
-}
-div#EventDetail table.eventlist tbody tr {
-    border-top: dashed 1px #5D835F;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
-    text-transform: uppercase;
-    width: 20%;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnDate {
-    background-color: #D8F3D6;
-    border-top: solid 1px #5D835F;
-}
-div#EventDetail table.eventlist tbody tr td.ColumnPerson {
-    background-color: #D8F3D6;
-}
-    
 /* Gallery
 ----------------------------------------------------- */
-#Gallery {
-    margin: 0;
-    padding: 0;
-}
-#Gallery table.infolist tbody tr td {
-    background-colo: #D8F3D6;
-}
-#Gallery table.infolist tbody tr td.ColumnRowLabel {
-    width: 5%;
-    padding-bottom: 0;
+#Gallery {  }
+#Gallery table.infolist tbody tr td.ColumnRowLabel, #Gallery table.infolist tbody tr td.ColumnDate {
+    padding-bottom:0;
 }
 #Gallery table.infolist tbody tr td.ColumnName {
-    width: 50%;
-    background-color: #FFF;
+    padding:0;
 }
 #Gallery table.infolist tbody tr td.ColumnName a {
-    display: block;
-    padding: .2em 10px .4em 10px;
+    padding:.1em 10px .3em 10px;
+    background-color:#FFF;
 }
-#Gallery table.infolist tbody tr td.ColumnDate {
-    width: 20%;
-}
-#Gallery table.infolist tbody tr td.ColumnMime {
-    width: 20%;
-}
-#Gallery table.gallerylist tbody tr td {
-    border-bottom: dashed 1px #5D835F;
+#Gallery table.infolist tbody tr td.ColumnName a:hover {
+    background-color:#C1B398;
 }
 #GalleryNav {
     font:normal 1em/1em sans-serif;
@@ -668,7 +646,10 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson {
 #GalleryNav a {
     font-weight:bold;
     text-decoration:none;
-    border: solid 1px #5D835F;
+    border:solid 1px #453619;
+}
+#GalleryNav a:hover {
+    background-color:#C1B398;
 }
 #GalleryNav a#Previous {
     padding:.5em .7em .3em .7em;
@@ -691,7 +672,7 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson {
     position:relative;
     overflow:hidden;
     text-align:center;
-    border: solid 1px #5D835F;
+    border:solid 1px #453619;
 }
 #GalleryDisplay img {
     margin:0 auto;
@@ -709,33 +690,21 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson {
 }
 #GalleryDetail div#summaryarea table.gallery {
     padding-bottom:0;
-    margin: 1.5em 0 0 0;
-    border-style: solid;
-    border-width: 2px 0 1px 0;
-    border-color: #5D835F;
-}
-#GalleryDetail table.exifdata {
-    margin: .2em 0 .2em 0;
-    width: 100%;
-}
-#GalleryDetail table.exifdata tbody tr {
-    border-top: solid 1px #5D835F;
-}
-#GalleryDetail table.exifdata tbody tr td.ColumnExifKeys {
-    width: 60%;
-}
-#GalleryDetail table.exifdata tbody tr td.ColumnMetaData {
-    width: 40%;
+    margin-top:1.5em;
+    margin-bottom:0;
+    background-color:#FFF;
+    border-style:solid;
+    border-width:8px 0 0 0;
+    border-color:#453619;
 }
 
 /* Contact
 ----------------------------------------------------- */
 #Contact #summaryarea {
-    background-color: #D8F3D6;
     width:500px;
     margin:0 auto;
     padding:3em;
-    border: double 4px #5D835F;
+    background-color:#F1ECE2;
 }
 #Contact #summaryarea img {
     float:right;
@@ -771,141 +740,60 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson {
 #email a {
     text-decoration:none;
 }
+#email a:hover {
+    text-decoration:underline;
+}
 
 /* Download 
 ----------------------------------------------------- */
-
-div#Download { 
-    margin: 0;
-    padding: 0px 0px .5em 0px;
+#Download { 
+    padding:1cm;
+    height:420px;
 }
-div#Download table.download {
-    padding: 0;
-    margin: .5em 0 .5em 0;
-    border: solid 1px #5D835F;
-    width: 100%;
+table.download {
+    border:solid 2px #000;
+    width:100%;
 }
-div#Download table.download img {
+table.download img {
     float:center;
 }
-div#Download table.download tbody tr#Row02 {
-    border-bottom: solid 2px #5D835F;
+table.download thead tr th {
+    text-align:center;
+    border:solid 2px #000;
+    color: #000;
+    text-transform:uppercase;
 }
-div#Download table.download tbody tr td { 
-    background-color: #D8F3D6;
-    border: solid 1px #5D835F;
+table.download tbody tr#Row02 {
+    border-bottom:solid 2px #000;
+}
+table.download thead tr th, table.download tbody tr td { 
+    padding-left:10px;
+    padding-top:20px;
+    border-style:solid;
+    border-color:#000;
+    border-width:0 2px 2px 2px;
     text-align:left;
 }
-div#Download table.download td.Filename {
-    width:30%;
-    background-color: #FFF;
+table.download td.Description {
+    width: 50%;
 }
-div#Download table.download td.Filename a {
-    display: block;
-    padding: 10px 10px 14px 6px;
+table.download td.License {
+    width:8%;
+}
+table.download td.Filename {
+    width:30%;
+}
+table.download td.Filename a {
     font-weight:bold;
     font-style: italic;
     text-decoration:none;
 }
-div#Download table.download td.Description {
-    width:45%;
+table.download td.Filename a:hover {
+    text-decoration:underline;
 }
-div#Download table.download td.License {
-    width:6%;
-}
-div#Download table.download td.Modified {
-    width:17%;
-}
-
-/* Sources
------------------------------------------------------ */
-#Sources {  }
-
-div#Sources table.infolist tbody tr td {
-    background-color: #D8F3D6;
-}
-div#Sources table.infolist tbody tr td.ColumnRowLabel {
-    padding-bottom:0;
-}
-div#Sources table.infolist tbody tr td.ColumnName {
-    padding:0;
-    background-color: #FFF;
-}
-div#Sources table.infolist tbody tr td.ColumnName a {
-    font-size:.9em;
-    padding:.1em 10px .3em 10px;
-}
-div#Sources table.infolist tbody tr td.ColumnName a:hover { }
-
-div#SourceDetail div#references ol li {
-    padding-bottom:.5em;
-}
-
-
-/* Repositories
------------------------------------------------------- */
-div#RepositoryList {
-    margin: 0;
-    padding: 0;
-}
-div#RepositoryList table.repolist tbody tr td {
-    background-color: #D8F3D6;
-}
-div#RepositoryList table.repolist tbody tr td a {
-    display: block;
-    padding: .3em 10px;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnRowLabel {
-    width: 9%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnType {
-    width: 15%;
-}
-div#RepositoryList table.repolist tbody tr td.ColumnName {
-    background-color: #FFF;
-}
-
-/* Address Book
------------------------------------------------------- */
-div#AddressBookList, AddressBookDetail {
-    margin: 0;
-    padding: 0;
-}
-div#AddressBookList table.addressbook {
-    margin: .3em 0 .3em 0;
-}
-div#AddressBookList table.addressbook tbody tr.Totals {
-    border: solid 1px #5D835F;
-}
-div#AddressBookList tble.addressbook tbody tr.Totals td {
-    text-align: left;
-    background-color: #D8F3D6;
-}
-div#AddressBookList table.addressbook tbody tr td {
-    background-color: #D8F3D6;
-    text-align: center;
-    border: solid 1px #5D835F;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnRowLabel {
-    width: 4%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName {
-    background-color: #FFF;
-    text-align: left;
-    width: 70%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnName a {
-    display: block;
-    padding: 6px 0px 6px 0px;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnAddress {
-    width: 8%;
-}
-div#AddressBookList table.adressbook tbody tr td.ColumnResidence {
-    width: 8%;
-}
-div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
-    width: 8%;
+table.download td.Modified {
+    width:12%;
+    font-weight:bold;
 }
 
 /* Subsections
@@ -923,6 +811,7 @@ div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
 }
 div.subsection{
     padding-bottom:.5em;
+    background-color:#FFF;
 }
 div.subsection h4 {
     margin-bottom:.5em;
@@ -945,26 +834,27 @@ div.subsection table.infolist {
 ----------------------------------------------------- */
 div#events {
     padding-bottom:0;
+    height:3.5cm;
+    overflow:auto;
 }
 div#events h4 {
     margin-bottom:0;
     border:none;
 }
-#IndividualDetail {
-    background-color: #FFF;
+#IndividualDetail div#events table.infolist thead tr th {
+    font-weight:bold;
+    font-size:12px;
+    line-height:12px;
+    font-family:sans-serif;
+    text-transform:uppercase;
+    color:#542;
+    padding-top:6px;
+    padding-bottom:4px;
+    background-color:#6AF364;
 }
 #IndividualDetail div#events table.eventtable {
     width:100%;
-    padding-top:15px;
-}
-#IndividualDetail div#events table.infolist thead tr th {
-    font-weight:bold;
-    font-size:10px;
-    line-height:12px;
-    text-transform:uppercase;
-    color: #542;
-    padding-top:6px 0 4px 0;
-    background-color: #6AF364;
+    padding-bottom:15px;
 }
 #IndividualDetail div#events table.infolist thead tr th:first-child {
     padding-left:20px;
@@ -974,60 +864,19 @@ div#events h4 {
     padding-bottom:.8em;
 }
 #IndividualDetail div#events table.infolist tbody tr td.ColumnAttribute {
-    border-bottom: solid 1px #5D835F;
+    border-bottom:solid 1px #453619;
 }
 #IndividualDetail div#events table.infolist tbody tr td.ColumnValue {
-    border-bottom:solid 1px #5D835F
+    border-bottom:solid 1px #453619;
 }
 table.infolist tbody tr td.ColumnValue p {
     font-family:sans-serif;
-    color: #696969;
+    color:#696969;
     margin:.2em 0 0 2em;
 }
 
 /* Subsections : Attributes
 ----------------------------------------------------- */
-div#attributes {
-    margin: 0;
-    padding: 0;
-}
-table.attrlist {
-    width: 100%;
-}
-table.attrlist thead tr th.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist thead tr th.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td {
-    background-color: #D8F3D6;
-    border-bottom: dashed 1px #5D835F;
-}
-table.attrlist tbody tr td.ColumnType {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttribute {
-    border: none;
-    background: none;
-}
-table.attrlist tbody tr td.ColumnAttrType {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrValue {
-    width: 15%;
-}
-table.attrlist tbody tr td.ColumnAttrNotes {
-    width: 45%;
-    background-color: #D8F3D6;
-}
-table.attrlist tbody tr td.ColumnAttrSources {
-    background-color: #FFF;
-    width: 15%;
-}
 
 /* Subsections : Parents
 ----------------------------------------------------- */
@@ -1048,12 +897,7 @@ div#parents table.infolist tbody tr td.ColumnValue ol li {
 /* Subsections : Families
 ----------------------------------------------------- */
 div#families table.infolist {
-    margin: .3cm 0 .3cm 0;
-}
-div#Families table.infolist tbody tr td { }
-
-div#families table.infolist tbody tr td.ColumnValue {
-    background-color: #FFF;
+    margin-top:.5em;
 }
 div#families table.infolist tbody tr td.ColumnValue p {
     margin-top:0;
@@ -1066,78 +910,21 @@ div#families table.infolist tbody tr td.ColumnValue ol li {
     padding-bottom:.2em;
 }
 
-/* Subsection: LDS Ordinance
------------------------------------------------------- */
-div#LDSOrdinance { }
-
-div#LDSOrdinance table.ldsordlist {
-    font-size:.35cm;
-}
-table.ldsordlist {
-    margin-bottom:.5em;
-}
-table.ldsordlist tbody tr td {
-    border-bottom: solid 1px #5D835F;
-}
-table.ldsordlist tbody tr td.ColumnLDSType {
-    width:12%;
-}
-table.ldsordlist tbody tr td.ColumnLDSDate {
-    width:15%;
-}
-table.ldsordlist tbody tr td.ColumnLDSTemple {
-    width:10%;
-}
-table.ldsordlist tbody tr td.ColumnLDSPlace {
-    width:35%;
-}
-table.ldsordlist tbody tr td.ColumnLDSStatus {
-    width:8;
-}
-table.ldsordlist tbody tr td.ColumnLDSSealed {
-    width:25%;
-}
-table.ldsordlist tbody tr td.ColumnLDSSources {
-    width:7%;
-    margin-top:.2cm;
-}
-
 /* Subsections : Addresses
 ----------------------------------------------------- */
-div#Addresses {
-    margin: 0;
-    padding: 0;
+div#addresses {
+    padding-bottom:0;
 }
-div#Addresses table.infolist {
-    font-size: 12px;
-    background-color: #D8F3D6;
+div#addresses table.infolist tbody tr td {
+    padding-top:.4em;
+    padding-bottom:.4em;
 }
-div#Addresses table.infolist tbody tr td {
-    border-bottom: solid 1px #5D835F;
+div#addresses table.infolist tbody tr td.ColumnAttribute {
+    width:30%;
+    border-bottom:solid 1px #453619;
 }
-div#Addresses table.infolist tbody tr td.ColumnDate {
-    width: 15%;
-}
-div#Addresses table.infolist tbody tr td.ColumnStreetAddress {
-    width: 30%;
-}
-div#Addresses table.infolist tbody tr td.ColumnCity {
-    width: 8%;
-}
-div#Addresses table.infolist tbody tr td.ColumnCounty {
-    width: 8%;
-}
-div#Addresses table.infolist tbody tr td.ColumnState {
-    width: 12%;
-}
-div#Addresses table.infolist tbody tr td.ColumnCntry {
-    width: 5%;
-}
-div#Addresses table.infolist tbody tr td.ColumnPostalcode {
-    width: 10%;
-}
-div#Addresses table.infolist tbody tr td.ColumnPhone {
-    width: 15%;
+div#addresses table.infolist tbody tr td.ColumnValue {
+    border-bottom:solid 1px #453619;
 }
 
 /* Subsections : Gallery
@@ -1145,23 +932,23 @@ div#Addresses table.infolist tbody tr td.ColumnPhone {
 #indivgallery h4 {
     margin-bottom:1em;
 }
-#indivgallery .thumbnail {
+#indivgallery .thumbnail tr {
     margin:0;
     float:left;
     width:130px;
     height:150px;
     text-align:center;
 }
-#indivgallery div.thumbnail a {
+#indivgallery .thumbnail tr a {
     display:block;
     margin:0;
     padding:0;
     background:none;
 }
-#indivgallery div.thumbnail a img {
-    margin-bottom:.5cm;
+#indivgallery .thumbnail tr a img {
+    margin:0;
     padding:0;
-    border: solid 1px #5D835F;
+    border:solid 1px #453619;
 }
 #indivgallery div.thumbnail p {
     font:normal .7em/1.4em sans-serif;
@@ -1189,8 +976,8 @@ div#narrative {
 /* Subsections : Source References
 ----------------------------------------------------- */
 div#sourcerefs {
-    padding: 0;
-    margin: 0 auto;
+    height:2.5cm;
+    overflow:auto;
 }
 div#sourcerefs ol {
     list-style-type:decimal;
@@ -1202,13 +989,13 @@ div#sourcerefs ol li ol {
 /* Subsections : Summary Area
 ----------------------------------------------------- */
 div#summaryarea {
-    background-color: #FFF;
+    background:none;
 }
 div#summaryarea table.infolist {
     margin:0;
     padding:0;
     background:#FFF;
-    border-bottom: solid .7em #5D835F;
+    border-bottom:solid .7em #FFF;
 }
 div#summaryarea table.infolist tr td, div#summaryarea table.infolist tr td p {
     font:normal .9em/1.2em sans-serif;
@@ -1219,32 +1006,12 @@ div#summaryarea table.infolist tr td a, div#summaryarea table.infolist tr td p a
 }
 div#summaryarea table.infolist tbody tr td.ColumnAttribute {
     width:14%;
-    color: #696969;
+    color:#696969;
     padding-left:20px;
 }
 
 /* Subsections : Weblinks
 ----------------------------------------------------- */
-div#WebLinks {
-    margin : 0 auto;
-    padding: 0;
-}
-
-table.weblinks tr td {
-    background-color: #6AF364;
-    border-bottom: dashed 1px #000;
-}
-table.weblinks tr td.ColumnRowLabel {
-    width: 8%;
-}
-table.weblinks tr td.ColumnType {
-    width: 30%;
-}
-table.weblinks tr td.ColumnDescription {
-    background-color: #FFF;
-    width: 30%;
-}
-
 
 /* Subsections : Pedigree
 ----------------------------------------------------- */
@@ -1253,7 +1020,7 @@ div#pedigree {
 }
 #pedigree a {
     text-decoration:none;
-    color: #000;
+    color:#000;
 }
 #pedigree a:hover {
     text-decoration:underline;
@@ -1284,7 +1051,7 @@ div#pedigree {
 .spouse a {
     font-weight:normal;
     font-style:normal;
-    color: #000;
+    color:#000;
 }
 .spouse:before {
     content: "+ ";
@@ -1319,36 +1086,37 @@ div#pedigree {
     font:normal .7em/1.4em sans-serif;
     text-align:center;
     text-decoration:none;
-    color: #542;
+    color:#542;
     width:118px;
     padding:5px 20px 7px 20px;
+    margin-top:-25px;
     margin-left:16px;
-    background-color: #FFF;
-    border: solid 1px #5D835F
-}
-#treeContainer div.boxbg a.noThumb,
-#treeContainer div.AncCol3 a, 
-#treeContainer div.AncCol4 a, 
-#treeContainer div.AncCol3 span.unlinked, 
-#treeContainer div.AncCol4 span.unlinked {
-    margin-top:10px;
+    background-color:#FFF;
+    border:solid 1px #453619;
 }
 #treeContainer div.boxbg a:hover {
     position:relative;
     z-index:999;
     font-size:1em;
     text-decoration:none;
-    color: #542;
+    color:#542;
     width:190px;
     margin-left:-20px;
     padding:10px 25px 12px 25px;
-    border: solid 2px #5D835F;
+    border:solid 2px #453619;
 }
 #treeContainer div.boxbg a:hover, 
 #treeContainer div.AncCol3 a:hover, 
 #treeContainer div.AncCol4 a:hover {
     margin-top:-44px;
 }
+#treeContainer div.boxbg a.noThumb, 
+#treeContainer div.AncCol3 a, 
+#treeContainer div.AncCol4 a, 
+#treeContainer div.AncCol3 span.unlinked, 
+#treeContainer div.AncCol4 span.unlinked {
+    margin-top:10px;
+}
 #treeContainer div.boxbg a.noThumb:hover {
     margin-top:0;
 }
@@ -1360,14 +1128,12 @@ div#pedigree {
 }
 #treeContainer div.boxbg span.thumbnail {
     display:block;
-    max-width:80px auto;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
     padding:4px 0;
 }
 #treeContainer div.boxbg span.thumbnail img {
-    max-width:80px auto;
-    max-height:65px;
+    height:65px;
     margin:0 auto;
 }
 #treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
@@ -1389,8 +1155,8 @@ div#pedigree {
 }
 #treeContainer div.unknown a,
 #treeContainer div.unknown span.unlinked {
-    background-color: #000;
-    color: #FAFAFA;
+    background-color:#000;
+    color:#FAFAFA;
 }
 .shadow {
     display:none;
@@ -1401,7 +1167,7 @@ div#pedigree {
     height:1px;
     margin:0 0 0 16px;
     padding:0;
-    background-color: #228A22;
+    background-color:#453619;
 }
 #tree div div.bhline {
     position:absolute;
@@ -1409,7 +1175,7 @@ div#pedigree {
     width:1px;
     margin:0 0 0 16px;
     padding:0;
-    background-color: #228A22;
+    background-color:#453619;
 }
 .ghline, .gvline {
     display:none;
@@ -1419,7 +1185,7 @@ div#pedigree {
 -------------------------------------------------------------------------------------------- */
 /* Calendar : General */
 body#WebCal {
-    background-color: #FFF;
+    padding:0 14px;
 }
 .calendar {
     empty-cells:show;
@@ -1445,37 +1211,39 @@ body#WebCal {
     font-size:2em;
     line-height:100%;
     text-transform:none;
-    color: #542;
+    color:#542;
     padding:.3em 0 .2em 0;
-    background-color: #FFF;
+    background-color:#FFF;
 }
 #CreatorInfo {
     float:right;
-    color: #FFF;
+    color:#FFF;
     margin:-24px 10px 0 0;
 }
 #CreatorInfo a {
-    color: #FFF;
+    color:#FFF;
 }
 #CreatorInfo a:hover {
-    color: #FFF;
+    background-color: #C1B398;
+    color: #000;
 }
 .calendar thead tr th.weekend, 
 .calendar thead tr th.weekday {
     font-style:italic;
-    color: #000;
-    background-color: #6AF364;
-    border: solid 2px #5D835F;
+    color:#000;
+    background-color:#6AF364;
+    border:solid 2px #453619;
 }
 .calendar tfoot tr td {
     padding:.7em 5% 1em 5%;
-    border-top:solid 2px #000;
+    border-top: solid 1px #5D835F;
     vertical-align:middle;
     color: #000;
-    background-color: #D8F3D6;
+    background-color:#D8F3D6;
 }
 
-/* Calendar : Date Numeral */
+/* Calendar : Date Numeral 
+------------------------------------------- */
 .calendar tbody tr td div.date {
     float:right;
     display:block;
@@ -1483,10 +1251,10 @@ body#WebCal {
     font-size:1.2em;
     line-height:100%;
     text-align:center;
-    color: #542;
+    color:#542;
     margin:0 0 0 .5em;
     padding:.2em 0;
-    background-color: #D8F3D6;
+    background-color:#D8F3D6;
 }
 
 /* Calendar : Date Container */
@@ -1496,22 +1264,22 @@ body#WebCal {
     padding:0;
     border-width:1px 0 0 1px;
     border-style:solid;
-    border-color: #5D835F;
+    border-color:#453619;
 }
 .calendar tbody tr td.weekday {
-    background-color: #FFF;
+    background-color:#FFF;
 }
 .calendar tbody tr td.weekend {
-    background-color: #D8F3D6;
+    background-color:#D8F3D6;
 }
 .calendar tbody tr td.saturday {
-    border-right: solid 1px #5D835F;
+    border-right:solid 1px #453619;
  }
 .calendar tbody tr td.sunday {
-    border-left: solid 1px #5D835F;
+    border-left:solid 1px #453619;
 }
 .calendar tbody tr td:first-child {
-    border-left: solid 1px #5D835F;
+    border-left:solid 1px #453619;
 }
 .calendar tbody tr:first-child td {
     border-top:none;
@@ -1530,7 +1298,7 @@ body#WebCal {
     width:92%;
     margin:0 4%;
     padding:.2em 0 .3em 0;
-    border-top: dashed 1px #5D835F;
+    border-top:dashed 1px #453619;
 }
 .calendar tbody tr td ul li:first-child {
     border:none;
@@ -1539,16 +1307,16 @@ body#WebCal {
 /* Calendar : Birthday, Anniversary, Highlight */
 .calendar tbody tr td ul li em {
     font-style:normal;
-    color: #0A65B5;
+    color:#0A65B5;
 }
 .calendar tbody tr td ul li span.yearsmarried em {
-    color: #228A22;
+    color:#453619;
 }
 .calendar tbody tr td.highlight { }
 
 .calendar tbody tr td.highlight div.date {
-    color: #0A65B5;
-    background-color: #C2E1FE;
+    color:#0A65B5;
+    background-color:#C2E1FE;
 }
 
 /* Calendar : Previous-Next Month */
@@ -1556,14 +1324,11 @@ body#WebCal {
 .calendar tbody tr td.next, 
 .calendar tbody tr td.previous div.date, 
 .calendar tbody tr td.next div.date {
-    color: #333;
-    background-color: #D8F3D6;
+    color:#333;
+    background-color:#D8F3D6;
 }
 
 /* Calendar : Full Year */
-body#fullyearlinked {
-    background-color: #FFF;
-}
 body#fullyearlinked div.content {
     width:963px;
     margin:0 auto;
@@ -1573,52 +1338,21 @@ body#fullyearlinked table.calendar {
     float:left;
     width:320px;
     height:18em;
-    border:solid 1px #000;
+    border:solid 1px #453619;
 }
 body#fullyearlinked table.calendar thead tr th {
     height:2em;
-    border-width: 1px 1px 0px 0px;
-    border-color: #000;
-    text-align: center;
 }
 body#fullyearlinked table.calendar thead tr th.monthName {
     font-size:1.2em;
     padding:2px 0;
-    border-bottom: solid 1px #000;
 }
 body#fullyearlinked table.calendar tbody tr td {
     height:3em;
 }
-body#fullyearlinked table.calendar tbody tr td.emptyDays {
-    background-color: #FFF;
-}
 body#fullyearlinked table.calendar tbody tr td.saturday {
     border-right:solid 2px #000;
 }
 body#fullyearlinked able.calendar tbody tr td.sunday {
     border:solid 2px #000;
 }
-
-/* Calendar: OneDay
---------------------------------------------------------------------------------- */
-body#OneDay h3 {
-    color: #228A22;
-    font-weight: bold;
-    text-align: center;
-}
-table.oneday {
-    margin: .3em 0 .3em 0;
-    padding: 0;
-}
-table.oneday tbody tr td {
-    border-bottom: dashed 1px #5D835F;
-}
-table.oneday tbody tr td.ColumnRowLabel {
-    width: 5%;
-}
-table.oneday tbody tr td.ColumnText {
-    width: 85%;
-}
-table.oneday tbody tr td.ColumnEvent {
-    width; 10%;
-}
diff --git a/src/data/behaviour.css b/src/data/behaviour.css
index 381293e2d..45a594e4c 100644
--- a/src/data/behaviour.css
+++ b/src/data/behaviour.css
@@ -1,29 +1,31 @@
 /*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2009 Stephane Charette and Jason Simanek
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-**************************************************************************************************
+-------------------------------------------------------------------------------
 GRAMPS cascading style sheet for common behaviour independant of styles
 Style Name: n/a (used by many different styles)
 Style Author: Stephane Charette and Jason Simanek
-**************************************************************************************************
+-------------------------------------------------------------------------------
+GRAMPS is a Free Software Project for Genealogy, offering a professional
+genealogy program, and a wiki open to all. It is a community project, created,
+developed and governed by genealogists.
+
+Go to <http://www.gramps-project.org/> to learn more!
+
+License
+-------------------------------------------------------------------------------
+Copyright 2009 Stephane Charette and Jason Simanek
+This file is part of the GRAMPS program.
+
+GRAMPS is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 of the License.
+
+GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GRAMPS. If not, see <http://www.gnu.org/licenses/>.
+-------------------------------------------------------------------------------
 
  ------------- 
  Image Gallery