824 files changed, 14510 insertions, 17224 deletions

diff --git a/themes/_administration/css-1.6.2/favicon.png b/themes/_administration/css-1.7.0/favicon.png
index 4c54cc0e4e..4c54cc0e4e 100644
--- a/themes/_administration/css-1.6.2/favicon.png
+++ b/themes/_administration/css-1.7.0/favicon.png
diff --git a/themes/_administration/css-1.6.2/images/admin_icon_sprite.png b/themes/_administration/css-1.7.0/images/admin_icon_sprite.png
index bb668fd715..bb668fd715 100644
--- a/themes/_administration/css-1.6.2/images/admin_icon_sprite.png
+++ b/themes/_administration/css-1.7.0/images/admin_icon_sprite.png
diff --git a/themes/_administration/css-1.6.2/images/bullet.png b/themes/_administration/css-1.7.0/images/bullet.png
index 20a5d02a8b..20a5d02a8b 100644
--- a/themes/_administration/css-1.6.2/images/bullet.png
+++ b/themes/_administration/css-1.7.0/images/bullet.png
diff --git a/themes/_administration/css-1.6.2/images/close.png b/themes/_administration/css-1.7.0/images/close.png
index 83faef7c62..83faef7c62 100644
--- a/themes/_administration/css-1.6.2/images/close.png
+++ b/themes/_administration/css-1.7.0/images/close.png
diff --git a/themes/_administration/css-1.6.2/images/controls.png b/themes/_administration/css-1.7.0/images/controls.png
index 140c6fc4ae..140c6fc4ae 100644
--- a/themes/_administration/css-1.6.2/images/controls.png
+++ b/themes/_administration/css-1.7.0/images/controls.png
diff --git a/themes/_administration/css-1.6.2/images/delete.png b/themes/_administration/css-1.7.0/images/delete.png
index f27ac4561b..f27ac4561b 100644
--- a/themes/_administration/css-1.6.2/images/delete.png
+++ b/themes/_administration/css-1.7.0/images/delete.png
diff --git a/themes/_administration/css-1.6.2/images/edit.png b/themes/_administration/css-1.7.0/images/edit.png
index 20c81678fc..20c81678fc 100644
--- a/themes/_administration/css-1.6.2/images/edit.png
+++ b/themes/_administration/css-1.7.0/images/edit.png
diff --git a/themes/_administration/css-1.6.2/images/email.png b/themes/_administration/css-1.7.0/images/email.png
index 60bc81f770..60bc81f770 100644
--- a/themes/_administration/css-1.6.2/images/email.png
+++ b/themes/_administration/css-1.7.0/images/email.png
diff --git a/themes/_administration/css-1.6.2/images/icon-mime-sprite.png b/themes/_administration/css-1.7.0/images/icon-mime-sprite.png
index 8322ae4580..8322ae4580 100644
--- a/themes/_administration/css-1.6.2/images/icon-mime-sprite.png
+++ b/themes/_administration/css-1.7.0/images/icon-mime-sprite.png
diff --git a/themes/_administration/css-1.6.2/images/indicator.gif b/themes/_administration/css-1.7.0/images/indicator.gif
index 085ccaecaf..085ccaecaf 100644
--- a/themes/_administration/css-1.6.2/images/indicator.gif
+++ b/themes/_administration/css-1.7.0/images/indicator.gif
diff --git a/themes/_administration/css-1.6.2/images/open.png b/themes/_administration/css-1.7.0/images/open.png
index 21562210ee..21562210ee 100644
--- a/themes/_administration/css-1.6.2/images/open.png
+++ b/themes/_administration/css-1.7.0/images/open.png
diff --git a/themes/_administration/css-1.6.2/images/resn_confidential.png b/themes/_administration/css-1.7.0/images/resn_confidential.png
index 348f12765e..348f12765e 100644
--- a/themes/_administration/css-1.6.2/images/resn_confidential.png
+++ b/themes/_administration/css-1.7.0/images/resn_confidential.png
diff --git a/themes/_administration/css-1.6.2/images/resn_locked.png b/themes/_administration/css-1.7.0/images/resn_locked.png
index 43fa09b350..43fa09b350 100644
--- a/themes/_administration/css-1.6.2/images/resn_locked.png
+++ b/themes/_administration/css-1.7.0/images/resn_locked.png
diff --git a/themes/_administration/css-1.6.2/images/resn_none.png b/themes/_administration/css-1.7.0/images/resn_none.png
index 4a185e21e6..4a185e21e6 100644
--- a/themes/_administration/css-1.6.2/images/resn_none.png
+++ b/themes/_administration/css-1.7.0/images/resn_none.png
diff --git a/themes/_administration/css-1.6.2/images/resn_privacy.png b/themes/_administration/css-1.7.0/images/resn_privacy.png
index ca462fd84d..ca462fd84d 100644
--- a/themes/_administration/css-1.6.2/images/resn_privacy.png
+++ b/themes/_administration/css-1.7.0/images/resn_privacy.png
diff --git a/themes/_administration/css-1.6.2/images/sex_f_9x9.png b/themes/_administration/css-1.7.0/images/sex_f_9x9.png
index e35e46ccd4..e35e46ccd4 100644
--- a/themes/_administration/css-1.6.2/images/sex_f_9x9.png
+++ b/themes/_administration/css-1.7.0/images/sex_f_9x9.png
diff --git a/themes/_administration/css-1.6.2/images/sex_m_9x9.png b/themes/_administration/css-1.7.0/images/sex_m_9x9.png
index 32a8484b1f..32a8484b1f 100644
--- a/themes/_administration/css-1.6.2/images/sex_m_9x9.png
+++ b/themes/_administration/css-1.7.0/images/sex_m_9x9.png
diff --git a/themes/_administration/css-1.6.2/images/sex_u_9x9.png b/themes/_administration/css-1.7.0/images/sex_u_9x9.png
index d113a1898c..d113a1898c 100644
--- a/themes/_administration/css-1.6.2/images/sex_u_9x9.png
+++ b/themes/_administration/css-1.7.0/images/sex_u_9x9.png
diff --git a/themes/_administration/css-1.6.2/images/warning.png b/themes/_administration/css-1.7.0/images/warning.png
index d484c33341..d484c33341 100644
--- a/themes/_administration/css-1.6.2/images/warning.png
+++ b/themes/_administration/css-1.7.0/images/warning.png
diff --git a/themes/_administration/css-1.6.2/images/yes.png b/themes/_administration/css-1.7.0/images/yes.png
index f8205430c4..f8205430c4 100644
--- a/themes/_administration/css-1.6.2/images/yes.png
+++ b/themes/_administration/css-1.7.0/images/yes.png
diff --git a/themes/_administration/css-1.6.2/images/zoomin.png b/themes/_administration/css-1.7.0/images/zoomin.png
index 44981dbae4..44981dbae4 100644
--- a/themes/_administration/css-1.6.2/images/zoomin.png
+++ b/themes/_administration/css-1.7.0/images/zoomin.png
diff --git a/themes/_administration/css-1.6.2/images/zoomout.png b/themes/_administration/css-1.7.0/images/zoomout.png
index 3379e919f2..3379e919f2 100644
--- a/themes/_administration/css-1.6.2/images/zoomout.png
+++ b/themes/_administration/css-1.7.0/images/zoomout.png
diff --git a/themes/_administration/css-1.7.0/paper_fibers.png b/themes/_administration/css-1.7.0/paper_fibers.png
new file mode 100644
index 0000000000..2d93493f86
--- /dev/null
+++ b/themes/_administration/css-1.7.0/paper_fibers.png
diff --git a/themes/_administration/css-1.7.0/paper_fibers_@2X.png b/themes/_administration/css-1.7.0/paper_fibers_@2X.png
new file mode 100644
index 0000000000..6a9fc6a6e4
--- /dev/null
+++ b/themes/_administration/css-1.7.0/paper_fibers_@2X.png
diff --git a/themes/_administration/css-1.6.2/style.css b/themes/_administration/css-1.7.0/style.css
index 50a4e25869..4e665c9bb4 100644
--- a/themes/_administration/css-1.6.2/style.css
+++ b/themes/_administration/css-1.7.0/style.css
@@ -19,86 +19,73 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/* Add a permanent scrollbar, to prevent "flickering" when hover effects lengthen page */
-html {
-	overflow-y: scroll;
+/* Some menus (e.g. languages) can be longer than a page */
+.dropdown-menu {
+	max-height: 320px;
+	overflow-x: hidden;
 }
 
-/* general styles */
-body {
-	font-family: "Trebuchet MS", Tahoma, Verdana, Arial, sans-serif;
-	font-size: 12px;
-	margin: 10px;
-	min-width: 800px;
+/* Provide visual feedback for invalid and missing fields */
+[pattern]:valid,
+[required]:valid {
+	background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAONJREFUeNpi/P//PwMlgImBQjDwBrCgCzDOF2Zg+Adk/AOGDRvQfHZGoDWMxgyMDMb/Q1/NIt0F/xk8gIbNZPj7P41YL4AUGsM1//rfkuyeYMzw8z9xXgBqgNm0nuHnv0D/IH/juavmngV6oYY4F3z7y2DqY2oMpANB9MYl684yfP9Xw3Dzzw7sXgQmJGTM0MbjwdDKc0b2vt5/EM2QwunBoMyCVS1YPYYAMOwZ7FmiGLLYzjBYsSQD+QpALAjErNgMYERPyoyMjMxAih+IOYD4LxD/hOJfQLV/MaJ9NC8wAAQYAPbPfH2KJKx/AAAAAElFTkSuQmCC) no-repeat right center;
 }
 
-input.ui-button {
-	padding: 1px 3px;
+[pattern]:invalid,
+[required]:invalid {
+	background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMpJREFUeNpi/P//PwMlgImBQjAMDGBBF1jFyOgBpFqAuOYPA8MOoAI4P+z//x0YJoBiARkvYWA486+k5D+IBuJqZD66WnAMogvMA9o4F6j4R3Lyf2R6IQODMVEGTAW6CoirgfjMB2/v/yB6CgNDYQ8W14IwRiB+A7rgOwNDYLChofGcrVvPgugfDAzR/yFhwUAwDJqBNj6Ulf0PooEhV4jMx+YCRvSknAeMBWDotwgwMKRzMTCcfQW0GcQHxkbNJCyxwDiaFxgAAgwAYy67YIOQ//cAAAAASUVORK5CYII=) no-repeat right center;
 }
 
-input,
-textarea,
-select {
-	border: 1px solid grey;
-	color: #000;
-	font: inherit;
-	padding: 0 3px;
+[dir=rtl] [pattern]:invalid,
+[dir=rtl] [required]:invalid,
+[dir=rtl] [pattern]:invalid,
+[dir=rtl] [required]:invalid {
+	background-position: left center;
 }
 
-button,
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="file"] {
-	background: url(../jquery-ui-1.11.2/images/ui-bg_fine-grain_10_f8f7f6_60x60.png) 50% 50% #f8f7f6;
-	border: 1px solid #cbc7bd;
-	color: #654b24;
-	font-weight: 700;
-	border-radius: 3px;
-	margin: 0.3em;
+/* Drag-n-drop sort handles for modules, etc. */
+.sortme {
+	cursor: move;
 }
 
-button:hover,
-input[type="submit"]:hover,
-input[type="reset"]:hover,
-input[type="button"]:hover,
-input[type="file"]:hover {
-	background: url(../jquery-ui-1.11.2/images/ui-bg_fine-grain_65_654b24_60x60.png) 50% 50% #654b24;
-	border: 1px solid #654b24;
-	color: #fff;
-	font-weight: 700;
-	border-radius: 3px;
+/* http://www.subtlepatterns.com */
+body {
+	background: url(paper_fibers.png);
+}
+@media (min-device-pixel-ratio: 2) {
+	body {
+		background: url(paper_fibers_@2X.png);
+	}
 }
 
+/* Make <fieldset class="form-group"> look like <div class="form-group"> so we can use semantic/accessible markup */
 fieldset {
-	margin: 8px 8px 4px;
+	margin-bottom: inherit;
+
 }
 
+/* Make <legend class="control-label"> look like <label class="control-label"> so we can use semantic/accessible markup */
 legend {
-	font-style: italic;
-	font-weight: bold;
-	padding: 0 5px 5px;
-	vertical-align: top;
+	border: inherit;
+	font-size: inherit;
+	font-weight: 700;
 }
 
-img {
-	border: 0;
-	vertical-align: middle;
-}
 
-h3 {
-	margin: 0;
-}
 
-h4 {
-	margin: 5px 3px;
-	font-weight: normal;
-	font-style: italic;
-}
 
-td {
-	vertical-align: top;
-}
+
+
+
+
+
+
+
+
+/* http://bootstrapdesigntools.com */
+
+
+
 
 .icon {
 	border: 0;
@@ -135,165 +122,13 @@ a.accepted {
 	padding-right: 15px;
 }
 
-.parentdeath {
-	border: thin solid #f00;
-	padding: 1px;
-}
-
-.submenu {
-	background-color: #eee;
-	border: thin solid #aaa;
-	padding: 3px;
-}
-
-.rela {
-	opacity: 0.4;
-}
-
-/* jQuery styling over-rides */
-.ui-widget-content a {
-	text-decoration: none;
-}
 
-.ui-widget-content a.current {
-	color: #e17009;
-	font-weight: bold;
-}
-
-.ui-widget-content a:hover,
-.DataTables_sort_wrapper:hover {
-	color: #f00;
-	cursor: pointer;
-}
-
-.ui-widget-header {
-	padding: 5px;
-}
-
-.ui-progressbar-value {
-	height: 60% !important;
-	background: #d3d3d3 !important;
-}
-
-.ui-accordion .ui-accordion-content-active {
-	display: block;
-}
-
-.css_right {
-	float: right;
-}
-
-[dir=rtl] .css_right {
-	float: left;
-}
 
 [dir=rtl] input {
 	padding-right: 3px;
 	padding-left: 0;
 }
 
-[dir=rtl] .ui-tabs .ui-tabs-nav li {
-	float: right;
-}
-
-/* jEditable styling over-rides */
-.editable:hover {
-	color: #f00;
-	cursor: pointer;
-}
-
-/* both cursors needed for cross-browser support */
-.editable input,
-select {
-	padding: 0;
-}
-
-.editable input {
-	font-size: 90%;
-	height: 18px !important;
-}
-
-.editable button {
-	font-size: 85%;
-	padding: 0;
-}
-
-/* jQuery.datatable styling over-rides */
-.odd {
-	background-color: #dfd;
-}
-
-.even {
-	background-color: #efe;
-}
-
-.fg-button {
-	padding: 2px 6px;
-}
-
-.dataTables_paginate {
-	float: left;
-}
-
-.dataTables_processing {
-    float: left;
-    margin-top: 5px;
-    padding-left: 5px;
-}
-
-.dataTables_filter {
-	float: right;
-}
-
-.dataTables_info {
-	float: left;
-	margin-top: 5px;
-	font-weight: normal;
-}
-
-.dataTables_length {
-	float: right;
-}
-
-.dataTables_length select,
-.dataTables_filter input {
-	font-size: 11px;
-	padding: 1px;
-}
-
-.dataTables_wrapper th {
-	white-space: nowrap;
-}
-
-.dt-clear {
-	clear: both;
-}
-
-[dir=rtl] .dataTables_paginate {
-	float: right;
-}
-
-[dir=rtl] .dataTables_processing {
-	float: right;
-}
-
-[dir=rtl] .dataTables_filter {
-	float: left;
-}
-
-[dir=rtl] .dataTables_info {
-	float: right;
-}
-
-[dir=rtl] .dataTables_length {
-	float: left;
-}
-
-/* Drag-n-drop sorting for modules, etc. */
-.sortme {
-	cursor: move;
-}
-
 /* Find special characters */
 .largechars {
 	font-family: monospace;
@@ -318,100 +153,6 @@ select {
 	width: 24px;
 }
 
-/* HEADER */
-#admin_head {
-	position: relative;
-	height: 70px;
-	margin-bottom: 10px;
-	min-width: 970px;
-	z-index: 1000;
-}
-
-#title {
-	position: absolute;
-	left: 47%;
-	top: 20px;
-	font-size: 18px;
-	font-weight: bold;
-}
-
-#info {
-	position: absolute;
-	right: 10px;
-	bottom: 0;
-	text-align: right;
-}
-
-[dir=rtl] #info {
-	right: auto;
-	left: 10px;
-	text-align: left;
-}
-
-#links {
-	position: absolute;
-	left: 10px;
-	bottom: 0;
-	display: inline;
-	margin-bottom: 5px;
-	white-space: nowrap;
-}
-
-[dir=rtl] #links {
-	left: auto;
-	right: 10px;
-}
-
-#links li {
-	display: inline;
-	position: relative;
-}
-
-#links li ul {
-	display: none;
-	position: absolute;
-	left: 0;
-	top: 1.2em;
-	background: url("../jquery-ui-1.11.2/images/ui-bg_fine-grain_10_eceadf_60x60.png") repeat scroll 50% 50% #eceadf;
-	border: 1px solid #d9d6c4;
-	z-index: 999;
-}
-
-[dir=rtl] #links li ul {
-	left: auto;
-	right: 0;
-}
-
-#links li ul li {
-	display: block;
-	padding: 0 5px;
-	text-align: left;
-}
-
-[dir=rtl] #links li ul li {
-	text-align: right;
-}
-
-#links,
-#links li ul {
-	list-style: none;
-	margin: 0;
-	padding: 1px;
-}
-
-#links li:hover > ul {
-	display: block;
-}
-
-.ui-widget-content a.lang-active {
-	color: #008000;
-}
-
-#links .langmenu {
-	display: inline;
-	padding: 0;
-}
-
 /* SIDE and CONTENT panels */
 #admin_menu,
 #admin_content {
@@ -1282,23 +1023,6 @@ table#adduser2 {
 	text-align: center;
 }
 
-input:required:valid,
-textarea:required:valid {
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAONJREFUeNpi/P//PwMlgImBQjDwBrCgCzDOF2Zg+Adk/AOGDRvQfHZGoDWMxgyMDMb/Q1/NIt0F/xk8gIbNZPj7P41YL4AUGsM1//rfkuyeYMzw8z9xXgBqgNm0nuHnv0D/IH/juavmngV6oYY4F3z7y2DqY2oMpANB9MYl684yfP9Xw3Dzzw7sXgQmJGTM0MbjwdDKc0b2vt5/EM2QwunBoMyCVS1YPYYAMOwZ7FmiGLLYzjBYsSQD+QpALAjErNgMYERPyoyMjMxAih+IOYD4LxD/hOJfQLV/MaJ9NC8wAAQYAPbPfH2KJKx/AAAAAElFTkSuQmCC) no-repeat right top;
-}
-
-input:required:invalid,
-textarea:required:invalid {
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMpJREFUeNpi/P//PwMlgImBQjAMDGBBF1jFyOgBpFqAuOYPA8MOoAI4P+z//x0YJoBiARkvYWA486+k5D+IBuJqZD66WnAMogvMA9o4F6j4R3Lyf2R6IQODMVEGTAW6CoirgfjMB2/v/yB6CgNDYQ8W14IwRiB+A7rgOwNDYLChofGcrVvPgugfDAzR/yFhwUAwDJqBNj6Ulf0PooEhV4jMx+YCRvSknAeMBWDotwgwMKRzMTCcfQW0GcQHxkbNJCyxwDiaFxgAAgwAYy67YIOQ//cAAAAASUVORK5CYII=) no-repeat right top;
-}
-
-[dir=rtl] input:required:valid,
-[dir=rtl] textarea:required:valid,
-[dir=rtl] input:required:invalid,
-[dir=rtl] textarea:required:invalid {
-	background-position: left top;
-}
-
 /* BROADCAST MESSAGES */
 /* no styles used */
 
@@ -1371,6 +1095,10 @@ table.media_table td {
 	padding: 5px;
 }
 
+table.media_table .label {
+	color:#2e6e9e;
+}
+
 /* UPLOAD MEDIA */
 table.upload_media {
 	border-collapse: separate;
@@ -1919,10 +1647,11 @@ table#story_table {
 	border: 1px solid black;
 	background-color: #fff;
 	z-index: 99999;
-    list-style: none outside none;
-    margin: 0;;
+	list-style: none outside none;
+	margin: 0;;
 	max-height: 200px;
-	overflow-y: auto;
+	overflow-x: hidden;
+	overflow-y: scroll;
 }
 
 .ui-autocomplete li {
diff --git a/themes/_administration/footer.php b/themes/_administration/footer.php
deleted file mode 100644
index ab4d3dc0f7..0000000000
--- a/themes/_administration/footer.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-// Footer for webtrees administration theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo '</div>'; // id="admin_content"
diff --git a/themes/_administration/header.php b/themes/_administration/header.php
deleted file mode 100644
index a7f457b873..0000000000
--- a/themes/_administration/header.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-// Header for webtrees administration theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use WT\Auth;
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-// This theme uses the jQuery “colorbox” plugin to display images
-$this
-	->addExternalJavascript(WT_JQUERY_COLORBOX_URL)
-	->addExternalJavascript(WT_JQUERY_WHEELZOOM_URL)
-	->addInlineJavascript('activate_colorbox();')
-	->addInlineJavascript('jQuery.extend(jQuery.colorbox.settings, {width:"75%", height:"75%", transition:"none", slideshowStart:"'. WT_I18N::translate('Play').'", slideshowStop:"'. WT_I18N::translate('Stop').'"})')
-	->addInlineJavascript('
-		jQuery.extend(jQuery.colorbox.settings, {
-			title: function() {
-				var img_title = jQuery(this).data("title");
-				return img_title;
-			}
-		});
-	');
-echo
-	'<!DOCTYPE html>',
-	'<html ', WT_I18N::html_markup(), '>',
-	'<head>',
-	'<meta charset="UTF-8">',
-	'<meta http-equiv="X-UA-Compatible" content="IE=edge">',
-	'<meta name="robots" content="noindex,nofollow">',
-	'<title>', htmlspecialchars($title), '</title>',
-	'<link rel="icon" href="', WT_CSS_URL, 'favicon.png" type="image/png">',
-	'<link rel="stylesheet" href="', WT_THEME_URL, 'jquery-ui-1.11.2/jquery-ui.css" type="text/css">',
-	'<link rel="stylesheet" href="', WT_CSS_URL, 'style.css" type="text/css">',
-	'<!--[if IE 8]>',
-	'<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>',
-	'<![endif]-->';
-
-echo
-	'</head>',
-	'<body id="body">',
-// Header
-	'<div id="admin_head" class="ui-widget-content">',
-	'<i class="icon-webtrees"></i>',
-	'<div id="title"><a href="admin.php">', WT_I18N::translate('Administration'), '</a></div>',
-	'<div id="links">',
-	'<a href="index.php">', WT_I18N::translate('My page'), '</a> | ',
-	logout_link(),
-	'<span> | </span>',
-	'<ul class="langmenu">';
-	$language_menu=WT_MenuBar::getLanguageMenu();
-		if ($language_menu) {
-			echo $language_menu->getMenuAsList();
-		}
-	echo '</ul>';
-	if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
-	echo ' | <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\', chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
-	}
-	echo '</div>',
-	'<div id="info">',
-	WT_WEBTREES, ' ', WT_VERSION,
-	'<br>',
-	/* I18N: The local time on the server */
-	WT_I18N::translate('Server time'), ' —  ', format_timestamp(WT_SERVER_TIMESTAMP),
-	'<br>',
-	/* I18N: The local time on the client/browser */
-	WT_I18N::translate('Client time'), ' — ', format_timestamp(WT_CLIENT_TIMESTAMP),
-	'<br>',
-	/* I18N: Timezone - http://en.wikipedia.org/wiki/UTC */
-	WT_I18N::translate('UTC'), ' — ', format_timestamp(WT_TIMESTAMP),
-	'</div>',
-	'</div>',
-// Side menu
-	'<div id="admin_menu" class="ui-widget-content">',
-	'<ul>',
-	'<li><a ', (WT_SCRIPT_NAME=='admin.php' ? 'class="current" ' : ''), 'href="admin.php">', WT_I18N::translate('Administration'), '</a></li>';
-if (Auth::isAdmin()) {
-	echo
-		'<li><ul>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_site_config.php'  ? 'class="current" ' : ''), 'href="admin_site_config.php">',  WT_I18N::translate('Site configuration'    ), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_site_logs.php'    ? 'class="current" ' : ''), 'href="admin_site_logs.php">',    WT_I18N::translate('Logs'                  ), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_site_readme.php'  ? 'class="current" ' : ''), 'href="admin_site_readme.php">',  WT_I18N::translate('README documentation'  ), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_site_info.php'    ? 'class="current" ' : ''), 'href="admin_site_info.php">',    WT_I18N::translate('PHP information'       ), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_site_access.php'  ? 'class="current" ' : ''), 'href="admin_site_access.php">',  WT_I18N::translate('Site access rules'     ), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_site_clean.php'   ? 'class="current" ' : ''), 'href="admin_site_clean.php">',   WT_I18N::translate('Clean up data folder'), '</a></li>',
-		'</ul></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_trees_manage.php' ? 'class="current" ' : ''), 'href="admin_trees_manage.php">', WT_I18N::translate('Family trees'          ), '</a></li>';
-} else {
-	echo '<li>', WT_I18N::translate('Family trees'), '</li>';
-}
-echo '<li><ul>';
-//-- gedcom list
-foreach (WT_Tree::getAll() as $tree) {
-	if (Auth::isManager($tree)) {
-		// Add a title="" element, since long tree titles are cropped
-		echo
-			'<li><span><a ', (WT_SCRIPT_NAME=='admin_trees_config.php' && WT_GED_ID==$tree->tree_id ? 'class="current" ' : ''), 'href="admin_trees_config.php?ged='.$tree->tree_name_url.'" title="', WT_Filter::escapeHtml($tree->tree_title), '" dir="auto">', $tree->tree_title_html,
-			'</a></span></li>';
-	}
-}
-echo
-	'<li><a ', (WT_SCRIPT_NAME=='admin_site_merge.php'   ? 'class="current" ' : ''), 'href="admin_site_merge.php">',   WT_I18N::translate('Merge records'), '</a></li>',
-	'<li><a ', (WT_SCRIPT_NAME=='admin_trees_merge.php'   ? 'class="current" ' : ''), 'href="admin_trees_merge.php">', WT_I18N::translate('Merge family trees'), '</a></li>',
-	'<li><a ', (WT_SCRIPT_NAME=='admin_site_other.php'   ? 'class="current" ' : ''), 'href="admin_site_other.php">',   WT_I18N::translate('Add unlinked records'), '</a></li>',
-	'<li><a ', (WT_SCRIPT_NAME=='admin_trees_places.php' ? 'class="current" ' : ''), 'href="admin_trees_places.php">', WT_I18N::translate('Update place names'), '</a></li>',
-	'<li><a ', (WT_SCRIPT_NAME=='admin_trees_check.php'  ? 'class="current" ' : ''), 'href="admin_trees_check.php">',  WT_I18N::translate('Check for errors'), '</a></li>',
-	'<li><a ', (WT_SCRIPT_NAME=='admin_site_change.php'  ? 'class="current" ' : ''), 'href="admin_site_change.php">',  WT_I18N::translate('Changes log'),'</a></li>',
-	'<li><a href="index_edit.php?gedcom_id=-1" onclick="return modalDialog(\'index_edit.php?gedcom_id=-1'.'\', \'',    WT_I18N::translate('Set the default blocks for new family trees'), '\');">', WT_I18N::translate('Set the default blocks'), '</a></li>',
-	'</ul></li>';
-
-if (Auth::isAdmin()) {
-	echo
-		'<li><a ', (WT_SCRIPT_NAME=='admin_users.php' && WT_Filter::get('action')!="cleanup"&& WT_Filter::get('action')!="createform" ? 'class="current" ' : ''), 'href="admin_users.php">',
-		WT_I18N::translate('Users'),
-		'</a></li>',
-		'<li><ul>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_users.php' && WT_Filter::get('action')=='createform' ? 'class="current" ' : ''), 'href="admin_users.php?action=createform">', WT_I18N::translate('Add a new user'), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_users_bulk.php' ? 'class="current" ' : ''), 'href="admin_users_bulk.php">', WT_I18N::translate('Send broadcast messages'), '</a>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_users.php' && WT_Filter::get('action')=='cleanup' ? 'class="current" ' : ''), 'href="admin_users.php?action=cleanup">', WT_I18N::translate('Delete inactive users'), '</a></li>',
-		'<li><a href="index_edit.php?user_id=-1" onclick="return modalDialog(\'index_edit.php?user_id=-1'.'\', \'', WT_I18N::translate('Set the default blocks for new users'), '\');">', WT_I18N::translate('Set the default blocks'), '</a></li>',
-		'</ul></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_media.php' ? 'class="current" ' : ''), 'href="admin_media.php">', WT_I18N::translate('Media'), '</a></li>',
-		'<li><ul>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_media_upload.php' ? 'class="current" ' : ''), 'href="admin_media_upload.php">', WT_I18N::translate('Upload media files'), '</a></li>',
-		'</ul></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_modules.php' ? 'class="current" ' : ''), 'href="admin_modules.php">',
-		WT_I18N::translate('Modules'),
-		'</a></li>',
-		'<li><ul>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_module_menus.php'   ? 'class="current" ' : ''), 'href="admin_module_menus.php">',   WT_I18N::translate('Menus'  ), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_module_tabs.php'    ? 'class="current" ' : ''), 'href="admin_module_tabs.php">',    WT_I18N::translate('Tabs'   ), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_module_blocks.php'  ? 'class="current" ' : ''), 'href="admin_module_blocks.php">',  WT_I18N::translate('Blocks' ), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_module_sidebar.php' ? 'class="current" ' : ''), 'href="admin_module_sidebar.php">', WT_I18N::translate('Sidebar'), '</a></li>',
-		'<li><a ', (WT_SCRIPT_NAME=='admin_module_reports.php' ? 'class="current" ' : ''), 'href="admin_module_reports.php">', WT_I18N::translate('Reports'), '</a></li>',
-		'</ul></li>';
-	foreach (WT_Module::getActiveModules(true) as $module) {
-		if ($module instanceof WT_Module_Config) {
-			echo '<li><span><a ', (WT_SCRIPT_NAME=='module.php' && WT_Filter::get('mod')==$module->getName() ? 'class="current" ' : ''), 'href="', $module->getConfigLink(), '">', $module->getTitle(), '</a></span></li>';
-		}
-	}
-}
-echo
-	'</ul>',
-	'</div>',
-	'<div id="admin_content" class="ui-widget-content">',
-	WT_FlashMessages::getHtmlMessages(); // Feedback from asynchronous actions;
diff --git a/themes/_administration/theme.php b/themes/_administration/theme.php
index 48e96d06c9..72440131fe 100644
--- a/themes/_administration/theme.php
+++ b/themes/_administration/theme.php
@@ -2,10 +2,7 @@
 // Administration theme
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
+// Copyright (C) 2015 webtrees development team.
 //
 // 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
@@ -21,27 +18,4 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-// Theme name - this needs double quotes, as file is scanned/parsed by script
-$theme_name = "_administration";
-
-// A version number in the path prevents browser-cache problems during upgrade
-define('WT_CSS_URL', WT_THEME_URL . 'css-1.6.2/');
-
-$headerfile = WT_THEME_DIR . 'header.php';
-$footerfile = WT_THEME_DIR . 'footer.php';
-
-// Main icons
-$WT_IMAGES=array(
-	// Lightbox module uses this in manage media links, and also admin_media.php for delete folder.
-	'remove'          => WT_CSS_URL . 'images/delete.png',
-
-	// Need different sizes before moving to CSS
-	'default_image_F' => WT_CSS_URL . 'images/silhouette_female.png',
-	'default_image_M' => WT_CSS_URL . 'images/silhouette_male.png',
-	'default_image_U' => WT_CSS_URL . 'images/silhouette_unknown.png',
-);
+return new WT\Theme\Administration();
diff --git a/themes/_custom/theme.php b/themes/_custom/theme.php
new file mode 100644
index 0000000000..a95963f3c4
--- /dev/null
+++ b/themes/_custom/theme.php
@@ -0,0 +1,104 @@
+<?php
+// webtrees: Web based Family History software
+// Copyright (C) 2015 webtrees development team.
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+/**
+ * Class CustomTheme - This is a template showing how to create a custom theme.
+ *
+ * Since theme folders beginning with an underscore are reserved for special
+ * use, you should copy this entire folder ("themes/_custom") to a new name.
+ * For example, "themes/custom".  You should also rename the class.
+ *
+ * In this example, we are extending the webtrees theme, but you could
+ * also extend any of the core themes, or even the base theme.  You
+ * should choose a unique class name, as users may install many custom themes.
+ *
+ * Only the first two functions are required: themeId() and themeName().
+ * The rest are just examples, and should be removed in actual themes.
+ *
+ * Many of the core classes are being moved to namespaces.  For example,
+ * WT_Foo will be renamed to WT\Foo.  The object API should remain the
+ * same.  Avoid unecessary type-hints to allow your
+ */
+class CustomTheme extends WT\Theme\Webtrees {
+	/**
+	 * Give your theme a unique identifier.  Themes beginning with an underscore
+	 * are reserved for internal use.
+	 *
+	 * {@inheritdoc}
+	 */
+	public function themeId() {
+		return '_custom';
+	}
+
+	/**
+	 * Give your theme a name.  This is shown to the users.
+	 * Use HTML entities where appropriate.  e.g. “Black &amp; white”.
+	 *
+	 * You could use switch($this->locale) {} to provide a translated versions
+	 * of the theme name.
+	 *
+	 * {@inheritdoc}
+	 */
+	public function themeName() {
+		return 'Custom theme';
+	}
+
+	/**
+	 * This is an example function which shows how to add an additional CSS file to the theme.
+	 *
+	 * {@inheritdoc}
+	 */
+	public function stylesheets() {
+		try {
+			$css_files   = parent::stylesheets();
+			// Put a version number in the URL, to prevent browsers from caching old versions.
+			$css_files[] = WT_SERVER_NAME . WT_SCRIPT_PATH . 'themes/custom/custom.css';
+		} catch (Exception $ex) {
+			// Something went wrong with our script?  Use the default behaviour instead.
+			return parent::stylesheets();
+		}
+
+		return $css_files;
+	}
+
+	/**
+	 * This is an example function which shows one way to remove an entry from a menu.
+	 *
+	 * {@inheritdoc}
+	 */
+	public function menuLists() {
+		try {
+			// Start with the default "Lists" menu.
+			$menu = parent::menuLists();
+			// Remove the "notes" sub-menu.
+			$submenus = array_filter($menu->getSubmenus(), function(WT_Menu $menu) {
+				return $menu->getId() !== 'menu-list-note';
+			});
+			// Replace the sub-menus
+			$menu->setSubmenus($submenus);
+		} catch (Exception $ex) {
+			// Something went wrong with our script?  Maybe the core code was updated?
+			// Use the default behaviour instead, so that our theme continues to work.
+			return parent::menuLists();
+		}
+
+		return $menu;
+	}
+}
+
+return new CustomTheme; // This script must return a theme object.
diff --git a/themes/clouds/css-1.6.2/images/clouds.png b/themes/clouds/css-1.6.2/images/clouds.png
deleted file mode 100644
index 6014b3df1c..0000000000
--- a/themes/clouds/css-1.6.2/images/clouds.png
+++ /dev/null
diff --git a/themes/clouds/css-1.6.2/favicon.png b/themes/clouds/css-1.7.0/favicon.png
index 4c54cc0e4e..4c54cc0e4e 100644
--- a/themes/clouds/css-1.6.2/favicon.png
+++ b/themes/clouds/css-1.7.0/favicon.png
diff --git a/themes/clouds/css-1.6.2/images/add.png b/themes/clouds/css-1.7.0/images/add.png
index c4554632f2..c4554632f2 100644
--- a/themes/clouds/css-1.6.2/images/add.png
+++ b/themes/clouds/css-1.7.0/images/add.png
diff --git a/themes/clouds/css-1.6.2/images/admin.png b/themes/clouds/css-1.7.0/images/admin.png
index 6de111507b..6de111507b 100644
--- a/themes/clouds/css-1.6.2/images/admin.png
+++ b/themes/clouds/css-1.7.0/images/admin.png
diff --git a/themes/clouds/css-1.6.2/images/background.png b/themes/clouds/css-1.7.0/images/background.png
index 38a934c635..38a934c635 100644
--- a/themes/clouds/css-1.6.2/images/background.png
+++ b/themes/clouds/css-1.7.0/images/background.png
diff --git a/themes/clouds/css-1.6.2/images/bing.png b/themes/clouds/css-1.7.0/images/bing.png
index 400627cf16..400627cf16 100644
--- a/themes/clouds/css-1.6.2/images/bing.png
+++ b/themes/clouds/css-1.7.0/images/bing.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/addmedia.png b/themes/clouds/css-1.7.0/images/buttons/addmedia.png
index 65cc2aefb5..65cc2aefb5 100644
--- a/themes/clouds/css-1.6.2/images/buttons/addmedia.png
+++ b/themes/clouds/css-1.7.0/images/buttons/addmedia.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/addnote.png b/themes/clouds/css-1.7.0/images/buttons/addnote.png
index a240b5317b..a240b5317b 100644
--- a/themes/clouds/css-1.6.2/images/buttons/addnote.png
+++ b/themes/clouds/css-1.7.0/images/buttons/addnote.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/addrepository.png b/themes/clouds/css-1.7.0/images/buttons/addrepository.png
index 220b432717..220b432717 100644
--- a/themes/clouds/css-1.6.2/images/buttons/addrepository.png
+++ b/themes/clouds/css-1.7.0/images/buttons/addrepository.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/addsource.png b/themes/clouds/css-1.7.0/images/buttons/addsource.png
index c3e944a930..c3e944a930 100644
--- a/themes/clouds/css-1.6.2/images/buttons/addsource.png
+++ b/themes/clouds/css-1.7.0/images/buttons/addsource.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/calendar.png b/themes/clouds/css-1.7.0/images/buttons/calendar.png
index 0d308a977a..0d308a977a 100644
--- a/themes/clouds/css-1.6.2/images/buttons/calendar.png
+++ b/themes/clouds/css-1.7.0/images/buttons/calendar.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/family.png b/themes/clouds/css-1.7.0/images/buttons/family.png
index 3ceafc5abb..3ceafc5abb 100644
--- a/themes/clouds/css-1.6.2/images/buttons/family.png
+++ b/themes/clouds/css-1.7.0/images/buttons/family.png
diff --git a/themes/clouds/css-1.7.0/images/buttons/find.png b/themes/clouds/css-1.7.0/images/buttons/find.png
new file mode 100644
index 0000000000..be6c6002e4
--- /dev/null
+++ b/themes/clouds/css-1.7.0/images/buttons/find.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/find_facts.png b/themes/clouds/css-1.7.0/images/buttons/find_facts.png
index 2ba25a7858..2ba25a7858 100644
--- a/themes/clouds/css-1.6.2/images/buttons/find_facts.png
+++ b/themes/clouds/css-1.7.0/images/buttons/find_facts.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/head.png b/themes/clouds/css-1.7.0/images/buttons/head.png
index ea21719c82..ea21719c82 100644
--- a/themes/clouds/css-1.6.2/images/buttons/head.png
+++ b/themes/clouds/css-1.7.0/images/buttons/head.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/indi.png b/themes/clouds/css-1.7.0/images/buttons/indi.png
index 31e3856acc..31e3856acc 100644
--- a/themes/clouds/css-1.6.2/images/buttons/indi.png
+++ b/themes/clouds/css-1.7.0/images/buttons/indi.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/keyboard.png b/themes/clouds/css-1.7.0/images/buttons/keyboard.png
index 0c6f4b33f9..0c6f4b33f9 100644
--- a/themes/clouds/css-1.6.2/images/buttons/keyboard.png
+++ b/themes/clouds/css-1.7.0/images/buttons/keyboard.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/media.png b/themes/clouds/css-1.7.0/images/buttons/media.png
index b70ae5606c..b70ae5606c 100644
--- a/themes/clouds/css-1.6.2/images/buttons/media.png
+++ b/themes/clouds/css-1.7.0/images/buttons/media.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/note.png b/themes/clouds/css-1.7.0/images/buttons/note.png
index 14b1681d0f..14b1681d0f 100644
--- a/themes/clouds/css-1.6.2/images/buttons/note.png
+++ b/themes/clouds/css-1.7.0/images/buttons/note.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/place.png b/themes/clouds/css-1.7.0/images/buttons/place.png
index 1562e0ee0c..1562e0ee0c 100644
--- a/themes/clouds/css-1.6.2/images/buttons/place.png
+++ b/themes/clouds/css-1.7.0/images/buttons/place.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/repository.png b/themes/clouds/css-1.7.0/images/buttons/repository.png
index bf0b660c91..bf0b660c91 100644
--- a/themes/clouds/css-1.6.2/images/buttons/repository.png
+++ b/themes/clouds/css-1.7.0/images/buttons/repository.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/source.png b/themes/clouds/css-1.7.0/images/buttons/source.png
index 6c29202d73..6c29202d73 100644
--- a/themes/clouds/css-1.6.2/images/buttons/source.png
+++ b/themes/clouds/css-1.7.0/images/buttons/source.png
diff --git a/themes/clouds/css-1.6.2/images/buttons/target.png b/themes/clouds/css-1.7.0/images/buttons/target.png
index f8410ba149..f8410ba149 100644
--- a/themes/clouds/css-1.6.2/images/buttons/target.png
+++ b/themes/clouds/css-1.7.0/images/buttons/target.png
diff --git a/themes/clouds/css-1.6.2/images/cfamily.png b/themes/clouds/css-1.7.0/images/cfamily.png
index 5006724cf6..5006724cf6 100644
--- a/themes/clouds/css-1.6.2/images/cfamily.png
+++ b/themes/clouds/css-1.7.0/images/cfamily.png
diff --git a/themes/clouds/css-1.6.2/images/childless.png b/themes/clouds/css-1.7.0/images/childless.png
index 10f82fe6fe..10f82fe6fe 100644
--- a/themes/clouds/css-1.6.2/images/childless.png
+++ b/themes/clouds/css-1.7.0/images/childless.png
diff --git a/themes/clouds/css-1.6.2/images/children.png b/themes/clouds/css-1.7.0/images/children.png
index 30dbbf1099..30dbbf1099 100644
--- a/themes/clouds/css-1.6.2/images/children.png
+++ b/themes/clouds/css-1.7.0/images/children.png
diff --git a/themes/clouds/css-1.6.2/images/clippings.png b/themes/clouds/css-1.7.0/images/clippings.png
index 2181e93935..2181e93935 100644
--- a/themes/clouds/css-1.6.2/images/clippings.png
+++ b/themes/clouds/css-1.7.0/images/clippings.png
diff --git a/themes/clouds/css-1.7.0/images/clouds.png b/themes/clouds/css-1.7.0/images/clouds.png
new file mode 100644
index 0000000000..5e05257c8e
--- /dev/null
+++ b/themes/clouds/css-1.7.0/images/clouds.png
diff --git a/themes/clouds/css-1.6.2/images/controls.png b/themes/clouds/css-1.7.0/images/controls.png
index 140c6fc4ae..140c6fc4ae 100644
--- a/themes/clouds/css-1.6.2/images/controls.png
+++ b/themes/clouds/css-1.7.0/images/controls.png
diff --git a/themes/clouds/css-1.6.2/images/copy.png b/themes/clouds/css-1.7.0/images/copy.png
index 7397f49c27..7397f49c27 100644
--- a/themes/clouds/css-1.6.2/images/copy.png
+++ b/themes/clouds/css-1.7.0/images/copy.png
diff --git a/themes/clouds/css-1.6.2/images/darrow.png b/themes/clouds/css-1.7.0/images/darrow.png
index f9e0c1287d..f9e0c1287d 100644
--- a/themes/clouds/css-1.6.2/images/darrow.png
+++ b/themes/clouds/css-1.7.0/images/darrow.png
diff --git a/themes/clouds/css-1.6.2/images/darrow2.png b/themes/clouds/css-1.7.0/images/darrow2.png
index 60797330f1..60797330f1 100644
--- a/themes/clouds/css-1.6.2/images/darrow2.png
+++ b/themes/clouds/css-1.7.0/images/darrow2.png
diff --git a/themes/clouds/css-1.6.2/images/ddarrow.png b/themes/clouds/css-1.7.0/images/ddarrow.png
index d3cebbdf56..d3cebbdf56 100644
--- a/themes/clouds/css-1.6.2/images/ddarrow.png
+++ b/themes/clouds/css-1.7.0/images/ddarrow.png
diff --git a/themes/clouds/css-1.6.2/images/delete.png b/themes/clouds/css-1.7.0/images/delete.png
index 7ce1741b6b..7ce1741b6b 100644
--- a/themes/clouds/css-1.6.2/images/delete.png
+++ b/themes/clouds/css-1.7.0/images/delete.png
diff --git a/themes/clouds/css-1.6.2/images/dline.png b/themes/clouds/css-1.7.0/images/dline.png
index 0c8e050797..0c8e050797 100644
--- a/themes/clouds/css-1.6.2/images/dline.png
+++ b/themes/clouds/css-1.7.0/images/dline.png
diff --git a/themes/clouds/css-1.6.2/images/dline2.png b/themes/clouds/css-1.7.0/images/dline2.png
index aa3d7cddf7..aa3d7cddf7 100644
--- a/themes/clouds/css-1.6.2/images/dline2.png
+++ b/themes/clouds/css-1.7.0/images/dline2.png
diff --git a/themes/clouds/css-1.6.2/images/edit_indi.png b/themes/clouds/css-1.7.0/images/edit_indi.png
index dfeb5f8277..dfeb5f8277 100644
--- a/themes/clouds/css-1.6.2/images/edit_indi.png
+++ b/themes/clouds/css-1.7.0/images/edit_indi.png
diff --git a/themes/clouds/css-1.6.2/images/email.png b/themes/clouds/css-1.7.0/images/email.png
index 2b3efdd668..2b3efdd668 100644
--- a/themes/clouds/css-1.6.2/images/email.png
+++ b/themes/clouds/css-1.7.0/images/email.png
diff --git a/themes/clouds/css-1.6.2/images/gedcom.png b/themes/clouds/css-1.7.0/images/gedcom.png
index c369a5f879..c369a5f879 100644
--- a/themes/clouds/css-1.6.2/images/gedcom.png
+++ b/themes/clouds/css-1.7.0/images/gedcom.png
diff --git a/themes/clouds/css-1.6.2/images/general_sprite.png b/themes/clouds/css-1.7.0/images/general_sprite.png
index 570c6b9013..570c6b9013 100644
--- a/themes/clouds/css-1.6.2/images/general_sprite.png
+++ b/themes/clouds/css-1.7.0/images/general_sprite.png
diff --git a/themes/clouds/css-1.6.2/images/go.png b/themes/clouds/css-1.7.0/images/go.png
index b0ae730ad4..b0ae730ad4 100644
--- a/themes/clouds/css-1.6.2/images/go.png
+++ b/themes/clouds/css-1.7.0/images/go.png
diff --git a/themes/clouds/css-1.6.2/images/googlemaps.png b/themes/clouds/css-1.7.0/images/googlemaps.png
index 12ab0c14d5..12ab0c14d5 100644
--- a/themes/clouds/css-1.6.2/images/googlemaps.png
+++ b/themes/clouds/css-1.7.0/images/googlemaps.png
diff --git a/themes/clouds/css-1.6.2/images/help.png b/themes/clouds/css-1.7.0/images/help.png
index 3726e13cbd..3726e13cbd 100644
--- a/themes/clouds/css-1.6.2/images/help.png
+++ b/themes/clouds/css-1.7.0/images/help.png
diff --git a/themes/clouds/css-1.6.2/images/hline.png b/themes/clouds/css-1.7.0/images/hline.png
index 7d23f087d3..7d23f087d3 100644
--- a/themes/clouds/css-1.6.2/images/hline.png
+++ b/themes/clouds/css-1.7.0/images/hline.png
diff --git a/themes/clouds/css-1.6.2/images/icon-mime-sprite.png b/themes/clouds/css-1.7.0/images/icon-mime-sprite.png
index 8322ae4580..8322ae4580 100644
--- a/themes/clouds/css-1.6.2/images/icon-mime-sprite.png
+++ b/themes/clouds/css-1.7.0/images/icon-mime-sprite.png
diff --git a/themes/clouds/css-1.6.2/images/image_add.png b/themes/clouds/css-1.7.0/images/image_add.png
index ecac61c284..ecac61c284 100644
--- a/themes/clouds/css-1.6.2/images/image_add.png
+++ b/themes/clouds/css-1.7.0/images/image_add.png
diff --git a/themes/clouds/css-1.6.2/images/image_edit.png b/themes/clouds/css-1.7.0/images/image_edit.png
index 3fb8061de2..3fb8061de2 100644
--- a/themes/clouds/css-1.6.2/images/image_edit.png
+++ b/themes/clouds/css-1.7.0/images/image_edit.png
diff --git a/themes/clouds/css-1.6.2/images/image_link.png b/themes/clouds/css-1.7.0/images/image_link.png
index 190b08e7d2..190b08e7d2 100644
--- a/themes/clouds/css-1.6.2/images/image_link.png
+++ b/themes/clouds/css-1.7.0/images/image_link.png
diff --git a/themes/clouds/css-1.6.2/images/image_view.png b/themes/clouds/css-1.7.0/images/image_view.png
index 1e7babae94..1e7babae94 100644
--- a/themes/clouds/css-1.6.2/images/image_view.png
+++ b/themes/clouds/css-1.7.0/images/image_view.png
diff --git a/themes/clouds/css-1.6.2/images/images.png b/themes/clouds/css-1.7.0/images/images.png
index b3854d450a..b3854d450a 100644
--- a/themes/clouds/css-1.6.2/images/images.png
+++ b/themes/clouds/css-1.7.0/images/images.png
diff --git a/themes/clouds/css-1.6.2/images/indicator.gif b/themes/clouds/css-1.7.0/images/indicator.gif
index 085ccaecaf..085ccaecaf 100644
--- a/themes/clouds/css-1.6.2/images/indicator.gif
+++ b/themes/clouds/css-1.7.0/images/indicator.gif
diff --git a/themes/clouds/css-1.6.2/images/indis.png b/themes/clouds/css-1.7.0/images/indis.png
index c61d7b85cf..c61d7b85cf 100644
--- a/themes/clouds/css-1.6.2/images/indis.png
+++ b/themes/clouds/css-1.7.0/images/indis.png
diff --git a/themes/clouds/css-1.6.2/images/larrow.png b/themes/clouds/css-1.7.0/images/larrow.png
index ec566c56ab..ec566c56ab 100644
--- a/themes/clouds/css-1.6.2/images/larrow.png
+++ b/themes/clouds/css-1.7.0/images/larrow.png
diff --git a/themes/clouds/css-1.6.2/images/larrow2.png b/themes/clouds/css-1.7.0/images/larrow2.png
index 9d25f3a4e0..9d25f3a4e0 100644
--- a/themes/clouds/css-1.6.2/images/larrow2.png
+++ b/themes/clouds/css-1.7.0/images/larrow2.png
diff --git a/themes/clouds/css-1.6.2/images/ldarrow.png b/themes/clouds/css-1.7.0/images/ldarrow.png
index 1d477d196d..1d477d196d 100644
--- a/themes/clouds/css-1.6.2/images/ldarrow.png
+++ b/themes/clouds/css-1.7.0/images/ldarrow.png
diff --git a/themes/clouds/css-1.7.0/images/ldarrow2.png b/themes/clouds/css-1.7.0/images/ldarrow2.png
new file mode 100644
index 0000000000..3e58fdffa8
--- /dev/null
+++ b/themes/clouds/css-1.7.0/images/ldarrow2.png
diff --git a/themes/clouds/css-1.6.2/images/left1B.png b/themes/clouds/css-1.7.0/images/left1B.png
index 17161ad076..17161ad076 100644
--- a/themes/clouds/css-1.6.2/images/left1B.png
+++ b/themes/clouds/css-1.7.0/images/left1B.png
diff --git a/themes/clouds/css-1.6.2/images/left2.png b/themes/clouds/css-1.7.0/images/left2.png
index d3a97ea996..d3a97ea996 100644
--- a/themes/clouds/css-1.6.2/images/left2.png
+++ b/themes/clouds/css-1.7.0/images/left2.png
diff --git a/themes/clouds/css-1.6.2/images/left3.png b/themes/clouds/css-1.7.0/images/left3.png
index 8190efbcb4..8190efbcb4 100644
--- a/themes/clouds/css-1.6.2/images/left3.png
+++ b/themes/clouds/css-1.7.0/images/left3.png
diff --git a/themes/clouds/css-1.6.2/images/li.png b/themes/clouds/css-1.7.0/images/li.png
index 9cbf6904ea..9cbf6904ea 100644
--- a/themes/clouds/css-1.6.2/images/li.png
+++ b/themes/clouds/css-1.7.0/images/li.png
diff --git a/themes/clouds/css-1.6.2/images/lifespan-chunk.png b/themes/clouds/css-1.7.0/images/lifespan-chunk.png
index 493ce7e39f..493ce7e39f 100644
--- a/themes/clouds/css-1.6.2/images/lifespan-chunk.png
+++ b/themes/clouds/css-1.7.0/images/lifespan-chunk.png
diff --git a/themes/clouds/css-1.6.2/images/lifespan-down.png b/themes/clouds/css-1.7.0/images/lifespan-down.png
index 19f5f44b6d..19f5f44b6d 100644
--- a/themes/clouds/css-1.6.2/images/lifespan-down.png
+++ b/themes/clouds/css-1.7.0/images/lifespan-down.png
diff --git a/themes/clouds/css-1.6.2/images/lifespan-left.png b/themes/clouds/css-1.7.0/images/lifespan-left.png
index 3bae6f9c4b..3bae6f9c4b 100644
--- a/themes/clouds/css-1.6.2/images/lifespan-left.png
+++ b/themes/clouds/css-1.7.0/images/lifespan-left.png
diff --git a/themes/clouds/css-1.6.2/images/lifespan-right.png b/themes/clouds/css-1.7.0/images/lifespan-right.png
index 2240a4cbb3..2240a4cbb3 100644
--- a/themes/clouds/css-1.6.2/images/lifespan-right.png
+++ b/themes/clouds/css-1.7.0/images/lifespan-right.png
diff --git a/themes/clouds/css-1.6.2/images/lifespan-up.png b/themes/clouds/css-1.7.0/images/lifespan-up.png
index dab8ebc73d..dab8ebc73d 100644
--- a/themes/clouds/css-1.6.2/images/lifespan-up.png
+++ b/themes/clouds/css-1.7.0/images/lifespan-up.png
diff --git a/themes/clouds/css-1.6.2/images/loading.gif b/themes/clouds/css-1.7.0/images/loading.gif
index 5bb90fd6a4..5bb90fd6a4 100644
--- a/themes/clouds/css-1.6.2/images/loading.gif
+++ b/themes/clouds/css-1.7.0/images/loading.gif
diff --git a/themes/clouds/css-1.6.2/images/mapquest.png b/themes/clouds/css-1.7.0/images/mapquest.png
index c62ccd1e52..c62ccd1e52 100644
--- a/themes/clouds/css-1.6.2/images/mapquest.png
+++ b/themes/clouds/css-1.7.0/images/mapquest.png
diff --git a/themes/clouds/css-1.6.2/images/media.png b/themes/clouds/css-1.7.0/images/media.png
index ef74a50288..ef74a50288 100644
--- a/themes/clouds/css-1.6.2/images/media.png
+++ b/themes/clouds/css-1.7.0/images/media.png
diff --git a/themes/clouds/css-1.6.2/images/minus.png b/themes/clouds/css-1.7.0/images/minus.png
index 8ed68808da..8ed68808da 100644
--- a/themes/clouds/css-1.6.2/images/minus.png
+++ b/themes/clouds/css-1.7.0/images/minus.png
diff --git a/themes/clouds/css-1.6.2/images/mypage.png b/themes/clouds/css-1.7.0/images/mypage.png
index f0cc0af1af..f0cc0af1af 100644
--- a/themes/clouds/css-1.6.2/images/mypage.png
+++ b/themes/clouds/css-1.7.0/images/mypage.png
diff --git a/themes/clouds/css-1.6.2/images/notes.png b/themes/clouds/css-1.7.0/images/notes.png
index 9bf410b7bf..9bf410b7bf 100644
--- a/themes/clouds/css-1.6.2/images/notes.png
+++ b/themes/clouds/css-1.7.0/images/notes.png
diff --git a/themes/clouds/css-1.6.2/images/osm.png b/themes/clouds/css-1.7.0/images/osm.png
index 899e2a58b6..899e2a58b6 100644
--- a/themes/clouds/css-1.6.2/images/osm.png
+++ b/themes/clouds/css-1.7.0/images/osm.png
diff --git a/themes/clouds/css-1.6.2/images/patriarch.png b/themes/clouds/css-1.7.0/images/patriarch.png
index 7f373ce7cc..7f373ce7cc 100644
--- a/themes/clouds/css-1.6.2/images/patriarch.png
+++ b/themes/clouds/css-1.7.0/images/patriarch.png
diff --git a/themes/clouds/css-1.6.2/images/pedigree.png b/themes/clouds/css-1.7.0/images/pedigree.png
index 968a8f539c..968a8f539c 100644
--- a/themes/clouds/css-1.6.2/images/pedigree.png
+++ b/themes/clouds/css-1.7.0/images/pedigree.png
diff --git a/themes/clouds/css-1.6.2/images/place.png b/themes/clouds/css-1.7.0/images/place.png
index 8c1238d50c..8c1238d50c 100644
--- a/themes/clouds/css-1.6.2/images/place.png
+++ b/themes/clouds/css-1.7.0/images/place.png
diff --git a/themes/clouds/css-1.6.2/images/plus.png b/themes/clouds/css-1.7.0/images/plus.png
index 64e15fc9f3..64e15fc9f3 100644
--- a/themes/clouds/css-1.6.2/images/plus.png
+++ b/themes/clouds/css-1.7.0/images/plus.png
diff --git a/themes/clouds/css-1.6.2/images/webtrees.png b/themes/clouds/css-1.7.0/images/powered-by-webtrees.png
index 6a5cf0fb3e..6a5cf0fb3e 100644
--- a/themes/clouds/css-1.6.2/images/webtrees.png
+++ b/themes/clouds/css-1.7.0/images/powered-by-webtrees.png
diff --git a/themes/clouds/css-1.6.2/images/rarrow.png b/themes/clouds/css-1.7.0/images/rarrow.png
index df266cf212..df266cf212 100644
--- a/themes/clouds/css-1.6.2/images/rarrow.png
+++ b/themes/clouds/css-1.7.0/images/rarrow.png
diff --git a/themes/clouds/css-1.6.2/images/rarrow2.png b/themes/clouds/css-1.7.0/images/rarrow2.png
index ee73492ea6..ee73492ea6 100644
--- a/themes/clouds/css-1.6.2/images/rarrow2.png
+++ b/themes/clouds/css-1.7.0/images/rarrow2.png
diff --git a/themes/clouds/css-1.6.2/images/rdarrow.png b/themes/clouds/css-1.7.0/images/rdarrow.png
index a549e8d076..a549e8d076 100644
--- a/themes/clouds/css-1.6.2/images/rdarrow.png
+++ b/themes/clouds/css-1.7.0/images/rdarrow.png
diff --git a/themes/clouds/css-1.7.0/images/rdarrow2.png b/themes/clouds/css-1.7.0/images/rdarrow2.png
new file mode 100644
index 0000000000..e17283de78
--- /dev/null
+++ b/themes/clouds/css-1.7.0/images/rdarrow2.png
diff --git a/themes/clouds/css-1.6.2/images/reminder.png b/themes/clouds/css-1.7.0/images/reminder.png
index fa5bbcf507..fa5bbcf507 100644
--- a/themes/clouds/css-1.6.2/images/reminder.png
+++ b/themes/clouds/css-1.7.0/images/reminder.png
diff --git a/themes/clouds/css-1.6.2/images/reorder.png b/themes/clouds/css-1.7.0/images/reorder.png
index 2cfe889ad1..2cfe889ad1 100644
--- a/themes/clouds/css-1.6.2/images/reorder.png
+++ b/themes/clouds/css-1.7.0/images/reorder.png
diff --git a/themes/clouds/css-1.6.2/images/repository.png b/themes/clouds/css-1.7.0/images/repository.png
index 6e433b498f..6e433b498f 100644
--- a/themes/clouds/css-1.6.2/images/repository.png
+++ b/themes/clouds/css-1.7.0/images/repository.png
diff --git a/themes/clouds/css-1.6.2/images/resn_confidential.png b/themes/clouds/css-1.7.0/images/resn_confidential.png
index 348f12765e..348f12765e 100644
--- a/themes/clouds/css-1.6.2/images/resn_confidential.png
+++ b/themes/clouds/css-1.7.0/images/resn_confidential.png
diff --git a/themes/clouds/css-1.6.2/images/resn_locked.png b/themes/clouds/css-1.7.0/images/resn_locked.png
index 560d963b8c..560d963b8c 100644
--- a/themes/clouds/css-1.6.2/images/resn_locked.png
+++ b/themes/clouds/css-1.7.0/images/resn_locked.png
diff --git a/themes/clouds/css-1.6.2/images/resn_none.png b/themes/clouds/css-1.7.0/images/resn_none.png
index d86137658e..d86137658e 100644
--- a/themes/clouds/css-1.6.2/images/resn_none.png
+++ b/themes/clouds/css-1.7.0/images/resn_none.png
diff --git a/themes/clouds/css-1.6.2/images/resn_privacy.png b/themes/clouds/css-1.7.0/images/resn_privacy.png
index ca462fd84d..ca462fd84d 100644
--- a/themes/clouds/css-1.6.2/images/resn_privacy.png
+++ b/themes/clouds/css-1.7.0/images/resn_privacy.png
diff --git a/themes/clouds/css-1.6.2/images/right1B.png b/themes/clouds/css-1.7.0/images/right1B.png
index c789d56ea7..c789d56ea7 100644
--- a/themes/clouds/css-1.6.2/images/right1B.png
+++ b/themes/clouds/css-1.7.0/images/right1B.png
diff --git a/themes/clouds/css-1.6.2/images/right3.png b/themes/clouds/css-1.7.0/images/right3.png
index b36532bbb8..b36532bbb8 100644
--- a/themes/clouds/css-1.6.2/images/right3.png
+++ b/themes/clouds/css-1.7.0/images/right3.png
diff --git a/themes/clouds/css-1.6.2/images/rings.png b/themes/clouds/css-1.7.0/images/rings.png
index 2190ac6573..2190ac6573 100644
--- a/themes/clouds/css-1.6.2/images/rings.png
+++ b/themes/clouds/css-1.7.0/images/rings.png
diff --git a/themes/clouds/css-1.6.2/images/selected.png b/themes/clouds/css-1.7.0/images/selected.png
index 7abd8e6031..7abd8e6031 100644
--- a/themes/clouds/css-1.6.2/images/selected.png
+++ b/themes/clouds/css-1.7.0/images/selected.png
diff --git a/themes/clouds/css-1.6.2/images/sex_f_15x15.png b/themes/clouds/css-1.7.0/images/sex_f_15x15.png
index 2d3abae32a..2d3abae32a 100644
--- a/themes/clouds/css-1.6.2/images/sex_f_15x15.png
+++ b/themes/clouds/css-1.7.0/images/sex_f_15x15.png
diff --git a/themes/clouds/css-1.6.2/images/sex_f_9x9.png b/themes/clouds/css-1.7.0/images/sex_f_9x9.png
index e35e46ccd4..e35e46ccd4 100644
--- a/themes/clouds/css-1.6.2/images/sex_f_9x9.png
+++ b/themes/clouds/css-1.7.0/images/sex_f_9x9.png
diff --git a/themes/clouds/css-1.6.2/images/sex_m_15x15.png b/themes/clouds/css-1.7.0/images/sex_m_15x15.png
index 4ac7956421..4ac7956421 100644
--- a/themes/clouds/css-1.6.2/images/sex_m_15x15.png
+++ b/themes/clouds/css-1.7.0/images/sex_m_15x15.png
diff --git a/themes/clouds/css-1.6.2/images/sex_m_9x9.png b/themes/clouds/css-1.7.0/images/sex_m_9x9.png
index 32a8484b1f..32a8484b1f 100644
--- a/themes/clouds/css-1.6.2/images/sex_m_9x9.png
+++ b/themes/clouds/css-1.7.0/images/sex_m_9x9.png
diff --git a/themes/clouds/css-1.6.2/images/sex_u_15x15.png b/themes/clouds/css-1.7.0/images/sex_u_15x15.png
index 158c3f9a10..158c3f9a10 100644
--- a/themes/clouds/css-1.6.2/images/sex_u_15x15.png
+++ b/themes/clouds/css-1.7.0/images/sex_u_15x15.png
diff --git a/themes/clouds/css-1.6.2/images/sex_u_9x9.png b/themes/clouds/css-1.7.0/images/sex_u_9x9.png
index d113a1898c..d113a1898c 100644
--- a/themes/clouds/css-1.6.2/images/sex_u_9x9.png
+++ b/themes/clouds/css-1.7.0/images/sex_u_9x9.png
diff --git a/themes/clouds/css-1.6.2/images/sfamily.png b/themes/clouds/css-1.7.0/images/sfamily.png
index e5f8f755c3..e5f8f755c3 100644
--- a/themes/clouds/css-1.6.2/images/sfamily.png
+++ b/themes/clouds/css-1.7.0/images/sfamily.png
diff --git a/themes/clouds/css-1.6.2/images/silhouette_female.png b/themes/clouds/css-1.7.0/images/silhouette_female.png
index bb8d503371..bb8d503371 100644
--- a/themes/clouds/css-1.6.2/images/silhouette_female.png
+++ b/themes/clouds/css-1.7.0/images/silhouette_female.png
diff --git a/themes/clouds/css-1.6.2/images/silhouette_female_small.png b/themes/clouds/css-1.7.0/images/silhouette_female_small.png
index ff153f7e5e..ff153f7e5e 100644
--- a/themes/clouds/css-1.6.2/images/silhouette_female_small.png
+++ b/themes/clouds/css-1.7.0/images/silhouette_female_small.png
diff --git a/themes/clouds/css-1.6.2/images/silhouette_male.png b/themes/clouds/css-1.7.0/images/silhouette_male.png
index 0615900224..0615900224 100644
--- a/themes/clouds/css-1.6.2/images/silhouette_male.png
+++ b/themes/clouds/css-1.7.0/images/silhouette_male.png
diff --git a/themes/clouds/css-1.6.2/images/silhouette_male_small.png b/themes/clouds/css-1.7.0/images/silhouette_male_small.png
index 6c7c175c76..6c7c175c76 100644
--- a/themes/clouds/css-1.6.2/images/silhouette_male_small.png
+++ b/themes/clouds/css-1.7.0/images/silhouette_male_small.png
diff --git a/themes/clouds/css-1.6.2/images/silhouette_unknown.png b/themes/clouds/css-1.7.0/images/silhouette_unknown.png
index d0417439ee..d0417439ee 100644
--- a/themes/clouds/css-1.6.2/images/silhouette_unknown.png
+++ b/themes/clouds/css-1.7.0/images/silhouette_unknown.png
diff --git a/themes/clouds/css-1.6.2/images/silhouette_unknown_small.png b/themes/clouds/css-1.7.0/images/silhouette_unknown_small.png
index 9602cffaa0..9602cffaa0 100644
--- a/themes/clouds/css-1.6.2/images/silhouette_unknown_small.png
+++ b/themes/clouds/css-1.7.0/images/silhouette_unknown_small.png
diff --git a/themes/clouds/css-1.6.2/images/source.png b/themes/clouds/css-1.7.0/images/source.png
index 085d3b179a..085d3b179a 100644
--- a/themes/clouds/css-1.6.2/images/source.png
+++ b/themes/clouds/css-1.7.0/images/source.png
diff --git a/themes/clouds/css-1.6.2/images/spacer.png b/themes/clouds/css-1.7.0/images/spacer.png
index a31b396979..a31b396979 100644
--- a/themes/clouds/css-1.6.2/images/spacer.png
+++ b/themes/clouds/css-1.7.0/images/spacer.png
diff --git a/themes/clouds/css-1.6.2/images/sprites-sub-menu.png b/themes/clouds/css-1.7.0/images/sprites-sub-menu.png
index 33b2a53592..33b2a53592 100644
--- a/themes/clouds/css-1.6.2/images/sprites-sub-menu.png
+++ b/themes/clouds/css-1.7.0/images/sprites-sub-menu.png
diff --git a/themes/clouds/css-1.6.2/images/sprites-top-menu.png b/themes/clouds/css-1.7.0/images/sprites-top-menu.png
index f0a634fc85..f0a634fc85 100644
--- a/themes/clouds/css-1.6.2/images/sprites-top-menu.png
+++ b/themes/clouds/css-1.7.0/images/sprites-top-menu.png
diff --git a/themes/clouds/css-1.6.2/images/stop.png b/themes/clouds/css-1.7.0/images/stop.png
index 7f8200a727..7f8200a727 100644
--- a/themes/clouds/css-1.6.2/images/stop.png
+++ b/themes/clouds/css-1.7.0/images/stop.png
diff --git a/themes/clouds/css-1.6.2/images/uarrow.png b/themes/clouds/css-1.7.0/images/uarrow.png
index 358859bd76..358859bd76 100644
--- a/themes/clouds/css-1.6.2/images/uarrow.png
+++ b/themes/clouds/css-1.7.0/images/uarrow.png
diff --git a/themes/clouds/css-1.6.2/images/uarrow2.png b/themes/clouds/css-1.7.0/images/uarrow2.png
index 5f2fc4b9af..5f2fc4b9af 100644
--- a/themes/clouds/css-1.6.2/images/uarrow2.png
+++ b/themes/clouds/css-1.7.0/images/uarrow2.png
diff --git a/themes/clouds/css-1.6.2/images/udarrow.png b/themes/clouds/css-1.7.0/images/udarrow.png
index 48c23c8e7d..48c23c8e7d 100644
--- a/themes/clouds/css-1.6.2/images/udarrow.png
+++ b/themes/clouds/css-1.7.0/images/udarrow.png
diff --git a/themes/clouds/css-1.6.2/images/user_add.png b/themes/clouds/css-1.7.0/images/user_add.png
index 80f6a0b266..80f6a0b266 100644
--- a/themes/clouds/css-1.6.2/images/user_add.png
+++ b/themes/clouds/css-1.7.0/images/user_add.png
diff --git a/themes/clouds/css-1.6.2/images/vline.png b/themes/clouds/css-1.7.0/images/vline.png
index 4aefe4df4e..4aefe4df4e 100644
--- a/themes/clouds/css-1.6.2/images/vline.png
+++ b/themes/clouds/css-1.7.0/images/vline.png
diff --git a/themes/clouds/css-1.6.2/images/w_button.png b/themes/clouds/css-1.7.0/images/w_button.png
index 31af28a377..31af28a377 100644
--- a/themes/clouds/css-1.6.2/images/w_button.png
+++ b/themes/clouds/css-1.7.0/images/w_button.png
diff --git a/themes/clouds/css-1.6.2/images/warning.png b/themes/clouds/css-1.7.0/images/warning.png
index d484c33341..d484c33341 100644
--- a/themes/clouds/css-1.6.2/images/warning.png
+++ b/themes/clouds/css-1.7.0/images/warning.png
diff --git a/themes/clouds/css-1.6.2/images/zoomin.png b/themes/clouds/css-1.7.0/images/zoomin.png
index 19a0d339d5..19a0d339d5 100644
--- a/themes/clouds/css-1.6.2/images/zoomin.png
+++ b/themes/clouds/css-1.7.0/images/zoomin.png
diff --git a/themes/clouds/css-1.6.2/images/zoomout.png b/themes/clouds/css-1.7.0/images/zoomout.png
index 4e97829f77..4e97829f77 100644
--- a/themes/clouds/css-1.6.2/images/zoomout.png
+++ b/themes/clouds/css-1.7.0/images/zoomout.png
diff --git a/themes/clouds/css-1.6.2/style.css b/themes/clouds/css-1.7.0/style.css
index 7a7999813d..8c745443a0 100644
--- a/themes/clouds/css-1.6.2/style.css
+++ b/themes/clouds/css-1.7.0/style.css
@@ -4,9 +4,10 @@
 * webtrees: Web based Family History software
 * Copyright (C) 2014 webtrees development team.
 *
-* Derived from PhpGedView Cloudy theme
-* Original author w.a. bastein http://genealogy.bastein.biz
-* Copyright (C) 2010 PGV Development Team.
+* Derived from PhpGedView
+* Copyright (C) 2002 to 2009 PGV Development Team.
+*
+* Mime-type icons from http://gnome-look.org, published under GPL (v2)
 *
 * 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
@@ -22,6 +23,9 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
+
+/* ======== Globals ========== */
+
 /* Add a permanent scrollbar, to prevent "flickering" when hover effects lengthen page */
 html {
 	overflow-y: scroll;
@@ -33,1144 +37,20 @@ body {
 	font: 12px tahoma, arial, helvetica, sans-serif;
 }
 
-header {
-	background-color: #fff;
-	border: 1px solid #039;
-	margin: 10px;
+#home-page {
+	padding-top: 10px;
 }
 
 main {
 	display: block;
-	padding: 10px;
-}
-
-* {
-	margin: 0;
-}
-
-td {
-	padding: 0;
-}
-
-/* ================= Header Layout */
-#header {
-	background-image: url(images/clouds.png);
-	height: 30px;
-}
-
-/* Set stack level for top menu row */
-.makeMenu ul,
-#main-menu ul {
-	z-index: 210;
-}
-
-header h1 {
-	color: #039;
-	float: left;
-	font-size: 20px;
-	font-weight: normal;
-	margin: 5px 12px 0;
-}
-
-[dir=rtl] header h1 {
-	float: right;
-}
-
-.hsearch {
-	display: block;
-	float: right;
-	padding-right: 10px;
-	padding-top: 5px;
-}
-
-#header-user-links {
-	float: right;
-	margin-right: 20px;
-}
-
-[dir=rtl] .hsearch {
-	float: left;
-	padding-left: 10px;
-}
-
-[dir=rtl] #header-user-links {
-	float: left;
-	margin-left: 20px;
-}
-
-#bodydiv .title {
-	margin: 0;
-}
-
-/* ===== */
-/* Layout Left Main menu */
-
-/* set up div container */
-#topMenu {
-	background: #acf;
-	clear: both;
-	height: 31px;
-	width: 100%;
-}
-
-#topMenu ul {
-	margin: 0;
-	padding: 0;
-}
-
-#main-menu ul {
-	padding: 0;
-	margin: 0;
-	border: 1px solid #ddd;
-	border-radius: 5px;
-	list-style-type: none;
-	position: absolute;
-	visibility: hidden;
-	opacity: 0;
-	background: #fff;
-}
-
-#main-menu li {
-	display: block;
-	position: relative;
-	float: left;
-	list-style: none;
-	width: 100%;
-}
-
-#main-menu li a {
-	display: block;
-}
-
-#main-menu li > ul {
-	display: block;
-	position: absolute;
-	top: 0;
-	white-space: nowrap;
-	left: 100%;
-	right: auto;
-}
-
-#main-menu > li > a {
-	height: 37px;
-	width: 27px;
-}
-
-#main-menu > li > ul {
-	left: 0;
-	right: auto;
-	top: 22px;
-}
-
-#main-menu a {
-	text-decoration: none;
-	padding: 0 10px;
-	margin: 0;
-	white-space: nowrap;
-}
-
-#main-menu ul li:hover a,
-#main-menu li:hover li a {
-	background: none;
-	border: 0;
-}
-
-#main-menu li:hover > ul {
-	visibility: visible;
-	opacity: 1;
-}
-
-/* First row submenu style*/
-#main-menu > li > ul > li:first-child {
-	text-indent: 0;
-	min-width: 100px;
-	width: 100%;
-	background: none;
-	font-weight: bold;
-	white-space: nowrap;
-	font-size: 12px;
-	text-align: center;
-	height: 22px;
-	line-height: 1.5;
-	border-bottom: solid #ddd 1px;
-}
-
-/* Mainmenu Icons*/
-#main-menu > li {
-	background-image: url(images/sprites-top-menu.png);
-	background-repeat: no-repeat;
-	width: 22px;
-	height: 22px;
-	line-height: 22px;
-	margin: 5px 0 0 10px;
-}
-
-/* Submenu Icons */
-#main-menu li ul li {
-	background-image: url(images/sprites-sub-menu.png);
-	background-repeat: no-repeat;
-	height: 22px;
-	line-height: 15px;
-	margin: 2px 0;
-	text-indent: 22px;
-}
-
-[dir=rtl] #main-menu > li {
-	margin: 4px 16px 0 0;
-}
-
-[dir=rtl] #main-menu li {
-	float: right;
-}
-
-[dir=rtl] #main-menu li:hover > ul {
-	right: 100%;
-	left: auto;
-}
-
-[dir=rtl] #main-menu > li:hover > ul {
-	left: auto;
-	right: 0;
-}
-
-[dir=rtl] #main-menu li li {
-	text-align: right;
-}
-
-[dir=rtl] #main-menu li li a {
-	display: block;
-}
-
-[dir=rtl] #main-menu > li > ul > li:first-child {
-	text-align: center;
-}
-
-/********************Menu Top Row Icons **********************/
-
-#menu-tree {
-	background-position: 0 0;
-}
-
-#menu-chart {
-	background-position: 0 -29px;
-}
-
-#menu-list {
-	background-position: 0 -59px;
-}
-
-#menu-calendar {
-	background-position: 0 -88px;
-}
-
-#menu-report {
-	background-position: 0 -117px;
-}
-
-#menu-search {
-	background-position: 0 -146px;
-}
-
-#menu-help {
-	background-position: 0 -175px;
-}
-
-#menu-mymenu {
-	background-position: 0 -204px;
-}
-
-#menu-clippings {
-	background-position: 0 -233px;
-}
-
-#menu-indi {
-	background-position: 0 -261px;
-}
-
-#menu-sour {
-	background-position: 0 -320px;
-}
-
-#menu-fam {
-	background-position: 0 -291px;
-}
-
-#menu-note {
-	background-position: 0 -348px;
-}
-
-#menu-obje {
-	background-position: 0 -378px;
-}
-
-#menu-repo {
-	background-position: 0 -407px;
-}
-
-#menu-story {
-	background-position: 0 -435px;
-}
-
-/**** Menu submenu Icons ****/
-/* Chart Icons */
-#menu-chart-ancestry {
-	background-position: left -0px;
-}
-
-[dir=rtl] #menu-chart-ancestry {
-	background-position: right -0px;
-}
-
-#menu-chart-fanchart {
-	background-position: left -23px;
-}
-
-[dir=rtl] #menu-chart-fanchart {
-	background-position: right -23px;
-}
-
-#menu-chart-compact {
-	background-position: left -0px;
-}
-
-[dir=rtl] #menu-chart-compact {
-	background-position: right -0px;
-}
-
-#menu-chart-descendancy {
-	background-position: left -69px;
-}
-
-[dir=rtl] #menu-chart-descendancy {
-	background-position: right -69px;
-}
-
-#menu-chart-familybook {
-	background-position: left -92px;
-}
-
-[dir=rtl] #menu-chart-familybook {
-	background-position: right -92px;
-}
-
-#menu-chart-hourglass {
-	background-position: left -115px;
-}
-
-[dir=rtl] #menu-chart-hourglass {
-	background-position: right -115px;
-}
-
-#menu-chart-tree {
-	background-position: left -138px;
-}
-
-[dir=rtl] #menu-chart-tree {
-	background-position: right -138px;
-}
-
-#menu-chart-lifespan {
-	background-position: left -161px;
-}
-
-[dir=rtl] #menu-chart-lifespan {
-	background-position: right -161px;
-}
-
-#menu-chart-pedigree {
-	background-position: left -184px;
-}
-
-[dir=rtl] #menu-chart-pedigree {
-	background-position: right -184px;
-}
-
-#menu-chart-pedigree_map {
-	background-position: left -207px;
-}
-
-[dir=rtl] #menu-chart-pedigree_map {
-	background-position: right -207px;
-}
-
-#menu-chart-relationship {
-	background-position: left -230px;
-}
-
-[dir=rtl] #menu-chart-relationship {
-	background-position: right -230px;
-}
-
-#menu-chart-relationship li {
-	background-position: left -230px;
-}
-
-[dir=rtl] #menu-chart-relationship li {
-	background-position: right -230px;
-}
-
-#menu-chart-statistics {
-	background-position: left -253px;
-}
-
-[dir=rtl] #menu-chart-statistics {
-	background-position: right -253px;
-}
-
-#menu-chart-timeline {
-	background-position: left -276px;
-}
-
-[dir=rtl] #menu-chart-timeline {
-	background-position: right -276px;
-}
-
-#menu-chart-timeline li {
-	background-position: left -276px;
-}
-
-[dir=rtl] #menu-chart-timeline li {
-	background-position: right -276px;
-}
-
-/* Lists Icons */
-#menu-list-obje {
-	background-position: left -299px;
-}
-
-[dir=rtl] #menu-list-obje {
-	background-position: right -299px;
-}
-
-#menu-list-plac {
-	background-position: left -322px;
-}
-
-[dir=rtl] #menu-list-plac {
-	background-position: right -322px;
-}
-
-#menu-list-repo {
-	background-position: left -345px;
-}
-
-[dir=rtl] #menu-list-repo {
-	background-position: right -345px;
-}
-
-#menu-list-note {
-	background-position: left -368px;
-}
-
-[dir=rtl] #menu-list-note {
-	background-position: right -368px;
-}
-
-#menu-list-sour {
-	background-position: left -391px;
-}
-
-[dir=rtl] #menu-list-sour {
-	background-position: right -391px;
-}
-
-#menu-branches {
-	background-position: left -414px;
-}
-
-[dir=rtl] #menu-branches {
-	background-position: right -414px;
-}
-
-#menu-list-fam {
-	background-position: left -437px;
-}
-
-[dir=rtl] #menu-list-fam {
-	background-position: right -437px;
-}
-
-#menu-list-indi {
-	background-position: left -460px;
-}
-
-[dir=rtl] #menu-list-indi {
-	background-position: right -460px;
-}
-
-/* Report Icons */
-#menu-report li {
-	background-position: left -483px;
-}
-
-[dir=rtl] #menu-report li {
-	background-position: right -483px;
-}
-
-/* Calendar Icons */
-#menu-calendar-day {
-	background-position: left -506px;
-}
-
-[dir=rtl] #menu-calendar-day {
-	background-position: right -506px;
-}
-
-#menu-calendar-month {
-	background-position: left -506px;
-}
-
-[dir=rtl] #menu-calendar-month {
-	background-position: right -506px;
-}
-
-#menu-calendar-year {
-	background-position: left -506px;
-}
-
-[dir=rtl] #menu-calendar-year {
-	background-position: right -506px;
-}
-
-/* Search Icons */
-#menu-search-general {
-	background-position: left -529px;
-}
-
-[dir=rtl] #menu-search-general {
-	background-position: right -529px;
-}
-
-#menu-search-soundex {
-	background-position: left -529px;
-}
-
-[dir=rtl] #menu-search-soundex {
-	background-position: right -529px;
-}
-
-#menu-search-advanced {
-	background-position: left -529px;
-}
-
-[dir=rtl] #menu-search-advanced {
-	background-position: right -529px;
-}
-
-#menu-search-replace {
-	background-position: left -529px;
-}
-
-[dir=rtl] #menu-search-replace {
-	background-position: right -529px;
-}
-
-/* Help Icons */
-#menu-help-genealogy {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-genealogy {
-	background-position: right -552px;
-}
-
-#menu-help-show {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-show {
-	background-position: right -552px;
-}
-
-#menu-help-contents {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-contents {
-	background-position: right -552px;
-}
-
-#menu-help-hide {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-hide {
-	background-position: right -552px;
-}
-
-#menu-help-faq {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-faq {
-	background-position: right -552px;
-}
-
-#menu-help-wiki {
-	background-position: left -575px;
-}
-
-[dir=rtl] #menu-help-wiki {
-	background-position: right -575px;
-}
-
-#menu-help-technica {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-help-technical {
-	background-position: right -598px;
-}
-
-/* MyPage Icons */
-#menu-mypage {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-mypage {
-	background-position: right -598px;
-}
-
-#menu-myaccount {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-myaccount {
-	background-position: right -598px;
-}
-
-#menu-mypedigree {
-	background-position: left -828px;
-}
-
-[dir=rtl] #menu-mypedigree {
-	background-position: right -828px;
-}
-
-#menu-myrecord {
-	background-position: left -460px;
-}
-
-[dir=rtl] #menu-myrecord {
-	background-position: right -460px;
-}
-
-#menu-admin {
-	background-position: left -644px;
-}
-
-[dir=rtl] #menu-admin {
-	background-position: right -644px;
-}
-
-#menu-tree li {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-tree li {
-	background-position: right -667px;
-}
-
-/* Family Icons */
-#menu-fam-addchil {
-	background-position: left -759px;
-}
-
-[dir=rtl] #menu-fam-addchil {
-	background-position: right -759px;
-}
-
-#menu-fam-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-fam-addfav {
-	background-position: right -736px;
-}
-
-#menu-fam-change {
-	background-position: left -759px;
-}
-
-[dir=rtl] #menu-fam-change {
-	background-position: right -759px;
-}
-
-#menu-fam-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-fam-del {
-	background-position: right -713px;
-}
-
-#menu-fam-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-fam-editraw {
-	background-position: right -667px;
-}
-
-#menu-fam-orderchil {
-	background-position: left -759px;
-}
-
-[dir=rtl] #menu-fam-orderchil {
-	background-position: right -759px;
-}
-
-/* Clipping Icons */
-#menu-clippingscart {
-	background-position: left -621px;
-}
-
-[dir=rtl] #menu-clippingscart {
-	background-position: right -621px;
-}
-
-#menu-clippingsadd {
-	background-position: left -621px;
-}
-
-[dir=rtl] #menu-clippingsadd {
-	background-position: right -621px;
-}
-
-/* Edit Icons */
-#menu-indi-addname {
-	background-position: left -690px;
-}
-
-[dir=rtl] #menu-indi-addname {
-	background-position: right -690px;
-}
-
-#menu-indi-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-indi-editraw {
-	background-position: right -667px;
-}
-
-#menu-indi-editsex {
-	background-position: left -690px;
-}
-
-[dir=rtl] #menu-indi-editsex {
-	background-position: right -690px;
-}
-
-#menu-indi-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-indi-del {
-	background-position: right -713px;
-}
-
-#menu-indi-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-indi-addfav {
-	background-position: right -736px;
-}
-
-/* Edit Notes */
-#menu-note-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-note-fav {
-	background-position: right -736px;
-}
-
-#menu-note-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-note-del {
-	background-position: right -713px;
-}
-
-#menu-note-edit {
-	background-position: left -805px;
-}
-
-[dir=rtl] #menu-note-edit {
-	background-position: right -805px;
-}
-
-#menu-note-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-note-editraw {
-	background-position: right -667px;
-}
-
-/* Objects */
-#menu-obje-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-obje-addfav {
-	background-position: right -736px;
-}
-
-#menu-obje-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-obje-del {
-	background-position: right -713px;
-}
-
-#menu-obje-edit {
-	background-position: left -852px;
-}
-
-[dir=rtl] #menu-obje-edit {
-	background-position: right -852px;
-}
-
-#menu-obje-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-obje-editraw {
-	background-position: right -667px;
-}
-
-#menu-obje-link {
-	background-position: left -875px;
-}
-
-[dir=rtl] #menu-obje-link {
-	background-position: right -875px;
-}
-
-#menu-obje-link-fam {
-	background-position: left -437px;
-}
-
-[dir=rtl] #menu-obje-link-fam {
-	background-position: right -437px;
-}
-
-#menu-obje-link-indi {
-	background-position: left -460px;
-}
-
-[dir=rtl] #menu-obje-link-indi {
-	background-position: right -460px;
-}
-
-#menu-obje-link-sour {
-	background-position: left -391px;
-}
-
-[dir=rtl] #menu-obje-link-sour {
-	background-position: right -391px;
-}
-
-/* Repository */
-#menu-repo-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-repo-addfav {
-	background-position: right -736px;
-}
-
-#menu-repo-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-repo-de {
-	background-position: right -713px;
-}
-
-#menu-repo-edit {
-	background-position: left -897px;
-}
-
-[dir=rtl] #menu-repo-edit {
-	background-position: right -897px;
-}
-
-#menu-repo-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-repo-editraw {
-	background-position: right -667px;
-}
-
-/* Source */
-#menu-sour-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-sour-addfav {
-	background-position: right -736px;
-}
-
-#menu-sour-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-sour-del {
-	background-position: right -713px;
-}
-
-#menu-sour-edit {
-	background-position: left -782px;
-}
-
-[dir=rtl] #menu-sour-edit {
-	background-position: right -782px;
-}
-
-#menu-sour-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-sour-editraw {
-	background-position: right -667px;
-}
-
-/* Stories */
-#menu-story-sub {
-	background-position: left -920px;
-}
-
-[dir=rtl] #menu-story-sub {
-	background-position: right -920px;
-}
-
-/* ===== */
-/* User Links Menu */
-
-#header-user-links {
-	float: right;
-	margin: 10px 10px 4px 0;
-}
-
-.makeMenu li {
-	display: inline;
-	position: relative;
-	white-space: nowrap;
-}
-
-.makeMenu li:before {
-	content: " | ";
-}
-
-.makeMenu li ul {
-	background-color: #eee;
-	border: thin solid #aaa;
-	display: none;
-	left: 0;
-	position: absolute;
-	top: 1.1em !important;
-}
-
-.makeMenu li ul li {
-	display: block;
-	text-align: left;
-}
-
-.makeMenu li ul li a {
-	color: #333;
-	padding: 2px 5px 2px 2px !important;
-}
-
-.makeMenu,
-.makeMenu li ul {
-	list-style: none;
-	margin-left: 0 !important;
-	padding: 1px;
-	top: 5px;
-}
-
-.makeMenu li:hover > ul {
-	display: block;
-}
-
-.makeMenu li a {
-	color: #039;
-}
-
-.makeMenu li a:hover {
-	color: #f5003d;
-}
-
-.makeMenu ul li a {
-	background-color: #fff;
-	display: block;
-	padding: 0 5px !important;
-}
-
-.makeMenu ul li a:hover {
-	background: #c8e7ff;
-	color: #000;
-}
-
-li a.link {
-	font-size: 13px;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-
-.makeMenu li ul li:before,
-.makeMenu li:first-child:before {
-	content: "";
-}
-
-.lang-active,
-.theme-active {
-	color: #006;
-	font-weight: 900;
-}
-
-[dir=rtl] .makeMenu li ul {
-	left: auto;
-	right: -20px !important;
-}
-
-[dir=rtl] .makeMenu li ul li {
-	text-align: right;
-}
-
-/* Tbl hdrs and Light Text */
-
-.descriptionbox,
-.topbottombar,
-.topbottombar a,
-.list_label,
-.list_label a,
-.facts_label,
-.facts_label a,
-.facts_label .date,
-.facts_label03,
-.facts_table h2,
-.facts_table .descriptionbox a,
-.blockcontent .facts_label {
-	background-color: #95b8e0;
-	color: #039;
-}
-
-/* Base Color */
-.descriptionbox .submenu a,
-.blockcontent,
-.list_value,
-.list_value_wrap,
-.news_box,
-.submenuitem_hover {
-	background: #fff;
-}
-
-/* Link Color */
-a {
-	color: #039;
-	text-decoration: none;
-}
-
-a:link,
-a:visited,
-a:active,
-a:hover,
-.menuitem a,
-.nameZoom {
-	color: #039;
-}
-
-a:hover,
-a.link:hover {
-	color: #f00;
-	text-decoration: none;
-}
-
-:focus {
-	outline-style: none;
-}
-
-.subheaders {
-	color: #006;
-}
-
-/* Edit Facts */
-td.descriptionbox div a {
-	color: #fff;
-}
-
-/* End Edit Facts */
-.facts_label .submenu a {
-	background: #fff;
-	color: #000;
-}
-
-hr {
-	margin-top: 5px;
-}
-
-h2 {
-	font-size: 18px;
-	font-weight: bold;
-}
-
-h4 {
-	font-weight: bold;
-}
-
-.center, .alpha_index {
-	margin: 12px 0;
-}
-
-p.center a {
-	font-size: 13px;
-}
-
-p.center a:hover,
-p.center span.warning,
-td.list_label span.warning {
-	color: #f50;
-	font-size: 13px;
-}
-
-table.header {
-	margin: 0;
-	padding: 0 10px;
-	width: 100%;
-}
-
-div.error {
-	color: #d00;
-	font-weight: 600;
-}
-
-p.center .warning,
-tr td.optionbox span.error,
-span.error {
-	color: #f50;
-}
-
-.error,
-.warning,
-.red,
-td.descriptionbox div div div a:hover {
-	color: #f00;
-}
-
-td.descriptionbox .submenu a,
-td.descriptionbox div div div a {
-	color: #000;
+	padding-top: 10px;
 }
 
-/* Rounded corners */
+/* ====== Round Corners ======== */
+input,
+textarea,
+fieldset,
+.border1,
 .block,
 .descriptionbox,
 .facts_label,
@@ -1192,508 +72,206 @@ td.descriptionbox div div div a {
 .person3,
 .person4,
 .person5,
-#sidebar,
-.topbottombar,
-#save-cancel {
+.primary-menu ul,
+.secondary-menu li ul,
+footer,
+#indi_main_blocks,
+#tabs,
+#save-cancel,
+.topbottombar {
 	border-radius: 3px;
 }
 
-#pid {
-	color: #333;
-	background: #ffc;
-}
-
-footer {
-	clear: both;
-	text-align: center;
-}
-
-/* ======= Block styles ========== */
-#index_main_blocks {
-	clear: none;
-	float: left;
-	width: 66%;
-}
-
-#index_small_blocks {
-	clear: none;
-	float: right;
-	width: 33%;
-}
-
-#index_full_blocks {
-	clear: none;
-	width: 100%;
-}
-
-#index_small_blocks .name1 {
-	color: #333;
-}
-
-[dir=rtl] #index_main_blocks {
-	float: right;
-}
-
-[dir=rtl] #index_small_blocks {
-	float: left;
-}
-
-#random_picture {
-	text-align: center;
-}
-
-#random_picture_box {
-	width: 100%;
-}
-
-.small_inner_block {
-	max-height: 200px;
-	overflow: auto;
-}
-
-.block {
-	color: #000;
-	margin-bottom: 5px;
-	padding: 1px;
-	vertical-align: top;
-}
-
-.blockcontent {
-	border: solid #999 1px;
-	margin-bottom: 10px;
-	margin-left: auto;
-	margin-right: 2px;
-	overflow: auto;
-	padding: 5px;
-}
-
-.blockheader {
-	width: 100%;
-	padding: 0;
-	margin: 0;
-	border-collapse: collapse;
-}
-
-img {
-	border: 0 none;
-}
-
-img.block {
-	height: 25px;
-}
-
-.line1,
-.line2,
-.line3 {
-	vertical-align: middle;
-}
-
-#hourglass_chart img.line4 {
-	vertical-align: middle;
-}
-
-.line5 {
-	vertical-align: top;
-}
-
-.blockh1 {
-	background: url(images/left1B.png) no-repeat;
-	height: 24px;
-	width: 26px;
-	padding: 0;
-}
-
-.blockh2 {
-	background: url(images/left2.png) repeat-x;
-	font-size: 13px;
-	font-weight: 700;
-	padding: 0;
-}
-
-.blockh3 {
-	background: url(images/left3.png) no-repeat;
-	height: 24px;
-	width: 8px;
-	padding: 0;
-}
-
-.blockhc {
-	padding: 3px 3px 0;
-}
-
-.blockhc img {
-	padding-right: 3px;
-}
-
-[dir=rtl] .blockh1 {
-	background-image: url(images/right1B.png);
-}
-
-[dir=rtl] .blockh3 {
-	background-image: url(images/right3.png);
+/* ios on click workaround */
+.iconz {
+	cursor: pointer;
 }
 
-[dir=rtl] .blockhc {
-	padding: 3px 0 0 3px;
+input:required:valid,
+textarea:required:valid {
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAONJREFUeNpi/P//PwMlgImBQjDwBrCgCzDOF2Zg+Adk/AOGDRvQfHZGoDWMxgyMDMb/Q1/NIt0F/xk8gIbNZPj7P41YL4AUGsM1//rfkuyeYMzw8z9xXgBqgNm0nuHnv0D/IH/juavmngV6oYY4F3z7y2DqY2oMpANB9MYl684yfP9Xw3Dzzw7sXgQmJGTM0MbjwdDKc0b2vt5/EM2QwunBoMyCVS1YPYYAMOwZ7FmiGLLYzjBYsSQD+QpALAjErNgMYERPyoyMjMxAih+IOYD4LxD/hOJfQLV/MaJ9NC8wAAQYAPbPfH2KJKx/AAAAAElFTkSuQmCC) no-repeat right top;
 }
 
-[dir=rtl] .blockhc img {
-	padding-left: 3px;
+input:required:invalid,
+textarea:required:invalid {
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMpJREFUeNpi/P//PwMlgImBQjAMDGBBF1jFyOgBpFqAuOYPA8MOoAI4P+z//x0YJoBiARkvYWA486+k5D+IBuJqZD66WnAMogvMA9o4F6j4R3Lyf2R6IQODMVEGTAW6CoirgfjMB2/v/yB6CgNDYQ8W14IwRiB+A7rgOwNDYLChofGcrVvPgugfDAzR/yFhwUAwDJqBNj6Ulf0PooEhV4jMx+YCRvSknAeMBWDotwgwMKRzMTCcfQW0GcQHxkbNJCyxwDiaFxgAAgwAYy67YIOQ//cAAAAASUVORK5CYII=) no-repeat right top;
 }
 
-#index_title {
-	float: left;
+[dir=rtl] input:required:valid,
+[dir=rtl] textarea:required:valid,
+[dir=rtl] input:required:invalid,
+[dir=rtl] textarea:required:invalid {
+	background-position: left top;
 }
 
-#main_select,
-#available_select,
-#right_select {
-	min-width: 150px;
+a {
+	color: #039;
+	text-decoration: none;
 }
 
-.user_welcome_block table,
-.gedcom_block_block table {
-	margin: auto;
+a:hover {
+	color: #f00;
+	text-decoration: none;
 }
 
-.user_welcome_block td,
-.gedcom_block_block td {
-	width: 33%;
-	text-align: center;
-	vertical-align: top;
+:focus {
+	outline-style: none;
 }
 
-#link_change_blocks {
+#flash-messages {
 	clear: both;
-	margin: 0 auto;
-	padding: 25px 0 0;
-	text-align: center;
-	width: 400px;
-}
-
-#link_change_blocks span {
-	padding: 0 50px;
-}
-
-#link_change_blocks span span {
-	padding: 0 3px;
 }
 
-/*-- charts layout --*/
-
-#ancestry_chart table div p {
-	font-size: 90%;
-	margin: 0;
-}
-
-#ancestry_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-#ancestry_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	display: block;
-	list-style: none;
-	margin: 0 0 0 15px;
-	padding-bottom: 0;
-	padding-right: 0;
-	padding-top: 3px;
-}
-
-#ancestry_chart li {
-	list-style: none;
-	margin: 0 0 2px -13px;
-	padding-bottom: 0;
-	padding-right: 0;
-	padding-top: 0;
-}
-
-#ancestry_chart li table {
-	margin: 5px 0;
-}
-
-[dir=rtl] #ancestry_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
-}
-
-[dir=rtl] #ancestry_chart li {
+dl {
 	margin: 0;
-	padding: 0 2px 0 0;
-	left: auto;
-}
-
-#descendancy_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	margin: 0 0 5px 20px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#descendancy_chart li {
-	list-style: none;
-	margin: 5px 0 0 -15px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
 }
 
-#descendancy_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-#descendancy_chart td.details1 {
-	padding-top: 5px;
-}
-
-[dir=rtl] #descendancy_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
+dt {
+	float: left;
+	font-weight: bold;
+	margin-right: 10px;
 }
 
-#familybook_chart {
+[dir=rtl] dt {
+	float: right;
+	margin-right: auto;
 	margin-left: 10px;
 }
 
-#familybook_chart table {
-	border-collapse: collapse;
-	empty-cells: show;
-}
-
-#familybook_chart td {
-	margin: 0;
-	padding: 0;
-}
-
-#familybook_chart h2 {
-	text-align: center;
-}
-
-#familybook_chart .line3,
-#familybook_chart .pvline,
-#familybook_chart .spacer {
-	width: 3px;
-}
-
-#familybook_chart img.line4 {
-	width: 7px;
-	vertical-align: middle;
-}
-
-[ID^="vline"] {
-	width: 3px;
+h2 {
+	color: #006;
+	font-size: 18px;
+	font-weight: bold;
+	margin: 14px 0;
 }
 
-#familybook_chart h3 {
-	font-size: 16px;
-	text-align: center;
+h4 {
+	color: #006;
+	font-size: 12px;
+	font-weight: bold;
 }
 
-#relationship-page h3 {
-	margin: 20px 0 0 20px;
+th {
+	font-weight: 100;
 }
 
-#relationship_chart {
-	margin: 0 20px;
+ul {
+	padding-left: 15px;
+	padding-right: 15px;
+	margin: 8px;
 }
 
-.tdtop {
-	vertical-align: top;
+img {
+	border: 0;
 }
 
-.tdmid {
+legend img {
+	height: 20px;
 	vertical-align: middle;
+	width: 20px;
 }
 
-.tdbot,
-.tvertline {
-	vertical-align: bottom;
-}
-
-[dir=rtl] #familybook_chart {
-	margin-right: 10px;
-}
-
-/*-- pedigree chart specific stylesheets --*/
-#pedigree-page table.list_table {
-	margin: 0 auto;
-	width: 500px;
-}
-
-.pedigree_chart_table {
+img.block,
+#mycart img {
 	border: 0;
-	border-collapse: collapse;
-	padding: 0;
-	width: 100%;
-}
-
-#pedigree_chart {
-	position: relative;
-	top: -200px;
-	left: 0;
-	z-index: 1;
-}
-
-[dir=rtl] #pedigree_chart {
-	left: auto;
-	right: 0;
-}
-
-#pedigree_canvas {
-	color: #8bf;
-	position: absolute;
-	top: 200px;
-	z-index: -1000;
-}
-
-#pedigree_chart #childarrow,
-#pedigree_chart #uparrow,
-#pedigree_chart .shadow,
-.ancestorarrow {
-	position: absolute;
-}
-
-#childbox {
-	padding: 5px;
-	position: absolute;
-	display: none;
-	text-align: start;
-	white-space: nowrap;
-	top: 20px;
-	left: 0;
-}
-
-[dir=rtl] #childbox {
-	left: auto;
-	right: 0;
-}
-
-.layout3 #childbox {
-	top: auto;
-	bottom: 20px;
-}
-
-#childbox a.name1 {
-	/*	font-weight: normal;*/
-	display: block;
-	margin-left: 5px;
-}
-
-#hourglass_chart table,
-.charts_block table {
-	border-collapse: collapse;
-}
-
-#hourglass_chart td,
-.charts_block td {
-	padding: 0;
-	empty-cells: show;
-}
-
-#pedigree_chart #childbox {
-	border: 1px solid;
-	background-color: #fff;
-}
-
-#relationship_chart {
-	z-index: 1;
-}
-
-#timeline_chart {
-	position: relative;
-	top: 50px;
-	left: 0;
+	height: 25px;
+	vertical-align: middle;
 }
 
-#compact_chart,
-#fan_chart,
-#ancestry_chart,
-#familybook_chart,
-#hourglass_chart {
-	margin: 20px;
+input,
+button,
+textarea {
+	border-width: 1px;
+	border-color: #fff #006 #006 #fff;
+	font-size: 12px;
 }
 
-.fan_chart_menu {
-	position: absolute;
-	display: none;
-	z-index: 100;
+input,
+textarea {
+	padding: 3px;
 }
 
-#fan_chart ul {
-	list-style-type: none;
-	margin: 0;
+textarea {
+	border-style: inset;
 }
 
-#fan_chart ul.children li:before {
-	content: "< ";
+.topbottombar {
+	font-size: 12px;
 	font-weight: bold;
+	padding: 4px;
+	text-align: center;
 }
 
-#fan_chart_img {
-	text-align: center;
+fieldset {
+	margin: 8px 8px 4px;
+	text-align: left;
 }
 
-.topheader {
-	color: #888;
-	margin: 0;
-	white-space: nowrap;
+[dir=rtl] fieldset {
+	text-align: right;
 }
 
-ul {
-	margin: 8px;
-	padding-left: 15px;
-	padding-right: 15px;
+legend {
+	font-weight: bold;
 }
 
-.center {
-	text-align: center;
+select {
+	border: 1px solid #ccc;
+	font-size: 12px;
+	margin: 0 7px;
+	padding: 1px;
 }
 
-table.center {
-	margin-left: auto;
-	margin-right: auto;
+header form {
+	font-size: 12px;
 }
 
-th {
-	font-weight: 100;
+#mycart a img {
+	height: 15px;
 }
 
 .button {
 	width: 60px;
 }
 
-/* person boxes are used in various charts */
+.alpha_index {
+	color: #006;
+}
 
-.person_box,
-.person_boxF,
-.person_boxNN {
-	border: 1px solid #aaa;
-	padding: 3px;
+hr {
+	margin-top: 5px;
+	border-color: #006;
 }
 
 .person_box {
 	background: #ddf;
+	border: 1px solid #8bf;
+	padding: 3px;
 }
 
 .person_boxF {
 	background: #fdd;
+	border: 1px solid #8bf;
+	padding: 3px;
 }
 
 .person_boxNN {
 	background: #fff;
+	border: 1px solid #8bf;
+	padding: 3px;
+}
+
+.person_box:target,
+.news_box:target,
+#gedcom_stats:target {
+	background-color: #ffc;
 }
 
 .person_box_lifespan {
 	display: inline;
 }
 
-/* families tab */
+/* families tab person box */
 #relatives_content .person_box > .person_box,
 #relatives_content .person_boxF > .person_boxF,
 #relatives_content .person_boxNN > .person_boxNN {
@@ -1701,12 +279,13 @@ th {
 	min-height: 50px;
 }
 
-.action_headerF {
-	background: #fdd;
+.center {
+	text-align: center;
 }
 
-.action_header {
-	background: #ddf;
+table.center {
+	margin-left: auto;
+	margin-right: auto;
 }
 
 .list_table {
@@ -1714,52 +293,29 @@ th {
 }
 
 .list_label,
-.list_label_wrap,
-.list_value,
-.list_value_wrap {
-	border: 1px solid #999;
-}
-
-.list_value_wrap p {
-	margin: 10px 0;
-}
-
-.list_label,
 .list_label_wrap {
-	color: #fff !important;
-	font-weight: 700;
+	color: #fff;
+	font-size: 12px;
+	border: 1px solid #999;
+	font-weight: bold;
 	text-align: center;
-	vertical-align: text-top;
-	white-space: normal;
 }
 
 .list_value,
 .list_value_wrap {
-	padding: 1px;
-	text-align: left;
+	background-color: #edf7f9;
+	font-size: 12px;
+	border: solid #999 1px;
 	vertical-align: top;
 }
 
-[dir=rtl] .list_value,
-[dir=rtl] .list_value_wrap {
-	text-align: right;
-}
-
 .list_label,
 .list_value {
 	white-space: nowrap;
 }
 
-table.width66 {
-	margin-left: auto;
-	margin-right: auto;
-}
-
 .list_label_wrap,
 .list_value_wrap {
-	background-color: #ecf5ff;
-	border: 1px solid #84beff;
-	color: #006;
 	white-space: normal;
 }
 
@@ -1769,17 +325,12 @@ table.width66 {
 
 .facts_table {
 	width: 100%;
-	padding: 0;
 }
 
 div.fact_SHARED_NOTE {
 	clear: both;
 }
 
-.tabs_table {
-	max-width: 98%;
-}
-
 .facts_label {
 	border: 1px solid #acf;
 	padding: 4px;
@@ -1788,92 +339,100 @@ div.fact_SHARED_NOTE {
 }
 
 .facts_label03 {
-	font-weight: bold;
 	padding: 4px;
 	text-align: center;
+	font-weight: bold;
 }
 
 .facts_value {
 	background: #fff;
-	border: 1pt solid #999;
+	font-size: 12px;
+	border: solid #999 1px;
 	padding: 4px;
-	color: #039;
+}
+
+.facts_label .submenu a {
+	background: #fff;
+	color: #000;
 }
 
 .quickfacts a {
-	font-size: 9px;
 	padding: 0 3px;
+	font-size: 9px;
+}
+
+.tabs_table {
+	width: 99%;
 }
 
 .name1,
 .name2 {
-	font-weight: 700;
-	overflow: hidden;
+	font-weight: bold;
 	font-size: 12px;
 }
 
-a:hover .name1,
-a:hover .name2 {
+a:hover .name1, a:hover .name2 {
 	color: #f00;
-	font-weight: 700;
+	font-weight: bold;
 	font-size: 12px;
 }
 
-.nameZoom {
-	font-size: 14px;
-	text-decoration: none;
-	font-weight: 700;
-	overflow: hidden;
-}
-
 a:hover .nameZoom {
-	font-size: 14px;
 	color: #f00;
-	font-weight: 700;
+	font-size: 14px;
+	font-weight: bold;
 }
 
 .details0,
 .details1 {
-	text-decoration: none;
 	font-size: 11px;
 }
 
 .details2 {
-	font-size: 11px;
-	text-decoration: none;
 	color: #006;
-	font-weight: bold;
+	font-size: 12px;
 }
 
 .nameZoom {
+	color: #006;
 	font-size: 14px;
 	font-weight: bold;
-	text-decoration: none;
 }
 
-a:hover .nameZoom {
+.details_label {
 	font-weight: bold;
-	font-size: 14px;
-	color: red;
+}
+
+.name_head {
+	color: #333;
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 2;
+	padding: 0 5px;
 }
 
 .date {
 	color: #039;
-	font-weight: bold;
 }
 
 .label {
 	font-weight: bold;
 }
 
-.error,
-.largeError {
+.error {
+	color: #d00;
 	font-weight: bold;
 }
 
 .largeError {
 	color: #d00;
-	font-size: 24px;
+	font-size: large;
+	font-weight: bold;
+}
+
+.warning {
+	color: #f00;
+	font-weight: bold;
 }
 
 .indent {
@@ -1892,35 +451,37 @@ a:hover .nameZoom {
 }
 
 .gender_image {
-	padding-left: 3px;
-	padding-right: 3px;
+	margin: 0 3px;
 	border: 0;
 	vertical-align: middle;
 }
 
-.pedigree_form {
-	width: 60px;
-}
-
 .thumbnail {
 	height: auto;
-	padding: 5px;
+	padding: 3px;
 }
 
-.link {
-	font-size: 11px;
-	text-align: center;
+.icon {
+	border: 0;
+	padding: 0 5px
 }
 
 .sublinks_cell {
-	background: #9be;
+	background-color: #9be;
+	font-size: 12px;
+}
+
+.submenu .icon {
+	vertical-align: middle;
+	width: 20px;
+	height: 20px;
 }
 
 .subheaders {
-	font-size: 16px;
+	color: #006
 	font-weight: bold;
-	padding: 10px;
-	margin: 15px 0 0 15px;
+	font-size: 15px;
+	margin-top: 15px;
 	vertical-align: bottom;
 }
 
@@ -1937,33 +498,86 @@ a:hover .nameZoom {
 	display: none;
 }
 
-.contact_links {
-	margin: 15px 0;
-	text-align: center;
-}
-
-.hit-counter {
-	background: #000;
-	color: #fff;
-	font-weight: bold;
+.selected-option {
+	background-color: #cef;
 }
 
 .border1 {
 	border: solid #000 1px;
 }
 
-.theme_form {
-	margin-top: 0;
-	font-size: 14px;
+.menuitem {
+	text-decoration: none;
+	font-size: 11px;
+	padding: 1px;
 }
 
-.theme_form option,
-.color_form option {
-	margin: 3px;
+.menuitem_hover {
+	text-decoration: none;
+	font-size: 11px;
+	padding: 1px;
 }
 
-.selected-option {
-	background: #cef;
+.menuitem .icon, .menuitem_hover .icon {
+	width: 50px;
+	height: 50px;
+}
+
+.submenu {
+	text-decoration: none;
+	font-size: 11px;
+	background-color: #fff;
+	border: solid #ccc 1px;
+	visibility: hidden;
+	position: absolute;
+	padding: 5px;
+}
+
+.submenuitem  {
+	vertical-align: middle;
+	font-size: 11px;
+	height: 20px;
+	text-decoration: none;
+	background-color: #fff;
+	padding: 1px;
+	white-space: nowrap;
+}
+
+.submenuitem_hover {
+	vertical-align: middle;
+	height: 20px;
+	font-size: 11px;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	white-space: nowrap;
+	padding: 1px;
+}
+
+.submenuitem a,
+.submenuitem_hover a {
+	display: inline-block;
+	vertical-align: middle;
+}
+
+.journal_box {
+	padding: 3pt;
+	border: thin solid #aaa;
+	overflow: visible;
+}
+
+.news_box {
+	border-top: solid #ccc 1px;
+}
+
+.news_title {
+	color: #000;
+	font-weight: bold;
+	font-size: 14px;
+}
+
+.news_date {
+	color: #000;
+	margin-bottom: 12px;
 }
 
 .current_day {
@@ -1980,95 +594,103 @@ a:hover .nameZoom {
 	direction: rtl;
 	float: right;
 	color: #00f;
-	font-weight: 700;
+	font-weight: bold;
 }
 
-.helpheader {
-	text-align: left;
+.helpcontent {
+	margin-left: 10px;
+	margin-right: 10px;
 }
 
 .helpcontent dt {
 	clear: both;
 }
 
-.block {
-	color: #000;
+#my-page h1 {
+	margin: 0.25em auto 0.6em;
+}
+
+.tdtop {
 	vertical-align: top;
 }
 
-.submenuitem {
-	height: 20px;
-	color: #555;
-	text-decoration: none;
-	font-size: 11px;
-	background-color: #fff;
-	border: 1px solid #ccc;
-	padding: 3px 3px 0;
-	white-space: nowrap;
+.tdmid {
+	vertical-align: middle;
 }
 
-.submenuitem_hover {
-	height: 20px;
-	font-size: 11px;
-	white-space: nowrap;
-	border: 1px solid #ccc;
-	padding: 3px 3px 0;
+.tdbot,
+.tvertline {
+	vertical-align: bottom;
 }
 
-.journal_box {
-	padding: 3pt;
-	border: thin solid #aaa;
-	overflow: visible;
+.line1,
+.line2,
+.line3 {
+	vertical-align: middle;
 }
 
-.news_box {
-	padding: 5pt 5px;
-	border-top: solid #ccc 1px;
+.line5 {
+	vertical-align: top;
 }
 
-.news_title {
-	color: #000;
-	font-size: 13px;
-	font-weight: 700;
+#childbox {
+	padding: 5px;
+	position: absolute;
+	display: none;
+	text-align: start;
+	white-space: nowrap;
+	top: 20px;
+	left: 0;
 }
 
-.news_date {
-	color: #000;
-	margin-bottom: 12px;
+[dir=rtl] #childbox {
+	left: auto;
+	right: 0;
+}
+
+.layout3 #childbox {
+	top: auto;
+	bottom: 20px;
+}
+
+#childbox a.name1 {
+	/*	font-weight: normal;*/
+	display: block;
+	margin-left: 5px;
 }
 
 .person0 {
-	background: #ddf;
+	background-color: #ddf;
 	border: outset #999 1px;
 	vertical-align: top;
 }
 
 .person1 {
-	background: #afa;
+	background-color: #afa;
 	border: outset #afa 1px;
 	vertical-align: top;
 }
 
 .person2 {
-	background: #faa;
+	background-color: #faa;
 	border: outset #faa 1px;
 	vertical-align: top;
 }
 
 .person3 {
-	background: #aad;
+	background-color: #aad;
 	border: outset #55f 1px;
 	vertical-align: top;
 }
 
 .person4 {
-	background: #f55;
+	background-color: #f55;
 	border: outset #f55 1px;
 	vertical-align: top;
 }
 
 .person5 {
-	background: #5f5;
+	background-color: #5f5;
 	border: outset #5f5 1px;
 	vertical-align: top;
 }
@@ -2078,47 +700,7 @@ a:hover .nameZoom {
 	color: #555;
 }
 
-input,
-button,
-textarea {
-	border-width: 1px;
-	border-color: #fff #006 #006 #fff;
-	font-size: 12px;
-	font-family: inherit;
-}
-
-input,
-textarea {
-	padding: 0 3px;
-}
-
-button,
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="file"] {
-	border: 1px solid #cbc7bd;
-	color: #654b24;
-	font-weight: 700;
-	border-radius: 3px;
-	font-size: 10px;
-	padding: 0 3px;
-}
-
-.optionbox input {
-	margin-right: 5px;
-}
-
-[dir=rtl] .optionbox input {
-	margin-left: 5px;
-}
-
-select {
-	border: 1px solid #ccc;
-}
-
 .formField {
-	width: 140px;
 	font-size: 12px;
 }
 
@@ -2127,117 +709,43 @@ select {
 }
 
 .search_hit {
-	background: #ff0;
-	color: #000;
+	background-color: #ff0;
 }
 
 .search_item {
 	font-weight: 600;
 }
 
-.search-icon {
-	height: 17px;
-	vertical-align: top;
-}
-
-.topbottombar {
-	font-weight: bold;
-	padding: 4px;
-	text-align: center;
-}
-
 .descriptionbox {
-	border: 1px solid #9be;
+	font-size: 12px;
+	border: 1px solid #ccc;
 	vertical-align: top;
 	padding: 3px;
 }
 
 .optionbox {
+	font-size: 12px;
 	background-color: #ecf5ff;
-	border: 1px solid #8bf;
 	color: #006;
-	font-size: 11px;
-	padding: 3px;
+	border: solid #ccc 1px;
 	vertical-align: top;
 	white-space: nowrap;
+	padding: 3px;
 }
 
 .vmiddle {
 	vertical-align: middle;
 }
 
+.red {
+	color: #f00;
+}
+
 .rela,
 .histo {
 	opacity: 0.8;
 }
 
-#index .user_messages td {
-	border: 1px #999 solid;
-	padding: 2px;
-}
-
-.sex_image {
-	height: 9px;
-	width: 9px;
-	padding-left: 3px;
-	padding-right: 3px;
-	border: 0;
-	vertical-align: middle;
-}
-
-fieldset {
-	padding: 30px;
-	margin: 8px 8px 4px;
-	text-align: left;
-}
-
-[dir=rtl] fieldset {
-	text-align: right;
-}
-
-fieldset ol,
-fieldset li {
-	margin: 2px 0 0 5px;
-}
-
-[dir=rtl] fieldset ol,
-fieldset li {
-	margin: 2px 5px 0 0;
-}
-
-div.blockhc a:hover {
-	background: transparent;
-}
-
-legend {
-	font-weight: bold;
-}
-
-.details_label {
-	font-weight: bold;
-}
-
-.name_head {
-	color: #333;
-	font-weight: bold;
-	font-size: 16px;
-	line-height: 2;
-	padding: 0 5px;
-}
-
-form .rtl {
-	text-align: right;
-}
-
-.ltr {
-	text-align: left;
-}
-
-.rtl {
-	text-align: right;
-	direction: rtl;
-}
-
 .width10 {
 	width: 10%;
 }
@@ -2250,14 +758,14 @@ form .rtl {
 	width: 25%;
 }
 
-.width33 {
-	width: 33%;
-}
-
 .width30 {
 	width: 30%;
 }
 
+.width33 {
+	width: 33%;
+}
+
 .width40 {
 	width: 40%;
 }
@@ -2298,11 +806,16 @@ form .rtl {
 	font-size: 9px;
 }
 
+.font11 {
+	font-size: 11px;
+}
+
 .messagebox {
-	background: #dfeeff;
+	background-color: #c2ceef;
+	border: solid #ccc 1px;
 }
 
-/* Pending edits - TODO perhaps show differently in different contexts? */
+/* ---Pending edits--- */
 .new {
 	border: solid blue 1px;
 	overflow: hidden;
@@ -2310,19 +823,18 @@ form .rtl {
 
 .old {
 	border: solid red 1px;
-	overflow: hidden
+	overflow: hidden;
 }
 
 a.showit {
 	position: relative;
 	z-index: 24;
-	color: #000;
 	text-decoration: none;
 }
 
 a.showit:hover {
 	z-index: 25;
-	background: #ff9;
+	background-color: #ff9;
 	cursor: crosshair;
 }
 
@@ -2331,97 +843,67 @@ a.showit > span {
 }
 
 a.showit:hover > span {
-	background: #444;
-	border-bottom: 2px solid #000;
-	border-left: 15px outset #111;
-	border-right: 2px solid #000;
-	border-top: 2px solid #111;
-	color: #fff;
 	display: block;
-	font-size: 15px;
-	left: 0;
-	opacity: .85;
-	padding: 3px;
 	position: absolute;
-	text-align: left;
 	top: 22px;
-	white-space: normal;
+	left: 0;
 	width: 225px;
+	border: 2px solid #000;
+	border-left: 15px outset;
+	padding: 3px;
+	background-color: #444;
+	color: #fff;
+	font-size: 15px;
+	text-align: left;
+	opacity: .85;
 	z-index: 5;
 }
 
-.lifespan_outer {
-	position: relative;
-	width: 99.5%;
-	height: 600px;
-	overflow: hidden;
-	border: solid #00f 1px;
-}
-
-.lifespan_outer a {
-	color: #000;
-}
-
-.lifespan_outer a:hover {
-	color: #f00;
-	text-decoration: none;
-}
-
-.lifespan_people span:first-letter {
-	font-variant: small-caps;
-	font-weight: bold;
-	font-size: 16px;
-	padding: 1px;
-}
-
-.lifespan_people {
-	position: absolute;
-	width: 500px;
-	left: -10px;
-	top: -60px;
-	z-index: 1;
+.tag_cloud {
+	text-align: center;
 }
 
-.lifespan_timeline {
-	position: absolute;
-	width: 100%;
-	left: -10px;
-	top: -65px;
-	z-index: 2;
-	background: #fff;
+.tag_cloud a {
+	white-space: nowrap;
 }
 
+/* ---Autocomplete styles--- */
 .ui-autocomplete-input {
-	background: #eea;
-}
-
-.ui-autocomplete-loading {
-	background: #fff url(images/indicator.gif) right center no-repeat;
+	background-color: #eea;
 }
 
 .ui-autocomplete {
+	padding: 0;
 	border: 1px solid #000;
-	background: #fff;
+	background-color: #fff;
 	z-index: 99999;
-	padding: 0;
 	list-style: none outside none;
 	margin: 0;
 	max-height: 200px;
-	overflow-y: auto;
+	overflow-x: hidden;
+	overflow-y: scroll;
 }
 
 .ui-autocomplete li {
+	margin: 0;
+	padding: 2px 5px;
+	font-size: 12px;
 	cursor: default;
 	display: block;
+	/* if width will be 100% horizontal scrollbar will apear when scroll mode will be used */
+	/* width: 100%; */
 	font: menu;
+	/* it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */
 	line-height: 14px;
 	overflow: hidden;
-	margin: 0;
-	padding: 2px 5px;
+}
+
+.ui-autocomplete-loading {
+	background: #fff url(images/indicator.gif) right center no-repeat;
 }
 
 .ui-autocomplete li:nth-child(odd) {
-	background: #eee;
+	background-color: #eee;
 }
 
 .ui-autocomplete a.ui-state-focus {
@@ -2436,9 +918,7 @@ a.showit:hover > span {
 	display: none;
 }
 
-.sublinks_cell .submenuitem {
-	background: #fff;
-}
+/* ---End of Autocomplete styles--- */
 
 .nowrap {
 	white-space: nowrap;
@@ -2452,50 +932,46 @@ a.showit:hover > span {
 	text-align: center;
 }
 
-.gchart {
-	border: 1px solid #999;
-}
-
-.execution_stats {
-	padding: 12px;
+.center2 {
 	text-align: center;
 }
 
-.tag_cloud a {
-	white-space: nowrap;
+.gchart {
+	border: solid #999 1px;
 }
 
-.clearfloat {
-	clear: both;
+/* ---Find special characters--- */
+.largechars {
+	font-family: monospace;
+	font-size: 200%;
 }
 
-dl {
-	margin: 0;
+#facts_content dd {
+	float: left;
+	width: 70%;
 }
 
-dt {
-	float: left;
-	font-weight: bold;
-	margin-right: 10px;
+.clearfloat {
 	clear: both;
 }
 
-[dir=rtl] dt {
-	float: right;
-	margin-right: auto;
-	margin-left: 10px;
+/* this keeps the tag color the same when it is a link as when not */
+
+.place {
+	padding-top: 5px;
 }
 
 #pending h2 {
-	margin-bottom: 20px;
 	text-align: center;
+	margin-bottom: 20px;
 }
 
 #pending h3 {
-	margin-top: 20px;
 	text-align: center;
+	margin-top: 20px;
 }
 
+/* ======== Person box ======= */
 .gedcom_favorites_block,
 .user_favorites_block,
 .person_box_template {
@@ -2524,11 +1000,11 @@ dt {
 	height: auto;
 }
 
-.person_box_template .namedef i {
+.person_box_template .namedef i[class^="icon-sex"] {
 	margin-left: 3px;
 }
 
-[dir=rtl] .person_box_template .namedef i {
+[dir=rtl] .person_box_template .namedef i[class^="icon-sex"] {
 	margin-right: 3px;
 }
 
@@ -2540,17 +1016,17 @@ dt {
 	float: left;
 }
 
+.person_box_template .inout {
+	clear: both;
+	display: none;
+}
+
 .person_box_template .noprint {
 	width: 25px;
 	height: 50px;
 	position: relative;
 }
 
-.person_box_template .inout {
-	clear: both;
-	display: none;
-}
-
 .person_box_template .chart_textbox {
 	overflow: hidden;
 }
@@ -2567,7 +1043,7 @@ dt {
 [dir=rtl] .person_box_template img,
 [dir=rtl] .person_box_template a.gallery {
 	float: right;
-	margin: 0 0 0 3px;
+	margin: 0 0 0 4px;
 }
 
 .person_box_template i[class^="icon-silhouette"] {
@@ -2578,110 +1054,83 @@ dt {
 	float: right;
 }
 
-/* ============= Statistics block ============ */
-.gedcom_stats_block table td {
-	vertical-align: top;
-}
-
-.gedcom_stats_block table td td {
-	vertical-align: middle;
-}
-
-.gedcom_stats_block td .stats_value {
-	text-align: center;
-}
-
-/* ============= Theme select block ============ */
-.theme_form ul {
-	margin: -10px auto;
-}
-
-.theme_form li {
-	visibility: hidden;
-}
-
-.theme_form li ul li {
-	display: inline-block;
-	padding: 10px;
-	visibility: visible;
-}
-
-/* ======= Favourites block ========== */
-.blockcontent .person_box_template .details2 {
-	min-height: 40px;
-}
-
-.blockcontent [class*='box-style2'] {
-	margin: 5px 0;
-}
-
-.add_fav_head {
-	font-weight: 900;
-	margin: 5px 0;
+#branches-page table,
+#medialist-page .list_table,
+#medialist-page .list_table_controls {
+	margin: 0 auto;
 }
 
-.add_fav_head i {
-	margin: 0 5px 1px;
+#medialist-page form .list_table {
+	width: 75%;
 }
 
-.add_fav_ref p {
-	margin: 5px 0;
+#medialist-page div .list_table,
+#medialist-page .media-col,
+#medialist-page .media-col1,
+#medialist-page .list_value_wrap,
+#medialist-page div .list_table_controls {
+	width: 100%;
 }
 
-.add_fav_ref label {
-	display: inline-block;
-	min-width: 100px;
+#medialist-page .optionbox, 
+#medialist-page .descriptionbox {
+	width: 25%;
 }
 
-.add_fav_ref label:after {
-	content: ":";
+#medialist-page .media-col2 {
+	width: 50%;
 }
 
-.add_fav_ref input {
-	margin: 0 5px;
+#medialist-page .media-col {
+	padding-left: 5px; 
+	border: none;
 }
 
-#branches-page table,
-#medialist-page .list_table,
-#medialist-page .list_table_controls {
-	margin: 0 auto;
+[dir=rtl] #medialist-page .media-col {
+	padding-left: 0;
+	padding-right: 5px;
 }
 
-#medialist-page .list_table_controls {
-	width: 100%;
+#medialist-page .media-image {
+	vertical-align:top; 
+	white-space:normal;
 }
 
-#branches-page ol {
-	margin-left: 40px;
-	font-size: 14px;
+#medialist-page p {
+	text-align: center;
 }
 
-#surnlist {
-	margin-bottom: 20px;
+.list_table_controls td {
+	min-width: 40px;
+	text-align: center;
 }
 
-[dir=rtl] #branches-page ol {
-	margin-right: 40px;
+/* ======== medialist.php ==== */
+.makeMenu li ul {
+	border: thin solid #AAA;
+	position: absolute;
+	margin:0;
 }
 
-.list_table_controls td {
-	min-width: 40px;
+.makeMenu, .makeMenu li ul {
 	padding: 1px;
-	text-align: center;
 }
 
-#branches-page p {
-	margin: 10px;
+.makeMenu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
 }
 
-/* ============== medialist.php ======================= */
 .lb-menu {
 	display: inline-block;
 	margin: 0;
 }
 
 .lb-menu ul {
+	display: block;
 	list-style-type: none;
+	margin: 0;
 }
 
 .lb-menu > li {
@@ -2690,6 +1139,10 @@ dt {
 	top: 0;
 }
 
+.lb-menu li:first-child {
+	padding-left: 0;
+}
+
 .lb-menu > li ul {
 	display: none;
 }
@@ -2704,24 +1157,16 @@ dt {
 }
 
 .lb-menu li a {
-	padding-top: 24px;
+	padding: 24px 10px 1px 5px;
 }
 
 .lb-menu li li a {
-	padding: 1px 10px 1px 5px;
-}
-
-.makeMenu.lb-menu li:before {
-	content: "";
-}
-
-.lb-image_edit,
-.lb-image_link {
-	padding-right: 5px;
+	background-color: #fff;
+	padding: 5px 10px 5px 5px;
 }
 
-.lb-menu > li:hover > ul {
-	top: 28px !important;
+.lb-menu li {
+	border: 0;
 }
 
 [dir=rtl] .lb-menu > li {
@@ -2740,50 +1185,19 @@ dt {
 	background: url(images/image_view.png) no-repeat 50% 20%;
 }
 
-/* ============== login.php ======================= */
-#login-form a:hover {
-	color: red;
-}
-
-#login-form div,
-#login-form div a,
-#new_passwd_form div,
-#register-form div,
-#verify-form div {
-	color: #039;
-	margin: auto;
-	padding: 5px;
+/* login.php */
+#login-register-page h2 {
 	text-align: center;
 }
 
-#login-form label input,
-#new_passwd_form label input,
-#verify-form input {
-	margin: 0 10px;
-	width: 140px;
-}
-
-#login-form label,
-#new_passwd_form label,
-#verify-form label {
-	display: block;
-	text-align: right;
-}
-
-#login-form,
-#new_passwd_form,
-#register-form,
-#verify-form {
-	background-color: #95b8e0;
-	border-radius: 3px;
-	display: inline-block;
-	margin: 10px auto 0;
-	padding: 5px;
+#login-register-page .warning {
+	margin: 20px auto;
+	text-align: center;
 }
 
 #login-register-page .back {
+	font-weight: bold;
 	font-size: 14px;
-	font-weight: 700;
 	text-align: center;
 }
 
@@ -2794,40 +1208,76 @@ dt {
 }
 
 #login-register-page .confirm p {
+	font-weight: bold;
 	font-size: 14px;
-	font-weight: 700;
 }
 
 #login-register-page .confirm p + p {
 	font-size: 12px;
-	font-weight: 400;
+	font-weight: normal;
 }
 
-#login-register-page .warning {
+#login-text,
+#register-text,
+#user-verify {
 	margin: 20px auto;
-	text-align: center;
+	width: 610px;
+	text-align: justify;
 }
 
-#login-register-page h2,
 #login-box,
-#register-box,
-#register-form div#registration-submit {
+#register-box {
 	text-align: center;
 }
 
-#login-text,
-#register-text,
-#user-verify {
-	margin: 20px auto;
-	text-align: justify;
-	width: 610px;
+#login-form,
+#new_passwd_form,
+#register-form,
+#verify-form {
+	background-color: #95b8e0;
+	border: 1px solid #999;
+	display: inline-block;
+	margin: 10px auto 0;
+	padding: 5px;
+}
+
+#register-form,
+#verify-form {
+	width: 440px;
+}
+
+#login-form div,
+#login-form div a,
+#new_passwd_form div,
+#register-form div,
+#verify-form div {
+	margin: auto;
+	padding: 5px;
+	text-align: center;
+}
+
+#login-form label,
+#new_passwd_form label,
+#verify-form label {
+	display: block;
+	text-align: right;
+}
+
+#login-form label input,
+#new_passwd_form label input,
+#verify-form input {
+	width: 140px;
+	margin: 0 10px;
+}
+
+#register-form p,
+#verify-form p {
+	text-align: left;
 }
 
 #new_passwd_form h4,
 #register-form h4 {
-	color: #039;
-	font-weight: 400;
-	margin: 5px;
+	font-weight: normal;
 	text-align: center;
 }
 
@@ -2839,8 +1289,10 @@ dt {
 #register-form label input,
 #register-form label select,
 #register-form textarea {
-	margin: 0 10px;
+background-color: #fff;
 	width: 220px;
+	margin: 0 10px;
+	padding: 3px;
 }
 
 #register-form label select {
@@ -2852,10 +1304,14 @@ dt {
 	vertical-align: top;
 }
 
+#register-form div#registration-submit {
+	text-align: center;
+}
+
 .login_block_block #login-form,
 .login_block_block #new_passwd_form {
-	background: none;
 	border: 0;
+	background: none;
 }
 
 [dir=rtl] #login-form label,
@@ -2865,10 +1321,24 @@ dt {
 	text-align: left;
 }
 
-/* ==== reportengine.php ===== */
+[dir=rtl] #register-form div,
+[dir=rtl] #verify-form div {
+	text-align: left;
+}
+
+[dir=rtl] #register-form p, 
+[dir=rtl] #verify-form p {
+	text-align: right;
+}
+
+/* --- reportengine.php --- */
+#reportengine-page table {
+	margin: 20px auto;
+}
+
 #reportengine-page .report-type {
-	margin: auto;
 	overflow: hidden;
+	margin: auto;
 	width: 180px;
 }
 
@@ -2882,94 +1352,72 @@ dt {
 	text-align: center;
 }
 
-#reportengine-page table {
-	margin: 20px auto;
-}
-
-.block .itr,
-#family-table .itr,
-#ancestry_chart .itr,
-#descendancy_chart .itr,
-#familybook_chart .itr,
-#hourglass_chart .itr,
-#relatives_content .itr {
-	position: relative;
-	top: 0;
-}
-
+/* styles for popup menus */
 .itr {
+	position: relative;
 	line-height: 1.5;
-	position: absolute;
 }
 
-.itr:hover .popup {
-	display: block;
+.popup {
 	position: absolute;
+	top: 20px;
 	right: 0;
-	width: 12em;
+	left: auto;
+	visibility: hidden;
+	opacity: 0;
+	transition: visibility 0s ease .25s,opacity .25s ease;
 	z-index: 9999;
+	-webkit-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	-moz-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
 }
 
-.popup {
-	display: none;
+[dir=rtl] .popup {
+	left: 0;
+	right: auto;
 }
 
 .popup ul {
-	background-image: none !important;
-	font-size: 9px;
+	white-space: nowrap;
 	list-style: none;
 	margin: 0;
 	padding: 0 10px;
+	font-size: smaller;
 }
 
-.popup li {
-	padding: 1px 5px;
+.popup > ul {
+	padding: 2px 10px;
 }
 
-.popup li span {
+.popup li .NAME {
 	padding: 0 5px;
 }
 
-.popup li ul,
-.popup li ul li,
-.popup li span span {
-	padding: 0;
+.itr:hover .popup {
+	visibility: visible;
+	opacity: 1;
+	transition-delay: 0s;
 }
 
-.itr:hover .popup {
-	display: block;
-	position: absolute;
-	width: 12em;
-	right: 0;
-	z-index: 9999;
+/* styles for FindFacts pop-up */
+#layDefinedTags,
+#tabDefinedTagsShow {
+	width: 450px;
 }
 
-[dir=rtl] .itr:hover .popup {
-	left: 0;
-	right: auto;
+#tabDefinedTags {
+	width: 430px;
 }
 
 #layDefinedTags {
-	height: 285px;
 	margin-left: auto;
 	margin-right: auto;
+	height: 285px;
 	overflow: auto;
 }
 
-/* FindFacts pop-up */
-#layDefinedTags,
-#tabDefinedTagsShow {
-	width: 450px;
-}
-
 #tabDefinedTags {
 	border-collapse: collapse;
-	width: 430px;
-}
-
-#tabDefinedTags tbody th {
-	font-weight: 700;
-	text-align: left;
 }
 
 #tabDefinedTags th,
@@ -2979,6 +1427,11 @@ dt {
 	padding: 3px;
 }
 
+#tabDefinedTags tbody th {
+	text-align: left;
+	font-weight: bold;
+}
+
 #tabDefinedTags tr.sel {
 	background-color: #d1d9ef;
 	color: #888;
@@ -2989,49 +1442,416 @@ dt {
 	color: #888;
 }
 
-#tabDefinedTagsShow td,
-#tabAction td {
-	text-align: center;
+#tabDefinedTagsShow {
+	margin-left: auto;
+	margin-right: auto;
+}
+
+#tabDefinedTagsShow td {
 	width: 50%;
+	text-align: center;
+}
+
+#tabFilterAndCustom {
+	margin-left: auto;
+	margin-right: auto;
 }
 
-#tabDefinedTagsShow,
-#tabFilterAndCustom,
 #tabAction {
 	margin-left: auto;
 	margin-right: auto;
 }
 
-.faq_italic {
-	font-size: 12px;
-	font-style: italic;
-	font-weight: 700;
-	padding: 0 10px;
+#tabAction td {
+	width: 50%;
+	text-align: center;
 }
 
-.faq_top,
-.faq_edit {
-	float: right;
+/* ======== List styles ====== */
+.source-list,
+.note-list,
+.repo-list,
+.media-list,
+.indi-list,
+.fam-list {
+	visibility: hidden;
 }
 
-div.faq_body {
-	clear: both;
-	margin: 1em 0;
-	padding: 1em;
+.surname-list,
+.givn-list {
+	margin: 5px auto;
 }
 
-div.faq_title {
-	background-color: #eee;
-	font-weight: 700;
-	margin: 1em 0;
-	padding: .25em;
+.source-list table,
+.note-list table,
+.repo-list table,
+.media-list table,
+.indi-list table,
+.fam-list table {
+	width: 100%;
+}
+
+.source-list td,
+.note-list td,
+.repo-list td,
+.media-list td,
+.indi-list td,
+.fam-list td,
+.recent_changes_block td,
+.upcoming_events_block td,
+.surname-list td,
+.givn-list td {
+	padding: 2px 5px;
+}
+
+.surname-list td {
+	vertical-align: top;
+}
+
+.indi-list .stats,
+.fam-list .stats {
+	margin: 0 auto;
+	width: auto;
+}
+
+.source-list th,
+.note-list th,
+.repo-list th,
+.media-list th,
+.indi-list th,
+.fam-list th,
+.recent_changes_block th,
+.upcoming_events_block th,
+.todays_events_block th,
+.todo_block th,
+.yahrzeit_block th,
+.surname-list th,
+.givn-list th {
+	cursor: pointer;
+	font-weight: 600;
+	padding: 2px 4px;
+	white-space: nowrap;
+}
+
+.source-list th:last-child,
+.note-list th:last-child,
+.repo-list th:last-child {
+	margin: 0 -2px 1px 1px;
+	padding: 3px 0 4px;
+	width: 24px;
+}
+
+.givn-list th {
+	cursor: pointer;
+	white-space: nowrap;
+	padding: 2px;
+	text-align: center;
+}
+
+#source-details h2,
+#sourcelist-page h2,
+#note-details h2,
+#notelist-page h2,
+#repo-details h2,
+#repolist-page h2,
+#media-details h2,
+#medialist-page h2,
+#statistics-page h2 {
+	margin-bottom: 20px;
+	text-align: center;
+}
+
+#source-tabs,
+#note-tabs,
+#repo-tabs,
+#media-tabs {
+	margin: auto;
+	visibility: hidden;
+	width: 80%;
+}
+
+#statistics_chart {
+	margin: auto;
+	visibility: hidden;
+	width: 90%;
+}
+
+#source-edit,
+#note-edit,
+#repo-edit,
+#media-edit {
+	overflow-x: auto;
+}
+
+.media-list td img {
+	display: block;
+	height: 40px;
+	width: auto;
+	margin: 3px auto;
+}
+
+.filtersH,
+.filtersF {
+	margin: 4px;
+}
+
+.filtersH img {
+	margin-bottom: 2px;
+}
+
+.loading-image {
+	background: transparent url(images/loading.gif) 50% 50% no-repeat;
+	height: 50px;
+	margin: 50px;
+}
+
+.list-charts {
+	text-align: center;
+}
+
+#search-result-tabs,
+#places-tabs {
+	margin: auto;
 	width: 98%;
+	visibility: hidden;
+}
+
+#search-result-tabs h3 {
+	text-align: center;
+}
+
+#searchAccordion-indi,
+#searchAccordion-fam,
+#searchAccordion-source,
+#searchAccordion-note {
+	margin: auto;
+	width: 99%;
+}
+
+#place-hierarchy h2,
+#place-hierarchy h4 {
+	text-align: center;
+}
+
+[dir=rtl] .source-list th:last-child,
+[dir=rtl] .note-list th:last-child,
+[dir=rtl] .repo-list th:last-child {
+	margin: 0 1px 1px -2px;
+}
+
+/* ======== Block styles ===== */
+#index_main_blocks {
+	clear: none;
+	width: 66%;
+	float: left;
+}
+
+#index_small_blocks {
+	clear: none;
+	width: 33%;
+	float: right;
+}
+
+#index_full_blocks {
+	clear: none;
+	width: 100%;
+}
+
+[dir=rtl] #index_main_blocks {
+	float: right;
+}
+
+[dir=rtl] #index_small_blocks {
+	float: left;
+}
+
+.small_inner_block {
+	max-height: 200px;
+	overflow: auto;
+}
+
+.normal_inner_block {
+	overflow: auto;
+}
+
+.block {
+	color: #000;
+	margin-bottom: 5px;
+	padding: 1px;
+	vertical-align: top;
+}
+
+.blockcontent {
+	border: solid #999 1px;
+	margin:  0 2px 10px 0;
+	overflow: auto;
+	padding: 5px;
+}
+
+.blockcontent .list_table {
+	border-spacing: 0;
+	border: solid #999 1px;
+	border-right: 0;
+}
+
+.blockcontent .list_value,
+.blockcontent .list_value_wrap {
+	border: 0;
+	border-top: solid #999 1px;
+	border-right: solid #999 1px;
+}
+
+.blockheader {
+	width: 100%;
+	padding: 0;
+	margin: 0;
+	border-collapse: collapse;
+}
+
+.blockh1 {
+	background: url(images/left1B.png) no-repeat;
+	height: 24px;
+	width: 26px;
+	padding: 0;
 }
 
-/* FAQ table */
+.blockh2 {
+	background: url(images/left2.png) repeat-x;
+	font-size: 13px;
+	font-weight: bold;
+	padding: 0;
+}
+
+.blockh3 {
+	background: url(images/left3.png) no-repeat;
+	height: 24px;
+	width: 8px;
+	padding: 0;
+}
+
+.blockhc {
+	padding: 3px 3px 0;
+}
+
+.blockhc img {
+	padding-right: 3px;
+}
+
+[dir=rtl] .blockh1 {
+	background-image: url(images/right1B.png);
+}
+
+[dir=rtl] .blockh3 {
+	background-image: url(images/right3.png);
+}
+
+[dir=rtl] .blockhc {
+	padding: 3px 0 0 3px;
+}
+
+[dir=rtl] .blockhc img {
+	padding-left: 3px;
+}
+
+/* end Block styles */
+
+#main_select,
+#available_select,
+#right_select {
+	min-width: 150px;
+}
+
+.user_welcome_block table,
+.gedcom_block_block table {
+	margin: auto;
+}
+
+.user_welcome_block td,
+.gedcom_block_block td {
+	width: 33%;
+	text-align: center;
+	vertical-align: top;
+}
+
+/* Random picture block */
+#random_picture {
+	text-align: center;
+}
+
+#random_picture_box {
+	width: 100%;
+}
+
+/* ==== Favourites block ===== */
+.blockcontent .person_box_template .details2 {
+	min-height: 40px;
+}
+
+.blockcontent [class*='box-style2'] {
+	margin: 5px 0;
+}
+
+.add_fav_head {
+	font-weight: 900;
+	margin: 5px 0;
+}
+
+.add_fav_head i {
+	margin: 0 5px 1px;
+}
+
+.add_fav_ref label {
+	display: inline-block;
+	min-width: 100px;
+}
+
+.add_fav_ref label:after {
+	content: ":";
+}
+
+.add_fav_ref input {
+	margin: 0 5px;
+}
+
+/* === Who is online block === */
+.logged_in_list {
+	margin: 5px 0 0;
+	padding: 0;
+	line-height: 20px;
+}
+
+/* Statistics block */
+.gedcom_stats_block table td {
+	vertical-align: top;
+}
+
+.gedcom_stats_block table td td {
+	vertical-align: middle;
+}
+
+.gedcom_stats_block td .stats_value {
+	text-align: center;
+}
+
+/* ==== Theme select block === */
+.theme_form ul {
+	margin: -10px auto;
+}
+
+.theme_form li {
+	visibility: hidden;
+}
+
+.theme_form li ul li {
+	display: inline-block;
+	padding: 10px;
+	visibility: visible;
+}
+
+/* ==== FAQ table styles ===== */
 table.faq {
 	background-color: #eee;
-	margin: 5px 0 15px 5px;
+	margin: 5px 0 50px 5px;
 	width: 98%;
 }
 
@@ -3039,90 +1859,88 @@ table.faq tr.odd td {
 	background-color: #eee;
 }
 
-[dir=rtl] .faq_top {
-	float: left;
+div.faq_title {
+	background-color: #eee;
+	margin: 1em 0;
+	padding: .25em;
+	font-weight: bold;
+	width: 98%;
 }
 
-[dir=rtl] .faq_edit {
-	float: left;
+div.faq_body {
+	clear: both;
+	padding: 0 1em;
 }
 
-.place {
-	padding-top: 5px;
+.faq_italic {
+	font-style: italic;
+	font-weight: bold;
+	font-size: 90%;
+	padding: 0 10px;
 }
 
-.logo {
-	text-align: center;
+.faq_top {
+	float: right;
 }
 
-ul.clist {
-	list-style-image: none;
-	text-decoration: none;
-	color: #000;
-	margin: 0;
+.faq_edit {
+	float: right;
 }
 
-/* Find special characters */
-.largechars {
-	font-family: monospace;
-	font-size: 200%;
+[dir=rtl] .faq_top {
+	float: left;
 }
 
-/* edit, copy, delete links */
+[dir=rtl] .faq_edit {
+	float: left;
+}
+
+/* === Positioning edit, copy, delete links === */
+/* General use */
 .editfacts {
 	clear: left;
 	padding-top: 15px;
 }
 
+/* a container for the following three links */
+
 .editlink,
 .copylink,
 .deletelink {
 	float: left;
 }
 
-span.link_text {
-	display: none;
-}
-
 [dir=rtl] .editlink,
 [dir=rtl] .copylink,
 [dir=rtl] .deletelink {
 	float: right;
 }
 
-/* ==== Indi header ==== */
+span.link_text {
+	display: none;
+}
 
-#dates {
-	color: #333;
+/* ======== Indi header ====== */
+.field .editlink,
+.field .deletelink,
+.field .copylink {
 	float: right;
 }
 
-#sex,
-dd .editlink,
-dd .deletelink {
-	float: right;
+[dir=rtl].field .editlink,
+[dir=rtl].field .deletelink {
+	float: left;
 }
 
 #indi_header {
-	border-radius: 3px;
 	overflow: hidden;
-	margin: 0 2px 5px;
-	width: 100%;
-}
-
-#indi_header a {
-	color: #337;
-	font-weight: 400;
-}
-
-#indi_header a:hover {
-	color: red;
+	margin: 0 0 5px;
 }
 
 #indi_header h3 {
 	color: #006;
 	font-size: 90%;
-	font-weight: 700;
+	font-weight: bold;
 	margin: 0;
 	padding: 0 10px 0 30px;
 	text-align: left;
@@ -3130,30 +1948,40 @@ dd .deletelink {
 	position: relative;
 }
 
+#indi_header .name_one {
+	font-size: 1.5em;
+}
+
 #indi_header h3 .details1 {
-	font-size: 1em;
+	font-size: 1.0em;
+}
+
+#indi_header h3.person_box,
+#indi_header h3.person_boxF,
+#indi_header h3.person_boxNN {
+	background-color: #acf;
+	border: 1px solid #8fbcff;
 }
 
 #indi_header h3 .header_age {
+	padding: 5px 0 5px 5px;
 	float: right;
+	font-weight: normal;
 	font-size: 65%;
-	font-weight: 400;
-	padding: 5px 0 5px 5px;
 }
 
 #indi_header h3 a {
 	display: inline;
 }
 
-#indi_header .name_one {
-	font-size: 1.5em;
+#indi_header a {
+	color: #337;
+	font-size: 0.75em;
+	font-weight: normal;
 }
 
-#indi_header h3.person_box,
-#indi_header h3.person_boxF,
-#indi_header h3.person_boxNN {
-	background: #acf;
-	border: 1px solid #8fbcff;
+#indi_header a:hover {
+	color: #f00;
 }
 
 #indi_mainimage {
@@ -3162,32 +1990,57 @@ dd .deletelink {
 }
 
 #header_accordion1 {
+	padding: 0 10px 0 0;
 	overflow: hidden;
 }
 
+[dir='rtl'] #header_accordion1 {
+	padding: 0 0 0 10px;
+}
+
 #header_accordion1 .indi_name_details {
 	margin: 0;
 	overflow: hidden;
 	padding: 5px;
 }
 
-#indi_header a.warning {
-	color: red;
-	font-size: 1em;
-}
-
 .indi_name_details dt:after {
 	content: ":";
 }
 
 .indi_name_details .name1 {
 	font-weight: normal;
+	padding-top: 5px;
+	font-size: inherit;
+}
+
+#indi_header a.warning {
+	color: #f00;
+	font-size: 1em;
 }
 
 #indi_note {
 	margin: 0 0 5px;
 }
 
+.indi_table {
+	clear: left;
+}
+
+#sex {
+	float: right;
+}
+
+#dates {
+	color: #333;
+	float: right;
+}
+
+dd .editlink,
+dd .deletelink {
+	float: right;
+}
+
 #indi_note .fact_NOTE {
 	float: left;
 	margin: 0 5px 0 0;
@@ -3225,25 +2078,9 @@ dd .deletelink {
 	padding: 3px;
 }
 
-.markdown ol,
-.markdown ul {
-	margin: 12px 0;
-}
-
-#main_name {
-	color: #555;
-	float: left;
-	font-size: 2em;
-	font-weight: 700;
-	margin: 10px;
-}
-
-.indi_table {
-	clear: left;
-}
-
-[dir=rtl] #dates {
-	float: left;
+[dir=rtl] #indi_header h3 {
+	padding: 0 30px 0 10px;
+	text-align: right;
 }
 
 [dir=rtl] #indi_header h3 .header_age {
@@ -3251,43 +2088,39 @@ dd .deletelink {
 	float: left;
 }
 
-[dir=rtl] #sex {
-	float: left;
-}
-
-[dir=rtl] dd .editlink,
-[dir=rtl] dd .deletelink {
-	float: left;
+[dir=rtl] #indi_mainimage {
+	float: right;
 }
 
-[dir=rtl] #indi_header {
+[dir=rtl] #indi_note .fact_NOTE {
 	float: right;
+	margin: 0 0 0 10px;
 }
 
-[dir=rtl] #indi_header h3 {
-	padding: 0 30px 0 10px;
-	text-align: right;
+[dir=rtl] .indi_table {
+	clear: right;
 }
 
-[dir=rtl] #indi_mainimage {
-	float: right;
-	padding: 0 0 0 10px;
+[dir=rtl] #sex {
+	float: left;
 }
 
-[dir=rtl] #indi_note .fact_NOTE {
-	float: right;
-	margin: 0 0 0 10px;
+[dir=rtl] #dates {
+	float: left;
 }
 
-[dir=rtl] #main_name {
-	float: right;
+[dir=rtl] dd .editlink,
+[dir=rtl] dd .deletelink {
+	float: left;
 }
 
-[dir=rtl] .indi_table {
-	clear: right;
+.hit-counter {
+	background: #000;
+	color: #fff;
+	font-weight: bold;
 }
 
-/* General sprite */
+/* ======= General sprite ==== */
 .male_gender,
 .female_gender,
 .unknown_gender,
@@ -3295,25 +2128,7 @@ dd .deletelink {
 .copyicon,
 .deleteicon {
 	display: block;
-	background: transparent url(images/general_sprite.png) no-repeat left 0;
-}
-
-.editicon {
-	background-position: -40px -32px;
-	width: 24px;
-	height: 16px;
-}
-
-.copyicon {
-	background-position: -70px -32px;
-	width: 24px;
-	height: 16px;
-}
-
-.deleteicon {
-	background-position: -100px -32px;
-	width: 24px;
-	height: 16px;
+	background: url(images/general_sprite.png) no-repeat left 0;
 }
 
 .female_gender {
@@ -3334,7 +2149,25 @@ dd .deletelink {
 	height: 30px;
 }
 
-/* ==== Indi tabs ==== */
+.editicon {
+	background-position: -40px -32px;
+	width: 24px;
+	height: 16px;
+}
+
+.copyicon {
+	background-position: -70px -32px;
+	width: 24px;
+	height: 16px;
+}
+
+.deleteicon {
+	background-position: -100px -32px;
+	width: 24px;
+	height: 16px;
+}
+
+/* ======== Indi tabs ======== */
 /* Facts & Events tab */
 #personal_facts_content .fact_NOTE,
 #personal_facts_content .fact_SOUR,
@@ -3375,7 +2208,7 @@ dd .deletelink {
 	padding-right: 5px;
 }
 
-/* Album tab */
+/* ======== Album tab =========*/
 .album-list {
 	list-style-type: none;
 }
@@ -3408,53 +2241,12 @@ dd .deletelink {
 	width: 100%;
 }
 
-/* ========= jquery-ui.custom.css changes ============ */
+/* === jquery-ui.css changes === */
 .ui-accordion .ui-accordion-content {
-	margin-top: 1px;
-	overflow: visible;
-	padding: 0 5px;
+	border: 0;
 	position: relative;
-}
-
-.ui-accordion .ui-accordion-header {
-	margin-top: 0;
-}
-
-.ui-accordion .ui-accordion-header a {
-	padding: 2px;
-	text-align: center;
-}
-
-.ui-accordion .ui-accordion-header {
-	margin-top: 0;
-	text-align: center;
-}
-
-.ui-helper-reset {
-	line-height: 1.5;
-}
-
-.ui-state-active a:link {
-	color: #fff;
-}
-
-.ui-state-active,
-.ui-widget-content .ui-state-active {
-	background: #acf;
-	border: 0 solid #8fbcff;
-	color: #000;
-	font-weight: 400;
-	outline: none;
-}
-
-.ui-state-default a:link,
-.ui-state-hover a,
-.ui-state-hover a:hover {
-	color: #000;
-}
-
-.ui-state-highlight a {
-	color: red;
+	padding: 5px 5px 0 5px;
+	overflow: visible;
 }
 
 .ui-tabs,
@@ -3462,20 +2254,18 @@ dd .deletelink {
 	padding: 0;
 }
 
-.ui-tabs .ui-tabs-nav li a span {
-	padding: .5em 1em;
-}
-
-.ui-tabs .ui-tabs-panel {
-	padding: 1em 0;
+#sidebarAccordion .ui-accordion-header {
+	text-align: center;
 }
 
 .ui-widget-header {
-	border: 1px solid #fff;
+	padding: 3px;
 }
 
-span.link_text {
-	display: none;
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-default a:link {
+	color: #000;
 }
 
 .ui-menu .ui-menu-item a {
@@ -3484,20 +2274,15 @@ span.link_text {
 
 .ui-menu .ui-menu-item a.ui-state-hover,
 .ui-menu .ui-menu-item a.ui-state-active {
-	color: red;
-}
-
-[dir=rtl] .ui-accordion .ui-accordion-header .ui-icon {
-	right: 0.5em;
+	color: #f00;
 }
 
-[dir=rtl] .ui-tabs {
-	direction: rtl;
+.ui-helper-reset {
+	line-height: 1.5;
 }
 
-[dir=rtl] .ui-tabs .ui-tabs-nav li.ui-tabs-selected,
-[dir=rtl] .ui-tabs .ui-tabs-nav li.ui-state-default {
-	float: right;
+[dir=rtl] .ui-accordion .ui-accordion-header .ui-icon {
+	right: 0.5em;
 }
 
 [dir=rtl] .ui-dialog-title {
@@ -3509,70 +2294,41 @@ span.link_text {
 	right: auto;
 }
 
-/* ==== jQuery over-rides ==== */
-
-#loading {
-	text-align: center;
-}
-
-.DataTables_sort_wrapper {
-	margin: 0 20px;
-	position: relative;
+/* === jQuery.datatable styling general over-rides === */
+.odd {
+	background-color: #d9eaf7;
 }
 
-.DataTables_sort_wrapper span {
-	left: 0;
-	margin-left: -20px;
-	margin-top: -8px;
-	position: absolute;
-	top: 50%;
+.even {
+	background-color: #fafafa;
 }
 
 .css_right {
 	float: left;
 }
 
-.dataTables_filter {
-	float: right;
-	margin: 4px;
-}
-
-.dataTables_length {
-	float: right;
-}
-
-.dataTables_length select,
-.dataTables_filter input {
-	font-size: 11px;
-	padding: 1px;
+.fg-button {
+	padding: 2px 6px;
 }
 
-.dataTables_paginate,
-.dataTables_processing,
-.dataTables_info {
+.dataTables_paginate {
 	float: left;
-	margin: 5px;
+	margin-bottom: 3px;
 }
 
-.dt-clear {
-	clear: both;
-}
-
-.fg-button {
-	padding: 2px 6px;
-}
-
-.fg-toolbar button {
-	margin: 2px;
-	padding: 1px 6px;
+.dataTables_processing {
+	float: left;
 }
 
-.odd {
-	background-color: #d9eaf7;
+.dataTables_filter {
+	float: right;
+	font-weight: normal;
 }
 
-.even {
-	background-color: #fafafa;
+.dataTables_info {
+	float: left;
+	font-weight: normal;
+	padding: 4px;
 }
 
 .recent_changes_block .dataTables_info,
@@ -3590,7 +2346,43 @@ span.link_text {
 
 .upcoming_events_block button,
 .todays_events_block button {
-	margin: 5px 20px;
+	margin: 0 20px;
+}
+
+.dataTables_length {
+	float: right;
+	font-weight: normal;
+}
+
+.dataTables_length select,
+.dataTables_filter input {
+	font-size: 11px;
+	padding: 1px;
+}
+
+.dt-clear {
+	clear: both;
+}
+
+#loading {
+	text-align: center;
+}
+
+.DataTables_sort_wrapper {
+	position: relative;
+	margin: 0 20px;
+}
+
+.DataTables_sort_wrapper span {
+	left: 0;
+	margin-left: -20px;
+	margin-top: -8px;
+	position: absolute;
+	top: 50%;
+}
+
+.dataTables_wrapper {
+	margin-bottom: 10px;
 }
 
 [dir=rtl] .css_right {
@@ -3627,221 +2419,44 @@ span.link_text {
 	margin-right: -20px;
 }
 
-/* ==== List styles ===== */
-
-#firstfocus {
-	font-size: 12px;
-	width: 330px;
-}
-
-#search-result-tabs h3,
-#place-hierarchy h2,
-#place-hierarchy h4 {
-	text-align: center;
-}
-
-#search-result-tabs,
-#places-tabs {
-	margin: auto;
-	visibility: hidden;
-	width: 98%;
-}
-
-#searchAccordion-indi,
-#searchAccordion-fam,
-#searchAccordion-source,
-#searchAccordion-note {
-	margin: auto;
-	width: 99%;
-}
-
-#source-details h2,
-#sourcelist-page h2,
-#note-details h2,
-#notelist-page h2,
-#repo-details h2,
-#repolist-page h2,
-#media-details h2,
-#medialist-page h2,
-#statistics-page h2 {
-	margin-bottom: 20px;
-	text-align: center;
-}
-
-#source-edit,
-#note-edit,
-#repo-edit,
-#media-edit {
-	overflow-x: auto;
-}
-
-#source-tabs,
-#note-tabs,
-#repo-tabs,
-#media-tabs {
-	margin: auto;
-	visibility: hidden;
-	width: 80%;
-}
-
-#statistics_chart {
-	margin: auto;
-	visibility: hidden;
-	width: 90%;
-}
-
-.filters .ui-state-default {
-	margin: 0 2px;
-	padding: 2px;
-}
-
-.filtersH img {
-	margin-bottom: 2px;
-}
-
-.filtersH,
-.filtersF {
-	margin: 4px;
-}
-
-.givn-list th {
-	cursor: pointer;
-	padding: 2px;
-	text-align: center;
-	white-space: nowrap;
-}
-
-.indi-list .stats,
-.fam-list .stats {
-	margin: 0 auto;
-	width: auto;
-}
-
-.indi-list td,
-.fam-list td {
-	color: #555;
-}
-
-.loading-image {
-	background: transparent url(images/loading.gif) 50% 50% no-repeat;
-	height: 50px;
-	margin: 50px;
-}
-
-.media-list td img {
-	display: block;
-	height: 40px;
-	width: auto;
-	margin: 3px auto;
-}
-
-.source-list table,
-.note-list table,
-.repo-list table,
-.media-list table,
-.indi-list table,
-.fam-list table {
+/* ======= Sidebar setup ===== */
+#main {
+	min-width: 600px;
 	width: 100%;
+	display: table;
+	table-layout: fixed;
 }
 
-.source-list td,
-.note-list td,
-.repo-list td,
-.media-list td,
-.indi-list td,
-.fam-list td,
-.recent_changes_block td,
-.upcoming_events_block,
-.surname-list td,
-.givn-list td {
-	padding: 2px 5px;
-}
-
-.source-list th,
-.note-list th,
-.repo-list th,
-.media-list th,
-.indi-list th,
-.fam-list th,
-.recent_changes_block th,
-.upcoming_events_block th,
-.todays_events_block th,
-.todo_block th,
-.yahrzeit_block th,
-.surname-list th,
-.givn-list th {
-	cursor: pointer;
-	white-space: nowrap;
-}
-
-.source-list th:last-child,
-.note-list th:last-child,
-.repo-list th:last-child {
-	margin: 0 -2px 1px 1px;
-	padding: 3px 0 4px;
-	width: 24px;
-}
-
-.source-list,
-.note-list,
-.repo-list,
-.media-list,
-.indi-list,
-.fam-list {
-	margin: 5px auto;
-	visibility: hidden;
-	width: 98%;
-}
-
-.surname-list td {
-	vertical-align: top;
-}
-
-.surname-list,
-.givn-list {
-	margin: 5px auto;
-}
-
-[dir=rtl] .source-list th:last-child,
-[dir=rtl] .note-list th:last-child,
-[dir=rtl] .repo-list th:last-child {
-	margin: 0 1px 1px -2px;
-}
-
-/* ==== Sidebar ===== */
 #indi_left {
 	display: table-cell;
 }
 
-#main {
-	min-width: 600px;
-	width: 100%;
-	padding: 5px 2px 0;
-	display: table;
-	table-layout: fixed;
+#indi_left .ui-tabs-panel {
+	padding: 0;
+}
+
+#indi_left .ui-tabs-nav {
+	margin: 0 2px;
 }
 
 #tabs {
 	background-color: #fff;
 	border-color: #8fbcff;
-	overflow: visible;
 	width: 100%;
+	overflow: visible;
 }
 
 [dir=rtl] #tabs {
 	float: right;
 }
 
+/* sidebar */
 #sidebar {
 	width: 20%;
 	display: table-cell;
 	vertical-align: top;
 }
 
-#sidebarAccordion {
-	border: 1px solid #8fbcff;
-}
-
 #separator {
 	display: table-cell;
 	width: 2.5em;
@@ -3853,8 +2468,8 @@ span.link_text {
 #separator:after {
 	position: absolute;
 	top: 0;
-	left: auto;
 	right: 0;
+	left: auto;
 	width: 10px;
 	height: 99999px;
 	content: "";
@@ -3864,8 +2479,8 @@ span.link_text {
 }
 
 [dir=rtl] #separator:after {
-	left: 0;
 	right: auto;
+	left: 0;
 }
 
 .separator-hidden:after,
@@ -3878,20 +2493,33 @@ span.link_text {
 	background: #acf url(images/general_sprite.png) no-repeat -1px 100px;
 }
 
-/* ==== Sidebar content items ==== */
+/* Sidebar content items */
 /* Family navigator */
 #sb_content_family_nav {
 	padding: 0;
 }
 
 #sb_family_nav_content {
-	margin-top: 8px;
+	margin-top: 0px;
+}
+
+.nam a:hover {
+	color: #f00;
+}
+
+.nav_content {
+	width: 100%;
+	padding: 0;
 }
 
 .nav_content .facts_label {
 	width: 75px;
 }
 
+#sb_family_nav_content .clist {
+	margin: 0;
+}
+
 .famnav_title {
 	font-weight: bold;
 	display: block;
@@ -3900,9 +2528,6 @@ span.link_text {
 
 .flyout {
 	left: 40px;
-	padding: 3px;
-	background-color: #ecf5ff;
-	border: 1px solid #ccc;
 }
 
 [dir=rtl] .flyout {
@@ -3917,7 +2542,7 @@ span.link_text {
 }
 
 .flyout2 {
-	font-weight: 700;
+	font-weight: bold;
 }
 
 .flyout3 {
@@ -3929,18 +2554,9 @@ span.link_text {
 	color: #f00;
 }
 
-.nam a:hover {
-	color: red;
-}
-
-.nav_content {
-	padding: 0;
-	width: 100%;
-}
-
-/* Descendancy */
+/* Sidebar*/
 #sb_content_descendancy {
-	margin-top: 5px;
+	margin-top: 0;
 }
 
 #sb_desc_content {
@@ -3953,6 +2569,10 @@ span.link_text {
 	margin: 0;
 }
 
+.sb_desc_indi_li {
+	list-style-type: none;
+}
+
 .desc_tree_div {
 	display: none;
 }
@@ -3964,11 +2584,6 @@ span.link_text {
 	margin-right: 0;
 }
 
-.sb_desc_indi_li {
-	list-style-type: none;
-	white-space: nowrap;
-}
-
 [dir=rtl] #sb_desc_content {
 	margin-right: 3px;
 }
@@ -3978,21 +2593,19 @@ span.link_text {
 	margin-left: 0;
 }
 
-/* Individuals, Families */
+/* Individuals and Families */
 #sb_content_individuals,
 #sb_content_families {
-	margin-top: 5px;
+	margin-top: 0;
 }
 
-.name_tree_div {
-	display: none;
+.sb_indi_surname_li,
+.sb_fam_surname_li {
+	list-style-image: url(images/plus.png);
 }
 
-.name_tree_div li,
-.name_tree_div_visible li {
-	list-style: none;
-	margin: 0;
-	padding: 0;
+.name_tree_div {
+	display: none;
 }
 
 .name_tree_div ul,
@@ -4001,42 +2614,39 @@ span.link_text {
 	margin: 0;
 }
 
-.sb_indi_surname_li,
-.sb_fam_surname_li {
-	list-style-image: url(images/plus.png);
-}
-
-/* Clippings */
-#sb_clippings_content li {
+.name_tree_div li,
+.name_tree_div_visible li {
 	list-style: none;
 	margin: 0;
 	padding: 0;
 }
 
+/* Clippings */
+#sb_content_clippings {
+	margin-top: 0;
+}
+
 #sb_clippings_content ul {
-	margin: 0;
 	padding: 0;
+	margin: 0;
 }
 
-#sb_content_clippings {
-	margin-top: 5px;
+#sb_clippings_content li {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	white-space: nowrap;
 }
 
-/* References */
+/* Extra info */
 #sb_content_extra_info {
 	font-size: 80%;
-	font-weight: 700;
-	margin-top: 1px;
+	font-weight: bold;
+	margin-top: 0;
 	overflow: hidden;
 	padding: 5px;
 }
 
-#sb_content_extra_info #hitcounter {
-	border-top: 1px solid #bcd;
-	font-weight: 700;
-	padding-top: 5px;
-}
-
 #sb_content_extra_info .editfacts {
 	float: right;
 	margin-top: -30px;
@@ -4047,26 +2657,33 @@ span.link_text {
 }
 
 #sb_content_extra_info span {
-	font-weight: 400;
+	font-weight: normal;
 }
 
 #sb_content_extra_info span a {
 	display: inline;
 }
 
+#sb_content_extra_info #hitcounter {
+	border-top: 1px solid #bcd;
+	font-weight: bold;
+	padding-top: 5px;
+}
+
 [dir=rtl] #sb_content_extra_info .editfacts {
 	float: left;
 }
 
-/* ==== find.php ==== */
-#find-facts-header .list_label {
-	text-align: inherit;
+/* ===== find.php =====  */
+#find-page h3,
+#find-page h4 {
+	margin: 10px;
+	text-align: center;
 }
 
 #find-header {
 	background-color: #95b8e0;
 	border: 1px solid #95b8e0;
-	border-radius: 3px;
 	margin: 10px auto;
 	padding: 5px 20px;
 	width: 50%;
@@ -4079,7 +2696,23 @@ span.link_text {
 
 #find-header span {
 	color: #fff;
-	font-weight: 700;
+	font-weight: bold;
+}
+
+#find-output,
+#find-output-special {
+	background-color: #fff;
+	border: 1px solid #95b8e0;
+	margin: 20px 5px;
+	padding: 10px;
+}
+
+#find-output p {
+	border-top: 1px solid #95b8e0;
+	font-weight: bold;
+	margin: 0;
+	padding-top: 10px;
+	text-align: center;
 }
 
 #find-media {
@@ -4092,78 +2725,59 @@ span.link_text {
 
 #find-media span {
 	border: 0;
-	font-weight: 700;
+	font-weight: bold;
 	margin: auto;
 	padding: 5px;
 }
 
-#find-output .find-media-details div span {
-	font-weight: 400;
-	padding: 0 5px 2px;
+#find-output .find-media-dirs {
+	border-bottom: 1px solid #95b8e0;
+	padding: 3px;
 }
 
-#find-output .find-media-details p {
-	border: 0;
-	font-weight: 400;
-	padding: 0 5px 2px;
-	text-align: left;
+#find-output .find-media-media {
+	border: 1px solid #95b8e0;
+	overflow: hidden;
+	margin: 1px;
+	padding: 2px;
 }
 
-#find-output p {
-	border-top: 1px solid #95b8e0;
-	font-weight: 700;
-	margin: 0;
-	padding-top: 10px;
-	text-align: center;
+#find-output .find-media-thumb {
+	clear: left;
+	float: left;
 }
 
-#find-output p.find-media-title {
-	font-weight: 700;
+#find-output .find-media-details {
+	float: left;
 }
 
-#find-output,
-#find-output-special {
-	background-color: #fff;
-	border: 1px solid #95b8e0;
-	border-radius: 3px;
-	margin: 20px 5px;
-	padding: 10px;
+#find-output .find-media-details p {
+	border: 0;
+	padding: 0 5px 2px;
+	font-weight: normal;
+	text-align: left;
 }
 
-#find-page h3,
-#find-page h4 {
-	margin: 10px;
-	text-align: center;
+#find-output .find-media-details div span {
+	font-weight: normal;
+	padding: 0 5px 2px;
 }
 
-#find-output .find-media-details {
-	float: left;
+#find-output p.find-media-title {
+	font-weight: bold;
 }
 
 #find-output .find-media-details ul {
-	list-style-type: none;
-	margin: 0 20px 10px;
 	padding: 0;
+	margin: 0 20px 10px;
+	list-style-type: none;
 }
 
-#find-output .find-media-dirs {
-	border-bottom: 1px solid #95b8e0;
-	padding: 3px;
-}
-
-#find-output .find-media-media {
-	border: 1px solid #95b8e0;
-	margin: 1px;
-	overflow: hidden;
-	padding: 2px;
-}
-
-#find-output .find-media-thumb {
-	clear: left;
-	float: left;
+#find-facts-header .list_label {
+	text-align: inherit;
 }
 
-/* ==== search.php ==== */
+/* ===== search.php ===== */
 #search-page h2,
 #search_submit {
 	margin: 20px;
@@ -4182,7 +2796,7 @@ span.link_text {
 	border-top: 1px solid #ccc;
 	color: #fff;
 	float: left;
-	font-weight: 700;
+	font-weight: bold;
 	padding: 5px 10px 0;
 	width: 150px;
 }
@@ -4207,7 +2821,7 @@ span.link_text {
 	margin: 0 170px 0 0;
 }
 
-/* ============== edituser.php ======================= */
+/*  edituser.php  */
 #edituser-page h2,
 #edituser_submit {
 	margin: 20px;
@@ -4255,66 +2869,664 @@ span.link_text {
 	margin: 0 260px 0 0;
 }
 
-/* ======= Who is online block ========== */
-.logged_in_list {
-	margin: 5px 0 0;
+/* ===== Edit interface pop-ups ===== */
+#edit_interface-page h4 {
+	color: #555;
+	margin: 5px;
+}
+
+#edit_interface-page .optionbox span {
+	margin: 0 5px;
+}
+
+#edit_interface-page #LATI,
+#edit_interface-page #LONG,
+#edit_interface-page #SPFX,
+#edit_interface-page #NSFX,
+#edit_interface-page #NPFX {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 88px;
+}
+
+#edit_interface-page #GIVN,
+#edit_interface-page #SURN,
+#edit_interface-page #_MARNM {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 180px;
+}
+
+#edit_interface-page input[type="text"],
+#edit_interface-page #NAME_display {
+	line-height: 18px;
+	margin: 0 5px;
+	vertical-align: top;
+	width: 240px;
+}
+
+#edit_interface-page input[type="text"][id*="PAGE"],
+#edit_interface-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR"],
+#edit_interface-page input[type="text"][id*="REPO"],
+#edit_interface-page input[type="text"][id*="OBJE"],
+#edit_interface-page input[type="text"][id*="FAMC"],
+#edit_interface-page input[type="text"][id*="ASSO"],
+#edit_interface-page input[type="text"][id^="AGE"],
+#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 250px;
+}
+
+#edit_interface-page input[type="text"][id$="DATE"] {
+	width: 160px;
+}
+
+#edit_interface-page input[type="text"][id^="TIME"] {
+	width: 100px;
+}
+
+#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
+	width: 200px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
+	width: 250px;
+}
+
+#edit_interface-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#edit_interface-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#edit_interface-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#edit_interface-page textarea[id*="TEXT"],
+#edit_interface-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+#edit_interface-page textarea[id^="newgedrec"] {
+	line-height: 18px;
+	width: 605px;
+}
+
+#edit_interface-page textarea#gedcom {
+	height: 364px;
+}
+
+#edit_interface-page textarea[id*="ADDR"],
+#edit_interface-page input[id*="ADDR"] {
+	height: 80px;
+	width: 300px;
+}
+
+#edit_interface-page #changefam {
+	padding: 5px;
+}
+
+#edit_interface-page #changefam table {
+	margin: 10px auto;
+	min-width: 400px;
+	max-width: 650px;
+}
+
+#edit_interface-page #changefam span {
+	margin: 0;
+}
+
+#edit_interface-page #changefam td {
+	padding: 5px;
+	white-space: normal;
+}
+
+#edit_interface-page #changefam td.child {
+	text-align: center;
+}
+
+#save-cancel {
+	position: fixed;
+	bottom: 0;
+	width: 98%;
+	border: solid #999 1px;
+	margin: 0;
+}
+
+#save-cancel input {
+	padding: 2px 8px;
+}
+
+#save-cancel .save {
+	float: left;
+	margin: 5px;
+}
+
+#save-cancel .cancel {
+	float: right;
+	margin: 5px;
+}
+
+[dir=rtl] #save-cancel .save {
+	float: right;
+}
+
+[dir=rtl] #save-cancel .cancel {
+	float: left;
+}
+
+#edit_interface-page,
+#addmedia-page {
+	margin-bottom: 50px;
+}
+
+/* ===== Addmedia pop-ups ===== */
+#addmedia-page input[type="text"] {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 350px;
+}
+
+#addmedia-page .optionbox select {
+	margin: 0 5px;
+}
+
+#addmedia-page .optionbox p.sub {
+	margin: 0 5px;
+	font-size: 11px;
+}
+
+#addmedia-page input[type="text"][id*="PAGE"],
+#addmedia-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#addmedia-page input[type="text"][id*="SOUR"],
+#addmedia-page input[type="text"][id*="REPO"],
+#addmedia-page input[type="text"][id*="OBJE"],
+#addmedia-page input[type="text"][id*="FAMC"],
+#addmedia-page input[type="text"][id*="ASSO"],
+#addmedia-page input[type="text"][id^="AGE"],
+#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 70px;
+}
+
+#addmedia-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#addmedia-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#addmedia-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#addmedia-page textarea[id*="TEXT"],
+#addmedia-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+/* ===== Styling for the jquery.colorbox gallery ===== */
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+#colorbox {
+	border: 2px solid #ccc;
+}
+
+#cboxOverlay {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	background: #ccc;
+}
+
+#cboxContent {
+	background: #fff;
+	border: 5px solid #888;
+}
+
+#cboxLoadedContent {
+	overflow: auto;
+	background: #fff;
+	margin-bottom: 30px;
+	margin-top: 35px;
+}
+
+#cboxTitle {
+	position: absolute;
+	left: 0;
+	top: 10px;
+	font-size: 14px;
+	color: #949494;
+	text-align: center;
+	width: 100%;
+	font-weight: 800;
+}
+
+.cboxPhoto {
+	float: left;
+	margin: auto;
+	border: 0;
+	display: block;
+	max-width: none;
+}
+
+.cboxIframe {
+	width: 100%;
+	height: 100%;
+	display: block;
+	border: 0;
+}
+
+#cboxPrevious {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	background: url(images/controls.png) no-repeat -75px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxPrevious:hover {
+	background-position: -75px -25px;
+}
+
+#cboxNext {
+	position: absolute;
+	bottom: 0;
+	left: 27px;
+	background: url(images/controls.png) no-repeat -50px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxNext:hover {
+	background-position: -50px -25px;
+}
+
+#cboxSlideshow {
+	position: absolute;
+	bottom: 5px;
+	font-size: 14px;
+	left: 57px;
+	margin: 10px;
+	border: 0;
+	background: none;
+}
+
+#cboxSlideshow:hover {
+	color: #f00;
+	background: #fff;
+}
+
+#cboxClose {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	background: url(images/controls.png) no-repeat -25px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxClose:hover {
+	background-position: -25px -25px;
+}
+
+#cboxCurrent {
+	bottom: 4px;
+	color: #949494;
+	left: 58px;
+	position: absolute;
+}
+
+[dir=rtl] #cboxPrevious {
+	right: 27px;
+	left: auto;
+}
+
+[dir=rtl] #cboxNext {
+	right: 0;
+	left: auto;
+}
+
+[dir=rtl] #cboxCurrent {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxClose {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxSlideshow {
+	right: 57px;
+	left: auto;
+}
+
+/* ===== Census assistant module ===== */
+table.table-census-assistant th {
+	font-weight: bold;
+	text-align: left;
+}
+
+/* Stories module */
+.story_title {
+	padding-top: 12px;
+	font-size: 13px;
+	height: 32px;
+	font-weight: bold;
+}
+
+.story_body {
+	padding: 20px;
+	white-space: normal;
+}
+
+.story_edit {
+	padding: 12px;
+}
+
+.btn-group {
+	display: inline-block;
+	margin: 0 4px;
+}
+
+.btn-group button:first-child,
+[dir=rtl] .btn-group button:last-child {
+	border-radius: 3px 0 0 3px;
+}
+
+.btn-group button:last-child,
+[dir=rtl] .btn-group button:first-child {
+	border-radius: 0 3px 3px 0;
+}
+
+/* ====== Charts Styles ======== */
+#compact_chart,
+#fan_chart,
+.chart_common,
+#ancestry_booklet,
+#descendancy_booklet,
+#familybook_chart,
+#hourglass_chart {
+	margin: 20px;
+}
+
+/* styles for vertical lines in ancestry and descendancy charts */
+.chart_common li {
+	list-style: none;
+}
+
+.chart_common li > span.details1 {
+	white-space: nowrap;
+}
+
+.chart_common .generation {
+	background: transparent url(images/vline.png) left top repeat-y;
+	margin: 0 0 0 15px;
 	padding: 0;
-	line-height: 20px;
+	display: block;
 }
 
-@media print {
-	#content {
-		padding: 0;
-	}
+[dir=rtl] .chart_common .generation {
+	margin: 0 15px 0 0;
+	background-position: right top
+;
+}
 
-	#backprint,
-	#sidebar,
-	#CB_All,
-	#separator,
-	header,
-	footer,
-	form,
-	.noprint {
-		display: none !important;
-	}
+.chart_common .generation > li {
+	margin: 5px 0;
+}
 
-	#pedigree_chart {
-		left: -80px;
-	}
+.chart_common table {
+	padding: 0;
+	border-spacing: 0;
+	border-collapse: collapse;
+	margin: 5px 0;
+}
 
-	#header_accordion1 {
-		width: 510px !important;
-	}
+.chart_common td {
+	border: 0;
+	padding: 0;
+}
 
-	[dir=rtl] #pedigree_chart {
-		left: auto;
-		right: -80px;
-	}
+.chart_common span.details1 div[class^=fact_] {
+	display: inline-block;
+}
 
-	#familybook_chart h3 {
-		margin-bottom: 10px;
-		vertical-align: middle;
-	}
+.chart_common span.details1 .date {
+	color: inherit;
+}
 
-	/* buttons and input are used out of forms in sortable tables*/
-	.lifespan_outer {
-		border: 0;
-		height: auto;
-		overflow: visible;
-		position: relative;
-		width: auto;
-	}
+/*-- Family book  --*/
+#familybook_chart {
+	margin-left: 10px;
+}
 
-	.lifespan_people {
-		left: -10px;
-		position: absolute;
-		top: -60px;
-		width: auto;
-		z-index: 1;
-	}
+#familybook_chart table {
+	border-collapse: collapse;
+	empty-cells: show;
+}
+
+#familybook_chart td {
+	margin: 0;
+	padding: 0;
+}
+
+#familybook_chart h2 {
+	text-align: center;
+}
+
+#familybook_chart .line3,
+#familybook_chart .pvline,
+#familybook_chart .spacer {
+	width: 3px;
+}
+
+#familybook_chart .line4 {
+	width: 7px;
+	vertical-align: middle;
+}
+
+[ID^="vline"] {
+	width: 3px;
+}
+
+#familybook_chart h3 {
+	color: #006;
+	font-size: 16px;
+	text-align: center;
+}
+
+[dir=rtl] #familybook_chart {
+	margin-right: 10px;
+}
+
+/*-- Fan chart ---- */
+.fan_chart_menu {
+	position: absolute;
+	display: none;
+	z-index: 100;
+}
+
+#fan_chart ul {
+	list-style-type: none;
+	margin: 0;
+}
+
+#fan_chart ul.children li:before {
+	content: "< ";
+	font-weight: bold;
+}
+
+#fan_chart_img {
+	text-align: center;
+}
+
+/*-- Hourglass ---- */
+#hourglass_chart img.line4 {
+	vertical-align: middle;
+}
+
+#hourglass_chart table,
+.charts_block table {
+	border-collapse: collapse;
+}
+
+#hourglass_chart td,
+.charts_block td {
+	padding: 0;
+	empty-cells: show;
+}
+
+/*-- Lifespan ---- */
+#lifespan-page .person0 {
+	padding: 5px;
+}
+
+#lifespan-page .person0 div{
+	text-align: center;
+}
+
+#lifespan_chart .div-controls {
+	opacity: 0.67;
+	position: relative;
+	top: 80px;
+	width: 180px;
+	z-index: 100;
+	margin-left: 20px;
+}
+
+.lifespan_people span:first-letter {
+	font-variant: small-caps;
+	font-size: 16px;
+	padding: 1px;
+}
+
+.lifespan_outer {
+	position: relative;
+	width: 99.5%;
+	height: 600px;
+	overflow: hidden;
+	border: solid #00f 1px;
+}
+
+.lifespan_outer a:hover {
+	color: #f00;
+	text-decoration: none;
+}
+
+.lifespan_timeline {
+	position: absolute;
+	width: 100%;
+	left: -10px;
+	top: -65px;
+	z-index: 2;
+	background-color: #fff;
+}
+
+.lifespan_people {
+	position: absolute;
+	width: 500px;
+	left: -10px;
+	top: -60px;
+	z-index: 1;
+}
+
+/*-- Pedigree ---- */
+#pedigree_chart #childbox {
+	border: 1px solid;
+	background-color: #fff;
+}
+
+.pedigree_form {
+	width: 45px;
+}
+
+#pedigree-page table.list_table {
+	margin: 0 auto;
+	width: 500px;
+}
+
+.pedigree_chart_table {
+	border: 0;
+	border-collapse: collapse;
+	padding: 0;
+	width: 100%;
+}
+
+#pedigree_chart {
+	position: relative;
+	top: -200px;
+	left: 0;
+}
+
+[dir=rtl] #pedigree_chart {
+	left: auto;
+	right: 0;
+}
+
+#pedigree_canvas {
+	color: #81a9cb;
+	position: absolute;
+	top: 200px;
+	z-index: -1000;
+}
+
+#pedigree_chart #childarrow,
+#pedigree_chart #uparrow,
+#pedigree_chart .shadow,
+.ancestorarrow {
+	position: absolute;
+}
+
+/*-- Relationship ---- */
+#relationship-page h3 {
+	margin: 20px 0 0 20px;
+}
+
+#relationship_chart {
+	margin: 0 6px;
 }
 
-/* Icons */
+/*-- timeline  --*/
+#timeline_chart {
+	position: relative;
+	top: 0;
+	left: 0;
+}
+
+/* ====== Common Icons ========= */
 [class^="icon-"],
 [class*=" icon-"] {
 	display: inline-block;
@@ -4344,6 +3556,7 @@ span.link_text {
 	width: 18px;
 	height: 16px;
 	background-image: url(images/buttons/addmedia.png);
+	vertical-align: middle;
 }
 
 .icon-button_addnote {
@@ -4368,6 +3581,7 @@ span.link_text {
 	width: 19px;
 	height: 15px;
 	background-image: url(images/buttons/calendar.png);
+	vertical-align: middle;
 }
 
 .icon-button_family {
@@ -4376,6 +3590,12 @@ span.link_text {
 	background-image: url(images/buttons/family.png);
 }
 
+.icon-button_find {
+	width: 17px;
+	height: 15px;
+	background-image: url(images/buttons/find.png);
+}
+
 .icon-button_find_facts {
 	width: 20px;
 	height: 20px;
@@ -4398,12 +3618,14 @@ span.link_text {
 	width: 30px;
 	height: 15px;
 	background-image: url(images/buttons/keyboard.png);
+	vertical-align: middle;
 }
 
 .icon-button_media {
 	width: 18px;
 	height: 16px;
 	background-image: url(images/buttons/media.png);
+	vertical-align: middle;
 }
 
 .icon-button_note {
@@ -4416,6 +3638,7 @@ span.link_text {
 	width: 15px;
 	height: 15px;
 	background-image: url(images/buttons/place.png);
+	vertical-align: middle;
 }
 
 .icon-button_repository {
@@ -4472,6 +3695,12 @@ a.icon-darrow:hover {
 	background-image: url(images/ddarrow.png);
 }
 
+a.icon-ddarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/ddarrow2.png);
+}
+
 .icon-edit_indi {
 	width: 22px;
 	height: 22px;
@@ -4498,6 +3727,7 @@ a.icon-darrow:hover {
 
 .icon-help {
 	cursor: help;
+	margin: 0 5px;
 	width: 15px;
 	height: 15px;
 	background-image: url(images/help.png);
@@ -4509,12 +3739,6 @@ a.icon-darrow:hover {
 	background-image: url(images/indis.png);
 }
 
-.icon-indis {
-	width: 22px;
-	height: 22px;
-	background-image: url(images/indis.png);
-}
-
 .icon-larrow {
 	width: 20px;
 	height: 20px;
@@ -4533,6 +3757,12 @@ a.icon-larrow:hover {
 	background-image: url(images/ldarrow.png);
 }
 
+a.icon-ldarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/ldarrow2.png);
+}
+
 .icon-lifespan-chunk {
 	width: 50px;
 	height: 37px;
@@ -4647,24 +3877,6 @@ a.icon-larrow:hover {
 	background-image: url(images/osm.png);
 }
 
-.icon-patriarch {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/patriarch.png);
-}
-
-.icon-pedigree {
-	width: 22px;
-	height: 22px;
-	background-image: url(images/pedigree.png);
-}
-
-.icon-place {
-	width: 22px;
-	height: 22px;
-	background-image: url(images/place.png);
-}
-
 .icon-plus {
 	width: 11px;
 	height: 11px;
@@ -4689,6 +3901,12 @@ a.icon-rarrow:hover {
 	background-image: url(images/rdarrow.png);
 }
 
+a.icon-rdarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/rdarrow2.png);
+}
+
 .icon-reminder {
 	width: 15px;
 	height: 12px;
@@ -4701,18 +3919,6 @@ a.icon-rarrow:hover {
 	background-image: url(images/delete.png);
 }
 
-.icon-repo-list {
-	width: 22px;
-	height: 22px;
-	background-image: url(images/repository.png);
-}
-
-.icon-repository {
-	width: 22px;
-	height: 22px;
-	background-image: url(images/repository.png);
-}
-
 .icon-resn-confidential {
 	width: 16px;
 	height: 16px;
@@ -4739,16 +3945,10 @@ a.icon-rarrow:hover {
 
 .icon-rings {
 	width: 9px;
-	height: 11px;
+	height: 9px;
 	background-image: url(images/rings.png);
 }
 
-.icon-search {
-	width: 16px;
-	height: 16px;
-	background-image: url(images/go.png);
-}
-
 .icon-selected {
 	width: 12px;
 	height: 12px;
@@ -4791,34 +3991,17 @@ a.icon-rarrow:hover {
 	background-image: url(images/sex_u_9x9.png);
 }
 
-.icon-sfamily {
-	width: 22px;
-	height: 22px;
-	background-image: url(images/sfamily.png);
-}
-
 .icon-source {
 	width: 25px;
 	height: 25px;
 	background-image: url(images/source.png);
 }
 
-.icon-source-list {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/source.png);
-}
-
 .icon-target {
 	width: 15px;
 	height: 15px;
 	background-image: url(images/buttons/target.png);
-}
-
-.icon-tree {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/gedcom.png);
+	vertical-align: middle;
 }
 
 .icon-uarrow {
@@ -4839,10 +4022,10 @@ a.icon-uarrow:hover {
 	background-image: url(images/udarrow.png);
 }
 
-.icon-user_add {
-	width: 22px;
-	height: 22px;
-	background-image: url(images/user_add.png);
+a.icon-udarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/udarrow2.png);
 }
 
 .icon-warning {
@@ -4851,23 +4034,12 @@ a.icon-uarrow:hover {
 	background-image: url(images/warning.png);
 }
 
-.icon-webtrees {
-	width: 100px;
-	height: 21px;
-	background-image: url(images/webtrees.png);
-}
-
 .icon-wiki {
 	width: 16px;
 	height: 16px;
 	background-image: url(images/w_button.png);
 }
 
-/* ios on click workaround */
-.iconz {
-	cursor: pointer;
-}
-
 .icon-zoomin {
 	width: 25px;
 	height: 25px;
@@ -4883,23 +4055,22 @@ a.icon-uarrow:hover {
 /* Silhouettes on charts */
 .icon-silhouette-F {
 	width: 37px;
-	height: 50px;
+	height: 45px;
 	background-image: url(images/silhouette_female_small.png);
 }
 
 .icon-silhouette-M {
 	width: 37px;
-	height: 50px;
+	height: 45px;
 	background-image: url(images/silhouette_male_small.png);
 }
 
 .icon-silhouette-U {
 	width: 37px;
-	height: 50px;
+	height: 45px;
 	background-image: url(images/silhouette_unknown_small.png);
 }
 
-/* Silhouettes on individual pages */
 #indi_mainimage .icon-silhouette-F {
 	width: 99px;
 	height: 106px;
@@ -4926,7 +4097,7 @@ a.icon-uarrow:hover {
 	height: 48px;
 }
 
-/* Generic MIME types */
+/* ===== Generic MIME types ===== */
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
 	background-position: -99px -49px;
@@ -4957,7 +4128,7 @@ a.icon-uarrow:hover {
 	background-position: -148px -147px;
 }
 
-/* Specific MIME types */
+/* ===== Specific MIME types ===== */
 .icon-mime-application-pdf {
 	background-position: -1px -49px;
 }
@@ -5041,421 +4212,1188 @@ a.icon-uarrow:hover {
 .icon-mime-video-x-ms-wmv {
 	background-position: -50px -196px;
 }
+/* ====== End Icon styles ====== */
 
-input:required:valid,
-textarea:required:valid {
-	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAONJREFUeNpi/P//PwMlgImBQjDwBrCgCzDOF2Zg+Adk/AOGDRvQfHZGoDWMxgyMDMb/Q1/NIt0F/xk8gIbNZPj7P41YL4AUGsM1//rfkuyeYMzw8z9xXgBqgNm0nuHnv0D/IH/juavmngV6oYY4F3z7y2DqY2oMpANB9MYl684yfP9Xw3Dzzw7sXgQmJGTM0MbjwdDKc0b2vt5/EM2QwunBoMyCVS1YPYYAMOwZ7FmiGLLYzjBYsSQD+QpALAjErNgMYERPyoyMjMxAih+IOYD4LxD/hOJfQLV/MaJ9NC8wAAQYAPbPfH2KJKx/AAAAAElFTkSuQmCC) no-repeat right top;
+/* ====== Theme Header ========= */
+
+/* Tbl hdrs and Light Text */
+.descriptionbox,
+.topbottombar,
+.topbottombar a,
+.list_label,
+.list_label a,
+.facts_label,
+.facts_label a,
+.facts_label .date,
+.facts_label03,
+.facts_table h2,
+.facts_table .descriptionbox a,
+.blockcontent .facts_label {
+	background-color: #95b8e0;
+	color: #039;
 }
 
-input:required:invalid,
-textarea:required:invalid {
-	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMpJREFUeNpi/P//PwMlgImBQjAMDGBBF1jFyOgBpFqAuOYPA8MOoAI4P+z//x0YJoBiARkvYWA486+k5D+IBuJqZD66WnAMogvMA9o4F6j4R3Lyf2R6IQODMVEGTAW6CoirgfjMB2/v/yB6CgNDYQ8W14IwRiB+A7rgOwNDYLChofGcrVvPgugfDAzR/yFhwUAwDJqBNj6Ulf0PooEhV4jMx+YCRvSknAeMBWDotwgwMKRzMTCcfQW0GcQHxkbNJCyxwDiaFxgAAgwAYy67YIOQ//cAAAAASUVORK5CYII=) no-repeat right top;
+/* Base Color */
+.descriptionbox .submenu a,
+.blockcontent,
+.list_value,
+.list_value_wrap,
+.news_box,
+.submenuitem_hover {
+	background: #fff;
 }
 
-[dir=rtl] input:required:valid,
-[dir=rtl] textarea:required:valid,
-[dir=rtl] input:required:invalid,
-[dir=rtl] textarea:required:invalid {
-	background-position: left top;
+header {
+	background: #acf url(images/clouds.png) repeat-x;
+	border: 1px solid #039;
+	height: 63px;
+	position: relative;
+	margin: 0;
 }
 
-/* Edit interface pop-ups*/
-#edit_interface-page h4 {
-	color: #555;
-	margin: 5px;
+.header-search {
+	position: absolute;
+	top: 5px;
+	right: 10px;
 }
 
-#edit_interface-page .optionbox span {
-	margin: 0 5px;
+[dir=rtl] .header-search {
+	left: 10px;
+	right: auto;
 }
 
-#edit_interface-page #LATI,
-#edit_interface-page #LONG,
-#edit_interface-page #SPFX,
-#edit_interface-page #NSFX,
-#edit_interface-page #NPFX {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 88px;
+/* Set stack level for top two header menu rows */
+.secondary-menu ul,
+.primary-menu ul {
+	z-index: 210;
 }
 
-#edit_interface-page #GIVN,
-#edit_interface-page #SURN,
-#edit_interface-page #_MARNM {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 180px;
+#topMenu {
+	background: #acf;
+	clear: both;
+	height: 31px;
+	width: 100%;
 }
 
-#edit_interface-page input[type="text"],
-#edit_interface-page #NAME_display {
-	line-height: 18px;
-	margin: 0 5px;
-	vertical-align: top;
-	width: 240px;
+#topMenu ul {
+	margin: 0;
+	padding: 0;
 }
 
-#edit_interface-page input[type="text"][id*="PAGE"],
-#edit_interface-page input[type="text"][id*="_UID"] {
-	width: 350px;
+/* Set stack level for top two header menu rows */
+/* ====== Secondary menu ======= */
+.secondary-menu {
+	position: absolute;
+	bottom: 0;
+	right: 10px;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR"],
-#edit_interface-page input[type="text"][id*="REPO"],
-#edit_interface-page input[type="text"][id*="OBJE"],
-#edit_interface-page input[type="text"][id*="FAMC"],
-#edit_interface-page input[type="text"][id*="ASSO"],
-#edit_interface-page input[type="text"][id^="AGE"],
-#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 250px;
+.secondary-menu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
 }
 
-#edit_interface-page input[type="text"][id$="DATE"] {
-	width: 160px;
+.secondary-menu li:before {
+	content: " | ";
 }
 
-#edit_interface-page input[type="text"][id^="TIME"] {
-	width: 100px;
+.secondary-menu ul {
+	background-color: #eee;
+	border: thin solid #aaa;
+	display: none;
+	left: 0;
+	position: absolute;
 }
 
-#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
-	width: 200px;
+.secondary-menu li ul li {
+	display: block;
+	text-align: left;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
-	width: 250px;
+.secondary-menu li ul li a {
+	color: #333;
 }
 
-#edit_interface-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+.secondary-menu {
+	list-style: none;
+	margin-left: 0;
+	padding: 1px;
 }
 
-#edit_interface-page textarea {
-	margin: 0 5px;
-	width: 440px;
+.secondary-menu ul {
+	list-style: none;
+	margin-left: 0;
+	padding: 1px;
+	top: 5px;
 }
 
-#edit_interface-page textarea[id*="NOTE"] {
-	height: 240px;
+/*set position of dropdown */
+.secondary-menu li:hover > ul {
+	display: block;
 }
 
-#edit_interface-page textarea[id*="TEXT"],
-#edit_interface-page textarea[id*="PUBL"] {
-	height: 140px;
+.secondary-menu li a {
+	color: #039;
 }
 
-#edit_interface-page textarea[id^="newgedrec"] {
-	line-height: 18px;
-	width: 605px;
+.secondary-menu li a:hover {
+	color: #f5003d;
 }
 
-#edit_interface-page textarea#gedcom {
-	height: 364px;
+.secondary-menu ul li a {
+	background-color: #fff;
+	display: block;
+	padding: 2px 5px 2px 2px;
 }
 
-#edit_interface-page textarea[id*="ADDR"],
-#edit_interface-page input[id*="ADDR"] {
-	height: 80px;
-	width: 300px;
+.secondary-menu ul li a:hover {
+	background: #c8e7ff;
+	color: #000;
 }
 
-#edit_interface-page #changefam {
-	padding: 5px;
+li a.link {
+	font-size: 13px;
+	margin-left: 5px;
+	margin-right: 5px;
 }
 
-#edit_interface-page #changefam table {
-	margin: 10px auto;
-	min-width: 400px;
-	max-width: 650px;
+.secondary-menu li ul li:before,
+.secondary-menu li:first-child:before {
+	content: "";
 }
 
-#edit_interface-page #changefam span {
+.lang-active,
+.theme-active {
+	color: #006;
+	font-weight: 900;
+}
+
+.hsearch {
+    display: block;
+    float: right;
+    padding-right: 10px;
+    padding-top: 5px;
+}
+
+.search-icon {
+	height: 17px;
+	vertical-align: top;
+}
+
+[dir=rtl] .secondary-menu {
+    left: 10px;
+    right: auto;
+}
+
+[dir=rtl] .secondary-menu ul {
+	left: auto;
+	right: -40px;
+}
+
+[dir=rtl] .secondary-menu ul li {
+	text-align: right;
+}
+
+/* ====== Primary menu ========= */
+header h1 {
+    color: #039;
+    font-size: 20px;
+    font-weight: normal;
+	margin: 5px 12px;
+}
+
+.primary-menu {
+	position: absolute;
+	top: 20px;
+	left: -20px;
+}
+
+[dir=rtl] .primary-menu {
+	right: -20px;
+	left: auto;
+}
+.primary-menu ul {
+	padding: 0;
 	margin: 0;
+	border: 1px solid #ddd;
+	list-style-type: none;
+	position: absolute;
+	visibility: hidden;
+	opacity: 0;
+	background-color: #fff;
 }
 
-#edit_interface-page #changefam td {
-	padding: 5px;
-	white-space: normal;
+.primary-menu li {
+	float: left;
+	position: relative;
+	display: block;
+	list-style: none;
 }
 
-#edit_interface-page #changefam td.child {
-	text-align: center;
+.primary-menu li a {
+	display: block;
 }
 
-#save-cancel {
-	position: fixed;
-	bottom: 0;
-	border-radius: 3px;
-	width: 96.5%;
-	border: solid #999 1px;
+.primary-menu li > ul {
+	display: block;
+	position: absolute;
+	top: 0;
+	left: 100%;
+	right: auto;
+}
+
+.primary-menu > li > a {
+	height: 37px;
+	width: 27px;
+	color: transparent; /* Use class="sr-only" from bootstrap? */
+}
+
+.primary-menu > li > ul {
+	left: 0;
+	right: auto;
+	top: 22px;
+}
+
+.primary-menu a {
+	display: block;
+	text-decoration: none;
+	padding: 0 10px;
 	margin: 0;
+	white-space: nowrap;
 }
 
-#save-cancel input {
-	padding: 2px 8px;
+.primary-menu ul li:hover a,
+.primary-menu li:hover li a {
+	background: none;
+	border: 0;
 }
 
-#save-cancel .save {
-	float: left;
-	margin: 5px;
+.primary-menu li:hover > ul {
+	visibility: visible;
+	opacity: 1;
 }
 
-#save-cancel .cancel {
-	float: right;
-	margin: 5px;
+.primary-menu > li > ul > li:first-child {
+	text-indent: 0;
+	min-width: 100px;
+	width: 100%;
+	background: none;
+	font-weight: bold;
+	white-space: nowrap;
+	font-size: 14px;
+	text-align: center;
+	height: 22px;
+	line-height: 1.5;
+	border-bottom: solid #ddd 1px;
 }
 
-[dir=rtl] #save-cancel .save {
-	float: right;
+.primary-menu > li {
+	background-image: url(images/sprites-top-menu.png);
+	background-repeat: no-repeat;
+	line-height: 22px;
+	margin: 5px 0 0 10px;
+	width: 22px;
+	height: 22px;
 }
 
-[dir=rtl] #save-cancel .cancel {
-	float: left;
+
+
+.primary-menu li ul li {
+	background-image: url(images/sprites-sub-menu.png);
+	background-repeat: no-repeat;
+	height: 22px;
+	left: auto;
+	line-height: 15px;
+	text-align: left;
+	margin: 2px 0;
+	text-indent: 22px;
+	width: 100%;
 }
 
-#edit_interface-page,
-#addmedia-page {
-	margin-bottom: 50px;
+/* Reverse left and right on RTL pages */
+[dir=rtl] .primary-menu > li {
+	margin: 4px 16px 0 0;
 }
 
-/* Addmedia pop-ups*/
-#addmedia-page input[type="text"] {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 250px;
+[dir=rtl] .primary-menu li {
+	float: right;
 }
 
-#addmedia-page .optionbox select {
-	margin: 0 5px;
+[dir=rtl] .primary-menu li:hover > ul {
+	right: 100%;
+	left: auto;
 }
 
-#addmedia-page .optionbox p.sub {
-	font-size: 11px;
-	margin: 0 5px;
+[dir=rtl] .primary-menu > li:hover > ul {
+	left: auto;
+	right: 0;
 }
 
-#addmedia-page input[type="text"][id*="PAGE"],
-#addmedia-page input[type="text"][id*="_UID"] {
-	width: 350px;
+[dir=rtl] .primary-menu li li {
+	text-align: right;
 }
 
-#addmedia-page input[type="text"][id*="SOUR"],
-#addmedia-page input[type="text"][id*="REPO"],
-#addmedia-page input[type="text"][id*="OBJE"],
-#addmedia-page input[type="text"][id*="FAMC"],
-#addmedia-page input[type="text"][id*="ASSO"],
-#addmedia-page input[type="text"][id^="AGE"],
-#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 70px;
+[dir=rtl] .primary-menu li li a {
+	display: block;
 }
 
-#addmedia-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+[dir=rtl] .primary-menu > li > ul > li:first-child {
+	text-align: center;
 }
 
-#addmedia-page textarea {
-	margin: 0 5px;
-	width: 440px;
+/* ====== End Theme Header ===== */
+
+/* ====== Theme Footer ========= */
+
+footer {
+	clear: both;
+	font-size: 12px;
+	padding-top: 10px;
+	text-align: center;
+}
+.contact_links {
+	margin-top: 15px;
 }
 
-#addmedia-page textarea[id*="NOTE"] {
-	height: 240px;
+.powered-by-webtrees {
+	display: inline-block;
+	margin-top: 10px;
+	width: 100px;
+	height: 21px;
 }
 
-/* Styling for the jquery.colorbox gallery */
-#colorbox,
-#cboxOverlay,
-#cboxWrapper {
-	position: absolute;
-	top: 0;
-	left: 0;
-	z-index: 9999;
-	overflow: hidden;
+.powered-by-webtrees:after {
+	content: url(images/powered-by-webtrees.png);
 }
 
-#colorbox {
-	border: 2px solid #ccc;
+.logo {
+	text-align: center;
 }
 
-#cboxOverlay {
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	background: #ccc;
+footer .center {
+	text-align: center;
 }
 
-#cboxContent {
-	background: #fff;
-	border: 5px solid #888;
+footer .error {
+	color: #d00;
+	font-weight: bold;
 }
 
-#cboxLoadedContent {
-	overflow: auto;
-	background: #fff;
-	margin-bottom: 30px;
-	margin-top: 35px;
+.user_links {
+	white-space: nowrap;
 }
 
-#cboxTitle {
-	position: absolute;
-	left: 0;
-	top: 10px;
-	color: #949494;
+#link_change_blocks {
+	clear: both;
+	margin: 0 auto;
+	padding: 25px 0 0;
 	text-align: center;
-	width: 100%;
-	font-weight: 800;
-	font-size: 14px;
+	width: 400px;
 }
 
-.cboxPhoto {
-	float: left;
-	margin: auto;
-	border: 0;
-	display: block;
-	max-width: none;
+#link_change_blocks span {
+	padding: 0 50px;
 }
 
-.cboxIframe {
-	width: 100%;
-	height: 100%;
-	display: block;
-	border: 0;
+#link_change_blocks span span {
+	padding: 0 3px;
 }
 
-#cboxPrevious {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	background: url(images/controls.png) no-repeat -75px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+/* ====== End Theme Footer ===== */
+
+/* ====== Theme Icons ========== */
+/* ***** Header icons **** */
+#menu-tree {
+	background-position: 0 0;
 }
 
-#cboxPrevious:hover {
-	background-position: -75px -25px;
+#menu-mymenu {
+	background-position: 0 -204px;
 }
 
-#cboxNext {
-	position: absolute;
-	bottom: 0;
-	left: 27px;
-	background: url(images/controls.png) no-repeat -50px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#menu-chart {
+	background-position: 0 -29px;
 }
 
-#cboxNext:hover {
-	background-position: -50px -25px;
+#menu-list {
+	background-position: 0 -59px;
 }
 
-#cboxSlideshow {
-	position: absolute;
-	bottom: 5px;
-	left: 57px;
-	margin: 10px;
-	border: 0;
-	background: none;
-	font-size: 14px;
-	font-weight: 400;
+#menu-report {
+	background-position: 0 -117px;
 }
 
-#cboxSlideshow:hover {
-	color: red;
-	background: #fff;
+#menu-calendar {
+	background-position: 0 -88px;
 }
 
-#cboxClose {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	background: url(images/controls.png) no-repeat -25px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#menu-search {
+	background-position: 0 -146px;
 }
 
-#cboxClose:hover {
-	background-position: -25px -25px;
+#menu-help {
+	background-position: 0 -175px;
 }
 
-#cboxCurrent {
-	bottom: 4px;
-	color: #949494;
-	left: 58px;
-	position: absolute;
+#menu-clippings {
+	background-position: 0 -233px;
 }
 
-[dir=rtl] #cboxPrevious {
-	right: 27px;
-	left: auto;
+#menu-indi {
+	background-position: 0 -261px;
 }
 
-[dir=rtl] #cboxNext {
-	right: 0;
-	left: auto;
+#menu-sour {
+	background-position: 0 -320px;
 }
 
-[dir=rtl] #cboxCurrent {
-	right: auto;
-	left: 0;
+#menu-fam {
+	background-position: 0 -291px;
 }
 
-[dir=rtl] #cboxClose {
-	right: auto;
-	left: 0;
+#menu-obje {
+	background-position: 0 -378px;
 }
 
-[dir=rtl] #cboxSlideshow {
-	right: 57px;
-	left: auto;
+#menu-note {
+	background-position: 0 -348px;
 }
 
-/* Census assistant module */
-table.table-census-assistant th {
-	font-weight: bold;
-	text-align: left;
+#menu-repo {
+	background-position: 0 -407px;
 }
 
-/* Stories module */
-.story_title {
-	padding-top: 12px;
-	height: 32px;
-	font-size: 13px;
-	font-weight: 700;
+#menu-story {
+	background-position: 0 -436px;
 }
 
-.story_body {
-	padding: 20px;
-	white-space: normal;
+/* Header Sub-menu icons */
+#menu-admin {
+	background-position: left -644px;
 }
 
-.story_edit {
-	padding: 12px;
+[dir=rtl] #menu-admin {
+	background-position: right -644px;
 }
 
-/* User content in stories tab */
-#stories h2,
-#stories h3,
-#stories h4,
-#stories h5 {
-	padding-top: 20px;
+#menu-branches {
+	background-position: left -414px;
 }
 
-#stories p {
-	padding-top: 8px;
+[dir=rtl] #menu-branches {
+	background-position: right -414px;
 }
 
-.btn-group {
-	display: inline-block;
-	margin: 0 4px;
+#menu-calendar-day {
+	background-position: left -506px;
+}
+
+[dir=rtl] #menu-calendar-day {
+	background-position: right -506px;
+}
+
+#menu-calendar-month {
+	background-position: left -506px;
+}
+
+[dir=rtl] #menu-calendar-month {
+	background-position: right -506px;
+}
+
+#menu-calendar-year {
+	background-position: left -506px;
+}
+
+[dir=rtl] #menu-calendar-year {
+	background-position: right -506px;
+}
+
+#menu-chart-ancestry {
+	background-position: left -0px;
+}
+
+[dir=rtl] #menu-chart-ancestry {
+	background-position: right -0px;
+}
+
+#menu-chart-compact {
+	background-position: left -0px;
+}
+
+[dir=rtl] #menu-chart-compact {
+	background-position: right -0px;
+}
+#menu-chart-descendants {
+	background-position: left -69px;
+}
+
+[dir=rtl] #menu-chart-descendants {
+	background-position: right -69px;
+}
+
+#menu-chart-familybook {
+	background-position: left -92px;
+}
+
+[dir=rtl] #menu-chart-familybook {
+	background-position: right -92px;
+}
+
+#menu-chart-fanchart {
+	background-position: left -23px;
+}
+
+[dir=rtl] #menu-chart-fanchart {
+	background-position: right -23px;
+}
+
+#menu-chart-hourglass {
+	background-position: left -115px;
+}
+
+[dir=rtl] #menu-chart-hourglass {
+	background-position: right -115px;
+}
+
+#menu-chart-lifespan {
+	background-position: left -161px;
+}
+
+[dir=rtl] #menu-chart-lifespan {
+	background-position: right -161px;
+}
+
+#menu-chart-pedigree {
+	background-position: left -184px;
+}
+
+[dir=rtl] #menu-chart-pedigree {
+	background-position: right -184px;
+}
+
+#menu-chart-pedigree_map {
+	background-position: left -207px;
+}
+
+[dir=rtl] #menu-chart-pedigree_map {
+	background-position: right -207px;
+}
+
+#menu-chart-relationship {
+	background-position: left -230px;
+}
+
+[dir=rtl] #menu-chart-relationship {
+	background-position: right -230px;
+}
+
+#menu-chart-statistics {
+	background-position: left -253px;
+}
+
+[dir=rtl] #menu-chart-statistics {
+	background-position: right -253px;
+}
+
+#menu-chart-timeline {
+	background-position: left -276px;
+}
+
+[dir=rtl] #menu-chart-timeline {
+	background-position: right -276px;
+}
+
+#menu-chart-tree {
+	background-position: left -138px;
+}
+
+[dir=rtl] #menu-chart-tree {
+	background-position: right -138px;
+}
+
+#menu-clippingsadd {
+	background-position: left -621px;
+}
+
+[dir=rtl] #menu-clippingsadd {
+	background-position: right -621px;
+}
+
+#menu-clippingscart {
+	background-position: left -621px;
+}
+
+[dir=rtl] #menu-clippingscart {
+	background-position: right -621px;
+}
+
+#menu-fam-addchil {
+	background-position: left -759px;
+}
+
+[dir=rtl] #menu-fam-addchil {
+	background-position: right -759px;
+}
+
+#menu-fam-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-fam-addfav {
+	background-position: right -736px;
+}
+
+#menu-fam-change {
+	background-position: left -759px;
+}
+
+[dir=rtl] #menu-fam-change {
+	background-position: right -759px;
+}
+
+#menu-fam-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-fam-del {
+	background-position: right -713px;
+}
+
+#menu-fam-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-fam-editraw {
+	background-position: right -667px;
+}
+
+#menu-fam-orderchil {
+	background-position: left -759px;
+}
+
+[dir=rtl] #menu-fam-orderchil {
+	background-position: right -759px;
+}
+
+#menu-help-contents {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-contents {
+	background-position: right -552px;
+}
+
+#menu-help-faq {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-faq {
+	background-position: right -552px;
+}
+
+#menu-help-genealogy {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-genealogy {
+	background-position: right -552px;
+}
+
+#menu-help-hide {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-hide {
+	background-position: right -552px;
+}
+
+#menu-help-show {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-show {
+	background-position: right -552px;
+}
+
+#menu-help-technical {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-help-technical {
+	background-position: right -598px;
+}
+
+#menu-help-wiki {
+	background-position: left -575px;
+}
+
+[dir=rtl] #menu-help-wiki {
+	background-position: right -575px;
+}
+
+#menu-indi-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-indi-addfav {
+	background-position: right -736px;
+}
+
+#menu-indi-addname {
+	background-position: left -690px;
+}
+
+[dir=rtl] #menu-indi-addname {
+	background-position: right -690px;
+}
+
+#menu-indi-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-indi-del {
+	background-position: right -713px;
+}
+
+#menu-indi-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-indi-editraw {
+	background-position: right -667px;
+}
+
+#menu-indi-editsex {
+	background-position: left -690px;
+}
+
+[dir=rtl] #menu-indi-editsex {
+	background-position: right -690px;
+}
+
+#menu-list-fam {
+	background-position: left -437px;
+}
+
+[dir=rtl] #menu-list-fam {
+	background-position: right -437px;
+}
+
+#menu-list-indi {
+	background-position: left -460px;
+}
+
+[dir=rtl] #menu-list-indi {
+	background-position: right -460px;
+}
+
+#menu-list-note {
+	background-position: left -368px;
+}
+
+[dir=rtl] #menu-list-note {
+	background-position: right -368px;
+}
+
+#menu-list-obje {
+	background-position: left -299px;
+}
+
+[dir=rtl] #menu-list-obje {
+	background-position: right -299px;
+}
+
+#menu-list-plac {
+	background-position: left -322px;
+}
+
+[dir=rtl] #menu-list-plac {
+	background-position: right -322px;
+}
+
+#menu-list-repo {
+	background-position: left -345px;
+}
+
+[dir=rtl] #menu-list-repo {
+	background-position: right -345px;
+}
+
+#menu-list-sour {
+	background-position: left -391px;
+}
+
+[dir=rtl] #menu-list-sour {
+	background-position: right -391px;
+}
+
+#menu-myaccount {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-myaccount {
+	background-position: right -598px;
+}
+
+#menu-mypage {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-mypage {
+	background-position: right -598px;
+}
+
+#menu-mypedigree {
+	background-position: left -828px;
+}
+
+[dir=rtl] #menu-mypedigree {
+	background-position: right -828px;
+}
+
+#menu-myrecord {
+	background-position: left -460px;
+}
+
+[dir=rtl] #menu-myrecord {
+	background-position: right -460px;
+}
+
+#menu-note-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-note-fav {
+	background-position: right -736px;
+}
+
+#menu-note-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-note-del {
+	background-position: right -713px;
+}
+
+#menu-note-edit {
+	background-position: left -805px;
+}
+
+[dir=rtl] #menu-note-edit {
+	background-position: right -805px;
+}
+
+#menu-note-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-note-editraw {
+	background-position: right -667px;
+}
+
+#menu-obje-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-obje-addfav {
+	background-position: right -736px;
+}
+
+#menu-obje-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-obje-del {
+	background-position: right -713px;
+}
+
+#menu-obje-edit {
+	background-position: left -852px;
+}
+
+[dir=rtl] #menu-obje-edit {
+	background-position: right -852px;
+}
+
+#menu-obje-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-obje-editraw {
+	background-position: right -667px;
+}
+
+#menu-obje-link {
+	background-position: left -875px;
+}
+
+[dir=rtl] #menu-obje-link {
+	background-position: right -875px;
+}
+
+#menu-obje-link-fam {
+	background-position: left -437px;
+}
+
+[dir=rtl] #menu-obje-link-fam {
+	background-position: right -437px;
+}
+
+#menu-obje-link-indi {
+	background-position: left -460px;
+}
+
+[dir=rtl] #menu-obje-link-indi {
+	background-position: right -460px;
+}
+
+#menu-obje-link-sour {
+	background-position: left -391px;
+}
+
+[dir=rtl] #menu-obje-link-sour {
+	background-position: right -391px;
+}
+
+#menu-repo-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-repo-addfav {
+	background-position: right -736px;
+}
+
+#menu-repo-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-repo-del {
+	background-position: right -713px;
+}
+
+#menu-repo-edit {
+	background-position: left -897px;
+}
+
+[dir=rtl] #menu-repo-edit {
+	background-position: right -897px;
+}
+
+#menu-repo-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-repo-editraw {
+	background-position: right -667px;
+}
+
+#menu-report li {
+	background-position: left -483px;
+}
+
+[dir=rtl] #menu-report li {
+	background-position: right -483px;
+}
+
+#menu-search-advanced {
+	background-position: left -529px;
+}
+
+[dir=rtl] #menu-search-advanced {
+	background-position: right -529px;
+}
+
+#menu-search-general {
+	background-position: left -529px;
+}
+
+[dir=rtl] #menu-search-general {
+	background-position: right -529px;
+}
+
+#menu-search-replace {
+	background-position: left -529px;
+}
+
+[dir=rtl] #menu-search-replace {
+	background-position: right -529px;
+}
+
+#menu-search-soundex {
+	background-position: left -529px;
+}
+
+[dir=rtl] #menu-search-soundex {
+	background-position: right -529px;
+}
+
+#menu-sour-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-sour-addfav {
+	background-position: right -736px;
+}
+
+#menu-sour-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-sour-del {
+	background-position: right -713px;
+}
+
+#menu-sour-edit {
+	background-position: left -782px;
+}
+
+[dir=rtl] #menu-sour-edit {
+	background-position: right -782px;
+}
+
+#menu-sour-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-sour-editraw {
+	background-position: right -667px;
+}
+
+#menu-story-sub {
+	background-position: left -920px;
+}
+
+[dir=rtl] #menu-story-sub {
+	background-position: right -920px;
+}
+
+#menu-tree li {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-tree li {
+	background-position: right -667px;
+}
+
+.icon-indis {
+	width: 22px;
+	height: 22px;
+	background-image: url(images/indis.png);
+}
+
+.icon-patriarch {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/patriarch.png);
+}
+
+.icon-pedigree {
+	width: 22px;
+	height: 22px;
+	background-image: url(images/pedigree.png);
+}
+
+.icon-place {
+	width: 22px;
+	height: 22px;
+	background-image: url(images/place.png);
+}
+
+.icon-repo-list {
+	width: 22px;
+	height: 22px;
+	background-image: url(images/repository.png);
+}
+
+.icon-repository {
+	width: 22px;
+	height: 22px;
+	background-image: url(images/repository.png);
+}
+
+.icon-search {
+	width: 16px;
+	height: 16px;
+	background-image: url(images/go.png);
+}
+
+.icon-sfamily {
+	width: 22px;
+	height: 22px;
+	background-image: url(images/sfamily.png);
+}
+
+.icon-source-list {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/source.png);
+}
+
+.icon-tree {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/gedcom.png);
+}
+
+.icon-user_add {
+	width: 22px;
+	height: 22px;
+	background-image: url(images/user_add.png);
+}
+
+.icon-webtrees {
+	width: 100px;
+	height: 21px;
+	background-image: url(images/webtrees.png);
+}
+
+@media print {
+	header,
+	footer,
+	form,
+	#sidebar,
+	#separator,
+	.noprint {
+		display: none;
+	}
+
+	#content {
+		padding: 0;
+	}
+
+	#pedigree_chart {
+		left: -40px;
+		top:  -260px;
+	}
+
+	[dir=rtl] #pedigree_chart {
+		left: auto;
+		right: -20px;
+	}
+
+	#header_accordion1 {
+		width: 510px;
+	}
+
+	#familybook_chart h3 {
+		margin-bottom: 10px;
+		vertical-align: middle;
+	}
+
+	.lifespan_outer {
+		border: 0;
+		height: auto;
+		overflow: visible;
+		position: relative;
+		width: auto;
+	}
+
+	.lifespan_people {
+		left: -10px;
+		position: absolute;
+		top: -60px;
+		width: auto;
+		z-index: 1;
+	}
 }
diff --git a/themes/clouds/footer.php b/themes/clouds/footer.php
deleted file mode 100644
index 565ddf53c9..0000000000
--- a/themes/clouds/footer.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Footer for Clouds theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView Cloudy theme
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo '</main>';
-if ($view !== 'simple') {
-	echo '<footer>';
-	echo contact_links();
-	echo '<p class="logo">';
-	echo '<a href="', WT_WEBTREES_URL, '" target="_blank" class="icon-webtrees" title="', WT_WEBTREES, ' ', WT_VERSION, '"></a>';
-	echo '</p>';
-	if ($WT_TREE && $WT_TREE->getPreference('SHOW_STATS')) {
-		echo execution_stats();
-	}
-	if (exists_pending_change()) {
-		echo '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;">';
-		echo '<p class="error center">', WT_I18N::translate('There are pending changes for you to moderate.'), '</p>';
-		echo '</a>';
-	}
-	echo '</footer>';
-}
diff --git a/themes/clouds/header.php b/themes/clouds/header.php
deleted file mode 100644
index f2c3d59357..0000000000
--- a/themes/clouds/header.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-// Header for clouds theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use WT\Auth;
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-global $WT_IMAGES;
-
-// This theme uses the jQuery “colorbox” plugin to display images
-$this
-	->addExternalJavascript(WT_JQUERY_COLORBOX_URL)
-	->addExternalJavascript(WT_JQUERY_WHEELZOOM_URL)
-	->addInlineJavascript('activate_colorbox();')
-	->addInlineJavascript('jQuery.extend(jQuery.colorbox.settings, {width:"85%", height:"85%", transition:"none", slideshowStart:"'. WT_I18N::translate('Play').'", slideshowStop:"'. WT_I18N::translate('Stop').'"})')
-	->addInlineJavascript('
-		jQuery.extend(jQuery.colorbox.settings, {
-			title: function() {
-				var img_title = jQuery(this).data("title");
-				return img_title;
-			}
-		});
-	');
-
-$menu_items = array(
-	WT_MenuBar::getGedcomMenu(),
-	WT_MenuBar::getMyPageMenu(),
-	WT_MenuBar::getChartsMenu(),
-	WT_MenuBar::getListsMenu(),
-	WT_MenuBar::getCalendarMenu(),
-	WT_MenuBar::getReportsMenu(),
-	WT_MenuBar::getSearchMenu(),
-);
-foreach (WT_MenuBar::getModuleMenus() as $menu) {
-	$menu_items[] = $menu;
-}
-
-?>
-<!DOCTYPE html>
-<html <?php echo WT_I18N::html_markup(); ?>>
-<head>
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<?php echo header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL); ?>
-	<title><?php echo WT_Filter::escapeHtml($title); ?></title>
-	<link rel="icon" href="<?php echo WT_CSS_URL; ?>favicon.png" type="image/png">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_THEME_URL; ?>jquery-ui-1.11.2/jquery-ui.css">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_CSS_URL; ?>style.css">
-	<!--[if IE 8]>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-	<![endif]-->
-</head>
-<body id="body">
-	<?php if ($view !== 'simple') { ?>
-	<header>
-		<div id="header">
-			<h1><?php echo WT_TREE_TITLE; ?></h1>
-			<div class="hsearch">
-				<form style="display:inline;" action="search.php" method="post" role="search">
-					<input type="hidden" name="action" value="general">
-					<input type="hidden" name="ged" value="<?php echo WT_GEDCOM; ?>">
-					<input type="hidden" name="topsearch" value="yes">
-					<input type="search" name="query" size="15" placeholder="<?php echo WT_I18N::translate('Search'); ?>">
-					<input class="search-icon" type="image" src="<?php echo $WT_IMAGES['search']; ?>" alt="<?php echo WT_I18N::translate('Search'); ?>" title="<?php echo WT_I18N::translate('Search'); ?>">
-				</form>
-			</div>
-		</div>
-		<div id="topMenu">
-			<nav>
-				<ul id="main-menu">
-					<?php
-					foreach (array_filter($menu_items) as $menu) {
-						echo getMenuAsCustomList($menu);
-					}
-					?>
-				</ul>
-			</nav>
-			<div id="header-user-links">
-				<ul class="makeMenu">
-					<?php
-					if (Auth::check()) {
-						echo '<li><a href="edituser.php" class="link">', WT_Filter::escapeHtml(Auth::user()->getRealName()), '</a></li><li>', logout_link(), '</li>';
-						if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
-							echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\', chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
-						}
-					} else {
-						echo '<li>', login_link(),'</li>';
-					}
-					?>
-					<?php echo WT_MenuBar::getFavoritesMenu(); ?>
-					<?php echo WT_MenuBar::getLanguageMenu(); ?>
-					<?php echo WT_MenuBar::getThemeMenu(); ?>
-				</ul>
-			</div>
-		</div>
-	</header>
-	<?php } ?>
-	<?php echo WT_FlashMessages::getHtmlMessages(); ?>
-	<main id="content">
diff --git a/themes/clouds/templates/block_main_temp.php b/themes/clouds/templates/block_main_temp.php
deleted file mode 100644
index dbfe4965a0..0000000000
--- a/themes/clouds/templates/block_main_temp.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-// Template for drawing the main blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<table class="blockheader">
-		<tr>
-			<td class="blockh1" ></td>
-			<td class="blockh2" >
-				<div class="blockhc"><b><?php echo $title; ?></b></div>
-			</td>
-			<td class="blockh3"></td>
-		</tr>
-	</table>
-	<div class="blockcontent <?php echo $class; ?>">
-		<?php echo $content; ?>
-	</div>
-</div>
diff --git a/themes/clouds/templates/block_small_temp.php b/themes/clouds/templates/block_small_temp.php
deleted file mode 100644
index 24af18c7d8..0000000000
--- a/themes/clouds/templates/block_small_temp.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-// Template for drawing the height-restricted blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<table class="blockheader">
-		<tr>
-			<td class="blockh1" ></td>
-			<td class="blockh2" >
-				<div class="blockhc"><b><?php echo $title; ?></b></div>
-			</td>
-			<td class="blockh3"></td>
-		</tr>
-	</table>
-	<div class="blockcontent <?php echo $class; ?>">
-		<div class="small_inner_block">
-		<?php echo $content; ?>
-		</div>
-	</div>
-</div>
diff --git a/themes/clouds/templates/compactbox_template.php b/themes/clouds/templates/compactbox_template.php
deleted file mode 100644
index 4a3386f801..0000000000
--- a/themes/clouds/templates/compactbox_template.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-//  $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $outBoxAdd, $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '"' , $outBoxAdd, '>
-	<div class="compact_view">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'">
-			<span class="namedef name',$style,'">', $shortname, '</span>
-		</a>
-	</div>
-	<div class="inout2 details',$style,'">',
-		$person->getLifeSpan(), '
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/clouds/templates/personbox_template.php b/themes/clouds/templates/personbox_template.php
deleted file mode 100644
index b1fdc7ade2..0000000000
--- a/themes/clouds/templates/personbox_template.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-// $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $genderImage, $BirthDeath, $outBoxAdd,
-// $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team. All rights reserved.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '" ',$outBoxAdd,'>
-	<div class="noprint icons">', $icons, '</div>',
-	'<div class="chart_textbox" style="max-height:', $bheight,'px;">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '">
-			<span class="namedef name',$style,'">',
-				$name,
-				$genderImage,'
-				<span class="details',$style,'">' . $LDSord . '</span>
-			</span>
-		</a>
-		<div class="namedef name',$style,'">',$addname,'</div>
-		<div class="inout2 details',$style,'">',
-			$BirthDeath,
-		'</div>
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/clouds/theme.php b/themes/clouds/theme.php
index 1433358e86..64d23eca49 100644
--- a/themes/clouds/theme.php
+++ b/themes/clouds/theme.php
@@ -2,11 +2,7 @@
 // Clouds theme
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView Cloudy theme
-// Original author w.a. bastein http://genealogy.bastein.biz
-// Copyright (C) 2010 PGV Development Team.
+// Copyright (C) 2015 webtrees development team.
 //
 // 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
@@ -22,108 +18,4 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-/**
- * Convert a menu into our theme-specific format
- *
- * @param WT_Menu $menu
- *
- * @return string
- */
-function getMenuAsCustomList(WT_Menu $menu) {
-		// Create an inert menu - to use as a label
-		$tmp = new WT_Menu(strip_tags($menu->getLabel()), '');
-
-		// Insert the label into the submenu
-	$submenus = $menu->getSubmenus();
-	array_unshift($submenus, $tmp);
-	$menu->setSubmenus($submenus);
-
-		// Neutralise the top-level menu
-		$menu->setLabel('');
-		$menu->setOnclick('');
-
-		return $menu->getMenuAsList();
-}
-
-// Theme name - this needs double quotes, as file is scanned/parsed by script
-$theme_name = "clouds"; /* I18N: Name of a theme. */ WT_I18N::translate('clouds');
-
-// A version number in the path prevents browser-cache problems during upgrade
-define('WT_CSS_URL', WT_THEME_URL . 'css-1.6.2/');
-
-$headerfile = WT_THEME_DIR . 'header.php';
-$footerfile = WT_THEME_DIR . 'footer.php';
-
-$WT_IMAGES=array(
-	// used to draw charts
-	'dline'           => WT_CSS_URL .'images/dline.png',
-	'dline2'          => WT_CSS_URL .'images/dline2.png',
-	'hline'           => WT_CSS_URL .'images/hline.png',
-	'spacer'          => WT_CSS_URL .'images/spacer.png',
-	'vline'           => WT_CSS_URL .'images/vline.png',
-
-	// used in button images and javascript
-	'add'             => WT_CSS_URL .'images/add.png',
-	'button_family'   => WT_CSS_URL .'images/buttons/family.png',
-	'minus'           => WT_CSS_URL .'images/minus.png',
-	'plus'            => WT_CSS_URL .'images/plus.png',
-	'remove'          => WT_CSS_URL .'images/delete.png',
-	'search'          => WT_CSS_URL .'images/go.png',
-
-	// need different sizes before moving to CSS
-	'default_image_F' => WT_CSS_URL .'images/silhouette_female.png',
-	'default_image_M' => WT_CSS_URL .'images/silhouette_male.png',
-	'default_image_U' => WT_CSS_URL .'images/silhouette_unknown.png',
-);
-
-// Variables for the Fan chart
-$fanChart = array(
-	'font'     => WT_ROOT . 'includes/fonts/DejaVuSans.ttf',
-	'size'     => 7,
-	'color'    => '#000000',
-	'bgColor'  => '#eeeeee',
-	'bgMColor' => '#b1cff0',
-	'bgFColor' => '#e9daf1'
-);
-
-// This section defines variables for the charts
-$bwidth        = 250; // width of boxes on all person-box based charts
-$bheight       = 80;  // height of boxes on all person-box based chart
-$baseyoffset   = 10;  // position the timeline chart relative to the top of the page
-$basexoffset   = 10;  // position the pedigree and timeline charts relative to the left of the page
-$bxspacing     = 4;   // horizontal spacing between boxes on the pedigree chart
-$byspacing     = 5;   // vertical spacing between boxes on the pedigree chart
-$brborder      = 1;   // pedigree chart box right border thickness
-$linewidth     = 1.5; // width of joining lines
-$shadowcolor   = '';  // shadow color for joining lines
-$shadowblur    = 0;   // shadow blur for joining lines
-$shadowoffsetX = 0;   // shadowOffsetX for joining lines
-$shadowoffsetY = 0;   // shadowOffsetY for joining lines
-
-// Other settings that should not be touched
-$Dbxspacing    = 5;   // position vertical line between boxes in relationship chart
-$Dbyspacing    = 10;  // position vertical spacing between boxes in relationship chart
-$Dbwidth       = 250; // horizontal spacing between boxes in all charts
-$Dbheight      = 80;  // horizontal spacing between boxes in all charts
-$Dindent       = 15;  // width to indent ancestry and descendancy charts boxes
-$Darrowwidth   = 300; // not used that I can see ***
-
-// -- Dimensions for compact version of chart displays
-$cbwidth  = 240;
-$cbheight = 50;
-
-// The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels
-$WT_STATS_S_CHART_X = 440;
-$WT_STATS_S_CHART_Y = 125;
-$WT_STATS_L_CHART_X = 900;
-// For map charts, the maximum size is 440 pixels wide by 220 pixels high
-$WT_STATS_MAP_X = 440;
-$WT_STATS_MAP_Y = 220;
-$WT_STATS_CHART_COLOR1 = "ffffff";
-$WT_STATS_CHART_COLOR2 = "95b8e0";
-$WT_STATS_CHART_COLOR3 = "c8e7ff";
+return new WT\Theme\Clouds;
diff --git a/themes/colors/css-1.6.2/images/pedigree.png b/themes/colors/css-1.6.2/images/pedigree.png
deleted file mode 100644
index 6127a9411a..0000000000
--- a/themes/colors/css-1.6.2/images/pedigree.png
+++ /dev/null
diff --git a/themes/colors/css-1.6.2/images/sfamily.png b/themes/colors/css-1.6.2/images/sfamily.png
deleted file mode 100644
index 9a0a7adb07..0000000000
--- a/themes/colors/css-1.6.2/images/sfamily.png
+++ /dev/null
diff --git a/themes/colors/css-1.6.2/ipad.css b/themes/colors/css-1.6.2/ipad.css
deleted file mode 100644
index 1f89b4691d..0000000000
--- a/themes/colors/css-1.6.2/ipad.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * iPad Specific style
- */
-@media only screen and (orientation: portrait) {
-	/* portrait styles here */
-	#wrap {
-		width: 768px;
-	}
-}
diff --git a/themes/colors/css-1.6.2/favicon.png b/themes/colors/css-1.7.0/favicon.png
index 4c54cc0e4e..4c54cc0e4e 100644
--- a/themes/colors/css-1.6.2/favicon.png
+++ b/themes/colors/css-1.7.0/favicon.png
diff --git a/themes/colors/css-1.6.2/images/add.png b/themes/colors/css-1.7.0/images/add.png
index c4554632f2..c4554632f2 100644
--- a/themes/colors/css-1.6.2/images/add.png
+++ b/themes/colors/css-1.7.0/images/add.png
diff --git a/themes/colors/css-1.6.2/images/admin.png b/themes/colors/css-1.7.0/images/admin.png
index 6de111507b..6de111507b 100644
--- a/themes/colors/css-1.6.2/images/admin.png
+++ b/themes/colors/css-1.7.0/images/admin.png
diff --git a/themes/colors/css-1.6.2/images/bing.png b/themes/colors/css-1.7.0/images/bing.png
index 400627cf16..400627cf16 100644
--- a/themes/colors/css-1.6.2/images/bing.png
+++ b/themes/colors/css-1.7.0/images/bing.png
diff --git a/themes/colors/css-1.6.2/images/buttons/addmedia.png b/themes/colors/css-1.7.0/images/buttons/addmedia.png
index 65cc2aefb5..65cc2aefb5 100644
--- a/themes/colors/css-1.6.2/images/buttons/addmedia.png
+++ b/themes/colors/css-1.7.0/images/buttons/addmedia.png
diff --git a/themes/colors/css-1.6.2/images/buttons/addnote.png b/themes/colors/css-1.7.0/images/buttons/addnote.png
index 525937a14b..525937a14b 100644
--- a/themes/colors/css-1.6.2/images/buttons/addnote.png
+++ b/themes/colors/css-1.7.0/images/buttons/addnote.png
diff --git a/themes/colors/css-1.6.2/images/buttons/addrepository.png b/themes/colors/css-1.7.0/images/buttons/addrepository.png
index 220b432717..220b432717 100644
--- a/themes/colors/css-1.6.2/images/buttons/addrepository.png
+++ b/themes/colors/css-1.7.0/images/buttons/addrepository.png
diff --git a/themes/colors/css-1.6.2/images/buttons/addsource.png b/themes/colors/css-1.7.0/images/buttons/addsource.png
index ea044ad095..ea044ad095 100644
--- a/themes/colors/css-1.6.2/images/buttons/addsource.png
+++ b/themes/colors/css-1.7.0/images/buttons/addsource.png
diff --git a/themes/colors/css-1.6.2/images/buttons/calendar.png b/themes/colors/css-1.7.0/images/buttons/calendar.png
index 0d308a977a..0d308a977a 100644
--- a/themes/colors/css-1.6.2/images/buttons/calendar.png
+++ b/themes/colors/css-1.7.0/images/buttons/calendar.png
diff --git a/themes/colors/css-1.6.2/images/buttons/family.png b/themes/colors/css-1.7.0/images/buttons/family.png
index 3ceafc5abb..3ceafc5abb 100644
--- a/themes/colors/css-1.6.2/images/buttons/family.png
+++ b/themes/colors/css-1.7.0/images/buttons/family.png
diff --git a/themes/colors/css-1.7.0/images/buttons/find.png b/themes/colors/css-1.7.0/images/buttons/find.png
new file mode 100644
index 0000000000..be6c6002e4
--- /dev/null
+++ b/themes/colors/css-1.7.0/images/buttons/find.png
diff --git a/themes/colors/css-1.6.2/images/buttons/find_facts.png b/themes/colors/css-1.7.0/images/buttons/find_facts.png
index 2ba25a7858..2ba25a7858 100644
--- a/themes/colors/css-1.6.2/images/buttons/find_facts.png
+++ b/themes/colors/css-1.7.0/images/buttons/find_facts.png
diff --git a/themes/colors/css-1.6.2/images/buttons/head.png b/themes/colors/css-1.7.0/images/buttons/head.png
index 7a48ef9e86..7a48ef9e86 100644
--- a/themes/colors/css-1.6.2/images/buttons/head.png
+++ b/themes/colors/css-1.7.0/images/buttons/head.png
diff --git a/themes/colors/css-1.6.2/images/buttons/indi.png b/themes/colors/css-1.7.0/images/buttons/indi.png
index 4d06f389d2..4d06f389d2 100644
--- a/themes/colors/css-1.6.2/images/buttons/indi.png
+++ b/themes/colors/css-1.7.0/images/buttons/indi.png
diff --git a/themes/colors/css-1.6.2/images/buttons/keyboard.png b/themes/colors/css-1.7.0/images/buttons/keyboard.png
index 482f1bdb25..482f1bdb25 100644
--- a/themes/colors/css-1.6.2/images/buttons/keyboard.png
+++ b/themes/colors/css-1.7.0/images/buttons/keyboard.png
diff --git a/themes/colors/css-1.6.2/images/buttons/media.png b/themes/colors/css-1.7.0/images/buttons/media.png
index b70ae5606c..b70ae5606c 100644
--- a/themes/colors/css-1.6.2/images/buttons/media.png
+++ b/themes/colors/css-1.7.0/images/buttons/media.png
diff --git a/themes/colors/css-1.6.2/images/buttons/note.png b/themes/colors/css-1.7.0/images/buttons/note.png
index 5ef61ee5a0..5ef61ee5a0 100644
--- a/themes/colors/css-1.6.2/images/buttons/note.png
+++ b/themes/colors/css-1.7.0/images/buttons/note.png
diff --git a/themes/colors/css-1.6.2/images/buttons/place.png b/themes/colors/css-1.7.0/images/buttons/place.png
index 1562e0ee0c..1562e0ee0c 100644
--- a/themes/colors/css-1.6.2/images/buttons/place.png
+++ b/themes/colors/css-1.7.0/images/buttons/place.png
diff --git a/themes/colors/css-1.6.2/images/buttons/repository.png b/themes/colors/css-1.7.0/images/buttons/repository.png
index bf0b660c91..bf0b660c91 100644
--- a/themes/colors/css-1.6.2/images/buttons/repository.png
+++ b/themes/colors/css-1.7.0/images/buttons/repository.png
diff --git a/themes/colors/css-1.6.2/images/buttons/source.png b/themes/colors/css-1.7.0/images/buttons/source.png
index f103b323a8..f103b323a8 100644
--- a/themes/colors/css-1.6.2/images/buttons/source.png
+++ b/themes/colors/css-1.7.0/images/buttons/source.png
diff --git a/themes/colors/css-1.6.2/images/buttons/target.png b/themes/colors/css-1.7.0/images/buttons/target.png
index f8410ba149..f8410ba149 100644
--- a/themes/colors/css-1.6.2/images/buttons/target.png
+++ b/themes/colors/css-1.7.0/images/buttons/target.png
diff --git a/themes/colors/css-1.6.2/images/cfamily.png b/themes/colors/css-1.7.0/images/cfamily.png
index 9a0a7adb07..9a0a7adb07 100644
--- a/themes/colors/css-1.6.2/images/cfamily.png
+++ b/themes/colors/css-1.7.0/images/cfamily.png
diff --git a/themes/colors/css-1.6.2/images/childless.png b/themes/colors/css-1.7.0/images/childless.png
index 10f82fe6fe..10f82fe6fe 100644
--- a/themes/colors/css-1.6.2/images/childless.png
+++ b/themes/colors/css-1.7.0/images/childless.png
diff --git a/themes/colors/css-1.6.2/images/children.png b/themes/colors/css-1.7.0/images/children.png
index 30dbbf1099..30dbbf1099 100644
--- a/themes/colors/css-1.6.2/images/children.png
+++ b/themes/colors/css-1.7.0/images/children.png
diff --git a/themes/colors/css-1.6.2/images/clippings.png b/themes/colors/css-1.7.0/images/clippings.png
index c4aec579f6..c4aec579f6 100644
--- a/themes/colors/css-1.6.2/images/clippings.png
+++ b/themes/colors/css-1.7.0/images/clippings.png
diff --git a/themes/colors/css-1.6.2/images/controls.png b/themes/colors/css-1.7.0/images/controls.png
index 140c6fc4ae..140c6fc4ae 100644
--- a/themes/colors/css-1.6.2/images/controls.png
+++ b/themes/colors/css-1.7.0/images/controls.png
diff --git a/themes/colors/css-1.6.2/images/copy.png b/themes/colors/css-1.7.0/images/copy.png
index 7397f49c27..7397f49c27 100644
--- a/themes/colors/css-1.6.2/images/copy.png
+++ b/themes/colors/css-1.7.0/images/copy.png
diff --git a/themes/colors/css-1.6.2/images/darrow.png b/themes/colors/css-1.7.0/images/darrow.png
index 3be2605dc8..3be2605dc8 100644
--- a/themes/colors/css-1.6.2/images/darrow.png
+++ b/themes/colors/css-1.7.0/images/darrow.png
diff --git a/themes/colors/css-1.6.2/images/darrow2.png b/themes/colors/css-1.7.0/images/darrow2.png
index 995ae19667..995ae19667 100644
--- a/themes/colors/css-1.6.2/images/darrow2.png
+++ b/themes/colors/css-1.7.0/images/darrow2.png
diff --git a/themes/colors/css-1.6.2/images/ddarrow.png b/themes/colors/css-1.7.0/images/ddarrow.png
index 44dd6ab5aa..44dd6ab5aa 100644
--- a/themes/colors/css-1.6.2/images/ddarrow.png
+++ b/themes/colors/css-1.7.0/images/ddarrow.png
diff --git a/themes/colors/css-1.6.2/images/delete.png b/themes/colors/css-1.7.0/images/delete.png
index 7ce1741b6b..7ce1741b6b 100644
--- a/themes/colors/css-1.6.2/images/delete.png
+++ b/themes/colors/css-1.7.0/images/delete.png
diff --git a/themes/colors/css-1.6.2/images/dline.png b/themes/colors/css-1.7.0/images/dline.png
index f298074427..f298074427 100644
--- a/themes/colors/css-1.6.2/images/dline.png
+++ b/themes/colors/css-1.7.0/images/dline.png
diff --git a/themes/colors/css-1.6.2/images/dline2.png b/themes/colors/css-1.7.0/images/dline2.png
index 8567b1849d..8567b1849d 100644
--- a/themes/colors/css-1.6.2/images/dline2.png
+++ b/themes/colors/css-1.7.0/images/dline2.png
diff --git a/themes/colors/css-1.6.2/images/edit_indi.png b/themes/colors/css-1.7.0/images/edit_indi.png
index cbc4fe8ea7..cbc4fe8ea7 100644
--- a/themes/colors/css-1.6.2/images/edit_indi.png
+++ b/themes/colors/css-1.7.0/images/edit_indi.png
diff --git a/themes/colors/css-1.6.2/images/email.png b/themes/colors/css-1.7.0/images/email.png
index 2b3efdd668..2b3efdd668 100644
--- a/themes/colors/css-1.6.2/images/email.png
+++ b/themes/colors/css-1.7.0/images/email.png
diff --git a/themes/colors/css-1.6.2/images/fambook.png b/themes/colors/css-1.7.0/images/fambook.png
index 7b77f07fe9..7b77f07fe9 100644
--- a/themes/colors/css-1.6.2/images/fambook.png
+++ b/themes/colors/css-1.7.0/images/fambook.png
diff --git a/themes/colors/css-1.6.2/images/gedcom.png b/themes/colors/css-1.7.0/images/gedcom.png
index c369a5f879..c369a5f879 100644
--- a/themes/colors/css-1.6.2/images/gedcom.png
+++ b/themes/colors/css-1.7.0/images/gedcom.png
diff --git a/themes/colors/css-1.6.2/images/general_sprite.png b/themes/colors/css-1.7.0/images/general_sprite.png
index 570c6b9013..570c6b9013 100644
--- a/themes/colors/css-1.6.2/images/general_sprite.png
+++ b/themes/colors/css-1.7.0/images/general_sprite.png
diff --git a/themes/colors/css-1.6.2/images/go.png b/themes/colors/css-1.7.0/images/go.png
index b0ae730ad4..b0ae730ad4 100644
--- a/themes/colors/css-1.6.2/images/go.png
+++ b/themes/colors/css-1.7.0/images/go.png
diff --git a/themes/colors/css-1.6.2/images/googlemaps.png b/themes/colors/css-1.7.0/images/googlemaps.png
index 12ab0c14d5..12ab0c14d5 100644
--- a/themes/colors/css-1.6.2/images/googlemaps.png
+++ b/themes/colors/css-1.7.0/images/googlemaps.png
diff --git a/themes/colors/css-1.6.2/images/help.png b/themes/colors/css-1.7.0/images/help.png
index 9309abc258..9309abc258 100644
--- a/themes/colors/css-1.6.2/images/help.png
+++ b/themes/colors/css-1.7.0/images/help.png
diff --git a/themes/colors/css-1.6.2/images/hline.png b/themes/colors/css-1.7.0/images/hline.png
index 7d23f087d3..7d23f087d3 100644
--- a/themes/colors/css-1.6.2/images/hline.png
+++ b/themes/colors/css-1.7.0/images/hline.png
diff --git a/themes/colors/css-1.6.2/images/icon-mime-sprite.png b/themes/colors/css-1.7.0/images/icon-mime-sprite.png
index 8322ae4580..8322ae4580 100644
--- a/themes/colors/css-1.6.2/images/icon-mime-sprite.png
+++ b/themes/colors/css-1.7.0/images/icon-mime-sprite.png
diff --git a/themes/colors/css-1.6.2/images/icon-pedigree.png b/themes/colors/css-1.7.0/images/icon-pedigree.png
index 82faf9eea6..82faf9eea6 100644
--- a/themes/colors/css-1.6.2/images/icon-pedigree.png
+++ b/themes/colors/css-1.7.0/images/icon-pedigree.png
diff --git a/themes/colors/css-1.6.2/images/icon-sfamily.png b/themes/colors/css-1.7.0/images/icon-sfamily.png
index eb70862edb..eb70862edb 100644
--- a/themes/colors/css-1.6.2/images/icon-sfamily.png
+++ b/themes/colors/css-1.7.0/images/icon-sfamily.png
diff --git a/themes/colors/css-1.6.2/images/image_add.png b/themes/colors/css-1.7.0/images/image_add.png
index ecac61c284..ecac61c284 100644
--- a/themes/colors/css-1.6.2/images/image_add.png
+++ b/themes/colors/css-1.7.0/images/image_add.png
diff --git a/themes/colors/css-1.6.2/images/image_edit.png b/themes/colors/css-1.7.0/images/image_edit.png
index 3fb8061de2..3fb8061de2 100644
--- a/themes/colors/css-1.6.2/images/image_edit.png
+++ b/themes/colors/css-1.7.0/images/image_edit.png
diff --git a/themes/colors/css-1.6.2/images/image_link.png b/themes/colors/css-1.7.0/images/image_link.png
index 190b08e7d2..190b08e7d2 100644
--- a/themes/colors/css-1.6.2/images/image_link.png
+++ b/themes/colors/css-1.7.0/images/image_link.png
diff --git a/themes/colors/css-1.6.2/images/image_view.png b/themes/colors/css-1.7.0/images/image_view.png
index 1e7babae94..1e7babae94 100644
--- a/themes/colors/css-1.6.2/images/image_view.png
+++ b/themes/colors/css-1.7.0/images/image_view.png
diff --git a/themes/colors/css-1.6.2/images/images.png b/themes/colors/css-1.7.0/images/images.png
index b3854d450a..b3854d450a 100644
--- a/themes/colors/css-1.6.2/images/images.png
+++ b/themes/colors/css-1.7.0/images/images.png
diff --git a/themes/colors/css-1.6.2/images/indicator.gif b/themes/colors/css-1.7.0/images/indicator.gif
index 085ccaecaf..085ccaecaf 100644
--- a/themes/colors/css-1.6.2/images/indicator.gif
+++ b/themes/colors/css-1.7.0/images/indicator.gif
diff --git a/themes/colors/css-1.6.2/images/indis.png b/themes/colors/css-1.7.0/images/indis.png
index cb39cb175a..cb39cb175a 100644
--- a/themes/colors/css-1.6.2/images/indis.png
+++ b/themes/colors/css-1.7.0/images/indis.png
diff --git a/themes/colors/css-1.6.2/images/larrow.png b/themes/colors/css-1.7.0/images/larrow.png
index 6d152c1aa0..6d152c1aa0 100644
--- a/themes/colors/css-1.6.2/images/larrow.png
+++ b/themes/colors/css-1.7.0/images/larrow.png
diff --git a/themes/colors/css-1.6.2/images/larrow2.png b/themes/colors/css-1.7.0/images/larrow2.png
index 9b63d582a0..9b63d582a0 100644
--- a/themes/colors/css-1.6.2/images/larrow2.png
+++ b/themes/colors/css-1.7.0/images/larrow2.png
diff --git a/themes/colors/css-1.6.2/images/ldarrow.png b/themes/colors/css-1.7.0/images/ldarrow.png
index fc0e73fc86..fc0e73fc86 100644
--- a/themes/colors/css-1.6.2/images/ldarrow.png
+++ b/themes/colors/css-1.7.0/images/ldarrow.png
diff --git a/themes/colors/css-1.6.2/images/left1B.png b/themes/colors/css-1.7.0/images/left1B.png
index 243deb5731..243deb5731 100644
--- a/themes/colors/css-1.6.2/images/left1B.png
+++ b/themes/colors/css-1.7.0/images/left1B.png
diff --git a/themes/colors/css-1.6.2/images/left2.png b/themes/colors/css-1.7.0/images/left2.png
index 85be3c3518..85be3c3518 100644
--- a/themes/colors/css-1.6.2/images/left2.png
+++ b/themes/colors/css-1.7.0/images/left2.png
diff --git a/themes/colors/css-1.6.2/images/left3.png b/themes/colors/css-1.7.0/images/left3.png
index 05c086ad84..05c086ad84 100644
--- a/themes/colors/css-1.6.2/images/left3.png
+++ b/themes/colors/css-1.7.0/images/left3.png
diff --git a/themes/colors/css-1.6.2/images/li.png b/themes/colors/css-1.7.0/images/li.png
index ffbb11f596..ffbb11f596 100644
--- a/themes/colors/css-1.6.2/images/li.png
+++ b/themes/colors/css-1.7.0/images/li.png
diff --git a/themes/colors/css-1.6.2/images/lifespan-chunk.png b/themes/colors/css-1.7.0/images/lifespan-chunk.png
index 493ce7e39f..493ce7e39f 100644
--- a/themes/colors/css-1.6.2/images/lifespan-chunk.png
+++ b/themes/colors/css-1.7.0/images/lifespan-chunk.png
diff --git a/themes/colors/css-1.6.2/images/lifespan-down.png b/themes/colors/css-1.7.0/images/lifespan-down.png
index d06f382790..d06f382790 100644
--- a/themes/colors/css-1.6.2/images/lifespan-down.png
+++ b/themes/colors/css-1.7.0/images/lifespan-down.png
diff --git a/themes/colors/css-1.6.2/images/lifespan-left.png b/themes/colors/css-1.7.0/images/lifespan-left.png
index 50eecf5249..50eecf5249 100644
--- a/themes/colors/css-1.6.2/images/lifespan-left.png
+++ b/themes/colors/css-1.7.0/images/lifespan-left.png
diff --git a/themes/colors/css-1.6.2/images/lifespan-right.png b/themes/colors/css-1.7.0/images/lifespan-right.png
index 2c7675b1d1..2c7675b1d1 100644
--- a/themes/colors/css-1.6.2/images/lifespan-right.png
+++ b/themes/colors/css-1.7.0/images/lifespan-right.png
diff --git a/themes/colors/css-1.6.2/images/lifespan-up.png b/themes/colors/css-1.7.0/images/lifespan-up.png
index e155fe6ce0..e155fe6ce0 100644
--- a/themes/colors/css-1.6.2/images/lifespan-up.png
+++ b/themes/colors/css-1.7.0/images/lifespan-up.png
diff --git a/themes/colors/css-1.6.2/images/loading.gif b/themes/colors/css-1.7.0/images/loading.gif
index 5bb90fd6a4..5bb90fd6a4 100644
--- a/themes/colors/css-1.6.2/images/loading.gif
+++ b/themes/colors/css-1.7.0/images/loading.gif
diff --git a/themes/colors/css-1.6.2/images/mapquest.png b/themes/colors/css-1.7.0/images/mapquest.png
index c62ccd1e52..c62ccd1e52 100644
--- a/themes/colors/css-1.6.2/images/mapquest.png
+++ b/themes/colors/css-1.7.0/images/mapquest.png
diff --git a/themes/colors/css-1.6.2/images/media.png b/themes/colors/css-1.7.0/images/media.png
index 4afcea74de..4afcea74de 100644
--- a/themes/colors/css-1.6.2/images/media.png
+++ b/themes/colors/css-1.7.0/images/media.png
diff --git a/themes/colors/css-1.6.2/images/minus.png b/themes/colors/css-1.7.0/images/minus.png
index 8ed68808da..8ed68808da 100644
--- a/themes/colors/css-1.6.2/images/minus.png
+++ b/themes/colors/css-1.7.0/images/minus.png
diff --git a/themes/colors/css-1.6.2/images/mypage.png b/themes/colors/css-1.7.0/images/mypage.png
index cb39cb175a..cb39cb175a 100644
--- a/themes/colors/css-1.6.2/images/mypage.png
+++ b/themes/colors/css-1.7.0/images/mypage.png
diff --git a/themes/colors/css-1.6.2/images/notes.png b/themes/colors/css-1.7.0/images/notes.png
index 178a1ea020..178a1ea020 100644
--- a/themes/colors/css-1.6.2/images/notes.png
+++ b/themes/colors/css-1.7.0/images/notes.png
diff --git a/themes/colors/css-1.6.2/images/osm.png b/themes/colors/css-1.7.0/images/osm.png
index 899e2a58b6..899e2a58b6 100644
--- a/themes/colors/css-1.6.2/images/osm.png
+++ b/themes/colors/css-1.7.0/images/osm.png
diff --git a/themes/colors/css-1.6.2/images/patriarch.png b/themes/colors/css-1.7.0/images/patriarch.png
index 9672bb6bf9..9672bb6bf9 100644
--- a/themes/colors/css-1.6.2/images/patriarch.png
+++ b/themes/colors/css-1.7.0/images/patriarch.png
diff --git a/themes/colors/css-1.7.0/images/pedigree.png b/themes/colors/css-1.7.0/images/pedigree.png
new file mode 100644
index 0000000000..6ddf84588d
--- /dev/null
+++ b/themes/colors/css-1.7.0/images/pedigree.png
diff --git a/themes/colors/css-1.6.2/images/place.png b/themes/colors/css-1.7.0/images/place.png
index b7e16bdd3e..b7e16bdd3e 100644
--- a/themes/colors/css-1.6.2/images/place.png
+++ b/themes/colors/css-1.7.0/images/place.png
diff --git a/themes/colors/css-1.6.2/images/plus.png b/themes/colors/css-1.7.0/images/plus.png
index 64e15fc9f3..64e15fc9f3 100644
--- a/themes/colors/css-1.6.2/images/plus.png
+++ b/themes/colors/css-1.7.0/images/plus.png
diff --git a/themes/colors/css-1.6.2/images/webtrees.png b/themes/colors/css-1.7.0/images/powered-by-webtrees.png
index 137677e3fb..137677e3fb 100644
--- a/themes/colors/css-1.6.2/images/webtrees.png
+++ b/themes/colors/css-1.7.0/images/powered-by-webtrees.png
diff --git a/themes/colors/css-1.6.2/images/rarrow.png b/themes/colors/css-1.7.0/images/rarrow.png
index 705bc43c4f..705bc43c4f 100644
--- a/themes/colors/css-1.6.2/images/rarrow.png
+++ b/themes/colors/css-1.7.0/images/rarrow.png
diff --git a/themes/colors/css-1.6.2/images/rarrow2.png b/themes/colors/css-1.7.0/images/rarrow2.png
index a74991fd63..a74991fd63 100644
--- a/themes/colors/css-1.6.2/images/rarrow2.png
+++ b/themes/colors/css-1.7.0/images/rarrow2.png
diff --git a/themes/colors/css-1.6.2/images/rdarrow.png b/themes/colors/css-1.7.0/images/rdarrow.png
index 198e7d1768..198e7d1768 100644
--- a/themes/colors/css-1.6.2/images/rdarrow.png
+++ b/themes/colors/css-1.7.0/images/rdarrow.png
diff --git a/themes/colors/css-1.6.2/images/reminder.png b/themes/colors/css-1.7.0/images/reminder.png
index fa5bbcf507..fa5bbcf507 100644
--- a/themes/colors/css-1.6.2/images/reminder.png
+++ b/themes/colors/css-1.7.0/images/reminder.png
diff --git a/themes/colors/css-1.6.2/images/reorder.png b/themes/colors/css-1.7.0/images/reorder.png
index 2cfe889ad1..2cfe889ad1 100644
--- a/themes/colors/css-1.6.2/images/reorder.png
+++ b/themes/colors/css-1.7.0/images/reorder.png
diff --git a/themes/colors/css-1.6.2/images/report.png b/themes/colors/css-1.7.0/images/report.png
index abb54537ac..abb54537ac 100644
--- a/themes/colors/css-1.6.2/images/report.png
+++ b/themes/colors/css-1.7.0/images/report.png
diff --git a/themes/colors/css-1.6.2/images/repository.png b/themes/colors/css-1.7.0/images/repository.png
index 87bc90bec1..87bc90bec1 100644
--- a/themes/colors/css-1.6.2/images/repository.png
+++ b/themes/colors/css-1.7.0/images/repository.png
diff --git a/themes/colors/css-1.6.2/images/resn_confidential.png b/themes/colors/css-1.7.0/images/resn_confidential.png
index 4e5449b25a..4e5449b25a 100644
--- a/themes/colors/css-1.6.2/images/resn_confidential.png
+++ b/themes/colors/css-1.7.0/images/resn_confidential.png
diff --git a/themes/colors/css-1.6.2/images/resn_locked.png b/themes/colors/css-1.7.0/images/resn_locked.png
index b65a188dd3..b65a188dd3 100644
--- a/themes/colors/css-1.6.2/images/resn_locked.png
+++ b/themes/colors/css-1.7.0/images/resn_locked.png
diff --git a/themes/colors/css-1.6.2/images/resn_none.png b/themes/colors/css-1.7.0/images/resn_none.png
index d86137658e..d86137658e 100644
--- a/themes/colors/css-1.6.2/images/resn_none.png
+++ b/themes/colors/css-1.7.0/images/resn_none.png
diff --git a/themes/colors/css-1.6.2/images/resn_privacy.png b/themes/colors/css-1.7.0/images/resn_privacy.png
index ca462fd84d..ca462fd84d 100644
--- a/themes/colors/css-1.6.2/images/resn_privacy.png
+++ b/themes/colors/css-1.7.0/images/resn_privacy.png
diff --git a/themes/colors/css-1.6.2/images/right1B.png b/themes/colors/css-1.7.0/images/right1B.png
index 4631252fe1..4631252fe1 100644
--- a/themes/colors/css-1.6.2/images/right1B.png
+++ b/themes/colors/css-1.7.0/images/right1B.png
diff --git a/themes/colors/css-1.6.2/images/right3.png b/themes/colors/css-1.7.0/images/right3.png
index e049592f14..e049592f14 100644
--- a/themes/colors/css-1.6.2/images/right3.png
+++ b/themes/colors/css-1.7.0/images/right3.png
diff --git a/themes/colors/css-1.6.2/images/rings.png b/themes/colors/css-1.7.0/images/rings.png
index 2190ac6573..2190ac6573 100644
--- a/themes/colors/css-1.6.2/images/rings.png
+++ b/themes/colors/css-1.7.0/images/rings.png
diff --git a/themes/colors/css-1.6.2/images/selected.png b/themes/colors/css-1.7.0/images/selected.png
index 7abd8e6031..7abd8e6031 100644
--- a/themes/colors/css-1.6.2/images/selected.png
+++ b/themes/colors/css-1.7.0/images/selected.png
diff --git a/themes/colors/css-1.6.2/images/sex_f_15x15.png b/themes/colors/css-1.7.0/images/sex_f_15x15.png
index 2d3abae32a..2d3abae32a 100644
--- a/themes/colors/css-1.6.2/images/sex_f_15x15.png
+++ b/themes/colors/css-1.7.0/images/sex_f_15x15.png
diff --git a/themes/colors/css-1.6.2/images/sex_f_9x9.png b/themes/colors/css-1.7.0/images/sex_f_9x9.png
index e35e46ccd4..e35e46ccd4 100644
--- a/themes/colors/css-1.6.2/images/sex_f_9x9.png
+++ b/themes/colors/css-1.7.0/images/sex_f_9x9.png
diff --git a/themes/colors/css-1.6.2/images/sex_m_15x15.png b/themes/colors/css-1.7.0/images/sex_m_15x15.png
index 4ac7956421..4ac7956421 100644
--- a/themes/colors/css-1.6.2/images/sex_m_15x15.png
+++ b/themes/colors/css-1.7.0/images/sex_m_15x15.png
diff --git a/themes/colors/css-1.6.2/images/sex_m_9x9.png b/themes/colors/css-1.7.0/images/sex_m_9x9.png
index 32a8484b1f..32a8484b1f 100644
--- a/themes/colors/css-1.6.2/images/sex_m_9x9.png
+++ b/themes/colors/css-1.7.0/images/sex_m_9x9.png
diff --git a/themes/colors/css-1.6.2/images/sex_u_15x15.png b/themes/colors/css-1.7.0/images/sex_u_15x15.png
index 158c3f9a10..158c3f9a10 100644
--- a/themes/colors/css-1.6.2/images/sex_u_15x15.png
+++ b/themes/colors/css-1.7.0/images/sex_u_15x15.png
diff --git a/themes/colors/css-1.6.2/images/sex_u_9x9.png b/themes/colors/css-1.7.0/images/sex_u_9x9.png
index d113a1898c..d113a1898c 100644
--- a/themes/colors/css-1.6.2/images/sex_u_9x9.png
+++ b/themes/colors/css-1.7.0/images/sex_u_9x9.png
diff --git a/themes/colors/css-1.7.0/images/sfamily.png b/themes/colors/css-1.7.0/images/sfamily.png
new file mode 100644
index 0000000000..828b83ee08
--- /dev/null
+++ b/themes/colors/css-1.7.0/images/sfamily.png
diff --git a/themes/colors/css-1.6.2/images/silhouette_female.png b/themes/colors/css-1.7.0/images/silhouette_female.png
index bb8d503371..bb8d503371 100644
--- a/themes/colors/css-1.6.2/images/silhouette_female.png
+++ b/themes/colors/css-1.7.0/images/silhouette_female.png
diff --git a/themes/colors/css-1.6.2/images/silhouette_female_small.png b/themes/colors/css-1.7.0/images/silhouette_female_small.png
index 4258916eef..4258916eef 100644
--- a/themes/colors/css-1.6.2/images/silhouette_female_small.png
+++ b/themes/colors/css-1.7.0/images/silhouette_female_small.png
diff --git a/themes/colors/css-1.6.2/images/silhouette_male.png b/themes/colors/css-1.7.0/images/silhouette_male.png
index 0615900224..0615900224 100644
--- a/themes/colors/css-1.6.2/images/silhouette_male.png
+++ b/themes/colors/css-1.7.0/images/silhouette_male.png
diff --git a/themes/colors/css-1.6.2/images/silhouette_male_small.png b/themes/colors/css-1.7.0/images/silhouette_male_small.png
index fb376fd233..fb376fd233 100644
--- a/themes/colors/css-1.6.2/images/silhouette_male_small.png
+++ b/themes/colors/css-1.7.0/images/silhouette_male_small.png
diff --git a/themes/colors/css-1.6.2/images/silhouette_unknown.png b/themes/colors/css-1.7.0/images/silhouette_unknown.png
index d0417439ee..d0417439ee 100644
--- a/themes/colors/css-1.6.2/images/silhouette_unknown.png
+++ b/themes/colors/css-1.7.0/images/silhouette_unknown.png
diff --git a/themes/colors/css-1.6.2/images/silhouette_unknown_small.png b/themes/colors/css-1.7.0/images/silhouette_unknown_small.png
index dda5d259e8..dda5d259e8 100644
--- a/themes/colors/css-1.6.2/images/silhouette_unknown_small.png
+++ b/themes/colors/css-1.7.0/images/silhouette_unknown_small.png
diff --git a/themes/colors/css-1.6.2/images/source.png b/themes/colors/css-1.7.0/images/source.png
index 994fa9d38a..994fa9d38a 100644
--- a/themes/colors/css-1.6.2/images/source.png
+++ b/themes/colors/css-1.7.0/images/source.png
diff --git a/themes/colors/css-1.6.2/images/spacer.png b/themes/colors/css-1.7.0/images/spacer.png
index a31b396979..a31b396979 100644
--- a/themes/colors/css-1.6.2/images/spacer.png
+++ b/themes/colors/css-1.7.0/images/spacer.png
diff --git a/themes/colors/css-1.6.2/images/sprites-sub-menu.png b/themes/colors/css-1.7.0/images/sprites-sub-menu.png
index ef015b9902..ef015b9902 100644
--- a/themes/colors/css-1.6.2/images/sprites-sub-menu.png
+++ b/themes/colors/css-1.7.0/images/sprites-sub-menu.png
diff --git a/themes/colors/css-1.6.2/images/sprites-top-menu.png b/themes/colors/css-1.7.0/images/sprites-top-menu.png
index ded8eff5ac..ded8eff5ac 100644
--- a/themes/colors/css-1.6.2/images/sprites-top-menu.png
+++ b/themes/colors/css-1.7.0/images/sprites-top-menu.png
diff --git a/themes/colors/css-1.6.2/images/stop.png b/themes/colors/css-1.7.0/images/stop.png
index a15d4bae84..a15d4bae84 100644
--- a/themes/colors/css-1.6.2/images/stop.png
+++ b/themes/colors/css-1.7.0/images/stop.png
diff --git a/themes/colors/css-1.6.2/images/uarrow.png b/themes/colors/css-1.7.0/images/uarrow.png
index dde11141c3..dde11141c3 100644
--- a/themes/colors/css-1.6.2/images/uarrow.png
+++ b/themes/colors/css-1.7.0/images/uarrow.png
diff --git a/themes/colors/css-1.6.2/images/uarrow2.png b/themes/colors/css-1.7.0/images/uarrow2.png
index e82af4097a..e82af4097a 100644
--- a/themes/colors/css-1.6.2/images/uarrow2.png
+++ b/themes/colors/css-1.7.0/images/uarrow2.png
diff --git a/themes/colors/css-1.6.2/images/udarrow.png b/themes/colors/css-1.7.0/images/udarrow.png
index e26db59a0b..e26db59a0b 100644
--- a/themes/colors/css-1.6.2/images/udarrow.png
+++ b/themes/colors/css-1.7.0/images/udarrow.png
diff --git a/themes/colors/css-1.6.2/images/user_add.png b/themes/colors/css-1.7.0/images/user_add.png
index e6a539b726..e6a539b726 100644
--- a/themes/colors/css-1.6.2/images/user_add.png
+++ b/themes/colors/css-1.7.0/images/user_add.png
diff --git a/themes/colors/css-1.6.2/images/vline.png b/themes/colors/css-1.7.0/images/vline.png
index 4aefe4df4e..4aefe4df4e 100644
--- a/themes/colors/css-1.6.2/images/vline.png
+++ b/themes/colors/css-1.7.0/images/vline.png
diff --git a/themes/colors/css-1.6.2/images/w_button.png b/themes/colors/css-1.7.0/images/w_button.png
index 31af28a377..31af28a377 100644
--- a/themes/colors/css-1.6.2/images/w_button.png
+++ b/themes/colors/css-1.7.0/images/w_button.png
diff --git a/themes/colors/css-1.6.2/images/warning.png b/themes/colors/css-1.7.0/images/warning.png
index d484c33341..d484c33341 100644
--- a/themes/colors/css-1.6.2/images/warning.png
+++ b/themes/colors/css-1.7.0/images/warning.png
diff --git a/themes/colors/css-1.6.2/images/zoomin.png b/themes/colors/css-1.7.0/images/zoomin.png
index b40b34c4e5..b40b34c4e5 100644
--- a/themes/colors/css-1.6.2/images/zoomin.png
+++ b/themes/colors/css-1.7.0/images/zoomin.png
diff --git a/themes/colors/css-1.6.2/images/zoomout.png b/themes/colors/css-1.7.0/images/zoomout.png
index ce56e5042c..ce56e5042c 100644
--- a/themes/colors/css-1.6.2/images/zoomout.png
+++ b/themes/colors/css-1.7.0/images/zoomout.png
diff --git a/themes/colors/css-1.6.2/css/aquamarine.css b/themes/colors/css-1.7.0/palette/aquamarine.css
index 9fc2ff4d0d..6b9ca364f7 100644
--- a/themes/colors/css-1.6.2/css/aquamarine.css
+++ b/themes/colors/css-1.7.0/palette/aquamarine.css
@@ -25,7 +25,7 @@
 /* Aquamarine Palette */
 
 /* Header */
-#header {
+header {
 	background: #007e94;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #085360;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/ash.css b/themes/colors/css-1.7.0/palette/ash.css
index c7ec2abcca..16da0ffde7 100644
--- a/themes/colors/css-1.6.2/css/ash.css
+++ b/themes/colors/css-1.7.0/palette/ash.css
@@ -25,7 +25,7 @@
 /* Ash Palette */
 
 /* Header */
-#header {
+header {
 	background: #5d6779;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #2a2b2d;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/belgianchocolate.css b/themes/colors/css-1.7.0/palette/belgianchocolate.css
index f7c0af2133..04ce5cf37a 100644
--- a/themes/colors/css-1.6.2/css/belgianchocolate.css
+++ b/themes/colors/css-1.7.0/palette/belgianchocolate.css
@@ -25,7 +25,7 @@
 /* Belgianchocolate Palette */
 
 /* Header */
-#header {
+header {
 	background: #971702;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #311900;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/bluelagoon.css b/themes/colors/css-1.7.0/palette/bluelagoon.css
index 3c0d0db6cc..2251c435e8 100644
--- a/themes/colors/css-1.6.2/css/bluelagoon.css
+++ b/themes/colors/css-1.7.0/palette/bluelagoon.css
@@ -25,7 +25,7 @@
 /* Bluelagoon Palette */
 
 /* Header */
-#header {
+header {
 	background: #5ab5ee;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #2385c2;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/bluemarine.css b/themes/colors/css-1.7.0/palette/bluemarine.css
index 54a0311e73..20bbade8ce 100644
--- a/themes/colors/css-1.6.2/css/bluemarine.css
+++ b/themes/colors/css-1.7.0/palette/bluemarine.css
@@ -25,7 +25,7 @@
 /* Bluemarine Palette */
 
 /* Header */
-#header {
+header {
 	background: #6598cb;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #98badd;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/coffeeandcream.css b/themes/colors/css-1.7.0/palette/coffeeandcream.css
index eabbcdff8e..95a1a1a765 100644
--- a/themes/colors/css-1.6.2/css/coffeeandcream.css
+++ b/themes/colors/css-1.7.0/palette/coffeeandcream.css
@@ -25,7 +25,7 @@
 /* Coffeeandcream Palette */
 
 /* Header */
-#header {
+header {
 	background: #d4c7a7;
 	color: #553e2f;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #93724f;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #553e2f;
 }
 
diff --git a/themes/colors/css-1.6.2/css/coldday.css b/themes/colors/css-1.7.0/palette/coldday.css
index e5aa6c5ecf..b975c8b22d 100644
--- a/themes/colors/css-1.6.2/css/coldday.css
+++ b/themes/colors/css-1.7.0/palette/coldday.css
@@ -25,7 +25,7 @@
 /* Coldday Palette */
 
 /* Header */
-#header {
+header {
 	background: #1a1575;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #4d91ff;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/greenbeam.css b/themes/colors/css-1.7.0/palette/greenbeam.css
index db145c8871..ae0b026b07 100644
--- a/themes/colors/css-1.6.2/css/greenbeam.css
+++ b/themes/colors/css-1.7.0/palette/greenbeam.css
@@ -25,7 +25,7 @@
 /* Greenbeam Palette */
 
 /* Header */
-#header {
+header {
 	background: #03961e;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #7be000;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/mediterranio.css b/themes/colors/css-1.7.0/palette/mediterranio.css
index e71db91537..b5cfa4bb20 100644
--- a/themes/colors/css-1.6.2/css/mediterranio.css
+++ b/themes/colors/css-1.7.0/palette/mediterranio.css
@@ -25,7 +25,7 @@
 /* Mediterranio Palette */
 
 /* Header */
-#header {
+header {
 	background: #a30f42;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #fc6d1d;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/mercury.css b/themes/colors/css-1.7.0/palette/mercury.css
index 542eedf6b9..8ae792f12f 100644
--- a/themes/colors/css-1.6.2/css/mercury.css
+++ b/themes/colors/css-1.7.0/palette/mercury.css
@@ -25,7 +25,7 @@
 /* Mercury Palette */
 
 /* Header */
-#header {
+header {
 	background: #d4d4d4;
 	color: #707070;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #a9adbc;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #707070;
 }
 
diff --git a/themes/colors/css-1.6.2/css/nocturnal.css b/themes/colors/css-1.7.0/palette/nocturnal.css
index 2c6d98f1ad..81b75b53b0 100644
--- a/themes/colors/css-1.6.2/css/nocturnal.css
+++ b/themes/colors/css-1.7.0/palette/nocturnal.css
@@ -25,7 +25,7 @@
 /* Nocturnal Palette */
 
 /* Header */
-#header {
+header {
 	background: #0a2352;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #9fa8d5;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/olivia.css b/themes/colors/css-1.7.0/palette/olivia.css
index 0847f00187..513e15df8d 100644
--- a/themes/colors/css-1.6.2/css/olivia.css
+++ b/themes/colors/css-1.7.0/palette/olivia.css
@@ -25,7 +25,7 @@
 /* Olivia Palette */
 
 /* Header */
-#header {
+header {
 	background: #7db323;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #b5d52a;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/pinkplastic.css b/themes/colors/css-1.7.0/palette/pinkplastic.css
index 50d7ec92f2..9fa0066625 100644
--- a/themes/colors/css-1.6.2/css/pinkplastic.css
+++ b/themes/colors/css-1.7.0/palette/pinkplastic.css
@@ -25,7 +25,7 @@
 /* Pinkplastic Palette */
 
 /* Header */
-#header {
+header {
 	background: #f41063;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #f391c6;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/sage.css b/themes/colors/css-1.7.0/palette/sage.css
index 4fee0ef9ac..8f299d566a 100644
--- a/themes/colors/css-1.6.2/css/sage.css
+++ b/themes/colors/css-1.7.0/palette/sage.css
@@ -25,7 +25,7 @@
 /* Sage Palette */
 
 /* Header */
-#header {
+header {
 	background: #767647;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #cca;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/shinytomato.css b/themes/colors/css-1.7.0/palette/shinytomato.css
index 7059560e09..3c21970962 100644
--- a/themes/colors/css-1.6.2/css/shinytomato.css
+++ b/themes/colors/css-1.7.0/palette/shinytomato.css
@@ -25,7 +25,7 @@
 /* Shinytomato Palette */
 
 /* Header */
-#header {
+header {
 	background: #f21107;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #a1443a;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/tealtop.css b/themes/colors/css-1.7.0/palette/tealtop.css
index 0a2c011d1c..e13fdcb687 100644
--- a/themes/colors/css-1.6.2/css/tealtop.css
+++ b/themes/colors/css-1.7.0/palette/tealtop.css
@@ -25,7 +25,7 @@
 /* Tealtop Palette */
 
 /* Header */
-#header {
+header {
 	background: #34775a;
 	color: #fff;
 }
@@ -52,7 +52,7 @@
 }
 
 /* Top Menu  */
-#main-menu {
+.primary-menu {
 	background: #52bf90;
 
 }
@@ -60,7 +60,7 @@
 /* Base */
 #indi_header h3,
 .blockcontent, #search, #search-page-table .value, #edituser-table .value,
-.makeMenu ul li a:hover, .ui-widget-header, #save-cancel,
+.secondary-menu ul li a:hover, .ui-widget-header, #save-cancel,
 .optionbox, #indi_header .ui-state-active a:link,
 .list_value, .list_value_wrap, .list_value_wrap a,
 #login-form, #new_passwd_form, #register-form, .facts_value  {
@@ -73,7 +73,7 @@
 }
 
 /* Light Text */
-.makeMenu li a {
+.secondary-menu li a {
 	color: #fff;
 }
 
diff --git a/themes/colors/css-1.6.2/css/colors.css b/themes/colors/css-1.7.0/style.css
index 1e797cb6ea..e5cc68f2c6 100644
--- a/themes/colors/css-1.6.2/css/colors.css
+++ b/themes/colors/css-1.7.0/style.css
@@ -4,9 +4,10 @@
 * webtrees: Web based Family History software
 * Copyright (C) 2014 webtrees development team.
 *
-* Derived from PhpGedView Cloudy theme
-* Original author w.a. bastein http://genealogy.bastein.biz
-* Copyright (C) 2010 PGV Development Team.
+* Derived from PhpGedView
+* Copyright (C) 2002 to 2009 PGV Development Team.
+*
+* Mime-type icons from http://gnome-look.org, published under GPL (v2)
 *
 * 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
@@ -23,104 +24,78 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-/* Set defaults */
+/* ======== Globals ========== */
+
 /* Add a permanent scrollbar, to prevent "flickering" when hover effects lengthen page */
 html {
 	overflow-y: scroll;
 }
 
 body {
-	font: 12px tahoma, arial, helvetica, sans-serif;
-}
-
-legend,
-.details_label {
-	font-weight: 700;
-}
-
-a {
-	color: #333;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #f00;
-	text-decoration: none;
-}
-
-:focus {
-	outline-style: none;
-}
-
-h2 {
 	color: #333;
-	font-size: 18px;
-	font-weight: 700;
-}
-
-h4 {
-	font-weight: 700;
-}
-
-hr {
-	margin-top: 5px;
-}
-
-th {
-	font-weight: 100;
-}
-
-select {
-	border: 1px solid #ccc;
-}
-
-img {
-	border: 0 none;
-}
-
-img.block {
-	height: 25px;
-}
-
-fieldset {
-	margin: 8px 8px 4px;
-	padding: 30px;
-	text-align: left;
+	background-color: #fff;
+	font: 12px tahoma, arial, helvetica, sans-serif;
+	margin: 0;
 }
 
-fieldset ol,
-fieldset li {
-	margin: 2px 0 0 5px;
+p {
+	margin: 12px 0;
 }
 
-[dir=rtl] fieldset {
-	text-align: right;
+#home-page {
+	padding: 8px 0;
 }
 
-[dir=rtl] fieldset ol,
-fieldset li {
-	margin: 2px 5px 0 0;
+#content {
+	margin-left: 8px;  
+	margin-right: 8px;
+	padding-top: 10px;
 }
 
-dt {
-	float: left;
-	font-weight: bold;
-	margin-right: 10px;
+main {
+	display: block;
 	clear: both;
 }
 
-[dir=rtl] dt {
-	float: right;
-	margin-right: auto;
-	margin-left: 10px;
-}
-
-* {
-	margin: 0;
+/* ====== Round Corners ======== */
+input,
+textarea,
+fieldset,
+.border1,
+.block,
+.descriptionbox,
+.facts_label,
+.facts_label03,
+.facts_value,
+.lifespan_outer,
+.list_label,
+.list_label_wrap,
+.list_value,
+.list_value_wrap,
+.messagebox,
+.optionbox,
+.person_box,
+.person_boxF,
+.person_boxNN,
+.person0,
+.person1,
+.person2,
+.person3,
+.person4,
+.person5,
+.primary-menu ul,
+.secondary-menu li ul,
+footer,
+#indi_main_blocks,
+#tabs,
+#save-cancel,
+.topbottombar {
+	border-radius: 3px;
 }
 
-td {
-	padding: 0;
+/* ios on click workaround */
+.iconz {
+	cursor: pointer;
 }
 
 input:required:valid,
@@ -140,1320 +115,506 @@ textarea:required:invalid {
 	background-position: left top;
 }
 
-/* Set stack level for top two header menu rows */
-.makeMenu ul,
-#main-menu ul {
-	z-index: 210;
-}
-
-/* Title Line */
-#header {
-	height: 50px;
-}
-
-header h1 {
-	float: left;
-	font-size: 24px;
-	font-weight: normal;
-	margin: 16px 12px 3px;
-}
-
-[dir=rtl] header h1 {
-	float: right;
-	margin: 16px 12px 3px;
-}
-
-/* Options Menu */
-.makeMenu {
-	float: right;
-	margin: 21px 10px 0 0;
-	white-space: nowrap;
-}
-
-.makeMenu ul {
-	border-radius: 5px;
-}
-
-.makeMenu li {
-	display: inline;
-	position: relative;
-	white-space: nowrap;
-}
-
-.makeMenu li:before {
-	content: " | ";
-}
-
-.makeMenu li a.link {
-	font-size: 13px;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-
-.makeMenu li ul {
-	background-color: #eee;
-	border: thin solid #aaa;
-	display: none;
-	left: 10px;
-	position: absolute;
-}
-
-.makeMenu li ul li {
-	display: block;
-	text-align: left;
-}
-
-.makeMenu li ul li a {
+a {
 	color: #333;
+	text-decoration: none;
 }
 
-.makeMenu,
-.makeMenu li ul {
-	color: #fff;
-	list-style: none;
-	margin-left: 0;
-	padding: 1px;
-	top: 5px;
-}
-
-/*set position of dropdown */
-.makeMenu li:hover > ul {
-	display: block;
-}
-
-.makeMenu li a:hover {
-	color: #f5003d;
-}
-
-.makeMenu ul li a {
-	background-color: #fff;
-	display: block;
-	padding: 2px 5px 2px 2px;
+a:hover {
+	color: #f00;
+	text-decoration: none;
 }
 
-.makeMenu ul li a:hover {
-	color: #000;
+:focus {
+	outline-style: none;
 }
 
-.makeMenu li ul li:before,
-.makeMenu li:first-child:before {
-	content: "";
+#flash-messages {
+	clear: both;
 }
 
-.lang-active,
-.theme-active {
-	font-weight: 900;
+dl {
+	margin: 0;
 }
 
-[dir=rtl] .makeMenu {
-	display: block;
+dt {
 	float: left;
-	margin: 21px 0 0 10px;
-}
-
-[dir=rtl] .makeMenu li ul {
-	left: auto;
-	right: 0;
+	font-weight: bold;
+	margin-right: 10px;
 }
 
-[dir=rtl] .makeMenu li ul li {
-	text-align: right;
+[dir=rtl] dt {
+	float: right;
+	margin-right: auto;
+	margin-left: 10px;
 }
 
-/* Menu setup */
-#main-menu {
-	display: inline-block;
-	width: 100%;
-	margin: 0;
-	padding: 0;
-	height: 48px;
+h2 {
+	color: #333;
+	font-size: 18px;
+	font-weight: bold;
+	margin: 14px 0;
 }
 
-#main-menu ul {
-	padding: 0;
-	margin: 0;
-	border: 1px solid #ddd;
-	border-radius: 5px;
-	list-style-type: none;
-	position: absolute;
-	visibility: hidden;
-	opacity: 0;
-	background: #fff;
+h4 {
+	color: #333;
+	font-size: 12px;
+	font-weight: bold;
 }
 
-#main-menu li {
-	display: block;
-	position: relative;
-	float: left;
-	list-style: none;
+th {
+	font-weight: 100;
 }
 
-#main-menu li a {
-	display: block;
+ul {
+	padding-left: 15px;
+	padding-right: 15px;
+	margin: 8px;
 }
 
-#main-menu li > ul {
-	display: block;
-	position: absolute;
-	top: 0;
-	left: 100%;
-	right: auto;
+img {
+	border: 0;
 }
 
-#main-menu > li > a {
-	height: 37px;
-	width: 27px;
+legend img {
+	height: 20px;
+	vertical-align: middle;
+	width: 20px;
 }
 
-#main-menu > li > ul {
-	left: 0;
-	right: auto;
-	top: 40px;
+img.block,
+#mycart img {
+	border: 0;
+	height: 25px;
+	vertical-align: middle;
 }
 
-#main-menu a {
-	display: block;
-	text-decoration: none;
-	padding: 0 10px;
-	margin: 0;
-	white-space: nowrap;
+input,
+button,
+textarea {
+	border-width: 1px;
+	border-color: #fff #494949 #494949 #fff;
+	font-size: 13px;
 }
 
-#main-menu ul li:hover a,
-#main-menu li:hover li a {
-	background: none;
-	border: 0;
+input,
+textarea {
+	padding: 3px;
 }
 
-#main-menu li:hover > ul {
-	visibility: visible;
-	opacity: 1;
+textarea {
+	border-style: inset;
 }
 
-/* First row submenu style*/
-#main-menu > li > ul > li:first-child {
-	text-indent: 0;
-	min-width: 100px;
-	width: 100%;
-	background: none;
+.topbottombar {
+	color: #fff;
+	font-size: 12px;
 	font-weight: bold;
-	white-space: nowrap;
-	font-size: 14px;
+	padding: 4px;
 	text-align: center;
-	height: 22px;
-	line-height: 1.5;
-	border-bottom: solid #ddd 1px;
 }
 
-/* Menu icons */
-#main-menu > li {
-	background-image: url(../images/sprites-top-menu.png);
-	background-repeat: no-repeat;
-	height: 40px;
-	line-height: 40px;
-	margin: 4px 0 0 16px;
-	text-indent: 32px;
-	width: 40px;
-}
-
-#main-menu li ul li {
-	background-image: url(../images/sprites-sub-menu.png);
-	background-repeat: no-repeat;
-	height: 28px;
-	left: auto;
-	line-height: 25px;
+fieldset {
+	margin: 8px 8px 4px;
 	text-align: left;
-	text-indent: 22px;
-	width: 100%;
-}
-
-[dir=rtl] #main-menu > li {
-	margin: 4px 16px 0 0;
-}
-
-[dir=rtl] #main-menu li {
-	float: right;
-}
-
-[dir=rtl] #main-menu li:hover > ul {
-	right: 100%;
-	left: auto;
-}
-
-[dir=rtl] #main-menu > li:hover > ul {
-	left: auto;
-	right: 0;
 }
 
-[dir=rtl] #main-menu li li {
+[dir=rtl] fieldset {
 	text-align: right;
 }
 
-[dir=rtl] #main-menu li li a {
-	display: block;
-	float: right;
-}
-
-[dir=rtl] #main-menu > li > ul > li:first-child {
-	text-align: center;
-}
-
-#flash-messages {
-	clear: both;
-}
-
-/* Menu Icons */
-#menu-tree {
-	background-position: center 0;
-}
-
-#menu-chart {
-	background-position: center -41px;
-}
-
-#menu-list {
-	background-position: center -82px;
-}
-
-#menu-calendar {
-	background-position: center -123px;
-}
-
-#menu-report {
-	background-position: center -164px;
-}
-
-#menu-search {
-	background-position: center -205px;
-}
-
-#menu-help {
-	background-position: center -246px;
-}
-
-#menu-mymenu {
-	background-position: center -287px;
-}
-
-#menu-clippings {
-	background-position: center -328px;
-}
-
-#menu-indi {
-	background-position: center -369px;
-}
-
-#menu-sour {
-	background-position: center -451px;
-}
-
-#menu-fam {
-	background-position: center -410px;
-}
-
-#menu-note {
-	background-position: center -492px;
-}
-
-#menu-obje {
-	background-position: center -533px;
-}
-
-#menu-repo {
-	background-position: center -574px;
-}
-
-#menu-story {
-	background-position: center -616px;
-}
-
-/* Submenu Icons */
-#menu-chart-ancestry {
-	background-position: left -208px;
-}
-
-[dir=rtl] #menu-chart-ancestry {
-	background-position: right -208px;
-}
-
-#menu-chart-fanchart {
-	background-position: left -26px;
-}
-
-[dir=rtl] #menu-chart-fanchart {
-	background-position: right -26px;
-}
-
-#menu-chart-compact {
-	background-position: left -52px;
-}
-
-[dir=rtl] #menu-chart-compact {
-	background-position: right -52px;
-}
-
-#menu-chart-descendancy {
-	background-position: left -0px;
-}
-
-[dir=rtl] #menu-chart-descendancy {
-	background-position: right -0px;
-}
-
-#menu-chart-familybook {
-	background-position: left -104px;
-}
-
-[dir=rtl] #menu-chart-familybook {
-	background-position: right -104px;
-}
-
-#menu-chart-hourglass {
-	background-position: left -130px;
-}
-
-[dir=rtl] #menu-chart-hourglass {
-	background-position: right -130px;
-}
-
-#menu-chart-tree {
-	background-position: left -156px;
-}
-
-[dir=rtl] #menu-chart-tree {
-	background-position: right -156px;
-}
-
-#menu-chart-lifespan {
-	background-position: left -182px;
-}
-
-[dir=rtl] #menu-chart-lifespan {
-	background-position: right -182px;
-}
-
-#menu-chart-pedigree {
-	background-position: left -208px;
-}
-
-[dir=rtl] #menu-chart-pedigree {
-	background-position: right -208px;
-}
-
-#menu-chart-pedigree_map {
-	background-position: left -234px;
-}
-
-[dir=rtl] #menu-chart-pedigree_map {
-	background-position: right -234px;
-}
-
-#menu-chart-relationship {
-	background-position: left -260px;
-}
-
-[dir=rtl] #menu-chart-relationship {
-	background-position: right -260px;
-}
-
-#menu-chart-relationship li {
-	background-position: left -260px;
-}
-
-[dir=rtl] #menu-chart-relationship li {
-	background-position: right -260px;
-}
-
-#menu-chart-statistics {
-	background-position: left -286px;
-}
-
-[dir=rtl] #menu-chart-statistics {
-	background-position: right -286px;
-}
-
-#menu-chart-timeline {
-	background-position: left -312px;
-}
-
-[dir=rtl] #menu-chart-timeline {
-	background-position: right -312px;
-}
-
-#menu-chart-timeline li {
-	background-position: left -312px;
-}
-
-[dir=rtl] #menu-chart-timeline li {
-	background-position: right -312px;
-}
-
-#menu-list-obje {
-	background-position: left -338px;
-}
-
-[dir=rtl] #menu-list-obje {
-	background-position: right -338px;
-}
-
-#menu-list-plac {
-	background-position: left -364px;
-}
-
-[dir=rtl] #menu-list-plac {
-	background-position: right -364px;
-}
-
-#menu-list-repo {
-	background-position: left -390px;
-}
-
-[dir=rtl] #menu-list-repo {
-	background-position: right -390px;
-}
-
-#menu-list-note {
-	background-position: left -416px;
-}
-
-[dir=rtl] #menu-list-note {
-	background-position: right -416px;
-}
-
-#menu-list-sour {
-	background-position: left -442px;
-}
-
-[dir=rtl] #menu-list-sour {
-	background-position: right -442px;
-}
-
-#menu-branches {
-	background-position: left -468px;
-}
-
-[dir=rtl] #menu-branches {
-	background-position: right -468px;
-}
-
-#menu-list-fam {
-	background-position: left -494px;
-}
-
-[dir=rtl] #menu-list-fam {
-	background-position: right -494px;
-}
-
-#menu-list-indi {
-	background-position: left -520px;
-}
-
-[dir=rtl] #menu-list-indi {
-	background-position: right -520px;
-}
-
-/* Report Icons */
-#menu-report li {
-	background-position: left -546px;
-}
-
-[dir=rtl] #menu-report li {
-	background-position: right -546px;
-}
-
-/* Calendar Icons */
-#menu-calendar-day {
-	background-position: left -572px;
-}
-
-[dir=rtl] #menu-calendar-day {
-	background-position: right -572px;
-}
-
-#menu-calendar-month {
-	background-position: left -572px;
-}
-
-[dir=rtl] #menu-calendar-month {
-	background-position: right -572px;
-}
-
-#menu-calendar-year {
-	background-position: left -572px;
-}
-
-[dir=rtl] #menu-calendar-year {
-	background-position: right -572px;
-}
-
-/* Search Icons */
-#menu-search-general {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-search-general {
-	background-position: right -598px;
-}
-
-#menu-search-soundex {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-search-soundex {
-	background-position: right -598px;
-}
-
-#menu-search-advanced {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-search-advanced {
-	background-position: right -598px;
-}
-
-#menu-search-replace {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-search-replace {
-	background-position: right -598px;
-}
-
-/* Help Icons */
-#menu-help-genealogy {
-	background-position: left -624px;
-}
-
-[dir=rtl] #menu-help-genealogy {
-	background-position: right -624px;
-}
-
-#menu-help-show {
-	background-position: left -624px;
-}
-
-[dir=rtl] #menu-help-show {
-	background-position: right -624px;
-}
-
-#menu-help-contents {
-	background-position: left -624px;
-}
-
-[dir=rtl] #menu-help-contents {
-	background-position: right -624px;
-}
-
-#menu-help-hide {
-	background-position: left -624px;
-}
-
-[dir=rtl] #menu-help-hide {
-	background-position: right -624px;
-}
-
-#menu-help-faq {
-	background-position: left -624px;
-}
-
-[dir=rtl] #menu-help-faq {
-	background-position: right -624px;
-}
-
-#menu-help-wiki {
-	background-position: left -650px;
-}
-
-[dir=rtl] #menu-help-wiki {
-	background-position: right -650px;
-}
-
-#menu-help-technical {
-	background-position: left -676px;
-}
-
-[dir=rtl] #menu-help-technical {
-	background-position: right -676px;
-}
-
-/* MyPage Icons */
-#menu-mypage {
-	background-position: left -676px;
-}
-
-[dir=rtl] #menu-mypage {
-	background-position: right -676px;
-}
-
-#menu-myaccount {
-	background-position: left -676px;
-}
-
-[dir=rtl] #menu-myaccount {
-	background-position: right -676px;
-}
-
-#menu-mypedigree {
-	background-position: left -208px;
-}
-
-[dir=rtl] #menu-mypedigree {
-	background-position: right -208px;
-}
-
-#menu-myrecord {
-	background-position: left -520px;
-}
-
-[dir=rtl] #menu-myrecord {
-	background-position: right -520px;
-}
-
-#menu-admin {
-	background-position: left -728px;
-}
-
-[dir=rtl] #menu-admin {
-	background-position: right -728px;
-}
-
-#menu-tree li {
-	background-position: left -754px;
-}
-
-[dir=rtl] #menu-tree li {
-	background-position: right -754px;
-}
-
-/* Family Icons */
-#menu-fam-addchil {
-	background-position: left -858px;
-}
-
-[dir=rtl] #menu-fam-addchil {
-	background-position: right -858px;
-}
-
-#menu-fam-addfav {
-	background-position: left -832px;
-}
-
-[dir=rtl] #menu-fam-addfav {
-	background-position: right -832px;
-}
-
-#menu-fam-change {
-	background-position: left -858px;
-}
-
-[dir=rtl] #menu-fam-change {
-	background-position: right -858px;
-}
-
-#menu-fam-del {
-	background-position: left -936px;
-}
-
-[dir=rtl] #menu-fam-del {
-	background-position: right -936px;
-}
-
-#menu-fam-editraw {
-	background-position: left -754px;
-}
-
-[dir=rtl] #menu-fam-editraw {
-	background-position: right -574px;
-}
-
-#menu-fam-orderchil {
-	background-position: left -858px;
-}
-
-[dir=rtl] #menu-fam-orderchil {
-	background-position: right -858px;
-}
-
-/* Clipping Icons */
-#menu-clippingscart {
-	background-position: left -702px;
-}
-
-[dir=rtl] #menu-clippingscart {
-	background-position: right -702px;
-}
-
-#menu-clippingsadd {
-	background-position: left -702px;
-}
-
-[dir=rtl] #menu-clippingsadd {
-	background-position: right -702px;
-}
-
-/* Edit Icons */
-#menu-indi-addname {
-	background-position: left -780px;
-}
-
-[dir=rtl] #menu-indi-addname {
-	background-position: right -780px;
-}
-
-#menu-indi-editraw {
-	background-position: left -754px;
-}
-
-[dir=rtl] #menu-indi-editraw {
-	background-position: right -574px;
-}
-
-#menu-indi-editsex {
-	background-position: left -780px;
-}
-
-[dir=rtl] #menu-indi-editsex {
-	background-position: right -780px;
-}
-
-#menu-indi-del {
-	background-position: left -806px;
-}
-
-[dir=rtl] #menu-indi-del {
-	background-position: right -806px;
-}
-
-#menu-indi-addfav {
-	background-position: left -832px;
-}
-
-[dir=rtl] #menu-indi-addfav {
-	background-position: right -832px;
-}
-
-/* Edit Notes */
-#menu-note-addfav {
-	background-position: left -832px;
-}
-
-[dir=rtl] #menu-note-fav {
-	background-position: right -832px;
-}
-
-#menu-note-del {
-	background-position: left -806px;
-}
-
-[dir=rtl] #menu-note-del {
-	background-position: right -806px;
-}
-
-#menu-note-edit {
-	background-position: left -910px;
-}
-
-[dir=rtl] #menu-note-edit {
-	background-position: right -910px;
-}
-
-#menu-note-editraw {
-	background-position: left -754px;
-}
-
-[dir=rtl] #menu-note-editraw {
-	background-position: right -574px;
-}
-
-/* Objects */
-#menu-obje-addfav {
-	background-position: left -832px;
+legend {
+	font-weight: bold;
 }
 
-[dir=rtl] #menu-obje-addfav {
-	background-position: right -832px;
+select {
+	border: 1px solid #ccc;
+	font-size: 12px;
+	margin: 0 7px;
+	padding: 1px;
 }
 
-#menu-obje-del {
-	background-position: left -1040px;
+header form {
+	font-size: 12px;
 }
 
-[dir=rtl] #menu-obje-del {
-	background-position: right -1040px;
+#mycart a img {
+	height: 15px;
 }
 
-#menu-obje-edit {
-	background-position: left -962px;
+.button {
+	width: 60px;
 }
 
-[dir=rtl] #menu-obje-edit {
-	background-position: right -962px;
+.alpha_index {
+	color: #999;
 }
 
-#menu-obje-editraw {
-	background-position: left -754px;
+hr {
+	margin-top: 5px;
 }
 
-[dir=rtl] #menu-obje-editraw {
-	background-position: right -574px;
+.person_box {
+	background-color: #ddf;
+	border: 1px solid #aaa;
+	padding: 3px;
 }
 
-#menu-obje-link {
-	background-position: left -988px;
+.person_boxF {
+	background-color: #fdd;
+	border: 1px solid #aaa;
+	padding: 3px;
 }
 
-[dir=rtl] #menu-obje-link {
-	background-position: right -988px;
+.person_boxNN {
+	background-color: #fff;
+	border: 1px solid #aaa;
+	padding: 3px;
 }
 
-#menu-obje-link-fam {
-	background-position: left -494px;
+.person_box:target,
+.news_box:target,
+#gedcom_stats:target {
+	background-color: #ffc;
 }
 
-[dir=rtl] #menu-obje-link-fam {
-	background-position: right -494px;
+.person_box_lifespan {
+	display: inline;
 }
 
-#menu-obje-link-indi {
-	background-position: left -520px;
+/* families tab person box */
+#relatives_content .person_box > .person_box,
+#relatives_content .person_boxF > .person_boxF,
+#relatives_content .person_boxNN > .person_boxNN {
+	border: 0;
+	min-height: 50px;
 }
 
-[dir=rtl] #menu-obje-link-indi {
-	background-position: right -520px;
+.center {
+	text-align: center;
 }
 
-#menu-obje-link-sour {
-	background-position: left -442px;
+table.center {
+	margin-left: auto;
+	margin-right: auto;
 }
 
-[dir=rtl] #menu-obje-link-sour {
-	background-position: right -442px;
+.list_table {
+	margin: 0 auto;
 }
 
-/* Repository */
-#menu-repo-addfav {
-	background-position: left -832px;
+.list_label,
+.list_label_wrap {
+	color: #fff;
+	font-size: 12px;
+	background-color: #81a9cb;
+	font-weight: bold;
+	text-align: center;
 }
 
-[dir=rtl] #menu-repo-addfav {
-	background-position: right -832px;
+.list_value,
+.list_value_wrap {
+	background-color: #edf7f9;
+	font-size: 12px;
+	border: solid #999 1px;
+	vertical-align: top;
 }
 
-#menu-repo-del {
-	background-position: left -806px;
+.list_label,
+.list_value {
+	white-space: nowrap;
 }
 
-[dir=rtl] #menu-repo-del {
-	background-position: right -806px;
+.list_label_wrap,
+.list_value_wrap {
+	white-space: normal;
 }
 
-#menu-repo-edit {
-	background-position: left -1014px;
+.list_item {
+	font-size: 12px;
 }
 
-[dir=rtl] #menu-repo-edit {
-	background-position: right -1014px;
+.facts_table {
+	width: 100%;
 }
 
-#menu-repo-editraw {
-	background-position: left -754px;
+div.fact_SHARED_NOTE {
+	clear: both;
 }
 
-[dir=rtl] #menu-repo-editraw {
-	background-position: right -574px;
+.facts_label {
+	background-color: #81a9cb;
+	font-size: 12px;
+	padding: 4px;
+	width: 20%;
+	text-align: center;
 }
 
-/* Source */
-#menu-sour-addfav {
-	background-position: left -832px;
+.facts_label03 {
+	color: #fff;
+	background-color: #81a9cb;
+	font-size: 12px;
+	padding: 4px;
+	text-align: center;
+	font-weight: bold;
 }
 
-[dir=rtl] #menu-sour-addfav {
-	background-position: right -832px;
+.facts_value {
+	background-color: #edf7fd;
+	font-size: 12px;
+	border: solid #999 1px;
+	padding: 4px;
 }
 
-#menu-sour-del {
-	background-position: left -1066px;
+.facts_label .submenu a {
+	background: #fff;
+	color: #000;
 }
 
-[dir=rtl] #menu-sour-del {
-	background-position: right -1066px;
+.quickfacts a {
+	padding: 0 3px;
+	font-size: 9px;
 }
 
-#menu-sour-edit {
-	background-position: left -884px;
+.tabs_table {
+	width: 99%;
 }
 
-[dir=rtl] #menu-sour-edit {
-	background-position: right -884px;
+.name1,
+.name2 {
+	color: #555;
+	font-weight: bold;
+	font-size: 12px;
 }
 
-#menu-sour-editraw {
-	background-position: left -754px;
+a:hover .name1, a:hover .name2 {
+	color: #f00;
+	font-weight: bold;
+	font-size: 12px;
 }
 
-[dir=rtl] #menu-sour-editraw {
-	background-position: right -574px;
+a:hover .nameZoom {
+	color: #f00;
+	font-size: 14px;
+	font-weight: bold;
 }
 
-/* Stories */
-#menu-story-sub {
-	background-position: left -1092px;
+.details0,
+.details1 {
+	font-size: 11px;
 }
 
-[dir=rtl] #menu-story-sub {
-	background-position: right -1040px;
+.details2 {
+	font-size: 12px;
 }
 
-/* families */
-main {
-	display: block;
-	clear: both;
-	padding: 10px 10px 0;
+.nameZoom {
+	color: #333;
+	font-size: 14px;
+	font-weight: bold;
 }
 
-main .center a {
-	font-size: 13px;
+.details_label {
+	font-weight: bold;
 }
 
-.center, .alpha_index {
-	margin: 12px 0;
+.name_head {
+	color: #333;
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 2;
+	padding: 0 5px;
 }
 
-main .center a.warning,
-#login-box span.error,
-#calendar-page span.error {
-	color: #f50;
+.date {
+	color: #337;
 }
 
-table.header {
-	margin: 8px 0 0;
-	padding: 0 10px;
-	width: 100%;
+.label {
+	font-weight: bold;
 }
 
-div.error {
+.error {
 	color: #d00;
-	font-weight: 600;
+	font-weight: bold;
 }
 
-.label,
-.error {
+.largeError {
+	color: #d00;
+	font-size: large;
 	font-weight: bold;
 }
 
-.field {
-	font-weight: normal;
+.warning {
+	color: #f00;
+	font-weight: bold;
 }
 
-#pid {
-	background: #ffc;
-	color: #333;
+.indent {
+	padding-left: 7px;
 }
 
-footer {
-	clear: both;
-	text-align: center;
+.image {
+	height: 150px;
+	padding: 5px;
+	margin: 2px;
 }
 
-#index .user_messages td {
-	border: 1px #999 solid;
-	padding: 2px;
+.gender_image {
+	margin: 0 3px;
+	border: 0;
+	vertical-align: middle;
 }
 
-/* Block styles */
-ul {
-	margin: 8px;
-	padding-left: 15px;
-	padding-right: 15px;
+.thumbnail {
+	height: auto;
+	padding: 3px;
 }
 
-#index_main_blocks {
-	clear: none;
-	float: left;
-	width: 66%;
+.icon {
+	border: 0;
+	padding: 0 5px;
 }
 
-#index_small_blocks {
-	clear: none;
-	float: right;
-	width: 33%;
+.sublinks_cell {
+	background-color: #9be;
+	font-size: 12px;
 }
 
-#index_full_blocks {
-	clear: none;
-	width: 100%;
+.submenu .icon {
+	vertical-align: middle;
+	width: 20px;
+	height: 20px;
 }
 
-[dir=rtl] #index_main_blocks {
-	float: right;
+.subheaders {
+	font-weight: bold;
+	font-size: 15px;
+	margin-top: 15px;
+	vertical-align: bottom;
 }
 
-[dir=rtl] #index_small_blocks {
-	float: left;
+.age {
+	font-size: 9px;
 }
 
-#index_small_blocks .name1 {
-	color: #333;
+.parentdeath {
+	border: thin solid #888;
+	padding: 1px;
 }
 
-#random_picture {
-	text-align: center;
+.source_citations {
+	display: none;
 }
 
-#random_picture_box {
-	width: 100%;
+.selected-option {
+	background-color: #edf7fd;
 }
 
-.small_inner_block {
-	max-height: 200px;
-	overflow: auto;
+.border1 {
+	border: solid #000 1px;
 }
 
-.block {
-	border-radius: 3px;
-	color: #000;
-	margin-bottom: 5px;
+.menuitem {
+	text-decoration: none;
+	font-size: 11px;
 	padding: 1px;
-	vertical-align: top;
-}
-
-.blockcontent {
-	border: solid #999 1px;
-	margin-bottom: 10px;
-	margin-left: auto;
-	margin-right: 2px;
-	overflow: auto;
-	padding: 5px;
 }
 
-.blockcontent p {
-	font-size: 13px;
+.menuitem_hover {
+	text-decoration: none;
+	font-size: 11px;
+	padding: 1px;
 }
 
-.blockheader {
-	width: 100%;
-	padding: 0;
-	margin: 0;
-	border-collapse: collapse;
+.menuitem .icon, .menuitem_hover .icon {
+	width: 50px;
+	height: 50px;
 }
 
-.blockh1 {
-	background: url(../images/left1B.png) no-repeat;
-	height: 24px;
-	width: 26px;
-	padding: 0;
+.submenu {
+	text-decoration: none;
+	font-size: 11px;
+	background-color: #fff;
+	border: solid #ccc 1px;
+	visibility: hidden;
+	position: absolute;
+	padding: 5px;
 }
 
-.blockh2 {
-	background: url(../images/left2.png) repeat-x;
-	font-size: 13px;
-	font-weight: 700;
-	padding: 0;
+.submenuitem  {
+	vertical-align: middle;
+	font-size: 11px;
+	height: 20px;
+	text-decoration: none;
+	background-color: #fff;
+	padding: 1px;
+	white-space: nowrap;
 }
 
-.blockh3 {
-	background: url(../images/left3.png) no-repeat;
-	height: 24px;
-	width: 8px;
-	padding: 0;
+.submenuitem_hover {
+	vertical-align: middle;
+	height: 20px;
+	font-size: 11px;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	white-space: nowrap;
+	padding: 1px;
 }
 
-.blockhc {
-	padding: 3px 3px 0;
+.submenuitem a,
+.submenuitem_hover a {
+	display: inline-block;
+	vertical-align: middle;
 }
 
-.blockhc img {
-	padding-right: 3px;
+.journal_box {
+	padding: 3pt;
+	border: thin solid #aaa;
+	overflow: visible;
 }
 
-[dir=rtl] .blockh1 {
-	background-image: url(../images/right1B.png);
+.news_box {
+	border-top: solid #ccc 1px;
 }
 
-[dir=rtl] .blockh3 {
-	background-image: url(../images/right3.png);
+.news_title {
+	font-weight: bold;
+	font-size: 14px;
 }
 
-[dir=rtl] .blockhc {
-	padding: 3px 0 0 3px;
+.news_date {
+	margin-bottom: 12px;
 }
 
-[dir=rtl] .blockhc img {
-	padding-left: 3px;
+.current_day {
+	font-weight: bold;
+	font-size: 16px;
 }
 
-#index_title {
+.cal_day {
 	float: left;
+	font-weight: bold;
 }
 
-#main_select,
-#available_select,
-#right_select {
-	min-width: 150px;
-}
-
-.user_welcome_block table,
-.gedcom_block_block table {
-	margin: auto;
-}
-
-.user_welcome_block td,
-.gedcom_block_block td {
-	width: 33%;
-	text-align: center;
-	vertical-align: top;
-}
-
-#link_change_blocks {
-	clear: both;
-	margin: 0 auto;
-	padding: 25px 0 0;
-	text-align: center;
-	width: 400px;
-}
-
-#link_change_blocks span {
-	padding: 0 50px;
-}
-
-#link_change_blocks span span {
-	padding: 0 3px;
+.rtl_cal_day {
+	direction: rtl;
+	float: right;
+	color: #00f;
+	font-weight: bold;
 }
 
-/* chart styles */
-#ancestry_chart {
+.helpcontent {
 	margin-left: 10px;
-}
-
-#ancestry_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-#ancestry_chart table div p {
-	font-size: 90%;
-	margin: 0;
-}
-
-#ancestry_chart ul {
-	background-image:url(../images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	display: block;
-	list-style: none;
-	margin: 0 0 0 15px;
-	padding-bottom: 0;
-	padding-right: 0;
-	padding-top: 3px;
-}
-
-#ancestry_chart li {
-	list-style: none;
-	margin: 0 0 2px -13px;
-	padding-bottom: 0;
-	padding-right: 0;
-	padding-top: 0;
-}
-
-#ancestry_chart li table {
-	margin: 5px 0;
-}
-
-[dir=rtl] #ancestry_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
-}
-
-[dir=rtl] #ancestry_chart li {
-	margin: 0;
-	padding: 0 2px 0 0;
-	left: auto;
-}
-
-[dir=rtl] #ancestry_chart {
 	margin-right: 10px;
 }
 
-#descendancy_chart {
-	margin: 20px;
-}
-
-#descendancy_chart ul {
-	background-image:url(../images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	margin: 0 0 5px 15px;
-	padding-bottom: 0;
-	padding-right: 0;
-	padding-top: 0;
-}
-
-#descendancy_chart li {
-	list-style: none;
-	margin: 5px 0 0 -15px;
-	padding-bottom: 0;
-	padding-right: 0;
-	padding-top: 0;
-}
-
-#descendancy_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-#descendancy_chart td.details1 {
-	padding-top: 5px;
-}
-
-[dir=rtl] #descendancy_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
-}
-
-#familybook_chart {
-	margin-left: 10px;
-}
-
-#familybook_chart table {
-	border-collapse: collapse;
-	empty-cells: show;
-}
-
-#familybook_chart td {
-	margin: 0;
-	padding: 0;
-}
-
-#familybook_chart h2 {
-	text-align: center;
-}
-
-#familybook_chart .line3,
-#familybook_chart .pvline,
-#familybook_chart .spacer {
-	width: 3px;
-}
-
-#familybook_chart .line4 {
-	width: 7px;
-	vertical-align: middle;
-}
-
-[ID^="vline"] {
-	width: 3px;
-}
-
-#familybook_chart h3 {
-	font-size: 16px;
-	text-align: center;
-}
-
-#relationship-page h3 {
-	margin: 20px 0 0 20px;
+.helpcontent dt {
+	clear: both;
 }
 
-#relationship_chart {
-	margin: 0 20px;
+#my-page h1 {
+	margin: 0.25em auto 0.6em;
 }
 
 .tdtop {
@@ -1469,46 +630,14 @@ ul {
 	vertical-align: bottom;
 }
 
-[dir=rtl] #familybook_chart {
-	margin-right: 10px;
-}
-
-/*-- pedigree chart specific stylesheets --*/
-#pedigree-page table.list_table {
-	margin: 0 auto;
-	width: 500px;
-}
-
-.pedigree_chart_table {
-	border: 0;
-	border-collapse: collapse;
-	padding: 0;
-	width: 100%;
-}
-
-#pedigree_chart {
-	position: relative;
-	top: -200px;
-	left: 0;
-}
-
-[dir=rtl] #pedigree_chart {
-	left: auto;
-	right: 0;
-}
-
-#pedigree_canvas {
-	color: #999;
-	position: absolute;
-	top: 200px;
-	z-index: -1;
+.line1,
+.line2,
+.line3 {
+	vertical-align: middle;
 }
 
-#pedigree_chart #childarrow,
-#pedigree_chart #uparrow,
-#pedigree_chart .shadow,
-.ancestorarrow {
-	position: absolute;
+.line5 {
+	vertical-align: top;
 }
 
 #childbox {
@@ -1537,542 +666,90 @@ ul {
 	margin-left: 5px;
 }
 
-#hourglass_chart table,
-.charts_block table {
-	border-collapse: collapse;
-}
-
-#hourglass_chart td,
-.charts_block td {
-	padding: 0;
-	empty-cells: show;
-}
-
-#pedigree_chart #childbox {
-	border: 1px solid;
-	background-color: #fff;
-}
-
-#relationship_chart {
-	margin-left: 10px;
-}
-
-[dir=rtl] #relationship_chart {
-	margin-right: 10px;
-}
-
-#timeline_chart {
-	position: relative;
-	top: 0;
-	left: 0;
-}
-
-#compact_chart,
-#fan_chart,
-#ancestry_chart,
-#familybook_chart,
-#hourglass_chart {
-	margin: 20px;
-}
-
-.fan_chart_menu {
-	position: absolute;
-	display: none;
-	z-index: 100;
-}
-
-#fan_chart ul {
-	list-style-type: none;
-	margin: 0;
-}
-
-#fan_chart ul.children li:before {
-	content: "< ";
-	font-weight: bold;
-}
-
-#fan_chart_img {
-	text-align: center;
-}
-
-.button {
-	width: 60px;
-}
-
-.center {
-	text-align: center;
-}
-
-/* person boxes for charts */
-.person_box {
-	background: #ddf;
-	border: 1px solid #aaa;
-	border-radius: 3px;
-	padding: 3px;
-}
-
-.person_boxF {
-	background: #fdd;
-	border: 1px solid #aaa;
-	border-radius: 3px;
-	padding: 3px;
-}
-
-.person_boxNN {
-	background: #fff;
-	border: 1px solid #aaa;
-	border-radius: 3px;
-	padding: 3px;
-}
-
-.person_box_lifespan {
-	display: inline;
-	border: 1px solid #aaa;
-	border-radius: 3px;
-	padding: 3px;
-}
-
-/* families tab person box */
-#relatives_content .person_box > .person_box,
-#relatives_content .person_boxF > .person_boxF,
-#relatives_content .person_boxNN > .person_boxNN {
-	border: 0;
-	min-height: 50px;
-}
-
-.action_headerF {
-	background: #fdd;
-}
-
-.action_header {
-	background: #ddf;
-}
-
-.list_table {
-	margin: 0 auto;
-}
-
-#branches-page table,
-#medialist-page .list_table,
-#medialist-page .list_table_controls {
-	margin: 0 auto;
-}
-
-#branches-page ol {
-	font-size: 14px;
-}
-
-#surnlist {
-	margin-bottom: 20px;
-}
-
-#medialist-page .list_table_controls {
-	width: 100%;
-}
-
-.list_table_controls td {
-	min-width: 40px;
-	padding: 1px;
-	text-align: center;
-}
-
-.list_label {
-	border: 1px solid #999;
-	border-radius: 3px;
-	font-weight: 700;
-	text-align: center;
-	white-space: nowrap;
-}
-
-.list_label_wrap {
-	border: 1px solid #999;
-	border-radius: 3px;
-	font-weight: 700;
-	text-align: center;
-	white-space: normal;
-}
-
-.list_value {
-	border: 1px solid #999;
-	border-radius: 3px;
-	padding: 1px;
-	text-align: left;
-	vertical-align: top;
-	white-space: nowrap;
-}
-
-.list_value_wrap {
-	border: 1px solid #999;
-	border-radius: 3px;
-	padding: 1px;
-	text-align: left;
-	vertical-align: top;
-	white-space: normal;
-}
-
-.list_value_wrap p {
-	margin: 10px 0;
-}
-
-[dir=rtl] .list_value,
-[dir=rtl] .list_value_wrap {
-	text-align: right;
-}
-
-.tabs_table {
-	max-width: 98%;
-}
-
-.facts_table {
-	width: 100%;
-	padding: 0;
-}
-
-div.fact_SHARED_NOTE {
-	clear: both;
-}
-
-.facts_label .submenu a {
-	background: #fff;
-	color: #000;
-}
-
-.facts_label {
-	border: 1px solid #999;
-	border-radius: 3px;
-	padding: 4px;
-	text-align: center;
-	width: 20%;
-}
-
-.facts_label03 {
-	border-radius: 3px;
-	font-weight: 700;
-	padding: 4px;
-	text-align: center;
-}
-
-.facts_value {
-	border: 1px solid #999;
-	border-radius: 3px;
-	padding: 4px;
-}
-
-.quickfacts a {
-	font-size: 9px;
-	padding: 0 3px;
-}
-
-.name1,
-.name2 {
-	font-weight: 700;
-	overflow: hidden;
-	font-size: 12px;
-}
-
-a:hover .name1,
-a:hover .name2 {
-	color: #f00;
-	font-weight: 700;
-	font-size: 12px;
-}
-
-.nameZoom {
-	font-size: 14px;
-	text-decoration: none;
-	font-weight: 700;
-	overflow: hidden;
-}
-
-a:hover .nameZoom {
-	font-size: 14px;
-	color: #f00;
-	font-weight: 700;
-}
-
-.details0,
-.details1 {
-	font-size: 11px;
-	text-decoration: none;
-}
-
-.details2 {
-	color: #006;
-	font-size: 11px;
-	font-weight: 700;
-	text-decoration: none;
-}
-
-.age {
-	font-size: 9px;
-}
-
-.cal_day {
-	float: left;
-	font-weight: 700;
-}
-
-.contact_links {
-	margin: 30px 0 15px;
-	text-align: center;
-}
-
-.current_day {
-	font-size: 16px;
-	font-weight: 700;
-}
-
-.date {
-	color: #333;
-}
-
-.gender_image {
-	border: 0;
-	padding-left: 3px;
-	padding-right: 3px;
-	vertical-align: middle;
-}
-
-.helpcontent {
-	margin-left: 10px;
-	margin-right: 10px;
-}
-
-.helpcontent dt {
-	clear: both;
-}
-
-.hit-counter {
-	background: #000;
-	color: #fff;
-	font-weight: 700;
-}
-
-.image {
-	height: 150px;
-	margin-right: 15px;
-	padding: 5px;
-}
-
-.indent {
-	padding-left: 7px;
-}
-
-.journal_box {
-	border: thin solid #aaa;
-	overflow: visible;
-	padding: 3pt;
-}
-
-.largeError {
-	color: #d00;
-	font-size: 24px;
-	font-weight: 700;
-}
-
-.link {
-	font-size: 11px;
-	text-align: center;
-}
-
-.name_head {
-	color: #333;
-	font-size: 16px;
-	font-weight: 700;
-	line-height: 2;
-	padding: 0 5px;
-}
-
-.news_box {
-	padding: 5pt 5px;
-	border-top: solid #ccc 1px;
-}
-
-.news_title {
-	color: #000;
-	font-size: 13px;
-	font-weight: 700;
-}
-
-.news_date {
-	color: #000;
-	margin-bottom: 12px;
-}
-
-.parentdeath {
-	border: thin solid #888;
-	padding: 1px;
-}
-
-.pedigree_form {
-	width: 60px;
-}
-
-.rtl_cal_day {
-	direction: rtl;
-	float: right;
-	font-weight: 700;
-}
-
-.source_citations {
-	display: none;
-}
-
-.subheaders {
-	font-size: 16px;
-	font-weight: 700;
-	margin: 15px 0 0 15px;
-	padding: 10px;
-	vertical-align: bottom;
-}
-
-.sublinks_cell {
-	background: #9be;
-}
-
-.submenu {
-	font-size: 11px;
-}
-
-.submenuitem,
-.submenuitem_hover {
-	background-color: #fff;
-	border: 1px solid #ccc;
-	height: 20px;
-	padding: 3px 3px 0;
-	white-space: nowrap;
-}
-
-.theme_form {
-	font-size: 14px;
-	margin: 0 3px 3px;
-}
-
-.thumbnail {
-	height: auto;
-	padding: 5px;
-}
-
 .person0 {
-	background: #ddf;
+	background-color: #ddf;
 	border: outset #999 1px;
-	border-radius: 3px;
 	vertical-align: top;
 }
 
 .person1 {
-	background: #afa;
+	background-color: #afa;
 	border: outset #afa 1px;
-	border-radius: 3px;
 	vertical-align: top;
 }
 
 .person2 {
-	background: #faa;
+	background-color: #faa;
 	border: outset #faa 1px;
-	border-radius: 3px;
 	vertical-align: top;
 }
 
 .person3 {
-	background: #aad;
+	background-color: #aad;
 	border: outset #55f 1px;
-	border-radius: 3px;
 	vertical-align: top;
 }
 
 .person4 {
-	background: #f55;
+	background-color: #f55;
 	border: outset #f55 1px;
-	border-radius: 3px;
 	vertical-align: top;
 }
 
 .person5 {
-	background: #5f5;
+	background-color: #5f5;
 	border: outset #5f5 1px;
-	border-radius: 3px;
 	vertical-align: top;
 }
 
-button {
-	border-width: 1px;
-}
-
-input,
-button,
-textarea {
-	border-color: #fff #494949 #494949 #fff;
-	border-width: 1px;
-	font-size: 13px;
-	font-family: inherit;
+.listlog {
+	line-height: 20pt;
 }
 
-input,
-textarea {
-	padding: 3px;
+.formField {
+	font-size: 12px;
 }
 
-.optionbox {
-	border: solid #999 1px;
-	border-radius: 3px;
-	font-size: 12px;
-	padding: 3px;
-	vertical-align: top;
-	white-space: nowrap;
+.starredname {
+	text-decoration: underline;
 }
 
-.optionbox input {
-	margin-right: 5px;
+.search_hit {
+	background-color: #ff0;
 }
 
-[dir=rtl] .optionbox input {
-	margin-left: 5px;
+.search_item {
+	font-weight: 600;
 }
 
 .descriptionbox {
-	border: 1px solid #999;
 	font-size: 12px;
-	border-radius: 3px;
-	padding: 3px;
+	border: 1px solid #999;
 	vertical-align: top;
+	padding: 3px;
 }
 
-.formField {
+.optionbox {
 	font-size: 12px;
-	width: 140px;
-}
-
-.rela {
-	opacity: 0.67;
+	border: solid #999 1px;
+	vertical-align: top;
+	white-space: nowrap;
+	padding: 3px;
 }
 
-.sex_image {
-	border: 0;
-	height: 9px;
-	padding-left: 3px;
-	padding-right: 3px;
+.vmiddle {
 	vertical-align: middle;
-	width: 9px;
 }
 
-.starredname {
-	text-decoration: underline;
-}
-
-.topbottombar {
-	border-radius: 3px;
-	font-weight: 700;
-	padding: 4px;
-	text-align: center;
+.red {
+	color: #f00;
 }
 
-.vmiddle {
-	vertical-align: middle;
+.rela,
+.histo {
+	opacity: 0.8;
 }
 
-/* Standard Markup */
-
 .width10 {
 	width: 10%;
 }
@@ -2085,14 +762,14 @@ textarea {
 	width: 25%;
 }
 
-.width33 {
-	width: 33%;
-}
-
 .width30 {
 	width: 30%;
 }
 
+.width33 {
+	width: 33%;
+}
+
 .width40 {
 	width: 40%;
 }
@@ -2133,7 +810,16 @@ textarea {
 	font-size: 9px;
 }
 
-/* Pending edits - TODO perhaps show differently in different contexts? */
+.font11 {
+	font-size: 11px;
+}
+
+.messagebox {
+	background-color: #c2ceef;
+	border: solid #ccc 1px;
+}
+
+/* ---Pending edits--- */
 .new {
 	border: solid blue 1px;
 	overflow: hidden;
@@ -2145,104 +831,83 @@ textarea {
 }
 
 a.showit {
-	color: #000;
 	position: relative;
+	z-index: 24;
 	text-decoration: none;
 }
 
 a.showit:hover {
-	background: #ff9;
+	z-index: 25;
+	background-color: #ff9;
 	cursor: crosshair;
 }
 
+a.showit > span {
+	display: none;
+}
+
 a.showit:hover > span {
-	background: #444;
+	display: block;
+	position: absolute;
+	top: 22px;
+	left: 0;
+	width: 225px;
 	border: 2px solid #000;
 	border-left: 15px outset;
+	padding: 3px;
+	background-color: #444;
 	color: #fff;
-	display: block;
 	font-size: 15px;
-	left: 0;
-	opacity: .85;
-	padding: 3px;
-	position: absolute;
 	text-align: left;
-	top: 22px;
-	white-space: normal;
-	width: 225px;
-}
-
-.lifespan_outer {
-	border: solid #00f 1px;
-	border-radius: 3px;
-	height: 600px;
-	overflow: hidden;
-	position: relative;
-	width: 99.5%;
-}
-
-.lifespan_outer a {
-	color: #000;
-}
-
-.lifespan_outer a:hover {
-	color: #f00;
-	text-decoration: none;
-}
-
-.lifespan_people span:first-letter {
-	font-size: 16px;
-	font-variant: small-caps;
-	font-weight: 700;
-	padding: 1px;
+	opacity: .85;
+	z-index: 5;
 }
 
-.lifespan_people {
-	left: -10px;
-	position: absolute;
-	top: -60px;
-	width: 500px;
+.tag_cloud {
+	text-align: center;
 }
 
-.lifespan_timeline {
-	background: #fff;
-	left: -10px;
-	position: absolute;
-	top: -65px;
-	width: 100%;
+.tag_cloud a {
+	white-space: nowrap;
 }
 
+/* ---Autocomplete styles--- */
 .ui-autocomplete-input {
-	background: #eea;
+	background-color: #eea;
 }
 
 .ui-autocomplete {
-	background: #fff;
-	border: 1px solid #000;
 	padding: 0;
+	border: 1px solid #000;
+	background-color: #fff;
 	z-index: 99999;
 	list-style: none outside none;
 	margin: 0;
 	max-height: 200px;
-	overflow-y: auto;
+	overflow-x: hidden;
+	overflow-y: scroll;
 }
 
 .ui-autocomplete li {
+	margin: 0;
+	padding: 2px 5px;
+	font-size: 12px;
 	cursor: default;
 	display: block;
+	/* if width will be 100% horizontal scrollbar will apear when scroll mode will be used */
+	/* width: 100%; */
 	font: menu;
+	/* it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */
 	line-height: 14px;
-	margin: 0;
 	overflow: hidden;
-	padding: 2px 5px;
 }
 
 .ui-autocomplete-loading {
-	background: #fff url(../images/indicator.gif) right center no-repeat;
+	background: #fff url(images/indicator.gif) right center no-repeat;
 }
 
 .ui-autocomplete li:nth-child(odd) {
-	background: #eee;
+	background-color: #eee;
 }
 
 .ui-autocomplete a.ui-state-focus {
@@ -2257,86 +922,60 @@ a.showit:hover > span {
 	display: none;
 }
 
-.clearfloat {
-	clear: both;
-}
+/* ---End of Autocomplete styles--- */
 
-.execution_stats {
-	padding: 12px;
-	text-align: center;
-}
-
-.gchart {
-	border: 1px solid #999;
-}
-
-.line1,
-.line2,
-.line3 {
-	vertical-align: middle;
+.nowrap {
+	white-space: nowrap;
 }
 
-#hourglass_chart img.line4 {
-	vertical-align: middle;
+.wrap {
+	white-space: normal;
 }
 
-.line5 {
-	vertical-align: top;
+.statistics-page {
+	text-align: center;
 }
 
-.logo {
+.center2 {
 	text-align: center;
 }
 
-.messagebox {
-	background: #dfeeff;
-	border-radius: 3px;
+.gchart {
+	border: solid #999 1px;
 }
 
-.nam a:hover {
-	color: #f00;
+/* ---Find special characters--- */
+.largechars {
+	font-family: monospace;
+	font-size: 200%;
 }
 
-.nav_content {
-	padding: 0;
-	width: 100%;
+#facts_content dd {
+	float: left;
+	width: 70%;
 }
 
-a.showit > span {
-	display: none;
+.clearfloat {
+	clear: both;
 }
 
-.nowrap,
-.tag_cloud a {
-	white-space: nowrap;
-}
+/* this keeps the tag color the same when it is a link as when not */
 
 .place {
 	padding-top: 5px;
 }
 
-.statistics-page {
-	text-align: center;
-}
-
-.wrap {
-	white-space: normal;
-}
-
 #pending h2 {
-	margin-bottom: 20px;
 	text-align: center;
+	margin-bottom: 20px;
 }
 
 #pending h3 {
-	margin-top: 20px;
 	text-align: center;
+	margin-top: 20px;
 }
 
-#my-page h1 {
-	margin-bottom: 10px;
-}
-
+/* ======== Person box ======= */
 .gedcom_favorites_block,
 .user_favorites_block,
 .person_box_template {
@@ -2349,11 +988,11 @@ a.showit > span {
 	2 normal view - large box
 */
 .box-style0 {
-	cursor: url(../images/zoomin.png), n-resize;
+	cursor: url(images/zoomin.png), n-resize;
 }
 
 .box-style0-expanded {
-	cursor: url(../images/zoomout.png), n-resize;
+	cursor: url(images/zoomout.png), n-resize;
 }
 
 .box-style0-expanded,
@@ -2365,11 +1004,11 @@ a.showit > span {
 	height: auto;
 }
 
-.person_box_template .namedef i {
+.person_box_template .namedef i[class^="icon-sex"] {
 	margin-left: 3px;
 }
 
-[dir=rtl] .person_box_template .namedef i {
+[dir=rtl] .person_box_template .namedef i[class^="icon-sex"] {
 	margin-right: 3px;
 }
 
@@ -2408,7 +1047,7 @@ a.showit > span {
 [dir=rtl] .person_box_template img,
 [dir=rtl] .person_box_template a.gallery {
 	float: right;
-	margin: 0 0 0 3px;
+	margin: 0 0 0 4px;
 }
 
 .person_box_template i[class^="icon-silhouette"] {
@@ -2419,93 +1058,83 @@ a.showit > span {
 	float: right;
 }
 
-/* ============= Statistics block ============ */
-.gedcom_stats_block table td {
-	vertical-align: top;
-}
-
-.gedcom_stats_block table td td {
-	vertical-align: middle;
-}
-
-.gedcom_stats_block td .stats_value {
-	text-align: center;
-}
-
-/* ============= Theme select block ============ */
-.theme_form ul {
-	margin: -10px auto;
-}
-
-.theme_form li {
-	visibility: hidden;
-}
-
-.theme_form li ul li {
-	display: inline-block;
-	padding: 10px;
-	visibility: visible;
+#branches-page table,
+#medialist-page .list_table,
+#medialist-page .list_table_controls {
+	margin: 0 auto;
 }
 
-/* ======= Favourites block ========== */
-.blockcontent .person_box_template .details2 {
-	min-height: 40px;
+#medialist-page form .list_table {
+	width: 75%;
 }
 
-.blockcontent [class*='box-style2'] {
-	margin: 5px 0;
+#medialist-page div .list_table,
+#medialist-page .media-col,
+#medialist-page .media-col1,
+#medialist-page .list_value_wrap,
+#medialist-page div .list_table_controls {
+	width: 100%;
 }
 
-.add_fav_head {
-	font-weight: 900;
-	margin: 5px 0;
+#medialist-page .optionbox, 
+#medialist-page .descriptionbox {
+	width: 25%;
 }
 
-.add_fav_head i {
-	margin: 0 5px 1px;
+#medialist-page .media-col2 {
+	width: 50%;
 }
 
-.add_fav_ref p {
-	margin: 5px 0;
+#medialist-page .media-col {
+	padding-left: 5px; 
+	border: none;
 }
 
-.add_fav_ref label {
-	display: inline-block;
-	min-width: 100px;
+[dir=rtl] #medialist-page .media-col {
+	padding-left: 0;
+	padding-right: 5px;
 }
 
-.add_fav_ref label:after {
-	content: ":";
+#medialist-page .media-image {
+	vertical-align:top; 
+	white-space:normal;
 }
 
-.add_fav_ref input {
-	margin: 0 5px;
+#medialist-page p {
+	text-align: center;
 }
 
-#branches-page table {
-	margin: auto;
+.list_table_controls td {
+	min-width: 40px;
+	text-align: center;
 }
 
-#branches-page p {
-	margin: 10px;
+/* ======== medialist.php ==== */
+.makeMenu li ul {
+	border: thin solid #AAA;
+	position: absolute;
+	margin:0;
 }
 
-#medialist-page select {
-	min-width: 38px;
+.makeMenu, .makeMenu li ul {
+	padding: 1px;
 }
 
-#field_table select {
-	min-width: 100px;
+.makeMenu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
 }
 
-/* ============== medialist.php ======================= */
 .lb-menu {
 	display: inline-block;
 	margin: 0;
 }
 
 .lb-menu ul {
+	display: block;
 	list-style-type: none;
+	margin: 0;
 }
 
 .lb-menu > li {
@@ -2514,6 +1143,10 @@ a.showit > span {
 	top: 0;
 }
 
+.lb-menu li:first-child {
+	padding-left: 0;
+}
+
 .lb-menu > li ul {
 	display: none;
 }
@@ -2528,32 +1161,16 @@ a.showit > span {
 }
 
 .lb-menu li a {
-	padding-top: 24px;
+	padding: 24px 10px 1px 5px;
 }
 
 .lb-menu li li a {
-	padding: 1px 10px 1px 5px;
-}
-
-.lb-menu {
-	float: none;
-}
-
-.lb-menu li:before {
-	content: "";
-}
-
-.makeMenu.lb-menu li a {
-	color: #000;
-}
-
-.lb-image_edit,
-.lb-image_link {
-	padding-right: 5px;
+	background-color: #fff;
+	padding: 5px 10px 5px 5px;
 }
 
-.lb-menu > li:hover > ul {
-	top: 28px !important;
+.lb-menu li {
+	border: 0;
 }
 
 [dir=rtl] .lb-menu > li {
@@ -2561,21 +1178,19 @@ a.showit > span {
 }
 
 .list_value_wrap .lb-image_edit {
-	background: url(../images/image_edit.png) no-repeat 50% 20%;
+	background: url(images/image_edit.png) no-repeat 50% 20%;
 }
 
 .list_value_wrap .lb-image_link {
-	background: url(../images/image_link.png) no-repeat 50% 20%;
+	background: url(images/image_link.png) no-repeat 50% 20%;
 }
 
 .list_value_wrap .lb-image_view {
-	background: url(../images/image_view.png) no-repeat 50% 20%;
+	background: url(images/image_view.png) no-repeat 50% 20%;
 }
 
-/* ============== login.php ======================= */
-#login-register-page h2,
-#login-box,
-#register-box {
+/* login.php */
+#login-register-page h2 {
 	text-align: center;
 }
 
@@ -2585,8 +1200,8 @@ a.showit > span {
 }
 
 #login-register-page .back {
+	font-weight: bold;
 	font-size: 14px;
-	font-weight: 700;
 	text-align: center;
 }
 
@@ -2597,21 +1212,26 @@ a.showit > span {
 }
 
 #login-register-page .confirm p {
+	font-weight: bold;
 	font-size: 14px;
-	font-weight: 700;
 }
 
 #login-register-page .confirm p + p {
 	font-size: 12px;
-	font-weight: 400;
+	font-weight: normal;
 }
 
 #login-text,
 #register-text,
 #user-verify {
 	margin: 20px auto;
-	text-align: justify;
 	width: 610px;
+	text-align: justify;
+}
+
+#login-box,
+#register-box {
+	text-align: center;
 }
 
 #login-form,
@@ -2619,12 +1239,17 @@ a.showit > span {
 #register-form,
 #verify-form {
 	border: 1px solid #999;
-	border-radius: 3px;
 	display: inline-block;
 	margin: 10px auto 0;
 	padding: 5px;
 }
 
+#register-form,
+#verify-form {
+	width: 440px;
+}
+
+
 #login-form div,
 #login-form div a,
 #new_passwd_form div,
@@ -2645,12 +1270,18 @@ a.showit > span {
 #login-form label input,
 #new_passwd_form label input,
 #verify-form input {
-	margin: 0 10px;
 	width: 140px;
+	margin: 0 10px;
 }
 
-#new_passwd_form h4 {
-	font-weight: 400;
+#register-form p,
+#verify-form p {
+	text-align: left;
+}
+
+#new_passwd_form h4,
+#register-form h4 {
+	font-weight: normal;
 	text-align: center;
 }
 
@@ -2659,33 +1290,32 @@ a.showit > span {
 	text-align: right;
 }
 
-#register-form label input {
-	margin: 0 10px;
-	width: 220px;
-}
-
+#register-form label input,
+#register-form label select,
 #register-form textarea {
-	margin: 0 10px;
+	background-color: #fff;
 	width: 220px;
+	margin: 0 10px;
+	padding: 3px;
 }
 
 #register-form label select {
 	margin: 0 10px;
-	width: 225px;
+	width: 228px;
 }
 
 #register-form textarea {
 	vertical-align: top;
-	width: 212px;
 }
 
 #register-form div#registration-submit {
 	text-align: center;
 }
 
-#register-form h4 {
-	font-weight: 400;
-	text-align: center;
+.login_block_block #login-form,
+.login_block_block #new_passwd_form {
+	border: 0;
+	background: none;
 }
 
 [dir=rtl] #login-form label,
@@ -2695,14 +1325,24 @@ a.showit > span {
 	text-align: left;
 }
 
-/* reportengine.php */
+[dir=rtl] #register-form div,
+[dir=rtl] #verify-form div {
+	text-align: left;
+}
+
+[dir=rtl] #register-form p, 
+[dir=rtl] #verify-form p {
+	text-align: right;
+}
+
+/* --- reportengine.php --- */
 #reportengine-page table {
 	margin: 20px auto;
 }
 
 #reportengine-page .report-type {
-	margin: auto;
 	overflow: hidden;
+	margin: auto;
 	width: 180px;
 }
 
@@ -2716,86 +1356,74 @@ a.showit > span {
 	text-align: center;
 }
 
+/* styles for popup menus */
 .itr {
+	position: relative;
 	line-height: 1.5;
-	position: absolute;
 }
 
-.itr:hover .popup {
-	display: block;
+.popup {
 	position: absolute;
+	top: 21px;
 	right: 0;
-	width: 12em;
-	z-index: 10;
-}
-
-.block .itr,
-#family-table .itr,
-#ancestry_chart .itr,
-#descendancy_chart .itr,
-#familybook_chart .itr,
-#hourglass_chart .itr,
-#relatives_content .itr {
-	position: relative;
-	top: 0;
+	left: auto;
+	visibility: hidden;
+	opacity: 0;
+	transition: visibility 0s ease .25s,opacity .25s ease;
+	z-index: 9999;
+	-webkit-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	-moz-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
 }
 
-.popup {
-	display: none;
+[dir=rtl] .popup {
+	left: 0;
+	right: auto;
 }
 
 .popup ul {
-	background-image: none !important;
-	font-size: 9px;
+	white-space: nowrap;
 	list-style: none;
 	margin: 0;
 	padding: 0 10px;
+	font-size: smaller;
 }
 
-.popup li {
-	padding: 1px 5px;
+.popup > ul {
+	padding: 2px 10px;
 }
 
-.popup li span {
+.popup li .NAME {
 	padding: 0 5px;
 }
 
-.popup li ul,
-.popup li ul li,
-.popup li span span {
-	padding: 0;
-}
-
 .itr:hover .popup {
-	display: block;
-	position: absolute;
-	width: 12em;
-	right: 0;
-}
-
-[dir=rtl] .itr:hover .popup {
-	left: 0;
-	right: auto;
+	visibility: visible;
+	opacity: 1;
+	transition-delay: 0s;
 }
 
-/* FindFacts pop-up */
+/* styles for FindFacts pop-up */
 #layDefinedTags,
 #tabDefinedTagsShow {
 	width: 450px;
 }
 
 #tabDefinedTags {
-	border-collapse: collapse;
 	width: 430px;
 }
 
 #layDefinedTags {
-	height: 285px;
 	margin-left: auto;
 	margin-right: auto;
+	height: 285px;
 	overflow: auto;
 }
 
+#tabDefinedTags {
+	border-collapse: collapse;
+}
+
 #tabDefinedTags th,
 #tabDefinedTags td {
 	border: solid 1px #000;
@@ -2804,8 +1432,8 @@ a.showit > span {
 }
 
 #tabDefinedTags tbody th {
-	font-weight: 700;
 	text-align: left;
+	font-weight: bold;
 }
 
 #tabDefinedTags tr.sel {
@@ -2818,52 +1446,447 @@ a.showit > span {
 	color: #888;
 }
 
-#tabDefinedTagsShow,
-#tabFilterAndCustom,
+#tabDefinedTagsShow {
+	margin-left: auto;
+	margin-right: auto;
+}
+
+#tabDefinedTagsShow td {
+	width: 50%;
+	text-align: center;
+}
+
+#tabFilterAndCustom {
+	margin-left: auto;
+	margin-right: auto;
+}
+
 #tabAction {
 	margin-left: auto;
 	margin-right: auto;
 }
 
-#tabDefinedTagsShow td,
 #tabAction td {
-	text-align: center;
 	width: 50%;
+	text-align: center;
+}
+
+/* ======== List styles ====== */
+.source-list,
+.note-list,
+.repo-list,
+.media-list,
+.indi-list,
+.fam-list {
+	visibility: hidden;
+}
+
+.surname-list,
+.givn-list {
+	margin: 5px auto;
+}
+
+.source-list table,
+.note-list table,
+.repo-list table,
+.media-list table,
+.indi-list table,
+.fam-list table {
+	width: 100%;
+}
+
+.source-list td,
+.note-list td,
+.repo-list td,
+.media-list td,
+.indi-list td,
+.fam-list td,
+.recent_changes_block td,
+.upcoming_events_block td,
+.surname-list td,
+.givn-list td {
+	padding: 2px 5px;
+}
+
+.surname-list td {
+	vertical-align: top;
+}
+
+.indi-list .stats,
+.fam-list .stats {
+	margin: 0 auto;
+	width: auto;
+}
+
+.source-list th,
+.note-list th,
+.repo-list th,
+.media-list th,
+.indi-list th,
+.fam-list th,
+.recent_changes_block th,
+.upcoming_events_block th,
+.todays_events_block th,
+.todo_block th,
+.yahrzeit_block th,
+.surname-list th,
+.givn-list th {
+	cursor: pointer;
+	font-weight: 600;
+	padding: 2px 4px;
+	white-space: nowrap;
+}
+
+.source-list th:last-child,
+.note-list th:last-child,
+.repo-list th:last-child {
+	margin: 0 -2px 1px 1px;
+	padding: 3px 0 4px;
+	width: 24px;
+}
+
+.givn-list th {
+	cursor: pointer;
+	white-space: nowrap;
+	padding: 2px;
+	text-align: center;
+}
+
+#source-details h2,
+#sourcelist-page h2,
+#note-details h2,
+#notelist-page h2,
+#repo-details h2,
+#repolist-page h2,
+#media-details h2,
+#medialist-page h2,
+#statistics-page h2 {
+	margin-bottom: 20px;
+	text-align: center;
+}
+
+#source-tabs,
+#note-tabs,
+#repo-tabs,
+#media-tabs {
+	margin: auto;
+	visibility: hidden;
+	width: 80%;
+}
+
+#statistics_chart {
+	margin: auto;
+	visibility: hidden;
+	width: 90%;
+}
+
+#source-edit,
+#note-edit,
+#repo-edit,
+#media-edit {
+	overflow-x: auto;
+}
+
+.media-list td img {
+	display: block;
+	height: 40px;
+	width: auto;
+	margin: 3px auto;
+}
+
+.filtersH,
+.filtersF {
+	margin: 4px;
+}
+
+.filtersH img {
+	margin-bottom: 2px;
+}
+
+.loading-image {
+	background: transparent url(images/loading.gif) 50% 50% no-repeat;
+	height: 50px;
+	margin: 50px;
+}
+
+.list-charts {
+	text-align: center;
+}
+
+#search-result-tabs,
+#places-tabs {
+	margin: auto;
+	width: 98%;
+	visibility: hidden;
+}
+
+#search-result-tabs h3 {
+	text-align: center;
+}
+
+#searchAccordion-indi,
+#searchAccordion-fam,
+#searchAccordion-source,
+#searchAccordion-note {
+	margin: auto;
+	width: 99%;
 }
 
-/* FAQ table */
+#place-hierarchy h2,
+#place-hierarchy h4 {
+	text-align: center;
+}
+
+[dir=rtl] .source-list th:last-child,
+[dir=rtl] .note-list th:last-child,
+[dir=rtl] .repo-list th:last-child {
+	margin: 0 1px 1px -2px;
+}
+
+/* ======== Block styles ===== */
+#index_main_blocks {
+	clear: none;
+	width: 66%;
+	float: left;
+}
+
+#index_small_blocks {
+	clear: none;
+	width: 33%;
+	float: right;
+}
+
+#index_full_blocks {
+	clear: none;
+	width: 100%;
+}
+
+[dir=rtl] #index_main_blocks {
+	float: right;
+}
+
+[dir=rtl] #index_small_blocks {
+	float: left;
+}
+
+.small_inner_block {
+	max-height: 200px;
+	overflow: auto;
+}
+
+.normal_inner_block {
+	overflow: auto;
+}
+
+.block {
+	color: #000;
+	margin-bottom: 5px;
+	padding: 1px;
+	vertical-align: top;
+}
+
+.blockcontent {
+	border: solid #999 1px;
+	margin:  0 2px 10px 0;
+	overflow: auto;
+	padding: 5px;
+}
+
+.blockcontent .list_table {
+	border-spacing: 0;
+	border: solid #999 1px;
+	border-right: 0;
+}
+
+.blockcontent .list_value,
+.blockcontent .list_value_wrap {
+	border: 0;
+	border-top: solid #999 1px;
+	border-right: solid #999 1px;
+}
+
+.blockheader {
+	width: 100%;
+	padding: 0;
+	margin: 0;
+	border-collapse: collapse;
+}
+
+.blockh1 {
+	background: url(images/left1B.png) no-repeat;
+	height: 24px;
+	width: 26px;
+	padding: 0;
+}
+
+.blockh2 {
+	background: url(images/left2.png) repeat-x;
+	font-size: 13px;
+	font-weight: bold;
+	padding: 0;
+}
+
+.blockh3 {
+	background: url(images/left3.png) no-repeat;
+	height: 24px;
+	width: 8px;
+	padding: 0;
+}
+
+.blockhc {
+	padding: 3px 3px 0;
+}
+
+.blockhc img {
+	padding-right: 3px;
+}
+
+[dir=rtl] .blockh1 {
+	background-image: url(images/right1B.png);
+}
+
+[dir=rtl] .blockh3 {
+	background-image: url(images/right3.png);
+}
+
+[dir=rtl] .blockhc {
+	padding: 3px 0 0 3px;
+}
+
+[dir=rtl] .blockhc img {
+	padding-left: 3px;
+}
+
+/* end Block styles */
+
+#main_select,
+#available_select,
+#right_select {
+	min-width: 150px;
+}
+
+.user_welcome_block table,
+.gedcom_block_block table {
+	margin: auto;
+}
+
+.user_welcome_block td,
+.gedcom_block_block td {
+	width: 33%;
+	text-align: center;
+	vertical-align: top;
+}
+
+/* Random picture block */
+#random_picture {
+	text-align: center;
+}
+
+#random_picture_box {
+	width: 100%;
+}
+
+/* ==== Favourites block ===== */
+.blockcontent .person_box_template .details2 {
+	min-height: 40px;
+}
+
+.blockcontent [class*='box-style2'] {
+	margin: 5px 0;
+}
+
+.add_fav_head {
+	font-weight: 900;
+	margin: 5px 0;
+}
+
+.add_fav_head i {
+	margin: 0 5px 1px;
+}
+
+.add_fav_ref label {
+	display: inline-block;
+	min-width: 100px;
+}
+
+.add_fav_ref label:after {
+	content: ":";
+}
+
+.add_fav_ref input {
+	margin: 0 5px;
+}
+
+/* === Who is online block === */
+.logged_in_list {
+	margin: 5px 0 0;
+	padding: 0;
+	line-height: 20px;
+}
+
+/* Statistics block */
+.gedcom_stats_block table td {
+	vertical-align: top;
+}
+
+.gedcom_stats_block table td td {
+	vertical-align: middle;
+}
+
+.gedcom_stats_block td .stats_value {
+	text-align: center;
+}
+
+/* ==== Theme select block === */
+.theme_form ul {
+	margin: -10px auto;
+}
+
+.theme_form li {
+	visibility: hidden;
+}
+
+.theme_form li ul li {
+	display: inline-block;
+	padding: 10px;
+	visibility: visible;
+}
+
+/* ==== FAQ table styles ===== */
 table.faq {
-	background-color: #eee;
-	margin: 5px 0 15px 5px;
+	background-color: #e0e0e0;
+	margin: 5px 0 50px 5px;
 	width: 98%;
 }
 
 table.faq tr.odd td {
-	background-color: #eee;
+	background-color: #e7eef3;
 }
 
 div.faq_title {
-	background-color: #eee;
-	font-weight: 700;
+	background-color: #e0e0e0;
 	margin: 1em 0;
 	padding: .25em;
+	font-weight: bold;
 	width: 98%;
 }
 
 div.faq_body {
 	clear: both;
-	margin: 1em 0;
-	padding: .5em;
+	padding: 0 1em;
 }
 
 .faq_italic {
-	font-size: 12px;
 	font-style: italic;
-	font-weight: 700;
+	font-weight: bold;
+	font-size: 90%;
 	padding: 0 10px;
 }
 
-.faq_top,
+.faq_top {
+	float: right;
+}
+
 .faq_edit {
 	float: right;
 }
@@ -2876,43 +1899,32 @@ div.faq_body {
 	float: left;
 }
 
-ul.clist {
-	color: #000;
-	list-style-image: none;
-	margin: 0;
-	text-decoration: none;
-}
-
-/* Find special characters */
-.largechars {
-	font-family: monospace;
-	font-size: 200%;
-}
-
-/* edit, copy, delete links */
+/* === Positioning edit, copy, delete links === */
+/* General use */
 .editfacts {
 	clear: left;
 	padding-top: 15px;
 }
 
-/* container for next two links */
+/* a container for the following three links */
+
 .editlink,
 .copylink,
 .deletelink {
 	float: left;
 }
 
-span.link_text {
-	display: none;
-}
-
 [dir=rtl] .editlink,
 [dir=rtl] .copylink,
 [dir=rtl] .deletelink {
 	float: right;
 }
 
-/* Indi header */
+span.link_text {
+	display: none;
+}
+
+/* ======== Indi header ====== */
 .field .editlink,
 .field .deletelink,
 .field .copylink {
@@ -2924,81 +1936,85 @@ span.link_text {
 	float: left;
 }
 
-#dates {
-	color: #333;
-	float: right;
-}
-
 #indi_header {
-	border-radius: 3px;
 	overflow: hidden;
-	margin: 0 2px 5px;
-	width: 100%;
+	margin: 0 0 5px;
 }
 
-#indi_header a {
-	color: #337;
-	font-size: 0.75em;
-	font-weight: 400;
+#indi_header h3 {
+	color: #555;
+	font-size: 90%;
+	font-weight: bold;
+	margin: 0;
+	padding: 0 10px 0 30px;
+	text-align: left;
+	overflow: hidden;
+	position: relative;
 }
 
-#indi_header a:hover {
-	color: #f00;
+#indi_header .name_one {
+	font-size: 1.5em;
 }
 
 #indi_header h3 .details1 {
-	font-size: 1em;
+	font-size: 1.0em;
+}
+
+#indi_header h3.person_box,
+#indi_header h3.person_boxF,
+#indi_header h3.person_boxNN {
+	border: 1px solid #999;
 }
 
 #indi_header h3 .header_age {
+	padding: 5px 0 5px 5px;
 	float: right;
+	font-weight: normal;
 	font-size: 65%;
-	font-weight: 400;
-	padding: 5px 0 5px 5px;
-}
-
-#indi_header h3 {
-	color: #777;
-	font-size: 90%;
-	font-weight: 700;
-	margin: 0;
-	padding: 0 10px 0 30px;
-	text-align: left;
-	overflow: hidden;
-	position: relative;
 }
 
 #indi_header h3 a {
 	display: inline;
 }
 
-#indi_header .name_one {
-	font-size: 1.5em;
+#indi_header a {
+	color: #337;
+	font-size: 0.75em;
+	font-weight: normal;
 }
 
-#indi_header h3.person_box,
-#indi_header h3.person_boxF,
-#indi_header h3.person_boxNN {
-	border: 1px solid #999;
+#indi_header a:hover {
+	color: #f00;
 }
 
 #indi_mainimage {
 	float: left;
-	padding: 0 10px 0 0;
+	padding: 0 10px;
 }
 
 #header_accordion1 {
+	padding: 0 10px 0 0;
 	overflow: hidden;
 }
 
+[dir='rtl'] #header_accordion1 {
+	padding: 0 0 0 10px;
+}
+
 #header_accordion1 .indi_name_details {
 	margin: 0;
 	overflow: hidden;
 	padding: 5px;
 }
 
+.indi_name_details dt:after {
+	content: ":";
+}
+
 .indi_name_details .name1 {
 	font-weight: normal;
+	padding-top: 5px;
+	font-size: inherit;
 }
 
 #indi_header a.warning {
@@ -3006,17 +2022,25 @@ span.link_text {
 	font-size: 1em;
 }
 
-.indi_name_details dt:after {
-	content: ":";
-}
-
 #indi_note {
 	margin: 0 0 5px;
 }
 
-#indi_note .fact_SOUR a {
-	font-size: 100%;
-	margin: 3px 0;
+.indi_table {
+	clear: left;
+}
+
+#sex {
+	float: right;
+}
+
+#dates {
+	float: right;
+}
+
+dd .editlink,
+dd .deletelink {
+	float: right;
 }
 
 #indi_note .fact_NOTE {
@@ -3028,6 +2052,10 @@ span.link_text {
 	margin: 3px 0;
 }
 
+#indi_note .fact_SOUR a {
+	font-size: 100%;
+}
+
 #indi_note .fact_NOTE,
 #indi_note .fact_SOUR {
 	clear: both;
@@ -3050,42 +2078,36 @@ span.link_text {
 .markdown th {
 	border: solid thin #000;
 	padding: 3px;
-	font-size: .98em;
 }
 
-.markdown ol,
-.markdown ul {
-	margin: 12px 0;
+[dir=rtl] #indi_header h3 {
+	padding: 0 30px 0 10px;
+	text-align: right;
 }
 
-#sex,
-dd .editlink,
-dd .deletelink {
-	float: right;
+[dir=rtl] #indi_header h3 .header_age {
+	padding: 5px 5px 5px 0;
+	float: left;
 }
 
-#main_name {
-	color: #555;
-	float: left;
-	font-size: 2em;
-	font-weight: 700;
-	margin: 10px;
+[dir=rtl] #indi_mainimage {
+	float: right;
 }
 
-.indi_table {
-	clear: left;
+[dir=rtl] #indi_note .fact_NOTE {
+	float: right;
+	margin: 0 0 0 10px;
 }
 
-[dir=rtl] #dates {
-	float: left;
+[dir=rtl] .indi_table {
+	clear: right;
 }
 
-[dir=rtl] #indi_header h3 .header_age {
-	padding: 5px 5px 5px 0;
+[dir=rtl] #sex {
 	float: left;
 }
 
-[dir=rtl] #sex {
+[dir=rtl] #dates {
 	float: left;
 }
 
@@ -3094,60 +2116,21 @@ dd .deletelink {
 	float: left;
 }
 
-[dir=rtl] #indi_header {
-	float: right;
-}
-
-[dir=rtl] #indi_header h3 {
-	padding: 0 30px 0 10px;
-	text-align: right;
-}
-
-[dir=rtl] #indi_mainimage {
-	float: right;
-	padding: 0 0 0 10px;
-}
-
-[dir=rtl] #indi_note .fact_NOTE {
-	float: right;
-	margin: 0 0 0 10px;
-}
-
-[dir=rtl] #main_name {
-	float: right;
-}
-
-[dir=rtl] .indi_table {
-	clear: right;
+.hit-counter {
+	background: #000;
+	color: #fff;
+	font-weight: bold;
 }
 
-/* General sprite */
+/* ======= General sprite ==== */
 .male_gender,
 .female_gender,
 .unknown_gender,
 .editicon,
 .copyicon,
 .deleteicon {
-	background: transparent url(../images/general_sprite.png) no-repeat left 0;
 	display: block;
-}
-
-.editicon {
-	background-position: -40px -32px;
-	height: 16px;
-	width: 24px;
-}
-
-.copyicon {
-	background-position: -70px -32px;
-	height: 16px;
-	width: 24px;
-}
-
-.deleteicon {
-	background-position: -100px -32px;
-	height: 16px;
-	width: 24px;
+	background: url(images/general_sprite.png) no-repeat left 0;
 }
 
 .female_gender {
@@ -3168,18 +2151,32 @@ dd .deletelink {
 	height: 30px;
 }
 
-.icon_arrow:after {
-	content: " »";
+.editicon {
+	background-position: -40px -32px;
+	width: 24px;
+	height: 16px;
+}
+
+.copyicon {
+	background-position: -70px -32px;
+	width: 24px;
+	height: 16px;
+}
+
+.deleteicon {
+	background-position: -100px -32px;
+	width: 24px;
+	height: 16px;
 }
 
-/* Indi tabs */
-/* Facts & Events */
+/* ======== Indi tabs ======== */
+/* Facts & Events tab */
 #personal_facts_content .fact_NOTE,
 #personal_facts_content .fact_SOUR,
 #family-table .fact_NOTE,
 #family-table .fact_SOUR {
-	clear: both;
 	margin: 5px 3px 5px 0;
+	clear: both;
 }
 
 .facts_table .field em {
@@ -3193,15 +2190,12 @@ dd .deletelink {
 
 .media-display-image {
 	float: left;
-	margin-top: 5px;
 }
 
 .media-display-title {
 	float: left;
 	font-style: italic;
-	font-weight: 600;
-	padding-left: 3px;
-	margin-top: 5px;
+	margin: 10px;
 }
 
 [dir=rtl] .media-display-image {
@@ -3210,14 +2204,13 @@ dd .deletelink {
 
 [dir=rtl] .media-display-title {
 	float: right;
-	padding-right: 3px;
 }
 
 [dir=rtl] .facts_table .field em {
 	padding-right: 5px;
 }
 
-/* Album tab */
+/* ======== Album tab =========*/
 .album-list {
 	list-style-type: none;
 }
@@ -3250,33 +2243,12 @@ dd .deletelink {
 	width: 100%;
 }
 
-/* jquery-ui.custom.css changes */
-span.link_text {
-	display: none;
-}
-
+/* === jquery-ui.css changes === */
 .ui-accordion .ui-accordion-content {
-	margin-top: 1px;
-	overflow: visible;
-	padding: 0 5px;
+	border: 0;
 	position: relative;
-}
-
-.ui-accordion .ui-accordion-header {
-	margin-top: 0;
-	text-align: center;
-}
-
-.ui-accordion .ui-accordion-header a {
-	padding: 2px;
-}
-
-.ui-helper-reset {
-	line-height: 1.5;
-}
-
-.ui-tabs .ui-tabs-panel {
-	padding: 1em 0;
+	padding: 0 5px;
+	overflow: visible;
 }
 
 .ui-tabs,
@@ -3284,37 +2256,18 @@ span.link_text {
 	padding: 0;
 }
 
-.ui-tabs .ui-tabs-nav li a span {
-	padding: .5em 1em;
-}
-
-.ui-state-active,
-.ui-widget-content .ui-state-active {
-	border: 0 solid #999;
-	color: #000;
-	font-weight: 400;
-	outline: none;
-}
-
-.ui-state-highlight a {
-	color: #f00;
+#sidebarAccordion .ui-accordion-header {
+	text-align: center;
 }
 
 .ui-widget-header {
-	border: 1px solid #fff;
-	font-weight: 400;
-}
-
-.ui-state-default .ui-icon,
-.ui-state-active .ui-icon {
-	background-image: url(../../jquery-ui-1.11.2/images/ui-icons_222222_256x240.png);
+	padding: 3px;
 }
 
 .ui-state-hover a,
 .ui-state-hover a:hover,
 .ui-state-default a:link {
 	color: #000;
-	border-radius: 3px;
 }
 
 .ui-menu .ui-menu-item a {
@@ -3326,17 +2279,12 @@ span.link_text {
 	color: #f00;
 }
 
-[dir=rtl] .ui-accordion .ui-accordion-header .ui-icon {
-	right: 0.5em;
-}
-
-[dir=rtl] .ui-tabs {
-	direction: rtl;
+.ui-helper-reset {
+	line-height: 1.5;
 }
 
-[dir=rtl] .ui-tabs .ui-tabs-nav li.ui-tabs-selected,
-[dir=rtl] .ui-tabs .ui-tabs-nav li.ui-state-default {
-	float: right;
+[dir=rtl] .ui-accordion .ui-accordion-header .ui-icon {
+	right: 0.5em;
 }
 
 [dir=rtl] .ui-dialog-title {
@@ -3348,15 +2296,7 @@ span.link_text {
 	right: auto;
 }
 
-/* jQuery over-rides */
-#loading {
-	text-align: center;
-}
-
-.dt-clear {
-	clear: both;
-}
-
+/* === jQuery.datatable styling general over-rides === */
 .odd {
 	background-color: #e7eef3;
 }
@@ -3373,9 +2313,24 @@ span.link_text {
 	padding: 2px 6px;
 }
 
-.fg-toolbar button {
-	margin: 2px;
-	padding: 1px 6px;
+.dataTables_paginate {
+	float: left;
+	margin-bottom: 3px;
+}
+
+.dataTables_processing {
+	float: left;
+}
+
+.dataTables_filter {
+	float: right;
+	font-weight: normal;
+}
+
+.dataTables_info {
+	float: left;
+	font-weight: normal;
+	padding: 4px;
 }
 
 .recent_changes_block .dataTables_info,
@@ -3393,16 +2348,12 @@ span.link_text {
 
 .upcoming_events_block button,
 .todays_events_block button {
-	margin: 5px 20px;
-}
-
-.dataTables_filter {
-	float: right;
-	margin: 4px;
+	margin: 0 20px;
 }
 
 .dataTables_length {
 	float: right;
+	font-weight: normal;
 }
 
 .dataTables_length select,
@@ -3411,9 +2362,17 @@ span.link_text {
 	padding: 1px;
 }
 
+.dt-clear {
+	clear: both;
+}
+
+#loading {
+	text-align: center;
+}
+
 .DataTables_sort_wrapper {
-	margin: 0 20px;
 	position: relative;
+	margin: 0 20px;
 }
 
 .DataTables_sort_wrapper span {
@@ -3424,11 +2383,8 @@ span.link_text {
 	top: 50%;
 }
 
-.dataTables_paginate,
-.dataTables_processing,
-.dataTables_info {
-	float: left;
-	margin: 5px;
+.dataTables_wrapper {
+	margin-bottom: 10px;
 }
 
 [dir=rtl] .css_right {
@@ -3465,224 +2421,38 @@ span.link_text {
 	margin-right: -20px;
 }
 
-/* List styles */
-
-.source-list,
-.note-list,
-.repo-list,
-.media-list,
-.indi-list,
-.fam-list {
-	margin: 5px auto;
-	visibility: hidden;
-	width: 98%;
-}
-
-.source-list table,
-.note-list table,
-.repo-list table,
-.media-list table,
-.indi-list table,
-.fam-list table {
+/* ======= Sidebar setup ===== */
+#main {
+	min-width: 600px;
 	width: 100%;
+	display: table;
+	table-layout: fixed;
 }
 
-.source-list td,
-.note-list td,
-.repo-list td,
-.media-list td,
-.indi-list td,
-.fam-list td,
-.recent_changes_block td,
-.upcoming_events_block,
-.surname-list td,
-.givn-list td {
-	padding: 2px 5px;
-}
-
-.source-list th,
-.note-list th,
-.repo-list th,
-.media-list th,
-.indi-list th,
-.fam-list th,
-.recent_changes_block th,
-.upcoming_events_block th,
-.todays_events_block th,
-.todo_block th,
-.yahrzeit_block th,
-.surname-list th,
-.givn-list th {
-	cursor: pointer;
-	white-space: nowrap;
-}
-
-.source-list th:last-child,
-.note-list th:last-child,
-.repo-list th:last-child {
-	margin: 0 -2px 1px 1px;
-	padding: 3px 0 4px;
-	width: 24px;
-}
-
-.surname-list,
-.givn-list {
-	margin: 5px auto;
-}
-
-.surname-list td {
-	vertical-align: top;
-}
-
-.indi-list td,
-.fam-list td {
-	color: #555;
-}
-
-.indi-list .stats,
-.fam-list .stats {
-	margin: 0 auto;
-	width: auto;
-}
-
-.givn-list th {
-	padding: 2px;
-	text-align: center;
-}
-
-#source-details h2,
-#sourcelist-page h2,
-#note-details h2,
-#notelist-page h2,
-#repo-details h2,
-#repolist-page h2,
-#media-details h2,
-#medialist-page h2,
-#statistics-page h2 {
-	margin-bottom: 20px;
-	text-align: center;
-}
-
-#source-tabs,
-#note-tabs,
-#repo-tabs,
-#media-tabs {
-	margin: auto;
-	visibility: hidden;
-	width: 80%;
-}
-
-#statistics_chart {
-	margin: auto;
-	visibility: hidden;
-	width: 90%;
-}
-
-#source-edit,
-#note-edit,
-#repo-edit,
-#media-edit {
-	overflow-x: auto;
-}
-
-.media-list td img {
-	display: block;
-	height: 40px;
-	width: auto;
-	margin: 3px auto;
-}
-
-.filtersH,
-.filtersF {
-	margin: 4px;
+#indi_left {
+	display: table-cell;
 }
 
-.filtersH img {
-	margin-bottom: 2px;
+#indi_left .ui-tabs-panel {
+	padding: 0;
 }
 
-.filtersH .ui-state-default,
-.filtersF .ui-state-default {
+#indi_left .ui-tabs-nav {
 	margin: 0 2px;
-	padding: 2px;
-}
-
-.loading-image {
-	background: transparent url(../images/loading.gif) 50% 50% no-repeat;
-	height: 50px;
-	margin: 50px;
-}
-
-.search_hit {
-	background: #ff0;
-	color: #000;
-}
-
-.search_item {
-	font-weight: 600;
-}
-
-.search-icon {
-	height: 17px;
-	vertical-align: top;
-}
-
-#firstfocus {
-	font-size: 12px;
-	width: 330px;
-}
-
-#search-result-tabs,
-#places-tabs {
-	margin: auto;
-	visibility: hidden;
-	width: 98%;
-}
-
-#searchAccordion-indi,
-#searchAccordion-fam,
-#searchAccordion-source,
-#searchAccordion-note {
-	margin: auto;
-	width: 99%;
-}
-
-#search-result-tabs h3,
-#place-hierarchy h2,
-#place-hierarchy h4 {
-	text-align: center;
-}
-
-[dir=rtl] .source-list th:last-child,
-[dir=rtl] .note-list th:last-child,
-[dir=rtl] .repo-list th:last-child {
-	margin: 0 1px 1px -2px;
-}
-
-/* Sidebar */
-#indi_left {
-	display: table-cell;
-}
-
-#main {
-	min-width: 600px;
-	width: 100%;
-	padding: 5px 2px 0;
-	display: table;
-	table-layout: fixed;
 }
 
 #tabs {
 	background-color: #fff;
-	overflow: visible;
-	width: 100%;
 	border-color: #ddd;
+	width: 100%;
+	overflow: visible;
 }
 
 [dir=rtl] #tabs {
 	float: right;
 }
 
+/* sidebar */
 #sidebar {
 	width: 20%;
 	display: table-cell;
@@ -3700,8 +2470,8 @@ span.link_text {
 #separator:after {
 	position: absolute;
 	top: 0;
-	left: auto;
 	right: 0;
+	left: auto;
 	width: 10px;
 	height: 99999px;
 	content: "";
@@ -3711,18 +2481,18 @@ span.link_text {
 }
 
 [dir=rtl] #separator:after {
-	left: 0;
 	right: auto;
+	left: 0;
 }
 
 .separator-hidden:after,
 [dir=rtl] .separator-visible:after {
-	background: url(../images/general_sprite.png) no-repeat -26px 100px;
+	background: url(images/general_sprite.png) no-repeat -26px 100px;
 }
 
 .separator-visible:after,
 [dir=rtl] .separator-hidden:after {
-	background: url(../images/general_sprite.png) no-repeat -1px 100px;
+	background: url(images/general_sprite.png) no-repeat -1px 100px;
 }
 
 /* Sidebar content items */
@@ -3735,10 +2505,23 @@ span.link_text {
 	margin-top: 8px;
 }
 
+.nam a:hover {
+	color: #f00;
+}
+
+.nav_content {
+	width: 100%;
+	padding: 0;
+}
+
 .nav_content .facts_label {
 	width: 75px;
 }
 
+#sb_family_nav_content .clist {
+	margin: 0;
+}
+
 .famnav_title {
 	font-weight: bold;
 	display: block;
@@ -3747,9 +2530,6 @@ span.link_text {
 
 .flyout {
 	left: 40px;
-	padding: 3px;
-	background-color: #fff;
-	border: 1px solid #ccc;
 }
 
 [dir=rtl] .flyout {
@@ -3764,33 +2544,46 @@ span.link_text {
 }
 
 .flyout2 {
-	font-weight: 700;
+	font-weight: bold;
+}
+
+.flyout3 {
+	color: #362b36;
 }
 
 .flyout3:hover {
 	cursor: pointer;
-	text-decoration: underline;
+	color: #f00;
+}
+
+/* Sidebar*/
+#sb_content_descendancy {
+	margin-top: 2px;
 }
 
 #sb_desc_content {
-	font-size: 0.8em;
 	margin-left: 3px;
+	font-size: 0.8em;
 }
 
 #sb_desc_content ul {
-	margin: 0;
 	padding: 0;
+	margin: 0;
+}
+
+.sb_desc_indi_li {
+	list-style-type: none;
+}
+
+.desc_tree_div {
+	display: none;
 }
 
 .desc_tree_div ul {
+	padding: 0;
 	margin-left: 10px;
-	margin-right: 0;
 	margin-top: 0;
-	padding: 0;
-}
-
-.sb_desc_indi_li {
-	list-style-type: none;
+	margin-right: 0;
 }
 
 [dir=rtl] #sb_desc_content {
@@ -3798,19 +2591,59 @@ span.link_text {
 }
 
 [dir=rtl] .desc_tree_div ul {
-	margin-left: 0;
 	margin-right: 10px;
+	margin-left: 0;
+}
+
+/* Individuals and Families */
+#sb_content_individuals,
+#sb_content_families {
+	margin-top: 2px;
 }
 
 .sb_indi_surname_li,
 .sb_fam_surname_li {
-	list-style-image: url(../images/plus.png);
+	list-style-image: url(images/plus.png);
+}
+
+.name_tree_div {
+	display: none;
+}
+
+.name_tree_div ul,
+.name_tree_div_visible ul {
+	padding: 0;
+	margin: 0;
 }
 
-/* Extra Info */
+.name_tree_div li,
+.name_tree_div_visible li {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+/* Clippings */
+#sb_content_clippings {
+	margin-top: 2px;
+}
+
+#sb_clippings_content ul {
+	padding: 0;
+	margin: 0;
+}
+
+#sb_clippings_content li {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	white-space: nowrap;
+}
+
+/* Extra info */
 #sb_content_extra_info {
 	font-size: 80%;
-	font-weight: 700;
+	font-weight: bold;
 	margin-top: 1px;
 	overflow: hidden;
 	padding: 5px;
@@ -3821,25 +2654,29 @@ span.link_text {
 	margin-top: -30px;
 }
 
-#sb_content_extra_info #hitcounter {
-	border-top: 1px solid #bcd;
-	font-weight: 700;
-	padding-top: 5px;
-}
-
 #sb_content_extra_info a {
 	display: block;
 }
 
 #sb_content_extra_info span {
-	font-weight: 400;
+	font-weight: normal;
 }
 
 #sb_content_extra_info span a {
 	display: inline;
 }
 
-/* find.php */
+#sb_content_extra_info #hitcounter {
+	border-top: 1px solid #b2c7d7;
+	font-weight: bold;
+	padding-top: 5px;
+}
+
+[dir=rtl] #sb_content_extra_info .editfacts {
+	float: left;
+}
+
+/* ===== find.php =====  */
 #find-page h3,
 #find-page h4 {
 	margin: 10px;
@@ -3847,8 +2684,7 @@ span.link_text {
 }
 
 #find-header {
-	border: 1px solid #999;
-	border-radius: 3px;
+	border: 1px outset #999;
 	margin: 10px auto;
 	padding: 5px 20px;
 	width: 50%;
@@ -3859,25 +2695,29 @@ span.link_text {
 	text-align: center;
 }
 
+#find-header span {
+	color: #fff;
+	font-weight: bold;
+}
+
 #find-output,
 #find-output-special {
-	border: 1px solid #999;
-	border-radius: 3px;
+	border: 1px outset #999;
 	margin: 20px 5px;
 	padding: 10px;
 }
 
 #find-output p {
 	border-top: 1px solid #999;
-	font-weight: 700;
+	font-weight: bold;
 	margin: 0;
 	padding-top: 10px;
 	text-align: center;
 }
 
 #find-media {
-	border: 1px solid #999;
-	border-radius: 3px;
+	background-color: #81a9cb;
+	border: 1px outset #81a9cb;
 	color: #fff;
 	padding: 5px;
 	text-align: center;
@@ -3885,7 +2725,7 @@ span.link_text {
 
 #find-media span {
 	border: 0;
-	font-weight: 700;
+	font-weight: bold;
 	margin: auto;
 	padding: 5px;
 }
@@ -3897,8 +2737,8 @@ span.link_text {
 
 #find-output .find-media-media {
 	border: 1px solid #999;
-	margin: 1px;
 	overflow: hidden;
+	margin: 1px;
 	padding: 2px;
 }
 
@@ -3907,34 +2747,37 @@ span.link_text {
 	float: left;
 }
 
+#find-output .find-media-details {
+	float: left;
+}
+
 #find-output .find-media-details p {
 	border: 0;
-	font-weight: 400;
 	padding: 0 5px 2px;
+	font-weight: normal;
 	text-align: left;
 }
 
 #find-output .find-media-details div span {
-	font-weight: 400;
+	font-weight: normal;
 	padding: 0 5px 2px;
 }
 
+#find-output p.find-media-title {
+	font-weight: bold;
+}
+
 #find-output .find-media-details ul {
-	list-style-type: none;
-	margin: 0 20px 10px;
 	padding: 0;
+	margin: 0 20px 10px;
+	list-style-type: none;
 }
 
 #find-facts-header .list_label {
 	text-align: inherit;
 }
 
-#find-header span,
-#find-output p.find-media-title {
-	font-weight: 700;
-}
-
-/* search.php */
+/* ===== search.php ===== */
 #search-page h2,
 #search_submit {
 	margin: 20px;
@@ -3943,66 +2786,29 @@ span.link_text {
 
 #search-page-table {
 	border: 1px solid #999;
-	border-radius: 3px;
+	border-top: 0;
 	margin: 20px auto 0;
 	width: 580px;
 }
 
 #search-page-table .label {
 	float: left;
-	font-weight: 700;
+	font-weight: bold;
 	padding: 5px 10px 0;
 	width: 150px;
 }
 
 #search-page-table .value {
 	background-color: #ecf5ff;
-	border-top: 1px solid #999;
 	color: #333;
+	border-top: 1px solid #999;
 	margin: 0 0 0 170px;
 	padding: 5px;
 	white-space: nowrap;
 }
 
-#search-page-table div:nth-of-type(2) {
-	border: 0;
-}
-
-#search-page-table label,
-#search-page-table .value input {
-	margin: 0 3px;
-}
-
-#sb_content_descendancy,
-#sb_content_individuals,
-#sb_content_families,
-#sb_content_clippings {
-	margin-top: 5px;
-}
-
-.desc_tree_div,
-.name_tree_div {
-	display: none;
-}
-
-.name_tree_div li,
-.name_tree_div_visible li,
-#sb_clippings_content li {
-	list-style: none;
+#search-page-table p {
 	margin: 0;
-	padding: 0;
-}
-
-.name_tree_div ul,
-.name_tree_div_visible ul,
-#sb_clippings_content ul {
-	margin: 0;
-	padding: 0;
-}
-
-[dir=rtl] #sb_content_extra_info .editfacts,
-.find-media-details {
-	float: left;
 }
 
 [dir=rtl] #search-page-table .label {
@@ -4013,7 +2819,7 @@ span.link_text {
 	margin: 0 170px 0 0;
 }
 
-/* edituser.php */
+/*  edituser.php  */
 #edituser-page h2,
 #edituser_submit {
 	margin: 20px;
@@ -4022,14 +2828,14 @@ span.link_text {
 
 #edituser-table {
 	border: 1px solid #999;
-	border-radius: 3px;
+	border-top: 0;
 	margin: 20px auto 0;
 	width: 800px;
 }
 
 #edituser-table .label {
 	float: left;
-	font-weight: 700;
+	font-weight: bold;
 	padding: 5px 10px 0;
 	width: 240px;
 	white-space: nowrap;
@@ -4047,10 +2853,6 @@ span.link_text {
 	margin: 0 10px;
 }
 
-#edituser-table div:nth-of-type(2) {
-	border: 0;
-}
-
 #edituser-table select {
 	margin: 0;
 }
@@ -4063,55 +2865,664 @@ span.link_text {
 	margin: 0 260px 0 0;
 }
 
-@media print {
-	form,
-	#backprint,
-	#sidebar,
-	#main-menu,
-	#separator,
-	header,
-	footer,
-	#CB_All,
-	.noprint {
-		display: none !important;
-	}
+/* ===== Edit interface pop-ups ===== */
+#edit_interface-page h4 {
+	color: #555;
+	margin: 5px;
+}
 
+#edit_interface-page .optionbox span {
+	margin: 0 5px;
+}
 
-	#familybook_chart h3 {
-		margin-bottom: 10px;
-	}
+#edit_interface-page #LATI,
+#edit_interface-page #LONG,
+#edit_interface-page #SPFX,
+#edit_interface-page #NSFX,
+#edit_interface-page #NPFX {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 88px;
+}
 
-	#header_accordion1 {
-		width: 510px !important;
-	}
+#edit_interface-page #GIVN,
+#edit_interface-page #SURN,
+#edit_interface-page #_MARNM {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 180px;
+}
 
-	#pedigree_chart {
-		left: -90px;
-	}
+#edit_interface-page input[type="text"],
+#edit_interface-page #NAME_display {
+	line-height: 18px;
+	margin: 0 5px;
+	vertical-align: top;
+	width: 240px;
+}
 
-	[dir=rtl] #pedigree_chart {
-		left: auto;
-		right: -90px;
-	}
+#edit_interface-page input[type="text"][id*="PAGE"],
+#edit_interface-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
 
-	.lifespan_outer {
-		position: relative;
-		width: auto;
-		height: auto;
-		overflow: visible;
-		border: 0;
-	}
+#edit_interface-page input[type="text"][id*="SOUR"],
+#edit_interface-page input[type="text"][id*="REPO"],
+#edit_interface-page input[type="text"][id*="OBJE"],
+#edit_interface-page input[type="text"][id*="FAMC"],
+#edit_interface-page input[type="text"][id*="ASSO"],
+#edit_interface-page input[type="text"][id^="AGE"],
+#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 250px;
+}
 
-	.lifespan_people {
-		position: absolute;
-		width: auto;
-		left: -10px;
-		top: -60px;
-		z-index: 1;
-	}
+#edit_interface-page input[type="text"][id$="DATE"] {
+	width: 160px;
+}
+
+#edit_interface-page input[type="text"][id^="TIME"] {
+	width: 100px;
+}
+
+#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
+	width: 200px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
+	width: 250px;
+}
+
+#edit_interface-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#edit_interface-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#edit_interface-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#edit_interface-page textarea[id*="TEXT"],
+#edit_interface-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+#edit_interface-page textarea[id^="newgedrec"] {
+	line-height: 18px;
+	width: 605px;
+}
+
+#edit_interface-page textarea#gedcom {
+	height: 364px;
+}
+
+#edit_interface-page textarea[id*="ADDR"],
+#edit_interface-page input[id*="ADDR"] {
+	height: 80px;
+	width: 300px;
+}
+
+#edit_interface-page #changefam {
+	padding: 5px;
+}
+
+#edit_interface-page #changefam table {
+	margin: 10px auto;
+	min-width: 400px;
+	max-width: 650px;
+}
+
+#edit_interface-page #changefam span {
+	margin: 0;
+}
+
+#edit_interface-page #changefam td {
+	padding: 5px;
+	white-space: normal;
+}
+
+#edit_interface-page #changefam td.child {
+	text-align: center;
+}
+
+#save-cancel {
+	position: fixed;
+	bottom: 0;
+	width: 98%;
+	border: solid #999 1px;
+	margin: 0;
+}
+
+#save-cancel input {
+	padding: 2px 8px;
+}
+
+#save-cancel .save {
+	float: left;
+	margin: 5px;
+}
+
+#save-cancel .cancel {
+	float: right;
+	margin: 5px;
+}
+
+[dir=rtl] #save-cancel .save {
+	float: right;
+}
+
+[dir=rtl] #save-cancel .cancel {
+	float: left;
+}
+
+#edit_interface-page,
+#addmedia-page {
+	margin-bottom: 50px;
+}
+
+/* ===== Addmedia pop-ups ===== */
+#addmedia-page input[type="text"] {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 350px;
+}
+
+#addmedia-page .optionbox select {
+	margin: 0 5px;
+}
+
+#addmedia-page .optionbox p.sub {
+	margin: 0 5px;
+	font-size: 11px;
+}
+
+#addmedia-page input[type="text"][id*="PAGE"],
+#addmedia-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#addmedia-page input[type="text"][id*="SOUR"],
+#addmedia-page input[type="text"][id*="REPO"],
+#addmedia-page input[type="text"][id*="OBJE"],
+#addmedia-page input[type="text"][id*="FAMC"],
+#addmedia-page input[type="text"][id*="ASSO"],
+#addmedia-page input[type="text"][id^="AGE"],
+#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 70px;
+}
+
+#addmedia-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#addmedia-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#addmedia-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#addmedia-page textarea[id*="TEXT"],
+#addmedia-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+/* ===== Styling for the jquery.colorbox gallery ===== */
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+#colorbox {
+	border: 2px solid #ccc;
+}
+
+#cboxOverlay {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	background: #ccc;
+}
+
+#cboxContent {
+	background: #fff;
+	border: 5px solid #888;
+}
+
+#cboxLoadedContent {
+	overflow: auto;
+	background: #fff;
+	margin-bottom: 30px;
+	margin-top: 35px;
+}
+
+#cboxTitle {
+	position: absolute;
+	left: 0;
+	top: 10px;
+	font-size: 14px;
+	color: #949494;
+	text-align: center;
+	width: 100%;
+	font-weight: 800;
+}
+
+.cboxPhoto {
+	float: left;
+	margin: auto;
+	border: 0;
+	display: block;
+	max-width: none;
+}
+
+.cboxIframe {
+	width: 100%;
+	height: 100%;
+	display: block;
+	border: 0;
+}
+
+#cboxPrevious {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	background: url(images/controls.png) no-repeat -75px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxPrevious:hover {
+	background-position: -75px -25px;
+}
+
+#cboxNext {
+	position: absolute;
+	bottom: 0;
+	left: 27px;
+	background: url(images/controls.png) no-repeat -50px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxNext:hover {
+	background-position: -50px -25px;
+}
+
+#cboxSlideshow {
+	position: absolute;
+	bottom: 5px;
+	font-size: 14px;
+	left: 57px;
+	margin: 10px;
+	border: 0;
+	background: none;
+}
+
+#cboxSlideshow:hover {
+	color: #f00;
+	background: #fff;
+}
+
+#cboxClose {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	background: url(images/controls.png) no-repeat -25px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxClose:hover {
+	background-position: -25px -25px;
+}
+
+#cboxCurrent {
+	bottom: 4px;
+	color: #949494;
+	left: 58px;
+	position: absolute;
+}
+
+[dir=rtl] #cboxPrevious {
+	right: 27px;
+	left: auto;
+}
+
+[dir=rtl] #cboxNext {
+	right: 0;
+	left: auto;
+}
+
+[dir=rtl] #cboxCurrent {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxClose {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxSlideshow {
+	right: 57px;
+	left: auto;
+}
+
+/* ===== Census assistant module ===== */
+table.table-census-assistant th {
+	font-weight: bold;
+	text-align: left;
+}
+
+/* Stories module */
+.story_title {
+	padding-top: 12px;
+	font-size: 13px;
+	height: 32px;
+	font-weight: bold;
+}
+
+.story_body {
+	padding: 20px;
+	white-space: normal;
+}
+
+.story_edit {
+	padding: 12px;
+}
+
+.btn-group {
+	display: inline-block;
+	margin: 0 4px;
+}
+
+.btn-group button:first-child,
+[dir=rtl] .btn-group button:last-child {
+	border-radius: 3px 0 0 3px;
+}
+
+.btn-group button:last-child,
+[dir=rtl] .btn-group button:first-child {
+	border-radius: 0 3px 3px 0;
+}
+
+/* ====== Charts Styles ======== */
+#compact_chart,
+#fan_chart,
+.chart_common,
+#ancestry_booklet,
+#descendancy_booklet,
+#familybook_chart,
+#hourglass_chart {
+	margin: 20px;
+}
+
+/* styles for vertical lines in ancestry and descendancy charts */
+.chart_common li {
+	list-style: none;
+}
+
+.chart_common li > span.details1 {
+	white-space: nowrap;
+}
+
+.chart_common .generation {
+	background: transparent url(images/vline.png) left top repeat-y;
+	margin: 0 0 0 15px;
+	padding: 0;
+	display: block;
+}
+
+[dir=rtl] .chart_common .generation {
+	margin: 0 15px 0 0;
+	background-position: right top
+;
+}
+
+.chart_common .generation > li {
+	margin: 5px 0;
+}
+
+.chart_common table {
+	padding: 0;
+	border-spacing: 0;
+	border-collapse: collapse;
+	margin: 5px 0;
+}
+
+.chart_common td {
+	border: 0;
+	padding: 0;
+}
+
+.chart_common span.details1 div[class^=fact_] {
+	display: inline-block;
+}
+
+.chart_common span.details1 .date {
+	color: inherit;
+}
+
+/*-- Family book  --*/
+#familybook_chart {
+	margin-left: 10px;
+}
+
+#familybook_chart table {
+	border-collapse: collapse;
+	empty-cells: show;
+}
+
+#familybook_chart td {
+	margin: 0;
+	padding: 0;
+}
+
+#familybook_chart h2 {
+	text-align: center;
+}
+
+#familybook_chart .line3,
+#familybook_chart .pvline,
+#familybook_chart .spacer {
+	width: 3px;
+}
+
+#familybook_chart .line4 {
+	width: 7px;
+	vertical-align: middle;
+}
+
+[ID^="vline"] {
+	width: 3px;
+}
+
+#familybook_chart h3 {
+	color: #006;
+	font-size: 16px;
+	text-align: center;
+}
+
+[dir=rtl] #familybook_chart {
+	margin-right: 10px;
+}
+
+/*-- Fan chart ---- */
+.fan_chart_menu {
+	position: absolute;
+	display: none;
+	z-index: 100;
+}
+
+#fan_chart ul {
+	list-style-type: none;
+	margin: 0;
+}
+
+#fan_chart ul.children li:before {
+	content: "< ";
+	font-weight: bold;
+}
+
+#fan_chart_img {
+	text-align: center;
+}
+
+/*-- Hourglass ---- */
+#hourglass_chart img.line4 {
+	vertical-align: middle;
+}
+
+#hourglass_chart table,
+.charts_block table {
+	border-collapse: collapse;
+}
+
+#hourglass_chart td,
+.charts_block td {
+	padding: 0;
+	empty-cells: show;
+}
+
+/*-- Lifespan ---- */
+#lifespan-page .person0 {
+	padding: 5px;
+}
+
+#lifespan-page .person0 div{
+	text-align: center;
+}
+
+#lifespan_chart .div-controls {
+	opacity: 0.67;
+	position: relative;
+	top: 80px;
+	width: 180px;
+	z-index: 100;
+	margin-left: 20px;
+}
+
+.lifespan_people span:first-letter {
+	font-variant: small-caps;
+	font-size: 16px;
+	padding: 1px;
+}
+
+.lifespan_outer {
+	position: relative;
+	width: 99.5%;
+	height: 600px;
+	overflow: hidden;
+	border: solid #00f 1px;
+}
+
+.lifespan_outer a:hover {
+	color: #f00;
+	text-decoration: none;
+}
+
+.lifespan_timeline {
+	position: absolute;
+	width: 100%;
+	left: -10px;
+	top: -65px;
+	z-index: 2;
+	background-color: #fff;
+}
+
+.lifespan_people {
+	position: absolute;
+	width: 500px;
+	left: -10px;
+	top: -60px;
+	z-index: 1;
+}
+
+/*-- Pedigree ---- */
+#pedigree_chart #childbox {
+	border: 1px solid;
+	background-color: #fff;
+}
+
+.pedigree_form {
+	width: 45px;
+}
+
+#pedigree-page table.list_table {
+	margin: 0 auto;
+	width: 500px;
+}
+
+.pedigree_chart_table {
+	border: 0;
+	border-collapse: collapse;
+	padding: 0;
+	width: 100%;
+}
+
+#pedigree_chart {
+	position: relative;
+	top: -200px;
+	left: 0;
+}
+
+[dir=rtl] #pedigree_chart {
+	left: auto;
+	right: 0;
+}
+
+#pedigree_canvas {
+	color: #81a9cb;
+	position: absolute;
+	top: 200px;
+	z-index: -1000;
+}
+
+#pedigree_chart #childarrow,
+#pedigree_chart #uparrow,
+#pedigree_chart .shadow,
+.ancestorarrow {
+	position: absolute;
+}
+
+/*-- Relationship ---- */
+#relationship-page h3 {
+	margin: 20px 0 0 20px;
+}
+
+#relationship_chart {
+	margin: 0 6px;
+}
+
+/*-- timeline  --*/
+#timeline_chart {
+	position: relative;
+	top: 0;
+	left: 0;
 }
 
-/* Icons */
+/* ====== Common Icons ========= */
 [class^="icon-"],
 [class*=" icon-"] {
 	display: inline-block;
@@ -4122,564 +3533,567 @@ span.link_text {
 .icon-add {
 	width: 14px;
 	height: 15px;
-	background-image: url(../images/add.png);
+	background-image: url(images/add.png);
 }
 
 .icon-admin {
 	width: 22px;
 	height: 22px;
-	background-image: url(../images/admin.png);
+	background-image: url(images/admin.png);
 }
 
 .icon-bing {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/bing.png);
+	background-image: url(images/bing.png);
 }
 
 .icon-button_addmedia {
 	width: 18px;
 	height: 16px;
-	background-image: url(../images/buttons/addmedia.png);
+	background-image: url(images/buttons/addmedia.png);
+	vertical-align: middle;
 }
 
 .icon-button_addnote {
 	width: 17px;
 	height: 15px;
-	background-image: url(../images/buttons/addnote.png);
+	background-image: url(images/buttons/addnote.png);
 }
 
 .icon-button_addrepository {
 	width: 15px;
 	height: 15px;
-	background-image: url(../images/buttons/addrepository.png);
+	background-image: url(images/buttons/addrepository.png);
 }
 
 .icon-button_addsource {
 	width: 18px;
 	height: 16px;
-	background-image: url(../images/buttons/addsource.png);
+	background-image: url(images/buttons/addsource.png);
 }
 
 .icon-button_calendar {
 	width: 19px;
 	height: 15px;
-	background-image: url(../images/buttons/calendar.png);
+	background-image: url(images/buttons/calendar.png);
+	vertical-align: middle;
 }
 
 .icon-button_family {
 	width: 14px;
 	height: 15px;
-	background-image: url(../images/buttons/family.png);
+	background-image: url(images/buttons/family.png);
+}
+
+.icon-button_find {
+	width: 17px;
+	height: 15px;
+	background-image: url(images/buttons/find.png);
 }
 
 .icon-button_find_facts {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/buttons/find_facts.png);
+	background-image: url(images/buttons/find_facts.png);
 }
 
 .icon-button_head {
 	width: 12px;
 	height: 18px;
-	background-image: url(../images/buttons/head.png);
+	background-image: url(images/buttons/head.png);
 }
 
 .icon-button_indi {
 	width: 11px;
 	height: 15px;
-	background-image: url(../images/buttons/indi.png);
+	background-image: url(images/buttons/indi.png);
 }
 
 .icon-button_keyboard {
 	width: 30px;
 	height: 15px;
-	background-image: url(../images/buttons/keyboard.png);
+	background-image: url(images/buttons/keyboard.png);
+	vertical-align: middle;
 }
 
 .icon-button_media {
 	width: 18px;
 	height: 16px;
-	background-image: url(../images/buttons/media.png);
+	background-image: url(images/buttons/media.png);
+	vertical-align: middle;
 }
 
 .icon-button_note {
 	width: 17px;
 	height: 15px;
-	background-image: url(../images/buttons/note.png);
+	background-image: url(images/buttons/note.png);
 }
 
 .icon-button_place {
 	width: 15px;
 	height: 15px;
-	background-image: url(../images/buttons/place.png);
+	background-image: url(images/buttons/place.png);
+	vertical-align: middle;
 }
 
 .icon-button_repository {
 	width: 15px;
 	height: 15px;
-	background-image: url(../images/buttons/repository.png);
+	background-image: url(images/buttons/repository.png);
 }
 
 .icon-button_source {
 	width: 18px;
 	height: 16px;
-	background-image: url(../images/buttons/source.png);
+	background-image: url(images/buttons/source.png);
 }
 
 .icon-cfamily {
 	width: 32px;
 	height: 32px;
-	background-image: url(../images/cfamily.png);
+	background-image: url(images/cfamily.png);
 }
 
 .icon-childless {
 	width: 25px;
 	height: 25px;
-	background-image: url(../images/childless.png);
+	background-image: url(images/childless.png);
 }
 
 .icon-children {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/children.png);
+	background-image: url(images/children.png);
 }
 
 .icon-clippings {
 	width: 32px;
 	height: 32px;
-	background-image: url(../images/clippings.png);
+	background-image: url(images/clippings.png);
 }
 
 .icon-darrow {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/darrow.png);
+	background-image: url(images/darrow.png);
 }
 
 a.icon-darrow:hover {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/darrow2.png);
+	background-image: url(images/darrow2.png);
 }
 
 .icon-ddarrow {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/ddarrow.png);
+	background-image: url(images/ddarrow.png);
+}
+
+a.icon-ddarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/ddarrow2.png);
 }
 
 .icon-edit_indi {
 	width: 22px;
 	height: 22px;
-	background-image: url(../images/edit_indi.png);
+	background-image: url(images/edit_indi.png);
+}
+
+.icon-email {
+	width: 16px;
+	height: 16px;
+	background-image: url(images/email.png);
 }
 
 .icon-fam-list {
 	width: 32px;
 	height: 32px;
-	background-image: url(../images/sfamily.png);
+	background-image: url(images/sfamily.png);
 }
 
 .icon-googlemaps {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/googlemaps.png);
+	background-image: url(images/googlemaps.png);
 }
 
 .icon-help {
 	cursor: help;
+	margin: 0 5px;
 	width: 15px;
 	height: 15px;
-	background-image: url(../images/help.png);
+	background-image: url(images/help.png);
 }
 
 .icon-indi-list {
 	width: 32px;
 	height: 32px;
-	background-image: url(../images/indis.png);
-}
-
-.icon-indis {
-	width: 22px;
-	height: 25px;
-	background-image: url(../images/mypage.png);
+	background-image: url(images/indis.png);
 }
 
 .icon-larrow {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/larrow.png);
+	background-image: url(images/larrow.png);
 }
 
 a.icon-larrow:hover {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/larrow2.png);
+	background-image: url(images/larrow2.png);
 }
 
 .icon-ldarrow {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/ldarrow.png);
+	background-image: url(images/ldarrow.png);
+}
+
+a.icon-ldarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/ldarrow2.png);
 }
 
 .icon-lifespan-chunk {
 	width: 50px;
 	height: 37px;
-	background-image: url(../images/lifespan-chunk.png);
+	background-image: url(images/lifespan-chunk.png);
 }
 
 .icon-loading-small {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/indicator.gif);
+	background-image: url(images/indicator.gif);
 }
 
 .icon-loading-large {
 	width: 32px;
 	height: 32px;
-	background-image: url(../images/loading.gif);
+	background-image: url(images/loading.gif);
 }
 
 .icon-lsdnarrow {
 	width: 48px;
 	height: 48px;
-	background-image: url(../images/lifespan-down.png);
+	background-image: url(images/lifespan-down.png);
 }
 
 .icon-lsltarrow {
 	width: 48px;
 	height: 48px;
-	background-image: url(../images/lifespan-left.png);
+	background-image: url(images/lifespan-left.png);
 }
 
 .icon-lsrtarrow {
 	width: 48px;
 	height: 48px;
-	background-image: url(../images/lifespan-right.png);
+	background-image: url(images/lifespan-right.png);
 }
 
 .icon-lsuparrow {
 	width: 48px;
 	height: 48px;
-	background-image: url(../images/lifespan-up.png);
+	background-image: url(images/lifespan-up.png);
 }
 
 .icon-media {
 	width: 32px;
 	height: 32px;
-	background-image: url(../images/media.png);
+	background-image: url(images/media.png);
 }
 
 .icon-media-list {
 	width: 32px;
 	height: 32px;
-	background-image: url(../images/media.png);
+	background-image: url(images/media.png);
 }
 
 .icon-media-next {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/rdarrow.png);
+	background-image: url(images/rdarrow.png);
 }
 
 .icon-media-play {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/rarrow.png);
+	background-image: url(images/rarrow.png);
 }
 
 .icon-media-prev {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/ldarrow.png);
+	background-image: url(images/ldarrow.png);
 }
 
 .icon-media-shuffle {
 	width: 10px;
 	height: 10px;
-	background-image: url(../images/reorder.png);
+	background-image: url(images/reorder.png);
 }
 
 .icon-media-stop {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/stop.png);
+	background-image: url(images/stop.png);
 }
 
 .icon-minus {
 	width: 11px;
 	height: 11px;
-	background-image: url(../images/minus.png);
+	background-image: url(images/minus.png);
 }
 
 .icon-mypage {
 	width: 22px;
 	height: 25px;
-	background-image: url(../images/mypage.png);
+	background-image: url(images/mypage.png);
 }
 
 .icon-note {
 	width: 33px;
 	height: 35px;
-	background-image: url(../images/notes.png);
+	background-image: url(images/notes.png);
 }
 
 .icon-note-list {
 	width: 33px;
 	height: 35px;
-	background-image: url(../images/notes.png);
+	background-image: url(images/notes.png);
 }
 
 .icon-osm {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/osm.png);
-}
-
-.icon-patriarch {
-	width: 32px;
-	height: 32px;
-	background-image: url(../images/patriarch.png);
-}
-
-.icon-pedigree {
-	width: 22px;
-	height: 25px;
-	background-image: url(../images/icon-pedigree.png);
-}
-
-.icon-place {
-	width: 32px;
-	height: 17px;
-	background-image: url(../images/place.png);
+	background-image: url(images/osm.png);
 }
 
 .icon-plus {
 	width: 11px;
 	height: 11px;
-	background-image: url(../images/plus.png);
+	background-image: url(images/plus.png);
 }
 
 .icon-rarrow {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/rarrow.png);
+	background-image: url(images/rarrow.png);
 }
 
 a.icon-rarrow:hover {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/rarrow2.png);
+	background-image: url(images/rarrow2.png);
 }
 
 .icon-rdarrow {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/rdarrow.png);
+	background-image: url(images/rdarrow.png);
+}
+
+a.icon-rdarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/rdarrow2.png);
 }
 
 .icon-reminder {
 	width: 15px;
 	height: 12px;
-	background-image: url(../images/reminder.png);
+	background-image: url(images/reminder.png);
 }
 
 .icon-remove {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/delete.png);
-}
-
-.icon-repo-list {
-	width: 22px;
-	height: 22px;
-	background-image: url(../images/repository.png);
-}
-
-.icon-repository {
-	width: 22px;
-	height: 22px;
-	background-image: url(../images/repository.png);
+	background-image: url(images/delete.png);
 }
 
 .icon-resn-confidential {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/resn_confidential.png);
+	background-image: url(images/resn_confidential.png);
 }
 
 .icon-resn-locked {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/resn_locked.png);
+	background-image: url(images/resn_locked.png);
 }
 
 .icon-resn-none {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/resn_none.png);
+	background-image: url(images/resn_none.png);
 }
 
 .icon-resn-privacy {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/resn_privacy.png);
+	background-image: url(images/resn_privacy.png);
 }
 
 .icon-rings {
 	width: 9px;
-	height: 11px;
-	background-image: url(../images/rings.png);
-}
-
-.icon-search {
-	width: 16px;
-	height: 16px;
-	background-image: url(../images/go.png);
+	height: 9px;
+	background-image: url(images/rings.png);
 }
 
 .icon-selected {
 	width: 12px;
 	height: 12px;
-	background-image: url(../images/selected.png);
+	background-image: url(images/selected.png);
 }
 
 .icon-sex_f_15x15 {
 	width: 15px;
 	height: 15px;
-	background-image: url(../images/sex_f_15x15.png);
+	background-image: url(images/sex_f_15x15.png);
 }
 
 .icon-sex_f_9x9 {
 	width: 9px;
 	height: 9px;
-	background-image: url(../images/sex_f_9x9.png);
+	background-image: url(images/sex_f_9x9.png);
 }
 
 .icon-sex_m_15x15 {
 	width: 15px;
 	height: 15px;
-	background-image: url(../images/sex_m_15x15.png);
+	background-image: url(images/sex_m_15x15.png);
 }
 
 .icon-sex_m_9x9 {
 	width: 9px;
 	height: 9px;
-	background-image: url(../images/sex_m_9x9.png);
+	background-image: url(images/sex_m_9x9.png);
 }
 
 .icon-sex_u_15x15 {
 	width: 15px;
 	height: 15px;
-	background-image: url(../images/sex_u_15x15.png);
+	background-image: url(images/sex_u_15x15.png);
 }
 
 .icon-sex_u_9x9 {
 	width: 9px;
 	height: 9px;
-	background-image: url(../images/sex_u_9x9.png);
-}
-
-.icon-sfamily {
-	width: 22px;
-	height: 22px;
-	background-image: url(../images/icon-sfamily.png);
+	background-image: url(images/sex_u_9x9.png);
 }
 
 .icon-source {
 	width: 32px;
 	height: 32px;
-	background-image: url(../images/source.png);
-}
-
-.icon-source-list {
-	width: 32px;
-	height: 32px;
-	background-image: url(../images/source.png);
+	background-image: url(images/source.png);
 }
 
 .icon-target {
 	width: 15px;
 	height: 15px;
-	background-image: url(../images/buttons/target.png);
-}
-
-.icon-tree {
-	width: 20px;
-	height: 20px;
-	background-image: url(../images/gedcom.png);
+	background-image: url(images/buttons/target.png);
+	vertical-align: middle;
 }
 
 .icon-uarrow {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/uarrow.png);
+	background-image: url(images/uarrow.png);
 }
 
 a.icon-uarrow:hover {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/uarrow2.png);
+	background-image: url(images/uarrow2.png);
 }
 
 .icon-udarrow {
 	width: 20px;
 	height: 20px;
-	background-image: url(../images/udarrow.png);
+	background-image: url(images/udarrow.png);
 }
 
-.icon-user_add {
-	width: 22px;
-	height: 25px;
-	background-image: url(../images/user_add.png);
+a.icon-udarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/udarrow2.png);
 }
 
 .icon-warning {
 	width: 17px;
 	height: 17px;
-	background-image: url(../images/warning.png);
-}
-
-.icon-webtrees {
-	width: 100px;
-	height: 21px;
-	background-image: url(../images/webtrees.png);
+	background-image: url(images/warning.png);
 }
 
 .icon-wiki {
 	width: 16px;
 	height: 16px;
-	background-image: url(../images/w_button.png);
-}
-
-/* ios on click workaround */
-.iconz {
-	cursor: pointer;
+	background-image: url(images/w_button.png);
 }
 
 .icon-zoomin {
 	width: 25px;
 	height: 25px;
-	background-image: url(../images/zoomin.png);
+	background-image: url(images/zoomin.png);
 }
 
 .icon-zoomout {
 	width: 25px;
 	height: 25px;
-	background-image: url(../images/zoomout.png);
+	background-image: url(images/zoomout.png);
+}
+
+/* Silhouettes on charts */
+.icon-silhouette-F {
+	width: 37px;
+	height: 45px;
+	background-image: url(images/silhouette_female_small.png);
+}
+
+.icon-silhouette-M {
+	width: 37px;
+	height: 45px;
+	background-image: url(images/silhouette_male_small.png);
+}
+
+.icon-silhouette-U {
+	width: 37px;
+	height: 45px;
+	background-image: url(images/silhouette_unknown_small.png);
+}
+
+#indi_mainimage .icon-silhouette-F {
+	width: 99px;
+	height: 106px;
+	background-image: url(images/silhouette_female.png);
+}
+
+#indi_mainimage .icon-silhouette-M {
+	width: 99px;
+	height: 99px;
+	background-image: url(images/silhouette_male.png);
+}
+
+#indi_mainimage .icon-silhouette-U {
+	width: 100px;
+	height: 97px;
+	background-image: url(images/silhouette_unknown.png);
 }
 
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
 	display: inline-block;
-	background: transparent url(../images/icon-mime-sprite.png) no-repeat;
+	background: transparent url(images/icon-mime-sprite.png) no-repeat;
 	width: 48px;
 	height: 48px;
 }
 
-/* Generic MIME types */
+/* ===== Generic MIME types ===== */
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
 	background-position: -99px -49px;
@@ -4710,7 +4124,7 @@ a.icon-uarrow:hover {
 	background-position: -148px -147px;
 }
 
-/* Specific MIME types */
+/* ===== Specific MIME types ===== */
 .icon-mime-application-pdf {
 	background-position: -1px -49px;
 }
@@ -4794,440 +4208,1115 @@ a.icon-uarrow:hover {
 .icon-mime-video-x-ms-wmv {
 	background-position: -50px -196px;
 }
+/* ====== End Icon styles ====== */
 
-/* Silhouettes on charts */
-.icon-silhouette-F {
-	width: 37px;
-	height: 45px;
-	background-image: url(../images/silhouette_female_small.png);
+/* ====== Theme Header ========= */
+header h1 {
+	clear: left;
+	float: left;
+	font-size: 24px;
+	font-weight: normal;
+	margin: 16px 12px 3px;
 }
 
-.icon-silhouette-M {
-	width: 37px;
-	height: 45px;
-	background-image: url(../images/silhouette_male_small.png);
+[dir=rtl] header h1 {
+	float: right;
+	margin: 16px 12px 3px;
 }
 
-.icon-silhouette-U {
-	width: 37px;
-	height: 45px;
-	background-image: url(../images/silhouette_unknown_small.png);
+/* Set stack level for top two header menu rows */
+.secondary-menu ul,
+.primary-menu ul {
+	z-index: 210;
 }
 
-/* Silhouettes on individual pages */
-#indi_mainimage .icon-silhouette-F {
-	width: 99px;
-	height: 106px;
-	background-image: url(../images/silhouette_female.png);
+/* Title Line */
+header {
+	height: 98px;
 }
 
-#indi_mainimage .icon-silhouette-M {
-	width: 99px;
-	height: 99px;
-	background-image: url(../images/silhouette_male.png);
+.header-search {
+	display: inline;
 }
 
-#indi_mainimage .icon-silhouette-U {
-	width: 100px;
-	height: 97px;
-	background-image: url(../images/silhouette_unknown.png);
+/* ====== Secondary menu ======= */
+.secondary-menu {
+	float: right;
+	margin: 21px 10px 4px 0;
+	white-space: nowrap;
 }
 
-/* Edit interface pop-ups*/
-#edit_interface-page h4 {
-	color: #555;
-	margin: 5px;
+.secondary-menu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
 }
 
-#edit_interface-page .optionbox span {
-	margin: 0 5px;
+.secondary-menu li:before {
+	content: " | ";
 }
 
-#edit_interface-page #LATI,
-#edit_interface-page #LONG,
-#edit_interface-page #SPFX,
-#edit_interface-page #NSFX,
-#edit_interface-page #NPFX {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 88px;
+.secondary-menu li a.link {
+	font-size: 13px;
+	margin-left: 5px;
+	margin-right: 5px;
 }
 
-#edit_interface-page #GIVN,
-#edit_interface-page #SURN,
-#edit_interface-page #_MARNM {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 180px;
+.secondary-menu li ul {
+	background-color: #eee;
+	border: thin solid #aaa;
+	display: none;
+	left: 0;
+	position: absolute;
 }
 
-#edit_interface-page input[type="text"],
-#edit_interface-page #NAME_display {
-	line-height: 18px;
-	margin: 0 5px;
-	vertical-align: top;
-	width: 240px;
+.secondary-menu li ul li {
+	display: block;
+	text-align: left;
 }
 
-#edit_interface-page input[type="text"][id*="PAGE"],
-#edit_interface-page input[type="text"][id*="_UID"] {
-	width: 350px;
+.secondary-menu li ul li a {
+	color: #333;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR"],
-#edit_interface-page input[type="text"][id*="REPO"],
-#edit_interface-page input[type="text"][id*="OBJE"],
-#edit_interface-page input[type="text"][id*="FAMC"],
-#edit_interface-page input[type="text"][id*="ASSO"],
-#edit_interface-page input[type="text"][id^="AGE"],
-#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 250px;
+.secondary-menu,
+.secondary-menu li ul {
+	color: #fff;
+	list-style: none;
+	padding: 1px;
+	top: 5px;
 }
 
-#edit_interface-page input[type="text"][id$="DATE"] {
-	width: 160px;
+/*set position of dropdown */
+.secondary-menu li:hover > ul {
+	display: block;
 }
 
-#edit_interface-page input[type="text"][id^="TIME"] {
-	width: 100px;
+.secondary-menu li a:hover {
+	color: #f5003d;
 }
 
-#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
-	width: 200px;
+.secondary-menu ul li a {
+	background-color: #fff;
+	display: block;
+	padding: 2px 5px 2px 2px;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
-	width: 250px;
+.secondary-menu ul li a:hover {
+	color: #000;
 }
 
-#edit_interface-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+.secondary-menu li ul li:before,
+.secondary-menu li:first-child:before {
+	content: "";
 }
 
-#edit_interface-page textarea {
-	margin: 0 5px;
-	width: 440px;
+.secondary-menu .active {
+	font-weight: 900;
 }
 
-#edit_interface-page textarea[id*="NOTE"] {
-	height: 240px;
+.search-icon {
+	height: 17px;
+	vertical-align: top;
 }
 
-#edit_interface-page textarea[id*="TEXT"],
-#edit_interface-page textarea[id*="PUBL"] {
-	height: 140px;
+[dir=rtl] .secondary-menu {
+	display: block;
+	float: left;
+	margin: 21px 0 0 10px;
 }
 
-#edit_interface-page textarea[id^="newgedrec"] {
-	line-height: 18px;
-	width: 605px;
+[dir=rtl] .secondary-menu li ul {
+	left: auto;
+	right: 0;
 }
 
-#edit_interface-page textarea#gedcom {
-	height: 364px;
+[dir=rtl] .secondary-menu li ul li {
+	text-align: right;
 }
 
-#edit_interface-page textarea[id*="ADDR"],
-#edit_interface-page input[id*="ADDR"] {
-	height: 80px;
-	width: 300px;
+/* ====== Primary menu ========= */
+
+header nav {
+    clear: both;
+    margin: 8px auto;
+    position: relative;
+
 }
 
-#edit_interface-page #changefam {
-	padding: 5px;
+.primary-menu {
+	display: inline-block;
+	width: 100%;
+	margin: 0;
+	padding: 0;
+	height: 48px;
 }
 
-#edit_interface-page #changefam table {
-	margin: 10px auto;
-	min-width: 400px;
-	max-width: 650px;
+.primary-menu ul {
+	padding: 0;
+	margin: 0;
+	border: 1px solid #ddd;
+	list-style-type: none;
+	position: absolute;
+	visibility: hidden;
+	opacity: 0;
+	background-color: #fff;
 }
 
-#edit_interface-page #changefam span {
+.primary-menu li {
+	float: left;
+	position: relative;
+	display: block;
+	list-style: none;
+}
+
+.primary-menu li a {
+	display: block;
+}
+
+.primary-menu li > ul {
+	display: block;
+	position: absolute;
+	top: 0;
+	left: 100%;
+	right: auto;
+}
+
+.primary-menu > li > a {
+	height: 37px;
+	width: 27px;
+	color: transparent; /* Use class="sr-only" from bootstrap? */
+}
+
+.primary-menu > li > ul {
+	left: 0;
+	right: auto;
+	top: 40px;
+}
+
+.primary-menu a {
+	display: block;
+	text-decoration: none;
+	padding: 0 10px;
 	margin: 0;
+	white-space: nowrap;
 }
 
-#edit_interface-page #changefam td {
-	padding: 5px;
-	white-space: normal;
+.primary-menu ul li:hover a,
+.primary-menu li:hover li a {
+	background: none;
+	border: 0;
 }
 
-#edit_interface-page #changefam td.child {
+.primary-menu li:hover > ul {
+	visibility: visible;
+	opacity: 1;
+}
+
+.primary-menu > li > ul > li:first-child {
+	text-indent: 0;
+	min-width: 100px;
+	width: 100%;
+	background: none;
+	font-weight: bold;
+	white-space: nowrap;
+	font-size: 14px;
 	text-align: center;
+	height: 22px;
+	line-height: 1.5;
+	border-bottom: solid #ddd 1px;
 }
 
-#save-cancel {
-	position: fixed;
-	bottom: 0;
-	border-radius: 3px;
-	width: 96.5%;
-	border: solid #999 1px;
-	margin: 0;
+.primary-menu > li {
+	background-image: url(images/sprites-top-menu.png);
+	background-repeat: no-repeat;
+	height: 40px;
+	line-height: 40px;
+	margin: 4px 0 0 16px;
+	text-indent: 32px;
+	width: 40px;
 }
 
-#save-cancel input {
-	padding: 2px 8px;
+.primary-menu li ul li {
+	background-image: url(images/sprites-sub-menu.png);
+	background-repeat: no-repeat;
+	height: 28px;
+	left: auto;
+	line-height: 25px;
+	text-align: left;
+	text-indent: 22px;
+	width: 100%;
 }
 
-#save-cancel .save {
-	float: left;
-	margin: 5px;
+/* Reverse left and right on RTL pages */
+[dir=rtl] .primary-menu > li {
+	margin: 4px 16px 0 0;
 }
 
-#save-cancel .cancel {
+[dir=rtl] .primary-menu li {
 	float: right;
-	margin: 5px;
 }
 
-[dir=rtl] #save-cancel .save {
+[dir=rtl] .primary-menu li:hover > ul {
+	right: 100%;
+	left: auto;
+}
+
+[dir=rtl] .primary-menu > li:hover > ul {
+	left: auto;
+	right: 0;
+}
+
+[dir=rtl] .primary-menu li li {
+	text-align: right;
+}
+
+[dir=rtl] .primary-menu li li a {
+	display: block;
 	float: right;
 }
 
-[dir=rtl] #save-cancel .cancel {
-	float: left;
+[dir=rtl] .primary-menu > li > ul > li:first-child {
+	text-align: center;
 }
 
-#edit_interface-page,
-#addmedia-page {
-	margin-bottom: 50px;
+/* ====== End Theme Header ===== */
+
+/* ====== Theme Footer ========= */
+
+footer {
+	text-align: center;
 }
 
-/* Addmedia pop-ups*/
-#addmedia-page input[type="text"] {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 300px;
+.contact-links {
+	margin: 30px 0 15px;
 }
 
-#addmedia-page .optionbox select {
-	margin: 0 5px;
+.powered-by-webtrees {
+	display: inline-block;
+	margin-top: 10px;
+	width: 100px;
+	height: 21px;
 }
 
-#addmedia-page .optionbox p.sub {
-	font-size: 11px;
-	margin: 0 5px;
+.powered-by-webtrees:after {
+	content: url(images/powered-by-webtrees.png);
 }
 
-#addmedia-page input[type="text"][id*="PAGE"],
-#addmedia-page input[type="text"][id*="_UID"] {
-	width: 350px;
+#link_change_blocks {
+	clear: both;
+	margin: 0 auto;
+	padding: 25px 0 0;
+	text-align: center;
+	width: 400px;
 }
 
-#addmedia-page input[type="text"][id*="SOUR"],
-#addmedia-page input[type="text"][id*="REPO"],
-#addmedia-page input[type="text"][id*="OBJE"],
-#addmedia-page input[type="text"][id*="FAMC"],
-#addmedia-page input[type="text"][id*="ASSO"],
-#addmedia-page input[type="text"][id^="AGE"],
-#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 70px;
+#link_change_blocks span {
+	padding: 0 50px;
 }
 
-#addmedia-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+#link_change_blocks span span {
+	padding: 0 3px;
 }
 
-#addmedia-page textarea {
-	margin: 0 5px;
-	width: 440px;
+/* ====== End Theme Footer ===== */
+
+/* ====== Theme Icons ========== */
+/* ***** Header icons **** */
+#menu-tree {
+	background-position:center 0;
 }
 
-#addmedia-page textarea[id*="NOTE"] {
-	height: 240px;
+#menu-mymenu {
+	background-position:center -287px;
 }
 
-/* Styling for the jquery.colorbox gallery */
-#colorbox,
-#cboxOverlay,
-#cboxWrapper {
-	position: absolute;
-	top: 0;
-	left: 0;
-	overflow: hidden;
+#menu-chart {
+	background-position:center -41px;
 }
 
-#colorbox {
-	border: 2px solid #ccc;
+#menu-list {
+	background-position: center -82px;
 }
 
-#cboxOverlay {
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	background: #ccc;
+#menu-report {
+	background-position: center -164px;
 }
 
-#cboxContent {
-	background: #fff;
-	border: 5px solid #888;
+#menu-calendar {
+	background-position: center -123px;
 }
 
-#cboxLoadedContent {
-	overflow: auto;
-	background: #fff;
-	margin-bottom: 30px;
-	margin-top: 35px;
+#menu-search {
+	background-position: center -205px;
 }
 
-#cboxTitle {
-	position: absolute;
-	left: 0;
-	top: 10px;
-	color: #949494;
-	text-align: center;
-	width: 100%;
-	font-weight: 800;
-	font-size: 14px;
+#menu-help {
+	background-position: center -246px;
 }
 
-.cboxPhoto {
-	float: left;
-	margin: auto;
-	border: 0;
-	display: block;
-	max-width: none;
+#menu-clippings {
+	background-position: center -328px;
 }
 
-.cboxIframe {
-	width: 100%;
-	height: 100%;
-	display: block;
-	border: 0;
+#menu-indi {
+	background-position: center -369px;
 }
 
-#cboxPrevious {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	background: url(../images/controls.png) no-repeat -75px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#menu-indi-orderfam {
+	background-position: left 0; /* error */
 }
 
-#cboxPrevious:hover {
-	background-position: -75px -25px;
+[dir=rtl] #menu-indi-orderfam {
+	background-position: right 0; /* error */
 }
 
-#cboxNext {
-	position: absolute;
-	bottom: 0;
-	left: 27px;
-	background: url(../images/controls.png) no-repeat -50px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#menu-sour {
+	background-position: center -451px;
 }
 
-#cboxNext:hover {
-	background-position: -50px -25px;
+#menu-fam {
+	background-position: center -410px;
 }
 
-#cboxSlideshow {
-	position: absolute;
-	bottom: 5px;
-	left: 57px;
-	margin: 10px;
-	border: 0;
-	background: none;
-	font-size: 14px;
+#menu-obje {
+	background-position: center -533px;
 }
 
-#cboxSlideshow:hover {
-	color: #f00;
-	background: #fff;
+#menu-note {
+	background-position: center -492px;
 }
 
-#cboxClose {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	background: url(../images/controls.png) no-repeat -25px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#menu-repo {
+	background-position: center -574px;
 }
 
-#cboxClose:hover {
-	background-position: -25px -25px;
+#menu-story {
+	background-position: center -615px;
 }
 
-#cboxCurrent {
-	bottom: 4px;
-	color: #949494;
-	left: 58px;
-	position: absolute;
+/* Header Sub-menu icons */
+#menu-admin {
+	background-position: left -728px;
 }
 
-[dir=rtl] #cboxPrevious {
-	right: 27px;
-	left: auto;
+[dir=rtl] #menu-admin {
+	background-position: right -728px;
 }
 
-[dir=rtl] #cboxNext {
-	right: 0;
-	left: auto;
+#menu-branches {
+	background-position: left -468px;
 }
 
-[dir=rtl] #cboxCurrent {
-	right: auto;
-	left: 0;
+[dir=rtl] #menu-branches {
+	background-position: right -468px;
 }
 
-[dir=rtl] #cboxClose {
-	right: auto;
-	left: 0;
+#menu-calendar-day {
+	background-position: left -572px;
 }
 
-[dir=rtl] #cboxSlideshow {
-	right: 57px;
-	left: auto;
+[dir=rtl] #menu-calendar-day {
+	background-position: right -572px;
 }
 
-/* Census assistant module */
-table.table-census-assistant th {
-	font-weight: bold;
-	text-align: left;
+#menu-calendar-month {
+	background-position: left -572px;
 }
 
-/* Stories module */
-.story_title {
-	padding-top: 12px;
-	height: 32px;
-	font-size: 13px;
-	font-weight: 700;
+[dir=rtl] #menu-calendar-month {
+	background-position: right -572px;
 }
 
-.story_body {
-	padding: 20px;
-	white-space: normal;
+#menu-calendar-year {
+	background-position: left -572px;
 }
 
-.story_edit {
-	padding: 12px;
+[dir=rtl] #menu-calendar-year {
+	background-position: right -572px;
 }
 
-/* User content in stories tab */
-#stories h2,
-#stories h3,
-#stories h4,
-#stories h5 {
-	padding-top: 20px;
+#menu-chart-ancestry {
+	background-position: left -208px;
 }
 
-#stories p {
-	padding-top: 8px;
+[dir=rtl] #menu-chart-ancestry {
+	background-position: right -208px;
 }
 
-.btn-group {
-	display: inline-block;
-	margin: 0 4px;
+#menu-chart-compact {
+	background-position: left -52px;
+}
+
+[dir=rtl] #menu-chart-compact {
+	background-position: right -52px;
+}
+
+#menu-chart-descendants {
+	background-position: left -0px;
+}
+
+[dir=rtl] #menu-chart-descendants {
+	background-position: right -0px;
+}
+
+#menu-chart-familybook {
+	background-position: left -104px;
+}
+
+[dir=rtl] #menu-chart-familybook {
+	background-position: right -104px;
+}
+
+#menu-chart-fanchart {
+	background-position: left -26px;
+}
+
+[dir=rtl] #menu-chart-fanchart {
+	background-position: right -26px;
+}
+
+#menu-chart-hourglass {
+	background-position: left -130px;
+}
+
+[dir=rtl] #menu-chart-hourglass {
+	background-position: right -130px;
+}
+
+#menu-chart-lifespan {
+	background-position: left -182px;
+}
+
+[dir=rtl] #menu-chart-lifespan {
+	background-position: right -182px;
+}
+
+#menu-chart-pedigree {
+	background-position: left -208px;
+}
+
+[dir=rtl] #menu-chart-pedigree {
+	background-position: right -208px;
+}
+
+#menu-chart-pedigree_map {
+	background-position: left -234px;
+}
+
+[dir=rtl] #menu-chart-pedigree_map {
+	background-position: right -234px;
+}
+
+#menu-chart-relationship {
+	background-position: left -260px;
+}
+
+[dir=rtl] #menu-chart-relationship {
+	background-position: right -260px;
+}
+
+#menu-chart-statistics {
+	background-position: left -286px;
+}
+
+[dir=rtl] #menu-chart-statistics {
+	background-position: right -286px;
+}
+
+#menu-chart-timeline {
+	background-position: left -312px;
+}
+
+[dir=rtl] #menu-chart-timeline {
+	background-position: right -312px;
+}
+
+#menu-chart-tree {
+	background-position: left -156px;
+}
+
+[dir=rtl] #menu-chart-tree {
+	background-position: right -156px;
+}
+
+#menu-clippingsadd {
+	background-position: left -702px;
+}
+
+[dir=rtl] #menu-clippingsadd {
+	background-position: right -702px;
+}
+
+#menu-clippingscart {
+	background-position: left -702px;
+}
+
+[dir=rtl] #menu-clippingscart {
+	background-position: right -702px;
+}
+
+#menu-fam-addchil {
+	background-position: left -858px;
+}
+
+[dir=rtl] #menu-fam-addchil {
+	background-position: right -858px;
+}
+
+#menu-fam-addfav {
+	background-position: left -832px;
+}
+
+[dir=rtl] #menu-fam-addfav {
+	background-position: right -832px;
+}
+
+#menu-fam-change {
+	background-position: left -858px;
+}
+
+[dir=rtl] #menu-fam-change {
+	background-position: right -858px;
+}
+
+#menu-fam-del {
+	background-position: left -936px;
+}
+
+[dir=rtl] #menu-fam-del {
+	background-position: right -936px;
+}
+
+#menu-fam-editraw {
+	background-position: left -754px;
+}
+
+[dir=rtl] #menu-fam-editraw {
+	background-position: right -574px;
+}
+
+#menu-fam-orderchil {
+	background-position: left -858px;
+}
+
+[dir=rtl] #menu-fam-orderchil {
+	background-position: right -858px;
+}
+
+#menu-help-contents {
+	background-position: left -624px;
+}
+
+[dir=rtl] #menu-help-contents {
+	background-position: right -624px;
+}
+
+#menu-help-faq {
+	background-position: left -624px;
+}
+
+[dir=rtl] #menu-help-faq {
+	background-position: right -624px;
+}
+
+#menu-help-genealogy {
+	background-position: left -624px;
+}
+
+[dir=rtl] #menu-help-genealogy {
+	background-position: right -624px;
+}
+
+#menu-help-hide {
+	background-position: left -624px;
+}
+
+[dir=rtl] #menu-help-hide {
+	background-position: right -624px;
+}
+
+#menu-help-show {
+	background-position: left -624px;
+}
+
+[dir=rtl] #menu-help-show {
+	background-position: right -624px;
+}
+
+#menu-help-technical {
+	background-position: left -676px;
+}
+
+[dir=rtl] #menu-help-technical {
+	background-position: right -676px;
+}
+
+#menu-help-wiki {
+	background-position: left -650px;
+}
+
+[dir=rtl] #menu-help-wiki {
+	background-position: right -650px;
+}
+
+#menu-indi-addfav {
+	background-position: left -832px;
+}
+
+[dir=rtl] #menu-indi-addfav {
+	background-position: right -832px;
+}
+
+#menu-indi-addname {
+	background-position: left -780px;
+}
+
+[dir=rtl] #menu-indi-addname {
+	background-position: right -780px;
+}
+
+#menu-indi-del {
+	background-position: left -806px;
+}
+
+[dir=rtl] #menu-indi-del {
+	background-position: right -806px;
+}
+
+#menu-indi-editraw {
+	background-position: left -754px;
+}
+
+[dir=rtl] #menu-indi-editraw {
+	background-position: right -574px;
+}
+
+#menu-indi-editsex {
+	background-position: left -780px;
+}
+
+[dir=rtl] #menu-indi-editsex {
+	background-position: right -780px;
+}
+
+#menu-list-fam {
+	background-position: left -494px;
+}
+
+[dir=rtl] #menu-list-fam {
+	background-position: right -494px;
+}
+
+#menu-list-indi {
+	background-position: left -520px;
+}
+
+[dir=rtl] #menu-list-indi {
+	background-position: right -520px;
+}
+
+#menu-list-note {
+	background-position: left -416px;
+}
+
+[dir=rtl] #menu-list-note {
+	background-position: right -416px;
+}
+
+#menu-list-obje {
+	background-position: left -338px;
+}
+
+[dir=rtl] #menu-list-obje {
+	background-position: right -338px;
+}
+
+#menu-list-plac {
+	background-position: left -364px;
+}
+
+[dir=rtl] #menu-list-plac {
+	background-position: right -364px;
+}
+
+#menu-list-repo {
+	background-position: left -390px;
+}
+
+[dir=rtl] #menu-list-repo {
+	background-position: right -390px;
+}
+
+#menu-list-sour {
+	background-position: left -442px;
+}
+
+[dir=rtl] #menu-list-sour {
+	background-position: right -442px;
+}
+
+#menu-myaccount {
+	background-position: left -676px;
+}
+
+[dir=rtl] #menu-myaccount {
+	background-position: right -676px;
+}
+
+#menu-mypage {
+	background-position: left -676px;
+}
+
+[dir=rtl] #menu-mypage {
+	background-position: right -676px;
+}
+
+#menu-mypedigree {
+	background-position: left -208px;
+}
+
+[dir=rtl] #menu-mypedigree {
+	background-position: right -208px;
+}
+
+#menu-myrecord {
+	background-position: left -520px;
+}
+
+[dir=rtl] #menu-myrecord {
+	background-position: right -520px;
+}
+
+#menu-note-addfav {
+	background-position: left -832px;
+}
+
+[dir=rtl] #menu-note-fav {
+	background-position: right -832px;
+}
+
+#menu-note-del {
+	background-position: left -806px;
+}
+
+[dir=rtl] #menu-note-del {
+	background-position: right -806px;
+}
+
+#menu-note-edit {
+	background-position: left -910px;
+}
+
+[dir=rtl] #menu-note-edit {
+	background-position: right -910px;
+}
+
+#menu-note-editraw {
+	background-position: left -754px;
+}
+
+[dir=rtl] #menu-note-editraw {
+	background-position: right -574px;
+}
+
+#menu-obje-addfav {
+	background-position: left -832px;
+}
+
+[dir=rtl] #menu-obje-addfav {
+	background-position: right -832px;
+}
+
+#menu-obje-del {
+	background-position: left -1040px;
+}
+
+[dir=rtl] #menu-obje-del {
+	background-position: right -1040px;
+}
+
+#menu-obje-edit {
+	background-position: left -962px;
+}
+
+[dir=rtl] #menu-obje-edit {
+	background-position: right -962px;
+}
+
+#menu-obje-editraw {
+	background-position: left -754px;
+}
+
+[dir=rtl] #menu-obje-editraw {
+	background-position: right -574px;
+}
+
+#menu-obje-link {
+	background-position: left -988px;
+}
+
+[dir=rtl] #menu-obje-link {
+	background-position: right -988px;
+}
+
+#menu-obje-link-fam {
+	background-position: left -494px;
+}
+
+[dir=rtl] #menu-obje-link-fam {
+	background-position: right -494px;
+}
+
+#menu-obje-link-indi {
+	background-position: left -520px;
+}
+
+[dir=rtl] #menu-obje-link-indi {
+	background-position: right -520px;
+}
+
+#menu-obje-link-sour {
+	background-position: left -442px;
+}
+
+[dir=rtl] #menu-obje-link-sour {
+	background-position: right -442px;
+}
+
+#menu-repo-addfav {
+	background-position: left -832px;
+}
+
+[dir=rtl] #menu-repo-addfav {
+	background-position: right -832px;
+}
+
+#menu-repo-del {
+	background-position: left -806px;
+}
+
+[dir=rtl] #menu-repo-del {
+	background-position: right -806px;
+}
+
+#menu-repo-edit {
+	background-position: left -1014px;
+}
+
+[dir=rtl] #menu-repo-edit {
+	background-position: right -1014px;
+}
+
+#menu-repo-editraw {
+	background-position: left -754px;
+}
+
+[dir=rtl] #menu-repo-editraw {
+	background-position: right -574px;
+}
+
+#menu-report li {
+	background-position: left -546px;
+}
+
+[dir=rtl] #menu-report li {
+	background-position: right -546px;
+}
+
+#menu-search-advanced {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-search-advanced {
+	background-position: right -598px;
+}
+
+#menu-search-general {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-search-general {
+	background-position: right -598px;
+}
+
+#menu-search-replace {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-search-replace {
+	background-position: right -598px;
+}
+
+#menu-search-soundex {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-search-soundex {
+	background-position: right -598px;
+}
+
+#menu-sour-addfav {
+	background-position: left -832px;
+}
+
+[dir=rtl] #menu-sour-addfav {
+	background-position: right -832px;
+}
+
+#menu-sour-del {
+	background-position: left -1066px;
+}
+
+[dir=rtl] #menu-sour-del {
+	background-position: right -1066px;
+}
+
+#menu-sour-edit {
+	background-position: left -884px;
+}
+
+[dir=rtl] #menu-sour-edit {
+	background-position: right -884px;
+}
+
+#menu-sour-editraw {
+	background-position: left -754px;
+}
+
+[dir=rtl] #menu-sour-editraw {
+	background-position: right -574px;
+}
+
+#menu-story-sub {
+	background-position: left -1092px;
+}
+
+[dir=rtl] #menu-story-sub {
+	background-position: right -1040px;
+}
+
+#menu-tree li {
+	background-position: left -754px;
+}
+
+[dir=rtl] #menu-tree li {
+	background-position: right -754px;
+}
+
+.icon-indis {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/mypage.png);
+}
+
+.icon-patriarch {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/patriarch.png);
+}
+
+.icon-pedigree {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/pedigree.png);
+}
+
+.icon-place {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/place.png);
+}
+
+.icon-repo-list {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/repository.png);
+}
+
+.icon-repository {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/repository.png);
+}
+
+.icon-search {
+	width: 17px;
+	height: 17px;
+	background-image: url(images/search.png);
+}
+
+.icon-sfamily {
+	width: 22px;
+	height: 22px;
+	background-image: url(images/sfamily.png);
+}
+
+.icon-source-list {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/source.png);
+}
+
+.icon-tree {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/tree.png);
+}
+
+.icon-user_add {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/user_add.png);
+}
+
+.icon-webtrees {
+	width: 100px;
+	height: 21px;
+	background-image: url(images/webtrees.png);
+}
+
+@media print {
+	header,
+	footer,
+	form,
+	#sidebar,
+	#separator,
+	.noprint {
+		display: none;
+	}
+	
+	#pedigree_chart {
+		left: -40px;
+		top:  -260px;
+	}
+
+	[dir=rtl] #pedigree_chart {
+		left: auto;
+		right: -20px;
+	}
+	
+	#header_accordion1 {
+		width: 510px;
+	}
+
+	#familybook_chart h3 {
+		margin-bottom: 10px;
+	}
+	
+	.lifespan_outer {
+		position: relative;
+		width: auto;
+		height: auto;
+		overflow: visible;
+		border: 0;
+	}
+
+	.lifespan_people {
+		position: absolute;
+		width: auto;
+		left: -10px;
+		top: -60px;
+		z-index: 1;
+	}
 }
diff --git a/themes/colors/footer.php b/themes/colors/footer.php
deleted file mode 100644
index bd596f2801..0000000000
--- a/themes/colors/footer.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Footer for Colors theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo '</main>';
-if ($view !== 'simple') {
-	echo '<footer>';
-	echo contact_links();
-	echo '<p class="logo">';
-	echo '<a href="', WT_WEBTREES_URL, '" target="_blank" class="icon-webtrees" title="', WT_WEBTREES, ' ', WT_VERSION, '"></a>';
-	echo '</p>';
-	if ($WT_TREE && $WT_TREE->getPreference('SHOW_STATS')) {
-		echo execution_stats();
-	}
-	if (exists_pending_change()) {
-		echo '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;">';
-		echo '<p class="error center">', WT_I18N::translate('There are pending changes for you to moderate.'), '</p>';
-		echo '</a>';
-	}
-	echo '</footer>';
-}
diff --git a/themes/colors/header.php b/themes/colors/header.php
deleted file mode 100644
index 31472bcf62..0000000000
--- a/themes/colors/header.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-// Header for colors theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use WT\Auth;
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-global $WT_IMAGES, $subColor;
-
-// This theme uses the jQuery “colorbox” plugin to display images
-$this
-	->addExternalJavascript(WT_JQUERY_COLORBOX_URL)
-	->addExternalJavascript(WT_JQUERY_WHEELZOOM_URL)
-	->addInlineJavascript('activate_colorbox();')
-	->addInlineJavascript('jQuery.extend(jQuery.colorbox.settings, {width:"85%", height:"85%", transition:"none", slideshowStart:"'. WT_I18N::translate('Play').'", slideshowStop:"'. WT_I18N::translate('Stop').'"})')
-	->addInlineJavascript('
-		jQuery.extend(jQuery.colorbox.settings, {
-			title: function() {
-				var img_title = jQuery(this).data("title");
-				return img_title;
-			}
-		});
-	');
-
-// Remove list from home when only 1 gedcom
-$this->addInlineJavaScript(
-	'if (jQuery("#menu-tree ul li").length == 2) jQuery("#menu-tree ul li:last-child").remove();'
-);
-
-
-
-$menu_items = array(
-	WT_MenuBar::getGedcomMenu(),
-	WT_MenuBar::getMyPageMenu(),
-	WT_MenuBar::getChartsMenu(),
-	WT_MenuBar::getListsMenu(),
-	WT_MenuBar::getCalendarMenu(),
-	WT_MenuBar::getReportsMenu(),
-	WT_MenuBar::getSearchMenu(),
-);
-foreach (WT_MenuBar::getModuleMenus() as $menu) {
-	$menu_items[] = $menu;
-}
-
-?>
-<!DOCTYPE html>
-<html <?php echo WT_I18N::html_markup(); ?>>
-<head>
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<?php echo header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL); ?>
-	<title><?php echo WT_Filter::escapeHtml($title); ?></title>
-	<link rel="icon" href="<?php echo WT_CSS_URL; ?>favicon.png" type="image/png">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_THEME_URL; ?>jquery-ui-1.11.2/jquery-ui.css">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_CSS_URL; ?>css/colors.css">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_CSS_URL; ?>css/<?php echo $subColor; ?>.css">
-	<?php if (stristr($_SERVER['HTTP_USER_AGENT'], 'iPad')) { ?>
-	<link type="text/css" rel="stylesheet" href="<?php echo WT_CSS_URL; ?>ipad.css">
-	<?php } ?>
-	<!--[if IE 8]>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-	<![endif]-->
-</head>
-<body id="body">
-	<?php if ($view !== 'simple') { ?>
-	<header>
-		<div id="header">
-			<h1><?php echo WT_TREE_TITLE; ?></h1>
-			<div id="header-user-links">
-				<ul class="makeMenu">
-					<?php
-					if (Auth::check()) {
-						echo '<li><a href="edituser.php" class="link">', WT_Filter::escapeHtml(Auth::user()->getRealName()), '</a></li><li>', logout_link(), '</li>';
-						if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
-							echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
-						}
-					} else {
-						echo '<li>', login_link(),'</li>';
-					}
-					?>
-					<?php echo WT_MenuBar::getFavoritesMenu(); ?>
-					<?php echo WT_MenuBar::getLanguageMenu(); ?>
-					<?php echo WT_MenuBar::getThemeMenu(); ?>
-					<?php if (WT_MenuBar::getThemeMenu()) { echo color_theme_dropdown(); } ?>
-					<li>
-						<form style="display:inline;" action="search.php" method="post">
-							<input type="hidden" name="action" value="general">
-							<input type="hidden" name="ged" value="<?php echo WT_GEDCOM; ?>">
-							<input type="hidden" name="topsearch" value="yes">
-							<input type="search" name="query" size="15" placeholder="<?php echo WT_I18N::translate('Search'); ?>">
-							<input class="search-icon" type="image" src="<?php echo $WT_IMAGES['search']; ?>" alt="<?php echo WT_I18N::translate('Search'); ?>" title="<?php echo WT_I18N::translate('Search'); ?>">
-						</form>
-					</li>
-				</ul>
-			</div>
-		</div>
-		<nav>
-			<ul id="main-menu">
-				<?php
-				foreach (array_filter($menu_items) as $menu) {
-					echo getMenuAsCustomList($menu);
-				}
-				?>
-			</ul>
-		</nav>
-	</header>
-	<?php } ?>
-	<?php echo WT_FlashMessages::getHtmlMessages(); ?>
-	<main id="content">
diff --git a/themes/colors/templates/block_main_temp.php b/themes/colors/templates/block_main_temp.php
deleted file mode 100644
index dbfe4965a0..0000000000
--- a/themes/colors/templates/block_main_temp.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-// Template for drawing the main blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<table class="blockheader">
-		<tr>
-			<td class="blockh1" ></td>
-			<td class="blockh2" >
-				<div class="blockhc"><b><?php echo $title; ?></b></div>
-			</td>
-			<td class="blockh3"></td>
-		</tr>
-	</table>
-	<div class="blockcontent <?php echo $class; ?>">
-		<?php echo $content; ?>
-	</div>
-</div>
diff --git a/themes/colors/templates/block_small_temp.php b/themes/colors/templates/block_small_temp.php
deleted file mode 100644
index 24af18c7d8..0000000000
--- a/themes/colors/templates/block_small_temp.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-// Template for drawing the height-restricted blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<table class="blockheader">
-		<tr>
-			<td class="blockh1" ></td>
-			<td class="blockh2" >
-				<div class="blockhc"><b><?php echo $title; ?></b></div>
-			</td>
-			<td class="blockh3"></td>
-		</tr>
-	</table>
-	<div class="blockcontent <?php echo $class; ?>">
-		<div class="small_inner_block">
-		<?php echo $content; ?>
-		</div>
-	</div>
-</div>
diff --git a/themes/colors/templates/compactbox_template.php b/themes/colors/templates/compactbox_template.php
deleted file mode 100644
index 4a3386f801..0000000000
--- a/themes/colors/templates/compactbox_template.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-//  $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $outBoxAdd, $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '"' , $outBoxAdd, '>
-	<div class="compact_view">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'">
-			<span class="namedef name',$style,'">', $shortname, '</span>
-		</a>
-	</div>
-	<div class="inout2 details',$style,'">',
-		$person->getLifeSpan(), '
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/colors/templates/personbox_template.php b/themes/colors/templates/personbox_template.php
deleted file mode 100644
index b1fdc7ade2..0000000000
--- a/themes/colors/templates/personbox_template.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-// $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $genderImage, $BirthDeath, $outBoxAdd,
-// $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team. All rights reserved.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '" ',$outBoxAdd,'>
-	<div class="noprint icons">', $icons, '</div>',
-	'<div class="chart_textbox" style="max-height:', $bheight,'px;">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '">
-			<span class="namedef name',$style,'">',
-				$name,
-				$genderImage,'
-				<span class="details',$style,'">' . $LDSord . '</span>
-			</span>
-		</a>
-		<div class="namedef name',$style,'">',$addname,'</div>
-		<div class="inout2 details',$style,'">',
-			$BirthDeath,
-		'</div>
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/colors/theme.php b/themes/colors/theme.php
index c6acf28e85..0cfe922b7a 100644
--- a/themes/colors/theme.php
+++ b/themes/colors/theme.php
@@ -2,10 +2,7 @@
 // Colors theme
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
+// Copyright (C) 2015 webtrees development team.
 //
 // 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
@@ -22,190 +19,4 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 // PNG Icons By: Alessandro Rei; License:  GPL; www.deviantdark.com
 
-use WT\Auth;
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-/**
- * Convert a menu into our theme-specific format
- *
- * @param WT_Menu $menu
- *
- * @return string
- */
-function getMenuAsCustomList(WT_Menu $menu) {
-	// Create an inert menu - to use as a label
-	$tmp = new WT_Menu(strip_tags($menu->getLabel()), '');
-
-	// Insert the label into the submenu
-	$submenus = $menu->getSubmenus();
-	array_unshift($submenus, $tmp);
-	$menu->setSubmenus($submenus);
-
-	// Neutralise the top-level menu
-	$menu->setLabel('');
-	$menu->setOnclick('');
-
-	return $menu->getMenuAsList();
-}
-
-/**
- * Print color theme sub type change dropdown box
- *
- * @return string
- */
-function color_theme_dropdown() {
-	global $COLOR_THEME_LIST, $WT_SESSION, $subColor;
-	$menu = new WT_Menu(/* I18N: A colour scheme */ WT_I18N::translate('Palette'), '#', 'menu-color');
-	uasort($COLOR_THEME_LIST, array('WT_I18N', 'strcasecmp'));
-	foreach ($COLOR_THEME_LIST as $colorChoice => $colorName) {
-		$submenu = new WT_Menu($colorName, get_query_url(array('themecolor' => $colorChoice), '&amp;'), 'menu-color-' . $colorChoice);
-		if (isset($WT_SESSION->subColor)) {
-			if ($WT_SESSION->subColor === $colorChoice) {
-				$submenu->addClass('', '', 'theme-active');
-			}
-		} elseif (WT_Site::getPreference('DEFAULT_COLOR_PALETTE') === $colorChoice) { /* here when visitor changes palette from default */
-			$submenu->addClass('', '', 'theme-active');
-		} elseif ($subColor === 'ash') { /* here when site has different theme as default and user switches to colors */
-			if ($subColor === $colorChoice) {
-				$submenu->addClass('', '', 'theme-active');
-			}
-		}
-		$menu->addSubMenu($submenu);
-	}
-
-	return $menu->getMenuAsList();
-}
-
-/**
- *  Define the default palette to be used.  Set $subColor
- *  to one of the collowing values to determine the default:
- *
- */
-
-$COLOR_THEME_LIST = array(
-	'aquamarine'      => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Aqua Marine'),
-	'ash'             => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Ash'),
-	'belgianchocolate'=> /* I18N: The name of a colour-scheme */ WT_I18N::translate('Belgian Chocolate'),
-	'bluelagoon'      => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Blue Lagoon'),
-	'bluemarine'      => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Blue Marine'),
-	'coffeeandcream'  => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Coffee and Cream'),
-	'coldday'         => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Cold Day'),
-	'greenbeam'       => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Green Beam'),
-	'mediterranio'    => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Mediterranio'),
-	'mercury'         => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Mercury'),
-	'nocturnal'       => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Nocturnal'),
-	'olivia'          => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Olivia'),
-	'pinkplastic'     => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Pink Plastic'),
-	'sage'            => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Sage'),
-	'shinytomato'     => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Shiny Tomato'),
-	'tealtop'         => /* I18N: The name of a colour-scheme */ WT_I18N::translate('Teal Top'),
-);
-
-// If we've selected a new palette, and we are logged in, set this value as a default.
-if (isset($_GET['themecolor']) && array_key_exists($_GET['themecolor'], $COLOR_THEME_LIST)) {
-	// Request to change color
-	$subColor = $_GET['themecolor'];
-	Auth::user()->setPreference('themecolor', $subColor);
-	if (Auth::isAdmin()) {
-		WT_Site::setPreference('DEFAULT_COLOR_PALETTE', $subColor);
-	}
-	unset($_GET['themecolor']);
-	// Rember that we have selected a value
-	$WT_SESSION->subColor = $subColor;
-}
-// If we are logged in, use our preference
-$subColor = Auth::user()->getPreference('themecolor');
-// If not logged in or no preference, use one we selected earlier in the session?
-if (!$subColor) {
-	$subColor = $WT_SESSION->subColor;
-}
-// We haven't selected one this session?  Use the site default
-if (!$subColor) {
-	$subColor = WT_Site::getPreference('DEFAULT_COLOR_PALETTE');
-}
-// Make sure our selected palette actually exists
-if (!array_key_exists($subColor, $COLOR_THEME_LIST)) {
-	$subColor = 'ash';
-}
-
-// Theme name - this needs double quotes, as file is scanned/parsed by script
-$theme_name = "colors"; /* I18N: Name of a theme. */ WT_I18N::translate('colors');
-
-// A version number in the path prevents browser-cache problems during upgrade
-define('WT_CSS_URL', WT_THEME_URL . 'css-1.6.2/');
-
-$footerfile = WT_THEME_DIR . 'footer.php';
-$headerfile = WT_THEME_DIR . 'header.php';
-
-$WT_IMAGES = array(
-	// used to draw charts
-	'dline'  => WT_CSS_URL . 'images/dline.png',
-	'dline2' => WT_CSS_URL . 'images/dline2.png',
-	'hline'  => WT_CSS_URL . 'images/hline.png',
-	'spacer' => WT_CSS_URL . 'images/spacer.png',
-	'vline'  => WT_CSS_URL . 'images/vline.png',
-
-	// used in button images and javascript
-	'add'           => WT_CSS_URL . 'images/add.png',
-	'button_family' => WT_CSS_URL . 'images/buttons/family.png',
-	'minus'         => WT_CSS_URL . 'images/minus.png',
-	'plus'          => WT_CSS_URL . 'images/plus.png',
-	'remove'        => WT_CSS_URL . 'images/delete.png',
-	'search'        => WT_CSS_URL . 'images/go.png',
-
-	// need different sizes before moving to CSS
-	'default_image_F' => WT_CSS_URL . 'images/silhouette_female.png',
-	'default_image_M' => WT_CSS_URL . 'images/silhouette_male.png',
-	'default_image_U' => WT_CSS_URL . 'images/silhouette_unknown.png',
-);
-
-//-- Variables for the Fan chart
-$fanChart = array(
-	'font'     => WT_ROOT . 'includes/fonts/DejaVuSans.ttf',
-	'size'     => 7,
-	'color'    => '#000000',
-	'bgColor'  => '#eeeeee',
-	'bgMColor' => '#b1cff0',
-	'bgFColor' => '#e9daf1'
-);
-
-// This section defines variables for the charts
-$bwidth        = 250; // width of boxes on all person-box based charts
-$bheight       = 80;  // height of boxes on all person-box based chart
-$baseyoffset   = 10;  // position the timeline chart relative to the top of the page
-$basexoffset   = 10;  // position the pedigree and timeline charts relative to the left of the page
-$bxspacing     = 4;   // horizontal spacing between boxes on the pedigree chart
-$byspacing     = 5;   // vertical spacing between boxes on the pedigree chart
-$brborder      = 1;   // pedigree chart box right border thickness
-$linewidth     = 1.5; // width of joining lines
-$shadowcolor   = '';  // shadow color for joining lines
-$shadowblur    = 0;   // shadow blur for joining lines
-$shadowoffsetX = 0;   // shadowOffsetX for joining lines
-$shadowoffsetY = 0;   // shadowOffsetY for joining lines
-
-// Other settings that should not be touched
-$Dbxspacing  = 5;   // position vertical line between boxes in relationship chart
-$Dbyspacing  = 10;  // position vertical spacing between boxes in relationship chart
-$Dbwidth     = 250; // horizontal spacing between boxes in all charts
-$Dbheight    = 80;  // horizontal spacing between boxes in all charts
-$Dindent     = 15;  // width to indent ancestry and descendancy charts boxes
-$Darrowwidth = 300; // not used that I can see ***
-
-// Dimensions for compact version of chart displays
-$cbwidth  = 240;
-$cbheight = 50;
-
-// The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels
-$WT_STATS_S_CHART_X = 440;
-$WT_STATS_S_CHART_Y = 125;
-$WT_STATS_L_CHART_X = 900;
-
-// For map charts, the maximum size is 440 pixels wide by 220 pixels high
-$WT_STATS_MAP_X        = 440;
-$WT_STATS_MAP_Y        = 220;
-$WT_STATS_CHART_COLOR1 = 'ffffff';
-$WT_STATS_CHART_COLOR2 = '95b8e0';
-$WT_STATS_CHART_COLOR3 = 'c8e7ff';
+return new WT\Theme\Colors;
diff --git a/themes/fab/css-1.6.2/images/webtrees.png b/themes/fab/css-1.6.2/images/webtrees.png
deleted file mode 100644
index 55bed21617..0000000000
--- a/themes/fab/css-1.6.2/images/webtrees.png
+++ /dev/null
diff --git a/themes/fab/css-1.6.2/favicon.png b/themes/fab/css-1.7.0/favicon.png
index 4c54cc0e4e..4c54cc0e4e 100644
--- a/themes/fab/css-1.6.2/favicon.png
+++ b/themes/fab/css-1.7.0/favicon.png
diff --git a/themes/fab/css-1.6.2/images/add.png b/themes/fab/css-1.7.0/images/add.png
index c4554632f2..c4554632f2 100644
--- a/themes/fab/css-1.6.2/images/add.png
+++ b/themes/fab/css-1.7.0/images/add.png
diff --git a/themes/fab/css-1.6.2/images/admin.png b/themes/fab/css-1.7.0/images/admin.png
index 564ed26919..564ed26919 100644
--- a/themes/fab/css-1.6.2/images/admin.png
+++ b/themes/fab/css-1.7.0/images/admin.png
diff --git a/themes/fab/css-1.6.2/images/bing.png b/themes/fab/css-1.7.0/images/bing.png
index 400627cf16..400627cf16 100644
--- a/themes/fab/css-1.6.2/images/bing.png
+++ b/themes/fab/css-1.7.0/images/bing.png
diff --git a/themes/fab/css-1.6.2/images/buttons/addmedia.png b/themes/fab/css-1.7.0/images/buttons/addmedia.png
index a269a90e35..a269a90e35 100644
--- a/themes/fab/css-1.6.2/images/buttons/addmedia.png
+++ b/themes/fab/css-1.7.0/images/buttons/addmedia.png
diff --git a/themes/fab/css-1.6.2/images/buttons/addnote.png b/themes/fab/css-1.7.0/images/buttons/addnote.png
index 5811eabeaa..5811eabeaa 100644
--- a/themes/fab/css-1.6.2/images/buttons/addnote.png
+++ b/themes/fab/css-1.7.0/images/buttons/addnote.png
diff --git a/themes/fab/css-1.6.2/images/buttons/addrepository.png b/themes/fab/css-1.7.0/images/buttons/addrepository.png
index 9bf88ee0fe..9bf88ee0fe 100644
--- a/themes/fab/css-1.6.2/images/buttons/addrepository.png
+++ b/themes/fab/css-1.7.0/images/buttons/addrepository.png
diff --git a/themes/fab/css-1.6.2/images/buttons/addsource.png b/themes/fab/css-1.7.0/images/buttons/addsource.png
index f5b6d8b787..f5b6d8b787 100644
--- a/themes/fab/css-1.6.2/images/buttons/addsource.png
+++ b/themes/fab/css-1.7.0/images/buttons/addsource.png
diff --git a/themes/fab/css-1.6.2/images/buttons/calendar.png b/themes/fab/css-1.7.0/images/buttons/calendar.png
index 0d308a977a..0d308a977a 100644
--- a/themes/fab/css-1.6.2/images/buttons/calendar.png
+++ b/themes/fab/css-1.7.0/images/buttons/calendar.png
diff --git a/themes/fab/css-1.6.2/images/buttons/family.png b/themes/fab/css-1.7.0/images/buttons/family.png
index 3ceafc5abb..3ceafc5abb 100644
--- a/themes/fab/css-1.6.2/images/buttons/family.png
+++ b/themes/fab/css-1.7.0/images/buttons/family.png
diff --git a/themes/fab/css-1.7.0/images/buttons/find.png b/themes/fab/css-1.7.0/images/buttons/find.png
new file mode 100644
index 0000000000..be6c6002e4
--- /dev/null
+++ b/themes/fab/css-1.7.0/images/buttons/find.png
diff --git a/themes/fab/css-1.6.2/images/buttons/find_facts.png b/themes/fab/css-1.7.0/images/buttons/find_facts.png
index 2ba25a7858..2ba25a7858 100644
--- a/themes/fab/css-1.6.2/images/buttons/find_facts.png
+++ b/themes/fab/css-1.7.0/images/buttons/find_facts.png
diff --git a/themes/fab/css-1.6.2/images/buttons/head.png b/themes/fab/css-1.7.0/images/buttons/head.png
index 8c381b7d6a..8c381b7d6a 100644
--- a/themes/fab/css-1.6.2/images/buttons/head.png
+++ b/themes/fab/css-1.7.0/images/buttons/head.png
diff --git a/themes/fab/css-1.6.2/images/buttons/indi.png b/themes/fab/css-1.7.0/images/buttons/indi.png
index 31e3856acc..31e3856acc 100644
--- a/themes/fab/css-1.6.2/images/buttons/indi.png
+++ b/themes/fab/css-1.7.0/images/buttons/indi.png
diff --git a/themes/fab/css-1.6.2/images/buttons/keyboard.png b/themes/fab/css-1.7.0/images/buttons/keyboard.png
index 0c6f4b33f9..0c6f4b33f9 100644
--- a/themes/fab/css-1.6.2/images/buttons/keyboard.png
+++ b/themes/fab/css-1.7.0/images/buttons/keyboard.png
diff --git a/themes/fab/css-1.6.2/images/buttons/media.png b/themes/fab/css-1.7.0/images/buttons/media.png
index 0c7f115203..0c7f115203 100644
--- a/themes/fab/css-1.6.2/images/buttons/media.png
+++ b/themes/fab/css-1.7.0/images/buttons/media.png
diff --git a/themes/fab/css-1.6.2/images/buttons/note.png b/themes/fab/css-1.7.0/images/buttons/note.png
index 516bf511bf..516bf511bf 100644
--- a/themes/fab/css-1.6.2/images/buttons/note.png
+++ b/themes/fab/css-1.7.0/images/buttons/note.png
diff --git a/themes/fab/css-1.6.2/images/buttons/place.png b/themes/fab/css-1.7.0/images/buttons/place.png
index 8d4684fac3..8d4684fac3 100644
--- a/themes/fab/css-1.6.2/images/buttons/place.png
+++ b/themes/fab/css-1.7.0/images/buttons/place.png
diff --git a/themes/fab/css-1.6.2/images/buttons/repository.png b/themes/fab/css-1.7.0/images/buttons/repository.png
index ac7dcf74cb..ac7dcf74cb 100644
--- a/themes/fab/css-1.6.2/images/buttons/repository.png
+++ b/themes/fab/css-1.7.0/images/buttons/repository.png
diff --git a/themes/fab/css-1.6.2/images/buttons/source.png b/themes/fab/css-1.7.0/images/buttons/source.png
index c56ade9ca2..c56ade9ca2 100644
--- a/themes/fab/css-1.6.2/images/buttons/source.png
+++ b/themes/fab/css-1.7.0/images/buttons/source.png
diff --git a/themes/fab/css-1.6.2/images/buttons/target.png b/themes/fab/css-1.7.0/images/buttons/target.png
index 05e1a221e6..05e1a221e6 100644
--- a/themes/fab/css-1.6.2/images/buttons/target.png
+++ b/themes/fab/css-1.7.0/images/buttons/target.png
diff --git a/themes/fab/css-1.6.2/images/cfamily.png b/themes/fab/css-1.7.0/images/cfamily.png
index 605ef01d03..605ef01d03 100644
--- a/themes/fab/css-1.6.2/images/cfamily.png
+++ b/themes/fab/css-1.7.0/images/cfamily.png
diff --git a/themes/fab/css-1.6.2/images/childless.png b/themes/fab/css-1.7.0/images/childless.png
index 10f82fe6fe..10f82fe6fe 100644
--- a/themes/fab/css-1.6.2/images/childless.png
+++ b/themes/fab/css-1.7.0/images/childless.png
diff --git a/themes/fab/css-1.6.2/images/children.png b/themes/fab/css-1.7.0/images/children.png
index 64d2503625..64d2503625 100644
--- a/themes/fab/css-1.6.2/images/children.png
+++ b/themes/fab/css-1.7.0/images/children.png
diff --git a/themes/fab/css-1.6.2/images/clippings.png b/themes/fab/css-1.7.0/images/clippings.png
index c2bb99cf36..c2bb99cf36 100644
--- a/themes/fab/css-1.6.2/images/clippings.png
+++ b/themes/fab/css-1.7.0/images/clippings.png
diff --git a/themes/fab/css-1.6.2/images/close.png b/themes/fab/css-1.7.0/images/close.png
index 8b31a0c4be..8b31a0c4be 100644
--- a/themes/fab/css-1.6.2/images/close.png
+++ b/themes/fab/css-1.7.0/images/close.png
diff --git a/themes/fab/css-1.6.2/images/controls.png b/themes/fab/css-1.7.0/images/controls.png
index 140c6fc4ae..140c6fc4ae 100644
--- a/themes/fab/css-1.6.2/images/controls.png
+++ b/themes/fab/css-1.7.0/images/controls.png
diff --git a/themes/fab/css-1.6.2/images/darrow.png b/themes/fab/css-1.7.0/images/darrow.png
index 3be2605dc8..3be2605dc8 100644
--- a/themes/fab/css-1.6.2/images/darrow.png
+++ b/themes/fab/css-1.7.0/images/darrow.png
diff --git a/themes/fab/css-1.6.2/images/darrow2.png b/themes/fab/css-1.7.0/images/darrow2.png
index 995ae19667..995ae19667 100644
--- a/themes/fab/css-1.6.2/images/darrow2.png
+++ b/themes/fab/css-1.7.0/images/darrow2.png
diff --git a/themes/fab/css-1.6.2/images/ddarrow.png b/themes/fab/css-1.7.0/images/ddarrow.png
index 44dd6ab5aa..44dd6ab5aa 100644
--- a/themes/fab/css-1.6.2/images/ddarrow.png
+++ b/themes/fab/css-1.7.0/images/ddarrow.png
diff --git a/themes/fab/css-1.6.2/images/dline.png b/themes/fab/css-1.7.0/images/dline.png
index 36a4e2990c..36a4e2990c 100644
--- a/themes/fab/css-1.6.2/images/dline.png
+++ b/themes/fab/css-1.7.0/images/dline.png
diff --git a/themes/fab/css-1.6.2/images/dline2.png b/themes/fab/css-1.7.0/images/dline2.png
index 2ddfbed136..2ddfbed136 100644
--- a/themes/fab/css-1.6.2/images/dline2.png
+++ b/themes/fab/css-1.7.0/images/dline2.png
diff --git a/themes/fab/css-1.6.2/images/edit_indi.png b/themes/fab/css-1.7.0/images/edit_indi.png
index 4303823993..4303823993 100644
--- a/themes/fab/css-1.6.2/images/edit_indi.png
+++ b/themes/fab/css-1.7.0/images/edit_indi.png
diff --git a/themes/fab/css-1.6.2/images/email.png b/themes/fab/css-1.7.0/images/email.png
index 2b3efdd668..2b3efdd668 100644
--- a/themes/fab/css-1.6.2/images/email.png
+++ b/themes/fab/css-1.7.0/images/email.png
diff --git a/themes/fab/css-1.6.2/images/fambook.png b/themes/fab/css-1.7.0/images/fambook.png
index b07526f71e..b07526f71e 100644
--- a/themes/fab/css-1.6.2/images/fambook.png
+++ b/themes/fab/css-1.7.0/images/fambook.png
diff --git a/themes/fab/css-1.6.2/images/gedcom.png b/themes/fab/css-1.7.0/images/gedcom.png
index 0abbc64b8c..0abbc64b8c 100644
--- a/themes/fab/css-1.6.2/images/gedcom.png
+++ b/themes/fab/css-1.7.0/images/gedcom.png
diff --git a/themes/fab/css-1.6.2/images/googlemaps.png b/themes/fab/css-1.7.0/images/googlemaps.png
index 12ab0c14d5..12ab0c14d5 100644
--- a/themes/fab/css-1.6.2/images/googlemaps.png
+++ b/themes/fab/css-1.7.0/images/googlemaps.png
diff --git a/themes/fab/css-1.6.2/images/help.png b/themes/fab/css-1.7.0/images/help.png
index 4c98231e1c..4c98231e1c 100644
--- a/themes/fab/css-1.6.2/images/help.png
+++ b/themes/fab/css-1.7.0/images/help.png
diff --git a/themes/fab/css-1.6.2/images/hline.png b/themes/fab/css-1.7.0/images/hline.png
index 922070a492..922070a492 100644
--- a/themes/fab/css-1.6.2/images/hline.png
+++ b/themes/fab/css-1.7.0/images/hline.png
diff --git a/themes/fab/css-1.6.2/images/icon-mime-sprite.png b/themes/fab/css-1.7.0/images/icon-mime-sprite.png
index 8322ae4580..8322ae4580 100644
--- a/themes/fab/css-1.6.2/images/icon-mime-sprite.png
+++ b/themes/fab/css-1.7.0/images/icon-mime-sprite.png
diff --git a/themes/fab/css-1.6.2/images/image_add.png b/themes/fab/css-1.7.0/images/image_add.png
index ecac61c284..ecac61c284 100644
--- a/themes/fab/css-1.6.2/images/image_add.png
+++ b/themes/fab/css-1.7.0/images/image_add.png
diff --git a/themes/fab/css-1.6.2/images/image_link.png b/themes/fab/css-1.7.0/images/image_link.png
index 190b08e7d2..190b08e7d2 100644
--- a/themes/fab/css-1.6.2/images/image_link.png
+++ b/themes/fab/css-1.7.0/images/image_link.png
diff --git a/themes/fab/css-1.6.2/images/images.png b/themes/fab/css-1.7.0/images/images.png
index b3854d450a..b3854d450a 100644
--- a/themes/fab/css-1.6.2/images/images.png
+++ b/themes/fab/css-1.7.0/images/images.png
diff --git a/themes/fab/css-1.6.2/images/indi_sprite.png b/themes/fab/css-1.7.0/images/indi_sprite.png
index 570c6b9013..570c6b9013 100644
--- a/themes/fab/css-1.6.2/images/indi_sprite.png
+++ b/themes/fab/css-1.7.0/images/indi_sprite.png
diff --git a/themes/fab/css-1.6.2/images/indicator.gif b/themes/fab/css-1.7.0/images/indicator.gif
index 085ccaecaf..085ccaecaf 100644
--- a/themes/fab/css-1.6.2/images/indicator.gif
+++ b/themes/fab/css-1.7.0/images/indicator.gif
diff --git a/themes/fab/css-1.6.2/images/indis.png b/themes/fab/css-1.7.0/images/indis.png
index 79c3d7b625..79c3d7b625 100644
--- a/themes/fab/css-1.6.2/images/indis.png
+++ b/themes/fab/css-1.7.0/images/indis.png
diff --git a/themes/fab/css-1.6.2/images/larrow.png b/themes/fab/css-1.7.0/images/larrow.png
index 6d152c1aa0..6d152c1aa0 100644
--- a/themes/fab/css-1.6.2/images/larrow.png
+++ b/themes/fab/css-1.7.0/images/larrow.png
diff --git a/themes/fab/css-1.6.2/images/larrow2.png b/themes/fab/css-1.7.0/images/larrow2.png
index 9b63d582a0..9b63d582a0 100644
--- a/themes/fab/css-1.6.2/images/larrow2.png
+++ b/themes/fab/css-1.7.0/images/larrow2.png
diff --git a/themes/fab/css-1.6.2/images/ldarrow.png b/themes/fab/css-1.7.0/images/ldarrow.png
index fc0e73fc86..fc0e73fc86 100644
--- a/themes/fab/css-1.6.2/images/ldarrow.png
+++ b/themes/fab/css-1.7.0/images/ldarrow.png
diff --git a/themes/webtrees/css-1.6.2/images/ldarrow2.png b/themes/fab/css-1.7.0/images/ldarrow2.png
index df5ec8e5a9..df5ec8e5a9 100644
--- a/themes/webtrees/css-1.6.2/images/ldarrow2.png
+++ b/themes/fab/css-1.7.0/images/ldarrow2.png
diff --git a/themes/fab/css-1.6.2/images/lifespan-chunk.png b/themes/fab/css-1.7.0/images/lifespan-chunk.png
index 493ce7e39f..493ce7e39f 100644
--- a/themes/fab/css-1.6.2/images/lifespan-chunk.png
+++ b/themes/fab/css-1.7.0/images/lifespan-chunk.png
diff --git a/themes/fab/css-1.6.2/images/lifespan-down.png b/themes/fab/css-1.7.0/images/lifespan-down.png
index d06f382790..d06f382790 100644
--- a/themes/fab/css-1.6.2/images/lifespan-down.png
+++ b/themes/fab/css-1.7.0/images/lifespan-down.png
diff --git a/themes/fab/css-1.6.2/images/lifespan-left.png b/themes/fab/css-1.7.0/images/lifespan-left.png
index 50eecf5249..50eecf5249 100644
--- a/themes/fab/css-1.6.2/images/lifespan-left.png
+++ b/themes/fab/css-1.7.0/images/lifespan-left.png
diff --git a/themes/fab/css-1.6.2/images/lifespan-right.png b/themes/fab/css-1.7.0/images/lifespan-right.png
index 2c7675b1d1..2c7675b1d1 100644
--- a/themes/fab/css-1.6.2/images/lifespan-right.png
+++ b/themes/fab/css-1.7.0/images/lifespan-right.png
diff --git a/themes/fab/css-1.6.2/images/lifespan-up.png b/themes/fab/css-1.7.0/images/lifespan-up.png
index e155fe6ce0..e155fe6ce0 100644
--- a/themes/fab/css-1.6.2/images/lifespan-up.png
+++ b/themes/fab/css-1.7.0/images/lifespan-up.png
diff --git a/themes/fab/css-1.6.2/images/loading.gif b/themes/fab/css-1.7.0/images/loading.gif
index 5bb90fd6a4..5bb90fd6a4 100644
--- a/themes/fab/css-1.6.2/images/loading.gif
+++ b/themes/fab/css-1.7.0/images/loading.gif
diff --git a/themes/fab/css-1.6.2/images/mapquest.png b/themes/fab/css-1.7.0/images/mapquest.png
index 104dc95c9d..104dc95c9d 100644
--- a/themes/fab/css-1.6.2/images/mapquest.png
+++ b/themes/fab/css-1.7.0/images/mapquest.png
diff --git a/themes/fab/css-1.6.2/images/media.png b/themes/fab/css-1.7.0/images/media.png
index 5bb919380b..5bb919380b 100644
--- a/themes/fab/css-1.6.2/images/media.png
+++ b/themes/fab/css-1.7.0/images/media.png
diff --git a/themes/fab/css-1.6.2/images/minus.png b/themes/fab/css-1.7.0/images/minus.png
index 8ed68808da..8ed68808da 100644
--- a/themes/fab/css-1.6.2/images/minus.png
+++ b/themes/fab/css-1.7.0/images/minus.png
diff --git a/themes/fab/css-1.6.2/images/move.png b/themes/fab/css-1.7.0/images/move.png
index c8f799aa1a..c8f799aa1a 100644
--- a/themes/fab/css-1.6.2/images/move.png
+++ b/themes/fab/css-1.7.0/images/move.png
diff --git a/themes/fab/css-1.6.2/images/mypage.png b/themes/fab/css-1.7.0/images/mypage.png
index 3a46dbb34e..3a46dbb34e 100644
--- a/themes/fab/css-1.6.2/images/mypage.png
+++ b/themes/fab/css-1.7.0/images/mypage.png
diff --git a/themes/fab/css-1.6.2/images/notes.png b/themes/fab/css-1.7.0/images/notes.png
index 193dc252fa..193dc252fa 100644
--- a/themes/fab/css-1.6.2/images/notes.png
+++ b/themes/fab/css-1.7.0/images/notes.png
diff --git a/themes/fab/css-1.6.2/images/open.png b/themes/fab/css-1.7.0/images/open.png
index 05474627b2..05474627b2 100644
--- a/themes/fab/css-1.6.2/images/open.png
+++ b/themes/fab/css-1.7.0/images/open.png
diff --git a/themes/fab/css-1.6.2/images/osm.png b/themes/fab/css-1.7.0/images/osm.png
index 899e2a58b6..899e2a58b6 100644
--- a/themes/fab/css-1.6.2/images/osm.png
+++ b/themes/fab/css-1.7.0/images/osm.png
diff --git a/themes/fab/css-1.6.2/images/patriarch.png b/themes/fab/css-1.7.0/images/patriarch.png
index 6e4646c1f1..6e4646c1f1 100644
--- a/themes/fab/css-1.6.2/images/patriarch.png
+++ b/themes/fab/css-1.7.0/images/patriarch.png
diff --git a/themes/fab/css-1.6.2/images/pedigree.png b/themes/fab/css-1.7.0/images/pedigree.png
index 5a1dfe9b15..5a1dfe9b15 100644
--- a/themes/fab/css-1.6.2/images/pedigree.png
+++ b/themes/fab/css-1.7.0/images/pedigree.png
diff --git a/themes/fab/css-1.6.2/images/pin-in.png b/themes/fab/css-1.7.0/images/pin-in.png
index bba02bc592..bba02bc592 100644
--- a/themes/fab/css-1.6.2/images/pin-in.png
+++ b/themes/fab/css-1.7.0/images/pin-in.png
diff --git a/themes/fab/css-1.6.2/images/pin-out.png b/themes/fab/css-1.7.0/images/pin-out.png
index 2578e04689..2578e04689 100644
--- a/themes/fab/css-1.6.2/images/pin-out.png
+++ b/themes/fab/css-1.7.0/images/pin-out.png
diff --git a/themes/fab/css-1.6.2/images/place.png b/themes/fab/css-1.7.0/images/place.png
index b381240577..b381240577 100644
--- a/themes/fab/css-1.6.2/images/place.png
+++ b/themes/fab/css-1.7.0/images/place.png
diff --git a/themes/fab/css-1.6.2/images/plus.png b/themes/fab/css-1.7.0/images/plus.png
index 64e15fc9f3..64e15fc9f3 100644
--- a/themes/fab/css-1.6.2/images/plus.png
+++ b/themes/fab/css-1.7.0/images/plus.png
diff --git a/themes/webtrees/css-1.6.2/images/webtrees_s.png b/themes/fab/css-1.7.0/images/powered-by-webtrees.png
index 6a5cf0fb3e..6a5cf0fb3e 100644
--- a/themes/webtrees/css-1.6.2/images/webtrees_s.png
+++ b/themes/fab/css-1.7.0/images/powered-by-webtrees.png
diff --git a/themes/fab/css-1.6.2/images/rarrow.png b/themes/fab/css-1.7.0/images/rarrow.png
index 705bc43c4f..705bc43c4f 100644
--- a/themes/fab/css-1.6.2/images/rarrow.png
+++ b/themes/fab/css-1.7.0/images/rarrow.png
diff --git a/themes/fab/css-1.6.2/images/rarrow2.png b/themes/fab/css-1.7.0/images/rarrow2.png
index a74991fd63..a74991fd63 100644
--- a/themes/fab/css-1.6.2/images/rarrow2.png
+++ b/themes/fab/css-1.7.0/images/rarrow2.png
diff --git a/themes/fab/css-1.6.2/images/rdarrow.png b/themes/fab/css-1.7.0/images/rdarrow.png
index 198e7d1768..198e7d1768 100644
--- a/themes/fab/css-1.6.2/images/rdarrow.png
+++ b/themes/fab/css-1.7.0/images/rdarrow.png
diff --git a/themes/webtrees/css-1.6.2/images/rdarrow2.png b/themes/fab/css-1.7.0/images/rdarrow2.png
index 63437aa3c6..63437aa3c6 100644
--- a/themes/webtrees/css-1.6.2/images/rdarrow2.png
+++ b/themes/fab/css-1.7.0/images/rdarrow2.png
diff --git a/themes/fab/css-1.6.2/images/reminder.png b/themes/fab/css-1.7.0/images/reminder.png
index fa5bbcf507..fa5bbcf507 100644
--- a/themes/fab/css-1.6.2/images/reminder.png
+++ b/themes/fab/css-1.7.0/images/reminder.png
diff --git a/themes/fab/css-1.6.2/images/remove-dis.png b/themes/fab/css-1.7.0/images/remove-dis.png
index f27f67d1a2..f27f67d1a2 100644
--- a/themes/fab/css-1.6.2/images/remove-dis.png
+++ b/themes/fab/css-1.7.0/images/remove-dis.png
diff --git a/themes/fab/css-1.6.2/images/remove.png b/themes/fab/css-1.7.0/images/remove.png
index d781275707..d781275707 100644
--- a/themes/fab/css-1.6.2/images/remove.png
+++ b/themes/fab/css-1.7.0/images/remove.png
diff --git a/themes/fab/css-1.6.2/images/reorder.png b/themes/fab/css-1.7.0/images/reorder.png
index 2cfe889ad1..2cfe889ad1 100644
--- a/themes/fab/css-1.6.2/images/reorder.png
+++ b/themes/fab/css-1.7.0/images/reorder.png
diff --git a/themes/fab/css-1.6.2/images/repository.png b/themes/fab/css-1.7.0/images/repository.png
index 10eec3f7ca..10eec3f7ca 100644
--- a/themes/fab/css-1.6.2/images/repository.png
+++ b/themes/fab/css-1.7.0/images/repository.png
diff --git a/themes/fab/css-1.6.2/images/resn_confidential.png b/themes/fab/css-1.7.0/images/resn_confidential.png
index 7ecea33a1a..7ecea33a1a 100644
--- a/themes/fab/css-1.6.2/images/resn_confidential.png
+++ b/themes/fab/css-1.7.0/images/resn_confidential.png
diff --git a/themes/fab/css-1.6.2/images/resn_locked.png b/themes/fab/css-1.7.0/images/resn_locked.png
index 43fa09b350..43fa09b350 100644
--- a/themes/fab/css-1.6.2/images/resn_locked.png
+++ b/themes/fab/css-1.7.0/images/resn_locked.png
diff --git a/themes/fab/css-1.6.2/images/resn_none.png b/themes/fab/css-1.7.0/images/resn_none.png
index 1b5f57a70f..1b5f57a70f 100644
--- a/themes/fab/css-1.6.2/images/resn_none.png
+++ b/themes/fab/css-1.7.0/images/resn_none.png
diff --git a/themes/fab/css-1.6.2/images/resn_privacy.png b/themes/fab/css-1.7.0/images/resn_privacy.png
index ca462fd84d..ca462fd84d 100644
--- a/themes/fab/css-1.6.2/images/resn_privacy.png
+++ b/themes/fab/css-1.7.0/images/resn_privacy.png
diff --git a/themes/fab/css-1.6.2/images/rings.png b/themes/fab/css-1.7.0/images/rings.png
index 698927d4b8..698927d4b8 100644
--- a/themes/fab/css-1.6.2/images/rings.png
+++ b/themes/fab/css-1.7.0/images/rings.png
diff --git a/themes/fab/css-1.6.2/images/search.png b/themes/fab/css-1.7.0/images/search.png
index 360c293582..360c293582 100644
--- a/themes/fab/css-1.6.2/images/search.png
+++ b/themes/fab/css-1.7.0/images/search.png
diff --git a/themes/fab/css-1.6.2/images/selected.png b/themes/fab/css-1.7.0/images/selected.png
index c3c1c25802..c3c1c25802 100644
--- a/themes/fab/css-1.6.2/images/selected.png
+++ b/themes/fab/css-1.7.0/images/selected.png
diff --git a/themes/fab/css-1.6.2/images/sex_f_15x15.png b/themes/fab/css-1.7.0/images/sex_f_15x15.png
index 2d3abae32a..2d3abae32a 100644
--- a/themes/fab/css-1.6.2/images/sex_f_15x15.png
+++ b/themes/fab/css-1.7.0/images/sex_f_15x15.png
diff --git a/themes/fab/css-1.6.2/images/sex_f_9x9.png b/themes/fab/css-1.7.0/images/sex_f_9x9.png
index e35e46ccd4..e35e46ccd4 100644
--- a/themes/fab/css-1.6.2/images/sex_f_9x9.png
+++ b/themes/fab/css-1.7.0/images/sex_f_9x9.png
diff --git a/themes/fab/css-1.6.2/images/sex_m_15x15.png b/themes/fab/css-1.7.0/images/sex_m_15x15.png
index 4ac7956421..4ac7956421 100644
--- a/themes/fab/css-1.6.2/images/sex_m_15x15.png
+++ b/themes/fab/css-1.7.0/images/sex_m_15x15.png
diff --git a/themes/fab/css-1.6.2/images/sex_m_9x9.png b/themes/fab/css-1.7.0/images/sex_m_9x9.png
index 32a8484b1f..32a8484b1f 100644
--- a/themes/fab/css-1.6.2/images/sex_m_9x9.png
+++ b/themes/fab/css-1.7.0/images/sex_m_9x9.png
diff --git a/themes/fab/css-1.6.2/images/sex_u_15x15.png b/themes/fab/css-1.7.0/images/sex_u_15x15.png
index 158c3f9a10..158c3f9a10 100644
--- a/themes/fab/css-1.6.2/images/sex_u_15x15.png
+++ b/themes/fab/css-1.7.0/images/sex_u_15x15.png
diff --git a/themes/fab/css-1.6.2/images/sex_u_9x9.png b/themes/fab/css-1.7.0/images/sex_u_9x9.png
index d113a1898c..d113a1898c 100644
--- a/themes/fab/css-1.6.2/images/sex_u_9x9.png
+++ b/themes/fab/css-1.7.0/images/sex_u_9x9.png
diff --git a/themes/fab/css-1.6.2/images/sfamily.png b/themes/fab/css-1.7.0/images/sfamily.png
index 8b2270cae2..8b2270cae2 100644
--- a/themes/fab/css-1.6.2/images/sfamily.png
+++ b/themes/fab/css-1.7.0/images/sfamily.png
diff --git a/themes/fab/css-1.6.2/images/silhouette_female.png b/themes/fab/css-1.7.0/images/silhouette_female.png
index 871eaa753a..871eaa753a 100644
--- a/themes/fab/css-1.6.2/images/silhouette_female.png
+++ b/themes/fab/css-1.7.0/images/silhouette_female.png
diff --git a/themes/fab/css-1.6.2/images/silhouette_female_small.png b/themes/fab/css-1.7.0/images/silhouette_female_small.png
index 63b0597d4a..63b0597d4a 100644
--- a/themes/fab/css-1.6.2/images/silhouette_female_small.png
+++ b/themes/fab/css-1.7.0/images/silhouette_female_small.png
diff --git a/themes/fab/css-1.6.2/images/silhouette_male.png b/themes/fab/css-1.7.0/images/silhouette_male.png
index d2f1009a19..d2f1009a19 100644
--- a/themes/fab/css-1.6.2/images/silhouette_male.png
+++ b/themes/fab/css-1.7.0/images/silhouette_male.png
diff --git a/themes/fab/css-1.6.2/images/silhouette_male_small.png b/themes/fab/css-1.7.0/images/silhouette_male_small.png
index 5bf17eb4c3..5bf17eb4c3 100644
--- a/themes/fab/css-1.6.2/images/silhouette_male_small.png
+++ b/themes/fab/css-1.7.0/images/silhouette_male_small.png
diff --git a/themes/fab/css-1.6.2/images/silhouette_unknown.png b/themes/fab/css-1.7.0/images/silhouette_unknown.png
index d0417439ee..d0417439ee 100644
--- a/themes/fab/css-1.6.2/images/silhouette_unknown.png
+++ b/themes/fab/css-1.7.0/images/silhouette_unknown.png
diff --git a/themes/fab/css-1.6.2/images/silhouette_unknown_small.png b/themes/fab/css-1.7.0/images/silhouette_unknown_small.png
index 872432a50f..872432a50f 100644
--- a/themes/fab/css-1.6.2/images/silhouette_unknown_small.png
+++ b/themes/fab/css-1.7.0/images/silhouette_unknown_small.png
diff --git a/themes/fab/css-1.6.2/images/source.png b/themes/fab/css-1.7.0/images/source.png
index d51b3e41e9..d51b3e41e9 100644
--- a/themes/fab/css-1.6.2/images/source.png
+++ b/themes/fab/css-1.7.0/images/source.png
diff --git a/themes/fab/css-1.6.2/images/spacer.png b/themes/fab/css-1.7.0/images/spacer.png
index a31b396979..a31b396979 100644
--- a/themes/fab/css-1.6.2/images/spacer.png
+++ b/themes/fab/css-1.7.0/images/spacer.png
diff --git a/themes/fab/css-1.6.2/images/stop.png b/themes/fab/css-1.7.0/images/stop.png
index a15d4bae84..a15d4bae84 100644
--- a/themes/fab/css-1.6.2/images/stop.png
+++ b/themes/fab/css-1.7.0/images/stop.png
diff --git a/themes/fab/css-1.6.2/images/uarrow.png b/themes/fab/css-1.7.0/images/uarrow.png
index dde11141c3..dde11141c3 100644
--- a/themes/fab/css-1.6.2/images/uarrow.png
+++ b/themes/fab/css-1.7.0/images/uarrow.png
diff --git a/themes/fab/css-1.6.2/images/uarrow2.png b/themes/fab/css-1.7.0/images/uarrow2.png
index e82af4097a..e82af4097a 100644
--- a/themes/fab/css-1.6.2/images/uarrow2.png
+++ b/themes/fab/css-1.7.0/images/uarrow2.png
diff --git a/themes/fab/css-1.6.2/images/udarrow.png b/themes/fab/css-1.7.0/images/udarrow.png
index e26db59a0b..e26db59a0b 100644
--- a/themes/fab/css-1.6.2/images/udarrow.png
+++ b/themes/fab/css-1.7.0/images/udarrow.png
diff --git a/themes/fab/css-1.6.2/images/user_add.png b/themes/fab/css-1.7.0/images/user_add.png
index 7a511a376c..7a511a376c 100644
--- a/themes/fab/css-1.6.2/images/user_add.png
+++ b/themes/fab/css-1.7.0/images/user_add.png
diff --git a/themes/fab/css-1.6.2/images/video.png b/themes/fab/css-1.7.0/images/video.png
index b0862f2278..b0862f2278 100644
--- a/themes/fab/css-1.6.2/images/video.png
+++ b/themes/fab/css-1.7.0/images/video.png
diff --git a/themes/fab/css-1.6.2/images/vline.png b/themes/fab/css-1.7.0/images/vline.png
index b00ff9ea3e..b00ff9ea3e 100644
--- a/themes/fab/css-1.6.2/images/vline.png
+++ b/themes/fab/css-1.7.0/images/vline.png
diff --git a/themes/fab/css-1.6.2/images/w_button.png b/themes/fab/css-1.7.0/images/w_button.png
index 31af28a377..31af28a377 100644
--- a/themes/fab/css-1.6.2/images/w_button.png
+++ b/themes/fab/css-1.7.0/images/w_button.png
diff --git a/themes/fab/css-1.6.2/images/warning.png b/themes/fab/css-1.7.0/images/warning.png
index d484c33341..d484c33341 100644
--- a/themes/fab/css-1.6.2/images/warning.png
+++ b/themes/fab/css-1.7.0/images/warning.png
diff --git a/themes/fab/css-1.6.2/images/zoomin.png b/themes/fab/css-1.7.0/images/zoomin.png
index cea0ec773b..cea0ec773b 100644
--- a/themes/fab/css-1.6.2/images/zoomin.png
+++ b/themes/fab/css-1.7.0/images/zoomin.png
diff --git a/themes/fab/css-1.6.2/images/zoomout.png b/themes/fab/css-1.7.0/images/zoomout.png
index 5bfa433154..5bfa433154 100644
--- a/themes/fab/css-1.6.2/images/zoomout.png
+++ b/themes/fab/css-1.7.0/images/zoomout.png
diff --git a/themes/fab/css-1.6.2/style.css b/themes/fab/css-1.7.0/style.css
index f85679d0ca..d78d5d684e 100644
--- a/themes/fab/css-1.6.2/style.css
+++ b/themes/fab/css-1.7.0/style.css
@@ -5,7 +5,9 @@
 * Copyright (C) 2014 webtrees development team.
 *
 * Derived from PhpGedView
-* Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved.
+* Copyright (C) 2002 to 2009 PGV Development Team.
+*
+* Mime-type icons from http://gnome-look.org, published under GPL (v2)
 *
 * 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
@@ -22,6 +24,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+/* ======== Globals ========== */
+
 /* Add a permanent scrollbar, to prevent "flickering" when hover effects lengthen page */
 html {
 	overflow-y: scroll;
@@ -36,18 +40,10 @@ body {
 
 main {
 	display: block;
+	clear: both;
 }
 
-:focus {
-	outline-style: none;
-}
-
-.submenu {
-	background-color: #eee;
-	border: thin solid #aaa;
-}
-
-/* Round corners to block-level elements */
+/* ====== Round Corners ======== */
 input,
 textarea,
 fieldset,
@@ -73,6 +69,8 @@ fieldset,
 .person3,
 .person4,
 .person5,
+header,
+footer,
 #indi_main_blocks,
 #tabs,
 #save-cancel,
@@ -82,54 +80,9 @@ fieldset,
 	border-radius: 4px;
 }
 
-img.block {
-	border: 0;
-	height: 20px;
-	vertical-align: middle;
-}
-
-.line1,
-.line2,
-.line3 {
-	vertical-align: middle;
-}
-
-#hourglass_chart img.line4 {
-	vertical-align: middle;
-}
-
-.line5 {
-	vertical-align: top;
-}
-
-legend {
-	font-weight: bold;
-}
-
-/* Indicate that the parent died shortly after the birth */
-.parentdeath {
-	border: 1px solid #000;
-}
-
-/* Hyperlinks: regular and help */
-a {
-	text-decoration: none;
-}
-
-a:link,
-a:visited {
-	color: #369;
-}
-
-a:hover,
-a:active {
-	text-decoration: underline;
-}
-
-a.gallery img {
-	border: 0;
-	border-radius: 4px;
-	margin: 4px;
+/* ios on click workaround */
+.iconz {
+	cursor: pointer;
 }
 
 input:required:valid,
@@ -149,331 +102,164 @@ textarea:required:invalid {
 	background-position: left top;
 }
 
-/* Various text styles */
-.warning,
-.error,
-.largeError {
-	color: #f00;
-	font-weight: bold;
+a {
+	text-decoration: none;
 }
 
-/* Fact labels */
-.label {
-	font-weight: bold;
+a:hover,
+a:active {
+	text-decoration: underline;
 }
 
-.quickfacts a {
-	font-size: smaller;
-	padding: 0 3px;
+a:link,
+a:visited {
+	color: #369;
 }
 
-/* Main name on INDI/FAM/etc. pages */
-.name_head {
-	font-size: larger;
+:focus {
+	outline-style: none;
 }
 
-/* Elements used on every page */
-header {
-	color: #888;
-	text-align: center;
+#flash-messages {
+	clear: both;
 }
 
-#header-user-links {
-	float: right;
+dl {
+	margin: 0;
 }
 
-[dir=rtl] #header-user-links {
+dt {
 	float: left;
+	font-weight: bold;
+	margin-right: 10px;
 }
 
-header h1 {
-	clear: left;
+[dir=rtl] dt {
 	float: left;
-	font-size: x-large;
-	font-weight: normal;
-	margin: 0;
+	margin-right: auto;
+	margin-left: 10px;
 }
 
-[dir=rtl] header h1 {
-	clear: right;
-	float: right;
+header {
+	color: #888;
+	text-align: center;
 }
 
 #content {
-	margin-top: 12px;
-	margin-bottom: 12px;
-}
-
-footer {
-	clear: both;
-	text-align: center;
-	width: 99%;
+	margin: 5px 5px 12px 5px;
 }
 
-/* Block level objects, such as header, footer, etc. */
+header,
+footer,
 .block {
 	background-color: #eee;
 	clear: none;
 }
 
-.blockheader {
-	font-weight: bold;
+th {
+	font-weight: 100;
 }
 
-.charts_block {
-	overflow: auto;
+ul {
+	padding-left: 15px;
+	padding-right: 15px;
+	margin: 8px;
 }
 
-#link_change_blocks {
-	clear: both;
-	margin: 0 auto;
-	padding: 25px 0 0;
-	text-align: center;
-	width: 400px;
-}
-
-#link_change_blocks span {
-	padding: 0 50px;
-}
-
-#link_change_blocks span span {
-	padding: 0 3px;
-}
-
-#random_picture {
-	text-align: center;
-}
-
-#random_picture_box {
-	width: 100%;
-}
-
-/* Pending edits - TODO perhaps show differently in different contexts? */
-.new {
-	border: solid #00f 1px;
-	overflow: hidden;
-}
-
-.old {
-	border: solid #f00 1px;
-	overflow: hidden;
-}
-
-/* Set stack level for top two header menu rows */
-.makeMenu ul,
-#main-menu ul {
-	z-index: 210;
-
-}
-
-.makeMenu {
-	white-space: nowrap;
-}
-
-/* User Link Menus */
-.makeMenu li {
-	background: none !important;
-	display: inline;
-	position: relative;
-	white-space: nowrap;
-}
-
-.makeMenu li:before {
-	content: " | ";
-}
-
-.makeMenu li ul li:before {
-	content: "";
+img {
+	border: 0;
 }
 
-.makeMenu li:first-child:before {
-	content: "";
+legend img {
+	height: 20px;
+	vertical-align: middle;
+	width: 20px;
 }
 
-.makeMenu li ul {
-	display: none;
-	position: absolute;
-	left: 0;
-	top: 15px;
-	background-color: #eee;
-	border: thin solid #aaa;
+img.block,
+#mycart img {
+	border: 0;
+	height: 25px;
+	vertical-align: middle;
 }
 
-[dir=rtl] .makeMenu li ul {
-	left: auto;
-	right: 0;
+textarea {
+	border-style: inset;
 }
 
-/* position sub-sub-menus */
-.makeMenu ul ul {
-	top: 0;
-	left: 100px;
-}
-
-[dir=rtl] .makeMenu ul ul {
-	top: 0;
-	left: auto;
-	right: 100px;
+.topbottombar {
+	background-color: #ccc;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 4px;
+	text-align: center;
 }
 
-.makeMenu li ul li {
-	display: block;
+fieldset {
+	margin: 8px 8px 4px;
 	text-align: left;
 }
 
-[dir=rtl] .makeMenu li ul li {
+[dir=rtl] fieldset {
 	text-align: right;
 }
 
-.makeMenu,
-.makeMenu li ul {
-	list-style: none;
-	margin: 0;
-	padding: 1px;
-}
-
-.makeMenu li:hover > ul {
-	display: block;
-}
-
-.makeMenu ul li a {
-	background-color: #eee;
-	padding: 2px 5px;
-	display: block;
-}
-
-.makeMenu ul li a:hover {
-	background-color: #369;
-	color: #fff;
-	text-decoration: none;
-}
-
-/* Main menus */
-header nav {
-	clear: both;
-	text-align: center;
-	padding-top: 12px;
-}
-
-#main-menu {
-	margin: 0;
-}
-
-#main-menu li {
-	background: none !important;
-	display: inline;
-	position: relative;
-	white-space: nowrap;
-}
-
-#main-menu li:before {
-	content: " | ";
-}
-
-#main-menu li ul li:before {
-	content: "";
-}
-
-#main-menu li:first-child:before {
-	content: "";
-}
-
-#main-menu li ul {
-	display: none;
-	position: absolute;
-	left: 0;
-	top: 15px;
-	background-color: #eee;
-	border: thin solid #aaa;
-}
-
-[dir=rtl] #main-menu li ul {
-	left: auto;
-	right: 0;
-}
-
-/* position sub-sub-menus */
-
-#main-menu ul ul {
-	top: 0;
-	left: 100px;
-}
-
-[dir=rtl] #main-menu ul ul {
-	top: 0;
-	left: auto;
-	right: 100px;
-}
-
-#main-menu li ul li {
-	display: block;
-	text-align: left;
-}
-
-[dir=rtl] #main-menu li ul li {
-	text-align: right;
+legend {
+	font-weight: bold;
 }
 
-#main-menu,
-#main-menu li ul {
-	list-style: none;
+select {
+	font-size: 12px;
+	margin: 0 7px;
 	padding: 1px;
 }
 
-#main-menu li:hover > ul {
-	display: block;
-
+header form {
+	font-size: 12px;
 }
 
-#main-menu ul li a {
-	background-color: #eee;
-	padding: 2px 5px;
-	display: block;
-
+#mycart a img {
+	height: 15px;
 }
 
-#main-menu ul li a:hover {
-	background-color: #369;
-	color: #fff;
-	text-decoration: none;
+.button {
+	width: 60px;
 }
 
-.lang-active,
-.theme-active {
-	font-weight: 900;
+.alpha_index {
+	color: #999;
 }
 
-#menu-language li {
-	text-align: left; /* The language menu is always LTR, even on RTL pages */
+.person_box,
+.person_boxF,
+.person_boxNN {
+	margin: 1px 0;
 }
 
-#menu-theme li {
-	text-align: left; /* The theme menu is always LTR, even on RTL pages */
+.person_box_template .details0, 
+.person_box_template .details1 {
+    font-size: smaller;
 }
 
-/* person boxes are used in various charts */
-
 .person_box {
+	padding: 3px;
 	background-color: #ddf;
 }
 
 .person_boxF {
+	padding: 3px;
 	background-color: #fdd;
 }
 
 .person_boxNN {
+	padding: 3px;
 	background-color: #dfd;
 }
 
-.person_box,
-.person_boxF,
-.person_boxNN {
-	margin: 1px 0;
-}
-
-.person_box_template .details0,
-.person_box_template .details1 {
-	font-size: smaller;
+.person_box:target,
+.news_box:target,
+#gedcom_stats:target {
+	background-color: #ffc;
 }
 
 .person_box_lifespan {
@@ -488,56 +274,40 @@ header nav {
 	min-height: 50px;
 }
 
-[dir=rtl] .person_box [dir=rtl] .person_boxF [dir=rtl] .person_boxNN {
-	margin: 0 3px 0 0;
-}
-
-.action_headerF {
-	background: #fdd;
-}
-
-.action_header {
-	background: #ddf;
-}
-
-/* index.php */
-#index_main_blocks {
-	width: 60%;
-	float: left;
-}
-
-#index_small_blocks {
-	width: 40%;
-	float: right;
+.center {
+	text-align: center;
 }
 
-#index_full_blocks {
+table.center {
+	margin-left: auto;
+	margin-right: auto;
 }
 
-[dir=rtl] #index_main_blocks {
-	float: right;
+.list_table {
+	margin: 0 auto;
 }
 
-[dir=rtl] #index_small_blocks {
-	float: left;
+.list_label,
+.list_label_wrap {
+	background-color: #ccc;
+	font-weight: bold;
+	text-align: center;
 }
 
-#main_select,
-#available_select,
-#right_select {
-	min-width: 150px;
+.list_value,
+.list_value_wrap {
+	background-color: #ddd;
+	vertical-align: top;
 }
 
-.user_welcome_block table,
-.gedcom_block_block table {
-	margin: auto;
+.list_label,
+.list_value {
+	white-space: nowrap;
 }
 
-.user_welcome_block td,
-.gedcom_block_block td {
-	width: 33%;
-	text-align: center;
-	vertical-align: top;
+.list_label_wrap,
+.list_value_wrap {
+	white-space: normal;
 }
 
 .facts_table {
@@ -548,236 +318,201 @@ div.fact_SHARED_NOTE {
 	clear: both;
 }
 
-/*-- pedigree chart specific stylesheets --*/
-#pedigree-page table.list_table {
-	margin: 0 auto;
-	width: 500px;
+.facts_label {
+	background-color: #ccc;
+	padding: 4px;
+	width: 20%;
+	text-align: center;
 }
 
-.pedigree_chart_table {
-	border: 0;
-	border-collapse: collapse;
-	padding: 0;
-	width: 100%;
+.facts_label03 {
+	background-color: #ccc;
+	padding: 4px;
+	text-align: center;
+	font-weight: bold;
 }
 
-#pedigree_chart {
-	position: relative;
-	top: -200px;
-	left: 0;
+.facts_value {
+	background-color: #ddd;
+	padding: 4px;
 }
 
-#pedigree_canvas {
-	color: #aaa;
-	position: absolute;
-	top: 200px;
-	z-index: -1000;
+.quickfacts a {
+	padding: 0 3px;
+	font-size: 9px;
 }
 
-#pedigree_chart #childarrow,
-#pedigree_chart #uparrow,
-#pedigree_chart .shadow,
-.ancestorarrow {
-	position: absolute;
+.tabs_table {
+	width: 99%;
 }
 
-#childbox {
-	padding: 5px;
-	position: absolute;
-	display: none;
-	text-align: start;
-	white-space: nowrap;
-	top: 20px;
-	left: 0;
+.name1, .name2 {
+	color: #555;
 }
 
-[dir=rtl] #childbox {
-	left: auto;
-	right: 0;
+a:hover .name1, a:hover .name2 {
+	color: #f00;
 }
 
-.layout3 #childbox {
-	top: auto;
-	bottom: 20px;
+a:hover .nameZoom {
+	font-size: 14px;
+	font-weight: bold;
 }
 
-#childbox a.name1 {
-	/*	font-weight: normal;*/
-	display: block;
-	margin-left: 5px;
+.nameZoom {
+	color: #555;
+	font-size: 14px;
+	font-weight: bold;
 }
 
-#hourglass_chart table,
-.charts_block table {
-	border-collapse: collapse;
+.details_label {
+	font-weight: bold;
 }
 
-#hourglass_chart td,
-.charts_block td {
-	padding: 0;
-	empty-cells: show;
+.name_head {
+	color: #555;
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 2;
+	padding: 0 5px;
 }
 
-#pedigree_chart #childbox {
-	border: 1px solid;
-	background-color: #fff;
+.date {
+	color: #337;
 }
 
-.thumbnail {
-	height: auto;
-	padding: 5px;
+.label {
+	font-weight: bold;
 }
 
-#familybook_chart {
-	margin-left: 10px;
+.error {
+	color: #f00;
+	font-weight: bold;
 }
 
-#familybook_chart table {
-	border-collapse: collapse;
-	empty-cells: show;
+.largeError {
+	color: #f00;
+	font-weight: bold;
 }
 
-#familybook_chart td {
-	margin: 0;
-	padding: 0;
+.warning {
+	color: #f00;
+	font-weight: bold;
 }
 
-#familybook_chart h2 {
-	text-align: center;
+.indent {
+	padding-left: 7px;
 }
 
-#familybook_chart .line3,
-#familybook_chart .pvline,
-#familybook_chart .spacer {
-	width: 3px;
+.image {
+	height: 150px;
+	padding: 5px;
+	margin: 2px;
 }
 
-#familybook_chart .line4 {
-	width: 7px;
+.gender_image {
+	margin: 0 3px;
+	border: 0;
 	vertical-align: middle;
 }
 
-[ID^="vline"] {
-	width: 3px;
-}
-
-#familybook_chart h3 {
-	text-align: center;
-}
-
-#familybook_chart .person_box,
-#familybook_chart .person_boxF,
-#familybook_chart .person_boxNN {
+.thumbnail {
+	height: auto;
 	padding: 3px;
 }
 
-#relationship-page h3 {
-	margin: 20px 0 0 20px;
-}
-
-#relationship_chart {
-	margin: 0 20px;
+.icon {
+	border: 0;
+	padding: 0 5px;
 }
 
-.tdtop {
-	vertical-align: top;
+.sublinks_cell {
+	background-color: #ccc;
 }
 
-.tdmid {
+.submenu .icon {
 	vertical-align: middle;
+	width: 20px;
+	height: 20px;
 }
 
-.tdbot,
-.tvertline {
+.subheaders {
+	font-weight: bold;
+	font-size: 15px;
+	margin-top: 15px;
 	vertical-align: bottom;
 }
 
-[dir=rtl] #familybook_chart {
-	margin-right: 10px;
+.age {
+	font-size: 9px;
 }
 
-/*-- pedigree chart rtl specific stylesheets --*/
-[dir=rtl] #pedigree_chart {
-	left: auto;
-	right: 0;
+.parentdeath {
+	padding: 1px;
 }
 
-/* Printer friendliness */
-@media print {
-	.person_box, .person_boxF, .person_boxNN {
-		border: solid #888 1px;
-		background: #fff;
-	}
-
-	#header_accordion1 {
-		width: 510px !important;
-	}
-
-	header,
-	footer,
-	form,
-	#pedigree-page #people,
-	#CB_ALL, label,
-	#separator,
-	.noprint {
-		display: none !important;
-	}
-
-	#familybook_chart h3 {
-		margin-bottom: 10px;
-	}
+.source_citations {
+	display: none;
 }
 
-/* Tabular data */
-.list_table {
-	padding: 3px;
-	margin-left: auto;
-	margin-right: auto;
+.selected-option {
+	background-color: #d6e0ea;
 }
 
-.topbottombar,
-.descriptionbox {
-	font-weight: bold;
-	background-color: #ccc;
-	vertical-align: top;
+.border1 {
+	border: 0;
 }
 
-.optionbox {
-	background-color: #ddd;
-	color: #000;
-	vertical-align: top;
-	white-space: nowrap;
+.menuitem {
+	text-decoration: none;
+	font-size: 11px;
+	padding: 1px;
 }
 
-.facts_label,
-.facts_label03 {
-	background-color: #ccc;
-	width: 20%;
-	text-align: center;
+.menuitem_hover {
+	text-decoration: none;
+	font-size: 11px;
+	padding: 1px;
 }
 
-.facts_value {
-	background-color: #ddd;
+.menuitem .icon, .menuitem_hover .icon {
+	width: 50px;
+	height: 50px;
 }
 
-.list_label,
-.list_value {
-	white-space: nowrap;
+.submenu {
+	text-decoration: none;
+	font-size: 11px;
+	background-color: #eee;
+	border: thin #aaa;
+	visibility: hidden;
+	position: absolute;
+	padding: 5px;
 }
 
-.list_label_wrap,
-.list_value_wrap {
-	white-space: normal;
+.submenuitem  {
+	vertical-align: middle;
+	font-size: 11px;
+	height: 20px;
+	text-decoration: none;
+	background-color: #eee;
+	padding: 1px;
+	white-space: nowrap;
 }
 
-.list_label,
-.list_label_wrap {
-	background-color: #ccc;
+.submenuitem_hover {
+	vertical-align: middle;
+	height: 20px;
+	font-size: 11px;
+	background-color: #eee;
+	white-space: nowrap;
+	padding: 1px;
 }
 
-.list_value,
-.list_value_wrap {
-	background-color: #ddd;
+.submenuitem a,
+.submenuitem_hover a {
+	display: inline-block;
+	vertical-align: middle;
 }
 
 .journal_box {
@@ -786,120 +521,23 @@ div.fact_SHARED_NOTE {
 	overflow: visible;
 }
 
-.news_title {
-	font-weight: bold;
-}
-
-/* Autocomplete styles*/
-.ui-autocomplete-input {
-	background-color: #eea;
-}
-
-.ui-autocomplete {
-	padding: 0;
-	border: thin solid #aaa;
-	background-color: #fff;
-	z-index: 99999;
-	list-style: none outside none;
-	margin: 0;
-	max-height: 200px;
-	overflow-y: auto;
-}
-
-.ui-autocomplete li {
-	margin: 0;
-	padding: 2px 5px;
-	cursor: default;
-	display: block;
-	font: menu;
-	line-height: 14px; /* absolute setting required for firefox? */
-	overflow: hidden;
-}
-
-.ui-autocomplete-loading {
-	background: #fff url(images/indicator.gif) right center no-repeat;
-}
-
-.ui-autocomplete li:nth-child(odd) {
-	background-color: #eee;
-}
-
-.ui-autocomplete a.ui-state-focus {
-	background: #369;
-	color: #fff;
-}
-
-.ui-sortable li {
-	list-style-type: none;
-}
-
-.ui-sortable .noprint {
-	display: none;
-}
-
-.center {
-	text-align: center;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-.nowrap {
-	white-space: nowrap;
-}
-
-.wrap {
-	white-space: normal;
-}
-
-.tabs_table {
-	width: 99%;
-}
-
-.indent {
-	padding-left: 7px;
-}
-
-.image {
-	height: 150px;
-	padding: 5px;
-	margin: 2px;
-}
-
-.icon {
-	padding-left: 0;
-	padding-right: 5pt;
-}
-
-.subheaders {
-	margin-top: 15px;
-	vertical-align: bottom;
-}
-
-.age {
-	font-size: smaller;
-}
-
-.source_citations {
-	display: none;
-}
-
-.selected-option {
-	background-color: #d6e0ea;
+.news_box {
+	background-color: #ccc;
+	border-top: none;
 }
 
-.user_links {
-	white-space: nowrap;
+.news_title {
+	font-weight: bold;
+	font-size: 14px;
 }
 
-.hit-counter {
-	background: #000;
-	color: #fff;
-	font-weight: bold;
+.news_date {
+	margin-bottom: 12px;
 }
 
 .current_day {
 	font-weight: bold;
-	font-size: larger;
+	font-size: 16px;
 }
 
 .cal_day {
@@ -923,126 +561,57 @@ div.fact_SHARED_NOTE {
 	clear: both;
 }
 
-/*-- descendancy chart specific stylesheets --*/
-#descendancy_chart {
-	margin: 20px;
-}
-
-#descendancy_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	margin: 0 0 5px 15px;
-	padding: 0 15px;
-}
-
-#descendancy_chart li {
-	list-style: none;
-	margin: 0 0 0 -13px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-li .person_box,
-li .person_boxF {
-	margin: 3px 0;
-}
-
-#descendancy_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-#descendancy_chart td.details1 {
-	padding-top: 5px;
-}
-
-/*-- descendancy chart rtl specific stylesheets --*/
-[dir=rtl] #descendancy_chart ul {
-	background-position: right top;
-	left: auto;
-	margin: 0 15px 0 0;
-}
-
-[dir=rtl] #descendancy_chart li {
-	margin: 0 -13px 0 0;
-	padding: 0 2px 0 0;
-	left: auto;
-}
-
-/*-- ancestry chart specific stylesheets --*/
-#ancestry_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	display: block;
-	margin: 0 0 0 15px;
-	padding: 0 15px;
-}
-
-#ancestry_chart li {
-	list-style: none;
-	margin: 0 0 2px -13px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
+#my-page h1 {
+	margin: 0.25em auto 0.6em;
 }
 
-#ancestry_chart li table {
-	margin: 5px 0;
+.tdtop {
+	vertical-align: top;
 }
 
-/*-- ancestry chart rtl specific stylesheets --*/
-[dir=rtl] #ancestry_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
+.tdmid {
+	vertical-align: middle;
 }
 
-#ancestry_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
+.tdbot,
+.tvertline {
+	vertical-align: bottom;
 }
 
-[dir=rtl] #ancestry_chart li {
-	margin: 0 -13px 0 0;
-	padding: 0 2px 0 0;
-	left: auto;
+.line1,
+.line2,
+.line3 {
+	vertical-align: middle;
 }
 
-#compact_chart,
-#fan_chart,
-#ancestry_chart,
-#familybook_chart,
-#hourglass_chart {
-	margin: 20px;
+.line5 {
+	vertical-align: top;
 }
 
-.fan_chart_menu {
+#childbox {
+	padding: 5px;
 	position: absolute;
 	display: none;
-	z-index: 100;
-}
-
-#fan_chart ul {
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-	color: #369;
+	text-align: start;
+	white-space: nowrap;
+	top: 20px;
+	left: 0;
 }
 
-#fan_chart ul.children li:before {
-	content: "< ";
-	font-weight: bold;
+[dir=rtl] #childbox {
+	left: auto;
+	right: 0;
 }
 
-#fan_chart_img {
-	text-align: center;
+.layout3 #childbox {
+	top: auto;
+	bottom: 20px;
 }
 
-#timeline_chart {
-	position: relative;
-	top: 0;
-	left: 0;
+#childbox a.name1 {
+	/*	font-weight: normal;*/
+	display: block;
+	margin-left: 5px;
 }
 
 .person0 {
@@ -1077,7 +646,6 @@ li .person_boxF {
 
 .listlog {
 	line-height: 20pt;
-	color: #555;
 }
 
 .starredname {
@@ -1092,11 +660,32 @@ li .person_boxF {
 	font-weight: 600;
 }
 
+.topbottombar,
+.descriptionbox {
+	font-weight: bold;
+	background-color: #ccc;
+	vertical-align: top;
+}
+
+.descriptionbox {
+	font-size: 14px;
+	background-color: #ccc;
+	vertical-align: top;
+	padding: 3px;
+}
+
+.optionbox {
+	background-color: #ddd;
+	color: #000;
+	vertical-align: top;
+	white-space: nowrap;
+	padding: 3px;
+}
+
 .vmiddle {
 	vertical-align: middle;
 }
 
-/* Colors */
 .red {
 	color: #f00;
 }
@@ -1106,7 +695,6 @@ li .person_boxF {
 	opacity: 0.8;
 }
 
-/* Width settings */
 .width10 {
 	width: 10%;
 }
@@ -1163,16 +751,29 @@ li .person_boxF {
 	width: 100%;
 }
 
-/* Font sizes */
 .font9 {
-	font-size: smaller;
+	font-size: 9px;
+}
+
+.font11 {
+	font-size: 11px;
 }
 
-/* Message box */
 .messagebox {
 	background-color: #bce;
 }
 
+/* ---Pending edits--- */
+.new {
+	border: solid #00f 1px;
+	overflow: hidden;
+}
+
+.old {
+	border: solid #f00 1px;
+	overflow: hidden;
+}
+
 a.showit {
 	position: relative;
 	z-index: 24;
@@ -1196,74 +797,120 @@ a.showit:hover > span {
 	top: 22px;
 	left: 0;
 	width: 225px;
-	border-left: 15px outset #222;
 	border-top: 2px solid #222;
-	border-bottom: 2px solid #000;
 	border-right: 2px solid #000;
+	border-bottom: 2px solid #000;
+	border-left: 15px outset #222;
 	padding: 3px;
 	background: #555;
 	color: #fff;
+	font-size: 15px;
 	text-align: left;
 	opacity: .85;
 	z-index: 5;
 }
 
-.lifespan_people span:first-letter {
-	font-variant: small-caps;
-	padding: 1px;
+.tag_cloud {
+	text-align: center;
 }
 
-.lifespan_outer {
-	position: relative;
-	width: 99.5%;
-	height: 600px;
-	overflow: hidden;
+.tag_cloud a {
+	white-space: nowrap;
 }
 
-.lifespan_outer a {
-	color: #000;
+/* ---Autocomplete styles--- */
+.ui-autocomplete-input {
+	background-color: #eea;
 }
 
-.lifespan_timeline {
-	position: absolute;
-	width: 100%;
-	left: -10px;
-	top: -65px;
-	z-index: 2;
+.ui-autocomplete {
+	padding: 0;
+	border: thin solid #aaa;
 	background-color: #fff;
+	z-index: 99999;
+	list-style: none outside none;
+	margin: 0;
+	max-height: 200px;
+	overflow-x: hidden;
+	overflow-y: scroll;
 }
 
-.lifespan_people {
-	position: absolute;
-	width: 500px;
-	left: -10px;
-	top: -60px;
-	z-index: 1;
+.ui-autocomplete li {
+	margin: 0;
+	padding: 2px 5px;
+	font-size: 12px;
+	cursor: default;
+	display: block;
+	/* if width will be 100% horizontal scrollbar will apear when scroll mode will be used */
+	/* width: 100%; */
+	font: menu;
+	/* it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */
+	line-height: 14px;
+	overflow: hidden;
 }
 
-.tag_cloud a {
+.ui-autocomplete-loading {
+	background: #fff url(images/indicator.gif) right center no-repeat;
+}
+
+.ui-autocomplete li:nth-child(odd) {
+	background-color: #eee;
+}
+
+.ui-autocomplete a.ui-state-focus {
+	background: #369;
+	color: #fff;
+}
+
+.ui-sortable li {
+	list-style-type: none;
+}
+
+.ui-sortable .noprint {
+	display: none;
+}
+
+/* ---End of Autocomplete styles--- */
+
+.nowrap {
 	white-space: nowrap;
 }
 
-.clearfloat {
-	clear: both;
+.wrap {
+	white-space: normal;
 }
 
-dl {
-	margin: 0;
+.statistics-page {
+	text-align: center;
 }
 
-dt {
+.center2 {
+	text-align: center;
+}
+
+.gchart {
+	border: 0;
+}
+
+/* ---Find special characters--- */
+.largechars {
+	font-family: monospace;
+	font-size: 200%;
+}
+
+#facts_content dd {
 	float: left;
-	font-weight: bold;
-	margin-right: 10px;
+	width: 70%;
+}
+
+.clearfloat {
 	clear: both;
 }
 
-[dir=rtl] dt {
-	float: right;
-	margin-right: auto;
-	margin-left: 10px;
+/* this keeps the tag color the same when it is a link as when not */
+
+.place {
+	padding-top: 5px;
 }
 
 #pending h2 {
@@ -1276,6 +923,7 @@ dt {
 	margin-top: 20px;
 }
 
+/* ======== Person box ======= */
 .gedcom_favorites_block,
 .user_favorites_block,
 .person_box_template {
@@ -1304,11 +952,11 @@ dt {
 	height: auto;
 }
 
-.person_box_template .namedef i {
+.person_box_template .namedef i[class^="icon-sex"] {
 	margin-left: 3px;
 }
 
-[dir=rtl] .person_box_template .namedef i {
+[dir=rtl] .person_box_template .namedef i[class^="icon-sex"] {
 	margin-right: 3px;
 }
 
@@ -1335,11 +983,11 @@ dt {
 	overflow: hidden;
 }
 
-.person_box_template a.gallery img {
+.person_box_template img,
+.person_box_template a.gallery {
 	float: left;
 	height: 50px;
-	margin: 0 3px 0 0;
-	padding: 0;
+	margin: 0 4px 0 0;
 	max-width: 80px;
 	width: auto;
 }
@@ -1347,7 +995,7 @@ dt {
 [dir=rtl] .person_box_template img,
 [dir=rtl] .person_box_template a.gallery {
 	float: right;
-	margin: 0 0 0 3px;
+	margin: 0 0 0 4px;
 }
 
 .person_box_template i[class^="icon-silhouette"] {
@@ -1364,24 +1012,77 @@ dt {
 	margin: 0 auto;
 }
 
-#medialist-page .list_table_controls {
+#medialist-page form .list_table {
+	width: 75%;
+}
+
+#medialist-page div .list_table,
+#medialist-page .media-col,
+#medialist-page .media-col1,
+#medialist-page .list_value_wrap,
+#medialist-page div .list_table_controls {
 	width: 100%;
 }
 
+#medialist-page .optionbox, 
+#medialist-page .descriptionbox {
+	width: 25%;
+}
+
+#medialist-page .media-col2 {
+	width: 50%;
+}
+
+#medialist-page .media-col {
+	padding-left: 5px; 
+	border: none;
+}
+
+[dir=rtl] #medialist-page .media-col {
+	padding-left: 0;
+	padding-right: 5px;
+}
+
+#medialist-page .media-image {
+	vertical-align:top; 
+	white-space:normal;
+}
+
+#medialist-page p {
+	text-align: center;
+}
+
 .list_table_controls td {
 	min-width: 40px;
 	text-align: center;
 }
+/* ======== medialist.php ==== */
+.makeMenu li ul {
+	border: thin solid #AAA;
+	position: absolute;
+	margin:0;
+}
+
+.makeMenu, .makeMenu li ul {
+	padding: 1px;
+}
+
+.makeMenu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
+}
 
-/* ============== medialist.php ======================= */
 .lb-menu {
 	display: inline-block;
 	margin: 0;
+	list-style: none;
 }
 
 .lb-menu ul {
 	display: block;
 	list-style-type: none;
+	margin: 0;
 }
 
 .lb-menu > li {
@@ -1403,27 +1104,32 @@ dt {
 	top: 36px;
 }
 
-.lb-menu li a {
-	padding-top: 24px;
+.lb-menu a {
+	display: block;
 }
 
-.lb-menu li li a {
-	padding: 1px 10px 1px 5px;
+.lb-menu li a {
+	padding: 0px 10px 1px 5px;
 }
 
-.makeMenu.lb-menu li:before {
-	content: "";
+.lb-menu li li a {
+	background-color: #fff;
+	padding: 5px 10px 5px 5px;
 }
 
-.lb-image_edit, .lb-image_link {
-	padding-right: 5px;
+.lb-menu li {
+	border: 0;
 }
 
 [dir=rtl] .lb-menu > li {
 	float: right;
 }
 
-/* ============== login.php ======================= */
+.lb-image_edit, .lb-image_link {
+	padding-right: 5px;
+}
+
+/* login.php */
 #login-register-page h2 {
 	text-align: center;
 }
@@ -1435,6 +1141,7 @@ dt {
 
 #login-register-page .back {
 	font-weight: bold;
+	font-size: 14px;
 	text-align: center;
 }
 
@@ -1446,9 +1153,11 @@ dt {
 
 #login-register-page .confirm p {
 	font-weight: bold;
+	font-size: 14px;
 }
 
 #login-register-page .confirm p + p {
+	font-size: 12px;
 	font-weight: normal;
 }
 
@@ -1477,12 +1186,16 @@ dt {
 	padding: 5px;
 }
 
+#register-form,
+#verify-form {
+	width: 440px;
+}
+
 #login-form div,
 #login-form div a,
 #new_passwd_form div,
 #register-form div,
 #verify-form div {
-	font-weight: bold;
 	margin: auto;
 	padding: 5px;
 	text-align: center;
@@ -1502,6 +1215,11 @@ dt {
 	margin: 0 10px;
 }
 
+#register-form p,
+#verify-form p {
+	text-align: left;
+}
+
 #new_passwd_form h4,
 #register-form h4 {
 	font-weight: normal;
@@ -1518,6 +1236,7 @@ dt {
 #register-form textarea {
 	width: 220px;
 	margin: 0 10px;
+	padding: 3px;
 }
 
 #register-form label select {
@@ -1546,7 +1265,17 @@ dt {
 	text-align: left;
 }
 
-/* ============== reportengine.php ======================= */
+[dir=rtl] #register-form div,
+[dir=rtl] #verify-form div {
+	text-align: left;
+}
+
+[dir=rtl] #register-form p, 
+[dir=rtl] #verify-form p {
+	text-align: right;
+}
+
+/* --- reportengine.php --- */
 #reportengine-page table {
 	margin: 20px auto;
 }
@@ -1567,130 +1296,51 @@ dt {
 	text-align: center;
 }
 
-.gedcom_favorites_block .person_box,
-.gedcom_favorites_block .person_boxF,
-.gedcom_favorites_block .person_boxNN {
-	height: auto;
-}
-
-.user_favorites_block .person_box,
-.user_favorites_block .person_boxF,
-.user_favorites_block .person_boxNN {
-	height: auto;
-}
-
-/* ============= Statistics block ============ */
-.gedcom_stats_block table td {
-	vertical-align: top;
-}
-
-.gedcom_stats_block table td td {
-	vertical-align: middle;
-}
-
-.gedcom_stats_block td .stats_value {
-	text-align: center;
-}
-
-/* ============= Theme select block ============ */
-.theme_form ul {
-	margin: -10px auto;
-}
-
-.theme_form li {
-	visibility: hidden;
-}
-
-.theme_form li ul li {
-	display: inline-block;
-	padding: 10px;
-	visibility: visible;
-}
-
-/* ======= Favourites block ========== */
-.blockcontent .person_box_template .details2 {
-	min-height: 40px;
-}
-
-.blockcontent [class*='box-style2'] {
-	margin: 5px 0;
-}
-
-.add_fav_head {
-	font-weight: 900;
-	margin: 5px 0;
-}
-
-.add_fav_head i {
-	margin: 0 5px 1px;
-}
-
-.add_fav_ref label {
-	display: inline-block;
-	min-width: 100px;
-}
-
-.add_fav_ref label:after {
-	content: ":";
-}
-
-.add_fav_ref input {
-	margin: 0 5px;
-}
-
+/* styles for popup menus */
 .itr {
-	position: absolute;
+	position: relative;
 	line-height: 1.5;
 }
 
-.block .itr,
-#family-table .itr,
-#ancestry_chart .itr,
-#descendancy_chart .itr,
-#familybook_chart .itr,
-#hourglass_chart .itr,
-#relatives_content .itr {
-	position: relative;
-	top: 0;
+.popup {
+	position: absolute;
+	top: 20px;
+	right: 0;
+	left: auto;
+	visibility: hidden;
+	opacity: 0;
+	transition: visibility 0s ease .25s,opacity .25s ease;
+	z-index: 9999;
+	-webkit-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	-moz-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
 }
 
-.popup {
-	display: none;
+[dir=rtl] .popup {
+	left: 0;
+	right: auto;
 }
 
 .popup ul {
-	background-image: none !important;
-	font-size: smaller;
+	white-space: nowrap;
 	list-style: none;
 	margin: 0;
 	padding: 0 10px;
+	font-size: smaller;
 }
 
-.popup li {
-	padding: 1px 5px;
+.popup > ul {
+	padding: 2px 10px;
 }
 
-.popup li span {
+.popup li .NAME {
 	padding: 0 5px;
 }
 
-.popup li ul,
-.popup li ul li,
-.popup li span span {
-	padding: 0;
-}
-
 .itr:hover .popup {
-	display: block;
-	position: absolute;
-	width: 160px;
-	right: 0;
-	z-index: 9999;
-}
-
-[dir=rtl] .itr:hover .popup {
-	left: 0;
-	right: auto;
+	visibility: visible;
+	opacity: 1;
+	transition-delay: 0s;
 }
 
 /* styles for FindFacts pop-up */
@@ -1761,7 +1411,348 @@ dt {
 	text-align: center;
 }
 
-/* FAQ table styles */
+/* ======== List styles ====== */
+.source-list,
+.note-list,
+.repo-list,
+.media-list,
+.indi-list,
+.fam-list {
+	margin: 5px auto;
+	visibility: hidden;
+	width: 98%;
+}
+
+.recent_changes_block,
+.upcoming_events_block,
+.todays_events_block,
+.todo_block {
+	width: 98%;
+}
+
+.surname-list,
+.givn-list {
+	margin: 5px auto;
+}
+
+.source-list table,
+.note-list table,
+.repo-list table,
+.media-list table,
+.indi-list table,
+.fam-list table {
+	width: 100%;
+}
+
+.source-list td,
+.note-list td,
+.repo-list td,
+.media-list td,
+.indi-list td,
+.fam-list td,
+.recent_changes_block td,
+.upcoming_events_block td,
+.surname-list td,
+.givn-list td {
+	padding: 2px 5px;
+}
+
+.indi-list td,
+.fam-list td {
+	color: #555;
+}
+
+.surname-list td {
+	vertical-align: top;
+}
+
+.indi-list .stats,
+.fam-list .stats {
+	margin: 0 auto;
+	width: auto;
+}
+
+.source-list th,
+.note-list th,
+.repo-list th,
+.media-list th,
+.indi-list th,
+.fam-list th,
+.recent_changes_block th,
+.upcoming_events_block th,
+.todays_events_block th,
+.todo_block th,
+.yahrzeit_block th,
+.surname-list th,
+.givn-list th {
+	cursor: pointer;
+	font-weight: 600;
+	padding: 2px 4px;
+	white-space: nowrap;
+}
+
+.source-list th:last-child,
+.note-list th:last-child,
+.repo-list th:last-child {
+	margin: 0 -2px 1px 1px;
+	padding: 3px 0 4px;
+	width: 24px;
+}
+
+.givn-list th {
+	cursor: pointer;
+	white-space: nowrap;
+	padding: 2px;
+	text-align: center;
+}
+
+#source-details h2,
+#sourcelist-page h2,
+#note-details h2,
+#notelist-page h2,
+#repo-details h2,
+#repolist-page h2,
+#media-details h2,
+#medialist-page h2,
+#statistics-page h2 {
+	margin-bottom: 20px;
+	text-align: center;
+}
+
+#source-tabs,
+#note-tabs,
+#repo-tabs,
+#media-tabs {
+	margin: auto;
+	visibility: hidden;
+	width: 80%;
+}
+
+#statistics_chart {
+	margin: auto;
+	visibility: hidden;
+	width: 90%;
+}
+
+#source-edit,
+#note-edit,
+#repo-edit,
+#media-edit {
+	overflow-x: auto;
+}
+
+.media-list td img {
+	display: block;
+	height: 40px;
+	width: auto;
+	margin: 3px auto;
+}
+
+.filtersH,
+.filtersF {
+	margin: 4px;
+}
+
+.filtersH img {
+	margin-bottom: 2px;
+}
+
+.loading-image {
+	background: transparent url(images/loading.gif) 50% 50% no-repeat;
+	height: 50px;
+	margin: 50px;
+}
+
+.list-charts {
+	text-align: center;
+}
+
+#search-result-tabs,
+#places-tabs {
+	margin: auto;
+	width: 98%;
+	visibility: hidden;
+}
+
+#search-result-tabs h3 {
+	text-align: center;
+}
+
+#searchAccordion-indi,
+#searchAccordion-fam,
+#searchAccordion-source,
+#searchAccordion-note {
+	margin: auto;
+	width: 99%;
+}
+
+#place-hierarchy h2,
+#place-hierarchy h4 {
+	text-align: center;
+}
+
+[dir=rtl] .source-list th:last-child,
+[dir=rtl] .note-list th:last-child,
+[dir=rtl] .repo-list th:last-child {
+	margin: 0 1px 1px -2px;
+}
+
+/* ======== Block styles ===== */
+#index_main_blocks {
+	clear: none;
+	width: 60%;
+	float: left;
+}
+
+#index_small_blocks {
+	clear: none;
+	width: 40%;
+	float: right;
+}
+
+#index_full_blocks {
+	clear: none;
+	width: 100%;
+}
+
+[dir=rtl] #index_main_blocks {
+	float: right;
+}
+
+[dir=rtl] #index_small_blocks {
+	float: left;
+}
+
+.small_inner_block {
+	max-height: 200px;
+	overflow: auto;
+}
+
+.normal_inner_block {
+	overflow: auto;
+}
+
+.block {
+	background-color: #eee;
+	padding: 3px;
+	vertical-align: top;
+}
+
+.blockcontent {
+	margin: 5px;
+	overflow: auto;
+}
+
+.blockcontent .list_table {
+	border-spacing: 0;
+	border-right: 0;
+}
+
+.blockcontent .list_value,
+.blockcontent .list_value_wrap {
+	border: 0;
+}
+
+.blockheader {
+	font-weight: bold;
+}
+
+/* end Block styles */
+
+#main_select,
+#available_select,
+#right_select {
+	min-width: 150px;
+}
+
+.user_welcome_block table,
+.gedcom_block_block table {
+	margin: auto;
+}
+
+.user_welcome_block td,
+.gedcom_block_block td {
+	width: 33%;
+	text-align: center;
+	vertical-align: top;
+}
+
+/* Random picture block */
+#random_picture {
+	text-align: center;
+}
+
+#random_picture_box {
+	width: 100%;
+}
+
+/* ==== Favourites block ===== */
+.blockcontent .person_box_template .details2 {
+	min-height: 40px;
+}
+
+.blockcontent [class*='box-style2'] {
+	margin: 5px 0;
+}
+
+.add_fav_head {
+	font-weight: 900;
+	margin: 5px 0;
+}
+
+.add_fav_head i {
+	margin: 0 5px 1px;
+}
+
+.add_fav_ref label {
+	display: inline-block;
+	min-width: 100px;
+}
+
+.add_fav_ref label:after {
+	content: ":";
+}
+
+.add_fav_ref input {
+	margin: 0 5px;
+}
+
+/* === Who is online block === */
+.logged_in_list {
+	margin: 5px 0 0;
+	padding: 0;
+	line-height: 20px;
+}
+
+/* Statistics block */
+.gedcom_stats_block table td {
+	vertical-align: top;
+}
+
+.gedcom_stats_block table td td {
+	vertical-align: middle;
+}
+
+.gedcom_stats_block td .stats_value {
+	text-align: center;
+}
+
+/* ==== Theme select block === */
+.theme_form ul {
+	margin: -10px auto;
+}
+
+.theme_form li {
+	visibility: hidden;
+}
+
+.theme_form li ul li {
+	display: inline-block;
+	padding: 10px;
+	visibility: visible;
+}
+
+/* ==== FAQ table styles ===== */
 table.faq {
 	background-color: #ddd;
 	margin: 5px 0 50px 5px;
@@ -1774,21 +1765,21 @@ table.faq tr.odd td {
 
 div.faq_title {
 	background-color: #ddd;
-	margin: 12px 0 0 12px;
-	padding: 3px;
+	margin: 1em 0;
+	padding: .25em;
 	font-weight: bold;
 	width: 98%;
 }
 
 div.faq_body {
 	clear: both;
-	margin: 12px 0;
-	padding: 12px;
+	padding: 0 1em;
 }
 
 .faq_italic {
 	font-style: italic;
 	font-weight: bold;
+	font-size: 90%;
 	padding: 0 10px;
 }
 
@@ -1808,20 +1799,7 @@ div.faq_body {
 	float: left;
 }
 
-ul.clist {
-	list-style-image: none;
-	text-decoration: none;
-	color: #000;
-	margin: 0;
-}
-
-/* Find special characters */
-.largechars {
-	font-family: monospace;
-	font-size: xx-large;
-}
-
-/* ========= Positioning edit, copy, delete links ============= */
+/* === Positioning edit, copy, delete links === */
 /* General use */
 .editfacts {
 	clear: left;
@@ -1829,10 +1807,6 @@ ul.clist {
 }
 
 /* a container for the following three links */
-.editfacts a:hover,
-.field a:hover {
-	background-color: transparent !important;
-}
 
 .editlink,
 .copylink,
@@ -1850,7 +1824,7 @@ span.link_text {
 	display: none;
 }
 
-/* Indi header */
+/* ======== Indi header ====== */
 .field .editlink,
 .field .deletelink,
 .field .copylink {
@@ -1862,10 +1836,6 @@ span.link_text {
 	float: left;
 }
 
-/* =========== end edit, copy, delete links ==================== */
-
-/* =========== Indi header ================== */
-
 #indi_header {
 	overflow: hidden;
 	border-radius: 4px;
@@ -1875,6 +1845,7 @@ span.link_text {
 
 #indi_header h3 {
 	color: #369;
+	font-size: 90%;
 	font-weight: bold;
 	margin: 0;
 	padding: 0 10px 0 30px;
@@ -1884,14 +1855,38 @@ span.link_text {
 }
 
 #indi_header .name_one {
-	font-size: larger;
+	font-size: 1.5em;
+}
+
+#indi_header h3 .details1 {
+	font-size: 1.0em;
+}
+
+#indi_header h3.person_box,
+#indi_header h3.person_boxF,
+#indi_header h3.person_boxNN {
+	border: 0;
 }
 
 #indi_header h3 .header_age {
 	padding: 5px 0 5px 5px;
 	float: right;
 	font-weight: normal;
-	font-size: smaller;
+	font-size: 65%;
+}
+
+#indi_header h3 a {
+	display: inline;
+}
+
+#indi_header a {
+	color: #337;
+	font-size: 0.75em;
+	font-weight: normal;
+}
+
+#indi_header a:hover {
+	color: #f00;
 }
 
 #indi_mainimage {
@@ -1899,10 +1894,14 @@ span.link_text {
 }
 
 #header_accordion1 {
-	padding: 0 10px;
+	padding: 0 10px 0 0;
 	overflow: hidden;
 }
 
+[dir='rtl'] #header_accordion1 {
+	padding: 0 0 0 10px;
+}
+
 #header_accordion1 .indi_name_details {
 	margin: 0;
 	overflow: hidden;
@@ -1913,13 +1912,50 @@ span.link_text {
 	content: ":";
 }
 
+.indi_name_details .name1 {
+	font-weight: normal;
+	padding-top: 5px;
+	font-size: inherit;
+}
+
+#indi_header a.warning {
+	color: #f00;
+	font-size: 1em;
+}
+
 #indi_note {
 	margin: 0 0 5px;
 }
 
+.indi_table {
+	clear: left;
+}
+
+#sex {
+	float: right;
+}
+
+#dates {
+	color: #369;
+	float: right;
+}
+
+dd .editlink,
+dd .deletelink {
+	float: right;
+}
+
 #indi_note .fact_NOTE {
 	float: left;
-	margin: 0 10px 0 0;
+	margin: 0 5px 0 0;
+}
+
+#indi_note .fact_SOUR {
+	margin: 3px 0;
+}
+
+#indi_note .fact_SOUR a {
+	font-size: 100%;
 }
 
 #indi_note .fact_NOTE,
@@ -1944,29 +1980,6 @@ span.link_text {
 .markdown th {
 	border: solid thin #000;
 	padding: 3px;
-	font-size: 10px;
-}
-
-.indi_table {
-	clear: left;
-}
-
-#sex {
-	float: right;
-}
-
-#dates {
-	color: #369;
-	float: right;
-}
-
-dd .editlink,
-dd .deletelink {
-	float: right;
-}
-
-[dir=rtl] #indi_header {
-	float: right;
 }
 
 [dir=rtl] #indi_header h3 {
@@ -1979,10 +1992,6 @@ dd .deletelink {
 	float: left;
 }
 
-[dir=rtl] #main_name {
-	float: right;
-}
-
 [dir=rtl] #indi_mainimage {
 	float: left;
 }
@@ -2009,7 +2018,13 @@ dd .deletelink {
 	float: left;
 }
 
-/* INDI IMAGE SPRITE */
+.hit-counter {
+	background: #000;
+	color: #fff;
+	font-weight: bold;
+}
+
+/* ======= General sprite ==== */
 .male_gender,
 .female_gender,
 .unknown_gender,
@@ -2056,7 +2071,7 @@ dd .deletelink {
 	height: 16px;
 }
 
-/* =========== Indi tabs ================== */
+/* ======== Indi tabs ======== */
 /* Facts & Events tab */
 #personal_facts_content .fact_NOTE,
 #personal_facts_content .fact_SOUR,
@@ -2097,7 +2112,7 @@ dd .deletelink {
 	padding-right: 5px;
 }
 
-/* Album tab */
+/* ======== Album tab =========*/
 .album-list {
 	list-style-type: none;
 }
@@ -2130,13 +2145,17 @@ dd .deletelink {
 	width: 100%;
 }
 
-/* ========= jquery-ui.custom.css changes ============ */
+/* === jquery-ui.css changes === */
 .ui-tabs .ui-tabs-panel {
 	background-color: #eee;
 	border-radius: 4px;
 	padding: 4px;
 }
 
+.ui-widget {
+    font-size: 1em;
+}
+
 .ui-accordion .ui-accordion-header .ui-icon {
 	position: absolute;
 	left: 6px;
@@ -2181,11 +2200,11 @@ dd .deletelink {
 }
 
 [dir=rtl] .ui-dialog-titlebar-close {
-	left: 4px;
+	left: .3em;
 	right: auto;
 }
 
-/* ========= jQuery.datatable styling over-rides ============ */
+/* === jQuery.datatable styling general over-rides === */
 .odd {
 	background-color: LightGrey;
 }
@@ -2209,22 +2228,22 @@ dd .deletelink {
 
 .dataTables_paginate {
 	float: left;
-	margin: 5px;
+	margin-bottom: 3px;
 }
 
 .dataTables_processing {
 	float: left;
-	margin: 5px;
 }
 
 .dataTables_filter {
 	float: right;
-	margin: 4px;
+	font-weight: normal;
 }
 
 .dataTables_info {
 	float: left;
-	margin: 5px;
+	font-weight: normal;
+	padding: 4px;
 }
 
 .recent_changes_block .dataTables_info,
@@ -2242,12 +2261,12 @@ dd .deletelink {
 
 .upcoming_events_block button,
 .todays_events_block button {
-	margin: 5px 20px;
+	margin: 0 20px;
 }
 
 .dataTables_length {
 	float: right;
-	margin: 5px;
+	font-weight: normal;
 }
 
 .dataTables_length select,
@@ -2255,10 +2274,6 @@ dd .deletelink {
 	padding: 1px;
 }
 
-.ui-widget-header {
-	font-weight: normal;
-}
-
 .dt-clear {
 	clear: both;
 }
@@ -2280,6 +2295,10 @@ dd .deletelink {
 	top: 50%;
 }
 
+.dataTables_wrapper {
+	margin-bottom: 10px;
+}
+
 [dir=rtl] .css_right {
 	float: right;
 }
@@ -2314,190 +2333,10 @@ dd .deletelink {
 	margin-right: -20px;
 }
 
-/* ========= List styles ================= */
-.source-list,
-.note-list,
-.repo-list,
-.media-list,
-.indi-list,
-.fam-list {
-	margin: 5px auto;
-	visibility: hidden;
-	width: 98%;
-}
-
-.surname-list,
-.givn-list {
-	margin: 5px auto;
-}
-
-.source-list table,
-.note-list table,
-.repo-list table,
-.media-list table,
-.indi-list table,
-.fam-list table {
-	width: 100%;
-}
-
-.source-list td,
-.note-list td,
-.repo-list td,
-.media-list td,
-.indi-list td,
-.fam-list td,
-.recent_changes_block td,
-.upcoming_events_block,
-.surname-list td,
-.givn-list td {
-	padding: 2px 5px;
-}
-
-.indi-list td,
-.fam-list td {
-	color: #555;
-}
-
-.surname-list td {
-	vertical-align: top;
-}
-
-.indi-list .stats,
-.fam-list .stats {
-	margin: 0 auto;
-	width: auto;
-}
-
-.source-list th,
-.note-list th,
-.repo-list th,
-.media-list th,
-.indi-list th,
-.fam-list th,
-.recent_changes_block th,
-.upcoming_events_block th,
-.todays_events_block th,
-.todo_block th,
-.yahrzeit_block th,
-.surname-list th,
-.givn-list th {
-	cursor: pointer;
-	white-space: nowrap;
-}
-
-.source-list th:last-child,
-.note-list th:last-child,
-.repo-list th:last-child {
-	margin: 0 -2px 1px 1px;
-	padding: 3px 0 4px;
-	width: 24px;
-}
-
-.givn-list th {
-	cursor: pointer;
-	white-space: nowrap;
-	padding: 2px;
-	text-align: center;
-}
-
-#source-details h2,
-#sourcelist-page h2,
-#note-details h2,
-#notelist-page h2,
-#repo-details h2,
-#repolist-page h2,
-#media-details h2,
-#medialist-page h2,
-#statistics-page h2 {
-	margin-bottom: 20px;
-	text-align: center;
-}
-
-#source-tabs,
-#note-tabs,
-#repo-tabs,
-#media-tabs {
-	margin: auto;
-	visibility: hidden;
-	width: 80%;
-}
-
-#statistics_chart {
-	margin: auto;
-	visibility: hidden;
-	width: 90%;
-}
-
-#source-edit,
-#note-edit,
-#repo-edit,
-#media-edit {
-	overflow-x: auto;
-}
-
-.media-list td img {
-	display: block;
-	height: 40px;
-	width: auto;
-	margin: 3px auto;
-}
-
-.filtersH,
-.filtersF {
-	margin: 4px;
-}
-
-.filtersH img {
-	margin-bottom: 2px;
-}
-
-.filtersH .ui-state-default,
-.filtersF .ui-state-default {
-	margin: 0 2px;
-	padding: 2px;
-}
-
-.loading-image {
-	background: transparent url(images/loading.gif) 50% 50% no-repeat;
-	height: 50px;
-	margin: 50px;
-}
-
-#search-result-tabs,
-#places-tabs {
-	margin: auto;
-	width: 98%;
-	visibility: hidden;
-}
-
-#search-result-tabs h3 {
-	text-align: center;
-}
-
-#searchAccordion-indi,
-#searchAccordion-fam,
-#searchAccordion-source,
-#searchAccordion-note {
-	margin: auto;
-	width: 99%;
-}
-
-#place-hierarchy h2,
-#place-hierarchy h4 {
-	text-align: center;
-}
-
-[dir=rtl] .source-list th:last-child,
-[dir=rtl] .note-list th:last-child,
-[dir=rtl] .repo-list th:last-child {
-	margin: 0 1px 1px -2px;
-}
-
-/* ========= Sidebar ============== */
+/* ======= Sidebar setup ===== */
 #main {
 	min-width: 600px;
 	width: 100%;
-	padding: 3px 0 0;
 	display: table;
 	table-layout: fixed;
 }
@@ -2506,21 +2345,30 @@ dd .deletelink {
 	display: table-cell;
 }
 
+#indi_left .ui-tabs-panel {
+	padding: 0;
+}
+
+#indi_left .ui-tabs-nav {
+	margin: 0 2px;
+}
+
 #tabs {
-	width: 98%;
-	overflow: visible;
 	padding-bottom: 0;
 	margin-bottom: 0;
+	width: 98%;
+	overflow: visible;
 }
 
 [dir=rtl] #tabs {
 	float: right;
 }
 
+/* sidebar */
 #sidebar {
+	width: 20%;
 	display: table-cell;
 	vertical-align: top;
-	width: 20%;
 }
 
 #separator {
@@ -2534,19 +2382,19 @@ dd .deletelink {
 #separator:after {
 	position: absolute;
 	top: 0;
-	left: auto;
 	right: 0;
+	left: auto;
 	width: 10px;
 	height: 99999px;
 	content: "";
 	border: 1px solid #aaa;
-	border-top-left-radius: 4px;
-	border-top-right-radius: 4px;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
 }
 
 [dir=rtl] #separator:after {
-	left: 0;
 	right: auto;
+	left: 0;
 }
 
 .separator-hidden:after,
@@ -2567,30 +2415,33 @@ dd .deletelink {
 	text-align: center;
 }
 
-/* ============== Sidebar content items ============== */
+/* Sidebar content items */
 /* Family navigator */
 #sb_content_family_nav {
 	padding: 0;
 }
 
 #sb_family_nav_content {
-	margin-top: 2px;
+	margin-top: 8px;
 }
 
-.nav_content {
-	width: 100%;
-	padding: 10px 0;
+.nam a:hover {
+	color: #f00;
 }
 
-.famnav_link div {
-	padding: 0;
+.nav_content {
 	width: 100%;
+	padding: 0;
 }
 
 .nav_content .facts_label {
 	width: 75px;
 }
 
+#sb_family_nav_content .clist {
+	margin: 0;
+}
+
 .famnav_title {
 	font-weight: bold;
 	display: block;
@@ -2614,7 +2465,7 @@ dd .deletelink {
 }
 
 .flyout2 {
-	font-weight: 700;
+	font-weight: bold;
 }
 
 .flyout3 {
@@ -2626,10 +2477,14 @@ dd .deletelink {
 	text-decoration: underline;
 }
 
-/* Descendancy */
+/* Sidebar*/
+#sb_content_descendancy {
+	margin-top: 5px;
+}
+
 #sb_desc_content {
-	margin-left: 4px;
-	font-size: smaller;
+	margin-left: 3px;
+	font-size: 0.8em;
 }
 
 #sb_desc_content ul {
@@ -2661,21 +2516,27 @@ dd .deletelink {
 	margin-left: 0;
 }
 
-/* Individuals, Families */
+/* Individuals and Families */
+#sb_content_individuals,
+#sb_content_families {
+	margin-top: 5px;
+}
+
 .sb_indi_surname_li,
 .sb_fam_surname_li {
 	list-style-image: url(images/plus.png);
 }
 
-.name_tree_div li,
-.name_tree_div_visible li {
-	white-space: normal;
-}
-
 .name_tree_div {
 	display: none;
 }
 
+.name_tree_div ul,
+.name_tree_div_visible ul {
+	padding: 0;
+	margin: 0;
+}
+
 .name_tree_div li,
 .name_tree_div_visible li {
 	list-style: none;
@@ -2683,29 +2544,30 @@ dd .deletelink {
 	padding: 0;
 }
 
-.name_tree_div ul,
-.name_tree_div_visible ul {
+/* Clippings */
+#sb_content_clippings {
+	margin-top: 5px;
+}
+
+#sb_clippings_content ul {
 	padding: 0;
 	margin: 0;
 }
 
-/* Clippings */
 #sb_clippings_content li {
 	list-style: none;
 	margin: 0;
 	padding: 0;
-}
-
-#sb_clippings_content ul {
-	padding: 0;
-	margin: 0;
+	white-space: nowrap;
 }
 
 /* Extra info */
 #sb_content_extra_info {
+	font-size: 80%;
 	font-weight: bold;
+	margin-top: 1px;
 	overflow: hidden;
-	padding: 4px;
+	padding: 5px;
 }
 
 #sb_content_extra_info .editfacts {
@@ -2725,19 +2587,16 @@ dd .deletelink {
 	display: inline;
 }
 
-[dir=rtl] #sb_content_extra_info .editfacts {
-	float: left;
-}
-
-fieldset {
-	text-align: left;
+#sb_content_extra_info #hitcounter {
+	font-weight: bold;
+	padding-top: 5px;
 }
 
-[dir=rtl] fieldset {
-	text-align: right;
+[dir=rtl] #sb_content_extra_info .editfacts {
+	float: left;
 }
 
-/* ============== find.php ======================= */
+/* ===== find.php =====  */
 #find-page h3,
 #find-page h4 {
 	margin: 10px;
@@ -2759,14 +2618,14 @@ fieldset {
 }
 
 #find-header span {
-
+	color: #fff;
+	font-weight: bold;
 }
 
 #find-output,
 #find-output-special {
 	background-color: #ddd;
-	border: 1px solid #aaa;
-	border-radius: 4px;
+	border: 1px outset #aaa;
 	margin: 20px 5px;
 	padding: 10px;
 }
@@ -2780,8 +2639,9 @@ fieldset {
 }
 
 #find-media {
-	background-color: #ccc;
-	border: 1px solid #aaa;
+	background-color: #81a9cb;
+	border: 1px outset #81a9cb;
+	color: #fff;
 	padding: 5px;
 	text-align: center;
 }
@@ -2840,7 +2700,7 @@ fieldset {
 	text-align: inherit;
 }
 
-/* ============== search.php ======================= */
+/* ===== search.php ===== */
 #search-page h2,
 #search_submit {
 	margin: 20px;
@@ -2856,9 +2716,9 @@ fieldset {
 }
 
 #search-page-table .label {
+	border-top: 1px solid #ccc;
 	float: left;
 	font-weight: bold;
-	margin: 1px;
 	padding: 5px 10px 0;
 	width: 150px;
 }
@@ -2883,7 +2743,7 @@ fieldset {
 	margin: 0 170px 0 0;
 }
 
-/* ============== edituser.php ======================= */
+/*  edituser.php  */
 #edituser-page h2,
 #edituser_submit {
 	margin: 20px;
@@ -2902,7 +2762,6 @@ fieldset {
 #edituser-table .label {
 	float: left;
 	font-weight: bold;
-	margin: 1px;
 	padding: 5px 10px 0;
 	width: 240px;
 	white-space: nowrap;
@@ -2931,14 +2790,666 @@ fieldset {
 	margin: 0 260px 0 0;
 }
 
-/* ======= Who is online block ========== */
-.logged_in_list {
-	margin: 5px 0 0;
+/* ===== Edit interface pop-ups ===== */
+#edit_interface-page h4 {
+	color: #555;
+	margin: 5px;
+}
+
+#edit_interface-page .optionbox span {
+	margin: 0 5px;
+}
+
+#edit_interface-page #LATI,
+#edit_interface-page #LONG,
+#edit_interface-page #SPFX,
+#edit_interface-page #NSFX,
+#edit_interface-page #NPFX {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 88px;
+}
+
+#edit_interface-page #GIVN,
+#edit_interface-page #SURN,
+#edit_interface-page #_MARNM {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 180px;
+}
+
+#edit_interface-page input[type="text"],
+#edit_interface-page #NAME_display {
+	line-height: 18px;
+	margin: 0 5px;
+	vertical-align: top;
+	width: 240px;
+}
+
+#edit_interface-page input[type="text"][id*="PAGE"],
+#edit_interface-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR"],
+#edit_interface-page input[type="text"][id*="REPO"],
+#edit_interface-page input[type="text"][id*="OBJE"],
+#edit_interface-page input[type="text"][id*="FAMC"],
+#edit_interface-page input[type="text"][id*="ASSO"],
+#edit_interface-page input[type="text"][id^="AGE"],
+#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 250px;
+}
+
+#edit_interface-page input[type="text"][id$="DATE"] {
+	width: 160px;
+}
+
+#edit_interface-page input[type="text"][id^="TIME"] {
+	width: 100px;
+}
+
+#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
+	width: 200px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
+	width: 250px;
+}
+
+#edit_interface-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#edit_interface-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#edit_interface-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#edit_interface-page textarea[id*="TEXT"],
+#edit_interface-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+#edit_interface-page textarea[id^="newgedrec"] {
+	line-height: 18px;
+	width: 605px;
+}
+
+#edit_interface-page textarea#gedcom {
+	height: 364px;
+}
+
+#edit_interface-page textarea[id*="ADDR"],
+#edit_interface-page input[id*="ADDR"] {
+	height: 80px;
+	width: 300px;
+}
+
+#edit_interface-page #changefam {
+	padding: 5px;
+}
+
+#edit_interface-page #changefam table {
+	margin: 10px auto;
+	min-width: 400px;
+	max-width: 650px;
+}
+
+#edit_interface-page #changefam span {
+	margin: 0;
+}
+
+#edit_interface-page #changefam td {
+	padding: 5px;
+	white-space: normal;
+}
+
+#edit_interface-page #changefam td.child {
+	text-align: center;
+}
+
+#save-cancel {
+	position: fixed;
+	bottom: 0;
+	background-color: #eee;
+	width: 96.5%;
+	border-radius: 4px;
+	border: solid #999 1px;
+	margin: 0;
+}
+
+#save-cancel input {
+	padding: 2px 8px;
+}
+
+#save-cancel .save {
+	float: left;
+	margin: 5px;
+}
+
+#save-cancel .cancel {
+	float: right;
+	margin: 5px;
+}
+
+[dir=rtl] #save-cancel .save {
+	float: right;
+}
+
+[dir=rtl] #save-cancel .cancel {
+	float: left;
+}
+
+#edit_interface-page,
+#addmedia-page {
+	margin-bottom: 50px;
+}
+
+/* ===== Addmedia pop-ups ===== */
+#addmedia-page input[type="text"] {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 350px;
+}
+
+#addmedia-page .optionbox select {
+	margin: 0 5px;
+}
+
+#addmedia-page .optionbox p.sub {
+	margin: 0 5px;
+	font-size: 11px;
+}
+
+#addmedia-page input[type="text"][id*="PAGE"],
+#addmedia-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#addmedia-page input[type="text"][id*="SOUR"],
+#addmedia-page input[type="text"][id*="REPO"],
+#addmedia-page input[type="text"][id*="OBJE"],
+#addmedia-page input[type="text"][id*="FAMC"],
+#addmedia-page input[type="text"][id*="ASSO"],
+#addmedia-page input[type="text"][id^="AGE"],
+#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 70px;
+}
+
+#addmedia-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#addmedia-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#addmedia-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#addmedia-page textarea[id*="TEXT"],
+#addmedia-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+/* ===== Styling for the jquery.colorbox gallery ===== */
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+#colorbox {
+	border: 2px solid #ccc;
+}
+
+#cboxOverlay {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	background: #ccc;
+}
+
+#cboxContent {
+	background: #fff;
+	border: 5px solid #888;
+}
+
+#cboxLoadedContent {
+	overflow: auto;
+	background: #fff;
+	margin-bottom: 30px;
+	margin-top: 35px;
+}
+
+#cboxTitle {
+	position: absolute;
+	left: 0;
+	top: 10px;
+	font-size: 14px;
+	color: #888;
+	text-align: center;
+	width: 100%;
+	font-weight: 800;
+}
+
+.cboxPhoto {
+	float: left;
+	margin: auto;
+	border: 0;
+	display: block;
+	max-width: none;
+}
+
+.cboxIframe {
+	width: 100%;
+	height: 100%;
+	display: block;
+	border: 0;
+}
+
+#cboxPrevious {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	background: url(images/controls.png) no-repeat -75px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxPrevious:hover {
+	background-position: -75px -25px;
+}
+
+#cboxNext {
+	position: absolute;
+	bottom: 0;
+	left: 27px;
+	background: url(images/controls.png) no-repeat -50px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxNext:hover {
+	background-position: -50px -25px;
+}
+
+#cboxSlideshow {
+	position: absolute;
+	bottom: 5px;
+	font-size: 14px;
+	left: 57px;
+	margin: 10px;
+	border: 0;
+	background: none;
+}
+
+#cboxSlideshow:hover {
+	color: #f00;
+	background: #fff;
+}
+
+#cboxClose {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	background: url(images/controls.png) no-repeat -25px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxClose:hover {
+	background-position: -25px -25px;
+}
+
+#cboxCurrent {
+	bottom: 4px;
+	color: #888;
+	left: 58px;
+	position: absolute;
+}
+
+[dir=rtl] #cboxPrevious {
+	right: 27px;
+	left: auto;
+}
+
+[dir=rtl] #cboxNext {
+	right: 0;
+	left: auto;
+}
+
+[dir=rtl] #cboxCurrent {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxClose {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxSlideshow {
+	right: 57px;
+	left: auto;
+}
+
+/* ===== Census assistant module ===== */
+table.table-census-assistant th {
+	font-weight: bold;
+	text-align: left;
+}
+
+/* Stories module */
+.story_title {
+	padding-top: 12px;
+	font-size: 13px;
+	height: 32px;
+	font-weight: bold;
+}
+
+.story_body {
+	padding: 20px;
+	white-space: normal;
+}
+
+.story_edit {
+	padding: 12px;
+}
+
+.btn-group {
+	display: inline-block;
+	margin: 0 4px;
+}
+
+.btn-group button:first-child,
+[dir=rtl] .btn-group button:last-child {
+	border-radius: 3px 0 0 3px;
+}
+
+.btn-group button:last-child,
+[dir=rtl] .btn-group button:first-child {
+	border-radius: 0 3px 3px 0;
+}
+
+/* ====== Charts Styles ======== */
+#compact_chart,
+#fan_chart,
+.chart_common,
+#ancestry_booklet,
+#descendancy_booklet,
+#familybook_chart,
+#hourglass_chart {
+	margin: 20px;
+}
+
+/* styles for vertical lines in ancestry and descendancy charts */
+.chart_common li {
+	list-style: none;
+}
+
+.chart_common li > span.details1 {
+	white-space: nowrap;
+}
+
+.chart_common .generation {
+	background: transparent url(images/vline.png) left top repeat-y;
+	margin: 0 0 0 15px;
 	padding: 0;
-	line-height: 20px;
+	display: block;
+}
+
+[dir=rtl] .chart_common .generation {
+	margin: 0 15px 0 0;
+	background-position: right top
+;
+}
+
+.chart_common .generation > li {
+	margin: 5px 0;
+}
+
+.chart_common table {
+	padding: 0;
+	border-spacing: 0;
+	border-collapse: collapse;
+	margin: 5px 0;
+}
+
+.chart_common td {
+	border: 0;
+	padding: 0;
+}
+
+.chart_common span.details1 div[class^=fact_] {
+	display: inline-block;
+}
+
+.chart_common span.details1 .date {
+	color: inherit;
+}
+
+/*-- Family book  --*/
+#familybook_chart {
+	margin-left: 10px;
+}
+
+#familybook_chart table {
+	border-collapse: collapse;
+	empty-cells: show;
+}
+
+#familybook_chart td {
+	margin: 0;
+	padding: 0;
+}
+
+#familybook_chart h2 {
+	text-align: center;
 }
 
-/* Icons */
+#familybook_chart .line3,
+#familybook_chart .pvline,
+#familybook_chart .spacer {
+	width: 3px;
+}
+
+#familybook_chart .line4 {
+	width: 7px;
+	vertical-align: middle;
+}
+
+[ID^="vline"] {
+	width: 3px;
+}
+
+#familybook_chart h3 {
+	color: #006;
+	font-size: 16px;
+	text-align: center;
+}
+
+[dir=rtl] #familybook_chart {
+	margin-right: 10px;
+}
+
+/*-- Fan chart ---- */
+.fan_chart_menu {
+	position: absolute;
+	display: none;
+	z-index: 100;
+}
+
+#fan_chart ul {
+	list-style-type: none;
+	margin: 0;
+}
+
+#fan_chart ul.children li:before {
+	content: "< ";
+	font-weight: bold;
+}
+
+#fan_chart_img {
+	text-align: center;
+}
+
+/*-- Hourglass ---- */
+#hourglass_chart img.line4 {
+	vertical-align: middle;
+}
+
+#hourglass_chart table,
+.charts_block table {
+	border-collapse: collapse;
+}
+
+#hourglass_chart td,
+.charts_block td {
+	padding: 0;
+	empty-cells: show;
+}
+
+/*-- Lifespan ---- */
+
+#lifespan-page .person0 {
+	padding: 5px;
+}
+
+#lifespan-page .person0 div{
+	text-align: center;
+}
+
+#lifespan_chart .div-controls {
+	opacity: 0.67;
+	position: relative;
+	top: 80px;
+	width: 180px;
+	z-index: 100;
+	margin-left: 20px;
+}
+
+.lifespan_people span:first-letter {
+	font-variant: small-caps;
+	font-size: 16px;
+	padding: 1px;
+}
+
+.lifespan_outer {
+	position: relative;
+	width: 99.5%;
+	height: 600px;
+	overflow: hidden;
+}
+
+.lifespan_outer a:hover {
+	color: #f00;
+	text-decoration: none;
+}
+
+.lifespan_timeline {
+	position: absolute;
+	width: 100%;
+	left: -10px;
+	top: -65px;
+	z-index: 2;
+	background-color: #fff;
+}
+
+.lifespan_people {
+	position: absolute;
+	width: 500px;
+	left: -10px;
+	top: -60px;
+	z-index: 1;
+}
+
+/*-- Pedigree ---- */
+#pedigree_chart #childbox {
+	border: 1px solid;
+	background-color: #fff;
+}
+
+.pedigree_form {
+	width: 45px;
+}
+
+#pedigree-page table.list_table {
+	margin: 0 auto;
+	width: 500px;
+}
+
+.pedigree_chart_table {
+	border: 0;
+	border-collapse: collapse;
+	padding: 0;
+	width: 100%;
+}
+
+#pedigree_chart {
+	position: relative;
+	top: -200px;
+	left: 0;
+}
+
+[dir=rtl] #pedigree_chart {
+	left: auto;
+	right: 0;
+}
+
+#pedigree_canvas {
+	color: #aaa;
+	position: absolute;
+	top: 200px;
+	z-index: -1000;
+}
+
+#pedigree_chart #childarrow,
+#pedigree_chart #uparrow,
+#pedigree_chart .shadow,
+.ancestorarrow {
+	position: absolute;
+}
+
+/*-- Relationship ---- */
+#relationship-page h3 {
+	margin: 20px 0 0 20px;
+}
+
+#relationship_chart {
+	margin: 0 6px;
+}
+
+/*-- timeline  --*/
+#timeline_chart {
+	position: relative;
+	top: 0;
+	left: 0;
+}
+
+/* ====== Common Icons ========= */
 [class^="icon-"],
 [class*=" icon-"] {
 	display: inline-block;
@@ -2968,6 +3479,7 @@ fieldset {
 	width: 18px;
 	height: 16px;
 	background-image: url(images/buttons/addmedia.png);
+	vertical-align: middle;
 }
 
 .icon-button_addnote {
@@ -2992,6 +3504,7 @@ fieldset {
 	width: 19px;
 	height: 15px;
 	background-image: url(images/buttons/calendar.png);
+	vertical-align: middle;
 }
 
 .icon-button_family {
@@ -3000,6 +3513,12 @@ fieldset {
 	background-image: url(images/buttons/family.png);
 }
 
+.icon-button_find {
+	width: 17px;
+	height: 15px;
+	background-image: url(images/buttons/find.png);
+}
+
 .icon-button_find_facts {
 	width: 20px;
 	height: 20px;
@@ -3022,12 +3541,14 @@ fieldset {
 	width: 30px;
 	height: 15px;
 	background-image: url(images/buttons/keyboard.png);
+	vertical-align: middle;
 }
 
 .icon-button_media {
 	width: 18px;
 	height: 16px;
 	background-image: url(images/buttons/media.png);
+	vertical-align: middle;
 }
 
 .icon-button_note {
@@ -3040,6 +3561,7 @@ fieldset {
 	width: 15px;
 	height: 15px;
 	background-image: url(images/buttons/place.png);
+	vertical-align: middle;
 }
 
 .icon-button_repository {
@@ -3122,17 +3644,12 @@ a.icon-darrow:hover {
 
 .icon-help {
 	cursor: help;
+	margin: 0 5px;
 	width: 15px;
 	height: 15px;
 	background-image: url(images/help.png);
 }
 
-.icon-indis {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/indis.png);
-}
-
 .icon-indi-list {
 	width: 50px;
 	height: 50px;
@@ -3157,6 +3674,12 @@ a.icon-larrow:hover {
 	background-image: url(images/ldarrow.png);
 }
 
+.icon-ldarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/ldarrow2.png);
+}
+
 .icon-lifespan-chunk {
 	width: 50px;
 	height: 37px;
@@ -3271,18 +3794,6 @@ a.icon-larrow:hover {
 	background-image: url(images/osm.png);
 }
 
-.icon-patriarch {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/patriarch.png);
-}
-
-.icon-pedigree {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/pedigree.png);
-}
-
 .icon-pin-in {
 	width: 16px;
 	height: 16px;
@@ -3295,12 +3806,6 @@ a.icon-larrow:hover {
 	background-image: url(images/pin-out.png);
 }
 
-.icon-place {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/place.png);
-}
-
 .icon-plus {
 	width: 11px;
 	height: 11px;
@@ -3325,6 +3830,12 @@ a.icon-rarrow:hover {
 	background-image: url(images/rdarrow.png);
 }
 
+a.icon-rdarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/rdarrow2.png);
+}
+
 .icon-reminder {
 	width: 15px;
 	height: 12px;
@@ -3337,18 +3848,6 @@ a.icon-rarrow:hover {
 	background-image: url(images/remove.png);
 }
 
-.icon-repository {
-	width: 30px;
-	height: 30px;
-	background-image: url(images/repository.png);
-}
-
-.icon-repo-list {
-	width: 30px;
-	height: 30px;
-	background-image: url(images/repository.png);
-}
-
 .icon-resn-confidential {
 	width: 16px;
 	height: 16px;
@@ -3379,12 +3878,6 @@ a.icon-rarrow:hover {
 	background-image: url(images/rings.png);
 }
 
-.icon-search {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/search.png);
-}
-
 .icon-selected {
 	width: 12px;
 	height: 12px;
@@ -3427,12 +3920,6 @@ a.icon-rarrow:hover {
 	background-image: url(images/sex_u_9x9.png);
 }
 
-.icon-sfamily {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/sfamily.png);
-}
-
 .icon-slide_close {
 	width: 22px;
 	height: 20px;
@@ -3451,22 +3938,11 @@ a.icon-rarrow:hover {
 	background-image: url(images/source.png);
 }
 
-.icon-source-list {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/source.png);
-}
-
 .icon-target {
 	width: 15px;
 	height: 15px;
 	background-image: url(images/buttons/target.png);
-}
-
-.icon-tree {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/gedcom.png);
+	vertical-align: middle;
 }
 
 .icon-uarrow {
@@ -3487,35 +3963,18 @@ a.icon-uarrow:hover {
 	background-image: url(images/udarrow.png);
 }
 
-.icon-user_add {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/user_add.png);
-}
-
 .icon-warning {
 	width: 17px;
 	height: 17px;
 	background-image: url(images/warning.png);
 }
 
-.icon-webtrees {
-	width: 100px;
-	height: 21px;
-	background-image: url(images/webtrees.png);
-}
-
 .icon-wiki {
 	width: 16px;
 	height: 16px;
 	background-image: url(images/w_button.png);
 }
 
-/* ios on click workaround */
-.iconz {
-	cursor: pointer;
-}
-
 .icon-zoomin {
 	width: 25px;
 	height: 25px;
@@ -3528,6 +3987,43 @@ a.icon-uarrow:hover {
 	background-image: url(images/zoomout.png);
 }
 
+/* Silhouettes on charts */
+.icon-silhouette-F {
+	width: 37px;
+	height: 45px;
+	background-image: url(images/silhouette_female_small.png);
+}
+
+.icon-silhouette-M {
+	width: 37px;
+	height: 45px;
+	background-image: url(images/silhouette_male_small.png);
+}
+
+.icon-silhouette-U {
+	width: 37px;
+	height: 45px;
+	background-image: url(images/silhouette_unknown_small.png);
+}
+
+#indi_mainimage .icon-silhouette-F {
+	width: 99px;
+	height: 106px;
+	background-image: url(images/silhouette_female.png);
+}
+
+#indi_mainimage .icon-silhouette-M {
+	width: 99px;
+	height: 99px;
+	background-image: url(images/silhouette_male.png);
+}
+
+#indi_mainimage .icon-silhouette-U {
+	width: 100px;
+	height: 97px;
+	background-image: url(images/silhouette_unknown.png);
+}
+
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
 	display: inline-block;
@@ -3536,7 +4032,7 @@ a.icon-uarrow:hover {
 	height: 48px;
 }
 
-/* Generic MIME types */
+/* ===== Generic MIME types ===== */
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
 	background-position: -99px -49px;
@@ -3567,7 +4063,7 @@ a.icon-uarrow:hover {
 	background-position: -148px -147px;
 }
 
-/* Specific MIME types */
+/* ===== Specific MIME types ===== */
 .icon-mime-application-pdf {
 	background-position: -1px -49px;
 }
@@ -3651,440 +4147,372 @@ a.icon-uarrow:hover {
 .icon-mime-video-x-ms-wmv {
 	background-position: -50px -196px;
 }
+/* ====== End Icon styles ====== */
 
-/* Silhouettes on charts */
-.icon-silhouette-F {
-	width: 37px;
-	height: 45px;
-	background-image: url(images/silhouette_female_small.png);
-}
-
-.icon-silhouette-M {
-	width: 37px;
-	height: 45px;
-	background-image: url(images/silhouette_male_small.png);
-}
-
-.icon-silhouette-U {
-	width: 37px;
-	height: 45px;
-	background-image: url(images/silhouette_unknown_small.png);
+/* ====== Theme Header ========= */
+header h1 {
+	clear: left;
+	float: left;
+	font-size: x-large;
+	font-weight: normal;
+	margin: 0;
 }
 
-/* Silhouettes on individual pages */
-#indi_mainimage .icon-silhouette-F {
-	width: 99px;
-	height: 106px;
-	background-image: url(images/silhouette_female.png);
+[dir=rtl] header h1 {
+	clear: right;
+	float: right;
 }
 
-#indi_mainimage .icon-silhouette-M {
-	width: 99px;
-	height: 99px;
-	background-image: url(images/silhouette_male.png);
+.header-search {
+	display: inline-block;
 }
 
-#indi_mainimage .icon-silhouette-U {
-	width: 100px;
-	height: 97px;
-	background-image: url(images/silhouette_unknown.png);
+/* Set stack level for top two header menu rows */
+.secondary-menu ul,
+.primary-menu ul {
+	z-index: 210;
 }
 
-/* Edit interface pop-ups*/
-#edit_interface-page h4 {
-	color: #555;
-	margin: 5px;
+.secondary-menu {
+	white-space: nowrap;
+	float: right;
 }
 
-#edit_interface-page .optionbox span {
-	margin: 0 5px;
+[dir=rtl] .secondary-menu {
+	float: left;
 }
 
-#edit_interface-page #LATI,
-#edit_interface-page #LONG,
-#edit_interface-page #SPFX,
-#edit_interface-page #NSFX,
-#edit_interface-page #NPFX {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 88px;
+/* ====== Secondary menu ======= */
+.secondary-menu li {
+	background: none !important;
+	display: inline;
+	position: relative;
+	white-space: nowrap;
 }
 
-#edit_interface-page #GIVN,
-#edit_interface-page #SURN,
-#edit_interface-page #_MARNM {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 180px;
+.secondary-menu li:before {
+	content: " | ";
 }
 
-#edit_interface-page input[type="text"],
-#edit_interface-page #NAME_display {
-	line-height: 18px;
-	margin: 0 5px;
-	vertical-align: top;
-	width: 240px;
+.secondary-menu li ul li:before {
+	content: "";
 }
 
-#edit_interface-page input[type="text"][id*="PAGE"],
-#edit_interface-page input[type="text"][id*="_UID"] {
-	width: 350px;
+.secondary-menu li:first-child:before {
+	content: "";
 }
 
-#edit_interface-page input[type="text"][id*="SOUR"],
-#edit_interface-page input[type="text"][id*="REPO"],
-#edit_interface-page input[type="text"][id*="OBJE"],
-#edit_interface-page input[type="text"][id*="FAMC"],
-#edit_interface-page input[type="text"][id*="ASSO"],
-#edit_interface-page input[type="text"][id^="AGE"],
-#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 250px;
+.secondary-menu li ul {
+	display: none;
+	position: absolute;
+	left: 0;
+	top: 15px;
+	background-color: #eee;
+	border: thin solid #aaa;
 }
 
-#edit_interface-page input[type="text"][id$="DATE"] {
-	width: 160px;
+.secondary-menu.lb-menu li:before {
+	content: "";
 }
 
-#edit_interface-page input[type="text"][id^="TIME"] {
-	width: 100px;
+[dir=rtl] .secondary-menu li ul {
+	left: auto;
+	right: 0;
 }
 
-#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
-	width: 200px;
+.secondary-menu ul ul {
+	top: 0;
+	left: 100px;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
-	width: 250px;
+[dir=rtl] .secondary-menu ul ul {
+	top: 0;
+	left: auto;
+	right: 100px;
 }
 
-#edit_interface-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+.secondary-menu li ul li {
+	display: block;
+	text-align: left;
 }
 
-#edit_interface-page textarea {
-	margin: 0 5px;
-	width: 440px;
+[dir=rtl] .secondary-menu li ul li {
+	text-align: right;
 }
 
-#edit_interface-page textarea[id*="NOTE"] {
-	height: 240px;
+.secondary-menu,
+.secondary-menu li ul {
+	list-style: none;
+	margin: 0;
+	padding: 1px;
 }
 
-#edit_interface-page textarea[id*="TEXT"],
-#edit_interface-page textarea[id*="PUBL"] {
-	height: 140px;
+.secondary-menu li:hover > ul {
+	display: block;
 }
 
-#edit_interface-page textarea[id^="newgedrec"] {
-	line-height: 18px;
-	width: 605px;
+.secondary-menu .active {
+	font-weight: 900;
 }
 
-#edit_interface-page textarea#gedcom {
-	height: 364px;
+#menu-language li {
+	text-align: left; /* The language menu is always LTR, even on RTL pages */
 }
 
-#edit_interface-page textarea[id*="ADDR"],
-#edit_interface-page input[id*="ADDR"] {
-	height: 80px;
-	width: 300px;
+#menu-theme li {
+	text-align: left; /* The theme menu is always LTR, even on RTL pages */
 }
 
-#edit_interface-page #changefam {
-	padding: 5px;
+#header-user-links {
+	float: right;
 }
 
-#edit_interface-page #changefam table {
-	margin: 10px auto;
-	min-width: 400px;
-	max-width: 650px;
+[dir=rtl] #header-user-links {
+	float: left;
 }
 
-#edit_interface-page #changefam span {
-	margin: 0;
+.secondary-menu ul li a {
+	background-color: #eee;
+	padding: 2px 5px;
+	display: block;
 }
 
-#edit_interface-page #changefam td {
-	padding: 5px;
-	white-space: normal;
+.secondary-menu ul li a:hover {
+	background-color: #369;
+	color: #fff;
+	text-decoration: none;
 }
 
-#edit_interface-page #changefam td.child {
+/* ====== Primary menu ========= */
+header nav {
+	clear: both;
 	text-align: center;
+	padding-top: 12px;
 }
 
-#save-cancel {
-	background-color: #eee;
-	border-radius: 4px;
-	border: solid #999 1px;
-	bottom: 0;
+.primary-menu {
 	margin: 0;
-	position: fixed;
-	width: 96.5%;
 }
 
-#save-cancel input {
-	padding: 2px 8px;
+.primary-menu li {
+	background: none !important;
+	display: inline;
+	position: relative;
+	white-space: nowrap;
 }
 
-#save-cancel .save {
-	float: left;
-	margin: 5px;
+.primary-menu li:before {
+	content: " | ";
 }
 
-#save-cancel .cancel {
-	float: right;
-	margin: 5px;
+.primary-menu li ul li:before {
+	content: "";
 }
 
-[dir=rtl] #save-cancel .save {
-	float: right;
+.primary-menu li:first-child:before {
+	content: "";
 }
 
-[dir=rtl] #save-cancel .cancel {
-	float: left;
+.primary-menu li ul {
+	display: none;
+	position: absolute;
+	left: 0;
+	top: 7px;
+	background-color: #eee;
+	border: thin solid #aaa;
 }
 
-#edit_interface-page,
-#addmedia-page {
-	margin-bottom: 50px;
+[dir=rtl] .primary-menu li ul {
+	left: auto;
+	right: 0;
 }
 
-/* Addmedia pop-ups*/
-#addmedia-page input[type="text"] {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 350px;
-}
+/* position sub-sub-menus */
 
-#addmedia-page .optionbox select {
-	margin: 0 5px;
+.primary-menu ul ul {
+	top: 0;
+	left: 100px;
 }
 
-#addmedia-page .optionbox p.sub {
-	font-size: smaller;
-	margin: 0 5px;
+[dir=rtl] .primary-menu ul ul {
+	top: 0;
+	left: auto;
+	right: 100px;
 }
 
-#addmedia-page input[type="text"][id*="PAGE"],
-#addmedia-page input[type="text"][id*="_UID"] {
-	width: 350px;
+.primary-menu li ul li {
+	display: block;
+	text-align: left;
 }
 
-#addmedia-page input[type="text"][id*="SOUR"],
-#addmedia-page input[type="text"][id*="REPO"],
-#addmedia-page input[type="text"][id*="OBJE"],
-#addmedia-page input[type="text"][id*="FAMC"],
-#addmedia-page input[type="text"][id*="ASSO"],
-#addmedia-page input[type="text"][id^="AGE"],
-#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 70px;
+[dir=rtl] .primary-menu li ul li {
+	text-align: right;
 }
 
-#addmedia-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+.primary-menu,
+.primary-menu li ul {
+	list-style: none;
+	padding: 1px;
 }
 
-#addmedia-page textarea {
-	margin: 0 5px;
-	width: 440px;
-}
+.primary-menu li:hover > ul {
+	display: block;
 
-#addmedia-page textarea[id*="NOTE"] {
-	height: 240px;
 }
 
-/* Styling for the jquery.colorbox gallery */
-#colorbox,
-#cboxOverlay,
-#cboxWrapper {
-	position: absolute;
-	top: 0;
-	left: 0;
-	z-index: 9999;
-	overflow: hidden;
-}
+.primary-menu ul li a {
+	background-color: #eee;
+	padding: 2px 5px;
+	display: block;
 
-#colorbox {
-	border: 2px solid #ccc;
 }
 
-#cboxOverlay {
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	background: #ccc;
+.primary-menu ul li a:hover {
+	background-color: #369;
+	color: #fff;
+	text-decoration: none;
 }
 
-#cboxContent {
-	background: #fff;
-	border: 5px solid #888;
-}
+/* ====== End Theme Header ===== */
 
-#cboxLoadedContent {
-	overflow: auto;
-	background: #fff;
-	margin-bottom: 30px;
-	margin-top: 35px;
-}
+/* ====== Theme Footer ========= */
 
-#cboxTitle {
-	position: absolute;
-	left: 0;
-	top: 10px;
-	color: #888;
+footer {
+	clear: both;
 	text-align: center;
-	width: 100%;
-	font-weight: 800;
-}
-
-.cboxPhoto {
-	float: left;
-	margin: auto;
-	border: 0;
-	display: block;
-	max-width: none;
-}
-
-.cboxIframe {
-	width: 100%;
-	height: 100%;
-	display: block;
-	border: 0;
-}
-
-#cboxPrevious {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	background: url(images/controls.png) no-repeat -75px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
-}
-
-#cboxPrevious:hover {
-	background-position: -75px -25px;
+	width: 99%;
 }
 
-#cboxNext {
-	position: absolute;
-	bottom: 0;
-	left: 27px;
-	background: url(images/controls.png) no-repeat -50px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+.powered-by-webtrees {
+	display: inline-block;
+	margin-top: 10px;
+	width: 100px;
+	height: 21px;
 }
 
-#cboxNext:hover {
-	background-position: -50px -25px;
+.powered-by-webtrees:after {
+	content: url(images/powered-by-webtrees.png);
 }
 
-#cboxSlideshow {
-	position: absolute;
-	bottom: 5px;
-	left: 57px;
-	margin: 10px;
-	border: 0;
-	background: none;
+#link_change_blocks {
+	clear: both;
+	margin: 0 auto;
+	padding: 25px 0 0;
+	text-align: center;
+	width: 400px;
 }
 
-#cboxSlideshow:hover {
-	color: #f00;
-	background: #fff;
+#link_change_blocks span {
+	padding: 0 50px;
 }
 
-#cboxClose {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	background: url(images/controls.png) no-repeat -25px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#link_change_blocks span span {
+	padding: 0 3px;
 }
 
-#cboxClose:hover {
-	background-position: -25px -25px;
-}
+/* ====== End Theme Footer ===== */
 
-#cboxCurrent {
-	bottom: 4px;
-	color: #888;
-	left: 58px;
-	position: absolute;
+/* ====== Theme Icons ========== */
+.icon-indis {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/indis.png);
 }
 
-[dir=rtl] #cboxPrevious {
-	right: 27px;
-	left: auto;
+.icon-patriarch {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/patriarch.png);
 }
 
-[dir=rtl] #cboxNext {
-	right: 0;
-	left: auto;
+.icon-pedigree {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/pedigree.png);
 }
 
-[dir=rtl] #cboxCurrent {
-	right: auto;
-	left: 0;
+.icon-place {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/place.png);
 }
 
-[dir=rtl] #cboxClose {
-	right: auto;
-	left: 0;
+.icon-repo-list {
+	width: 30px;
+	height: 30px;
+	background-image: url(images/repository.png);
 }
 
-[dir=rtl] #cboxSlideshow {
-	right: 57px;
-	left: auto;
+.icon-repository {
+	width: 30px;
+	height: 30px;
+	background-image: url(images/repository.png);
 }
 
-/* Census assistant module */
-table.table-census-assistant th {
-	font-weight: bold;
-	text-align: left;
+.icon-search {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/search.png);
 }
 
-/* Stories module */
-.story_title {
-	padding-top: 12px;
-	height: 32px;
-	font-size: 13px;
-	font-weight: 700;
+.icon-sfamily {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/sfamily.png);
 }
 
-.story_body {
-	padding: 20px;
-	white-space: normal;
+.icon-source-list {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/source.png);
 }
 
-.story_edit {
-	padding: 12px;
+.icon-tree {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/gedcom.png);
 }
 
-/* User content in stories tab */
-#stories h2,
-#stories h3,
-#stories h4,
-#stories h5 {
-	padding-top: 20px;
+.icon-user_add {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/user_add.png);
 }
 
-#stories p {
-	padding-top: 8px;
-}
+@media print {
+	header,
+	footer,
+	form,
+	#sidebar,
+	#separator,
+	.noprint {
+		display: none;
+	}
+	
+	.descriptionbox, .optionbox {
+		border: solid #888 1px;
+		}
+	
+	.person_box, .person_boxF, .person_boxNN {
+		border: solid #888 1px;
+		background: #fff;
+	}
+	
+	#pedigree_chart {
+		left: -35px;
+		top:  -260px;
+	}
+	
+	[dir=rtl] #pedigree_chart {
+		left: auto;
+		right: -20px;
+	}
+	
+	#header_accordion1 {
+		width: 510px;
+	}
 
-.btn-group {
-	display: inline-block;
-	margin: 0 4px;
+	#familybook_chart h3 {
+		margin-bottom: 10px;
+	}
 }
diff --git a/themes/fab/footer.php b/themes/fab/footer.php
deleted file mode 100644
index 27f9c81442..0000000000
--- a/themes/fab/footer.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-// Footer for FAB theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Modifications Copyright (c) 2010 Greg Roach
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo '</main>';
-if ($view!='simple') {
-	echo '<footer><div class="block">', contact_links();
-	if ($WT_TREE && $WT_TREE->getPreference('SHOW_STATS')) {
-		echo execution_stats();
-	}
-	echo '</div><a style="font-size:150%; color:#888;" href="', WT_WEBTREES_URL, '" title="', WT_WEBTREES , ' - ', WT_VERSION, '">', WT_WEBTREES, '</a></footer>';
-}
diff --git a/themes/fab/header.php b/themes/fab/header.php
deleted file mode 100644
index aff70973b5..0000000000
--- a/themes/fab/header.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-// Header for FAB theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Modifications Copyright (c) 2010 Greg Roach
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use WT\Auth;
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-// This theme uses the jQuery “colorbox” plugin to display images
-$this
-	->addExternalJavascript(WT_JQUERY_COLORBOX_URL)
-	->addExternalJavascript(WT_JQUERY_WHEELZOOM_URL)
-	->addInlineJavascript('activate_colorbox();')
-	->addInlineJavascript('jQuery.extend(jQuery.colorbox.settings, {width:"85%", height:"85%", transition:"none", slideshowStart:"'. WT_I18N::translate('Play').'", slideshowStop:"'. WT_I18N::translate('Stop').'"})')
-	->addInlineJavascript('
-		jQuery.extend(jQuery.colorbox.settings, {
-			title: function() {
-				var img_title = jQuery(this).data("title");
-				return img_title;
-			}
-		});
-	');
-?>
-<!DOCTYPE html>
-<html <?php echo WT_I18N::html_markup(); ?>>
-<head>
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<?php echo header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL); ?>
-	<title><?php echo WT_Filter::escapeHtml($title); ?></title>
-	<link rel="icon" href="<?php echo WT_CSS_URL; ?>favicon.png" type="image/png">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_THEME_URL; ?>jquery-ui-1.11.2/jquery-ui.css">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_CSS_URL; ?>style.css">
-	<!--[if IE 8]>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-	<![endif]-->
-</head>
-<body id="body">
-	<?php if ($view !== 'simple') { ?>
-	<header class="block">
-		<div id="header-user-links">
-			<ul class="makeMenu">
-				<?php
-				if (Auth::check()) {
-					echo '<li><a href="edituser.php">', WT_Filter::escapeHtml(Auth::user()->getRealName()), '</a></li> <li>', logout_link(), '</li>';
-					if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
-						echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\',chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
-					}
-				} else {
-					echo '<li>', login_link(), '</li> ';
-				}
-				?>
-				<?php echo WT_MenuBar::getFavoritesMenu(); ?>
-				<?php echo WT_MenuBar::getLanguageMenu(); ?>
-				<?php echo WT_MenuBar::getThemeMenu(); ?>
-				<li>
-					<form style="display:inline;" action="search.php" method="post" role="search">
-						<input type="hidden" name="action" value="general">
-						<input type="hidden" name="ged" value="<?php echo WT_GEDCOM; ?>">
-						<input type="hidden" name="topsearch" value="yes">
-						<input type="search" name="query" size="20" placeholder="<?php echo WT_I18N::translate('Search'); ?>">
-					</form>
-				</li>
-			</ul>
-		</div>
-		<h1><?php echo WT_TREE_TITLE; ?></h1>
-		<nav>
-			<ul id="main-menu" role="menubar">
-				<?php echo WT_MenuBar::getGedcomMenu();   ?>
-				<?php echo WT_MenuBar::getMyPageMenu();   ?>
-				<?php echo WT_MenuBar::getChartsMenu();   ?>
-				<?php echo WT_MenuBar::getListsMenu();    ?>
-				<?php echo WT_MenuBar::getCalendarMenu(); ?>
-				<?php echo WT_MenuBar::getReportsMenu();  ?>
-				<?php echo WT_MenuBar::getSearchMenu();   ?>
-				<?php echo implode('', WT_MenuBar::getModuleMenus()); ?>
-			</ul>
-		</nav>
-	</header>
-	<?php } ?>
-	<?php echo WT_FlashMessages::getHtmlMessages(); ?>
-	<main id="content">
diff --git a/themes/fab/templates/block_main_temp.php b/themes/fab/templates/block_main_temp.php
deleted file mode 100644
index 35a3b0a990..0000000000
--- a/themes/fab/templates/block_main_temp.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-// Template for drawing the full-height blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-?>
-<div id="<?php echo $id; ?>" class="block">
-	<div class="blockheader"><?php echo $title; ?></div>
-	<div class="blockcontent <?php echo $class; ?>"><?php echo $content; ?></div>
-</div>
diff --git a/themes/fab/templates/block_small_temp.php b/themes/fab/templates/block_small_temp.php
deleted file mode 100644
index 1c226b5f32..0000000000
--- a/themes/fab/templates/block_small_temp.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-// Template for drawing the height-restricted blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-?>
-<div id="<?php echo $id; ?>" class="block">
-	<div class="blockheader"><?php echo $title; ?></div>
-	<div class="blockcontent <?php echo $class; ?>" style="max-height:240px; overflow:auto;"><?php echo $content; ?></div>
-</div>
diff --git a/themes/fab/templates/compactbox_template.php b/themes/fab/templates/compactbox_template.php
deleted file mode 100644
index 4a3386f801..0000000000
--- a/themes/fab/templates/compactbox_template.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-//  $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $outBoxAdd, $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '"' , $outBoxAdd, '>
-	<div class="compact_view">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'">
-			<span class="namedef name',$style,'">', $shortname, '</span>
-		</a>
-	</div>
-	<div class="inout2 details',$style,'">',
-		$person->getLifeSpan(), '
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/fab/templates/personbox_template.php b/themes/fab/templates/personbox_template.php
deleted file mode 100644
index b1fdc7ade2..0000000000
--- a/themes/fab/templates/personbox_template.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-// $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $genderImage, $BirthDeath, $outBoxAdd,
-// $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team. All rights reserved.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '" ',$outBoxAdd,'>
-	<div class="noprint icons">', $icons, '</div>',
-	'<div class="chart_textbox" style="max-height:', $bheight,'px;">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '">
-			<span class="namedef name',$style,'">',
-				$name,
-				$genderImage,'
-				<span class="details',$style,'">' . $LDSord . '</span>
-			</span>
-		</a>
-		<div class="namedef name',$style,'">',$addname,'</div>
-		<div class="inout2 details',$style,'">',
-			$BirthDeath,
-		'</div>
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/fab/theme.php b/themes/fab/theme.php
index 00ec20957a..241de3828f 100644
--- a/themes/fab/theme.php
+++ b/themes/fab/theme.php
@@ -2,9 +2,7 @@
 // FAB theme
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Based on standard theme, which is Copyright (C) 2002 to 2010 PGV Development Team.
+// Copyright (C) 2015 webtrees development team.
 //
 // 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
@@ -20,88 +18,4 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-// Theme name - this needs double quotes, as file is scanned/parsed by script
-$theme_name="F.A.B."; /* I18N: Name of a theme. */ WT_I18N::translate('F.A.B.');
-
-// A version number in the path prevents browser-cache problems during upgrade
-define('WT_CSS_URL', WT_THEME_URL . 'css-1.6.2/');
-
-$headerfile = WT_THEME_DIR.'header.php';
-$footerfile = WT_THEME_DIR.'footer.php';
-
-$WT_IMAGES = array(
-	// used to draw charts
-	'dline'           => WT_CSS_URL . 'images/dline.png',
-	'dline2'          => WT_CSS_URL . 'images/dline2.png',
-	'hline'           => WT_CSS_URL . 'images/hline.png',
-	'spacer'          => WT_CSS_URL . 'images/spacer.png',
-	'vline'           => WT_CSS_URL . 'images/vline.png',
-
-	// used in button images and javascript
-	'add'             => WT_CSS_URL . 'images/add.png',
-	'button_family'   => WT_CSS_URL . 'images/buttons/family.png',
-	'minus'           => WT_CSS_URL . 'images/minus.png',
-	'plus'            => WT_CSS_URL . 'images/plus.png',
-	'remove'          => WT_CSS_URL . 'images/remove.png',
-	'search'          => WT_CSS_URL . 'images/search.png',
-
-	// need different sizes before moving to CSS
-	'default_image_F' => WT_CSS_URL . 'images/silhouette_female.png',
-	'default_image_M' => WT_CSS_URL . 'images/silhouette_male.png',
-	'default_image_U' => WT_CSS_URL . 'images/silhouette_unknown.png',
-);
-
-// Fan chart
-$fanChart = array(
-	'font'     => WT_ROOT . 'includes/fonts/DejaVuSans.ttf',
-	'size'     => 7,
-	'color'    => '#000000',
-	'bgColor'  => '#eeeeee',
-	'bgMColor' => '#b1cff0',
-	'bgFColor' => '#e9daf1'
-);
-
-// variables for the pedigree chart
-$bwidth        = 260; // width of boxes on pedigree chart
-$bheight       = 80;  // height of boxes on pedigree chart
-$baseyoffset   = 10;  // position the entire pedigree tree relative to the top of the page
-$basexoffset   = 10;  // position the entire pedigree tree relative to the left of the page
-$bxspacing     = 0;   // horizontal spacing between boxes on the pedigree chart
-$byspacing     = 5;   // vertical spacing between boxes on the pedigree chart
-$brborder      = 1;   // box right border thickness
-$linewidth     = 1.5; // width of joining lines
-$shadowcolor   = '';  // shadow color for joining lines
-$shadowblur    = 0;   // shadow blur for joining lines
-$shadowoffsetX = 0;   // shadowOffsetX for joining lines
-$shadowoffsetY = 0;   // shadowOffsetY for joining lines
-
-// Descendancy and relationship chart variables
-$Dbaseyoffset  = 20;  // position the entire descendancy tree relative to the top of the page
-$Dbasexoffset  = 20;  // position the entire descendancy tree relative to the left of the page
-$Dbxspacing    = 5;   // horizontal spacing between boxes
-$Dbyspacing    = 10;  // vertical spacing between boxes
-$Dbwidth       = 290; // width of DIV layer boxes
-$Dbheight      = 80;  // height of DIV layer boxes
-$Dindent       = 15;  // width to indent descendancy boxes
-$Darrowwidth   = 30;  // additional width to include for the up arrows
-
-// Dimensions for compact version of chart displays
-$cbwidth  = 240;
-$cbheight = 50;
-
-// The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels
-$WT_STATS_S_CHART_X = 440;
-$WT_STATS_S_CHART_Y = 125;
-$WT_STATS_L_CHART_X = 900;
-
-// For map charts, the maximum size is 440 pixels wide by 220 pixels high
-$WT_STATS_MAP_X = 440;
-$WT_STATS_MAP_Y = 220;
-$WT_STATS_CHART_COLOR1='ffffff';
-$WT_STATS_CHART_COLOR2='9ca3d4';
-$WT_STATS_CHART_COLOR3='e5e6ef';
+return new WT\Theme\Fab;
diff --git a/themes/minimal/css-1.6.2/favicon.png b/themes/minimal/css-1.7.0/favicon.png
index 3ee61e9479..3ee61e9479 100644
--- a/themes/minimal/css-1.6.2/favicon.png
+++ b/themes/minimal/css-1.7.0/favicon.png
diff --git a/themes/minimal/css-1.6.2/images/add.png b/themes/minimal/css-1.7.0/images/add.png
index c4554632f2..c4554632f2 100644
--- a/themes/minimal/css-1.6.2/images/add.png
+++ b/themes/minimal/css-1.7.0/images/add.png
diff --git a/themes/minimal/css-1.6.2/images/addmedia.png b/themes/minimal/css-1.7.0/images/addmedia.png
index a02e95f710..a02e95f710 100644
--- a/themes/minimal/css-1.6.2/images/addmedia.png
+++ b/themes/minimal/css-1.7.0/images/addmedia.png
diff --git a/themes/minimal/css-1.6.2/images/addnote.png b/themes/minimal/css-1.7.0/images/addnote.png
index 08cd9e7d99..08cd9e7d99 100644
--- a/themes/minimal/css-1.6.2/images/addnote.png
+++ b/themes/minimal/css-1.7.0/images/addnote.png
diff --git a/themes/minimal/css-1.6.2/images/addrepository.png b/themes/minimal/css-1.7.0/images/addrepository.png
index 70ddfb3d47..70ddfb3d47 100644
--- a/themes/minimal/css-1.6.2/images/addrepository.png
+++ b/themes/minimal/css-1.7.0/images/addrepository.png
diff --git a/themes/minimal/css-1.6.2/images/addsource.png b/themes/minimal/css-1.7.0/images/addsource.png
index 15cbeaa9fc..15cbeaa9fc 100644
--- a/themes/minimal/css-1.6.2/images/addsource.png
+++ b/themes/minimal/css-1.7.0/images/addsource.png
diff --git a/themes/minimal/css-1.6.2/images/admin.png b/themes/minimal/css-1.7.0/images/admin.png
index 8f9ff90de4..8f9ff90de4 100644
--- a/themes/minimal/css-1.6.2/images/admin.png
+++ b/themes/minimal/css-1.7.0/images/admin.png
diff --git a/themes/minimal/css-1.6.2/images/bing.png b/themes/minimal/css-1.7.0/images/bing.png
index cdb327946a..cdb327946a 100644
--- a/themes/minimal/css-1.6.2/images/bing.png
+++ b/themes/minimal/css-1.7.0/images/bing.png
diff --git a/themes/minimal/css-1.6.2/images/calendar.png b/themes/minimal/css-1.7.0/images/calendar.png
index 9f9f87c059..9f9f87c059 100644
--- a/themes/minimal/css-1.6.2/images/calendar.png
+++ b/themes/minimal/css-1.7.0/images/calendar.png
diff --git a/themes/minimal/css-1.6.2/images/cfamily.png b/themes/minimal/css-1.7.0/images/cfamily.png
index 501a76e7b4..501a76e7b4 100644
--- a/themes/minimal/css-1.6.2/images/cfamily.png
+++ b/themes/minimal/css-1.7.0/images/cfamily.png
diff --git a/themes/minimal/css-1.6.2/images/childless.png b/themes/minimal/css-1.7.0/images/childless.png
index c41e7cf7c4..c41e7cf7c4 100644
--- a/themes/minimal/css-1.6.2/images/childless.png
+++ b/themes/minimal/css-1.7.0/images/childless.png
diff --git a/themes/minimal/css-1.6.2/images/children.png b/themes/minimal/css-1.7.0/images/children.png
index 64d2503625..64d2503625 100644
--- a/themes/minimal/css-1.6.2/images/children.png
+++ b/themes/minimal/css-1.7.0/images/children.png
diff --git a/themes/minimal/css-1.6.2/images/clippings.png b/themes/minimal/css-1.7.0/images/clippings.png
index a8aec1e456..a8aec1e456 100644
--- a/themes/minimal/css-1.6.2/images/clippings.png
+++ b/themes/minimal/css-1.7.0/images/clippings.png
diff --git a/themes/minimal/css-1.6.2/images/controls.png b/themes/minimal/css-1.7.0/images/controls.png
index 140c6fc4ae..140c6fc4ae 100644
--- a/themes/minimal/css-1.6.2/images/controls.png
+++ b/themes/minimal/css-1.7.0/images/controls.png
diff --git a/themes/minimal/css-1.6.2/images/copy.png b/themes/minimal/css-1.7.0/images/copy.png
index 7397f49c27..7397f49c27 100644
--- a/themes/minimal/css-1.6.2/images/copy.png
+++ b/themes/minimal/css-1.7.0/images/copy.png
diff --git a/themes/minimal/css-1.6.2/images/darrow.png b/themes/minimal/css-1.7.0/images/darrow.png
index afd6db8d2e..afd6db8d2e 100644
--- a/themes/minimal/css-1.6.2/images/darrow.png
+++ b/themes/minimal/css-1.7.0/images/darrow.png
diff --git a/themes/minimal/css-1.6.2/images/darrow2.png b/themes/minimal/css-1.7.0/images/darrow2.png
index f201c14ef0..f201c14ef0 100644
--- a/themes/minimal/css-1.6.2/images/darrow2.png
+++ b/themes/minimal/css-1.7.0/images/darrow2.png
diff --git a/themes/minimal/css-1.6.2/images/ddarrow.png b/themes/minimal/css-1.7.0/images/ddarrow.png
index 1c835877a6..1c835877a6 100644
--- a/themes/minimal/css-1.6.2/images/ddarrow.png
+++ b/themes/minimal/css-1.7.0/images/ddarrow.png
diff --git a/themes/minimal/css-1.6.2/images/ddarrow2.png b/themes/minimal/css-1.7.0/images/ddarrow2.png
index 23671f8ff1..23671f8ff1 100644
--- a/themes/minimal/css-1.6.2/images/ddarrow2.png
+++ b/themes/minimal/css-1.7.0/images/ddarrow2.png
diff --git a/themes/minimal/css-1.6.2/images/delete.png b/themes/minimal/css-1.7.0/images/delete.png
index 7ce1741b6b..7ce1741b6b 100644
--- a/themes/minimal/css-1.6.2/images/delete.png
+++ b/themes/minimal/css-1.7.0/images/delete.png
diff --git a/themes/minimal/css-1.6.2/images/dline.png b/themes/minimal/css-1.7.0/images/dline.png
index 079e06bed0..079e06bed0 100644
--- a/themes/minimal/css-1.6.2/images/dline.png
+++ b/themes/minimal/css-1.7.0/images/dline.png
diff --git a/themes/minimal/css-1.6.2/images/dline2.png b/themes/minimal/css-1.7.0/images/dline2.png
index 6b2c4d0158..6b2c4d0158 100644
--- a/themes/minimal/css-1.6.2/images/dline2.png
+++ b/themes/minimal/css-1.7.0/images/dline2.png
diff --git a/themes/minimal/css-1.6.2/images/edit_sm.png b/themes/minimal/css-1.7.0/images/edit_sm.png
index fe99f49c78..fe99f49c78 100644
--- a/themes/minimal/css-1.6.2/images/edit_sm.png
+++ b/themes/minimal/css-1.7.0/images/edit_sm.png
diff --git a/themes/minimal/css-1.6.2/images/email.png b/themes/minimal/css-1.7.0/images/email.png
index dc7c09d983..dc7c09d983 100644
--- a/themes/minimal/css-1.6.2/images/email.png
+++ b/themes/minimal/css-1.7.0/images/email.png
diff --git a/themes/minimal/css-1.6.2/images/fambook.png b/themes/minimal/css-1.7.0/images/fambook.png
index 97f48fa174..97f48fa174 100644
--- a/themes/minimal/css-1.6.2/images/fambook.png
+++ b/themes/minimal/css-1.7.0/images/fambook.png
diff --git a/themes/minimal/css-1.6.2/images/family.png b/themes/minimal/css-1.7.0/images/family.png
index 846e5a5ac8..846e5a5ac8 100644
--- a/themes/minimal/css-1.6.2/images/family.png
+++ b/themes/minimal/css-1.7.0/images/family.png
diff --git a/themes/minimal/css-1.7.0/images/find.png b/themes/minimal/css-1.7.0/images/find.png
new file mode 100644
index 0000000000..be6c6002e4
--- /dev/null
+++ b/themes/minimal/css-1.7.0/images/find.png
diff --git a/themes/minimal/css-1.6.2/images/find_facts.png b/themes/minimal/css-1.7.0/images/find_facts.png
index 6d142b587c..6d142b587c 100644
--- a/themes/minimal/css-1.6.2/images/find_facts.png
+++ b/themes/minimal/css-1.7.0/images/find_facts.png
diff --git a/themes/minimal/css-1.6.2/images/gedcom.png b/themes/minimal/css-1.7.0/images/gedcom.png
index e8f55b9a59..e8f55b9a59 100644
--- a/themes/minimal/css-1.6.2/images/gedcom.png
+++ b/themes/minimal/css-1.7.0/images/gedcom.png
diff --git a/themes/minimal/css-1.6.2/images/googlemaps.png b/themes/minimal/css-1.7.0/images/googlemaps.png
index 32a3957445..32a3957445 100644
--- a/themes/minimal/css-1.6.2/images/googlemaps.png
+++ b/themes/minimal/css-1.7.0/images/googlemaps.png
diff --git a/themes/minimal/css-1.6.2/images/head.png b/themes/minimal/css-1.7.0/images/head.png
index 7091085ce0..7091085ce0 100644
--- a/themes/minimal/css-1.6.2/images/head.png
+++ b/themes/minimal/css-1.7.0/images/head.png
diff --git a/themes/minimal/css-1.6.2/images/help.png b/themes/minimal/css-1.7.0/images/help.png
index eac53513f3..eac53513f3 100644
--- a/themes/minimal/css-1.6.2/images/help.png
+++ b/themes/minimal/css-1.7.0/images/help.png
diff --git a/themes/minimal/css-1.6.2/images/hline.png b/themes/minimal/css-1.7.0/images/hline.png
index 7d23f087d3..7d23f087d3 100644
--- a/themes/minimal/css-1.6.2/images/hline.png
+++ b/themes/minimal/css-1.7.0/images/hline.png
diff --git a/themes/minimal/css-1.6.2/images/icon-mime-sprite.png b/themes/minimal/css-1.7.0/images/icon-mime-sprite.png
index 8322ae4580..8322ae4580 100644
--- a/themes/minimal/css-1.6.2/images/icon-mime-sprite.png
+++ b/themes/minimal/css-1.7.0/images/icon-mime-sprite.png
diff --git a/themes/minimal/css-1.6.2/images/image_add.png b/themes/minimal/css-1.7.0/images/image_add.png
index ecac61c284..ecac61c284 100644
--- a/themes/minimal/css-1.6.2/images/image_add.png
+++ b/themes/minimal/css-1.7.0/images/image_add.png
diff --git a/themes/minimal/css-1.6.2/images/image_link.png b/themes/minimal/css-1.7.0/images/image_link.png
index 190b08e7d2..190b08e7d2 100644
--- a/themes/minimal/css-1.6.2/images/image_link.png
+++ b/themes/minimal/css-1.7.0/images/image_link.png
diff --git a/themes/minimal/css-1.6.2/images/images.png b/themes/minimal/css-1.7.0/images/images.png
index b3854d450a..b3854d450a 100644
--- a/themes/minimal/css-1.6.2/images/images.png
+++ b/themes/minimal/css-1.7.0/images/images.png
diff --git a/themes/minimal/css-1.6.2/images/indi.png b/themes/minimal/css-1.7.0/images/indi.png
index 42bbdad715..42bbdad715 100644
--- a/themes/minimal/css-1.6.2/images/indi.png
+++ b/themes/minimal/css-1.7.0/images/indi.png
diff --git a/themes/minimal/css-1.6.2/images/indi_sprite.png b/themes/minimal/css-1.7.0/images/indi_sprite.png
index 779bd03315..779bd03315 100644
--- a/themes/minimal/css-1.6.2/images/indi_sprite.png
+++ b/themes/minimal/css-1.7.0/images/indi_sprite.png
diff --git a/themes/minimal/css-1.6.2/images/indicator.gif b/themes/minimal/css-1.7.0/images/indicator.gif
index 085ccaecaf..085ccaecaf 100644
--- a/themes/minimal/css-1.6.2/images/indicator.gif
+++ b/themes/minimal/css-1.7.0/images/indicator.gif
diff --git a/themes/minimal/css-1.6.2/images/indis.png b/themes/minimal/css-1.7.0/images/indis.png
index ec22a41e55..ec22a41e55 100644
--- a/themes/minimal/css-1.6.2/images/indis.png
+++ b/themes/minimal/css-1.7.0/images/indis.png
diff --git a/themes/minimal/css-1.6.2/images/keyboard.png b/themes/minimal/css-1.7.0/images/keyboard.png
index 3366aa8b9b..3366aa8b9b 100644
--- a/themes/minimal/css-1.6.2/images/keyboard.png
+++ b/themes/minimal/css-1.7.0/images/keyboard.png
diff --git a/themes/minimal/css-1.6.2/images/larrow.png b/themes/minimal/css-1.7.0/images/larrow.png
index e9f6a17d2e..e9f6a17d2e 100644
--- a/themes/minimal/css-1.6.2/images/larrow.png
+++ b/themes/minimal/css-1.7.0/images/larrow.png
diff --git a/themes/minimal/css-1.6.2/images/larrow2.png b/themes/minimal/css-1.7.0/images/larrow2.png
index 99470f2ce7..99470f2ce7 100644
--- a/themes/minimal/css-1.6.2/images/larrow2.png
+++ b/themes/minimal/css-1.7.0/images/larrow2.png
diff --git a/themes/minimal/css-1.6.2/images/ldarrow.png b/themes/minimal/css-1.7.0/images/ldarrow.png
index 2891a76fd0..2891a76fd0 100644
--- a/themes/minimal/css-1.6.2/images/ldarrow.png
+++ b/themes/minimal/css-1.7.0/images/ldarrow.png
diff --git a/themes/minimal/css-1.6.2/images/ldarrow2.png b/themes/minimal/css-1.7.0/images/ldarrow2.png
index 0765020b8f..0765020b8f 100644
--- a/themes/minimal/css-1.6.2/images/ldarrow2.png
+++ b/themes/minimal/css-1.7.0/images/ldarrow2.png
diff --git a/themes/minimal/css-1.6.2/images/lifespan-chunk.png b/themes/minimal/css-1.7.0/images/lifespan-chunk.png
index 493ce7e39f..493ce7e39f 100644
--- a/themes/minimal/css-1.6.2/images/lifespan-chunk.png
+++ b/themes/minimal/css-1.7.0/images/lifespan-chunk.png
diff --git a/themes/minimal/css-1.6.2/images/lifespan-down.png b/themes/minimal/css-1.7.0/images/lifespan-down.png
index d06f382790..d06f382790 100644
--- a/themes/minimal/css-1.6.2/images/lifespan-down.png
+++ b/themes/minimal/css-1.7.0/images/lifespan-down.png
diff --git a/themes/minimal/css-1.6.2/images/lifespan-left.png b/themes/minimal/css-1.7.0/images/lifespan-left.png
index 50eecf5249..50eecf5249 100644
--- a/themes/minimal/css-1.6.2/images/lifespan-left.png
+++ b/themes/minimal/css-1.7.0/images/lifespan-left.png
diff --git a/themes/minimal/css-1.6.2/images/lifespan-right.png b/themes/minimal/css-1.7.0/images/lifespan-right.png
index 2c7675b1d1..2c7675b1d1 100644
--- a/themes/minimal/css-1.6.2/images/lifespan-right.png
+++ b/themes/minimal/css-1.7.0/images/lifespan-right.png
diff --git a/themes/minimal/css-1.6.2/images/lifespan-up.png b/themes/minimal/css-1.7.0/images/lifespan-up.png
index e155fe6ce0..e155fe6ce0 100644
--- a/themes/minimal/css-1.6.2/images/lifespan-up.png
+++ b/themes/minimal/css-1.7.0/images/lifespan-up.png
diff --git a/themes/minimal/css-1.6.2/images/loading.gif b/themes/minimal/css-1.7.0/images/loading.gif
index 5bb90fd6a4..5bb90fd6a4 100644
--- a/themes/minimal/css-1.6.2/images/loading.gif
+++ b/themes/minimal/css-1.7.0/images/loading.gif
diff --git a/themes/minimal/css-1.6.2/images/mapquest.png b/themes/minimal/css-1.7.0/images/mapquest.png
index f70eb12d63..f70eb12d63 100644
--- a/themes/minimal/css-1.6.2/images/mapquest.png
+++ b/themes/minimal/css-1.7.0/images/mapquest.png
diff --git a/themes/minimal/css-1.6.2/images/media.png b/themes/minimal/css-1.7.0/images/media.png
index 7aed5d7211..7aed5d7211 100644
--- a/themes/minimal/css-1.6.2/images/media.png
+++ b/themes/minimal/css-1.7.0/images/media.png
diff --git a/themes/minimal/css-1.6.2/images/minus.png b/themes/minimal/css-1.7.0/images/minus.png
index 18cedc3928..18cedc3928 100644
--- a/themes/minimal/css-1.6.2/images/minus.png
+++ b/themes/minimal/css-1.7.0/images/minus.png
diff --git a/themes/minimal/css-1.6.2/images/move.png b/themes/minimal/css-1.7.0/images/move.png
index c1d4733ffd..c1d4733ffd 100644
--- a/themes/minimal/css-1.6.2/images/move.png
+++ b/themes/minimal/css-1.7.0/images/move.png
diff --git a/themes/minimal/css-1.6.2/images/mypage.png b/themes/minimal/css-1.7.0/images/mypage.png
index eac878a4a3..eac878a4a3 100644
--- a/themes/minimal/css-1.6.2/images/mypage.png
+++ b/themes/minimal/css-1.7.0/images/mypage.png
diff --git a/themes/minimal/css-1.6.2/images/note.png b/themes/minimal/css-1.7.0/images/note.png
index f7fa6b69e0..f7fa6b69e0 100644
--- a/themes/minimal/css-1.6.2/images/note.png
+++ b/themes/minimal/css-1.7.0/images/note.png
diff --git a/themes/minimal/css-1.6.2/images/notes.png b/themes/minimal/css-1.7.0/images/notes.png
index aa755c502e..aa755c502e 100644
--- a/themes/minimal/css-1.6.2/images/notes.png
+++ b/themes/minimal/css-1.7.0/images/notes.png
diff --git a/themes/minimal/css-1.6.2/images/osm.png b/themes/minimal/css-1.7.0/images/osm.png
index 899e2a58b6..899e2a58b6 100644
--- a/themes/minimal/css-1.6.2/images/osm.png
+++ b/themes/minimal/css-1.7.0/images/osm.png
diff --git a/themes/minimal/css-1.6.2/images/patriarch.png b/themes/minimal/css-1.7.0/images/patriarch.png
index 146a3ab4e5..146a3ab4e5 100644
--- a/themes/minimal/css-1.6.2/images/patriarch.png
+++ b/themes/minimal/css-1.7.0/images/patriarch.png
diff --git a/themes/minimal/css-1.6.2/images/pedigree.png b/themes/minimal/css-1.7.0/images/pedigree.png
index d8dae6dfb1..d8dae6dfb1 100644
--- a/themes/minimal/css-1.6.2/images/pedigree.png
+++ b/themes/minimal/css-1.7.0/images/pedigree.png
diff --git a/themes/minimal/css-1.6.2/images/place.png b/themes/minimal/css-1.7.0/images/place.png
index 42c748b859..42c748b859 100644
--- a/themes/minimal/css-1.6.2/images/place.png
+++ b/themes/minimal/css-1.7.0/images/place.png
diff --git a/themes/minimal/css-1.6.2/images/plus.png b/themes/minimal/css-1.7.0/images/plus.png
index ba2d990c80..ba2d990c80 100644
--- a/themes/minimal/css-1.6.2/images/plus.png
+++ b/themes/minimal/css-1.7.0/images/plus.png
diff --git a/themes/minimal/css-1.6.2/images/rarrow.png b/themes/minimal/css-1.7.0/images/rarrow.png
index 0db18af532..0db18af532 100644
--- a/themes/minimal/css-1.6.2/images/rarrow.png
+++ b/themes/minimal/css-1.7.0/images/rarrow.png
diff --git a/themes/minimal/css-1.6.2/images/rarrow2.png b/themes/minimal/css-1.7.0/images/rarrow2.png
index a16cb4200e..a16cb4200e 100644
--- a/themes/minimal/css-1.6.2/images/rarrow2.png
+++ b/themes/minimal/css-1.7.0/images/rarrow2.png
diff --git a/themes/minimal/css-1.6.2/images/rdarrow.png b/themes/minimal/css-1.7.0/images/rdarrow.png
index 5c8780cd0a..5c8780cd0a 100644
--- a/themes/minimal/css-1.6.2/images/rdarrow.png
+++ b/themes/minimal/css-1.7.0/images/rdarrow.png
diff --git a/themes/minimal/css-1.6.2/images/rdarrow2.png b/themes/minimal/css-1.7.0/images/rdarrow2.png
index 6626c665dc..6626c665dc 100644
--- a/themes/minimal/css-1.6.2/images/rdarrow2.png
+++ b/themes/minimal/css-1.7.0/images/rdarrow2.png
diff --git a/themes/minimal/css-1.6.2/images/reminder.png b/themes/minimal/css-1.7.0/images/reminder.png
index 9b00de1562..9b00de1562 100644
--- a/themes/minimal/css-1.6.2/images/reminder.png
+++ b/themes/minimal/css-1.7.0/images/reminder.png
diff --git a/themes/minimal/css-1.6.2/images/remove.png b/themes/minimal/css-1.7.0/images/remove.png
index a85e5dd466..a85e5dd466 100644
--- a/themes/minimal/css-1.6.2/images/remove.png
+++ b/themes/minimal/css-1.7.0/images/remove.png
diff --git a/themes/minimal/css-1.6.2/images/reorder.png b/themes/minimal/css-1.7.0/images/reorder.png
index 2cfe889ad1..2cfe889ad1 100644
--- a/themes/minimal/css-1.6.2/images/reorder.png
+++ b/themes/minimal/css-1.7.0/images/reorder.png
diff --git a/themes/minimal/css-1.6.2/images/repository.png b/themes/minimal/css-1.7.0/images/repository.png
index f59edee879..f59edee879 100644
--- a/themes/minimal/css-1.6.2/images/repository.png
+++ b/themes/minimal/css-1.7.0/images/repository.png
diff --git a/themes/minimal/css-1.6.2/images/rings.png b/themes/minimal/css-1.7.0/images/rings.png
index 698927d4b8..698927d4b8 100644
--- a/themes/minimal/css-1.6.2/images/rings.png
+++ b/themes/minimal/css-1.7.0/images/rings.png
diff --git a/themes/minimal/css-1.6.2/images/search.png b/themes/minimal/css-1.7.0/images/search.png
index c003b7c73b..c003b7c73b 100644
--- a/themes/minimal/css-1.6.2/images/search.png
+++ b/themes/minimal/css-1.7.0/images/search.png
diff --git a/themes/minimal/css-1.6.2/images/selected.png b/themes/minimal/css-1.7.0/images/selected.png
index 8cd36aabd1..8cd36aabd1 100644
--- a/themes/minimal/css-1.6.2/images/selected.png
+++ b/themes/minimal/css-1.7.0/images/selected.png
diff --git a/themes/minimal/css-1.6.2/images/sex_f_15x15.png b/themes/minimal/css-1.7.0/images/sex_f_15x15.png
index 196c9549d5..196c9549d5 100644
--- a/themes/minimal/css-1.6.2/images/sex_f_15x15.png
+++ b/themes/minimal/css-1.7.0/images/sex_f_15x15.png
diff --git a/themes/minimal/css-1.6.2/images/sex_f_9x9.png b/themes/minimal/css-1.7.0/images/sex_f_9x9.png
index 9bc0dd7ae2..9bc0dd7ae2 100644
--- a/themes/minimal/css-1.6.2/images/sex_f_9x9.png
+++ b/themes/minimal/css-1.7.0/images/sex_f_9x9.png
diff --git a/themes/minimal/css-1.6.2/images/sex_m_15x15.png b/themes/minimal/css-1.7.0/images/sex_m_15x15.png
index 34de9d351c..34de9d351c 100644
--- a/themes/minimal/css-1.6.2/images/sex_m_15x15.png
+++ b/themes/minimal/css-1.7.0/images/sex_m_15x15.png
diff --git a/themes/minimal/css-1.6.2/images/sex_m_9x9.png b/themes/minimal/css-1.7.0/images/sex_m_9x9.png
index b74f8d8749..b74f8d8749 100644
--- a/themes/minimal/css-1.6.2/images/sex_m_9x9.png
+++ b/themes/minimal/css-1.7.0/images/sex_m_9x9.png
diff --git a/themes/minimal/css-1.6.2/images/sex_u_15x15.png b/themes/minimal/css-1.7.0/images/sex_u_15x15.png
index f613fab065..f613fab065 100644
--- a/themes/minimal/css-1.6.2/images/sex_u_15x15.png
+++ b/themes/minimal/css-1.7.0/images/sex_u_15x15.png
diff --git a/themes/minimal/css-1.6.2/images/sex_u_9x9.png b/themes/minimal/css-1.7.0/images/sex_u_9x9.png
index 26c6056885..26c6056885 100644
--- a/themes/minimal/css-1.6.2/images/sex_u_9x9.png
+++ b/themes/minimal/css-1.7.0/images/sex_u_9x9.png
diff --git a/themes/minimal/css-1.6.2/images/sfamily.png b/themes/minimal/css-1.7.0/images/sfamily.png
index 728294da1f..728294da1f 100644
--- a/themes/minimal/css-1.6.2/images/sfamily.png
+++ b/themes/minimal/css-1.7.0/images/sfamily.png
diff --git a/themes/minimal/css-1.6.2/images/silhouette_female.png b/themes/minimal/css-1.7.0/images/silhouette_female.png
index 871eaa753a..871eaa753a 100644
--- a/themes/minimal/css-1.6.2/images/silhouette_female.png
+++ b/themes/minimal/css-1.7.0/images/silhouette_female.png
diff --git a/themes/minimal/css-1.6.2/images/silhouette_female_small.png b/themes/minimal/css-1.7.0/images/silhouette_female_small.png
index abec42136f..abec42136f 100644
--- a/themes/minimal/css-1.6.2/images/silhouette_female_small.png
+++ b/themes/minimal/css-1.7.0/images/silhouette_female_small.png
diff --git a/themes/minimal/css-1.6.2/images/silhouette_male.png b/themes/minimal/css-1.7.0/images/silhouette_male.png
index d2f1009a19..d2f1009a19 100644
--- a/themes/minimal/css-1.6.2/images/silhouette_male.png
+++ b/themes/minimal/css-1.7.0/images/silhouette_male.png
diff --git a/themes/minimal/css-1.6.2/images/silhouette_male_small.png b/themes/minimal/css-1.7.0/images/silhouette_male_small.png
index c9b4a18c6d..c9b4a18c6d 100644
--- a/themes/minimal/css-1.6.2/images/silhouette_male_small.png
+++ b/themes/minimal/css-1.7.0/images/silhouette_male_small.png
diff --git a/themes/minimal/css-1.6.2/images/silhouette_unknown.png b/themes/minimal/css-1.7.0/images/silhouette_unknown.png
index d0417439ee..d0417439ee 100644
--- a/themes/minimal/css-1.6.2/images/silhouette_unknown.png
+++ b/themes/minimal/css-1.7.0/images/silhouette_unknown.png
diff --git a/themes/minimal/css-1.6.2/images/silhouette_unknown_small.png b/themes/minimal/css-1.7.0/images/silhouette_unknown_small.png
index 9602cffaa0..9602cffaa0 100644
--- a/themes/minimal/css-1.6.2/images/silhouette_unknown_small.png
+++ b/themes/minimal/css-1.7.0/images/silhouette_unknown_small.png
diff --git a/themes/minimal/css-1.6.2/images/source.png b/themes/minimal/css-1.7.0/images/source.png
index 85b40f744c..85b40f744c 100644
--- a/themes/minimal/css-1.6.2/images/source.png
+++ b/themes/minimal/css-1.7.0/images/source.png
diff --git a/themes/minimal/css-1.6.2/images/spacer.png b/themes/minimal/css-1.7.0/images/spacer.png
index a31b396979..a31b396979 100644
--- a/themes/minimal/css-1.6.2/images/spacer.png
+++ b/themes/minimal/css-1.7.0/images/spacer.png
diff --git a/themes/minimal/css-1.6.2/images/stop.png b/themes/minimal/css-1.7.0/images/stop.png
index 3b74a6d27a..3b74a6d27a 100644
--- a/themes/minimal/css-1.6.2/images/stop.png
+++ b/themes/minimal/css-1.7.0/images/stop.png
diff --git a/themes/minimal/css-1.6.2/images/target.png b/themes/minimal/css-1.7.0/images/target.png
index a35d214ec1..a35d214ec1 100644
--- a/themes/minimal/css-1.6.2/images/target.png
+++ b/themes/minimal/css-1.7.0/images/target.png
diff --git a/themes/minimal/css-1.6.2/images/uarrow.png b/themes/minimal/css-1.7.0/images/uarrow.png
index 8644bab717..8644bab717 100644
--- a/themes/minimal/css-1.6.2/images/uarrow.png
+++ b/themes/minimal/css-1.7.0/images/uarrow.png
diff --git a/themes/minimal/css-1.6.2/images/uarrow2.png b/themes/minimal/css-1.7.0/images/uarrow2.png
index 411bde2fb7..411bde2fb7 100644
--- a/themes/minimal/css-1.6.2/images/uarrow2.png
+++ b/themes/minimal/css-1.7.0/images/uarrow2.png
diff --git a/themes/minimal/css-1.6.2/images/udarrow.png b/themes/minimal/css-1.7.0/images/udarrow.png
index 373449d1d3..373449d1d3 100644
--- a/themes/minimal/css-1.6.2/images/udarrow.png
+++ b/themes/minimal/css-1.7.0/images/udarrow.png
diff --git a/themes/minimal/css-1.6.2/images/udarrow2.png b/themes/minimal/css-1.7.0/images/udarrow2.png
index 28b703d00e..28b703d00e 100644
--- a/themes/minimal/css-1.6.2/images/udarrow2.png
+++ b/themes/minimal/css-1.7.0/images/udarrow2.png
diff --git a/themes/minimal/css-1.6.2/images/user_add.png b/themes/minimal/css-1.7.0/images/user_add.png
index 8d8fe63d15..8d8fe63d15 100644
--- a/themes/minimal/css-1.6.2/images/user_add.png
+++ b/themes/minimal/css-1.7.0/images/user_add.png
diff --git a/themes/minimal/css-1.6.2/images/vline.png b/themes/minimal/css-1.7.0/images/vline.png
index 4aefe4df4e..4aefe4df4e 100644
--- a/themes/minimal/css-1.6.2/images/vline.png
+++ b/themes/minimal/css-1.7.0/images/vline.png
diff --git a/themes/minimal/css-1.6.2/images/w_button.png b/themes/minimal/css-1.7.0/images/w_button.png
index f60a7af1bc..f60a7af1bc 100644
--- a/themes/minimal/css-1.6.2/images/w_button.png
+++ b/themes/minimal/css-1.7.0/images/w_button.png
diff --git a/themes/minimal/css-1.6.2/images/warning.png b/themes/minimal/css-1.7.0/images/warning.png
index 5f3759b4a4..5f3759b4a4 100644
--- a/themes/minimal/css-1.6.2/images/warning.png
+++ b/themes/minimal/css-1.7.0/images/warning.png
diff --git a/themes/minimal/css-1.6.2/images/zoomin.png b/themes/minimal/css-1.7.0/images/zoomin.png
index ef48724f00..ef48724f00 100644
--- a/themes/minimal/css-1.6.2/images/zoomin.png
+++ b/themes/minimal/css-1.7.0/images/zoomin.png
diff --git a/themes/minimal/css-1.6.2/images/zoomout.png b/themes/minimal/css-1.7.0/images/zoomout.png
index d4057083d0..d4057083d0 100644
--- a/themes/minimal/css-1.6.2/images/zoomout.png
+++ b/themes/minimal/css-1.7.0/images/zoomout.png
diff --git a/themes/minimal/css-1.6.2/style.css b/themes/minimal/css-1.7.0/style.css
index 7b7cd6ab62..a1b7f0e1cf 100644
--- a/themes/minimal/css-1.6.2/style.css
+++ b/themes/minimal/css-1.7.0/style.css
@@ -5,7 +5,9 @@
 * Copyright (C) 2014 webtrees development team.
 *
 * Derived from PhpGedView
-* Copyright (C) 2002 to 2010 PGV Development Team.
+* Copyright (C) 2002 to 2009 PGV Development Team.
+*
+* Mime-type icons from http://gnome-look.org, published under GPL (v2)
 *
 * 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
@@ -22,6 +24,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+/* ======== Globals ========== */
+
 /* Add a permanent scrollbar, to prevent "flickering" when hover effects lengthen page */
 html {
 	overflow-y: scroll;
@@ -35,33 +39,14 @@ body {
 
 main {
 	display: block;
+	clear: both;
 }
 
-fieldset {
-	margin: 8px 8px 4px;
-	text-align: left;
-}
-
-[dir=rtl] fieldset {
-	text-align: right;
-}
-
-legend {
-	font-weight: bold;
-}
-
-a {
-	color: #666;
-	text-decoration: none;
-}
+/* ====== Round Corners ======== */
 
-a:hover {
-	color: #555;
-	text-decoration: underline;
-}
-
-:focus {
-	outline-style: none;
+/* ios on click workaround */
+.iconz {
+	cursor: pointer;
 }
 
 input:required:valid,
@@ -81,303 +66,117 @@ textarea:required:invalid {
 	background-position: left top;
 }
 
-/* ======= Layout for top header ======= */
-
-/* Set stack level for top two header menu rows */
-.makeMenu ul,
-#main-menu ul {
-	z-index: 210;
-}
-
-/* Row one */
-header h1 {
-	float: left;
-	clear: left;
-	font-size: 26px;
-	font-weight: 900;
-	margin: 0;
-}
-
-[dir=rtl] header h1 {
-	float: right;
-	clear: right;
-}
-
-#header-user-links {
-	float: right;
-}
-
-[dir=rtl] #header-user-links {
-	float: left;
-	clear: left;
-}
-
-/* Row two */
-.makeMenu {
-	font-size: 14px;
-}
-
-.makeMenu li {
-	background: none !important;
-	border: 1px solid #999;
-	display: inline;
-	float: left;
-	line-height: 26px;
-	position: relative;
-	white-space: nowrap;
-}
-
-.makeMenu li a {
-	padding: 5px 8px;
+a {
+	color: #666;
+	text-decoration: none;
 }
 
-.makeMenu li ul {
-	display: none;
-	font-weight: normal;
-	font-size: 12px;
-	position: absolute;
-	left: 0;
-	right: auto;
-	top: 26px;
-	background-color: #fff;
-	border: 1px solid #999;
+a:hover {
+	color: #555;
+	text-decoration: underline;
 }
 
-/* position sub-menus */
-.makeMenu ul ul {
-	background: #eee;
-	top: 0;
-	left: 100px;
+:focus {
+	outline-style: none;
 }
 
-.makeMenu li ul li {
-	border: 0;
+#flash-messages {
 	clear: both;
-	display: block;
-	line-height: 2;
-	text-align: left;
 }
 
-.makeMenu,
-.makeMenu li ul {
-	list-style: none;
+dl {
 	margin: 0;
-	padding: 1px;
-}
-
-.makeMenu li:hover > ul {
-	display: block;
-}
-
-.makeMenu ul li a {
-	padding: 0 5px 0 2px;
-	display: block;
-}
-
-.lang-active,
-.theme-active {
-	font-weight: 900;
-}
-
-/* --- RTL --- */
-[dir=rtl] .makeMenu li {
-	float: right;
-}
-
-[dir=rtl] .makeMenu li ul {
-	left: auto;
-	right: 0;
-}
-
-[dir=rtl] .makeMenu ul ul {
-	top: 0;
-	left: auto;
-	right: 100px;
 }
 
-[dir=rtl] .makeMenu li ul li {
-	text-align: right;
-}
-
-/* set up container for menu */
-#topMenu {
-	position: relative;
+dt {
 	float: left;
-	width: 100%;
-	margin-top: 18px;
-	border-bottom: 1px solid;
-	margin-bottom: 10px;
+	font-weight: bold;
+	margin-right: 10px;
+	clear: both;
 }
 
-#topMenu ul {
-	position: relative;
+[dir=rtl] dt {
 	float: right;
-	right: 50%;
-	list-style: none;
-}
-
-#topMenu ul li {
-	position: relative;
-	float: left;
-	left: 50%;
-	clear: right;
-	width: auto;
-	padding: 0 5px;
-	border: 1px solid #999;
-}
-
-#topMenu ul li a {
-	display: block;
-	font-size: 14px;
-	text-align: center;
-	padding: 5px;
-	background-color: #fff;
-}
-
-/* Subnavigation section */
-#topMenu ul li ul {
-	position: absolute;
-	top: 27px;
-	left: 0;
-	right: auto;
-	display: none;
-	background: #fff;
-	white-space: nowrap;
-	border: 1px solid #999;
-}
-
-/* sub-sub-menus */
-#topMenu ul ul ul {
-	top: 0;
-	left: 96px;
-	border: 1px solid #999;
+	margin-right: auto;
+	margin-left: 10px;
 }
 
-#topMenu ul ul li {
-	float: left;
-	width: 100%;
-	border: 0;
-	left: auto;
-	margin: 0;
-	padding: 0;
-	clear: left;
+h2 {
+	color: #555;
+	font-size: 18px;
+	font-weight: bold;
 }
 
-#topMenu ul ul li a {
-	padding: 5px;
-	text-align: left;
+h4 {
+	color: #555;
 	font-size: 12px;
+	font-weight: bold;
 }
 
-/* header hover */
-#topMenu ul li:hover > ul {
-	position: absolute;
-	margin: 0;
-	display: block;
-	text-align: left;
-	padding: 0;
-}
-
-#topMenu ul #menu-chart li:hover ul,
-#topMenu ul #menu-obje li:hover ul {
-	position: absolute;
-	display: block;
-	margin-left: 100%;
-	left: 0;
-}
-
-/* --- RTL --- */
-[dir=rtl] #topMenu {
-	float: right;
-}
-
-[dir=rtl] #topMenu ul {
-	right: auto;
-	float: left;
-	left: 50%;
-}
-
-[dir=rtl] #topMenu ul li {
-	float: right;
-	clear: left;
-	right: 50%;
+th {
+	font-weight: 100;
 }
 
-[dir=rtl] #topMenu ul ul {
-	right: 0;
-	left: auto;
+ul {
+	padding-left: 15px;
+	padding-right: 15px;
+	margin: 8px;
 }
 
-[dir=rtl] #topMenu ul ul li {
-	right: auto; /*resets the right:50% on the parent li */
-	clear: right;
-	float: right;
-	width: 100%;
+img {
+	border: 0;
 }
 
-[dir=rtl] #topMenu ul ul li a {
-	text-align: right;
-}
 
-[dir=rtl] #topMenu ul li:hover > ul {
-	text-align: right;
+img.block {
+	border: 0;
+	height: 20px;
+	vertical-align: middle;
 }
 
-[dir=rtl] #topMenu ul #menu-chart li:hover ul {
-	margin-right: 100%;
-	right: 0;
-	left: auto;
+input,
+textarea {
+	padding-left: 3px;
+	padding-right: 3px;
+	font-family: inherit;
 }
 
-[dir=rtl] #topMenu ul #menu-obje li:hover ul {
-	margin-right: 100%;
-	right: 0;
-	left: auto;
+#home-page {
+	margin-top: 10px;
 }
 
-#flash-messages {
+#content {
 	clear: both;
+	margin-left: 1px;
 }
 
-/* --- end headers --- */
-
-h2 {
-	color: #555;
-	font-weight: bold;
-	font-size: 18px;
-}
-
-h4 {
+.topbottombar {
 	color: #555;
+	background-color: #eee;
+	border: 1px solid #555;
 	font-weight: bold;
 	font-size: 12px;
+	padding: 4px;
+	text-align: center;
 }
 
-th {
-	font-weight: 100;
+fieldset {
+	margin: 8px 8px 4px;
+	text-align: left;
 }
 
-ul {
-	padding-left: 15px;
-	padding-right: 15px;
-	margin: 8px;
+[dir=rtl] fieldset {
+	text-align: right;
 }
 
-img {
-	border: 0;
+legend {
+	font-weight: bold;
 }
 
 .button {
 	width: 60px;
 }
 
-input,
-textarea {
-	padding-left: 3px;
-	padding-right: 3px;
-	font-family: inherit;
-}
-
 .person_box {
 	background: #fff;
 	border: solid #555 1px;
@@ -414,35 +213,37 @@ textarea {
 	min-height: 50px;
 }
 
-.list_table {
+.center {
+	text-align: center;
 	margin-left: auto;
 	margin-right: auto;
 }
 
-.center {
-	text-align: center;
+table.center {
+	margin-left: auto;
+	margin-right: auto;
 }
 
-table.center {
+.list_table {
 	margin-left: auto;
 	margin-right: auto;
 }
 
 .list_label,
 .list_label_wrap {
+	font-size: 12px;
 	color: #555;
 	background-color: #eee;
 	border: 1px solid #555;
-	font-size: 12px;
 	text-align: center;
 }
 
 .list_value,
 .list_value_wrap {
 	background-color: #fff;
+	font-size: 12px;
 	color: #555;
 	border: solid #555 1px;
-	font-size: 12px;
 	vertical-align: top;
 }
 
@@ -481,35 +282,36 @@ div.fact_SHARED_NOTE {
 .facts_label03 {
 	color: #555;
 	background-color: #eee;
-	border: 1px solid #555;
-	font-weight: bold;
 	font-size: 12px;
+	border: 1px solid #555;
 	padding: 4px;
-	width: 20%;
 	text-align: center;
+	font-weight: bold;
+	width: 20%;
+
 }
 
 .facts_value {
 	background-color: #fff;
+	font-size: 12px;
 	color: #555;
 	border: solid #555 1px;
-	font-size: 12px;
 	padding: 4px;
 }
 
 .quickfacts a {
-	font-size: 9px;
 	padding: 0 3px;
+	font-size: 9px;
 }
 
 .tabs_table {
-	width: 100%;
+	width: 99%;
 }
 
-.name1 {
+.name1, .name2 {
 	color: #555;
 	font-weight: bold;
-	font-size: 11px;
+	font-size: 12px;
 }
 
 a .name1:hover {
@@ -521,13 +323,7 @@ a .name1:hover {
 
 .details0,
 .details1 {
-	font-size: 10px;
-}
-
-.name2 {
-	color: #555;
-	font-weight: bold;
-	font-size: 12px;
+	font-size: 11px;
 }
 
 .details2 {
@@ -536,8 +332,8 @@ a .name1:hover {
 
 .nameZoom {
 	color: #555;
-	font-weight: bold;
 	font-size: 14px;
+	font-weight: bold;
 }
 
 .details_label {
@@ -546,8 +342,8 @@ a .name1:hover {
 
 .name_head {
 	color: #555;
-	font-weight: bold;
 	font-size: 16px;
+	font-weight: bold;
 }
 
 .date {
@@ -586,31 +382,14 @@ a .name1:hover {
 	vertical-align: middle;
 }
 
-.pedigree_form {
-	width: 45px;
-}
-
 .thumbnail {
 	height: auto;
 	padding: 5px;
 }
 
 .icon {
-	display: none;
 	border: 0;
-	padding-left: 0;
-	padding-right: 5pt;
-}
-
-#head_icon {
-	display: block;
-	float: left;
-	margin-right: 15px;
-}
-
-[dir=rtl] .icon {
-	padding-left: 5pt;
-	padding-right: 0;
+	padding: 0 5px;
 }
 
 .link {
@@ -634,6 +413,11 @@ a .name1:hover {
 	font-size: 9px;
 }
 
+.parentdeath {
+	border: solid #555 1px;
+	padding: 1px;
+}
+
 .source_citations {
 	display: none;
 }
@@ -643,28 +427,38 @@ a .name1:hover {
 	border: solid #555 1px;
 }
 
-.user_links {
-	white-space: nowrap;
-}
-
-.contact_links {
-	padding-top: 5px;
-	text-align: center;
+.border1 {
+	border: solid #555 1px;
 }
 
-.hit-counter {
-	background: #555;
-	color: #fff;
-	font-weight: bold;
+.submenu {
+	text-decoration: none;
+	font-size: 11px;
+	background-color: #fff;
+	border: solid #ccc 1px;
+	visibility: hidden;
+	position: absolute;
+	padding: 5px;
 }
 
-.border1 {
-	border: solid #555 1px;
+.submenuitem  {
+	vertical-align: middle;
+	font-size: 11px;
+	height: 20px;
+	text-decoration: none;
+	background-color: #fff;
+	padding: 1px;
+	white-space: nowrap;
 }
 
-.submenu {
-	background-color: #eee;
-	border: solid #555 1px;
+.submenuitem_hover {
+	vertical-align: middle;
+	height: 20px;
+	font-size: 11px;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	white-space: nowrap;
+	padding: 1px;
 }
 
 .journal_box {
@@ -709,208 +503,6 @@ a .name1:hover {
 	clear: both;
 }
 
-#content {
-	clear: both;
-	margin-left: 1px;
-}
-
-footer {
-	clear: both;
-	color: #555;
-	font-size: 12px;
-}
-
-#home-page {
-	margin-top: 10px;
-}
-
-/*-- index.php specific style sheets -- */
-.small_inner_block {
-	max-height: 200px;
-	overflow: auto;
-	text-decoration: none;
-}
-
-.normal_inner_block {
-	overflow: auto;
-}
-
-.block {
-	background-color: #fff;
-	color: #555;
-	border: solid #555 1px;
-	font-size: 12px;
-	vertical-align: top;
-	margin-bottom: 5px;
-	padding: 1px;
-}
-
-.blockcontent {
-	margin-left: 5px;
-	margin-right: 5px;
-	margin-bottom: 10px;
-	font-size: 13px;
-	overflow: auto;
-}
-
-.blockcontent .list_table {
-	border-spacing: 0;
-	border: solid #555 1px;
-	border-right: 0;
-}
-
-.blockcontent .list_value,
-.blockcontent .list_value_wrap,
-.blockcontent .list_label {
-	border: 0;
-	border-top: solid #555 1px;
-	border-right: solid #555 1px;
-}
-
-.blockheader {
-	font-weight: bold;
-}
-
-img.block {
-	border: 0;
-	height: 20px;
-	vertical-align: middle;
-}
-
-.line1,
-.line2,
-.line3 {
-	vertical-align: middle;
-}
-
-#hourglass_chart img.line4 {
-	vertical-align: middle;
-}
-
-.line5 {
-	vertical-align: top;
-}
-
-#index_main_blocks {
-	clear: none;
-	width: 66%;
-	float: left;
-}
-
-#index_small_blocks {
-	clear: none;
-	width: 33%;
-	float: right;
-}
-
-#index_full_blocks {
-	clear: none;
-	width: 100%;
-}
-
-[dir=rtl] #index_main_blocks {
-	float: right;
-}
-
-[dir=rtl] #index_small_blocks {
-	float: left;
-}
-
-#main_select,
-#available_select,
-#right_select {
-	min-width: 150px;
-}
-
-.user_welcome_block table,
-.gedcom_block_block table {
-	margin: auto;
-}
-
-.user_welcome_block td,
-.gedcom_block_block td {
-	width: 33%;
-	text-align: center;
-	vertical-align: top;
-}
-
-.user_welcome_block i,
-.gedcom_block_block i {
-	background-image: none;
-	width: 0;
-	height: 0;
-}
-
-#link_change_blocks {
-	clear: both;
-	margin: 0 auto;
-	padding: 25px 0 0;
-	text-align: center;
-	width: 400px;
-}
-
-#link_change_blocks span {
-	padding: 0 50px;
-}
-
-#link_change_blocks span span {
-	padding: 0 3px;
-}
-
-#random_picture {
-	text-align: center;
-}
-
-#random_picture_box {
-	width: 100%;
-}
-
-#familybook_chart {
-	margin-left: 10px;
-}
-
-#familybook_chart table {
-	border-collapse: collapse;
-	empty-cells: show;
-}
-
-#familybook_chart td {
-	margin: 0;
-	padding: 0;
-}
-
-#familybook_chart h2 {
-	text-align: center;
-}
-
-#familybook_chart .line3,
-#familybook_chart .pvline,
-#familybook_chart .spacer {
-	width: 3px;
-}
-
-#familybook_chart .line4 {
-	width: 7px;
-	vertical-align: middle;
-}
-
-[ID^="vline"] {
-	width: 3px;
-}
-
-#familybook_chart h3 {
-	font-size: 16px;
-	text-align: center;
-}
-
-#relationship-page h3 {
-	margin: 20px 0 0 20px;
-}
-
-#relationship_chart {
-	margin: 0 20px;
-}
-
 .tdtop {
 	vertical-align: top;
 }
@@ -924,40 +516,14 @@ img.block {
 	vertical-align: bottom;
 }
 
-[dir=rtl] #familybook_chart {
-	margin-right: 10px;
-}
-
-/*-- pedigree chart specific stylesheets --*/
-#pedigree-page table.list_table {
-	margin: 0 auto;
-	width: 500px;
-}
-
-.pedigree_chart_table {
-	border: 0;
-	border-collapse: collapse;
-	padding: 0;
-	width: 100%;
-}
-
-#pedigree_chart {
-	position: relative;
-	top: -200px;
-	left: 10px;
-}
-
-#pedigree_canvas {
-	position: absolute;
-	top: 200px;
-	z-index: -1000;
+.line1,
+.line2,
+.line3 {
+	vertical-align: middle;
 }
 
-#pedigree_chart #childarrow,
-#pedigree_chart #uparrow,
-#pedigree_chart .shadow,
-.ancestorarrow {
-	position: absolute;
+.line5 {
+	vertical-align: top;
 }
 
 #childbox {
@@ -986,140 +552,6 @@ img.block {
 	margin-left: 5px;
 }
 
-#hourglass_chart table,
-.charts_block table {
-	border-collapse: collapse;
-}
-
-#hourglass_chart td,
-.charts_block td {
-	padding: 0;
-	empty-cells: show;
-}
-
-#pedigree_chart #childbox {
-	border: 1px solid;
-	background-color: #fff;
-}
-
-/*-- pedigree chart rtl specific stylesheets --*/
-[dir=rtl] #pedigree_chart {
-	left: auto;
-	right: -20px;
-}
-
-/*-- descendancy chart specific stylesheets --*/
-#descendancy_chart {
-	margin: 20px;
-}
-
-#descendancy_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	margin: 0 0 5px 15px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#descendancy_chart li {
-	list-style: none;
-	margin: 5px 0 0 -14px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#descendancy_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-#descendancy_chart td.details1 {
-	padding-top: 5px;
-}
-
-/*-- descendancy chart rtl specific stylesheets --*/
-[dir=rtl] #descendancy_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
-}
-
-/*-- ancestry chart specific stylesheets --*/
-#ancestry_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	display: block;
-	margin: 0 0 0 15px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#ancestry_chart li {
-	list-style: url(images/spacer.png);
-	margin: 0 0 2px -13px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#ancestry_chart li table {
-	margin: 5px 0;
-}
-
-#ancestry_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-/*-- ancestry chart rtl specific stylesheets --*/
-[dir=rtl] #ancestry_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
-}
-
-[dir=rtl] #ancestry_chart li {
-	margin: 0;
-	padding: 0 2px 0 0;
-	left: auto;
-}
-
-#compact_chart,
-#fan_chart,
-#ancestry_chart,
-#familybook_chart,
-#hourglass_chart {
-	margin: 20px;
-}
-
-.fan_chart_menu {
-	position: absolute;
-	display: none;
-	z-index: 100;
-}
-
-#fan_chart ul {
-	list-style-type: none;
-	margin: 0;
-}
-
-#fan_chart ul.children li:before {
-	content: "< ";
-	font-weight: bold;
-}
-
-#fan_chart_img {
-	text-align: center;
-}
-
-#timeline_chart {
-	position: relative;
-	top: 0;
-}
-
 .person0 {
 	background-color: #eee;
 	border: outset #555 1px;
@@ -1158,7 +590,6 @@ img.block {
 
 .listlog {
 	line-height: 20pt;
-	color: #555;
 }
 
 .formField {
@@ -1177,37 +608,20 @@ img.block {
 	font-weight: 600;
 }
 
-.title {
-	font-size: 20px;
-}
-
-/* Style for the top and bottom bar */
-.topbottombar {
-	color: #555;
-	background-color: #eee;
-	border: 1px solid #555;
-	font-weight: bold;
-	font-size: 12px;
-	padding: 4px;
-	text-align: center;
-}
-
-/* Style for the descriptionbox */
 .descriptionbox {
-	background-color: #fff;
 	color: #555;
-	border: solid #555 1px;
 	font-size: 12px;
-	padding: 3px;
+	background-color: #fff;
 	vertical-align: top;
+	padding: 3px;
+	border: solid #555 1px;
 }
 
-/* Style for the optionbox */
 .optionbox {
 	background-color: #fff;
-	color: #555;
-	border: solid #555 1px;
 	font-size: 12px;
+	border: solid #555 1px;
+	color: #555;
 	vertical-align: top;
 	white-space: nowrap;
 	padding: 3px;
@@ -1217,7 +631,6 @@ img.block {
 	vertical-align: middle;
 }
 
-/* colors */
 .red {
 	color: #f00;
 }
@@ -1227,7 +640,6 @@ img.block {
 	opacity: 0.8;
 }
 
-/* Width settings */
 .width10 {
 	width: 10%;
 }
@@ -1284,18 +696,20 @@ img.block {
 	width: 100%;
 }
 
-/* font sizes */
 .font9 {
 	font-size: 9px;
 }
 
-/* Message box */
+.font11 {
+	font-size: 11px;
+}
+
 .messagebox {
 	background-color: #fff;
 	border: solid #555 1px;
 }
 
-/* Pending edits - TODO perhaps show differently in different contexts? */
+/* ---Pending edits--- */
 .new {
 	border: solid blue 1px;
 	overflow: hidden;
@@ -1329,10 +743,10 @@ a.showit:hover > span {
 	top: 22px;
 	left: 0;
 	width: 225px;
-	border-left: 15px outset #1f1f1f;
 	border-top: 2px solid #1f1f1f;
-	border-bottom: 2px solid #555;
 	border-right: 2px solid #555;
+	border-bottom: 2px solid #555;
+	border-left: 15px outset #1f1f1f;
 	padding: 3px;
 	background: #4f4f4f;
 	color: #fff;
@@ -1343,54 +757,17 @@ a.showit:hover > span {
 	white-space: normal;
 }
 
-.lifespan_people span:first-letter {
-	font-weight: bold;
-	font-size: 16px;
-	font-variant: small-caps;
-	padding: 1px;
-}
-
-.lifespan_outer {
-	position: relative;
-	width: 99.5%;
-	height: 600px;
-	overflow: hidden;
-	border: solid #00f 1px;
-}
-
-.lifespan_outer a {
-	color: #555;
-}
-
-.lifespan_outer a:hover {
-	color: #f00;
-	text-decoration: none;
-}
-
-.lifespan_timeline {
-	position: absolute;
-	width: 100%;
-	left: -10px;
-	top: -65px;
-	z-index: 2;
-	background-color: white;
-}
-
-.lifespan_people {
-	position: absolute;
-	width: 500px;
-	left: -10px;
-	top: -60px;
-	z-index: 1;
+.tag_cloud {
+	text-align: center;
 }
 
 .tag_cloud a {
 	white-space: nowrap;
 }
 
-/* Autocomplete styles*/
+/* ---Autocomplete styles--- */
 .ui-autocomplete-input {
-	background-color: #eee8aa;
+	background-color: #eea;
 }
 
 .ui-autocomplete {
@@ -1401,16 +778,20 @@ a.showit:hover > span {
 	list-style: none outside none;
 	margin: 0;
 	max-height: 200px;
-	overflow-y: auto;
+	overflow-x: hidden;
+	overflow-y: scroll;
 }
 
 .ui-autocomplete li {
 	margin: 0;
 	padding: 2px 5px;
+	font-size: 12px;
 	cursor: default;
 	display: block;
+	/* if width will be 100% horizontal scrollbar will apear when scroll mode will be used */
+	/* width: 100%; */
 	font: menu;
-	font-size: 12px;
+	/* it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */
 	line-height: 14px;
 	overflow: hidden;
 }
@@ -1424,7 +805,7 @@ a.showit:hover > span {
 }
 
 .ui-autocomplete a.ui-state-focus {
-	color: #f00 !important;
+	color: #f00;
 }
 
 .ui-sortable li {
@@ -1435,7 +816,7 @@ a.showit:hover > span {
 	display: none;
 }
 
-/* End of Autocomplete styles*/
+/* ---End of Autocomplete styles--- */
 
 .nowrap {
 	white-space: nowrap;
@@ -1458,85 +839,22 @@ ul.clist {
 	border: solid #555 1px;
 }
 
-.execution_stats {
-	padding-top: 5px;
-	text-align: center;
-}
-
-dt {
-	float: left;
-	font-weight: bold;
-	margin-right: 10px;
-	clear: both;
-}
-
-[dir=rtl] dt {
-	float: right;
-	margin-right: auto;
-	margin-left: 10px;
+/* ---Find special characters--- */
+.largechars {
+	font-family: monospace;
+	font-size: 200%;
 }
 
 .clearfloat {
 	clear: both;
 }
 
-/* ============= Statistics block ============ */
-.gedcom_stats_block table td {
-	vertical-align: top;
-}
-
-.gedcom_stats_block table td td {
-	vertical-align: middle;
-}
-
-.gedcom_stats_block td .stats_value {
-	text-align: center;
-}
-
-/* ============= Theme select block ============ */
-.theme_form ul {
-	margin: -10px auto;
-}
-
-.theme_form li {
-	visibility: hidden;
-}
-
-.theme_form li ul li {
-	display: inline-block;
-	padding: 10px;
-	visibility: visible;
-}
-
-/* ======= Favourites block ========== */
-.blockcontent .person_box_template .details2 {
-	min-height: 40px;
-}
-
-.blockcontent [class*='box-style2'] {
-	margin: 5px 0;
-}
-
-.add_fav_head {
-	font-weight: 900;
-	margin: 5px 0;
-}
-
-.add_fav_head i {
-	margin: 0 5px 1px;
-}
-
-.add_fav_ref label {
-	display: inline-block;
-	min-width: 100px;
-}
-
-.add_fav_ref label:after {
-	content: ":";
+td.descriptionbox a {
+	float: left;
 }
 
-.add_fav_ref input {
-	margin: 0 5px;
+[dir=rtl] td.descriptionbox a {
+	float: right;
 }
 
 .gedcom_favorites_block,
@@ -1567,11 +885,11 @@ dt {
 	height: auto;
 }
 
-.person_box_template .namedef i {
+.person_box_template .namedef i[class^="icon-sex"] {
 	margin-left: 3px;
 }
 
-[dir=rtl] .person_box_template .namedef i {
+[dir=rtl] .person_box_template .namedef i[class^="icon-sex"] {
 	margin-right: 3px;
 }
 
@@ -1602,15 +920,15 @@ dt {
 .person_box_template a.gallery {
 	float: left;
 	height: 50px;
-	width: auto;
+	margin: 0 4px 0 0;
 	max-width: 80px;
-	margin: 0 3px 0 0;
+	width: auto;
 }
 
 [dir=rtl] .person_box_template img,
 [dir=rtl] .person_box_template a.gallery {
 	float: right;
-	margin: 0 0 0 3px;
+	margin: 0 0 0 4px;
 }
 
 .person_box_template i[class^="icon-silhouette"] {
@@ -1627,55 +945,117 @@ dt {
 	margin: 0 auto;
 }
 
-#medialist-page .list_table_controls {
+#medialist-page form .list_table {
+	width: 75%;
+}
+
+#medialist-page div .list_table,
+#medialist-page .media-col,
+#medialist-page .media-col1,
+#medialist-page .list_value_wrap,
+#medialist-page div .list_table_controls {
 	width: 100%;
 }
 
+#medialist-page .optionbox, 
+#medialist-page .descriptionbox {
+	width: 25%;
+}
+
+#medialist-page .media-col2 {
+	width: 50%;
+}
+
+#medialist-page .media-col {
+	padding-left: 5px; 
+	border: none;
+}
+
+[dir=rtl] #medialist-page .media-col {
+	padding-left: 0;
+	padding-right: 5px;
+}
+
+#medialist-page .media-image {
+	vertical-align:top; 
+	white-space:normal;
+}
+
+#medialist-page p {
+	text-align: center;
+}
+
 .list_table_controls td {
 	min-width: 40px;
 	text-align: center;
 }
 
-/* ============== medialist.php ======================= */
+/* ======== medialist.php ==== */
+.makeMenu li ul {
+	border: thin solid #AAA;
+	position: absolute;
+	margin:0;
+}
+
+.makeMenu, .makeMenu li ul {
+	padding: 1px;
+}
+
+.makeMenu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
+}
+
 .lb-menu {
 	display: inline-block;
 	margin: 0;
+	list-style: none;
 }
 
 .lb-menu ul {
 	display: block;
 	list-style-type: none;
+	margin: 0;
 }
 
 .lb-menu > li {
 	font-weight: normal;
 	float: left;
-	margin-right: 2px;
 	top: 0;
 }
 
-.lb-menu li:first-child {
-	padding-left: 0;
-}
-
 .lb-menu > li ul {
 	display: none;
 }
 
 .lb-menu > li:hover ul {
 	display: block;
-	top: 36px;
+}
+
+.lb-menu li a {
+	padding-top: 24px;
 }
 
 .lb-menu li li a {
-	padding: 1px 10px 1px 5px;
+	display: block;
+	background-color: #fff;
+	padding: 5px 10px 5px 5px;
+}
+
+.secondary-menu.lb-menu li:before {
+	content: "";
+}
+
+.lb-image_edit, .lb-image_link {
+	padding-right: 5px;
 }
 
 [dir=rtl] .lb-menu > li {
 	float: right;
 }
 
-/* ============== login.php ======================= */
+/* login.php */
 #login-register-page h2 {
 	text-align: center;
 }
@@ -1698,8 +1078,8 @@ dt {
 }
 
 #login-register-page .confirm p {
-	font-size: 14px;
 	font-weight: bold;
+	font-size: 14px;
 }
 
 #login-register-page .confirm p + p {
@@ -1730,6 +1110,11 @@ dt {
 	padding: 5px;
 }
 
+#register-form,
+#verify-form {
+	width: 440px;
+}
+
 #login-form div,
 #login-form div a,
 #new_passwd_form div,
@@ -1754,6 +1139,11 @@ dt {
 	margin: 0 10px;
 }
 
+#register-form p,
+#verify-form p {
+	text-align: left;
+}
+
 #new_passwd_form h4,
 #register-form h4 {
 	font-weight: normal;
@@ -1770,11 +1160,12 @@ dt {
 #register-form textarea {
 	width: 220px;
 	margin: 0 10px;
+	padding: 3px;
 }
 
 #register-form label select {
 	margin: 0 10px;
-	width: 230px;
+	width: 228px;
 }
 
 #register-form textarea {
@@ -1799,7 +1190,17 @@ dt {
 	text-align: left;
 }
 
-/* ============== reportengine.php ======================= */
+[dir=rtl] #register-form div,
+[dir=rtl] #verify-form div {
+	text-align: left;
+}
+
+[dir=rtl] #register-form p, 
+[dir=rtl] #verify-form p {
+	text-align: right;
+}
+
+/* --- reportengine.php --- */
 #reportengine-page table {
 	margin: 20px auto;
 }
@@ -1820,59 +1221,51 @@ dt {
 	text-align: center;
 }
 
+/* styles for popup menus */
 .itr {
-	position: absolute;
+	position: relative;
 	line-height: 1.5;
 }
 
-.block .itr,
-#family-table .itr,
-#ancestry_chart .itr,
-#descendancy_chart .itr,
-#familybook_chart .itr,
-#hourglass_chart .itr,
-#relatives_content .itr {
-	position: relative;
-	top: 0;
+.popup {
+	position: absolute;
+	top: 20px;
+	right: 0;
+	left: auto;
+	visibility: hidden;
+	opacity: 0;
+	transition: visibility 0s ease .25s,opacity .25s ease;
+	z-index: 9999;
+	-webkit-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	-moz-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
 }
 
-.popup {
-	display: none;
+[dir=rtl] .popup {
+	left: 0;
+	right: auto;
 }
 
 .popup ul {
-	background-image: none !important;
-	font-size: 9px;
+	white-space: nowrap;
 	list-style: none;
 	margin: 0;
 	padding: 0 10px;
+	font-size: smaller;
 }
 
-.popup li {
-	padding: 1px 5px;
+.popup > ul {
+	padding: 2px 10px;
 }
 
-.popup li span {
+.popup li .NAME {
 	padding: 0 5px;
 }
 
-.popup li ul,
-.popup li ul li,
-.popup li span span {
-	padding: 0;
-}
-
 .itr:hover .popup {
-	display: block;
-	position: absolute;
-	width: 12em;
-	right: 0;
-	z-index: 9999;
-}
-
-[dir=rtl] .itr:hover .popup {
-	left: 0;
-	right: auto;
+	visibility: visible;
+	opacity: 1;
+	transition-delay: 0s;
 }
 
 /* styles for FindFacts pop-up */
@@ -1943,7 +1336,373 @@ dt {
 	text-align: center;
 }
 
-/* FAQ table styles */
+/* ======== List styles ====== */
+.source-list,
+.note-list,
+.repo-list,
+.media-list,
+.indi-list,
+.fam-list {
+	margin: 5px auto;
+	visibility: hidden;
+	width: 98%;
+}
+
+.recent_changes_block,
+.upcoming_events_block,
+.todays_events_block,
+.todo_block {
+	width: 98%;
+}
+
+.surname-list,
+.givn-list {
+	margin: 5px auto;
+}
+
+.source-list table,
+.note-list table,
+.repo-list table,
+.media-list table,
+.indi-list table,
+.fam-list table {
+	width: 100%;
+}
+
+.source-list td,
+.note-list td,
+.repo-list td,
+.media-list td,
+.indi-list td,
+.fam-list td,
+.recent_changes_block td,
+.upcoming_events_block td,
+.surname-list td,
+.givn-list td {
+	padding: 2px 5px;
+}
+
+.indi-list td,
+.fam-list td {
+	color: #555;
+}
+
+.surname-list td {
+	vertical-align: top;
+}
+
+.indi-list .stats,
+.fam-list .stats {
+	margin: 0 auto;
+	width: auto;
+}
+
+.source-list th,
+.note-list th,
+.repo-list th,
+.media-list th,
+.indi-list th,
+.fam-list th,
+.recent_changes_block th,
+.upcoming_events_block th,
+.todays_events_block th,
+.todo_block th,
+.yahrzeit_block th,
+.surname-list th,
+.givn-list th {
+	cursor: pointer;
+	font-weight: 600;
+	padding: 2px 4px;
+	white-space: nowrap;
+}
+
+.source-list th:last-child,
+.note-list th:last-child,
+.repo-list th:last-child {
+	margin: 0 -2px 1px 1px;
+	padding: 3px 0 4px;
+	width: 24px;
+}
+
+.givn-list th {
+	cursor: pointer;
+	white-space: nowrap;
+	padding: 2px;
+	text-align: center;
+}
+
+#source-details h2,
+#sourcelist-page h2,
+#note-details h2,
+#notelist-page h2,
+#repo-details h2,
+#repolist-page h2,
+#media-details h2,
+#medialist-page h2,
+#statistics-page h2 {
+	margin-bottom: 20px;
+	text-align: center;
+}
+
+#source-tabs,
+#note-tabs,
+#repo-tabs,
+#media-tabs {
+	margin: auto;
+	visibility: hidden;
+	width: 80%;
+}
+
+#statistics_chart {
+	margin: auto;
+	visibility: hidden;
+	width: 90%;
+}
+
+#source-edit,
+#note-edit,
+#repo-edit,
+#media-edit {
+	overflow-x: auto;
+}
+
+.media-list td img {
+	display: block;
+	height: 40px;
+	width: auto;
+	margin: 3px auto;
+}
+
+.filtersH,
+.filtersF {
+	margin: 4px;
+}
+
+.filtersH img {
+	margin-bottom: 2px;
+}
+
+.filtersH .ui-state-default,
+.filtersF .ui-state-default {
+	margin: 0 2px;
+	padding: 2px;
+}
+
+.loading-image {
+	background: transparent url(images/loading.gif) 50% 50% no-repeat;
+	height: 50px;
+	margin: 50px;
+}
+
+.list-charts {
+	text-align: center;
+}
+
+#search-result-tabs,
+#places-tabs {
+	margin: auto;
+	width: 98%;
+	visibility: hidden;
+}
+
+#search-result-tabs h3 {
+	text-align: center;
+}
+
+#searchAccordion-indi,
+#searchAccordion-fam,
+#searchAccordion-source,
+#searchAccordion-note {
+	margin: auto;
+	width: 99%;
+}
+
+#place-hierarchy h2,
+#place-hierarchy h4 {
+	text-align: center;
+}
+
+[dir=rtl] .source-list th:last-child,
+[dir=rtl] .note-list th:last-child,
+[dir=rtl] .repo-list th:last-child {
+	margin: 0 1px 1px -2px;
+}
+
+/* ======== Block styles ===== */
+#index_main_blocks {
+	clear: none;
+	width: 66%;
+	float: left;
+}
+
+#index_small_blocks {
+	clear: none;
+	width: 33%;
+	float: right;
+}
+
+#index_full_blocks {
+	clear: none;
+	width: 100%;
+}
+
+[dir=rtl] #index_main_blocks {
+	float: right;
+}
+
+[dir=rtl] #index_small_blocks {
+	float: left;
+}
+
+.small_inner_block {
+	max-height: 200px;
+	overflow: auto;
+	text-decoration: none;
+}
+
+.normal_inner_block {
+	overflow: auto;
+}
+
+.block {
+	background-color: #fff;
+	color: #555;
+	border: solid #555 1px;
+	font-size: 12px;
+	margin-bottom: 5px;
+	padding: 1px;
+	vertical-align: top;
+}
+
+.blockcontent {
+	margin-left: 5px;
+	margin-right: 5px;
+	margin-bottom: 10px;
+	font-size: 13px;
+	overflow: auto;
+}
+
+.blockcontent .list_table {
+	border-spacing: 0;
+	border: solid #555 1px;
+	border-right: 0;
+}
+
+.blockcontent .list_value,
+.blockcontent .list_value_wrap,
+.blockcontent .list_label {
+	border: 0;
+	border-top: solid #555 1px;
+	border-right: solid #555 1px;
+}
+
+.blockheader {
+	font-weight: bold;
+}
+
+/* end Block styles */
+
+#main_select,
+#available_select,
+#right_select {
+	min-width: 150px;
+}
+
+.user_welcome_block table,
+.gedcom_block_block table {
+	margin: auto;
+}
+
+.user_welcome_block td,
+.gedcom_block_block td {
+	width: 33%;
+	text-align: center;
+	vertical-align: top;
+}
+
+.user_welcome_block i,
+.gedcom_block_block i {
+	background-image: none;
+	width: 0;
+	height: 0;
+}
+
+/* Random picture block */
+#random_picture {
+	text-align: center;
+}
+
+#random_picture_box {
+	width: 100%;
+}
+
+/* ==== Favourites block ===== */
+.blockcontent .person_box_template .details2 {
+	min-height: 40px;
+}
+
+.blockcontent [class*='box-style2'] {
+	margin: 5px 0;
+}
+
+.add_fav_head {
+	font-weight: 900;
+	margin: 5px 0;
+}
+
+.add_fav_head i {
+	margin: 0 5px 1px;
+}
+
+.add_fav_ref label {
+	display: inline-block;
+	min-width: 100px;
+}
+
+.add_fav_ref label:after {
+	content: ":";
+}
+
+.add_fav_ref input {
+	margin: 0 5px;
+}
+
+/* === Who is online block === */
+.logged_in_list {
+	margin: 5px 0 0;
+	padding: 0;
+	line-height: 20px;
+}
+
+/* Statistics block */
+.gedcom_stats_block table td {
+	vertical-align: top;
+}
+
+.gedcom_stats_block table td td {
+	vertical-align: middle;
+}
+
+.gedcom_stats_block td .stats_value {
+	text-align: center;
+}
+
+/* ==== Theme select block === */
+.theme_form ul {
+	margin: -10px auto;
+}
+
+.theme_form li {
+	visibility: hidden;
+}
+
+.theme_form li ul li {
+	display: inline-block;
+	padding: 10px;
+	visibility: visible;
+}
+
+/* ==== FAQ table styles ===== */
 table.faq {
 	background-color: #ddd;
 	margin: 5px 0 50px 5px;
@@ -1991,33 +1750,10 @@ div.faq_body {
 	float: left;
 }
 
-td.descriptionbox a {
-	/* this keeps the tag color the same when it is a link as when not */
-	float: left;
-}
-
-[dir=rtl] td.descriptionbox a {
-	float: right;
-}
-
-.logo {
-	font-size: 16px;
-	font-weight: 900;
-	margin: 0;
-	padding-top: 5px;
-	text-align: center;
-}
-
-/* Find special characters */
-.largechars {
-	font-family: monospace;
-	font-size: 200%;
-}
-
-/* ========= Positioning edit, copy, delete links ============= */
+/* === Positioning edit, copy, delete links === */
 /* General use */
 .editfacts {
-	clear: both;
+	clear: left;
 	padding-top: 15px;
 }
 
@@ -2040,7 +1776,7 @@ span.link_text:hover {
 	text-decoration: underline;
 }
 
-/* Indi header */
+/* ======== Indi header ====== */
 .field .editlink,
 .field .deletelink,
 .field .copylink {
@@ -2052,10 +1788,6 @@ span.link_text:hover {
 	float: left;
 }
 
-/* =========== end edit, copy, delete links ==================== */
-
-/* =========== Indi header ================== */
-
 #indi_header {
 	overflow: hidden;
 	margin: 0 0 5px;
@@ -2084,12 +1816,12 @@ span.link_text:hover {
 #indi_header h3.person_box,
 #indi_header h3.person_boxF,
 #indi_header h3.person_boxNN {
-	background: #ddd;
 	border: 1px solid #888;
+	background: #ddd;
 }
 
 #indi_header h3 .header_age {
-	padding: 7px 0 5px 5px;
+	padding: 5px 0 5px 5px;
 	float: right;
 	font-weight: normal;
 	font-size: 65%;
@@ -2108,20 +1840,17 @@ span.link_text:hover {
 	font-weight: normal;
 }
 
-#main_name {
-	float: left;
-	font-size: 2em;
-	margin: 10px;
-	font-weight: bold;
+#indi_mainimage {
+	float: right;
 }
 
 #header_accordion1 {
+	padding: 0 10px 0 0;
 	overflow: hidden;
-	padding: 0 20px 0 0;
 }
 
 [dir='rtl'] #header_accordion1 {
-	padding: 0 0 0 20px;
+	padding: 0 0 0 10px;
 }
 
 #header_accordion1 .indi_name_details {
@@ -2130,29 +1859,18 @@ span.link_text:hover {
 	padding: 5px;
 	background: none #fff;
 	border: 0;
-	font-size: 10px;
-}
-
-.indi_name_details .warning {
-	font-size: 1em;
-}
-
-.indi_name_details dl {
-	height: 10px;
-	margin-top: 0;
+	font-size: 12px;
 }
 
 .indi_name_details dt:after {
 	content: ":";
 }
 
-.indi_name_details dt.label,
-.indi_name_details dd.field {
-	font-size: 12px;
-}
-
 .indi_name_details .name1 {
 	font-weight: normal;
+	padding-top: 5px;
+	font-size: inherit;
+	font-size: 12px;
 }
 
 .indi_name_details .name1:hover {
@@ -2163,6 +1881,24 @@ span.link_text:hover {
 	margin: 0 0 5px;
 }
 
+.indi_table {
+	clear: left;
+}
+
+#sex {
+	float: right;
+}
+
+dd .editlink,
+dd .deletelink {
+	float: right;
+}
+
+[dir=rtl] #indi_header {
+	float: right;
+	padding: 0 0 0 10px;
+}
+
 #indi_note .fact_NOTE .label {
 	float: left;
 	margin: 0 10px 0 0;
@@ -2201,32 +1937,6 @@ span.link_text:hover {
 	padding: 3px;
 }
 
-.indi_table {
-	clear: left;
-}
-
-#sex {
-	float: right;
-}
-
-[dir=rtl] #sex {
-	float: left;
-}
-
-#dates {
-	float: right;
-}
-
-dd .editlink,
-dd .deletelink {
-	float: right;
-}
-
-[dir=rtl] #indi_header {
-	float: right;
-	padding: 0 0 0 10px;
-}
-
 [dir=rtl] #indi_header h3 {
 	padding: 0 30px 0 10px;
 	text-align: right;
@@ -2237,9 +1947,6 @@ dd .deletelink {
 	float: left;
 }
 
-[dir=rtl] #main_name {
-	float: right;
-}
 
 [dir=rtl] #indi_mainimage {
 	float: left;
@@ -2254,6 +1961,10 @@ dd .deletelink {
 	clear: right;
 }
 
+[dir=rtl] #sex {
+	float: left;
+}
+
 [dir=rtl] #dates {
 	float: left;
 }
@@ -2263,7 +1974,13 @@ dd .deletelink {
 	float: left;
 }
 
-/* INDI IMAGE SPRITE */
+.hit-counter {
+	background: #555;
+	color: #fff;
+	font-weight: bold;
+}
+
+/* ======= General sprite ==== */
 .male_gender,
 .female_gender,
 .unknown_gender {
@@ -2289,7 +2006,7 @@ dd .deletelink {
 	height: 30px;
 }
 
-/* =========== Indi tabs ================== */
+/* ======== Indi tabs ======== */
 /* Facts & Events tab */
 #personal_facts_content .fact_NOTE,
 #personal_facts_content .fact_SOUR,
@@ -2330,7 +2047,7 @@ dd .deletelink {
 	padding-right: 5px;
 }
 
-/* Album tab */
+/* ======== Album tab =========*/
 .album-list {
 	list-style-type: none;
 }
@@ -2363,7 +2080,16 @@ dd .deletelink {
 	width: 100%;
 }
 
-/* ========= jquery-ui.custom.css changes ============ */
+/* === jquery-ui.css changes === */
+.ui-accordion .ui-accordion-content {
+	border: 0;
+	margin-top: 2px;
+	position: relative;
+	padding: 0 5px;
+	overflow: visible;
+	display: none;
+}
+
 .ui-widget-content {
 	color: #555;
 }
@@ -2457,15 +2183,7 @@ dd .deletelink {
 	margin-top: -8px;
 }
 
-.ui-accordion .ui-accordion-content {
-	border-top: 0;
-	margin-top: 1px;
-	position: relative;
-	top: 1px;
-	padding: 0 5px;
-	overflow: visible;
-	display: none;
-}
+
 
 .ui-accordion .ui-accordion-content-active {
 	display: block;
@@ -2493,7 +2211,7 @@ dd .deletelink {
 }
 
 [dir=rtl] .ui-accordion .ui-accordion-header .ui-icon {
-	right: .5em;
+	right: 0.5em;
 }
 
 [dir=rtl] .ui-dialog-title {
@@ -2505,7 +2223,7 @@ dd .deletelink {
 	right: auto;
 }
 
-/* ========= jQuery.datatable styling over-rides ============ */
+/* === jQuery.datatable styling general over-rides === */
 .odd {
 	background-color: #dcdcdc;
 }
@@ -2539,12 +2257,14 @@ dd .deletelink {
 
 .dataTables_filter {
 	float: right;
+	font-weight: normal;
 	margin: 4px;
 }
 
 .dataTables_info {
 	float: left;
-	margin: 5px;
+	font-weight: normal;
+	padding: 4px;
 }
 
 .recent_changes_block .dataTables_info,
@@ -2567,6 +2287,7 @@ dd .deletelink {
 
 .dataTables_length {
 	float: right;
+	font-weight: normal;
 }
 
 .dataTables_length select,
@@ -2596,6 +2317,10 @@ dd .deletelink {
 	top: 50%;
 }
 
+.dataTables_wrapper {
+	margin-bottom: 10px;
+}
+
 [dir=rtl] .css_right {
 	float: right;
 }
@@ -2630,186 +2355,7 @@ dd .deletelink {
 	margin-right: -20px;
 }
 
-/* ========= List styles ================= */
-.source-list,
-.note-list,
-.repo-list,
-.media-list,
-.indi-list,
-.fam-list {
-	margin: 5px auto;
-	visibility: hidden;
-	width: 98%;
-}
-
-.surname-list,
-.givn-list {
-	margin: 5px auto;
-}
-
-.source-list table,
-.note-list table,
-.repo-list table,
-.media-list table,
-.indi-list table,
-.fam-list table {
-	width: 100%;
-}
-
-.source-list td,
-.note-list td,
-.repo-list td,
-.media-list td,
-.indi-list td,
-.fam-list td,
-.recent_changes_block td,
-.upcoming_events_block,
-.surname-list td,
-.givn-list td {
-	padding: 2px 5px;
-}
-
-.indi-list td,
-.fam-list td {
-	color: #555;
-}
-
-.surname-list td {
-	vertical-align: top;
-}
-
-.indi-list .stats,
-.fam-list .stats {
-	margin: 0 auto;
-	width: auto;
-}
-
-.source-list th,
-.note-list th,
-.repo-list th,
-.media-list th,
-.indi-list th,
-.fam-list th,
-.recent_changes_block th,
-.upcoming_events_block th,
-.todays_events_block th,
-.todo_block th,
-.yahrzeit_block th,
-.surname-list th,
-.givn-list th {
-	cursor: pointer;
-	white-space: nowrap;
-}
-
-.source-list th:last-child,
-.note-list th:last-child,
-.repo-list th:last-child {
-	margin: 0 -2px 1px 1px;
-	padding: 3px 0 4px;
-	width: 24px;
-}
-
-.givn-list th {
-	cursor: pointer;
-	white-space: nowrap;
-	padding: 2px;
-	text-align: center;
-}
-
-#source-details h2,
-#sourcelist-page h2,
-#note-details h2,
-#notelist-page h2,
-#repo-details h2,
-#repolist-page h2,
-#media-details h2,
-#medialist-page h2,
-#statistics-page h2 {
-	margin-bottom: 20px;
-	text-align: center;
-}
-
-#source-tabs,
-#note-tabs,
-#repo-tabs,
-#media-tabs {
-	margin: auto;
-	visibility: hidden;
-	width: 80%;
-}
-
-#statistics_chart {
-	margin: auto;
-	visibility: hidden;
-	width: 90%;
-}
-
-#source-edit,
-#note-edit,
-#repo-edit,
-#media-edit {
-	overflow-x: auto;
-}
-
-.media-list td img {
-	display: block;
-	height: 40px;
-	width: auto;
-	margin: 3px auto;
-}
-
-.filtersH,
-.filtersF {
-	margin: 4px;
-}
-
-.filtersH img {
-	margin-bottom: 2px;
-}
-
-.filtersH .ui-state-default,
-.filtersF .ui-state-default {
-	margin: 0 2px;
-	padding: 2px;
-}
-
-.loading-image {
-	background: transparent url(images/loading.gif) 50% 50% no-repeat;
-	height: 50px;
-	margin: 50px;
-}
-
-#search-result-tabs,
-#places-tabs {
-	margin: auto;
-	width: 98%;
-	visibility: hidden;
-}
-
-#search-result-tabs h3 {
-	text-align: center;
-}
-
-#searchAccordion-indi,
-#searchAccordion-fam,
-#searchAccordion-source,
-#searchAccordion-note {
-	margin: auto;
-	width: 99%;
-}
-
-#place-hierarchy h2,
-#place-hierarchy h4 {
-	text-align: center;
-}
-
-[dir=rtl] .source-list th:last-child,
-[dir=rtl] .note-list th:last-child,
-[dir=rtl] .repo-list th:last-child {
-	margin: 0 1px 1px -2px;
-}
-
-/* ========= Sidebar ============== */
+/* ======= Sidebar setup ===== */
 #main {
 	min-width: 600px;
 	width: 100%;
@@ -2822,11 +2368,19 @@ dd .deletelink {
 	display: table-cell;
 }
 
+#indi_left .ui-tabs-panel {
+	padding: 0;
+}
+
+#indi_left .ui-tabs-nav {
+	margin: 0 2px;
+}
+
 #tabs {
 	background-color: #fff;
 	border-color: #ddd;
 	width: 98%;
-	overflow: auto;
+	overflow: visible;
 }
 
 #sidebarAccordion {
@@ -2840,6 +2394,7 @@ dd .deletelink {
 	border: 1px solid #888;
 }
 
+/* sidebar */
 #sidebar {
 	width: 20%;
 	display: table-cell;
@@ -2857,8 +2412,8 @@ dd .deletelink {
 #separator:after {
 	position: absolute;
 	top: 0;
-	left: auto;
 	right: 0;
+	left: auto;
 	width: 10px;
 	height: 99999px;
 	content: "";
@@ -2868,8 +2423,8 @@ dd .deletelink {
 }
 
 [dir=rtl] #separator:after {
-	left: 0;
 	right: auto;
+	left: 0;
 }
 
 .separator-hidden:after,
@@ -2882,14 +2437,11 @@ dd .deletelink {
 	background: #ddd url(images/indi_sprite.png) no-repeat -1px 100px;
 }
 
-/* ============== Sidebar content items ============== */
+/* Sidebar content items */
 /* Family navigator */
 #sb_content_family_nav {
 	padding: 0;
-}
-
-#sb_family_nav_content {
-	margin-top: 2px;
+	margin-top: 0;
 }
 
 .nam a:hover {
@@ -2942,7 +2494,11 @@ dd .deletelink {
 	text-decoration: underline;
 }
 
-/* Descendancy */
+/* Sidebar*/
+#sb_content_descendancy {
+	margin-top: 5px;
+}
+
 #sb_desc_content {
 	margin-left: 3px;
 	font-size: 0.8em;
@@ -2978,21 +2534,32 @@ dd .deletelink {
 	margin-left: 0;
 }
 
-/* Individuals, Families */
+/* Individuals and Families */
+#sb_content_individuals,
+#sb_content_families {
+	margin-top: 5px;
+}
+
 .sb_indi_surname_li,
 .sb_fam_surname_li {
 	list-style-image: url(images/plus.png);
 }
 
+.name_tree_div {
+	display: none;
+}
+
+.name_tree_div ul,
+.name_tree_div_visible ul {
+	padding: 0;
+	margin: 0;
+}
+
 .name_tree_div li,
 .name_tree_div_visible li {
 	white-space: normal;
 }
 
-.name_tree_div {
-	display: none;
-}
-
 .name_tree_div li,
 .name_tree_div_visible li {
 	list-style: none;
@@ -3000,25 +2567,24 @@ dd .deletelink {
 	padding: 0;
 }
 
-.name_tree_div ul,
-.name_tree_div_visible ul {
+/* Clippings */
+#sb_content_clippings {
+	margin-top: 5px;
+}
+
+#sb_clippings_content ul {
 	padding: 0;
 	margin: 0;
 }
 
-/* Clippings */
 #sb_clippings_content li {
 	list-style: none;
 	margin: 0;
 	padding: 0;
+	white-space: nowrap;
 }
 
-#sb_clippings_content ul {
-	padding: 0;
-	margin: 0;
-}
-
-/* References */
+/* Extra info */
 #sb_content_extra_info {
 	font-size: 80%;
 	font-weight: bold;
@@ -3054,7 +2620,7 @@ dd .deletelink {
 	float: left;
 }
 
-/* ============== find.php ======================= */
+/* ===== find.php =====  */
 #find-page h3,
 #find-page h4 {
 	margin: 10px;
@@ -3153,7 +2719,7 @@ dd .deletelink {
 	text-align: inherit;
 }
 
-/* ============== search.php ======================= */
+/* ===== search.php ===== */
 #search-page h2,
 #search_submit {
 	margin: 20px;
@@ -3181,7 +2747,7 @@ dd .deletelink {
 }
 
 #search-page-table div:nth-of-type(2) {
-	border: 0;
+    border: 0 none;
 }
 
 #search-page-table p {
@@ -3210,6 +2776,7 @@ dd .deletelink {
 }
 
 #edituser-table .label {
+	border: 1px solid #000;
 	float: left;
 	font-weight: bold;
 	padding: 5px;
@@ -3227,10 +2794,6 @@ dd .deletelink {
 	margin: 0 10px;
 }
 
-#edituser-table div:nth-of-type(2) {
-	border: 0;
-}
-
 #edituser-table select {
 	margin: 0;
 }
@@ -3243,61 +2806,677 @@ dd .deletelink {
 	margin: 0 260px 0 0;
 }
 
-/* ======= Who is online block ========== */
-.logged_in_list {
-	margin: 5px 0 0;
+/* ===== Edit interface pop-ups ===== */
+#edit_interface-page h4 {
+	color: #555;
+	margin: 5px;
+}
+
+#edit_interface-page .optionbox span {
+	margin: 0 5px;
+}
+
+#edit_interface-page #LATI,
+#edit_interface-page #LONG,
+#edit_interface-page #SPFX,
+#edit_interface-page #NSFX,
+#edit_interface-page #NPFX {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 88px;
+}
+
+#edit_interface-page #GIVN,
+#edit_interface-page #SURN,
+#edit_interface-page #_MARNM {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 180px;
+}
+
+#edit_interface-page input[type="text"],
+#edit_interface-page #NAME_display {
+	line-height: 18px;
+	margin: 0 5px;
+	vertical-align: top;
+	width: 240px;
+}
+
+#edit_interface-page input[type="text"][id*="PAGE"],
+#edit_interface-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR"],
+#edit_interface-page input[type="text"][id*="REPO"],
+#edit_interface-page input[type="text"][id*="OBJE"],
+#edit_interface-page input[type="text"][id*="FAMC"],
+#edit_interface-page input[type="text"][id*="ASSO"],
+#edit_interface-page input[type="text"][id^="AGE"],
+#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 250px;
+}
+
+#edit_interface-page input[type="text"][id$="DATE"] {
+	width: 160px;
+}
+
+#edit_interface-page input[type="text"][id^="TIME"] {
+	width: 100px;
+}
+
+#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
+	width: 200px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
+	width: 250px;
+}
+
+#edit_interface-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#edit_interface-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#edit_interface-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#edit_interface-page textarea[id*="TEXT"],
+#edit_interface-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+#edit_interface-page textarea[id^="newgedrec"] {
+	line-height: 18px;
+	width: 605px;
+}
+
+#edit_interface-page textarea#gedcom {
+	height: 364px;
+}
+
+#edit_interface-page textarea[id*="ADDR"],
+#edit_interface-page input[id*="ADDR"] {
+	height: 80px;
+	width: 300px;
+}
+
+#edit_interface-page #changefam {
+	padding: 5px;
+}
+
+#edit_interface-page #changefam table {
+	margin: 10px auto;
+	min-width: 400px;
+	max-width: 650px;
+}
+
+#edit_interface-page #changefam span {
+	margin: 0;
+}
+
+#edit_interface-page #changefam td {
+	padding: 5px;
+	white-space: normal;
+}
+
+#edit_interface-page #changefam td.child {
+	text-align: center;
+}
+
+#save-cancel {
+	position: fixed;
+	bottom: 0;
+	width: 98%;
+	border: solid #555 1px;
+	margin: 0;
+}
+
+#save-cancel input {
+	padding: 2px 8px;
+}
+
+#save-cancel .save {
+	float: left;
+	margin: 5px;
+}
+
+#save-cancel .cancel {
+	float: right;
+	margin: 5px;
+}
+
+[dir=rtl] #save-cancel .save {
+	float: right;
+}
+
+[dir=rtl] #save-cancel .cancel {
+	float: left;
+}
+
+#edit_interface-page,
+#addmedia-page {
+	margin-bottom: 50px;
+}
+
+/* ===== Addmedia pop-ups ===== */
+#addmedia-page input[type="text"] {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 350px;
+}
+
+#addmedia-page .optionbox select {
+	margin: 0 5px;
+}
+
+#addmedia-page .optionbox p.sub {
+	margin: 0 5px;
+	font-size: 11px;
+}
+
+#addmedia-page input[type="text"][id*="PAGE"],
+#addmedia-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#addmedia-page input[type="text"][id*="SOUR"],
+#addmedia-page input[type="text"][id*="REPO"],
+#addmedia-page input[type="text"][id*="OBJE"],
+#addmedia-page input[type="text"][id*="FAMC"],
+#addmedia-page input[type="text"][id*="ASSO"],
+#addmedia-page input[type="text"][id^="AGE"],
+#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 70px;
+}
+
+#addmedia-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#addmedia-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#addmedia-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#addmedia-page textarea[id*="TEXT"],
+#addmedia-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+/* ===== Styling for the jquery.colorbox gallery ===== */
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+#colorbox {
+	border: 2px solid #ccc;
+}
+
+#cboxOverlay {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	background: #ccc;
+}
+
+#cboxContent {
+	background: #fff;
+	border: 5px solid #888;
+}
+
+#cboxLoadedContent {
+	overflow: auto;
+	background: #fff;
+	margin-bottom: 30px;
+	margin-top: 35px;
+}
+
+#cboxTitle {
+	position: absolute;
+	left: 0;
+	top: 10px;
+	font-size: 14px;
+	color: #949494;
+	text-align: center;
+	width: 100%;
+	font-weight: 800;
+}
+
+.cboxPhoto {
+	float: left;
+	margin: auto;
+	border: 0;
+	display: block;
+	max-width: none;
+}
+
+.cboxIframe {
+	width: 100%;
+	height: 100%;
+	display: block;
+	border: 0;
+}
+
+#cboxPrevious {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	background: url(images/controls.png) no-repeat -75px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxPrevious:hover {
+	background-position: -75px -25px;
+}
+
+#cboxNext {
+	position: absolute;
+	bottom: 0;
+	left: 27px;
+	background: url(images/controls.png) no-repeat -50px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxNext:hover {
+	background-position: -50px -25px;
+}
+
+#cboxSlideshow {
+	position: absolute;
+	bottom: 5px;
+	font-size: 14px;
+	left: 57px;
+	margin: 10px;
+	border: 0;
+	background: none;
+}
+
+#cboxSlideshow:hover {
+	color: #f00;
+	background: #fff;
+}
+
+#cboxClose {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	background: url(images/controls.png) no-repeat -25px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxClose:hover {
+	background-position: -25px -25px;
+}
+
+#cboxCurrent {
+	bottom: 4px;
+	color: #949494;
+	left: 58px;
+	position: absolute;
+}
+
+[dir=rtl] #cboxPrevious {
+	right: 27px;
+	left: auto;
+}
+
+[dir=rtl] #cboxNext {
+	right: 0;
+	left: auto;
+}
+
+[dir=rtl] #cboxCurrent {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxClose {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxSlideshow {
+	right: 57px;
+	left: auto;
+}
+
+/* ===== Census assistant module ===== */
+table.table-census-assistant th {
+	font-weight: bold;
+	text-align: left;
+}
+
+/* Stories module */
+.story_title {
+	padding-top: 12px;
+	font-size: 13px;
+	height: 32px;
+	font-weight: bold;
+}
+
+.story_body {
+	padding: 20px;
+	white-space: normal;
+}
+
+.story_edit {
+	padding: 12px;
+}
+
+.btn-group {
+	display: inline-block;
+	margin: 0 4px;
+}
+
+.btn-group button:first-child,
+[dir=rtl] .btn-group button:last-child {
+	border-radius: 3px 0 0 3px;
+}
+
+.btn-group button:last-child,
+[dir=rtl] .btn-group button:first-child {
+	border-radius: 0 3px 3px 0;
+}
+
+/* User content in stories tab */
+#stories h2,
+#stories h3,
+#stories h4,
+#stories h5 {
+	padding-top: 20px;
+}
+
+#stories p {
+	padding-top: 8px;
+}
+
+
+
+/* ====== Charts Styles ======== */
+#compact_chart,
+#fan_chart,
+.chart_common,
+#ancestry_booklet,
+#descendancy_booklet,
+#familybook_chart,
+#hourglass_chart {
+	margin: 20px;
+}
+
+/* styles for vertical lines in ancestry and descendancy charts */
+.chart_common li {
+	list-style: none;
+}
+
+.chart_common li > span.details1 {
+	white-space: nowrap;
+}
+
+.chart_common .generation {
+	background: transparent url(images/vline.png) left top repeat-y;
+	margin: 0 0 0 15px;
 	padding: 0;
-	line-height: 20px;
+	display: block;
 }
 
-@media print {
-	#backprint,
-	#separator,
-	header,
-	footer,
-	form,
-	#CB_All,
-	.noprint {
-		display: none !important;
-	}
+[dir=rtl] .chart_common .generation {
+	margin: 0 15px 0 0;
+	background-position: right top
+;
+}
 
+.chart_common .generation > li {
+	margin: 5px 0;
+}
 
-	#pedigree_chart {
-		left: -80px;
-	}
+.chart_common table {
+	padding: 0;
+	border-spacing: 0;
+	border-collapse: collapse;
+	margin: 5px 0;
+}
 
-	#header_accordion1 {
-		width: 510px !important;
-	}
+.chart_common td {
+	border: 0;
+	padding: 0;
+}
 
-	[dir=rtl] #pedigree_chart {
-		left: auto;
-		right: -80px;
-	}
+.chart_common span.details1 div[class^=fact_] {
+	display: inline-block;
+}
 
-	#familybook_chart h3 {
-		margin-bottom: 10px;
-	}
+.chart_common span.details1 .date {
+	color: inherit;
+}
 
-	/* buttons and input are used out of forms in sortable tables*/
-	.lifespan_outer {
-		position: relative;
-		width: auto;
-		height: auto;
-		overflow: visible;
-		border: 0;
-	}
+/*-- Family book  --*/
+#familybook_chart {
+	margin-left: 10px;
+}
 
-	.lifespan_people {
-		position: absolute;
-		width: auto;
-		left: -10px;
-		top: -60px;
-		z-index: 1;
-	}
+#familybook_chart table {
+	border-collapse: collapse;
+	empty-cells: show;
+}
+
+#familybook_chart td {
+	margin: 0;
+	padding: 0;
+}
+
+#familybook_chart h2 {
+	text-align: center;
+}
+
+#familybook_chart .line3,
+#familybook_chart .pvline,
+#familybook_chart .spacer {
+	width: 3px;
+}
+
+#familybook_chart .line4 {
+	width: 7px;
+	vertical-align: middle;
+}
+
+[ID^="vline"] {
+	width: 3px;
+}
+
+#familybook_chart h3 {
+	color: #006;
+	font-size: 16px;
+	text-align: center;
+}
+
+[dir=rtl] #familybook_chart {
+	margin-right: 10px;
+}
+
+/*-- Fan chart ---- */
+.fan_chart_menu {
+	position: absolute;
+	display: none;
+	z-index: 100;
+}
+
+#fan_chart ul {
+	list-style-type: none;
+	margin: 0;
+}
+
+#fan_chart ul.children li:before {
+	content: "< ";
+	font-weight: bold;
+}
+
+#fan_chart_img {
+	text-align: center;
+}
+
+/*-- Hourglass ---- */
+#hourglass_chart img.line4 {
+	vertical-align: middle;
+}
+
+#hourglass_chart table,
+.charts_block table {
+	border-collapse: collapse;
+}
+
+#hourglass_chart td,
+.charts_block td {
+	padding: 0;
+	empty-cells: show;
+}
+
+/*-- Lifespan ---- */
+#lifespan-page .person0 {
+	padding: 5px;
+}
+
+#lifespan-page .person0 div{
+	text-align: center;
+}
+
+#lifespan_chart .div-controls {
+	opacity: 0.67;
+	position: relative;
+	top: 80px;
+	width: 180px;
+	z-index: 100;
+	margin-left: 20px;
+}
+
+.lifespan_people span:first-letter {
+	font-variant: small-caps;
+	font-size: 16px;
+	padding: 1px;
+}
+
+.lifespan_outer {
+	position: relative;
+	width: 99.5%;
+	height: 600px;
+	overflow: hidden;
+	border: solid #00f 1px;
+}
+
+.lifespan_outer a:hover {
+	color: #f00;
+	text-decoration: none;
+}
+
+.lifespan_timeline {
+	position: absolute;
+	width: 100%;
+	left: -10px;
+	top: -65px;
+	z-index: 2;
+	background-color: #fff;
+}
+
+.lifespan_people {
+	position: absolute;
+	width: 500px;
+	left: -10px;
+	top: -60px;
+	z-index: 1;
+}
+
+/*-- Pedigree ---- */
+#pedigree_chart #childbox {
+	border: 1px solid;
+	background-color: #fff;
+}
+
+.pedigree_form {
+	width: 45px;
+}
+
+#pedigree-page table.list_table {
+	margin: 0 auto;
+	width: 500px;
+}
+
+.pedigree_chart_table {
+	border: 0;
+	border-collapse: collapse;
+	padding: 0;
+	width: 100%;
 }
 
-/* Icons */
+#pedigree_chart {
+	position: relative;
+	top: -200px;
+	left: 0;
+}
+
+[dir=rtl] #pedigree_chart {
+	left: auto;
+	right: 0;
+}
+
+#pedigree_canvas {
+	position: absolute;
+	top: 200px;
+	z-index: -1000;
+}
+
+#pedigree_chart #childarrow,
+#pedigree_chart #uparrow,
+#pedigree_chart .shadow,
+.ancestorarrow {
+	position: absolute;
+}
+
+/*-- Relationship ---- */
+#relationship-page h3 {
+	margin: 20px 0 0 20px;
+}
+
+#relationship_chart {
+	margin: 0 6px;
+}
+
+/*-- timeline  --*/
+#timeline_chart {
+	position: relative;
+	top: 0;
+	left: 0;
+}
+
+/* ====== Common Icons ========= */
 [class^="icon-"],
 [class*=" icon-"] {
 	display: inline-block;
@@ -3327,6 +3506,7 @@ dd .deletelink {
 	width: 18px;
 	height: 16px;
 	background-image: url(images/addmedia.png);
+	vertical-align: middle;
 }
 
 .icon-button_addnote {
@@ -3351,6 +3531,19 @@ dd .deletelink {
 	width: 19px;
 	height: 15px;
 	background-image: url(images/calendar.png);
+	vertical-align: middle;
+}
+
+.icon-button_family {
+	width: 14px;
+	height: 15px;
+	background-image: url(images/family.png);
+}
+
+.icon-button_find {
+	width: 17px;
+	height: 15px;
+	background-image: url(images/find.png);
 }
 
 .icon-button_find_facts {
@@ -3366,15 +3559,24 @@ dd .deletelink {
 }
 
 .icon-button_indi {
-	width: 11px;
+	vertical-align: top;
+	width: 15px;
 	height: 15px;
 	background-image: url(images/indi.png);
 }
 
+.icon-button_keyboard {
+	width: 30px;
+	height: 15px;
+	background-image: url(images/keyboard.png);
+	vertical-align: middle;
+}
+
 .icon-button_media {
 	width: 18px;
 	height: 16px;
 	background-image: url(images/media.png);
+	vertical-align: middle;
 }
 
 .icon-button_note {
@@ -3387,6 +3589,7 @@ dd .deletelink {
 	width: 15px;
 	height: 15px;
 	background-image: url(images/place.png);
+	vertical-align: middle;
 }
 
 .icon-button_repository {
@@ -3401,24 +3604,28 @@ dd .deletelink {
 	background-image: url(images/source.png);
 }
 
-.icon-button_family {
-	width: 14px;
-	height: 15px;
+.icon-cfamily {
+	width: 20px;
+	height: 20px;
 	background-image: url(images/family.png);
-	vertical-align: top;
 }
 
-.icon-button_indi {
-	width: 15px;
-	height: 15px;
-	background-image: url(images/indi.png);
-	vertical-align: top;
+.icon-childless {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/childless.png);
 }
 
-.icon-button_keyboard {
-	width: 30px;
-	height: 15px;
-	background-image: url(images/keyboard.png);
+.icon-children {
+	width: 16px;
+	height: 16px;
+	background-image: url(images/children.png);
+}
+
+.icon-clippings {
+	width: 22px;
+	height: 22px;
+	background-image: url(images/clippings.png);
 }
 
 .icon-darrow {
@@ -3445,16 +3652,10 @@ a.icon-ddarrow {
 	background-image: url(images/ddarrow2.png);
 }
 
-.icon-childless {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/childless.png);
-}
-
-.icon-children {
-	width: 16px;
-	height: 16px;
-	background-image: url(images/children.png);
+.icon-edit_indi {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/edit_sm.png);
 }
 
 .icon-email {
@@ -3463,6 +3664,12 @@ a.icon-ddarrow {
 	background-image: url(images/email.png);
 }
 
+.icon-fam-list {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/family.png);
+}
+
 .icon-googlemaps {
 	width: 16px;
 	height: 16px;
@@ -3471,11 +3678,18 @@ a.icon-ddarrow {
 
 .icon-help {
 	cursor: help;
+	margin: 0 5px;
 	width: 15px;
 	height: 15px;
 	background-image: url(images/help.png);
 }
 
+.icon-indi-list {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/indis.png);
+}
+
 .icon-lifespan-chunk {
 	width: 50px;
 	height: 37px;
@@ -3506,6 +3720,12 @@ a.icon-ldarrow:hover {
 	background-image: url(images/ldarrow2.png);
 }
 
+.icon-lifespan-chunk {
+	width: 50px;
+	height: 37px;
+	background-image: url(images/lifespan-chunk.png);
+}
+
 .icon-loading-small {
 	width: 16px;
 	height: 16px;
@@ -3542,6 +3762,18 @@ a.icon-ldarrow:hover {
 	background-image: url(images/lifespan-up.png);
 }
 
+.icon-media {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/media.png);
+}
+
+.icon-media-list {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/media.png);
+}
+
 .icon-media-next {
 	width: 20px;
 	height: 20px;
@@ -3578,18 +3810,30 @@ a.icon-ldarrow:hover {
 	background-image: url(images/minus.png);
 }
 
+.icon-mypage {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/mypage.png);
+}
+
+.icon-note {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/notes.png);
+}
+
+.icon-note-list {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/notes.png);
+}
+
 .icon-osm {
 	width: 16px;
 	height: 16px;
 	background-image: url(images/osm.png);
 }
 
-.icon-pedigree {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/pedigree.png);
-}
-
 .icon-plus {
 	width: 11px;
 	height: 11px;
@@ -3633,6 +3877,8 @@ a.icon-rdarrow:hover {
 }
 
 .icon-resn-confidential {
+	width: 16px;
+	height: 16px;
 	background-image: none;
 }
 
@@ -3654,12 +3900,6 @@ a.icon-rdarrow:hover {
 	background-image: url(images/rings.png);
 }
 
-.icon-search {
-	width: 24px;
-	height: 24px;
-	background-image: url(images/search.png);
-}
-
 .icon-selected {
 	width: 12px;
 	height: 12px;
@@ -3702,10 +3942,23 @@ a.icon-rdarrow:hover {
 	background-image: url(images/sex_u_9x9.png);
 }
 
+.icon-sfamily {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/sfamily.png);
+}
+
+.icon-source {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/source.png);
+}
+
 .icon-target {
 	width: 15px;
 	height: 15px;
 	background-image: url(images/target.png);
+	vertical-align: middle;
 }
 
 .icon-uarrow {
@@ -3726,7 +3979,7 @@ a.icon-uarrow:hover {
 	background-image: url(images/udarrow.png);
 }
 
-a.icon-udarrow {
+a.icon-udarrow:hover {
 	width: 20px;
 	height: 20px;
 	background-image: url(images/udarrow2.png);
@@ -3744,11 +3997,6 @@ a.icon-udarrow {
 	background-image: url(images/w_button.png);
 }
 
-/* ios on click workaround */
-.iconz {
-	cursor: pointer;
-}
-
 .icon-zoomin {
 	width: 25px;
 	height: 25px;
@@ -3761,20 +4009,42 @@ a.icon-udarrow {
 	background-image: url(images/zoomout.png);
 }
 
-/*
-.icon-cfamily {width:24px;height:24px;background-image:url(images/cfamily.png);}
-.icon-clippings {width:24px;height:24px;background-image:url(images/clippings.png);}
-.icon-indis {width:24px;height:24px;background-image:url(images/indis.png);}
-.icon-mypage {width:25px;height:25px;background-image:url(images/mypage.png);}
-.icon-note {width:16px;height:16px;background-image:url(images/notes.png);}
-.icon-patriarch {width:25px;height:25px;background-image:url(images/patriarch.png);}
-.icon-place {width:24px;height:24px;background-image:url(images/place.png);}
-.icon-repository {width:25px;height:25px;background-image:url(images/repository.png);}
-.icon-sfamily {width:24px;height:24px;background-image:url(images/sfamily.png);}
-.icon-source {width:24px;height:24px;background-image:url(images/source.png);}
-.icon-tree {width:24px;height:24px;background-image:url(images/gedcom.png);}
-.icon-user_add {width:24px;height:24px;background-image:url(images/user_add.png);}
-*/
+/* Silhouettes on charts */
+.icon-silhouette-F {
+	width: 37px;
+	height: 50px;
+	background-image: url(images/silhouette_female_small.png);
+}
+
+.icon-silhouette-M {
+	width: 37px;
+	height: 50px;
+	background-image: url(images/silhouette_male_small.png);
+}
+
+.icon-silhouette-U {
+	width: 37px;
+	height: 50px;
+	background-image: url(images/silhouette_unknown_small.png);
+}
+
+#indi_mainimage .icon-silhouette-F {
+	width: 99px;
+	height: 106px;
+	background-image: url(images/silhouette_female.png);
+}
+
+#indi_mainimage .icon-silhouette-M {
+	width: 99px;
+	height: 99px;
+	background-image: url(images/silhouette_male.png);
+}
+
+#indi_mainimage .icon-silhouette-U {
+	width: 100px;
+	height: 97px;
+	background-image: url(images/silhouette_unknown.png);
+}
 
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
@@ -3784,7 +4054,7 @@ a.icon-udarrow {
 	height: 48px;
 }
 
-/* Generic MIME types */
+/* ===== Generic MIME types ===== */
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
 	background-position: -99px -49px;
@@ -3815,7 +4085,7 @@ a.icon-udarrow {
 	background-position: -148px -147px;
 }
 
-/* Specific MIME types */
+/* ===== Specific MIME types ===== */
 .icon-mime-application-pdf {
 	background-position: -1px -49px;
 }
@@ -3899,444 +4169,311 @@ a.icon-udarrow {
 .icon-mime-video-x-ms-wmv {
 	background-position: -50px -196px;
 }
+/* ====== End Icon styles ====== */
 
-/* Silhouettes on charts */
-.icon-silhouette-F {
-	width: 37px;
-	height: 50px;
-	background-image: url(images/silhouette_female_small.png);
-}
-
-.icon-silhouette-M {
-	width: 37px;
-	height: 50px;
-	background-image: url(images/silhouette_male_small.png);
-}
-
-.icon-silhouette-U {
-	width: 37px;
-	height: 50px;
-	background-image: url(images/silhouette_unknown_small.png);
+/* ====== Theme Header ========= */
+header h1 {
+	clear: left;
+	float: left;
+	font-size: 26px;
+	font-weight: 900;
+	margin: 0;
 }
 
-/* Silhouettes on individual pages */
-#indi_mainimage {
+[dir=rtl] header h1 {
 	float: right;
 }
 
-#indi_mainimage .icon-silhouette-F {
-	width: 99px;
-	height: 106px;
-	background-image: url(images/silhouette_female.png);
-}
-
-#indi_mainimage .icon-silhouette-M {
-	width: 99px;
-	height: 99px;
-	background-image: url(images/silhouette_male.png);
-}
-
-#indi_mainimage .icon-silhouette-U {
-	width: 100px;
-	height: 97px;
-	background-image: url(images/silhouette_unknown.png);
-}
-
-/* Edit interface pop-ups*/
-#edit_interface-page h4 {
-	color: #555;
-	margin: 5px;
-}
-
-#edit_interface-page .optionbox span {
-	margin: 0 5px;
-}
-
-#edit_interface-page #LATI,
-#edit_interface-page #LONG,
-#edit_interface-page #SPFX,
-#edit_interface-page #NSFX,
-#edit_interface-page #NPFX {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 88px;
-}
-
-#edit_interface-page #GIVN,
-#edit_interface-page #SURN,
-#edit_interface-page #_MARNM {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 180px;
-}
-
-#edit_interface-page input[type="text"],
-#edit_interface-page #NAME_display {
-	line-height: 18px;
-	margin: 0 5px;
-	vertical-align: top;
-	width: 240px;
-}
-
-#edit_interface-page input[type="text"][id*="PAGE"],
-#edit_interface-page input[type="text"][id*="_UID"] {
-	width: 350px;
-}
-
-#edit_interface-page input[type="text"][id*="SOUR"],
-#edit_interface-page input[type="text"][id*="REPO"],
-#edit_interface-page input[type="text"][id*="OBJE"],
-#edit_interface-page input[type="text"][id*="FAMC"],
-#edit_interface-page input[type="text"][id*="ASSO"],
-#edit_interface-page input[type="text"][id^="AGE"],
-#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 250px;
+header nav {
+	position: relative;
+	float: left;
+	width: 100%;
+	margin-top: 18px;
+	border-bottom: 1px solid;
+	margin-bottom: 10px;
 }
 
-#edit_interface-page input[type="text"][id$="DATE"] {
-	width: 160px;
+[dir=rtl] header nav {
+	float: right;
 }
 
-#edit_interface-page input[type="text"][id^="TIME"] {
-	width: 100px;
+/* Set stack level for top two header menu rows */
+.secondary-menu ul,
+.primary-menu ul {
+	z-index: 210;
 }
 
-#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
-	width: 200px;
+.title {
+	font-size: 20px;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
-	width: 250px;
+/* ====== Secondary menu ======= */
+.secondary-menu {
+	float: right;
+	font-size: 14px;
 }
 
-#edit_interface-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+[dir=rtl] .secondary-menu {
+	float: left;
 }
 
-#edit_interface-page textarea {
-	margin: 0 5px;
-	width: 440px;
-}
+.secondary-menu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
+	float: left;
+	border: 1px solid #999;
+	line-height: 26px;
 
-#edit_interface-page textarea[id*="NOTE"] {
-	height: 240px;
 }
 
-#edit_interface-page textarea[id*="TEXT"],
-#edit_interface-page textarea[id*="PUBL"] {
-	height: 140px;
+[dir=rtl] .secondary-menu li {
+	float: right;
 }
 
-#edit_interface-page textarea[id^="newgedrec"] {
-	line-height: 18px;
-	width: 605px;
+.secondary-menu li a {
+	padding: 5px 8px;
 }
 
-#edit_interface-page textarea#gedcom {
-	height: 364px;
+.secondary-menu ul {
+	position: absolute;
+	top: 26px;
+	left: 0;
+	right: auto;
+	display: none;
+	font-weight: normal;
+	font-size: 12px;
+	background: #fff;
+	border: 1px solid #999;
 }
 
-#edit_interface-page textarea[id*="ADDR"],
-#edit_interface-page input[id*="ADDR"] {
-	height: 80px;
-	width: 300px;
+[dir=rtl] .secondary-menu ul {
+	left: auto;
+	right: 0;
 }
 
-#edit_interface-page #changefam {
-	padding: 5px;
+.secondary-menu ul li {
+	border: 0;
+	clear: both;
+	display: block;
+	line-height: 2;
+	text-align: left;
 }
 
-#edit_interface-page #changefam table {
-	margin: 10px auto;
-	min-width: 400px;
-	max-width: 650px;
+[dir=rtl] .secondary-menu ul li {
+	text-align: right;
 }
 
-#edit_interface-page #changefam span {
+.secondary-menu,
+.secondary-menu ul {
+	list-style: none;
 	margin: 0;
+	padding: 1px;
 }
 
-#edit_interface-page #changefam td {
-	padding: 5px;
-	white-space: normal;
-}
-
-#edit_interface-page #changefam td.child {
-	text-align: center;
-}
-
-#save-cancel {
-	position: fixed;
-	bottom: 0;
-	width: 98%;
-	border: solid #555 1px;
-	margin: 0;
+.secondary-menu li:hover ul {
+	display: block;
 }
 
-#save-cancel input {
-	padding: 2px 8px;
-}
 
-#save-cancel .save {
-	float: left;
-	margin: 5px;
+.secondary-menu ul li a {
+	padding: 0 5px 0 2px;
+	display: block;
 }
 
-#save-cancel .cancel {
-	float: right;
-	margin: 5px;
+.secondary-menu .active {
+	font-weight: 900;
 }
 
-[dir=rtl] #save-cancel .save {
+/* ====== Primary menu ========= */
+.primary-menu {
+	position: relative;
 	float: right;
+	right: 50%;
+	list-style: none;
 }
 
-[dir=rtl] #save-cancel .cancel {
+[dir=rtl] .primary-menu {
+	right: auto;
 	float: left;
+	left: 50%;
 }
 
-#edit_interface-page,
-#addmedia-page {
-	margin-bottom: 50px;
-}
-
-/* Addmedia pop-ups*/
-#addmedia-page input[type="text"] {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 350px;
-}
-
-#addmedia-page .optionbox select {
-	margin: 0 5px;
-}
-
-#addmedia-page .optionbox p.sub {
-	font-size: 11px;
-	margin: 0 5px;
-}
-
-#addmedia-page input[type="text"][id*="PAGE"],
-#addmedia-page input[type="text"][id*="_UID"] {
-	width: 350px;
-}
-
-#addmedia-page input[type="text"][id*="SOUR"],
-#addmedia-page input[type="text"][id*="REPO"],
-#addmedia-page input[type="text"][id*="OBJE"],
-#addmedia-page input[type="text"][id*="FAMC"],
-#addmedia-page input[type="text"][id*="ASSO"],
-#addmedia-page input[type="text"][id^="AGE"],
-#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 70px;
+.primary-menu li {
+	float: left;
+	position: relative;
+	left: 50%;
+	clear: right;
+	width: auto;
+	padding: 0 5px;
+	border: 1px solid #999;
 }
 
-#addmedia-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+[dir=rtl] .primary-menu li {
+	float: right;
+	clear: left;
+	right: 50%;
 }
 
-#addmedia-page textarea {
-	margin: 0 5px;
-	width: 440px;
-}
 
-#addmedia-page textarea[id*="NOTE"] {
-	height: 240px;
+.primary-menu li a {
+	display: block;
+	font-size: 14px;
+	text-align: center;
+	padding: 5px;
+	background-color: #fff;
 }
 
-/* Styling for the jquery.colorbox gallery */
-#colorbox,
-#cboxOverlay,
-#cboxWrapper {
+.primary-menu ul {
 	position: absolute;
-	top: 0;
+	top: 27px;
 	left: 0;
-	z-index: 9999;
-	overflow: hidden;
-}
-
-#colorbox {
-	border: 2px solid #ccc;
-}
-
-#cboxOverlay {
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	background: #ccc;
-}
-
-#cboxContent {
-	background: #fff;
-	border: 5px solid #888;
-}
-
-#cboxLoadedContent {
-	overflow: auto;
+	right: auto;
+	display: none;
 	background: #fff;
-	margin-bottom: 30px;
-	margin-top: 35px;
+	white-space: nowrap;
+	border: 1px solid #999;
+	list-style: none;
 }
 
-#cboxTitle {
-	position: absolute;
-	left: 0;
-	top: 10px;
-	color: #949494;
-	text-align: center;
-	width: 100%;
-	font-weight: 800;
-	font-size: 14px;
+[dir=rtl] .primary-menu ul {
+	right: 0;
+	left: auto;
 }
 
-.cboxPhoto {
+.primary-menu ul li {
 	float: left;
-	margin: auto;
+	width: 100%;
 	border: 0;
-	display: block;
-	max-width: none;
+	left: auto;
+	margin: 0;
+	padding: 0;
+	clear: left;
 }
 
-.cboxIframe {
+[dir=rtl] .primary-menu ul li {
+	right: auto; /*resets the right:50% on the parent li */
+	clear: right;
+	float: right;
 	width: 100%;
-	height: 100%;
-	display: block;
-	border: 0;
 }
 
-#cboxPrevious {
+.primary-menu li:hover ul {
 	position: absolute;
-	bottom: 0;
-	left: 0;
-	background: url(images/controls.png) no-repeat -75px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+	margin: 0;
+	display: block;
+	text-align: left;
+	padding: 0;
 }
 
-#cboxPrevious:hover {
-	background-position: -75px -25px;
+[dir=rtl] .primary-menu li:hover ul {
+	text-align: right;
 }
 
-#cboxNext {
-	position: absolute;
-	bottom: 0;
-	left: 27px;
-	background: url(images/controls.png) no-repeat -50px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+.primary-menu ul li a {
+	padding: 5px;
+	text-align: left;
+	font-size: 12px;
 }
 
-#cboxNext:hover {
-	background-position: -50px -25px;
+[dir=rtl] .primary-menu ul li a {
+	text-align: right;
 }
 
-#cboxSlideshow {
-	position: absolute;
-	bottom: 5px;
-	left: 57px;
-	margin: 10px;
-	border: 0;
-	background: none;
-	font-size: 14px;
-}
+/* ====== End Theme Header ===== */
 
-#cboxSlideshow:hover {
-	color: #f00;
-	background: #fff;
-}
+/* ====== Theme Footer ========= */
 
-#cboxClose {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	background: url(images/controls.png) no-repeat -25px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+footer {
+	clear: both;
+	font-size: 12px;
+	color: #555;
+	text-align: center;
 }
 
-#cboxClose:hover {
-	background-position: -25px -25px;
+.contact-links {
+	margin-top: 15px;
 }
 
-#cboxCurrent {
-	bottom: 4px;
-	color: #949494;
-	left: 58px;
-	position: absolute;
+.powered-by-webtrees {
+	font-size: 16px;
+	margin-top: 10px;
 }
 
-[dir=rtl] #cboxPrevious {
-	right: 27px;
-	left: auto;
+#link_change_blocks {
+	clear: both;
+	margin: 0 auto;
+	padding: 25px 0 0;
+	text-align: center;
+	width: 400px;
 }
 
-[dir=rtl] #cboxNext {
-	right: 0;
-	left: auto;
+#link_change_blocks span {
+	padding: 0 50px;
 }
 
-[dir=rtl] #cboxCurrent {
-	right: auto;
-	left: 0;
+#link_change_blocks span span {
+	padding: 0 3px;
 }
 
-[dir=rtl] #cboxClose {
-	right: auto;
-	left: 0;
-}
+/* ====== End Theme Footer ===== */
 
-[dir=rtl] #cboxSlideshow {
-	right: 57px;
-	left: auto;
+/* ====== Theme Icons ========== */
+/* --- Body Icons -- */
+.icon-pedigree {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/pedigree.png);
 }
 
-/* Census assistant module */
-table.table-census-assistant th {
-	font-weight: bold;
-	text-align: left;
+.icon-search {
+	width: 24px;
+	height: 24px;
+	background-image: url(images/search.png);
 }
 
-/* Stories module */
-.story_title {
-	padding-top: 12px;
-	height: 32px;
-	font-size: 13px;
-	font-weight: 700;
-}
 
-.story_body {
-	padding: 20px;
-	white-space: normal;
-}
+@media print {
+	header,
+	footer,
+	form,
+	#sidebar,
+	#separator,
+	.noprint {
+		display: none;
+	}
 
-.story_edit {
-	padding: 12px;
-}
+	#pedigree_chart {
+		left: -40px;
+		top:  -260px;
+	}
 
-/* User content in stories tab */
-#stories h2,
-#stories h3,
-#stories h4,
-#stories h5 {
-	padding-top: 20px;
-}
+	[dir=rtl] #pedigree_chart {
+		left: auto;
+		right: -20px;
+	}
 
-#stories p {
-	padding-top: 8px;
-}
+	#header_accordion1 {
+		width: 510px;
+	}
 
-.btn-group {
-	display: inline-block;
-	margin: 0 4px;
+	#familybook_chart h3 {
+		margin-bottom: 10px;
+	}
+
+	.lifespan_outer {
+		position: relative;
+		width: auto;
+		height: auto;
+		overflow: visible;
+		border: 0;
+	}
+
+	.lifespan_people {
+		position: absolute;
+		width: auto;
+		left: -10px;
+		top: -60px;
+		z-index: 1;
+	}
 }
diff --git a/themes/minimal/footer.php b/themes/minimal/footer.php
deleted file mode 100644
index 74247e1960..0000000000
--- a/themes/minimal/footer.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-// Footer for Minimal theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo '</main>';
-if ($view!='simple') {
-	echo '<footer>';
-	echo contact_links();
-	echo '<p class="logo">';
-	echo '<a href="', WT_WEBTREES_URL, '" target="_blank" title="', WT_WEBTREES, ' ', WT_VERSION, '">webtrees</a>';
-	echo '</p>';
-	if ($WT_TREE && $WT_TREE->getPreference('SHOW_STATS')) {
-		echo execution_stats();
-	}
-	echo '</footer>';
-}
diff --git a/themes/minimal/header.php b/themes/minimal/header.php
deleted file mode 100644
index 5075e5ce62..0000000000
--- a/themes/minimal/header.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-// Header for Minimal theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use WT\Auth;
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-// This theme uses the jQuery “colorbox” plugin to display images
-$this
-	->addExternalJavascript(WT_JQUERY_COLORBOX_URL)
-	->addExternalJavascript(WT_JQUERY_WHEELZOOM_URL)
-	->addInlineJavascript('activate_colorbox();')
-	->addInlineJavascript('jQuery.extend(jQuery.colorbox.settings, {width:"85%", height:"85%", transition:"none", slideshowStart:"'. WT_I18N::translate('Play').'", slideshowStop:"'. WT_I18N::translate('Stop').'"})')
-	->addInlineJavascript('
-		jQuery.extend(jQuery.colorbox.settings, {
-			title: function() {
-				var img_title = jQuery(this).data("title");
-				return img_title;
-			}
-		});
-	');
-?>
-<!DOCTYPE html>
-<html <?php echo WT_I18N::html_markup(); ?>>
-<head>
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<?php echo header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL); ?>
-	<title><?php echo WT_Filter::escapeHtml($title); ?></title>
-	<link rel="icon" href="<?php echo WT_CSS_URL; ?>favicon.png" type="image/png">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_THEME_URL; ?>jquery-ui-1.11.2/jquery-ui.css">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_CSS_URL; ?>style.css">
-	<!--[if IE 8]>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-	<![endif]-->
-</head>
-<body id="body">
-	<?php if ($view !== 'simple') { ?>
-	<header>
-		<h1><?php echo WT_TREE_TITLE; ?></h1>
-		<div id="header-user-links">
-			<ul class="makeMenu">
-				<?php
-				if (Auth::check()) {
-					echo '<li><a href="edituser.php">', WT_Filter::escapeHtml(Auth::user()->getRealName()), '</a></li> <li>', logout_link(), '</li>';
-					if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
-						echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\',chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
-					}
-				} else {
-					echo '<li>', login_link(), '</li> ';
-				}
-				?>
-				<?php echo WT_MenuBar::getFavoritesMenu(); ?>
-				<?php echo WT_MenuBar::getLanguageMenu(); ?>
-				<?php echo WT_MenuBar::getThemeMenu(); ?>
-				<li>
-					<form style="display:inline;" action="search.php" method="post">
-						<input type="hidden" name="action" value="general">
-						<input type="hidden" name="ged" value="<?php echo WT_GEDCOM; ?>">
-						<input type="hidden" name="topsearch" value="yes">
-						<input type="search" name="query" size="20" placeholder="<?php echo WT_I18N::translate('Search'); ?>">
-					</form>
-				</li>
-			</ul>
-		</div>
-		<nav id="topMenu">
-			<ul id="main-menu" role="menubar">
-				<?php echo WT_MenuBar::getGedcomMenu();   ?>
-				<?php echo WT_MenuBar::getMyPageMenu();   ?>
-				<?php echo WT_MenuBar::getChartsMenu();   ?>
-				<?php echo WT_MenuBar::getListsMenu();    ?>
-				<?php echo WT_MenuBar::getCalendarMenu(); ?>
-				<?php echo WT_MenuBar::getReportsMenu();  ?>
-				<?php echo WT_MenuBar::getSearchMenu();   ?>
-				<?php echo implode('', WT_MenuBar::getModuleMenus()); ?>
-			</ul>
-		</nav>
-	</header>
-	<?php } ?>
-	<?php echo WT_FlashMessages::getHtmlMessages(); ?>
-	<main id="content">
diff --git a/themes/minimal/templates/block_main_temp.php b/themes/minimal/templates/block_main_temp.php
deleted file mode 100644
index 0f0b4416e0..0000000000
--- a/themes/minimal/templates/block_main_temp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-// Template for drawing the main blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2008 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<div class="blockheader">
-		<?php echo $title; ?>
-	</div>
-	<div class="blockcontent normal_inner_block <?php echo $class; ?>">
-		<?php echo $content; ?>
-	</div>
-</div>
diff --git a/themes/minimal/templates/block_small_temp.php b/themes/minimal/templates/block_small_temp.php
deleted file mode 100644
index 37e618400c..0000000000
--- a/themes/minimal/templates/block_small_temp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-// Template for drawing the height-restricted blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2008 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<div class="blockheader">
-		<?php echo $title; ?>
-	</div>
-	<div class="blockcontent small_inner_block <?php echo $class; ?>">
-		<?php echo $content; ?>
-	</div>
-</div>
diff --git a/themes/minimal/templates/compactbox_template.php b/themes/minimal/templates/compactbox_template.php
deleted file mode 100644
index 4a3386f801..0000000000
--- a/themes/minimal/templates/compactbox_template.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-//  $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $outBoxAdd, $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '"' , $outBoxAdd, '>
-	<div class="compact_view">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'">
-			<span class="namedef name',$style,'">', $shortname, '</span>
-		</a>
-	</div>
-	<div class="inout2 details',$style,'">',
-		$person->getLifeSpan(), '
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/minimal/templates/personbox_template.php b/themes/minimal/templates/personbox_template.php
deleted file mode 100644
index b1fdc7ade2..0000000000
--- a/themes/minimal/templates/personbox_template.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-// $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $genderImage, $BirthDeath, $outBoxAdd,
-// $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team. All rights reserved.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '" ',$outBoxAdd,'>
-	<div class="noprint icons">', $icons, '</div>',
-	'<div class="chart_textbox" style="max-height:', $bheight,'px;">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '">
-			<span class="namedef name',$style,'">',
-				$name,
-				$genderImage,'
-				<span class="details',$style,'">' . $LDSord . '</span>
-			</span>
-		</a>
-		<div class="namedef name',$style,'">',$addname,'</div>
-		<div class="inout2 details',$style,'">',
-			$BirthDeath,
-		'</div>
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php
index dd9f5aeafb..52b66b9b28 100644
--- a/themes/minimal/theme.php
+++ b/themes/minimal/theme.php
@@ -2,10 +2,7 @@
 // Minimal theme
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2010 PGV Development Team.
+// Copyright (C) 2015 webtrees development team.
 //
 // 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
@@ -21,90 +18,4 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-// Theme name - this needs double quotes, as file is scanned/parsed by script
-$theme_name = "minimal"; /* I18N: Name of a theme. */ WT_I18N::translate('minimal');
-
-// A version number in the path prevents browser-cache problems during upgrade
-define('WT_CSS_URL', WT_THEME_URL . 'css-1.6.2/');
-
-$headerfile = WT_THEME_DIR.'header.php';
-$footerfile = WT_THEME_DIR.'footer.php';
-
-//-- variables for image names
-$WT_IMAGES = array(
-	// used to draw charts
-	'dline'           => WT_CSS_URL . 'images/dline.png',
-	'dline2'          => WT_CSS_URL . 'images/dline2.png',
-	'hline'           => WT_CSS_URL . 'images/hline.png',
-	'spacer'          => WT_CSS_URL . 'images/spacer.png',
-	'vline'           => WT_CSS_URL . 'images/vline.png',
-
-	// used in button images and javascript
-	'add'             => WT_CSS_URL . 'images/add.png',
-	'button_family'   => WT_CSS_URL . 'images/buttons/family.png',
-	'minus'           => WT_CSS_URL . 'images/minus.png',
-	'plus'            => WT_CSS_URL . 'images/plus.png',
-	'remove'          => WT_CSS_URL . 'images/remove.png',
-	'search'          => WT_CSS_URL . 'images/search.png',
-
-	// need different sizes before moving to CSS
-	'default_image_F' => WT_CSS_URL . 'images/silhouette_female.png',
-	'default_image_M' => WT_CSS_URL . 'images/silhouette_male.png',
-	'default_image_U' => WT_CSS_URL . 'images/silhouette_unknown.png',
-);
-
-//-- Variables for the Fan chart
-$fanChart = array(
-	'font'     => WT_ROOT . 'includes/fonts/DejaVuSans.ttf',
-	'size'     => 7,
-	'color'    => '#000000',
-	'bgColor'  => '#eeeeee',
-	'bgMColor' => '#cccccc',
-	'bgFColor' => '#dddddd'
-);
-
-// This section defines variables for the pedigree chart
-$bwidth        = 250; // width of boxes on pedigree chart
-$bheight       = 80;  // height of boxes on pedigree chart
-$baseyoffset   = 10;  // position the entire pedigree tree relative to the top of the page
-$basexoffset   = 10;  // position the entire pedigree tree relative to the left of the page
-$bxspacing     = 0;   // horizontal spacing between boxes on the pedigree chart
-$byspacing     = 5;   // vertical spacing between boxes on the pedigree chart
-$brborder      = 1;   // box right border thickness
-$linewidth     = 1.5; // width of joining lines
-$shadowcolor   = '';  // shadow color for joining lines
-$shadowblur    = 0;   // shadow blur for joining lines
-$shadowoffsetX = 0;   // shadowOffsetX for joining lines
-$shadowoffsetY = 0;   // shadowOffsetY for joining lines
-
-// Global variables for the descendancy chart
-$Dbaseyoffset  = 20;  // position the entire descendancy tree relative to the top of the page
-$Dbasexoffset  = 20;  // position the entire descendancy tree relative to the left of the page
-$Dbxspacing    = 5;   // horizontal spacing between boxes
-$Dbyspacing    = 10;  // vertical spacing between boxes
-$Dbwidth       = 260; // width of DIV layer boxes
-$Dbheight      = 80;  // height of DIV layer boxes
-$Dindent       = 15;  // width to indent descendancy boxes
-$Darrowwidth   = 30;  // additional width to include for the up arrows
-$Darrowwidth   = 15;  // additional width to include for the up arrows
-
-// Dimensions for compact version of chart displays
-$cbwidth  = 240;
-$cbheight = 50;
-
-// The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels
-$WT_STATS_S_CHART_X = 440;
-$WT_STATS_S_CHART_Y = 125;
-$WT_STATS_L_CHART_X = 900;
-// For map charts, the maximum size is 440 pixels wide by 220 pixels high
-$WT_STATS_MAP_X = 440;
-$WT_STATS_MAP_Y = 220;
-
-$WT_STATS_CHART_COLOR1 = "ffffff";
-$WT_STATS_CHART_COLOR2 = "555555";
-$WT_STATS_CHART_COLOR3 = "cccccc";
+return new WT\Theme\Minimal;
diff --git a/themes/webtrees/css-1.6.2/favicon.png b/themes/webtrees/css-1.7.0/favicon.png
index 4c54cc0e4e..4c54cc0e4e 100644
--- a/themes/webtrees/css-1.6.2/favicon.png
+++ b/themes/webtrees/css-1.7.0/favicon.png
diff --git a/themes/webtrees/css-1.6.2/images/add.png b/themes/webtrees/css-1.7.0/images/add.png
index c4554632f2..c4554632f2 100644
--- a/themes/webtrees/css-1.6.2/images/add.png
+++ b/themes/webtrees/css-1.7.0/images/add.png
diff --git a/themes/webtrees/css-1.6.2/images/admin.png b/themes/webtrees/css-1.7.0/images/admin.png
index 6a97223e8f..6a97223e8f 100644
--- a/themes/webtrees/css-1.6.2/images/admin.png
+++ b/themes/webtrees/css-1.7.0/images/admin.png
diff --git a/themes/webtrees/css-1.6.2/images/bing.png b/themes/webtrees/css-1.7.0/images/bing.png
index 400627cf16..400627cf16 100644
--- a/themes/webtrees/css-1.6.2/images/bing.png
+++ b/themes/webtrees/css-1.7.0/images/bing.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/addmedia.png b/themes/webtrees/css-1.7.0/images/buttons/addmedia.png
index a269a90e35..a269a90e35 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/addmedia.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/addmedia.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/addnote.png b/themes/webtrees/css-1.7.0/images/buttons/addnote.png
index 5811eabeaa..5811eabeaa 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/addnote.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/addnote.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/addrepository.png b/themes/webtrees/css-1.7.0/images/buttons/addrepository.png
index b7f2ce630a..b7f2ce630a 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/addrepository.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/addrepository.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/addsource.png b/themes/webtrees/css-1.7.0/images/buttons/addsource.png
index f5b6d8b787..f5b6d8b787 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/addsource.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/addsource.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/calendar.png b/themes/webtrees/css-1.7.0/images/buttons/calendar.png
index 0d308a977a..0d308a977a 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/calendar.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/calendar.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/family.png b/themes/webtrees/css-1.7.0/images/buttons/family.png
index 3ceafc5abb..3ceafc5abb 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/family.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/family.png
diff --git a/themes/webtrees/css-1.7.0/images/buttons/find.png b/themes/webtrees/css-1.7.0/images/buttons/find.png
new file mode 100644
index 0000000000..be6c6002e4
--- /dev/null
+++ b/themes/webtrees/css-1.7.0/images/buttons/find.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/find_facts.png b/themes/webtrees/css-1.7.0/images/buttons/find_facts.png
index 2ba25a7858..2ba25a7858 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/find_facts.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/find_facts.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/head.png b/themes/webtrees/css-1.7.0/images/buttons/head.png
index 8c381b7d6a..8c381b7d6a 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/head.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/head.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/indi.png b/themes/webtrees/css-1.7.0/images/buttons/indi.png
index 31e3856acc..31e3856acc 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/indi.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/indi.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/keyboard.png b/themes/webtrees/css-1.7.0/images/buttons/keyboard.png
index 0c6f4b33f9..0c6f4b33f9 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/keyboard.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/keyboard.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/media.png b/themes/webtrees/css-1.7.0/images/buttons/media.png
index 0c7f115203..0c7f115203 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/media.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/media.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/note.png b/themes/webtrees/css-1.7.0/images/buttons/note.png
index 94435b7d06..94435b7d06 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/note.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/note.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/place.png b/themes/webtrees/css-1.7.0/images/buttons/place.png
index 8d4684fac3..8d4684fac3 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/place.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/place.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/repository.png b/themes/webtrees/css-1.7.0/images/buttons/repository.png
index ac7dcf74cb..ac7dcf74cb 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/repository.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/repository.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/source.png b/themes/webtrees/css-1.7.0/images/buttons/source.png
index a8770147b0..a8770147b0 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/source.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/source.png
diff --git a/themes/webtrees/css-1.6.2/images/buttons/target.png b/themes/webtrees/css-1.7.0/images/buttons/target.png
index 28d594c159..28d594c159 100644
--- a/themes/webtrees/css-1.6.2/images/buttons/target.png
+++ b/themes/webtrees/css-1.7.0/images/buttons/target.png
diff --git a/themes/webtrees/css-1.6.2/images/childless.png b/themes/webtrees/css-1.7.0/images/childless.png
index 10f82fe6fe..10f82fe6fe 100644
--- a/themes/webtrees/css-1.6.2/images/childless.png
+++ b/themes/webtrees/css-1.7.0/images/childless.png
diff --git a/themes/webtrees/css-1.6.2/images/children.png b/themes/webtrees/css-1.7.0/images/children.png
index 30dbbf1099..30dbbf1099 100644
--- a/themes/webtrees/css-1.6.2/images/children.png
+++ b/themes/webtrees/css-1.7.0/images/children.png
diff --git a/themes/webtrees/css-1.6.2/images/clippings.png b/themes/webtrees/css-1.7.0/images/clippings.png
index 194a884371..194a884371 100644
--- a/themes/webtrees/css-1.6.2/images/clippings.png
+++ b/themes/webtrees/css-1.7.0/images/clippings.png
diff --git a/themes/webtrees/css-1.6.2/images/controls.png b/themes/webtrees/css-1.7.0/images/controls.png
index 140c6fc4ae..140c6fc4ae 100644
--- a/themes/webtrees/css-1.6.2/images/controls.png
+++ b/themes/webtrees/css-1.7.0/images/controls.png
diff --git a/themes/webtrees/css-1.6.2/images/darrow.png b/themes/webtrees/css-1.7.0/images/darrow.png
index 3be2605dc8..3be2605dc8 100644
--- a/themes/webtrees/css-1.6.2/images/darrow.png
+++ b/themes/webtrees/css-1.7.0/images/darrow.png
diff --git a/themes/webtrees/css-1.6.2/images/darrow2.png b/themes/webtrees/css-1.7.0/images/darrow2.png
index 995ae19667..995ae19667 100644
--- a/themes/webtrees/css-1.6.2/images/darrow2.png
+++ b/themes/webtrees/css-1.7.0/images/darrow2.png
diff --git a/themes/webtrees/css-1.6.2/images/ddarrow.png b/themes/webtrees/css-1.7.0/images/ddarrow.png
index 44dd6ab5aa..44dd6ab5aa 100644
--- a/themes/webtrees/css-1.6.2/images/ddarrow.png
+++ b/themes/webtrees/css-1.7.0/images/ddarrow.png
diff --git a/themes/webtrees/css-1.6.2/images/ddarrow2.png b/themes/webtrees/css-1.7.0/images/ddarrow2.png
index 6cf0efbf9a..6cf0efbf9a 100644
--- a/themes/webtrees/css-1.6.2/images/ddarrow2.png
+++ b/themes/webtrees/css-1.7.0/images/ddarrow2.png
diff --git a/themes/webtrees/css-1.6.2/images/dline.png b/themes/webtrees/css-1.7.0/images/dline.png
index 36a4e2990c..36a4e2990c 100644
--- a/themes/webtrees/css-1.6.2/images/dline.png
+++ b/themes/webtrees/css-1.7.0/images/dline.png
diff --git a/themes/webtrees/css-1.6.2/images/dline2.png b/themes/webtrees/css-1.7.0/images/dline2.png
index 2ddfbed136..2ddfbed136 100644
--- a/themes/webtrees/css-1.6.2/images/dline2.png
+++ b/themes/webtrees/css-1.7.0/images/dline2.png
diff --git a/themes/webtrees/css-1.6.2/images/edit_indi.png b/themes/webtrees/css-1.7.0/images/edit_indi.png
index f0407aa2c9..f0407aa2c9 100644
--- a/themes/webtrees/css-1.6.2/images/edit_indi.png
+++ b/themes/webtrees/css-1.7.0/images/edit_indi.png
diff --git a/themes/webtrees/css-1.6.2/images/email.png b/themes/webtrees/css-1.7.0/images/email.png
index 2b3efdd668..2b3efdd668 100644
--- a/themes/webtrees/css-1.6.2/images/email.png
+++ b/themes/webtrees/css-1.7.0/images/email.png
diff --git a/themes/webtrees/css-1.6.2/images/family.png b/themes/webtrees/css-1.7.0/images/family.png
index c4ecc6c12d..c4ecc6c12d 100644
--- a/themes/webtrees/css-1.6.2/images/family.png
+++ b/themes/webtrees/css-1.7.0/images/family.png
diff --git a/themes/webtrees/css-1.6.2/images/general_sprite.png b/themes/webtrees/css-1.7.0/images/general_sprite.png
index 8b1d26397e..8b1d26397e 100644
--- a/themes/webtrees/css-1.6.2/images/general_sprite.png
+++ b/themes/webtrees/css-1.7.0/images/general_sprite.png
diff --git a/themes/webtrees/css-1.6.2/images/googlemaps.png b/themes/webtrees/css-1.7.0/images/googlemaps.png
index 12ab0c14d5..12ab0c14d5 100644
--- a/themes/webtrees/css-1.6.2/images/googlemaps.png
+++ b/themes/webtrees/css-1.7.0/images/googlemaps.png
diff --git a/themes/webtrees/css-1.6.2/images/help2.png b/themes/webtrees/css-1.7.0/images/help2.png
index 52bd22a3e9..52bd22a3e9 100644
--- a/themes/webtrees/css-1.6.2/images/help2.png
+++ b/themes/webtrees/css-1.7.0/images/help2.png
diff --git a/themes/webtrees/css-1.6.2/images/hline.png b/themes/webtrees/css-1.7.0/images/hline.png
index 922070a492..922070a492 100644
--- a/themes/webtrees/css-1.6.2/images/hline.png
+++ b/themes/webtrees/css-1.7.0/images/hline.png
diff --git a/themes/webtrees/css-1.6.2/images/icon-mime-sprite.png b/themes/webtrees/css-1.7.0/images/icon-mime-sprite.png
index 8322ae4580..8322ae4580 100644
--- a/themes/webtrees/css-1.6.2/images/icon-mime-sprite.png
+++ b/themes/webtrees/css-1.7.0/images/icon-mime-sprite.png
diff --git a/themes/webtrees/css-1.6.2/images/image_add.png b/themes/webtrees/css-1.7.0/images/image_add.png
index ecac61c284..ecac61c284 100644
--- a/themes/webtrees/css-1.6.2/images/image_add.png
+++ b/themes/webtrees/css-1.7.0/images/image_add.png
diff --git a/themes/webtrees/css-1.6.2/images/image_edit.png b/themes/webtrees/css-1.7.0/images/image_edit.png
index 3fb8061de2..3fb8061de2 100644
--- a/themes/webtrees/css-1.6.2/images/image_edit.png
+++ b/themes/webtrees/css-1.7.0/images/image_edit.png
diff --git a/themes/webtrees/css-1.6.2/images/image_link.png b/themes/webtrees/css-1.7.0/images/image_link.png
index 190b08e7d2..190b08e7d2 100644
--- a/themes/webtrees/css-1.6.2/images/image_link.png
+++ b/themes/webtrees/css-1.7.0/images/image_link.png
diff --git a/themes/webtrees/css-1.6.2/images/image_view.png b/themes/webtrees/css-1.7.0/images/image_view.png
index 1e7babae94..1e7babae94 100644
--- a/themes/webtrees/css-1.6.2/images/image_view.png
+++ b/themes/webtrees/css-1.7.0/images/image_view.png
diff --git a/themes/webtrees/css-1.6.2/images/images.png b/themes/webtrees/css-1.7.0/images/images.png
index b3854d450a..b3854d450a 100644
--- a/themes/webtrees/css-1.6.2/images/images.png
+++ b/themes/webtrees/css-1.7.0/images/images.png
diff --git a/themes/webtrees/css-1.6.2/images/indicator.gif b/themes/webtrees/css-1.7.0/images/indicator.gif
index 085ccaecaf..085ccaecaf 100644
--- a/themes/webtrees/css-1.6.2/images/indicator.gif
+++ b/themes/webtrees/css-1.7.0/images/indicator.gif
diff --git a/themes/webtrees/css-1.6.2/images/indis.png b/themes/webtrees/css-1.7.0/images/indis.png
index 41ab82c89c..41ab82c89c 100644
--- a/themes/webtrees/css-1.6.2/images/indis.png
+++ b/themes/webtrees/css-1.7.0/images/indis.png
diff --git a/themes/webtrees/css-1.6.2/images/large_menu_sprite.png b/themes/webtrees/css-1.7.0/images/large_menu_sprite.png
index 9abafa4aaf..9abafa4aaf 100644
--- a/themes/webtrees/css-1.6.2/images/large_menu_sprite.png
+++ b/themes/webtrees/css-1.7.0/images/large_menu_sprite.png
diff --git a/themes/webtrees/css-1.6.2/images/larrow.png b/themes/webtrees/css-1.7.0/images/larrow.png
index 6d152c1aa0..6d152c1aa0 100644
--- a/themes/webtrees/css-1.6.2/images/larrow.png
+++ b/themes/webtrees/css-1.7.0/images/larrow.png
diff --git a/themes/webtrees/css-1.6.2/images/larrow2.png b/themes/webtrees/css-1.7.0/images/larrow2.png
index 9b63d582a0..9b63d582a0 100644
--- a/themes/webtrees/css-1.6.2/images/larrow2.png
+++ b/themes/webtrees/css-1.7.0/images/larrow2.png
diff --git a/themes/webtrees/css-1.6.2/images/ldarrow.png b/themes/webtrees/css-1.7.0/images/ldarrow.png
index fc0e73fc86..fc0e73fc86 100644
--- a/themes/webtrees/css-1.6.2/images/ldarrow.png
+++ b/themes/webtrees/css-1.7.0/images/ldarrow.png
diff --git a/themes/webtrees/css-1.7.0/images/ldarrow2.png b/themes/webtrees/css-1.7.0/images/ldarrow2.png
new file mode 100644
index 0000000000..df5ec8e5a9
--- /dev/null
+++ b/themes/webtrees/css-1.7.0/images/ldarrow2.png
diff --git a/themes/webtrees/css-1.6.2/images/lifespan-chunk.png b/themes/webtrees/css-1.7.0/images/lifespan-chunk.png
index 493ce7e39f..493ce7e39f 100644
--- a/themes/webtrees/css-1.6.2/images/lifespan-chunk.png
+++ b/themes/webtrees/css-1.7.0/images/lifespan-chunk.png
diff --git a/themes/webtrees/css-1.6.2/images/lifespan-down.png b/themes/webtrees/css-1.7.0/images/lifespan-down.png
index 19f5f44b6d..19f5f44b6d 100644
--- a/themes/webtrees/css-1.6.2/images/lifespan-down.png
+++ b/themes/webtrees/css-1.7.0/images/lifespan-down.png
diff --git a/themes/webtrees/css-1.6.2/images/lifespan-left.png b/themes/webtrees/css-1.7.0/images/lifespan-left.png
index 3bae6f9c4b..3bae6f9c4b 100644
--- a/themes/webtrees/css-1.6.2/images/lifespan-left.png
+++ b/themes/webtrees/css-1.7.0/images/lifespan-left.png
diff --git a/themes/webtrees/css-1.6.2/images/lifespan-right.png b/themes/webtrees/css-1.7.0/images/lifespan-right.png
index 2240a4cbb3..2240a4cbb3 100644
--- a/themes/webtrees/css-1.6.2/images/lifespan-right.png
+++ b/themes/webtrees/css-1.7.0/images/lifespan-right.png
diff --git a/themes/webtrees/css-1.6.2/images/lifespan-up.png b/themes/webtrees/css-1.7.0/images/lifespan-up.png
index dab8ebc73d..dab8ebc73d 100644
--- a/themes/webtrees/css-1.6.2/images/lifespan-up.png
+++ b/themes/webtrees/css-1.7.0/images/lifespan-up.png
diff --git a/themes/webtrees/css-1.6.2/images/loading.gif b/themes/webtrees/css-1.7.0/images/loading.gif
index 5bb90fd6a4..5bb90fd6a4 100644
--- a/themes/webtrees/css-1.6.2/images/loading.gif
+++ b/themes/webtrees/css-1.7.0/images/loading.gif
diff --git a/themes/webtrees/css-1.6.2/images/mapquest.png b/themes/webtrees/css-1.7.0/images/mapquest.png
index dbcd57d95e..dbcd57d95e 100644
--- a/themes/webtrees/css-1.6.2/images/mapquest.png
+++ b/themes/webtrees/css-1.7.0/images/mapquest.png
diff --git a/themes/webtrees/css-1.6.2/images/media.png b/themes/webtrees/css-1.7.0/images/media.png
index a0334f70c1..a0334f70c1 100644
--- a/themes/webtrees/css-1.6.2/images/media.png
+++ b/themes/webtrees/css-1.7.0/images/media.png
diff --git a/themes/webtrees/css-1.6.2/images/minus.png b/themes/webtrees/css-1.7.0/images/minus.png
index 8ed68808da..8ed68808da 100644
--- a/themes/webtrees/css-1.6.2/images/minus.png
+++ b/themes/webtrees/css-1.7.0/images/minus.png
diff --git a/themes/webtrees/css-1.6.2/images/mypage.png b/themes/webtrees/css-1.7.0/images/mypage.png
index 686a0f019c..686a0f019c 100644
--- a/themes/webtrees/css-1.6.2/images/mypage.png
+++ b/themes/webtrees/css-1.7.0/images/mypage.png
diff --git a/themes/webtrees/css-1.6.2/images/notes.png b/themes/webtrees/css-1.7.0/images/notes.png
index c4c04bd9f4..c4c04bd9f4 100644
--- a/themes/webtrees/css-1.6.2/images/notes.png
+++ b/themes/webtrees/css-1.7.0/images/notes.png
diff --git a/themes/webtrees/css-1.6.2/images/osm.png b/themes/webtrees/css-1.7.0/images/osm.png
index 899e2a58b6..899e2a58b6 100644
--- a/themes/webtrees/css-1.6.2/images/osm.png
+++ b/themes/webtrees/css-1.7.0/images/osm.png
diff --git a/themes/webtrees/css-1.6.2/images/patriarch.png b/themes/webtrees/css-1.7.0/images/patriarch.png
index 9b7f5c205f..9b7f5c205f 100644
--- a/themes/webtrees/css-1.6.2/images/patriarch.png
+++ b/themes/webtrees/css-1.7.0/images/patriarch.png
diff --git a/themes/webtrees/css-1.6.2/images/pedigree.png b/themes/webtrees/css-1.7.0/images/pedigree.png
index 3e0eaeb6a9..3e0eaeb6a9 100644
--- a/themes/webtrees/css-1.6.2/images/pedigree.png
+++ b/themes/webtrees/css-1.7.0/images/pedigree.png
diff --git a/themes/webtrees/css-1.6.2/images/place.png b/themes/webtrees/css-1.7.0/images/place.png
index 7d79d30f8b..7d79d30f8b 100644
--- a/themes/webtrees/css-1.6.2/images/place.png
+++ b/themes/webtrees/css-1.7.0/images/place.png
diff --git a/themes/webtrees/css-1.6.2/images/plus.png b/themes/webtrees/css-1.7.0/images/plus.png
index 64e15fc9f3..64e15fc9f3 100644
--- a/themes/webtrees/css-1.6.2/images/plus.png
+++ b/themes/webtrees/css-1.7.0/images/plus.png
diff --git a/themes/xenea/css-1.6.2/images/webtrees.png b/themes/webtrees/css-1.7.0/images/powered-by-webtrees.png
index 6a5cf0fb3e..6a5cf0fb3e 100644
--- a/themes/xenea/css-1.6.2/images/webtrees.png
+++ b/themes/webtrees/css-1.7.0/images/powered-by-webtrees.png
diff --git a/themes/webtrees/css-1.6.2/images/rarrow.png b/themes/webtrees/css-1.7.0/images/rarrow.png
index 705bc43c4f..705bc43c4f 100644
--- a/themes/webtrees/css-1.6.2/images/rarrow.png
+++ b/themes/webtrees/css-1.7.0/images/rarrow.png
diff --git a/themes/webtrees/css-1.6.2/images/rarrow2.png b/themes/webtrees/css-1.7.0/images/rarrow2.png
index a74991fd63..a74991fd63 100644
--- a/themes/webtrees/css-1.6.2/images/rarrow2.png
+++ b/themes/webtrees/css-1.7.0/images/rarrow2.png
diff --git a/themes/webtrees/css-1.6.2/images/rdarrow.png b/themes/webtrees/css-1.7.0/images/rdarrow.png
index 198e7d1768..198e7d1768 100644
--- a/themes/webtrees/css-1.6.2/images/rdarrow.png
+++ b/themes/webtrees/css-1.7.0/images/rdarrow.png
diff --git a/themes/webtrees/css-1.7.0/images/rdarrow2.png b/themes/webtrees/css-1.7.0/images/rdarrow2.png
new file mode 100644
index 0000000000..63437aa3c6
--- /dev/null
+++ b/themes/webtrees/css-1.7.0/images/rdarrow2.png
diff --git a/themes/webtrees/css-1.6.2/images/reminder.png b/themes/webtrees/css-1.7.0/images/reminder.png
index fa5bbcf507..fa5bbcf507 100644
--- a/themes/webtrees/css-1.6.2/images/reminder.png
+++ b/themes/webtrees/css-1.7.0/images/reminder.png
diff --git a/themes/webtrees/css-1.6.2/images/remove.png b/themes/webtrees/css-1.7.0/images/remove.png
index 2badd4419b..2badd4419b 100644
--- a/themes/webtrees/css-1.6.2/images/remove.png
+++ b/themes/webtrees/css-1.7.0/images/remove.png
diff --git a/themes/webtrees/css-1.6.2/images/reorder.png b/themes/webtrees/css-1.7.0/images/reorder.png
index 2cfe889ad1..2cfe889ad1 100644
--- a/themes/webtrees/css-1.6.2/images/reorder.png
+++ b/themes/webtrees/css-1.7.0/images/reorder.png
diff --git a/themes/webtrees/css-1.6.2/images/repository.png b/themes/webtrees/css-1.7.0/images/repository.png
index 485ed097bf..485ed097bf 100644
--- a/themes/webtrees/css-1.6.2/images/repository.png
+++ b/themes/webtrees/css-1.7.0/images/repository.png
diff --git a/themes/webtrees/css-1.6.2/images/resn_confidential.png b/themes/webtrees/css-1.7.0/images/resn_confidential.png
index 4e5449b25a..4e5449b25a 100644
--- a/themes/webtrees/css-1.6.2/images/resn_confidential.png
+++ b/themes/webtrees/css-1.7.0/images/resn_confidential.png
diff --git a/themes/webtrees/css-1.6.2/images/resn_locked.png b/themes/webtrees/css-1.7.0/images/resn_locked.png
index 43fa09b350..43fa09b350 100644
--- a/themes/webtrees/css-1.6.2/images/resn_locked.png
+++ b/themes/webtrees/css-1.7.0/images/resn_locked.png
diff --git a/themes/webtrees/css-1.6.2/images/resn_none.png b/themes/webtrees/css-1.7.0/images/resn_none.png
index d86137658e..d86137658e 100644
--- a/themes/webtrees/css-1.6.2/images/resn_none.png
+++ b/themes/webtrees/css-1.7.0/images/resn_none.png
diff --git a/themes/webtrees/css-1.6.2/images/resn_privacy.png b/themes/webtrees/css-1.7.0/images/resn_privacy.png
index ca462fd84d..ca462fd84d 100644
--- a/themes/webtrees/css-1.6.2/images/resn_privacy.png
+++ b/themes/webtrees/css-1.7.0/images/resn_privacy.png
diff --git a/themes/webtrees/css-1.6.2/images/rings.png b/themes/webtrees/css-1.7.0/images/rings.png
index 698927d4b8..698927d4b8 100644
--- a/themes/webtrees/css-1.6.2/images/rings.png
+++ b/themes/webtrees/css-1.7.0/images/rings.png
diff --git a/themes/webtrees/css-1.6.2/images/search.png b/themes/webtrees/css-1.7.0/images/search.png
index 0b0af3de60..0b0af3de60 100644
--- a/themes/webtrees/css-1.6.2/images/search.png
+++ b/themes/webtrees/css-1.7.0/images/search.png
diff --git a/themes/webtrees/css-1.6.2/images/selected.png b/themes/webtrees/css-1.7.0/images/selected.png
index f5743429c3..f5743429c3 100644
--- a/themes/webtrees/css-1.6.2/images/selected.png
+++ b/themes/webtrees/css-1.7.0/images/selected.png
diff --git a/themes/webtrees/css-1.6.2/images/sex_f_15x15.png b/themes/webtrees/css-1.7.0/images/sex_f_15x15.png
index 2d3abae32a..2d3abae32a 100644
--- a/themes/webtrees/css-1.6.2/images/sex_f_15x15.png
+++ b/themes/webtrees/css-1.7.0/images/sex_f_15x15.png
diff --git a/themes/webtrees/css-1.6.2/images/sex_f_9x9.png b/themes/webtrees/css-1.7.0/images/sex_f_9x9.png
index e35e46ccd4..e35e46ccd4 100644
--- a/themes/webtrees/css-1.6.2/images/sex_f_9x9.png
+++ b/themes/webtrees/css-1.7.0/images/sex_f_9x9.png
diff --git a/themes/webtrees/css-1.6.2/images/sex_m_15x15.png b/themes/webtrees/css-1.7.0/images/sex_m_15x15.png
index 4ac7956421..4ac7956421 100644
--- a/themes/webtrees/css-1.6.2/images/sex_m_15x15.png
+++ b/themes/webtrees/css-1.7.0/images/sex_m_15x15.png
diff --git a/themes/webtrees/css-1.6.2/images/sex_m_9x9.png b/themes/webtrees/css-1.7.0/images/sex_m_9x9.png
index 32a8484b1f..32a8484b1f 100644
--- a/themes/webtrees/css-1.6.2/images/sex_m_9x9.png
+++ b/themes/webtrees/css-1.7.0/images/sex_m_9x9.png
diff --git a/themes/webtrees/css-1.6.2/images/sex_u_15x15.png b/themes/webtrees/css-1.7.0/images/sex_u_15x15.png
index 158c3f9a10..158c3f9a10 100644
--- a/themes/webtrees/css-1.6.2/images/sex_u_15x15.png
+++ b/themes/webtrees/css-1.7.0/images/sex_u_15x15.png
diff --git a/themes/webtrees/css-1.6.2/images/sex_u_9x9.png b/themes/webtrees/css-1.7.0/images/sex_u_9x9.png
index d113a1898c..d113a1898c 100644
--- a/themes/webtrees/css-1.6.2/images/sex_u_9x9.png
+++ b/themes/webtrees/css-1.7.0/images/sex_u_9x9.png
diff --git a/themes/webtrees/css-1.6.2/images/silhouette_female.png b/themes/webtrees/css-1.7.0/images/silhouette_female.png
index bb8d503371..bb8d503371 100644
--- a/themes/webtrees/css-1.6.2/images/silhouette_female.png
+++ b/themes/webtrees/css-1.7.0/images/silhouette_female.png
diff --git a/themes/webtrees/css-1.6.2/images/silhouette_female_small.png b/themes/webtrees/css-1.7.0/images/silhouette_female_small.png
index ff153f7e5e..ff153f7e5e 100644
--- a/themes/webtrees/css-1.6.2/images/silhouette_female_small.png
+++ b/themes/webtrees/css-1.7.0/images/silhouette_female_small.png
diff --git a/themes/webtrees/css-1.6.2/images/silhouette_male.png b/themes/webtrees/css-1.7.0/images/silhouette_male.png
index 0615900224..0615900224 100644
--- a/themes/webtrees/css-1.6.2/images/silhouette_male.png
+++ b/themes/webtrees/css-1.7.0/images/silhouette_male.png
diff --git a/themes/webtrees/css-1.6.2/images/silhouette_male_small.png b/themes/webtrees/css-1.7.0/images/silhouette_male_small.png
index 6c7c175c76..6c7c175c76 100644
--- a/themes/webtrees/css-1.6.2/images/silhouette_male_small.png
+++ b/themes/webtrees/css-1.7.0/images/silhouette_male_small.png
diff --git a/themes/webtrees/css-1.6.2/images/silhouette_unknown.png b/themes/webtrees/css-1.7.0/images/silhouette_unknown.png
index d0417439ee..d0417439ee 100644
--- a/themes/webtrees/css-1.6.2/images/silhouette_unknown.png
+++ b/themes/webtrees/css-1.7.0/images/silhouette_unknown.png
diff --git a/themes/webtrees/css-1.6.2/images/silhouette_unknown_small.png b/themes/webtrees/css-1.7.0/images/silhouette_unknown_small.png
index 9602cffaa0..9602cffaa0 100644
--- a/themes/webtrees/css-1.6.2/images/silhouette_unknown_small.png
+++ b/themes/webtrees/css-1.7.0/images/silhouette_unknown_small.png
diff --git a/themes/webtrees/css-1.6.2/images/small_menu_sprite.png b/themes/webtrees/css-1.7.0/images/small_menu_sprite.png
index b36a7d84fd..b36a7d84fd 100644
--- a/themes/webtrees/css-1.6.2/images/small_menu_sprite.png
+++ b/themes/webtrees/css-1.7.0/images/small_menu_sprite.png
diff --git a/themes/webtrees/css-1.6.2/images/source.png b/themes/webtrees/css-1.7.0/images/source.png
index 9213378a22..9213378a22 100644
--- a/themes/webtrees/css-1.6.2/images/source.png
+++ b/themes/webtrees/css-1.7.0/images/source.png
diff --git a/themes/webtrees/css-1.6.2/images/spacer.png b/themes/webtrees/css-1.7.0/images/spacer.png
index a31b396979..a31b396979 100644
--- a/themes/webtrees/css-1.6.2/images/spacer.png
+++ b/themes/webtrees/css-1.7.0/images/spacer.png
diff --git a/themes/webtrees/css-1.6.2/images/stop.png b/themes/webtrees/css-1.7.0/images/stop.png
index a15d4bae84..a15d4bae84 100644
--- a/themes/webtrees/css-1.6.2/images/stop.png
+++ b/themes/webtrees/css-1.7.0/images/stop.png
diff --git a/themes/webtrees/css-1.6.2/images/tree.png b/themes/webtrees/css-1.7.0/images/tree.png
index 4139d0d2c4..4139d0d2c4 100644
--- a/themes/webtrees/css-1.6.2/images/tree.png
+++ b/themes/webtrees/css-1.7.0/images/tree.png
diff --git a/themes/webtrees/css-1.6.2/images/uarrow.png b/themes/webtrees/css-1.7.0/images/uarrow.png
index dde11141c3..dde11141c3 100644
--- a/themes/webtrees/css-1.6.2/images/uarrow.png
+++ b/themes/webtrees/css-1.7.0/images/uarrow.png
diff --git a/themes/webtrees/css-1.6.2/images/uarrow2.png b/themes/webtrees/css-1.7.0/images/uarrow2.png
index e82af4097a..e82af4097a 100644
--- a/themes/webtrees/css-1.6.2/images/uarrow2.png
+++ b/themes/webtrees/css-1.7.0/images/uarrow2.png
diff --git a/themes/webtrees/css-1.6.2/images/udarrow.png b/themes/webtrees/css-1.7.0/images/udarrow.png
index e26db59a0b..e26db59a0b 100644
--- a/themes/webtrees/css-1.6.2/images/udarrow.png
+++ b/themes/webtrees/css-1.7.0/images/udarrow.png
diff --git a/themes/webtrees/css-1.6.2/images/udarrow2.png b/themes/webtrees/css-1.7.0/images/udarrow2.png
index 13317e1565..13317e1565 100644
--- a/themes/webtrees/css-1.6.2/images/udarrow2.png
+++ b/themes/webtrees/css-1.7.0/images/udarrow2.png
diff --git a/themes/webtrees/css-1.6.2/images/user_add.png b/themes/webtrees/css-1.7.0/images/user_add.png
index 9a07785997..9a07785997 100644
--- a/themes/webtrees/css-1.6.2/images/user_add.png
+++ b/themes/webtrees/css-1.7.0/images/user_add.png
diff --git a/themes/webtrees/css-1.6.2/images/vline.png b/themes/webtrees/css-1.7.0/images/vline.png
index b00ff9ea3e..b00ff9ea3e 100644
--- a/themes/webtrees/css-1.6.2/images/vline.png
+++ b/themes/webtrees/css-1.7.0/images/vline.png
diff --git a/themes/webtrees/css-1.6.2/images/w_button.png b/themes/webtrees/css-1.7.0/images/w_button.png
index 31af28a377..31af28a377 100644
--- a/themes/webtrees/css-1.6.2/images/w_button.png
+++ b/themes/webtrees/css-1.7.0/images/w_button.png
diff --git a/themes/webtrees/css-1.6.2/images/warning.png b/themes/webtrees/css-1.7.0/images/warning.png
index d484c33341..d484c33341 100644
--- a/themes/webtrees/css-1.6.2/images/warning.png
+++ b/themes/webtrees/css-1.7.0/images/warning.png
diff --git a/themes/webtrees/css-1.6.2/images/webtrees.png b/themes/webtrees/css-1.7.0/images/webtrees.png
index a71a33a048..a71a33a048 100644
--- a/themes/webtrees/css-1.6.2/images/webtrees.png
+++ b/themes/webtrees/css-1.7.0/images/webtrees.png
diff --git a/themes/webtrees/css-1.6.2/images/zoomin.png b/themes/webtrees/css-1.7.0/images/zoomin.png
index cea0ec773b..cea0ec773b 100644
--- a/themes/webtrees/css-1.6.2/images/zoomin.png
+++ b/themes/webtrees/css-1.7.0/images/zoomin.png
diff --git a/themes/webtrees/css-1.6.2/images/zoomout.png b/themes/webtrees/css-1.7.0/images/zoomout.png
index 5bfa433154..5bfa433154 100644
--- a/themes/webtrees/css-1.6.2/images/zoomout.png
+++ b/themes/webtrees/css-1.7.0/images/zoomout.png
diff --git a/themes/webtrees/css-1.6.2/style.css b/themes/webtrees/css-1.7.0/style.css
index d63b513a37..d529264a85 100644
--- a/themes/webtrees/css-1.6.2/style.css
+++ b/themes/webtrees/css-1.7.0/style.css
@@ -24,6 +24,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+/* ======== Globals ========== */
+
 /* Add a permanent scrollbar, to prevent "flickering" when hover effects lengthen page */
 html {
 	overflow-y: scroll;
@@ -37,17 +39,33 @@ body {
 	padding: 0 8px;
 }
 
-fieldset {
-	margin: 8px 8px 4px;
-	text-align: left;
+main {
+	display: block;
+	clear: both;
 }
 
-[dir=rtl] fieldset {
-	text-align: right;
+/* ====== Round Corners ======== */
+
+/* ios on click workaround */
+.iconz {
+	cursor: pointer;
 }
 
-legend {
-	font-weight: bold;
+input:required:valid,
+textarea:required:valid {
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAONJREFUeNpi/P//PwMlgImBQjDwBrCgCzDOF2Zg+Adk/AOGDRvQfHZGoDWMxgyMDMb/Q1/NIt0F/xk8gIbNZPj7P41YL4AUGsM1//rfkuyeYMzw8z9xXgBqgNm0nuHnv0D/IH/juavmngV6oYY4F3z7y2DqY2oMpANB9MYl684yfP9Xw3Dzzw7sXgQmJGTM0MbjwdDKc0b2vt5/EM2QwunBoMyCVS1YPYYAMOwZ7FmiGLLYzjBYsSQD+QpALAjErNgMYERPyoyMjMxAih+IOYD4LxD/hOJfQLV/MaJ9NC8wAAQYAPbPfH2KJKx/AAAAAElFTkSuQmCC) no-repeat right top;
+}
+
+input:required:invalid,
+textarea:required:invalid {
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMpJREFUeNpi/P//PwMlgImBQjAMDGBBF1jFyOgBpFqAuOYPA8MOoAI4P+z//x0YJoBiARkvYWA486+k5D+IBuJqZD66WnAMogvMA9o4F6j4R3Lyf2R6IQODMVEGTAW6CoirgfjMB2/v/yB6CgNDYQ8W14IwRiB+A7rgOwNDYLChofGcrVvPgugfDAzR/yFhwUAwDJqBNj6Ulf0PooEhV4jMx+YCRvSknAeMBWDotwgwMKRzMTCcfQW0GcQHxkbNJCyxwDiaFxgAAgwAYy67YIOQ//cAAAAASUVORK5CYII=) no-repeat right top;
+}
+
+[dir=rtl] input:required:valid,
+[dir=rtl] textarea:required:valid,
+[dir=rtl] input:required:invalid,
+[dir=rtl] textarea:required:invalid {
+	background-position: left top;
 }
 
 a {
@@ -64,6 +82,38 @@ a:hover {
 	outline-style: none;
 }
 
+#flash-messages {
+	clear: both;
+}
+
+dl {
+	margin: 0;
+}
+
+dt {
+	float: left;
+	font-weight: bold;
+	margin-right: 10px;
+}
+
+[dir=rtl] dt {
+	float: right;
+	margin-right: auto;
+	margin-left: 10px;
+}
+
+h2 {
+	color: #006;
+	font-size: 18px;
+	font-weight: bold;
+}
+
+h4 {
+	color: #006;
+	font-size: 12px;
+	font-weight: bold;
+}
+
 th {
 	font-weight: 100;
 }
@@ -108,84 +158,43 @@ textarea {
 	border-style: inset;
 }
 
-input.image {
-	width: 17px;
-	height: 17px;
-	border: 0;
-	padding: 0;
-	vertical-align: top;
-}
-
-select {
-	border: 1px solid #555;
-	font-size: 12px;
-	margin: 0 7px;
-	padding: 1px;
-}
-
-form {
+.topbottombar {
+	background-color: #81a9cb;
+	color: #fff;
 	font-size: 12px;
-}
-
-h2 {
-	color: #006;
 	font-weight: bold;
-	font-size: 18px;
-}
-
-h4 {
-	color: #006;
-	font-weight: bold;
-	font-size: 12px;
-}
-
-input:required:valid,
-textarea:required:valid {
-	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAONJREFUeNpi/P//PwMlgImBQjDwBrCgCzDOF2Zg+Adk/AOGDRvQfHZGoDWMxgyMDMb/Q1/NIt0F/xk8gIbNZPj7P41YL4AUGsM1//rfkuyeYMzw8z9xXgBqgNm0nuHnv0D/IH/juavmngV6oYY4F3z7y2DqY2oMpANB9MYl684yfP9Xw3Dzzw7sXgQmJGTM0MbjwdDKc0b2vt5/EM2QwunBoMyCVS1YPYYAMOwZ7FmiGLLYzjBYsSQD+QpALAjErNgMYERPyoyMjMxAih+IOYD4LxD/hOJfQLV/MaJ9NC8wAAQYAPbPfH2KJKx/AAAAAElFTkSuQmCC) no-repeat right top;
+	padding: 4px;
+	text-align: center;
 }
 
-input:required:invalid,
-textarea:required:invalid {
-	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMpJREFUeNpi/P//PwMlgImBQjAMDGBBF1jFyOgBpFqAuOYPA8MOoAI4P+z//x0YJoBiARkvYWA486+k5D+IBuJqZD66WnAMogvMA9o4F6j4R3Lyf2R6IQODMVEGTAW6CoirgfjMB2/v/yB6CgNDYQ8W14IwRiB+A7rgOwNDYLChofGcrVvPgugfDAzR/yFhwUAwDJqBNj6Ulf0PooEhV4jMx+YCRvSknAeMBWDotwgwMKRzMTCcfQW0GcQHxkbNJCyxwDiaFxgAAgwAYy67YIOQ//cAAAAASUVORK5CYII=) no-repeat right top;
+fieldset {
+	margin: 8px 8px 4px;
+	text-align: left;
 }
 
-[dir=rtl] input:required:valid,
-[dir=rtl] textarea:required:valid,
-[dir=rtl] input:required:invalid,
-[dir=rtl] textarea:required:invalid {
-	background-position: left top;
+[dir=rtl] fieldset {
+	text-align: right;
 }
 
-.line1,
-.line2,
-.line3 {
-	vertical-align: middle;
+legend {
+	font-weight: bold;
 }
 
-#hourglass_chart img.line4 {
-	vertical-align: middle;
+select {
+	border: 1px solid #555;
+	font-size: 12px;
+	margin: 0 7px;
+	padding: 1px;
 }
 
-.line5 {
-	vertical-align: top;
+header form {
+	font-size: 12px;
 }
 
 #mycart a img {
 	height: 15px;
 }
 
-main {
-	display: block;
-	clear: both;
-}
-
-footer {
-	clear: both;
-	font-size: 12px;
-	padding-top: 10px;
-	text-align: center;
-}
-
 .button {
 	width: 60px;
 }
@@ -246,17 +255,17 @@ table.center {
 .list_label,
 .list_label_wrap {
 	color: #fff;
+	font-size: 12px;
 	background-color: #81a9cb;
 	font-weight: bold;
-	font-size: 12px;
 	text-align: center;
 }
 
 .list_value,
 .list_value_wrap {
 	background-color: #edf7f9;
-	border: solid #81a9cb 1px;
 	font-size: 12px;
+	border: solid #81a9cb 1px;
 	vertical-align: top;
 }
 
@@ -292,45 +301,36 @@ div.fact_SHARED_NOTE {
 
 .facts_label03 {
 	color: #fff;
+	background-color: #81a9cb;
 	font-size: 12px;
 	padding: 4px;
 	text-align: center;
 	font-weight: bold;
 }
 
-.facts_label03 {
-	background-color: #81a9cb;
-}
-
 .facts_value {
 	background-color: #edf7fd;
-	border: solid #81a9cb 1px;
 	font-size: 12px;
+	border: solid #81a9cb 1px;
 	padding: 4px;
 }
 
 .quickfacts a {
-	font-size: 9px;
 	padding: 0 3px;
+	font-size: 9px;
 }
 
 .tabs_table {
 	width: 99%;
 }
 
-.name1 {
+.name1, .name2 {
 	color: #555;
 	font-weight: bold;
 	font-size: 12px;
 }
 
-a:hover .name1 {
-	color: #f00;
-	font-weight: bold;
-	font-size: 12px;
-}
-
-a:hover .name2 {
+a:hover .name1, a:hover .name2 {
 	color: #f00;
 	font-weight: bold;
 	font-size: 12px;
@@ -338,14 +338,8 @@ a:hover .name2 {
 
 a:hover .nameZoom {
 	color: #f00;
-	font-weight: bold;
 	font-size: 14px;
-}
-
-.name2 {
-	color: #555;
 	font-weight: bold;
-	font-size: 12px;
 }
 
 .details0,
@@ -359,8 +353,8 @@ a:hover .nameZoom {
 
 .nameZoom {
 	color: #555;
-	font-weight: bold;
 	font-size: 14px;
+	font-weight: bold;
 }
 
 .details_label {
@@ -369,8 +363,8 @@ a:hover .nameZoom {
 
 .name_head {
 	color: #555;
-	font-weight: bold;
 	font-size: 16px;
+	font-weight: bold;
 	line-height: 2;
 	padding: 0 5px;
 }
@@ -415,10 +409,6 @@ a:hover .nameZoom {
 	vertical-align: middle;
 }
 
-.pedigree_form {
-	width: 45px;
-}
-
 .thumbnail {
 	height: auto;
 	padding: 3px;
@@ -426,21 +416,12 @@ a:hover .nameZoom {
 
 .icon {
 	border: 0;
+	padding: 0 5px;
 }
 
 .sublinks_cell {
-	font-size: 12px;
 	background-color: #edf7fd;
-}
-
-.menuitem .icon {
-	width: 50px;
-	height: 50px;
-}
-
-.menuitem_hover .icon {
-	width: 50px;
-	height: 50px;
+	font-size: 12px;
 }
 
 .submenu .icon {
@@ -473,21 +454,6 @@ a:hover .nameZoom {
 	background-color: #edf7fd;
 }
 
-.user_links {
-	white-space: nowrap;
-}
-
-.contact_links {
-	margin-top: 15px;
-	text-align: center;
-}
-
-.hit-counter {
-	background: #000;
-	color: #fff;
-	font-weight: bold;
-}
-
 .border1 {
 	border: solid #000 1px;
 }
@@ -504,6 +470,11 @@ a:hover .nameZoom {
 	padding: 1px;
 }
 
+.menuitem .icon, .menuitem_hover .icon {
+	width: 50px;
+	height: 50px;
+}
+
 .submenu {
 	text-decoration: none;
 	font-size: 11px;
@@ -514,11 +485,11 @@ a:hover .nameZoom {
 	padding: 5px;
 }
 
-.submenuitem {
+.submenuitem  {
 	vertical-align: middle;
+	font-size: 11px;
 	height: 20px;
 	text-decoration: none;
-	font-size: 11px;
 	background-color: #edf7fd;
 	padding: 1px;
 	white-space: nowrap;
@@ -585,57 +556,10 @@ a:hover .nameZoom {
 	clear: both;
 }
 
-#familybook_chart {
-	margin-left: 10px;
-}
-
-#familybook_chart table {
-	border-collapse: collapse;
-	empty-cells: show;
-}
-
-#familybook_chart td {
-	margin: 0;
-	padding: 0;
-}
-
-#familybook_chart h2 {
-	text-align: center;
-}
-
-#familybook_chart .line3,
-#familybook_chart .pvline,
-#familybook_chart .spacer {
-	width: 3px;
-}
-
-#familybook_chart .line4 {
-	width: 7px;
-	vertical-align: middle;
-}
-
-[ID^="vline"] {
-	width: 3px;
-}
-
-#familybook_chart h3 {
-	color: #006;
-	font-size: 16px;
-	text-align: center;
-}
-
 #my-page h1 {
 	margin: 0.25em auto 0.6em;
 }
 
-#relationship-page h3 {
-	margin: 20px 0 0 20px;
-}
-
-#relationship_chart {
-	margin: 0 6px;
-}
-
 .tdtop {
 	vertical-align: top;
 }
@@ -649,46 +573,14 @@ a:hover .nameZoom {
 	vertical-align: bottom;
 }
 
-[dir=rtl] #familybook_chart {
-	margin-right: 10px;
-}
-
-/*-- pedigree chart specific stylesheets --*/
-#pedigree-page table.list_table {
-	margin: 0 auto;
-	width: 500px;
-}
-
-.pedigree_chart_table {
-	border: 0;
-	border-collapse: collapse;
-	padding: 0;
-	width: 100%;
-}
-
-#pedigree_chart {
-	position: relative;
-	top: -200px;
-	left: 0;
-}
-
-[dir=rtl] #pedigree_chart {
-	left: auto;
-	right: 0;
-}
-
-#pedigree_canvas {
-	color: #81a9cb;
-	position: absolute;
-	top: 200px;
-	z-index: -1000;
+.line1,
+.line2,
+.line3 {
+	vertical-align: middle;
 }
 
-#pedigree_chart #childarrow,
-#pedigree_chart #uparrow,
-#pedigree_chart .shadow,
-.ancestorarrow {
-	position: absolute;
+.line5 {
+	vertical-align: top;
 }
 
 #childbox {
@@ -717,111 +609,6 @@ a:hover .nameZoom {
 	margin-left: 5px;
 }
 
-#hourglass_chart table,
-.charts_block table {
-	border-collapse: collapse;
-}
-
-#hourglass_chart td,
-.charts_block td {
-	padding: 0;
-	empty-cells: show;
-}
-
-#pedigree_chart #childbox {
-	border: 1px solid;
-	background-color: #fff;
-}
-
-/*-- descendancy chart specific stylesheets --*/
-#descendancy_chart {
-	margin: 20px;
-}
-
-#descendancy_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	margin: 0 0 5px 15px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#descendancy_chart li {
-	list-style: none;
-	margin: 5px 0 0 -15px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#descendancy_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-#descendancy_chart td.details1 {
-	padding-top: 5px;
-}
-
-[dir=rtl] #descendancy_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
-}
-
-/*-- ancestry chart specific stylesheets --*/
-#ancestry_chart table div p {
-	font-size: 90%;
-	margin: 0;
-}
-
-#ancestry_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	display: block;
-	margin: 0 0 0 15px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#ancestry_chart li {
-	list-style: none;
-	margin: 0 0 2px -13px;
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#ancestry_chart li table {
-	margin: 5px 0;
-}
-
-[dir=rtl] #ancestry_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
-}
-
-#ancestry_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-[dir=rtl] #ancestry_chart li {
-	margin: 0;
-	padding: 0 2px 0 0;
-	left: auto;
-}
-
-/*-- timeline chart specific styles --*/
-#timeline_chart {
-	position: relative;
-	top: 0;
-	left: 0;
-}
-
 .person0 {
 	background-color: #aaf;
 	border: outset #aaf 1px;
@@ -858,34 +645,6 @@ a:hover .nameZoom {
 	vertical-align: top;
 }
 
-#compact_chart,
-#fan_chart,
-#ancestry_chart,
-#familybook_chart,
-#hourglass_chart {
-	margin: 20px;
-}
-
-.fan_chart_menu {
-	position: absolute;
-	display: none;
-	z-index: 100;
-}
-
-#fan_chart ul {
-	list-style-type: none;
-	margin: 0;
-}
-
-#fan_chart ul.children li:before {
-	content: "< ";
-	font-weight: bold;
-}
-
-#fan_chart_img {
-	text-align: center;
-}
-
 .listlog {
 	line-height: 20pt;
 }
@@ -906,63 +665,18 @@ a:hover .nameZoom {
 	font-weight: 600;
 }
 
-header h1 {
-	clear: both;
-	font-size: 20px;
-	font-weight: normal;
-	float: left;
-	margin: 0 10px 5px;
-}
-
-[dir=rtl] header h1 {
-	float: right;
-}
-
-.header_img {
-	float: left;
-}
-
-[dir=rtl] .header_img {
-	float: right;
-}
-
-.header_search {
-	float: right;
-}
-
-[dir=rtl] .header_search {
-	float: left;
-}
-
-#flash-messages {
-	clear: both;
-}
-
-/* Styles for the option boxes */
-/* Style for the top and bottom bar */
-.topbottombar {
-	color: #fff;
-	background-color: #81a9cb;
-	font-weight: bold;
-	font-size: 12px;
-	padding: 4px;
-	text-align: center;
-}
-
-/* Style for the descriptionbox */
 .descriptionbox {
 	color: #fff;
-	background-color: #81a9cb;
 	font-size: 12px;
+	background-color: #81a9cb;
 	vertical-align: top;
 	padding: 3px;
 }
 
-/* Style for the optionbox */
 .optionbox {
 	background-color: #d1d9ef;
-	border: solid #81a9cb 1px;
 	font-size: 12px;
+	border: solid #81a9cb 1px;
 	vertical-align: top;
 	white-space: nowrap;
 	padding: 3px;
@@ -972,7 +686,6 @@ header h1 {
 	vertical-align: middle;
 }
 
-/* Colors */
 .red {
 	color: #f00;
 }
@@ -982,7 +695,6 @@ header h1 {
 	opacity: 0.8;
 }
 
-/* Width settings */
 .width10 {
 	width: 10%;
 }
@@ -1039,22 +751,20 @@ header h1 {
 	width: 100%;
 }
 
-/* Font sizes */
-.font11 {
-	font-size: 11px;
-}
-
 .font9 {
 	font-size: 9px;
 }
 
-/* Message box */
+.font11 {
+	font-size: 11px;
+}
+
 .messagebox {
 	background-color: #c2ceef;
 	border: solid #81a9cb 1px;
 }
 
-/* Pending edits - TODO perhaps show differently in different contexts? */
+/* ---Pending edits--- */
 .new {
 	border: solid blue 1px;
 	overflow: hidden;
@@ -1100,42 +810,6 @@ a.showit:hover > span {
 	z-index: 5;
 }
 
-.lifespan_people span:first-letter {
-	font-size: 16px;
-	font-variant: small-caps;
-	padding: 1px;
-}
-
-.lifespan_outer {
-	position: relative;
-	width: 99.5%;
-	height: 600px;
-	overflow: hidden;
-	border: solid #00f 1px;
-}
-
-.lifespan_outer a:hover {
-	color: #f00;
-	text-decoration: none;
-}
-
-.lifespan_timeline {
-	position: absolute;
-	width: 100%;
-	left: -10px;
-	top: -65px;
-	z-index: 2;
-	background-color: #fff;
-}
-
-.lifespan_people {
-	position: absolute;
-	width: 500px;
-	left: -10px;
-	top: -60px;
-	z-index: 1;
-}
-
 .tag_cloud {
 	text-align: center;
 }
@@ -1144,9 +818,9 @@ a.showit:hover > span {
 	white-space: nowrap;
 }
 
-/* Autocomplete styles*/
+/* ---Autocomplete styles--- */
 .ui-autocomplete-input {
-	background-color: #eee8aa;
+	background-color: #eea;
 }
 
 .ui-autocomplete {
@@ -1157,18 +831,19 @@ a.showit:hover > span {
 	list-style: none outside none;
 	margin: 0;
 	max-height: 200px;
-	overflow-y: auto;
+	overflow-x: hidden;
+	overflow-y: scroll;
 }
 
 .ui-autocomplete li {
 	margin: 0;
 	padding: 2px 5px;
+	font-size: 12px;
 	cursor: default;
 	display: block;
 	/* if width will be 100% horizontal scrollbar will apear when scroll mode will be used */
 	/* width: 100%; */
 	font: menu;
-	font-size: 12px;
 	/* it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */
 	line-height: 14px;
 	overflow: hidden;
@@ -1194,7 +869,7 @@ a.showit:hover > span {
 	display: none;
 }
 
-/* End of Autocomplete styles*/
+/* ---End of Autocomplete styles--- */
 
 .nowrap {
 	white-space: nowrap;
@@ -1216,28 +891,7 @@ a.showit:hover > span {
 	border: solid #81a9cb 1px;
 }
 
-.execution_stats {
-	padding-top: 12px;
-	text-align: center;
-}
-
-dl {
-	margin: 0;
-}
-
-dt {
-	float: left;
-	font-weight: bold;
-	margin-right: 10px;
-}
-
-[dir=rtl] dt {
-	float: right;
-	margin-right: auto;
-	margin-left: 10px;
-}
-
-/* Find special characters */
+/* ---Find special characters--- */
 .largechars {
 	font-family: monospace;
 	font-size: 200%;
@@ -1262,10 +916,6 @@ td.descriptionbox a {
 	padding-top: 5px;
 }
 
-.logo {
-	text-align: center;
-}
-
 #pending h2 {
 	text-align: center;
 	margin-bottom: 20px;
@@ -1276,7 +926,7 @@ td.descriptionbox a {
 	margin-top: 20px;
 }
 
-/* ============== person box details ============== */
+/* ======== Person box ======= */
 .gedcom_favorites_block,
 .user_favorites_block,
 .person_box_template {
@@ -1365,17 +1015,68 @@ td.descriptionbox a {
 	margin: 0 auto;
 }
 
-#medialist-page .list_table,
-#medialist-page .list_table_controls {
+#medialist-page form .list_table {
+	width: 75%;
+}
+
+#medialist-page div .list_table,
+#medialist-page .media-col,
+#medialist-page .media-col1,
+#medialist-page .list_value_wrap,
+#medialist-page div .list_table_controls {
 	width: 100%;
 }
 
+#medialist-page .optionbox, 
+#medialist-page .descriptionbox {
+	width: 25%;
+}
+
+#medialist-page .media-col2 {
+	width: 50%;
+}
+
+#medialist-page .media-col {
+	padding-left: 5px; 
+	border: none;
+}
+
+[dir=rtl] #medialist-page .media-col {
+	padding-left: 0;
+	padding-right: 5px;
+}
+
+#medialist-page .media-image {
+	vertical-align:top; 
+	white-space:normal;
+}
+
+#medialist-page p {
+	text-align: center;
+}
+
 .list_table_controls td {
 	min-width: 40px;
 	text-align: center;
 }
 
-/* ============== medialist.php ======================= */
+/* ======== medialist.php ==== */
+.makeMenu li ul {
+	border: thin solid #AAA;
+	position: absolute;
+	margin:0;
+}
+
+.makeMenu, .makeMenu li ul {
+	padding: 1px;
+}
+
+.makeMenu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
+}
+
 .lb-menu {
 	display: inline-block;
 	margin: 0;
@@ -1384,6 +1085,7 @@ td.descriptionbox a {
 .lb-menu ul {
 	display: block;
 	list-style-type: none;
+	margin: 0;
 }
 
 .lb-menu > li {
@@ -1410,14 +1112,15 @@ td.descriptionbox a {
 }
 
 .lb-menu li a {
-	padding-top: 24px;
+	padding: 24px 10px 1px 5px;
 }
 
 .lb-menu li li a {
-	padding: 1px 10px 1px 5px;
+	background-color: #fff;
+	padding: 5px 10px 5px 5px;
 }
 
-.makeMenu.lb-menu li {
+.lb-menu li {
 	border: 0;
 }
 
@@ -1437,7 +1140,7 @@ td.descriptionbox a {
 	background: url(images/image_view.png) no-repeat 50% 20%;
 }
 
-/* ============== login.php ======================= */
+/* login.php */
 #login-register-page h2 {
 	text-align: center;
 }
@@ -1460,8 +1163,8 @@ td.descriptionbox a {
 }
 
 #login-register-page .confirm p {
-	font-size: 14px;
 	font-weight: bold;
+	font-size: 14px;
 }
 
 #login-register-page .confirm p + p {
@@ -1493,6 +1196,11 @@ td.descriptionbox a {
 	padding: 5px;
 }
 
+#register-form,
+#verify-form {
+	width: 440px;
+}
+
 #login-form div,
 #login-form div a,
 #new_passwd_form div,
@@ -1517,6 +1225,11 @@ td.descriptionbox a {
 	margin: 0 10px;
 }
 
+#register-form p,
+#verify-form p {
+	text-align: left;
+}
+
 #new_passwd_form h4,
 #register-form h4 {
 	font-weight: normal;
@@ -1567,7 +1280,12 @@ td.descriptionbox a {
 	text-align: left;
 }
 
-/* ============== reportengine.php ======================= */
+[dir=rtl] #register-form p, 
+[dir=rtl] #verify-form p {
+	text-align: right;
+}
+
+/* --- reportengine.php --- */
 #reportengine-page table {
 	margin: 20px auto;
 }
@@ -1588,59 +1306,51 @@ td.descriptionbox a {
 	text-align: center;
 }
 
+/* styles for popup menus */
 .itr {
-	position: absolute;
+	position: relative;
 	line-height: 1.5;
 }
 
-.block .itr,
-#family-table .itr,
-#ancestry_chart .itr,
-#descendancy_chart .itr,
-#familybook_chart .itr,
-#hourglass_chart .itr,
-#relatives_content .itr {
-	position: relative;
-	top: 0;
+.popup {
+	position: absolute;
+	top: 20px;
+	right: 0;
+	left: auto;
+	visibility: hidden;
+	opacity: 0;
+	transition: visibility 0s ease .25s,opacity .25s ease;
+	z-index: 9999;
+	-webkit-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	-moz-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
 }
 
-.popup {
-	display: none;
+[dir=rtl] .popup {
+	left: 0;
+	right: auto;
 }
 
 .popup ul {
-	background-image: none !important;
-	font-size: 9px;
+	white-space: nowrap;
 	list-style: none;
 	margin: 0;
 	padding: 0 10px;
+	font-size: smaller;
 }
 
-.popup li {
-	padding: 1px 5px;
+.popup > ul {
+	padding: 2px 10px;
 }
 
-.popup li span {
+.popup li .NAME {
 	padding: 0 5px;
 }
 
-.popup li ul,
-.popup li ul li,
-.popup li span span {
-	padding: 0;
-}
-
 .itr:hover .popup {
-	display: block;
-	position: absolute;
-	width: 12em;
-	right: 0;
-	z-index: 9999;
-}
-
-[dir=rtl] .itr:hover .popup {
-	left: 0;
-	right: auto;
+	visibility: visible;
+	opacity: 1;
+	transition-delay: 0s;
 }
 
 /* styles for FindFacts pop-up */
@@ -1711,7 +1421,7 @@ td.descriptionbox a {
 	text-align: center;
 }
 
-/* ======= List styles =========== */
+/* ======== List styles ====== */
 .source-list,
 .note-list,
 .repo-list,
@@ -1725,7 +1435,7 @@ td.descriptionbox a {
 .upcoming_events_block,
 .todays_events_block,
 .todo_block {
-	width: 99%;
+	width: 98%;
 }
 
 .surname-list,
@@ -1799,13 +1509,6 @@ td.descriptionbox a {
 	text-align: center;
 }
 
-.givn-list th {
-	cursor: pointer;
-	white-space: nowrap;
-	padding: 2px;
-	text-align: center;
-}
-
 #source-details h2,
 #sourcelist-page h2,
 #note-details h2,
@@ -1897,7 +1600,7 @@ td.descriptionbox a {
 	margin: 0 1px 1px -2px;
 }
 
-/* ======= Block styles ========== */
+/* ======== Block styles ===== */
 #index_main_blocks {
 	clear: none;
 	width: 66%;
@@ -1962,6 +1665,8 @@ td.descriptionbox a {
 	font-weight: bold;
 }
 
+/* end Block styles */
+
 #main_select,
 #available_select,
 #right_select {
@@ -1980,23 +1685,7 @@ td.descriptionbox a {
 	vertical-align: top;
 }
 
-#link_change_blocks {
-	clear: both;
-	margin: 0 auto;
-	padding: 25px 0 0;
-	text-align: center;
-	width: 400px;
-}
-
-#link_change_blocks span {
-	padding: 0 50px;
-}
-
-#link_change_blocks span span {
-	padding: 0 3px;
-}
-
-/* ======== Random picture block ====== */
+/* Random picture block */
 #random_picture {
 	text-align: center;
 }
@@ -2005,8 +1694,7 @@ td.descriptionbox a {
 	width: 100%;
 }
 
-/* ======= Favourites block ========== */
-
+/* ==== Favourites block ===== */
 .blockcontent .person_box_template .details2 {
 	min-height: 40px;
 }
@@ -2037,14 +1725,14 @@ td.descriptionbox a {
 	margin: 0 5px;
 }
 
-/* ======= Who is online block ========== */
+/* === Who is online block === */
 .logged_in_list {
 	margin: 5px 0 0;
 	padding: 0;
 	line-height: 20px;
 }
 
-/* ============= Statistics block ============ */
+/* Statistics block */
 .gedcom_stats_block table td {
 	vertical-align: top;
 }
@@ -2057,7 +1745,7 @@ td.descriptionbox a {
 	text-align: center;
 }
 
-/* ============= Theme select block ============ */
+/* ==== Theme select block === */
 .theme_form ul {
 	margin: -10px auto;
 }
@@ -2072,7 +1760,7 @@ td.descriptionbox a {
 	visibility: visible;
 }
 
-/* ======= FAQ table styles ========== */
+/* ==== FAQ table styles ===== */
 table.faq {
 	background-color: #e0e0e0;
 	margin: 5px 0 50px 5px;
@@ -2119,938 +1807,7 @@ div.faq_body {
 	float: left;
 }
 
-/* ======= Header menu styles ========== */
-
-/* Set stack level for top two header menu rows */
-.makeMenu ul,
-#main-menu ul {
-	z-index: 210;
-}
-
-header nav {
-	border-top: 2px solid #81a9cb;
-	border-bottom: 2px solid #81a9cb;
-	margin: 8px auto;
-	padding: 5px 0;
-	position: relative;
-	clear: both;
-}
-
-#main-menu,
-#main-menu ul {
-	margin: 0;
-	list-style-type: none;
-}
-
-#main-menu {
-	margin: 0 auto;
-	display: table;
-}
-
-#main-menu li {
-	float: left;
-	position: relative;
-}
-
-#main-menu li li {
-	clear: both;
-}
-
-#main-menu li:hover > ul {
-	display: block;
-	position: absolute;
-	top: 0;
-	left: 100%;
-	right: auto;
-}
-
-#main-menu > li:hover > ul {
-	left: 0;
-	right: auto;
-	top: 66px;
-}
-
-#main-menu a {
-	display: block;
-	white-space: nowrap;
-	overflow: hidden;
-}
-
-#main-menu ul {
-	position: absolute;
-	display: none;
-	background: #fff;
-	border: thin solid #aaa;
-	padding: 5px 0;
-}
-
-#main-menu li a {
-	margin: auto;
-	padding-top: 52px;
-	width: 100%;
-}
-
-#main-menu li li a {
-	display: block;
-	position: relative;
-	float: left;
-	font-size: 11px;
-	line-height: 1.5;
-	padding: 1px 10px 1px 5px;
-}
-
-/* Menu icons */
-#main-menu > li {
-	background-image: url(images/large_menu_sprite.png);
-	background-repeat: no-repeat;
-	min-width: 80px;
-	height: 64px;
-	padding: 0 5px;
-	text-align: center;
-}
-
-#main-menu li li {
-	background-image: url(images/small_menu_sprite.png);
-	background-repeat: no-repeat;
-	height: 24px;
-	left: auto;
-	line-height: 24px;
-	text-align: left;
-	text-indent: 26px;
-	width: 100%;
-}
-
-/* Reverse left and right on RTL pages */
-
-[dir=rtl] #main-menu li {
-	float: right;
-}
-
-[dir=rtl] #main-menu li:hover > ul {
-	right: 100%;
-	left: auto;
-}
-
-[dir=rtl] #main-menu > li:hover > ul {
-	left: auto;
-	right: 0;
-}
-
-[dir=rtl] #main-menu li li {
-	text-align: right;
-}
-
-[dir=rtl] #main-menu li li a {
-	float: right;
-	padding: 1px 5px 1px 10px;
-}
-
-/* Main menu icons */
-#menu-calendar {
-	background-position: center -350px;
-}
-
-#menu-chart {
-	background-position: center -140px;
-}
-
-#menu-clippings {
-	background-position: center -560px;
-}
-
-#menu-fam {
-	background-position: center -770px;
-}
-
-#menu-help {
-	background-position: center -490px;
-}
-
-#menu-indi {
-	background-position: center -630px;
-}
-
-#menu-list {
-	background-position: center -210px;
-}
-
-#menu-mymenu {
-	background-position: center -70px;
-}
-
-#menu-note {
-	background-position: center -910px;
-}
-
-#menu-obje {
-	background-position: center -840px;
-}
-
-#menu-repo {
-	background-position: center -980px;
-}
-
-#menu-report {
-	background-position: center -280px;
-}
-
-#menu-search {
-	background-position: center -420px;
-}
-
-#menu-sour {
-	background-position: center -700px;
-}
-
-#menu-tree {
-	background-position: center 0;
-}
-
-#menu-story {
-	background-position: center -1045px;
-}
-
-/* Sub-menu icons */
-#menu-admin {
-	background-position: left 0;
-}
-
-[dir=rtl] #menu-admin {
-	background-position: right 0;
-}
-
-#menu-branches {
-	background-position: left -450px;
-}
-
-[dir=rtl] #menu-branches {
-	background-position: right -450px;
-}
-
-#menu-calendar-day {
-	background-position: left -60px;
-}
-
-[dir=rtl] #menu-calendar-day {
-	background-position: right -60px;
-}
-
-#menu-calendar-month {
-	background-position: left -60px;
-}
-
-[dir=rtl] #menu-calendar-month {
-	background-position: right -60px;
-}
-
-#menu-calendar-year {
-	background-position: left -60px;
-}
-
-[dir=rtl] #menu-calendar-year {
-	background-position: right -60px;
-}
-
-#menu-chart-ancestry {
-	background-position: left -30px;
-}
-
-[dir=rtl] #menu-chart-ancestry {
-	background-position: right -30px;
-}
-
-#menu-chart-compact {
-	background-position: left -30px;
-}
-
-[dir=rtl] #menu-chart-compact {
-	background-position: right -30px;
-}
-
-#menu-chart-descendancy {
-	background-position: left -150px;
-}
-
-[dir=rtl] #menu-chart-descendancy {
-	background-position: right -150px;
-}
-
-#menu-chart-familybook {
-	background-position: left -180px;
-}
-
-[dir=rtl] #menu-chart-familybook {
-	background-position: right -180px;
-}
-
-#menu-chart-fanchart {
-	background-position: left -210px;
-}
-
-[dir=rtl] #menu-chart-fanchart {
-	background-position: right -210px;
-}
-
-#menu-chart-hourglass {
-	background-position: left -270px;
-}
-
-[dir=rtl] #menu-chart-hourglass {
-	background-position: right -270px;
-}
-
-#menu-chart-lifespan {
-	background-position: left -660px;
-}
-
-[dir=rtl] #menu-chart-lifespan {
-	background-position: right -660px;
-}
-
-#menu-chart-pedigree {
-	background-position: left -480px;
-}
-
-[dir=rtl] #menu-chart-pedigree {
-	background-position: right -480px;
-}
-
-#menu-chart-pedigree_map {
-	background-position: left -720px;
-}
-
-[dir=rtl] #menu-chart-pedigree_map {
-	background-position: right -720px;
-}
-
-#menu-chart-relationship {
-	background-position: left -540px;
-}
-
-[dir=rtl] #menu-chart-relationship {
-	background-position: right -540px;
-}
-
-#menu-chart-relationship li {
-	background-position: left -540px;
-}
-
-[dir=rtl] #menu-chart-relationship li {
-	background-position: right -540px;
-}
-
-#menu-chart-statistics {
-	background-position: left -630px;
-}
-
-[dir=rtl] #menu-chart-statistics {
-	background-position: right -630px;
-}
-
-#menu-chart-timeline {
-	background-position: left -660px;
-}
-
-[dir=rtl] #menu-chart-timeline {
-	background-position: right -660px;
-}
-
-#menu-chart-timeline li {
-	background-position: left -660px;
-}
-
-[dir=rtl] #menu-chart-timeline li {
-	background-position: right -660px;
-}
-
-#menu-chart-tree {
-	background-position: left -240px;
-}
-
-[dir=rtl] #menu-chart-tree {
-	background-position: right -240px;
-}
-
-#menu-clippingsadd {
-	background-position: left -930px;
-}
-
-[dir=rtl] #menu-clippingsadd {
-	background-position: right -930px;
-}
-
-#menu-clippingscart {
-	background-position: left -900px;
-}
-
-[dir=rtl] #menu-clippingscart {
-	background-position: right -900px;
-}
-
-#menu-fam-addchil {
-	background-position: left -1050px;
-}
-
-[dir=rtl] #menu-fam-addchil {
-	background-position: right -1050px;
-}
-
-#menu-fam-addfav {
-	background-position: left -870px;
-}
-
-[dir=rtl] #menu-fam-addfav {
-	background-position: right -870px;
-}
-
-#menu-fam-change {
-	background-position: left -90px;
-}
-
-[dir=rtl] #menu-fam-change {
-	background-position: right -90px;
-}
-
-#menu-fam-del {
-	background-position: left -840px;
-}
-
-[dir=rtl] #menu-fam-del {
-	background-position: right -840px;
-}
-
-#menu-fam-editraw {
-	background-position: left -90px;
-}
-
-[dir=rtl] #menu-fam-editraw {
-	background-position: right -90px;
-}
-
-/* needs new icon */
-
-#menu-fam-orderchil {
-	background-position: left -1080px;
-}
-
-[dir=rtl] #menu-fam-orderchil {
-	background-position: right -1080px;
-}
-
-#menu-help-contents {
-	background-position: left -300px;
-}
-
-[dir=rtl] #menu-help-contents {
-	background-position: right -300px;
-}
-
-#menu-help-faq {
-	background-position: left -300px;
-}
-
-[dir=rtl] #menu-help-faq {
-	background-position: right -300px;
-}
-
-#menu-help-genealogy {
-	background-position: left -120px;
-}
-
-[dir=rtl] #menu-help-genealogy {
-	background-position: right -120px;
-}
-
-#menu-help-hide {
-	background-position: left -300px;
-}
-
-[dir=rtl] #menu-help-hide {
-	background-position: right -300px;
-}
-
-#menu-help-show {
-	background-position: left -300px;
-}
-
-[dir=rtl] #menu-help-show {
-	background-position: right -300px;
-}
-
-#menu-help-technical {
-	background-position: left -120px;
-}
-
-[dir=rtl] #menu-help-technical {
-	background-position: right -120px;
-}
-
-#menu-help-wiki {
-	background-position: left -690px;
-}
-
-[dir=rtl] #menu-help-wiki {
-	background-position: right -690px;
-}
-
-#menu-indi-addfav {
-	background-position: left -870px;
-}
-
-[dir=rtl] #menu-indi-addfav {
-	background-position: right -870px;
-}
-
-#menu-indi-addname {
-	background-position: left -780px;
-}
-
-[dir=rtl] #menu-indi-addname {
-	background-position: right -780px;
-}
-
-#menu-indi-del {
-	background-position: left -840px;
-}
-
-[dir=rtl] #menu-indi-del {
-	background-position: right -840px;
-}
-
-#menu-indi-orderfam {
-	background-position: left 0;
-}
-
-[dir=rtl] #menu-indi-orderfam {
-	background-position: right 0;
-}
-
-#menu-indi-editraw {
-	background-position: left -750px;
-}
-
-[dir=rtl] #menu-indi-editraw {
-	background-position: right -750px;
-}
-
-#menu-indi-editsex {
-	background-position: left -810px;
-}
-
-[dir=rtl] #menu-indi-editsex {
-	background-position: right -810px;
-}
-
-#menu-list-fam {
-	background-position: left -90px;
-}
-
-[dir=rtl] #menu-list-fam {
-	background-position: right -90px;
-}
-
-#menu-list-indi {
-	background-position: left -120px;
-}
-
-[dir=rtl] #menu-list-indi {
-	background-position: right -120px;
-}
-
-#menu-list-note {
-	background-position: left -420px;
-}
-
-[dir=rtl] #menu-list-note {
-	background-position: right -420px;
-}
-
-#menu-list-obje {
-	background-position: left -330px;
-}
-
-[dir=rtl] #menu-list-obje {
-	background-position: right -330px;
-}
-
-#menu-list-plac {
-	background-position: left -510px;
-}
-
-[dir=rtl] #menu-list-plac {
-	background-position: right -510px;
-}
-
-#menu-list-repo {
-	background-position: left -360px;
-}
-
-[dir=rtl] #menu-list-repo {
-	background-position: right -360px;
-}
-
-#menu-list-sour {
-	background-position: left -180px;
-}
-
-[dir=rtl] #menu-list-sour {
-	background-position: right -180px;
-}
-
-#menu-myaccount {
-	background-position: left -390px;
-}
-
-[dir=rtl] #menu-myaccount {
-	background-position: right -390px;
-}
-
-#menu-mypage {
-	background-position: left -390px;
-}
-
-[dir=rtl] #menu-mypage {
-	background-position: right -390px;
-}
-
-#menu-mypedigree {
-	background-position: left -480px;
-}
-
-[dir=rtl] #menu-mypedigree {
-	background-position: right -480px;
-}
-
-#menu-myrecord {
-	background-position: left -120px;
-}
-
-[dir=rtl] #menu-myrecord {
-	background-position: right -120px;
-}
-
-#menu-note-addfav {
-	background-position: left -870px;
-}
-
-[dir=rtl] #menu-note-addfav {
-	background-position: right -870px;
-}
-
-#menu-note-del {
-	background-position: left -840px;
-}
-
-[dir=rtl] #menu-note-del {
-	background-position: right -840px;
-}
-
-#menu-note-edit {
-	background-position: left -1020px;
-}
-
-[dir=rtl] #menu-note-edit {
-	background-position: right -1020px;
-}
-
-#menu-note-editraw {
-	background-position: left -1020px;
-}
-
-[dir=rtl] #menu-note-editraw {
-	background-position: right -1020px;
-}
-
-#menu-obje-addfav {
-	background-position: left -870px;
-}
-
-[dir=rtl] #menu-obje-addfav {
-	background-position: right -870px;
-}
-
-#menu-obje-del {
-	background-position: left -840px;
-}
-
-[dir=rtl] #menu-obje-del {
-	background-position: right -840px;
-}
-
-#menu-obje-edit {
-	background-position: left -1110px;
-}
-
-[dir=rtl] #menu-obje-edit {
-	background-position: right -1110px;
-}
-
-#menu-obje-editraw {
-	background-position: left -1110px;
-}
-
-[dir=rtl] #menu-obje-editraw {
-	background-position: right -1110px;
-}
-
-#menu-obje-link {
-	background-position: left -1140px;
-}
-
-[dir=rtl] #menu-obje-link {
-	background-position: right -1140px;
-}
-
-#menu-obje-link-fam {
-	background-position: left -90px;
-}
-
-[dir=rtl] #menu-obje-link-fam {
-	background-position: right -90px;
-}
-
-#menu-obje-link-indi {
-	background-position: left -120px;
-}
-
-[dir=rtl] #menu-obje-link-indi {
-	background-position: right -120px;
-}
-
-#menu-obje-link-sour {
-	background-position: left -180px;
-}
-
-[dir=rtl] #menu-obje-link-sour {
-	background-position: right -180px;
-}
-
-#menu-repo-addfav {
-	background-position: left -870px;
-}
-
-[dir=rtl] #menu-repo-addfav {
-	background-position: right -870px;
-}
-
-#menu-repo-del {
-	background-position: left -840px;
-}
-
-[dir=rtl] #menu-repo-del {
-	background-position: right -840px;
-}
-
-#menu-repo-edit {
-	background-position: left -990px;
-}
-
-[dir=rtl] #menu-repo-edit {
-	background-position: right -990px;
-}
-
-#menu-repo-editraw {
-	background-position: left -990px;
-}
-
-[dir=rtl] #menu-repo-editraw {
-	background-position: right -990px;
-}
-
-#menu-report li {
-	background-position: left -570px;
-}
-
-[dir=rtl] #menu-report li {
-	background-position: right -570px;
-}
-
-#menu-search-advanced {
-	background-position: left -600px;
-}
-
-[dir=rtl] #menu-search-advanced {
-	background-position: right -600px;
-}
-
-#menu-search-general {
-	background-position: left -600px;
-}
-
-[dir=rtl] #menu-search-general {
-	background-position: right -600px;
-}
-
-#menu-search-replace {
-	background-position: left -600px;
-}
-
-[dir=rtl] #menu-search-replace {
-	background-position: right -600px;
-}
-
-#menu-search-soundex {
-	background-position: left -600px;
-}
-
-[dir=rtl] #menu-search-soundex {
-	background-position: right -600px;
-}
-
-#menu-sour-addfav {
-	background-position: left -870px;
-}
-
-[dir=rtl] #menu-sour-addfav {
-	background-position: right -870px;
-}
-
-#menu-sour-del {
-	background-position: left -840px;
-}
-
-[dir=rtl] #menu-sour-del {
-	background-position: right -840px;
-}
-
-#menu-sour-edit {
-	background-position: left -960px;
-}
-
-[dir=rtl] #menu-sour-edit {
-	background-position: right -960px;
-}
-
-#menu-sour-editraw {
-	background-position: left -960px;
-}
-
-[dir=rtl] #menu-sour-editraw {
-	background-position: right -960px;
-}
-
-#menu-story-sub {
-	background-position: left -1208px;
-}
-
-[dir=rtl] #menu-story-sub {
-	background-position: right -1208px;
-}
-
-#menu-tree li {
-	background-position: left -240px;
-}
-
-[dir=rtl] #menu-tree li {
-	background-position: right -240px;
-}
-
-#menu-language li {
-	text-align: left; /* The language menu is always LTR, even on RTL pages */
-}
-
-#menu-theme li {
-	text-align: left; /* The theme menu is always LTR, even on RTL pages */
-}
-
-/* ========= Login|Favorites|Theme|Language menu items ========== */
-#header-user-links {
-	float: right;
-	white-space: nowrap;
-	margin: 20px 10px 0 0;
-}
-
-.makeMenu li ul {
-	left: auto;
-	right: 0;
-}
-
-.makeMenu a {
-	background: none;
-	display: inline;
-}
-
-.makeMenu {
-	font-weight: bold;
-}
-
-.makeMenu li {
-	display: inline;
-	position: relative;
-	white-space: nowrap;
-	border-left: 2px solid;
-	padding: 0 5px;
-}
-
-.makeMenu li:first-child,
-.makeMenu li ul li {
-	border: 0;
-}
-
-.makeMenu li ul {
-	display: none;
-	font-weight: normal;
-	position: absolute;
-	top: 1.1em;
-	background-color: #fff;
-	border: thin solid #aaa;
-}
-
-.makeMenu li ul li {
-	padding: 2px;
-	display: block;
-	text-align: left;
-}
-
-.makeMenu,
-.makeMenu li ul {
-	list-style: none;
-	margin: 0;
-	padding: 1px;
-}
-
-.makeMenu li:hover > ul {
-	display: block;
-}
-
-.lang-active,
-.theme-active {
-	color: #006;
-	font-weight: 900;
-}
-
-[dir=rtl] #header-user-links {
-	float: left;
-	margin: 20px 0 0 10px;
-}
-
-[dir=rtl] #header-user-links .makeMenu li ul {
-	left: 0;
-	right: auto;
-}
-
-[dir=rtl] .makeMenu li ul {
-	left: auto;
-	right: 0;
-}
-
-[dir=rtl] .makeMenu li ul li {
-	text-align: right;
-}
-
-[dir=rtl] .makeMenu li {
-	border-left: none;
-	border-right: 2px solid;
-}
-
-[dir=rtl] .makeMenu li:first-child,
-[dir=rtl] .makeMenu li ul li {
-	border: 0;
-}
-
-/* ========= Positioning edit,
-copy,
-delete links ============= */
+/* === Positioning edit, copy, delete links === */
 /* General use */
 .editfacts {
 	clear: left;
@@ -3075,7 +1832,7 @@ span.link_text {
 	display: none;
 }
 
-/* Indi header */
+/* ======== Indi header ====== */
 .field .editlink,
 .field .deletelink,
 .field .copylink {
@@ -3087,11 +1844,6 @@ span.link_text {
 	float: left;
 }
 
-/* =========== end edit,
-copy,
-delete links ==================== */
-
-/* =========== Indi header ================== */
 #indi_header {
 	overflow: hidden;
 	border-radius: 3px;
@@ -3145,13 +1897,6 @@ delete links ==================== */
 	color: #f00;
 }
 
-#main_name {
-	float: left;
-	font-size: 2em;
-	margin: 10px;
-	font-weight: bold;
-}
-
 #indi_mainimage {
 	float: left;
 	padding: 0 10px;
@@ -3255,10 +2000,6 @@ dd .deletelink {
 	float: left;
 }
 
-[dir=rtl] #main_name {
-	float: right;
-}
-
 [dir=rtl] #indi_mainimage {
 	float: right;
 }
@@ -3285,7 +2026,13 @@ dd .deletelink {
 	float: left;
 }
 
-/* General sprite */
+.hit-counter {
+	background: #000;
+	color: #fff;
+	font-weight: bold;
+}
+
+/* ======= General sprite ==== */
 .male_gender,
 .female_gender,
 .unknown_gender,
@@ -3332,20 +2079,7 @@ dd .deletelink {
 	height: 16px;
 }
 
-.icon_arrow {
-	display: block;
-	background: url(images/small_menu_sprite.png) no-repeat left 0;
-}
-
-.icon_arrow {
-	background-position: 90% -1166px;
-}
-
-[dir=rtl] .icon_arrow {
-	background-position: 10% -1184px;
-}
-
-/* =========== Indi tabs ================== */
+/* ======== Indi tabs ======== */
 /* Facts & Events tab */
 #personal_facts_content .fact_NOTE,
 #personal_facts_content .fact_SOUR,
@@ -3386,7 +2120,7 @@ dd .deletelink {
 	padding-right: 5px;
 }
 
-/* Album tab */
+/* ======== Album tab =========*/
 .album-list {
 	list-style-type: none;
 }
@@ -3419,9 +2153,12 @@ dd .deletelink {
 	width: 100%;
 }
 
-/* ========= jquery-ui.css changes ============ */
+/* === jquery-ui.css changes === */
 .ui-accordion .ui-accordion-content {
+	border: 0;
+	position: relative;
 	padding: 0 5px;
+	overflow: visible;
 }
 
 #sidebarAccordion .ui-accordion-header {
@@ -3449,7 +2186,7 @@ dd .deletelink {
 	right: auto;
 }
 
-/* jQuery.datatable styling general over-rides */
+/* === jQuery.datatable styling general over-rides === */
 .odd {
 	background-color: #e7eef3;
 }
@@ -3574,7 +2311,7 @@ dd .deletelink {
 	margin-right: -20px;
 }
 
-/* ========= Sidebar ============== */
+/* ======= Sidebar setup ===== */
 #main {
 	min-width: 600px;
 	width: 100%;
@@ -3648,7 +2385,7 @@ dd .deletelink {
 	background: #99c2ff url(images/general_sprite.png) no-repeat -1px 100px;
 }
 
-/* ============== Sidebar content items ============== */
+/* Sidebar content items */
 /* Family navigator */
 #sb_content_family_nav {
 	padding: 0;
@@ -3697,7 +2434,7 @@ dd .deletelink {
 }
 
 .flyout2 {
-	font-weight: 700;
+	font-weight: bold;
 }
 
 .flyout3 {
@@ -3709,7 +2446,7 @@ dd .deletelink {
 	color: #f00;
 }
 
-/* Descendancy */
+/* Sidebar*/
 #sb_content_descendancy {
 	margin-top: 5px;
 }
@@ -3748,8 +2485,7 @@ dd .deletelink {
 	margin-left: 0;
 }
 
-/* Individuals,
-Families */
+/* Individuals and Families */
 #sb_content_individuals,
 #sb_content_families {
 	margin-top: 5px;
@@ -3830,7 +2566,7 @@ Families */
 	float: left;
 }
 
-/* ============== find.php ======================= */
+/* ===== find.php =====  */
 #find-page h3,
 #find-page h4 {
 	margin: 10px;
@@ -3933,7 +2669,7 @@ Families */
 	text-align: inherit;
 }
 
-/* ============== search.php ======================= */
+/* ===== search.php ===== */
 #search-page h2,
 #search_submit {
 	margin: 20px;
@@ -3977,7 +2713,7 @@ Families */
 	margin: 0 170px 0 0;
 }
 
-/* ============== edituser.php ======================= */
+/*  edituser.php  */
 #edituser-page h2,
 #edituser_submit {
 	margin: 20px;
@@ -4025,53 +2761,665 @@ Families */
 	margin: 0 260px 0 0;
 }
 
-@media print {
-	#backprint,
-	#separator,
-	header,
-	footer,
-	form,
-	#CB_All
-	.noprint {
-		display: none !important;
-	}
+/* ===== Edit interface pop-ups ===== */
+#edit_interface-page h4 {
+	color: #555;
+	margin: 5px;
+}
 
-	#pedigree_chart {
-		left: -80px;
-	}
+#edit_interface-page .optionbox span {
+	margin: 0 5px;
+}
 
-	#header_accordion1 {
-		width: 510px !important;
-	}
+#edit_interface-page #LATI,
+#edit_interface-page #LONG,
+#edit_interface-page #SPFX,
+#edit_interface-page #NSFX,
+#edit_interface-page #NPFX {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 88px;
+}
 
-	[dir=rtl] #pedigree_chart {
-		left: auto;
-		right: -80px;
-	}
+#edit_interface-page #GIVN,
+#edit_interface-page #SURN,
+#edit_interface-page #_MARNM {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 180px;
+}
 
-	#familybook_chart h3 {
-		margin-bottom: 10px;
-	}
+#edit_interface-page input[type="text"],
+#edit_interface-page #NAME_display {
+	line-height: 18px;
+	margin: 0 5px;
+	vertical-align: top;
+	width: 240px;
+}
 
-	.lifespan_outer {
-		position: relative;
-		width: auto;
-		height: auto;
-		overflow: visible;
-		border: 0;
-	}
+#edit_interface-page input[type="text"][id*="PAGE"],
+#edit_interface-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
 
-	.lifespan_people {
-		position: absolute;
-		width: auto;
-		left: -10px;
-		top: -60px;
-		z-index: 1;
-	}
+#edit_interface-page input[type="text"][id*="SOUR"],
+#edit_interface-page input[type="text"][id*="REPO"],
+#edit_interface-page input[type="text"][id*="OBJE"],
+#edit_interface-page input[type="text"][id*="FAMC"],
+#edit_interface-page input[type="text"][id*="ASSO"],
+#edit_interface-page input[type="text"][id^="AGE"],
+#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 250px;
+}
 
+#edit_interface-page input[type="text"][id$="DATE"] {
+	width: 160px;
+}
+
+#edit_interface-page input[type="text"][id^="TIME"] {
+	width: 100px;
+}
+
+#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
+	width: 200px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
+	width: 250px;
+}
+
+#edit_interface-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#edit_interface-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#edit_interface-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#edit_interface-page textarea[id*="TEXT"],
+#edit_interface-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+#edit_interface-page textarea[id^="newgedrec"] {
+	line-height: 18px;
+	width: 605px;
+}
+
+#edit_interface-page textarea#gedcom {
+	height: 364px;
+}
+
+#edit_interface-page textarea[id*="ADDR"],
+#edit_interface-page input[id*="ADDR"] {
+	height: 80px;
+	width: 300px;
+}
+
+#edit_interface-page #changefam {
+	padding: 5px;
+}
+
+#edit_interface-page #changefam table {
+	margin: 10px auto;
+	min-width: 400px;
+	max-width: 650px;
+}
+
+#edit_interface-page #changefam span {
+	margin: 0;
+}
+
+#edit_interface-page #changefam td {
+	padding: 5px;
+	white-space: normal;
+}
+
+#edit_interface-page #changefam td.child {
+	text-align: center;
+}
+
+#save-cancel {
+	position: fixed;
+	bottom: 0;
+	background-color: #d1d9ef;
+	width: 98%;
+	border: solid #81a9cb 1px;
+	margin: 0;
+}
+
+#save-cancel input {
+	padding: 2px 8px;
+}
+
+#save-cancel .save {
+	float: left;
+	margin: 5px;
+}
+
+#save-cancel .cancel {
+	float: right;
+	margin: 5px;
+}
+
+[dir=rtl] #save-cancel .save {
+	float: right;
+}
+
+[dir=rtl] #save-cancel .cancel {
+	float: left;
+}
+
+#edit_interface-page,
+#addmedia-page {
+	margin-bottom: 50px;
+}
+
+/* ===== Addmedia pop-ups ===== */
+#addmedia-page input[type="text"] {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 350px;
+}
+
+#addmedia-page .optionbox select {
+	margin: 0 5px;
 }
 
-/* Icons */
+#addmedia-page .optionbox p.sub {
+	margin: 0 5px;
+	font-size: 11px;
+}
+
+#addmedia-page input[type="text"][id*="PAGE"],
+#addmedia-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#addmedia-page input[type="text"][id*="SOUR"],
+#addmedia-page input[type="text"][id*="REPO"],
+#addmedia-page input[type="text"][id*="OBJE"],
+#addmedia-page input[type="text"][id*="FAMC"],
+#addmedia-page input[type="text"][id*="ASSO"],
+#addmedia-page input[type="text"][id^="AGE"],
+#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 70px;
+}
+
+#addmedia-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#addmedia-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#addmedia-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#addmedia-page textarea[id*="TEXT"],
+#addmedia-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+/* ===== Styling for the jquery.colorbox gallery ===== */
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+#colorbox {
+	border: 2px solid #ccc;
+}
+
+#cboxOverlay {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	background: #ccc;
+}
+
+#cboxContent {
+	background: #fff;
+	border: 5px solid #888;
+}
+
+#cboxLoadedContent {
+	overflow: auto;
+	background: #fff;
+	margin-bottom: 30px;
+	margin-top: 35px;
+}
+
+#cboxTitle {
+	position: absolute;
+	left: 0;
+	top: 10px;
+	font-size: 14px;
+	color: #949494;
+	text-align: center;
+	width: 100%;
+	font-weight: 800;
+}
+
+.cboxPhoto {
+	float: left;
+	margin: auto;
+	border: 0;
+	display: block;
+	max-width: none;
+}
+
+.cboxIframe {
+	width: 100%;
+	height: 100%;
+	display: block;
+	border: 0;
+}
+
+#cboxPrevious {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	background: url(images/controls.png) no-repeat -75px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxPrevious:hover {
+	background-position: -75px -25px;
+}
+
+#cboxNext {
+	position: absolute;
+	bottom: 0;
+	left: 27px;
+	background: url(images/controls.png) no-repeat -50px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxNext:hover {
+	background-position: -50px -25px;
+}
+
+#cboxSlideshow {
+	position: absolute;
+	bottom: 5px;
+	font-size: 14px;
+	left: 57px;
+	margin: 10px;
+	border: 0;
+	background: none;
+}
+
+#cboxSlideshow:hover {
+	color: #f00;
+	background: #fff;
+}
+
+#cboxClose {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	background: url(images/controls.png) no-repeat -25px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxClose:hover {
+	background-position: -25px -25px;
+}
+
+#cboxCurrent {
+	bottom: 4px;
+	color: #949494;
+	left: 58px;
+	position: absolute;
+}
+
+[dir=rtl] #cboxPrevious {
+	right: 27px;
+	left: auto;
+}
+
+[dir=rtl] #cboxNext {
+	right: 0;
+	left: auto;
+}
+
+[dir=rtl] #cboxCurrent {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxClose {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxSlideshow {
+	right: 57px;
+	left: auto;
+}
+
+/* ===== Census assistant module ===== */
+table.table-census-assistant th {
+	font-weight: bold;
+	text-align: left;
+}
+
+/* Stories module */
+.story_title {
+	padding-top: 12px;
+	font-size: 13px;
+	height: 32px;
+	font-weight: bold;
+}
+
+.story_body {
+	padding: 20px;
+	white-space: normal;
+}
+
+.story_edit {
+	padding: 12px;
+}
+
+.btn-group {
+	display: inline-block;
+	margin: 0 4px;
+}
+
+.btn-group button:first-child,
+[dir=rtl] .btn-group button:last-child {
+	border-radius: 3px 0 0 3px;
+}
+
+.btn-group button:last-child,
+[dir=rtl] .btn-group button:first-child {
+	border-radius: 0 3px 3px 0;
+}
+
+/* ====== Charts Styles ======== */
+#compact_chart,
+#fan_chart,
+.chart_common,
+#ancestry_booklet,
+#descendancy_booklet,
+#familybook_chart,
+#hourglass_chart {
+	margin: 20px;
+}
+
+/* styles for vertical lines in ancestry and descendancy charts */
+.chart_common li {
+	list-style: none;
+}
+
+.chart_common li > span.details1 {
+	white-space: nowrap;
+}
+
+.chart_common .generation {
+	background: transparent url(images/vline.png) left top repeat-y;
+	margin: 0 0 0 15px;
+	padding: 0;
+	display: block;
+}
+
+[dir=rtl] .chart_common .generation {
+	margin: 0 15px 0 0;
+	background-position: right top
+;
+}
+
+.chart_common .generation > li {
+	margin: 5px 0;
+}
+
+.chart_common table {
+	padding: 0;
+	border-spacing: 0;
+	border-collapse: collapse;
+	margin: 5px 0;
+}
+
+.chart_common td {
+	border: 0;
+	padding: 0;
+}
+
+.chart_common span.details1 div[class^=fact_] {
+	display: inline-block;
+}
+
+.chart_common span.details1 .date {
+	color: inherit;
+}
+
+/*-- Family book  --*/
+#familybook_chart {
+	margin-left: 10px;
+}
+
+#familybook_chart table {
+	border-collapse: collapse;
+	empty-cells: show;
+}
+
+#familybook_chart td {
+	margin: 0;
+	padding: 0;
+}
+
+#familybook_chart h2 {
+	text-align: center;
+}
+
+#familybook_chart .line3,
+#familybook_chart .pvline,
+#familybook_chart .spacer {
+	width: 3px;
+}
+
+#familybook_chart .line4 {
+	width: 7px;
+	vertical-align: middle;
+}
+
+[ID^="vline"] {
+	width: 3px;
+}
+
+#familybook_chart h3 {
+	color: #006;
+	font-size: 16px;
+	text-align: center;
+}
+
+[dir=rtl] #familybook_chart {
+	margin-right: 10px;
+}
+
+/*-- Fan chart ---- */
+.fan_chart_menu {
+	position: absolute;
+	display: none;
+	z-index: 100;
+}
+
+#fan_chart ul {
+	list-style-type: none;
+	margin: 0;
+}
+
+#fan_chart ul.children li:before {
+	content: "< ";
+	font-weight: bold;
+}
+
+#fan_chart_img {
+	text-align: center;
+}
+
+/*-- Hourglass ---- */
+#hourglass_chart img.line4 {
+	vertical-align: middle;
+}
+
+#hourglass_chart table,
+.charts_block table {
+	border-collapse: collapse;
+}
+
+#hourglass_chart td,
+.charts_block td {
+	padding: 0;
+	empty-cells: show;
+}
+
+/*-- Lifespan ---- */
+#lifespan-page .person0 {
+	padding: 5px;
+}
+
+#lifespan-page .person0 div{
+	text-align: center;
+}
+
+#lifespan_chart .div-controls {
+	opacity: 0.67;
+	position: relative;
+	top: 80px;
+	width: 180px;
+	z-index: 100;
+	margin-left: 20px;
+}
+
+.lifespan_people span:first-letter {
+	font-variant: small-caps;
+	font-size: 16px;
+	padding: 1px;
+}
+
+.lifespan_outer {
+	position: relative;
+	width: 99.5%;
+	height: 600px;
+	overflow: hidden;
+	border: solid #00f 1px;
+}
+
+.lifespan_outer a:hover {
+	color: #f00;
+	text-decoration: none;
+}
+
+.lifespan_timeline {
+	position: absolute;
+	width: 100%;
+	left: -10px;
+	top: -65px;
+	z-index: 2;
+	background-color: #fff;
+}
+
+.lifespan_people {
+	position: absolute;
+	width: 500px;
+	left: -10px;
+	top: -60px;
+	z-index: 1;
+}
+
+/*-- Pedigree ---- */
+#pedigree_chart #childbox {
+	border: 1px solid;
+	background-color: #fff;
+}
+
+.pedigree_form {
+	width: 45px;
+}
+
+#pedigree-page table.list_table {
+	margin: 0 auto;
+	width: 500px;
+}
+
+.pedigree_chart_table {
+	border: 0;
+	border-collapse: collapse;
+	padding: 0;
+	width: 100%;
+}
+
+#pedigree_chart {
+	position: relative;
+	top: -200px;
+	left: 0;
+}
+
+[dir=rtl] #pedigree_chart {
+	left: auto;
+	right: 0;
+}
+
+#pedigree_canvas {
+	color: #81a9cb;
+	position: absolute;
+	top: 200px;
+	z-index: -1000;
+}
+
+#pedigree_chart #childarrow,
+#pedigree_chart #uparrow,
+#pedigree_chart .shadow,
+.ancestorarrow {
+	position: absolute;
+}
+
+/*-- Relationship ---- */
+#relationship-page h3 {
+	margin: 20px 0 0 20px;
+}
+
+#relationship_chart {
+	margin: 0 6px;
+}
+
+/*-- timeline  --*/
+#timeline_chart {
+	position: relative;
+	top: 0;
+	left: 0;
+}
+
+/* ====== Common Icons ========= */
 [class^="icon-"],
 [class*=" icon-"] {
 	display: inline-block;
@@ -4136,6 +3484,12 @@ Families */
 	background-image: url(images/buttons/family.png);
 }
 
+.icon-button_find {
+	width: 17px;
+	height: 15px;
+	background-image: url(images/buttons/find.png);
+}
+
 .icon-button_find_facts {
 	width: 20px;
 	height: 20px;
@@ -4279,12 +3633,6 @@ a.icon-ddarrow:hover {
 	background-image: url(images/indis.png);
 }
 
-.icon-indis {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/indis.png);
-}
-
 .icon-larrow {
 	width: 20px;
 	height: 20px;
@@ -4423,24 +3771,6 @@ a.icon-ldarrow:hover {
 	background-image: url(images/osm.png);
 }
 
-.icon-patriarch {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/patriarch.png);
-}
-
-.icon-pedigree {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/pedigree.png);
-}
-
-.icon-place {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/place.png);
-}
-
 .icon-plus {
 	width: 11px;
 	height: 11px;
@@ -4483,18 +3813,6 @@ a.icon-rdarrow:hover {
 	background-image: url(images/remove.png);
 }
 
-.icon-repo-list {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/repository.png);
-}
-
-.icon-repository {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/repository.png);
-}
-
 .icon-resn-confidential {
 	width: 16px;
 	height: 16px;
@@ -4525,12 +3843,6 @@ a.icon-rdarrow:hover {
 	background-image: url(images/rings.png);
 }
 
-.icon-search {
-	width: 17px;
-	height: 17px;
-	background-image: url(images/search.png);
-}
-
 .icon-selected {
 	width: 12px;
 	height: 12px;
@@ -4573,24 +3885,12 @@ a.icon-rdarrow:hover {
 	background-image: url(images/sex_u_9x9.png);
 }
 
-.icon-sfamily {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/family.png);
-}
-
 .icon-source {
 	width: 20px;
 	height: 20px;
 	background-image: url(images/source.png);
 }
 
-.icon-source-list {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/source.png);
-}
-
 .icon-target {
 	width: 15px;
 	height: 15px;
@@ -4598,12 +3898,6 @@ a.icon-rdarrow:hover {
 	vertical-align: middle;
 }
 
-.icon-tree {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/tree.png);
-}
-
 .icon-uarrow {
 	width: 20px;
 	height: 20px;
@@ -4628,35 +3922,18 @@ a.icon-udarrow:hover {
 	background-image: url(images/udarrow2.png);
 }
 
-.icon-user_add {
-	width: 20px;
-	height: 20px;
-	background-image: url(images/user_add.png);
-}
-
 .icon-warning {
 	width: 17px;
 	height: 17px;
 	background-image: url(images/warning.png);
 }
 
-.icon-webtrees {
-	width: 100px;
-	height: 21px;
-	background-image: url(images/webtrees_s.png);
-}
-
 .icon-wiki {
 	width: 16px;
 	height: 16px;
 	background-image: url(images/w_button.png);
 }
 
-/* ios on click workaround */
-.iconz {
-	cursor: pointer;
-}
-
 .icon-zoomin {
 	width: 25px;
 	height: 25px;
@@ -4688,7 +3965,6 @@ a.icon-udarrow:hover {
 	background-image: url(images/silhouette_unknown_small.png);
 }
 
-/* Silhouettes on individual pages */
 #indi_mainimage .icon-silhouette-F {
 	width: 99px;
 	height: 106px;
@@ -4715,7 +3991,7 @@ a.icon-udarrow:hover {
 	height: 48px;
 }
 
-/* Generic MIME types */
+/* ===== Generic MIME types ===== */
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
 	background-position: -99px -49px;
@@ -4746,7 +4022,7 @@ a.icon-udarrow:hover {
 	background-position: -148px -147px;
 }
 
-/* Specific MIME types */
+/* ===== Specific MIME types ===== */
 .icon-mime-application-pdf {
 	background-position: -1px -49px;
 }
@@ -4830,406 +4106,1118 @@ a.icon-udarrow:hover {
 .icon-mime-video-x-ms-wmv {
 	background-position: -50px -196px;
 }
+/* ====== End Icon styles ====== */
 
-/* Edit interface pop-ups*/
-#edit_interface-page h4 {
-	color: #555;
-	margin: 5px;
+/* ====== Theme Header ========= */
+header h1 {
+	clear: left;
+	float: left;
+	font-size: 20px;
+	font-weight: normal;
+	margin: 0 10px 5px;
 }
 
-#edit_interface-page .optionbox span {
-	margin: 0 5px;
+[dir=rtl] header h1 {
+	float: right;
 }
 
-#edit_interface-page #LATI,
-#edit_interface-page #LONG,
-#edit_interface-page #SPFX,
-#edit_interface-page #NSFX,
-#edit_interface-page #NPFX {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 88px;
+/* Set stack level for top two header menu rows */
+.secondary-menu ul,
+.primary-menu ul {
+	z-index: 210;
 }
 
-#edit_interface-page #GIVN,
-#edit_interface-page #SURN,
-#edit_interface-page #_MARNM {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 180px;
+.header-logo {
+	float: left;
+	width: 242px;
+	height: 50px;
 }
 
-#edit_interface-page input[type="text"],
-#edit_interface-page #NAME_display {
-	line-height: 18px;
-	margin: 0 5px;
-	vertical-align: top;
-	width: 240px;
+.header-logo:after {
+	content: url(images/webtrees.png);
 }
 
-#edit_interface-page input[type="text"][id*="PAGE"],
-#edit_interface-page input[type="text"][id*="_UID"] {
-	width: 350px;
+[dir=rtl] .header-logo {
+	float: right;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR"],
-#edit_interface-page input[type="text"][id*="REPO"],
-#edit_interface-page input[type="text"][id*="OBJE"],
-#edit_interface-page input[type="text"][id*="FAMC"],
-#edit_interface-page input[type="text"][id*="ASSO"],
-#edit_interface-page input[type="text"][id^="AGE"],
-#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 250px;
+.header-search {
+	float: right;
 }
 
-#edit_interface-page input[type="text"][id$="DATE"] {
-	width: 160px;
+[dir=rtl] .header-search {
+	float: left;
 }
 
-#edit_interface-page input[type="text"][id^="TIME"] {
-	width: 100px;
+/* ====== Secondary menu ======= */
+.secondary-menu li ul {
+	left: auto;
+	right: 0;
 }
 
-#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
-	width: 200px;
+.secondary-menu a {
+	background: none;
+	display: inline;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
-	width: 250px;
+.secondary-menu {
+	float: right;
+	white-space: nowrap;
+	margin: 20px 10px 0 0;
+	font-weight: bold;
 }
 
-#edit_interface-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+.secondary-menu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
+	border-left: 2px solid #ccc;
+	padding: 0 5px;
 }
 
-#edit_interface-page textarea {
-	margin: 0 5px;
-	width: 440px;
+.secondary-menu li:first-child,
+.secondary-menu li ul li {
+	border: 0;
 }
 
-#edit_interface-page textarea[id*="NOTE"] {
-	height: 240px;
+.secondary-menu li ul {
+	display: none;
+	font-weight: normal;
+	position: absolute;
+	top: 1.1em;
+	background-color: #fff;
+	border: thin solid #aaa;
+	margin: 0;
 }
 
-#edit_interface-page textarea[id*="TEXT"],
-#edit_interface-page textarea[id*="PUBL"] {
-	height: 140px;
+.secondary-menu li ul li {
+	padding: 2px;
+	display: block;
+	text-align: left;
 }
 
-#edit_interface-page textarea[id^="newgedrec"] {
-	line-height: 18px;
-	width: 605px;
+.secondary-menu,
+.secondary-menu li ul {
+	list-style: none;
+	padding: 1px;
 }
 
-#edit_interface-page textarea#gedcom {
-	height: 364px;
+.secondary-menu li:hover > ul {
+	display: block;
 }
 
-#edit_interface-page textarea[id*="ADDR"],
-#edit_interface-page input[id*="ADDR"] {
-	height: 80px;
-	width: 300px;
+.secondary-menu .active.theme-active {
+	color: #006;
+	font-weight: 900;
 }
 
-#edit_interface-page #changefam {
-	padding: 5px;
+[dir=rtl] #header-user-links {
+	float: left;
+	margin: 20px 0 0 10px;
 }
 
-#edit_interface-page #changefam table {
-	margin: 10px auto;
-	min-width: 400px;
-	max-width: 650px;
+[dir=rtl] #header-user-links .secondary-menu li ul {
+	left: 0;
+	right: auto;
 }
 
-#edit_interface-page #changefam span {
-	margin: 0;
+[dir=rtl] .secondary-menu {
+	float: left;
+	margin: 20px 0 0 10px;
 }
 
-#edit_interface-page #changefam td {
-	padding: 5px;
-	white-space: normal;
+[dir=rtl] .secondary-menu li ul {
+	left: 0;
+	right: auto;
 }
 
-#edit_interface-page #changefam td.child {
-	text-align: center;
+[dir=rtl] .secondary-menu li ul li {
+	text-align: right;
 }
 
-#save-cancel {
-	position: fixed;
-	bottom: 0;
-	background-color: #d1d9ef;
-	width: 98%;
-	border: solid #81a9cb 1px;
+[dir=rtl] .secondary-menu li {
+	border-left: none;
+	border-right: 2px solid;
+}
+
+[dir=rtl] .secondary-menu li:first-child,
+[dir=rtl] .secondary-menu li ul li {
+	border: 0;
+}
+
+header input.image {
+	width: 17px;
+	height: 17px;
+	border: 0;
+	padding: 0;
+	vertical-align: top;
+}
+
+header input,
+button,
+textarea {
+	border-width: 1px;
+	border-color: #fff #555 #555 #fff;
+	font-size: 12px;
+}
+
+header input,
+textarea {
+	padding: 0 3px;
+}
+
+/* ====== Primary menu ========= */
+header nav {
+	border-top: 2px solid #81a9cb;
+	border-bottom: 2px solid #81a9cb;
+	margin: 8px auto;
+	padding: 5px 0;
+	position: relative;
+	clear: both;
+}
+
+.primary-menu,
+.primary-menu ul {
 	margin: 0;
+	list-style-type: none;
 }
 
-#save-cancel input {
-	padding: 2px 8px;
+.primary-menu {
+	margin: 0 auto;
+	display: table;
 }
 
-#save-cancel .save {
+.primary-menu li {
 	float: left;
-	margin: 5px;
+	position: relative;
 }
 
-#save-cancel .cancel {
-	float: right;
-	margin: 5px;
+.primary-menu li li {
+	clear: both;
 }
 
-[dir=rtl] #save-cancel .save {
-	float: right;
+.primary-menu li:hover > ul {
+	display: block;
+	position: absolute;
+	top: 0;
+	left: 100%;
+	right: auto;
 }
 
-[dir=rtl] #save-cancel .cancel {
-	float: left;
+.primary-menu > li:hover > ul {
+	left: 0;
+	right: auto;
+	top: 66px;
 }
 
-#edit_interface-page,
-#addmedia-page {
-	margin-bottom: 50px;
+.primary-menu a {
+	display: block;
+	white-space: nowrap;
+	overflow: hidden;
 }
 
-/* Addmedia pop-ups*/
-#addmedia-page input[type="text"] {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 300px;
+.primary-menu ul {
+	position: absolute;
+	display: none;
+	background: #fff;
+	border: thin solid #aaa;
+	padding: 5px 0;
 }
 
-#addmedia-page .optionbox select {
-	margin: 0 5px;
+.primary-menu li a {
+	margin: auto;
+	padding-top: 52px;
+	width: 100%;
 }
 
-#addmedia-page .optionbox p.sub {
+.primary-menu li li a {
+	display: block;
+	position: relative;
+	float: left;
 	font-size: 11px;
-	margin: 0 5px;
+	line-height: 1.5;
+	padding: 1px 10px 1px 5px;
 }
 
-#addmedia-page input[type="text"][id*="PAGE"],
-#addmedia-page input[type="text"][id*="_UID"] {
-	width: 350px;
+.primary-menu > li {
+	background-image: url(images/large_menu_sprite.png);
+	background-repeat: no-repeat;
+	min-width: 80px;
+	height: 64px;
+	padding: 0 5px;
+	text-align: center;
 }
 
-#addmedia-page input[type="text"][id*="SOUR"],
-#addmedia-page input[type="text"][id*="REPO"],
-#addmedia-page input[type="text"][id*="OBJE"],
-#addmedia-page input[type="text"][id*="FAMC"],
-#addmedia-page input[type="text"][id*="ASSO"],
-#addmedia-page input[type="text"][id^="AGE"],
-#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 70px;
+.primary-menu li li {
+	background-image: url(images/small_menu_sprite.png);
+	background-repeat: no-repeat;
+	height: 24px;
+	left: auto;
+	line-height: 24px;
+	text-align: left;
+	text-indent: 26px;
+	width: 100%;
 }
 
-#addmedia-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+
+/* Reverse left and right on RTL pages */
+[dir=rtl] .primary-menu li {
+	float: right;
 }
 
-#addmedia-page textarea {
-	margin: 0 5px;
-	width: 440px;
+[dir=rtl] .primary-menu li:hover > ul {
+	right: 100%;
+	left: auto;
 }
 
-#addmedia-page textarea[id*="NOTE"] {
-	height: 240px;
+[dir=rtl] .primary-menu > li:hover > ul {
+	left: auto;
+	right: 0;
 }
 
-#addmedia-page textarea[id*="TEXT"],
-#addmedia-page textarea[id*="PUBL"] {
-	height: 140px;
+[dir=rtl] .primary-menu li li {
+	text-align: right;
 }
 
-/* Styling for the jquery.colorbox gallery */
-#colorbox,
-#cboxOverlay,
-#cboxWrapper {
-	position: absolute;
-	top: 0;
-	left: 0;
-	z-index: 9999;
-	overflow: hidden;
+[dir=rtl] .primary-menu li li a {
+	float: right;
+	padding: 1px 5px 1px 10px;
 }
 
-#colorbox {
-	border: 2px solid #ccc;
+/* ====== End Theme Header ===== */
+
+/* ====== Theme Footer ========= */
+
+footer {
+	clear: both;
+	font-size: 12px;
+	padding-top: 10px;
+	text-align: center;
 }
 
-#cboxOverlay {
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	background: #ccc;
+.contact-links {
+	margin-top: 15px;
 }
 
-#cboxContent {
-	background: #fff;
-	border: 5px solid #888;
+.powered-by-webtrees {
+	display: inline-block;
+	margin-top: 10px;
+	width: 100px;
+	height: 21px;
 }
 
-#cboxLoadedContent {
-	overflow: auto;
-	background: #fff;
-	margin-bottom: 30px;
-	margin-top: 35px;
+.powered-by-webtrees:after {
+	content: url(images/powered-by-webtrees.png);
 }
 
-#cboxTitle {
-	position: absolute;
-	left: 0;
-	top: 10px;
-	color: #949494;
+#link_change_blocks {
+	clear: both;
+	margin: 0 auto;
+	padding: 25px 0 0;
 	text-align: center;
-	width: 100%;
-	font-weight: 800;
-	font-size: 14px;
+	width: 400px;
 }
 
-.cboxPhoto {
-	float: left;
-	margin: auto;
-	border: 0;
-	display: block;
-	max-width: none;
+#link_change_blocks span {
+	padding: 0 50px;
 }
 
-.cboxIframe {
-	width: 100%;
-	height: 100%;
-	display: block;
-	border: 0;
+#link_change_blocks span span {
+	padding: 0 3px;
 }
 
-#cboxPrevious {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	background: url(images/controls.png) no-repeat -75px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+/* ====== End Theme Footer ===== */
+
+/* ====== Theme Icons ========== */
+/* ***** Header icons **** */
+#menu-tree {
+	background-position:center 0;
 }
 
-#cboxPrevious:hover {
-	background-position: -75px -25px;
+#menu-mymenu {
+	background-position:center -70px;
 }
 
-#cboxNext {
-	position: absolute;
-	bottom: 0;
-	left: 27px;
-	background: url(images/controls.png) no-repeat -50px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#menu-chart {
+	background-position:center -140px;
 }
 
-#cboxNext:hover {
-	background-position: -50px -25px;
+#menu-list {
+	background-position:center -210px;
 }
 
-#cboxSlideshow {
-	position: absolute;
-	bottom: 5px;
-	left: 57px;
-	margin: 10px;
-	border: 0;
-	background: none;
-	font-size: 14px;
+#menu-report {
+	background-position:center -280px;
 }
 
-#cboxSlideshow:hover {
-	color: #f00;
-	background: #fff;
+#menu-calendar {
+	background-position:center -350px;
 }
 
-#cboxClose {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	background: url(images/controls.png) no-repeat -25px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#menu-search {
+	background-position:center -420px;
 }
 
-#cboxClose:hover {
-	background-position: -25px -25px;
+#menu-help {
+	background-position:center -490px;
 }
 
-#cboxCurrent {
-	bottom: 4px;
-	color: #949494;
-	left: 58px;
-	position: absolute;
+#menu-clippings {
+	background-position:center -560px;
 }
 
-[dir=rtl] #cboxPrevious {
-	right: 27px;
-	left: auto;
+#menu-indi {
+	background-position:center -630px;
 }
 
-[dir=rtl] #cboxNext {
-	right: 0;
-	left: auto;
+#menu-indi-orderfam {
+	background-position: left 0;
 }
 
-[dir=rtl] #cboxCurrent {
-	right: auto;
-	left: 0;
+[dir=rtl] #menu-indi-orderfam {
+	background-position: right 0;
 }
 
-[dir=rtl] #cboxClose {
-	right: auto;
-	left: 0;
+#menu-sour {
+	background-position:center -700px;
 }
 
-[dir=rtl] #cboxSlideshow {
-	right: 57px;
-	left: auto;
+#menu-fam {
+	background-position:center -770px;
 }
 
-/* Census assistant module */
-table.table-census-assistant th {
-	font-weight: bold;
-	text-align: left;
+#menu-obje {
+	background-position:center -840px;
 }
 
-/* Stories module */
-.story_title {
-	padding-top: 12px;
-	height: 32px;
-	font-size: 13px;
-	font-weight: 700;
+#menu-note {
+	background-position:center -910px;
 }
 
-.story_body {
-	padding: 20px;
-	white-space: normal;
+#menu-repo {
+	background-position:center -980px;
 }
 
-.story_edit {
-	padding: 12px;
+#menu-story {
+	background-position:center -1045px;
 }
 
-.btn-group {
-	display: inline-block;
-	margin: 0 4px;
+/* Header Sub-menu icons */
+#menu-admin {
+	background-position: left 0;
 }
 
-.btn-group button:first-child,
-[dir=rtl] .btn-group button:last-child {
-	border-radius: 3px 0 0 3px;
+[dir=rtl] #menu-admin {
+	background-position: right 0;
 }
 
-.btn-group button:last-child,
-[dir=rtl] .btn-group button:first-child {
-	border-radius: 0 3px 3px 0;
+#menu-branches {
+	background-position: left -450px;
+}
+
+[dir=rtl] #menu-branches {
+	background-position: right -450px;
+}
+
+#menu-calendar-day {
+	background-position: left -60px;
+}
+
+[dir=rtl] #menu-calendar-day {
+	background-position: right -60px;
+}
+
+#menu-calendar-month {
+	background-position: left -60px;
+}
+
+[dir=rtl] #menu-calendar-month {
+	background-position: right -60px;
+}
+
+#menu-calendar-year {
+	background-position: left -60px;
+}
+
+[dir=rtl] #menu-calendar-year {
+	background-position: right -60px;
+}
+
+#menu-chart-ancestry {
+	background-position: left -30px;
+}
+
+[dir=rtl] #menu-chart-ancestry {
+	background-position: right -30px;
+}
+
+#menu-chart-compact {
+	background-position: left -30px;
+}
+
+[dir=rtl] #menu-chart-compact {
+	background-position: right -30px;
+}
+
+#menu-chart-descendants {
+	background-position: left -150px;
+}
+
+[dir=rtl] #menu-chart-descendants {
+	background-position: right -150px;
+}
+
+#menu-chart-familybook {
+	background-position: left -180px;
+}
+
+[dir=rtl] #menu-chart-familybook {
+	background-position: right -180px;
+}
+
+#menu-chart-fanchart {
+	background-position: left -210px;
+}
+
+[dir=rtl] #menu-chart-fanchart {
+	background-position: right -210px;
+}
+
+#menu-chart-hourglass {
+	background-position: left -270px;
+}
+
+[dir=rtl] #menu-chart-hourglass {
+	background-position: right -270px;
+}
+
+#menu-chart-lifespan {
+	background-position: left -660px;
+}
+
+[dir=rtl] #menu-chart-lifespan {
+	background-position: right -660px;
+}
+
+#menu-chart-pedigree {
+	background-position: left -480px;
+}
+
+[dir=rtl] #menu-chart-pedigree {
+	background-position: right -480px;
+}
+
+#menu-chart-pedigree_map {
+	background-position: left -720px;
+}
+
+[dir=rtl] #menu-chart-pedigree_map {
+	background-position: right -720px;
+}
+
+#menu-chart-relationship {
+	background-position: left -540px;
+}
+
+[dir=rtl] #menu-chart-relationship {
+	background-position: right -540px;
+}
+
+#menu-chart-statistics {
+	background-position: left -630px;
+}
+
+[dir=rtl] #menu-chart-statistics {
+	background-position: right -630px;
+}
+
+#menu-chart-timeline {
+	background-position: left -660px;
+}
+
+[dir=rtl] #menu-chart-timeline {
+	background-position: right -660px;
+}
+
+#menu-chart-tree {
+	background-position: left -240px;
+}
+
+[dir=rtl] #menu-chart-tree {
+	background-position: right -240px;
+}
+
+#menu-clippingsadd {
+	background-position: left -930px;
+}
+
+[dir=rtl] #menu-clippingsadd {
+	background-position: right -930px;
+}
+
+#menu-clippingscart {
+	background-position: left -900px;
+}
+
+[dir=rtl] #menu-clippingscart {
+	background-position: right -900px;
+}
+
+#menu-fam-addchil {
+	background-position: left -1050px;
+}
+
+[dir=rtl] #menu-fam-addchil {
+	background-position: right -1050px;
+}
+
+#menu-fam-addfav {
+	background-position: left -870px;
+}
+
+[dir=rtl] #menu-fam-addfav {
+	background-position: right -870px;
+}
+
+#menu-fam-change {
+	background-position: left -90px;
+}
+
+[dir=rtl] #menu-fam-change {
+	background-position: right -90px;
+}
+
+#menu-fam-del {
+	background-position: left -840px;
+}
+
+[dir=rtl] #menu-fam-del {
+	background-position: right -840px;
+}
+
+#menu-fam-editraw {
+	background-position: left -90px;
+}
+
+[dir=rtl] #menu-fam-editraw {
+	background-position: right -90px;
+}
+
+#menu-fam-orderchil {
+	background-position: left -1080px;
+}
+
+[dir=rtl] #menu-fam-orderchil {
+	background-position: right -1080px;
+}
+
+#menu-help-contents {
+	background-position: left -300px;
+}
+
+[dir=rtl] #menu-help-contents {
+	background-position: right -300px;
+}
+
+#menu-help-faq {
+	background-position: left -300px;
+}
+
+[dir=rtl] #menu-help-faq {
+	background-position: right -300px;
+}
+
+#menu-help-genealogy {
+	background-position: left -120px;
+}
+
+[dir=rtl] #menu-help-genealogy {
+	background-position: right -120px;
+}
+
+#menu-help-hide {
+	background-position: left -300px;
+}
+
+[dir=rtl] #menu-help-hide {
+	background-position: right -300px;
+}
+
+#menu-help-show {
+	background-position: left -300px;
+}
+
+[dir=rtl] #menu-help-show {
+	background-position: right -300px;
+}
+
+#menu-help-technical {
+	background-position: left -120px;
+}
+
+[dir=rtl] #menu-help-technical {
+	background-position: right -120px;
+}
+
+#menu-help-wiki {
+	background-position: left -690px;
+}
+
+[dir=rtl] #menu-help-wiki {
+	background-position: right -690px;
+}
+
+#menu-indi-addfav {
+	background-position: left -870px;
+}
+
+[dir=rtl] #menu-indi-addfav {
+	background-position: right -870px;
+}
+
+#menu-indi-addname {
+	background-position: left -780px;
+}
+
+[dir=rtl] #menu-indi-addname {
+	background-position: right -780px;
+}
+
+#menu-indi-del {
+	background-position: left -840px;
+}
+
+[dir=rtl] #menu-indi-del {
+	background-position: right -840px;
+}
+
+#menu-indi-editraw {
+	background-position: left -750px;
+}
+
+[dir=rtl] #menu-indi-editraw {
+	background-position: right -750px;
+}
+
+#menu-indi-editsex {
+	background-position: left -810px;
+}
+
+[dir=rtl] #menu-indi-editsex {
+	background-position: right -810px;
+}
+
+#menu-list-fam {
+	background-position: left -90px;
+}
+
+[dir=rtl] #menu-list-fam {
+	background-position: right -90px;
+}
+
+#menu-list-indi {
+	background-position: left -120px;
+}
+
+[dir=rtl] #menu-list-indi {
+	background-position: right -120px;
+}
+
+#menu-list-note {
+	background-position: left -420px;
+}
+
+[dir=rtl] #menu-list-note {
+	background-position: right -420px;
+}
+
+#menu-list-obje {
+	background-position: left -330px;
+}
+
+[dir=rtl] #menu-list-obje {
+	background-position: right -330px;
+}
+
+#menu-list-plac {
+	background-position: left -510px;
+}
+
+[dir=rtl] #menu-list-plac {
+	background-position: right -510px;
+}
+
+#menu-list-repo {
+	background-position: left -360px;
+}
+
+[dir=rtl] #menu-list-repo {
+	background-position: right -360px;
+}
+
+#menu-list-sour {
+	background-position: left -180px;
+}
+
+[dir=rtl] #menu-list-sour {
+	background-position: right -180px;
+}
+
+#menu-myaccount {
+	background-position: left -390px;
+}
+
+[dir=rtl] #menu-myaccount {
+	background-position: right -390px;
+}
+
+#menu-mypage {
+	background-position: left -390px;
+}
+
+[dir=rtl] #menu-mypage {
+	background-position: right -390px;
+}
+
+#menu-mypedigree {
+	background-position: left -480px;
+}
+
+[dir=rtl] #menu-mypedigree {
+	background-position: right -480px;
+}
+
+#menu-myrecord {
+	background-position: left -120px;
+}
+
+[dir=rtl] #menu-myrecord {
+	background-position: right -120px;
+}
+
+#menu-note-addfav {
+	background-position: left -870px;
+}
+
+[dir=rtl] #menu-note-addfav {
+	background-position: right -870px;
+}
+
+#menu-note-del {
+	background-position: left -840px;
+}
+
+[dir=rtl] #menu-note-del {
+	background-position: right -840px;
+}
+
+#menu-note-edit {
+	background-position: left -1020px;
+}
+
+[dir=rtl] #menu-note-edit {
+	background-position: right -1020px;
+}
+
+#menu-note-editraw {
+	background-position: left -1020px;
+}
+
+[dir=rtl] #menu-note-editraw {
+	background-position: right -1020px;
+}
+
+#menu-obje-addfav {
+	background-position: left -870px;
+}
+
+[dir=rtl] #menu-obje-addfav {
+	background-position: right -870px;
+}
+
+#menu-obje-del {
+	background-position: left -840px;
+}
+
+[dir=rtl] #menu-obje-del {
+	background-position: right -840px;
+}
+
+#menu-obje-edit {
+	background-position: left -1110px;
+}
+
+[dir=rtl] #menu-obje-edit {
+	background-position: right -1110px;
+}
+
+#menu-obje-editraw {
+	background-position: left -1110px;
+}
+
+[dir=rtl] #menu-obje-editraw {
+	background-position: right -1110px;
+}
+
+#menu-obje-link {
+	background-position: left -1140px;
+}
+
+[dir=rtl] #menu-obje-link {
+	background-position: right -1140px;
+}
+
+#menu-obje-link-fam {
+	background-position: left -90px;
+}
+
+[dir=rtl] #menu-obje-link-fam {
+	background-position: right -90px;
+}
+
+#menu-obje-link-indi {
+	background-position: left -120px;
+}
+
+[dir=rtl] #menu-obje-link-indi {
+	background-position: right -120px;
+}
+
+#menu-obje-link-sour {
+	background-position: left -180px;
+}
+
+[dir=rtl] #menu-obje-link-sour {
+	background-position: right -180px;
+}
+
+#menu-repo-addfav {
+	background-position: left -870px;
+}
+
+[dir=rtl] #menu-repo-addfav {
+	background-position: right -870px;
+}
+
+#menu-repo-del {
+	background-position: left -840px;
+}
+
+[dir=rtl] #menu-repo-del {
+	background-position: right -840px;
+}
+
+#menu-repo-edit {
+	background-position: left -990px;
+}
+
+[dir=rtl] #menu-repo-edit {
+	background-position: right -990px;
+}
+
+#menu-repo-editraw {
+	background-position: left -990px;
+}
+
+[dir=rtl] #menu-repo-editraw {
+	background-position: right -990px;
+}
+
+#menu-report li {
+	background-position: left -570px;
+}
+
+[dir=rtl] #menu-report li {
+	background-position: right -570px;
+}
+
+#menu-search-advanced {
+	background-position: left -600px;
+}
+
+[dir=rtl] #menu-search-advanced {
+	background-position: right -600px;
+}
+
+#menu-search-general {
+	background-position: left -600px;
+}
+
+[dir=rtl] #menu-search-general {
+	background-position: right -600px;
+}
+
+#menu-search-replace {
+	background-position: left -600px;
+}
+
+[dir=rtl] #menu-search-replace {
+	background-position: right -600px;
+}
+
+#menu-search-soundex {
+	background-position: left -600px;
+}
+
+[dir=rtl] #menu-search-soundex {
+	background-position: right -600px;
+}
+
+#menu-sour-addfav {
+	background-position: left -870px;
+}
+
+[dir=rtl] #menu-sour-addfav {
+	background-position: right -870px;
+}
+
+#menu-sour-del {
+	background-position: left -840px;
+}
+
+[dir=rtl] #menu-sour-del {
+	background-position: right -840px;
+}
+
+#menu-sour-edit {
+	background-position: left -960px;
+}
+
+[dir=rtl] #menu-sour-edit {
+	background-position: right -960px;
+}
+
+#menu-sour-editraw {
+	background-position: left -960px;
+}
+
+[dir=rtl] #menu-sour-editraw {
+	background-position: right -960px;
+}
+
+#menu-story-sub {
+	background-position: left -1208px;
+}
+
+[dir=rtl] #menu-story-sub {
+	background-position: right -1208px;
+}
+
+#menu-tree li {
+	background-position: left -240px;
+}
+
+[dir=rtl] #menu-tree li {
+	background-position: right -240px;
+}
+
+.icon-indis {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/indis.png);
+}
+
+.icon-patriarch {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/patriarch.png);
+}
+
+.icon-pedigree {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/pedigree.png);
+}
+
+.icon-place {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/place.png);
+}
+
+.icon-repo-list {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/repository.png);
+}
+
+.icon-repository {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/repository.png);
+}
+
+.icon-search {
+	width: 17px;
+	height: 17px;
+	background-image: url(images/search.png);
+}
+
+.icon-sfamily {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/family.png);
+}
+
+.icon-source-list {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/source.png);
+}
+
+.icon-tree {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/tree.png);
+}
+
+.icon-user_add {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/user_add.png);
+}
+
+@media print {
+	header,
+	footer,
+	form,
+	#sidebar,
+	#separator,
+	.noprint {
+		display: none;
+	}
+
+	#pedigree_chart {
+		left: -40px;
+		top:  -260px;
+	}
+
+	[dir=rtl] #pedigree_chart {
+		left: auto;
+		right: -20px;
+	}
+
+	#header_accordion1 {
+		width: 510px;
+	}
+	
+	#familybook_chart h3 {
+		margin-bottom: 10px;
+	}
+
+	.lifespan_outer {
+		position: relative;
+		width: auto;
+		height: auto;
+		overflow: visible;
+		border: 0;
+	}
+
+	.lifespan_people {
+		position: absolute;
+		width: auto;
+		left: -10px;
+		top: -60px;
+		z-index: 1;
+	}
 }
diff --git a/themes/webtrees/footer.php b/themes/webtrees/footer.php
deleted file mode 100644
index feaea74f89..0000000000
--- a/themes/webtrees/footer.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-// Footer for webtrees theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo '</main>';
-if ($view !== 'simple') {
-	echo '<footer>';
-	echo contact_links();
-	echo '<p class="logo">';
-	echo '<a href="', WT_WEBTREES_URL, '" target="_blank" class="icon-webtrees" title="', WT_WEBTREES, ' ', WT_VERSION, '"></a>';
-	echo '</p>';
-
-	if ($WT_TREE && $WT_TREE->getPreference('SHOW_STATS')) {
-		echo execution_stats();
-	}
-	if (exists_pending_change()) {
-		echo '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;">';
-		echo '<p class="error center">', WT_I18N::translate('There are pending changes for you to moderate.'), '</p>';
-		echo '</a>';
-	}
-	echo '</footer>';
-}
diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php
deleted file mode 100644
index b5c73650f6..0000000000
--- a/themes/webtrees/header.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-// Header for webtrees theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use WT\Auth;
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-global $WT_IMAGES;
-
-// This theme uses the jQuery “colorbox” plugin to display images
-$this
-	->addExternalJavascript(WT_JQUERY_COLORBOX_URL)
-	->addExternalJavascript(WT_JQUERY_WHEELZOOM_URL)
-	->addInlineJavascript('activate_colorbox();')
-	->addInlineJavascript('jQuery.extend(jQuery.colorbox.settings, { width:"85%", height:"85%", transition:"none", slideshowStart:"'. WT_I18N::translate('Play').'", slideshowStop:"'. WT_I18N::translate('Stop').'", title: function() { var img_title = jQuery(this).data("title"); return img_title; } } );');
-?>
-<!DOCTYPE html>
-<html <?php echo WT_I18N::html_markup(); ?>>
-<head>
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<?php echo header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL); ?>
-	<title><?php echo WT_Filter::escapeHtml($title); ?></title>
-	<link rel="icon" href="<?php echo WT_CSS_URL; ?>favicon.png" type="image/png">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_THEME_URL; ?>jquery-ui-1.11.2/jquery-ui.css">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_CSS_URL; ?>style.css">
-	<!--[if IE 8]>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-	<![endif]-->
-</head>
-<body id="body">
-	<?php if ($view !== 'simple') { ?>
-	<header>
-		<div class="header_img">
-			<img src="<?php echo WT_CSS_URL; ?>images/webtrees.png" width="242" height="50" alt="<?php echo WT_WEBTREES; ?>">
-		</div>
-		<div id="header-user-links">
-			<ul class="makeMenu" role="menubar">
-				<li>
-					<?php
-					if (Auth::check()) {
-						echo '<a href="edituser.php">', WT_I18N::translate('Logged in as '), ' ', WT_Filter::escapeHtml(Auth::user()->getRealName()), '</a></li> <li>', logout_link();
-					} else {
-						echo login_link();
-					}
-					?>
-				</li>
-				<?php echo WT_MenuBar::getFavoritesMenu(); ?>
-				<?php echo WT_MenuBar::getThemeMenu(); ?>
-				<?php echo WT_MenuBar::getLanguageMenu(); ?>
-			</ul>
-		</div>
-		<h1><?php echo WT_TREE_TITLE; ?></h1>
-		<div class="header_search">
-			<form action="search.php" method="post" role="search">
-				<input type="hidden" name="action" value="general">
-				<input type="hidden" name="ged" value="<?php echo WT_GEDCOM; ?>">
-				<input type="hidden" name="topsearch" value="yes">
-				<input type="search" name="query" size="25" placeholder="<?php echo WT_I18N::translate('Search'); ?>">
-				<input type="image" class="image" src="<?php echo $WT_IMAGES['search']; ?>" alt="<?php echo WT_I18N::translate('Search'); ?>" title="<?php echo WT_I18N::translate('Search'); ?>">
-			</form>
-		</div>
-		<nav>
-			<ul id="main-menu" role="menubar">
-				<?php echo WT_MenuBar::getGedcomMenu();   ?>
-				<?php echo WT_MenuBar::getMyPageMenu();   ?>
-				<?php echo WT_MenuBar::getChartsMenu();   ?>
-				<?php echo WT_MenuBar::getListsMenu();    ?>
-				<?php echo WT_MenuBar::getCalendarMenu(); ?>
-				<?php echo WT_MenuBar::getReportsMenu();  ?>
-				<?php echo WT_MenuBar::getSearchMenu();   ?>
-				<?php echo implode('', WT_MenuBar::getModuleMenus()); ?>
-			</ul>
-		</nav>
-	</header>
-	<?php } ?>
-	<?php echo WT_FlashMessages::getHtmlMessages(); ?>
-	<main id="content">
diff --git a/themes/webtrees/templates/block_main_temp.php b/themes/webtrees/templates/block_main_temp.php
deleted file mode 100644
index 41dc615aa9..0000000000
--- a/themes/webtrees/templates/block_main_temp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-// Template for drawing the main blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<div class="blockheader">
-		<?php echo $title; ?>
-	</div>
-	<div class="blockcontent normal_inner_block <?php echo $class; ?>">
-		<?php echo $content; ?>
-	</div>
-</div>
diff --git a/themes/webtrees/templates/block_small_temp.php b/themes/webtrees/templates/block_small_temp.php
deleted file mode 100644
index 8fa95335ed..0000000000
--- a/themes/webtrees/templates/block_small_temp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-// Template for drawing the height-restricted blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<div class="blockheader">
-		<?php echo $title; ?>
-	</div>
-	<div class="blockcontent small_inner_block <?php echo $class; ?>">
-		<?php echo $content; ?>
-	</div>
-</div>
diff --git a/themes/webtrees/templates/compactbox_template.php b/themes/webtrees/templates/compactbox_template.php
deleted file mode 100644
index 4a3386f801..0000000000
--- a/themes/webtrees/templates/compactbox_template.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-//  $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $outBoxAdd, $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '"' , $outBoxAdd, '>
-	<div class="compact_view">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'">
-			<span class="namedef name',$style,'">', $shortname, '</span>
-		</a>
-	</div>
-	<div class="inout2 details',$style,'">',
-		$person->getLifeSpan(), '
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/webtrees/templates/personbox_template.php b/themes/webtrees/templates/personbox_template.php
deleted file mode 100644
index b1fdc7ade2..0000000000
--- a/themes/webtrees/templates/personbox_template.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-// $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $genderImage, $BirthDeath, $outBoxAdd,
-// $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team. All rights reserved.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '" ',$outBoxAdd,'>
-	<div class="noprint icons">', $icons, '</div>',
-	'<div class="chart_textbox" style="max-height:', $bheight,'px;">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '">
-			<span class="namedef name',$style,'">',
-				$name,
-				$genderImage,'
-				<span class="details',$style,'">' . $LDSord . '</span>
-			</span>
-		</a>
-		<div class="namedef name',$style,'">',$addname,'</div>
-		<div class="inout2 details',$style,'">',
-			$BirthDeath,
-		'</div>
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/webtrees/theme.php b/themes/webtrees/theme.php
index 28927345db..f625281c15 100644
--- a/themes/webtrees/theme.php
+++ b/themes/webtrees/theme.php
@@ -2,10 +2,7 @@
 // Standard theme
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
+// Copyright (C) 2015 webtrees development team.
 //
 // 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
@@ -20,92 +17,5 @@
 // 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-// PNG Icons By:Alessandro Rei; License: GPL; http://www.kde-look.org/content/show.php/Dark-Glass+reviewed?content=67902
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-// Theme name - this needs double quotes, as file is scanned/parsed by script
-$theme_name = "webtrees";
-
-// A version number in the path prevents browser-cache problems during upgrade
-define('WT_CSS_URL', WT_THEME_URL . 'css-1.6.2/');
-
-$headerfile = WT_THEME_DIR.'header.php';
-$footerfile = WT_THEME_DIR.'footer.php';
-
-// Legacy icons.
-$WT_IMAGES=array(
-	// used to draw charts
-	'dline'           => WT_CSS_URL . 'images/dline.png',
-	'dline2'          => WT_CSS_URL . 'images/dline2.png',
-	'hline'           => WT_CSS_URL . 'images/hline.png',
-	'spacer'          => WT_CSS_URL . 'images/spacer.png',
-	'vline'           => WT_CSS_URL . 'images/vline.png',
-
-	// used in button images and javascript
-	'add'             => WT_CSS_URL . 'images/add.png',
-	'button_family'   => WT_CSS_URL . 'images/buttons/family.png',
-	'minus'           => WT_CSS_URL . 'images/minus.png',
-	'plus'            => WT_CSS_URL . 'images/plus.png',
-	'remove'          => WT_CSS_URL . 'images/remove.png',
-	'search'          => WT_CSS_URL . 'images/search.png',
-
-	// need different sizes before moving to CSS
-	'default_image_M' => WT_CSS_URL . 'images/silhouette_male.png',
-	'default_image_F' => WT_CSS_URL . 'images/silhouette_female.png',
-	'default_image_U' => WT_CSS_URL . 'images/silhouette_unknown.png',
-);
-
-//-- variables for the fan chart
-$fanChart = array(
-	'font'     => WT_ROOT . 'includes/fonts/DejaVuSans.ttf',
-	'size'     => 7,
-	'color'    => '#000000',
-	'bgColor'  => '#eeeeee',
-	'bgMColor' => '#b1cff0',
-	'bgFColor' => '#e9daf1'
-);
-
-// Pedigree chart variables
-$bwidth        = 250; // width of boxes on pedigree chart
-$bheight       = 80;  // height of boxes on pedigree chart
-$baseyoffset   = 10;  // position the entire pedigree tree relative to the top of the page
-$basexoffset   = 10;  // position the entire pedigree tree relative to the left of the page
-$bxspacing     = 1;  // horizontal spacing between boxes on the pedigree chart
-$byspacing     = 5;  // vertical spacing between boxes on the pedigree chart
-$linewidth     = 1.5; // width of joining lines
-$shadowcolor   = '';  // shadow color for joining lines
-$shadowblur    = 0;   // shadow blur for joining lines
-$shadowoffsetX = 0;   // shadowOffsetX for joining lines
-$shadowoffsetY = 0;   // shadowOffsetY for joining lines
-
-// Descendancy and relationship chart variables
-$Dbaseyoffset = 20;  // position the entire descendancy tree relative to the top of the page
-$Dbasexoffset = 20;  // position the entire descendancy tree relative to the left of the page
-$Dbxspacing   = 5;   // horizontal spacing between boxes
-$Dbyspacing   = 10;  // vertical spacing between boxes
-$Dbwidth      = 260; // width of DIV layer boxes
-$Dbheight     = 80;  // height of DIV layer boxes
-$Dindent      = 15;  // width to indent descendancy boxes
-$Darrowwidth  = 30;  // additional width to include for the up arrows
-
-// Compact version of chart displays
-$cbwidth  = 240;
-$cbheight = 50;
-
-// The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels
-$WT_STATS_S_CHART_X = 440;
-$WT_STATS_S_CHART_Y = 125;
-$WT_STATS_L_CHART_X = 900;
-
-// For map charts, the maximum size is 440 pixels wide by 220 pixels high
-$WT_STATS_MAP_X = 440;
-$WT_STATS_MAP_Y = 220;
 
-$WT_STATS_CHART_COLOR1 = "ffffff";
-$WT_STATS_CHART_COLOR2 = "9ca3d4";
-$WT_STATS_CHART_COLOR3 = "e5e6ef";
+return new WT\Theme\Webtrees;
diff --git a/themes/xenea/css-1.6.2/favicon.png b/themes/xenea/css-1.7.0/favicon.png
index 4c54cc0e4e..4c54cc0e4e 100644
--- a/themes/xenea/css-1.6.2/favicon.png
+++ b/themes/xenea/css-1.7.0/favicon.png
diff --git a/themes/xenea/css-1.6.2/images/add.png b/themes/xenea/css-1.7.0/images/add.png
index c4554632f2..c4554632f2 100644
--- a/themes/xenea/css-1.6.2/images/add.png
+++ b/themes/xenea/css-1.7.0/images/add.png
diff --git a/themes/xenea/css-1.6.2/images/admin.png b/themes/xenea/css-1.7.0/images/admin.png
index 6c06b18768..6c06b18768 100644
--- a/themes/xenea/css-1.6.2/images/admin.png
+++ b/themes/xenea/css-1.7.0/images/admin.png
diff --git a/themes/xenea/css-1.6.2/images/barra.png b/themes/xenea/css-1.7.0/images/barra.png
index ccc66b22ba..ccc66b22ba 100644
--- a/themes/xenea/css-1.6.2/images/barra.png
+++ b/themes/xenea/css-1.7.0/images/barra.png
diff --git a/themes/xenea/css-1.6.2/images/bing.png b/themes/xenea/css-1.7.0/images/bing.png
index 400627cf16..400627cf16 100644
--- a/themes/xenea/css-1.6.2/images/bing.png
+++ b/themes/xenea/css-1.7.0/images/bing.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/addmedia.png b/themes/xenea/css-1.7.0/images/buttons/addmedia.png
index a269a90e35..a269a90e35 100644
--- a/themes/xenea/css-1.6.2/images/buttons/addmedia.png
+++ b/themes/xenea/css-1.7.0/images/buttons/addmedia.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/addnote.png b/themes/xenea/css-1.7.0/images/buttons/addnote.png
index 4a8c7031ef..4a8c7031ef 100644
--- a/themes/xenea/css-1.6.2/images/buttons/addnote.png
+++ b/themes/xenea/css-1.7.0/images/buttons/addnote.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/addrepository.png b/themes/xenea/css-1.7.0/images/buttons/addrepository.png
index 46eaf5d17f..46eaf5d17f 100644
--- a/themes/xenea/css-1.6.2/images/buttons/addrepository.png
+++ b/themes/xenea/css-1.7.0/images/buttons/addrepository.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/addsource.png b/themes/xenea/css-1.7.0/images/buttons/addsource.png
index f5b6d8b787..f5b6d8b787 100644
--- a/themes/xenea/css-1.6.2/images/buttons/addsource.png
+++ b/themes/xenea/css-1.7.0/images/buttons/addsource.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/calendar.png b/themes/xenea/css-1.7.0/images/buttons/calendar.png
index 0d308a977a..0d308a977a 100644
--- a/themes/xenea/css-1.6.2/images/buttons/calendar.png
+++ b/themes/xenea/css-1.7.0/images/buttons/calendar.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/family.png b/themes/xenea/css-1.7.0/images/buttons/family.png
index 3ceafc5abb..3ceafc5abb 100644
--- a/themes/xenea/css-1.6.2/images/buttons/family.png
+++ b/themes/xenea/css-1.7.0/images/buttons/family.png
diff --git a/themes/xenea/css-1.7.0/images/buttons/find.png b/themes/xenea/css-1.7.0/images/buttons/find.png
new file mode 100644
index 0000000000..be6c6002e4
--- /dev/null
+++ b/themes/xenea/css-1.7.0/images/buttons/find.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/find_facts.png b/themes/xenea/css-1.7.0/images/buttons/find_facts.png
index 2ba25a7858..2ba25a7858 100644
--- a/themes/xenea/css-1.6.2/images/buttons/find_facts.png
+++ b/themes/xenea/css-1.7.0/images/buttons/find_facts.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/head.png b/themes/xenea/css-1.7.0/images/buttons/head.png
index b50c7d2061..b50c7d2061 100644
--- a/themes/xenea/css-1.6.2/images/buttons/head.png
+++ b/themes/xenea/css-1.7.0/images/buttons/head.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/indi.png b/themes/xenea/css-1.7.0/images/buttons/indi.png
index 31e3856acc..31e3856acc 100644
--- a/themes/xenea/css-1.6.2/images/buttons/indi.png
+++ b/themes/xenea/css-1.7.0/images/buttons/indi.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/keyboard.png b/themes/xenea/css-1.7.0/images/buttons/keyboard.png
index 0c6f4b33f9..0c6f4b33f9 100644
--- a/themes/xenea/css-1.6.2/images/buttons/keyboard.png
+++ b/themes/xenea/css-1.7.0/images/buttons/keyboard.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/media.png b/themes/xenea/css-1.7.0/images/buttons/media.png
index 0c7f115203..0c7f115203 100644
--- a/themes/xenea/css-1.6.2/images/buttons/media.png
+++ b/themes/xenea/css-1.7.0/images/buttons/media.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/note.png b/themes/xenea/css-1.7.0/images/buttons/note.png
index 516bf511bf..516bf511bf 100644
--- a/themes/xenea/css-1.6.2/images/buttons/note.png
+++ b/themes/xenea/css-1.7.0/images/buttons/note.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/place.png b/themes/xenea/css-1.7.0/images/buttons/place.png
index 8d4684fac3..8d4684fac3 100644
--- a/themes/xenea/css-1.6.2/images/buttons/place.png
+++ b/themes/xenea/css-1.7.0/images/buttons/place.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/repository.png b/themes/xenea/css-1.7.0/images/buttons/repository.png
index ac7dcf74cb..ac7dcf74cb 100644
--- a/themes/xenea/css-1.6.2/images/buttons/repository.png
+++ b/themes/xenea/css-1.7.0/images/buttons/repository.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/source.png b/themes/xenea/css-1.7.0/images/buttons/source.png
index 8467f26f59..8467f26f59 100644
--- a/themes/xenea/css-1.6.2/images/buttons/source.png
+++ b/themes/xenea/css-1.7.0/images/buttons/source.png
diff --git a/themes/xenea/css-1.6.2/images/buttons/target.png b/themes/xenea/css-1.7.0/images/buttons/target.png
index 05e1a221e6..05e1a221e6 100644
--- a/themes/xenea/css-1.6.2/images/buttons/target.png
+++ b/themes/xenea/css-1.7.0/images/buttons/target.png
diff --git a/themes/xenea/css-1.6.2/images/cabeza.png b/themes/xenea/css-1.7.0/images/cabeza.png
index 68b1e87d92..68b1e87d92 100644
--- a/themes/xenea/css-1.6.2/images/cabeza.png
+++ b/themes/xenea/css-1.7.0/images/cabeza.png
diff --git a/themes/xenea/css-1.6.2/images/cabeza_rtl.png b/themes/xenea/css-1.7.0/images/cabeza_rtl.png
index 778962b893..778962b893 100644
--- a/themes/xenea/css-1.6.2/images/cabeza_rtl.png
+++ b/themes/xenea/css-1.7.0/images/cabeza_rtl.png
diff --git a/themes/xenea/css-1.6.2/images/cfamily.png b/themes/xenea/css-1.7.0/images/cfamily.png
index 528057d568..528057d568 100644
--- a/themes/xenea/css-1.6.2/images/cfamily.png
+++ b/themes/xenea/css-1.7.0/images/cfamily.png
diff --git a/themes/xenea/css-1.6.2/images/childless.png b/themes/xenea/css-1.7.0/images/childless.png
index 10f82fe6fe..10f82fe6fe 100644
--- a/themes/xenea/css-1.6.2/images/childless.png
+++ b/themes/xenea/css-1.7.0/images/childless.png
diff --git a/themes/xenea/css-1.6.2/images/children.png b/themes/xenea/css-1.7.0/images/children.png
index 30dbbf1099..30dbbf1099 100644
--- a/themes/xenea/css-1.6.2/images/children.png
+++ b/themes/xenea/css-1.7.0/images/children.png
diff --git a/themes/xenea/css-1.6.2/images/clippings.png b/themes/xenea/css-1.7.0/images/clippings.png
index 8b471f4263..8b471f4263 100644
--- a/themes/xenea/css-1.6.2/images/clippings.png
+++ b/themes/xenea/css-1.7.0/images/clippings.png
diff --git a/themes/xenea/css-1.6.2/images/controls.png b/themes/xenea/css-1.7.0/images/controls.png
index 140c6fc4ae..140c6fc4ae 100644
--- a/themes/xenea/css-1.6.2/images/controls.png
+++ b/themes/xenea/css-1.7.0/images/controls.png
diff --git a/themes/xenea/css-1.6.2/images/darrow.png b/themes/xenea/css-1.7.0/images/darrow.png
index 367376db7f..367376db7f 100644
--- a/themes/xenea/css-1.6.2/images/darrow.png
+++ b/themes/xenea/css-1.7.0/images/darrow.png
diff --git a/themes/xenea/css-1.6.2/images/darrow2.png b/themes/xenea/css-1.7.0/images/darrow2.png
index d4a45016a9..d4a45016a9 100644
--- a/themes/xenea/css-1.6.2/images/darrow2.png
+++ b/themes/xenea/css-1.7.0/images/darrow2.png
diff --git a/themes/xenea/css-1.6.2/images/ddarrow.png b/themes/xenea/css-1.7.0/images/ddarrow.png
index d49d101525..d49d101525 100644
--- a/themes/xenea/css-1.6.2/images/ddarrow.png
+++ b/themes/xenea/css-1.7.0/images/ddarrow.png
diff --git a/themes/xenea/css-1.6.2/images/delete.png b/themes/xenea/css-1.7.0/images/delete.png
index 7ce1741b6b..7ce1741b6b 100644
--- a/themes/xenea/css-1.6.2/images/delete.png
+++ b/themes/xenea/css-1.7.0/images/delete.png
diff --git a/themes/xenea/css-1.6.2/images/dline.png b/themes/xenea/css-1.7.0/images/dline.png
index 36a4e2990c..36a4e2990c 100644
--- a/themes/xenea/css-1.6.2/images/dline.png
+++ b/themes/xenea/css-1.7.0/images/dline.png
diff --git a/themes/xenea/css-1.6.2/images/dline2.png b/themes/xenea/css-1.7.0/images/dline2.png
index 2ddfbed136..2ddfbed136 100644
--- a/themes/xenea/css-1.6.2/images/dline2.png
+++ b/themes/xenea/css-1.7.0/images/dline2.png
diff --git a/themes/xenea/css-1.6.2/images/edit_indi.png b/themes/xenea/css-1.7.0/images/edit_indi.png
index 3ca2c719da..3ca2c719da 100644
--- a/themes/xenea/css-1.6.2/images/edit_indi.png
+++ b/themes/xenea/css-1.7.0/images/edit_indi.png
diff --git a/themes/xenea/css-1.6.2/images/edit_sm.png b/themes/xenea/css-1.7.0/images/edit_sm.png
index fe99f49c78..fe99f49c78 100644
--- a/themes/xenea/css-1.6.2/images/edit_sm.png
+++ b/themes/xenea/css-1.7.0/images/edit_sm.png
diff --git a/themes/xenea/css-1.6.2/images/email.png b/themes/xenea/css-1.7.0/images/email.png
index 2b3efdd668..2b3efdd668 100644
--- a/themes/xenea/css-1.6.2/images/email.png
+++ b/themes/xenea/css-1.7.0/images/email.png
diff --git a/themes/xenea/css-1.6.2/images/facts/ADDR.png b/themes/xenea/css-1.7.0/images/facts/ADDR.png
index 94b172640a..94b172640a 100644
--- a/themes/xenea/css-1.6.2/images/facts/ADDR.png
+++ b/themes/xenea/css-1.7.0/images/facts/ADDR.png
diff --git a/themes/xenea/css-1.6.2/images/facts/ADOP.png b/themes/xenea/css-1.7.0/images/facts/ADOP.png
index 82ac50b1a4..82ac50b1a4 100644
--- a/themes/xenea/css-1.6.2/images/facts/ADOP.png
+++ b/themes/xenea/css-1.7.0/images/facts/ADOP.png
diff --git a/themes/xenea/css-1.6.2/images/facts/AFN.png b/themes/xenea/css-1.7.0/images/facts/AFN.png
index 2352261118..2352261118 100644
--- a/themes/xenea/css-1.6.2/images/facts/AFN.png
+++ b/themes/xenea/css-1.7.0/images/facts/AFN.png
diff --git a/themes/xenea/css-1.6.2/images/facts/ANUL.png b/themes/xenea/css-1.7.0/images/facts/ANUL.png
index 541534dd39..541534dd39 100644
--- a/themes/xenea/css-1.6.2/images/facts/ANUL.png
+++ b/themes/xenea/css-1.7.0/images/facts/ANUL.png
diff --git a/themes/xenea/css-1.6.2/images/facts/ASSO.png b/themes/xenea/css-1.7.0/images/facts/ASSO.png
index c6250abe4c..c6250abe4c 100644
--- a/themes/xenea/css-1.6.2/images/facts/ASSO.png
+++ b/themes/xenea/css-1.7.0/images/facts/ASSO.png
diff --git a/themes/xenea/css-1.6.2/images/facts/BAPL.png b/themes/xenea/css-1.7.0/images/facts/BAPL.png
index 99b85a25b6..99b85a25b6 100644
--- a/themes/xenea/css-1.6.2/images/facts/BAPL.png
+++ b/themes/xenea/css-1.7.0/images/facts/BAPL.png
diff --git a/themes/xenea/css-1.6.2/images/facts/BAPM.png b/themes/xenea/css-1.7.0/images/facts/BAPM.png
index 99b85a25b6..99b85a25b6 100644
--- a/themes/xenea/css-1.6.2/images/facts/BAPM.png
+++ b/themes/xenea/css-1.7.0/images/facts/BAPM.png
diff --git a/themes/xenea/css-1.6.2/images/facts/BIRT.png b/themes/xenea/css-1.7.0/images/facts/BIRT.png
index 00f1c26c1b..00f1c26c1b 100644
--- a/themes/xenea/css-1.6.2/images/facts/BIRT.png
+++ b/themes/xenea/css-1.7.0/images/facts/BIRT.png
diff --git a/themes/xenea/css-1.6.2/images/facts/BURI.png b/themes/xenea/css-1.7.0/images/facts/BURI.png
index 43f8ef2e8b..43f8ef2e8b 100644
--- a/themes/xenea/css-1.6.2/images/facts/BURI.png
+++ b/themes/xenea/css-1.7.0/images/facts/BURI.png
diff --git a/themes/xenea/css-1.6.2/images/facts/CEME.png b/themes/xenea/css-1.7.0/images/facts/CEME.png
index 1faa5e0b32..1faa5e0b32 100644
--- a/themes/xenea/css-1.6.2/images/facts/CEME.png
+++ b/themes/xenea/css-1.7.0/images/facts/CEME.png
diff --git a/themes/xenea/css-1.6.2/images/facts/CENS.png b/themes/xenea/css-1.7.0/images/facts/CENS.png
index 3c4fd25a30..3c4fd25a30 100644
--- a/themes/xenea/css-1.6.2/images/facts/CENS.png
+++ b/themes/xenea/css-1.7.0/images/facts/CENS.png
diff --git a/themes/xenea/css-1.6.2/images/facts/CHAN.png b/themes/xenea/css-1.7.0/images/facts/CHAN.png
index 4d4f45b447..4d4f45b447 100644
--- a/themes/xenea/css-1.6.2/images/facts/CHAN.png
+++ b/themes/xenea/css-1.7.0/images/facts/CHAN.png
diff --git a/themes/xenea/css-1.6.2/images/facts/CHR.png b/themes/xenea/css-1.7.0/images/facts/CHR.png
index 99b85a25b6..99b85a25b6 100644
--- a/themes/xenea/css-1.6.2/images/facts/CHR.png
+++ b/themes/xenea/css-1.7.0/images/facts/CHR.png
diff --git a/themes/xenea/css-1.6.2/images/facts/CONF.png b/themes/xenea/css-1.7.0/images/facts/CONF.png
index 4d8b9579b4..4d8b9579b4 100644
--- a/themes/xenea/css-1.6.2/images/facts/CONF.png
+++ b/themes/xenea/css-1.7.0/images/facts/CONF.png
diff --git a/themes/xenea/css-1.6.2/images/facts/CONL.png b/themes/xenea/css-1.7.0/images/facts/CONL.png
index 4d8b9579b4..4d8b9579b4 100644
--- a/themes/xenea/css-1.6.2/images/facts/CONL.png
+++ b/themes/xenea/css-1.7.0/images/facts/CONL.png
diff --git a/themes/xenea/css-1.6.2/images/facts/DEAT.png b/themes/xenea/css-1.7.0/images/facts/DEAT.png
index 494e1cd2cd..494e1cd2cd 100644
--- a/themes/xenea/css-1.6.2/images/facts/DEAT.png
+++ b/themes/xenea/css-1.7.0/images/facts/DEAT.png
diff --git a/themes/xenea/css-1.6.2/images/facts/DIV.png b/themes/xenea/css-1.7.0/images/facts/DIV.png
index 541534dd39..541534dd39 100644
--- a/themes/xenea/css-1.6.2/images/facts/DIV.png
+++ b/themes/xenea/css-1.7.0/images/facts/DIV.png
diff --git a/themes/xenea/css-1.6.2/images/facts/DIVF.png b/themes/xenea/css-1.7.0/images/facts/DIVF.png
index 6c30ad24e6..6c30ad24e6 100644
--- a/themes/xenea/css-1.6.2/images/facts/DIVF.png
+++ b/themes/xenea/css-1.7.0/images/facts/DIVF.png
diff --git a/themes/xenea/css-1.6.2/images/facts/EMAIL.png b/themes/xenea/css-1.7.0/images/facts/EMAIL.png
index fcfd43b0e9..fcfd43b0e9 100644
--- a/themes/xenea/css-1.6.2/images/facts/EMAIL.png
+++ b/themes/xenea/css-1.7.0/images/facts/EMAIL.png
diff --git a/themes/xenea/css-1.6.2/images/facts/EMIG.png b/themes/xenea/css-1.7.0/images/facts/EMIG.png
index b989395431..b989395431 100644
--- a/themes/xenea/css-1.6.2/images/facts/EMIG.png
+++ b/themes/xenea/css-1.7.0/images/facts/EMIG.png
diff --git a/themes/xenea/css-1.6.2/images/facts/ENGA.png b/themes/xenea/css-1.7.0/images/facts/ENGA.png
index 8d455e5ea3..8d455e5ea3 100644
--- a/themes/xenea/css-1.6.2/images/facts/ENGA.png
+++ b/themes/xenea/css-1.7.0/images/facts/ENGA.png
diff --git a/themes/xenea/css-1.6.2/images/facts/EVEN.png b/themes/xenea/css-1.7.0/images/facts/EVEN.png
index e2510a3c58..e2510a3c58 100644
--- a/themes/xenea/css-1.6.2/images/facts/EVEN.png
+++ b/themes/xenea/css-1.7.0/images/facts/EVEN.png
diff --git a/themes/xenea/css-1.6.2/images/facts/FACT.png b/themes/xenea/css-1.7.0/images/facts/FACT.png
index 8f857a8cfb..8f857a8cfb 100644
--- a/themes/xenea/css-1.6.2/images/facts/FACT.png
+++ b/themes/xenea/css-1.7.0/images/facts/FACT.png
diff --git a/themes/xenea/css-1.6.2/images/facts/IMMI.png b/themes/xenea/css-1.7.0/images/facts/IMMI.png
index eee3119f65..eee3119f65 100644
--- a/themes/xenea/css-1.6.2/images/facts/IMMI.png
+++ b/themes/xenea/css-1.7.0/images/facts/IMMI.png
diff --git a/themes/xenea/css-1.6.2/images/facts/MARB.png b/themes/xenea/css-1.7.0/images/facts/MARB.png
index 8d455e5ea3..8d455e5ea3 100644
--- a/themes/xenea/css-1.6.2/images/facts/MARB.png
+++ b/themes/xenea/css-1.7.0/images/facts/MARB.png
diff --git a/themes/xenea/css-1.6.2/images/facts/MARR.png b/themes/xenea/css-1.7.0/images/facts/MARR.png
index f38f0aa05f..f38f0aa05f 100644
--- a/themes/xenea/css-1.6.2/images/facts/MARR.png
+++ b/themes/xenea/css-1.7.0/images/facts/MARR.png
diff --git a/themes/xenea/css-1.6.2/images/facts/NULL.png b/themes/xenea/css-1.7.0/images/facts/NULL.png
index 3836929c72..3836929c72 100644
--- a/themes/xenea/css-1.6.2/images/facts/NULL.png
+++ b/themes/xenea/css-1.7.0/images/facts/NULL.png
diff --git a/themes/xenea/css-1.6.2/images/facts/OCCU.png b/themes/xenea/css-1.7.0/images/facts/OCCU.png
index 4669d55d59..4669d55d59 100644
--- a/themes/xenea/css-1.6.2/images/facts/OCCU.png
+++ b/themes/xenea/css-1.7.0/images/facts/OCCU.png
diff --git a/themes/xenea/css-1.6.2/images/facts/ORDN.png b/themes/xenea/css-1.7.0/images/facts/ORDN.png
index 99fedb8859..99fedb8859 100644
--- a/themes/xenea/css-1.6.2/images/facts/ORDN.png
+++ b/themes/xenea/css-1.7.0/images/facts/ORDN.png
diff --git a/themes/xenea/css-1.6.2/images/facts/PHON.png b/themes/xenea/css-1.7.0/images/facts/PHON.png
index 526f56bf16..526f56bf16 100644
--- a/themes/xenea/css-1.6.2/images/facts/PHON.png
+++ b/themes/xenea/css-1.7.0/images/facts/PHON.png
diff --git a/themes/xenea/css-1.6.2/images/facts/PROP.png b/themes/xenea/css-1.7.0/images/facts/PROP.png
index 1fc44e530a..1fc44e530a 100644
--- a/themes/xenea/css-1.6.2/images/facts/PROP.png
+++ b/themes/xenea/css-1.7.0/images/facts/PROP.png
diff --git a/themes/xenea/css-1.6.2/images/facts/REFN.png b/themes/xenea/css-1.7.0/images/facts/REFN.png
index 2352261118..2352261118 100644
--- a/themes/xenea/css-1.6.2/images/facts/REFN.png
+++ b/themes/xenea/css-1.7.0/images/facts/REFN.png
diff --git a/themes/xenea/css-1.6.2/images/facts/RESI.png b/themes/xenea/css-1.7.0/images/facts/RESI.png
index 1fc44e530a..1fc44e530a 100644
--- a/themes/xenea/css-1.6.2/images/facts/RESI.png
+++ b/themes/xenea/css-1.7.0/images/facts/RESI.png
diff --git a/themes/xenea/css-1.6.2/images/facts/RFN.png b/themes/xenea/css-1.7.0/images/facts/RFN.png
index 2352261118..2352261118 100644
--- a/themes/xenea/css-1.6.2/images/facts/RFN.png
+++ b/themes/xenea/css-1.7.0/images/facts/RFN.png
diff --git a/themes/xenea/css-1.6.2/images/facts/RIN.png b/themes/xenea/css-1.7.0/images/facts/RIN.png
index 2352261118..2352261118 100644
--- a/themes/xenea/css-1.6.2/images/facts/RIN.png
+++ b/themes/xenea/css-1.7.0/images/facts/RIN.png
diff --git a/themes/xenea/css-1.6.2/images/facts/SLGS.png b/themes/xenea/css-1.7.0/images/facts/SLGS.png
index f38f0aa05f..f38f0aa05f 100644
--- a/themes/xenea/css-1.6.2/images/facts/SLGS.png
+++ b/themes/xenea/css-1.7.0/images/facts/SLGS.png
diff --git a/themes/xenea/css-1.6.2/images/facts/WWW.png b/themes/xenea/css-1.7.0/images/facts/WWW.png
index 0c6fcb695d..0c6fcb695d 100644
--- a/themes/xenea/css-1.6.2/images/facts/WWW.png
+++ b/themes/xenea/css-1.7.0/images/facts/WWW.png
diff --git a/themes/xenea/css-1.6.2/images/facts/_COML.png b/themes/xenea/css-1.7.0/images/facts/_COML.png
index 6c37c0bb34..6c37c0bb34 100644
--- a/themes/xenea/css-1.6.2/images/facts/_COML.png
+++ b/themes/xenea/css-1.7.0/images/facts/_COML.png
diff --git a/themes/xenea/css-1.6.2/images/facts/_MDCL.png b/themes/xenea/css-1.7.0/images/facts/_MDCL.png
index 8ae6b5ec87..8ae6b5ec87 100644
--- a/themes/xenea/css-1.6.2/images/facts/_MDCL.png
+++ b/themes/xenea/css-1.7.0/images/facts/_MDCL.png
diff --git a/themes/xenea/css-1.6.2/images/facts/_MILI.png b/themes/xenea/css-1.7.0/images/facts/_MILI.png
index a6390a1587..a6390a1587 100644
--- a/themes/xenea/css-1.6.2/images/facts/_MILI.png
+++ b/themes/xenea/css-1.7.0/images/facts/_MILI.png
diff --git a/themes/xenea/css-1.6.2/images/facts/_NMAR.png b/themes/xenea/css-1.7.0/images/facts/_NMAR.png
index c3e399c874..c3e399c874 100644
--- a/themes/xenea/css-1.6.2/images/facts/_NMAR.png
+++ b/themes/xenea/css-1.7.0/images/facts/_NMAR.png
diff --git a/themes/xenea/css-1.6.2/images/facts/_NMR.png b/themes/xenea/css-1.7.0/images/facts/_NMR.png
index d1bb9bb5ba..d1bb9bb5ba 100644
--- a/themes/xenea/css-1.6.2/images/facts/_NMR.png
+++ b/themes/xenea/css-1.7.0/images/facts/_NMR.png
diff --git a/themes/xenea/css-1.6.2/images/facts/_SEPR.png b/themes/xenea/css-1.7.0/images/facts/_SEPR.png
index 349660749a..349660749a 100644
--- a/themes/xenea/css-1.6.2/images/facts/_SEPR.png
+++ b/themes/xenea/css-1.7.0/images/facts/_SEPR.png
diff --git a/themes/xenea/css-1.6.2/images/facts/_TODO.png b/themes/xenea/css-1.7.0/images/facts/_TODO.png
index 7db90e69c1..7db90e69c1 100644
--- a/themes/xenea/css-1.6.2/images/facts/_TODO.png
+++ b/themes/xenea/css-1.7.0/images/facts/_TODO.png
diff --git a/themes/xenea/css-1.6.2/images/facts/_UID.png b/themes/xenea/css-1.7.0/images/facts/_UID.png
index 2352261118..2352261118 100644
--- a/themes/xenea/css-1.6.2/images/facts/_UID.png
+++ b/themes/xenea/css-1.7.0/images/facts/_UID.png
diff --git a/themes/xenea/css-1.6.2/images/fambook.png b/themes/xenea/css-1.7.0/images/fambook.png
index 810da065fa..810da065fa 100644
--- a/themes/xenea/css-1.6.2/images/fambook.png
+++ b/themes/xenea/css-1.7.0/images/fambook.png
diff --git a/themes/xenea/css-1.6.2/images/googlemaps.png b/themes/xenea/css-1.7.0/images/googlemaps.png
index 12ab0c14d5..12ab0c14d5 100644
--- a/themes/xenea/css-1.6.2/images/googlemaps.png
+++ b/themes/xenea/css-1.7.0/images/googlemaps.png
diff --git a/themes/xenea/css-1.6.2/images/help.png b/themes/xenea/css-1.7.0/images/help.png
index 40bf13a611..40bf13a611 100644
--- a/themes/xenea/css-1.6.2/images/help.png
+++ b/themes/xenea/css-1.7.0/images/help.png
diff --git a/themes/xenea/css-1.6.2/images/hline.png b/themes/xenea/css-1.7.0/images/hline.png
index 922070a492..922070a492 100644
--- a/themes/xenea/css-1.6.2/images/hline.png
+++ b/themes/xenea/css-1.7.0/images/hline.png
diff --git a/themes/xenea/css-1.6.2/images/home.png b/themes/xenea/css-1.7.0/images/home.png
index c7d28a56e4..c7d28a56e4 100644
--- a/themes/xenea/css-1.6.2/images/home.png
+++ b/themes/xenea/css-1.7.0/images/home.png
diff --git a/themes/xenea/css-1.6.2/images/icon-mime-sprite.png b/themes/xenea/css-1.7.0/images/icon-mime-sprite.png
index 8322ae4580..8322ae4580 100644
--- a/themes/xenea/css-1.6.2/images/icon-mime-sprite.png
+++ b/themes/xenea/css-1.7.0/images/icon-mime-sprite.png
diff --git a/themes/xenea/css-1.6.2/images/image_add.png b/themes/xenea/css-1.7.0/images/image_add.png
index ecac61c284..ecac61c284 100644
--- a/themes/xenea/css-1.6.2/images/image_add.png
+++ b/themes/xenea/css-1.7.0/images/image_add.png
diff --git a/themes/xenea/css-1.6.2/images/image_edit.png b/themes/xenea/css-1.7.0/images/image_edit.png
index 3fb8061de2..3fb8061de2 100644
--- a/themes/xenea/css-1.6.2/images/image_edit.png
+++ b/themes/xenea/css-1.7.0/images/image_edit.png
diff --git a/themes/xenea/css-1.6.2/images/image_link.png b/themes/xenea/css-1.7.0/images/image_link.png
index 190b08e7d2..190b08e7d2 100644
--- a/themes/xenea/css-1.6.2/images/image_link.png
+++ b/themes/xenea/css-1.7.0/images/image_link.png
diff --git a/themes/xenea/css-1.6.2/images/image_view.png b/themes/xenea/css-1.7.0/images/image_view.png
index 1e7babae94..1e7babae94 100644
--- a/themes/xenea/css-1.6.2/images/image_view.png
+++ b/themes/xenea/css-1.7.0/images/image_view.png
diff --git a/themes/xenea/css-1.6.2/images/images.png b/themes/xenea/css-1.7.0/images/images.png
index b3854d450a..b3854d450a 100644
--- a/themes/xenea/css-1.6.2/images/images.png
+++ b/themes/xenea/css-1.7.0/images/images.png
diff --git a/themes/xenea/css-1.6.2/images/indi_sprite.png b/themes/xenea/css-1.7.0/images/indi_sprite.png
index 570c6b9013..570c6b9013 100644
--- a/themes/xenea/css-1.6.2/images/indi_sprite.png
+++ b/themes/xenea/css-1.7.0/images/indi_sprite.png
diff --git a/themes/xenea/css-1.6.2/images/indicator.gif b/themes/xenea/css-1.7.0/images/indicator.gif
index 085ccaecaf..085ccaecaf 100644
--- a/themes/xenea/css-1.6.2/images/indicator.gif
+++ b/themes/xenea/css-1.7.0/images/indicator.gif
diff --git a/themes/xenea/css-1.6.2/images/indis.png b/themes/xenea/css-1.7.0/images/indis.png
index 820ff30689..820ff30689 100644
--- a/themes/xenea/css-1.6.2/images/indis.png
+++ b/themes/xenea/css-1.7.0/images/indis.png
diff --git a/themes/xenea/css-1.6.2/images/larrow.png b/themes/xenea/css-1.7.0/images/larrow.png
index 3a2ed913ce..3a2ed913ce 100644
--- a/themes/xenea/css-1.6.2/images/larrow.png
+++ b/themes/xenea/css-1.7.0/images/larrow.png
diff --git a/themes/xenea/css-1.6.2/images/larrow2.png b/themes/xenea/css-1.7.0/images/larrow2.png
index cbb19df3d8..cbb19df3d8 100644
--- a/themes/xenea/css-1.6.2/images/larrow2.png
+++ b/themes/xenea/css-1.7.0/images/larrow2.png
diff --git a/themes/xenea/css-1.6.2/images/ldarrow.png b/themes/xenea/css-1.7.0/images/ldarrow.png
index 944c397fde..944c397fde 100644
--- a/themes/xenea/css-1.6.2/images/ldarrow.png
+++ b/themes/xenea/css-1.7.0/images/ldarrow.png
diff --git a/themes/xenea/css-1.7.0/images/ldarrow2.png b/themes/xenea/css-1.7.0/images/ldarrow2.png
new file mode 100644
index 0000000000..01aa226c75
--- /dev/null
+++ b/themes/xenea/css-1.7.0/images/ldarrow2.png
diff --git a/themes/xenea/css-1.6.2/images/lifespan-chunk.png b/themes/xenea/css-1.7.0/images/lifespan-chunk.png
index 493ce7e39f..493ce7e39f 100644
--- a/themes/xenea/css-1.6.2/images/lifespan-chunk.png
+++ b/themes/xenea/css-1.7.0/images/lifespan-chunk.png
diff --git a/themes/xenea/css-1.6.2/images/lifespan-down.png b/themes/xenea/css-1.7.0/images/lifespan-down.png
index 5d9d01e89b..5d9d01e89b 100644
--- a/themes/xenea/css-1.6.2/images/lifespan-down.png
+++ b/themes/xenea/css-1.7.0/images/lifespan-down.png
diff --git a/themes/xenea/css-1.6.2/images/lifespan-left.png b/themes/xenea/css-1.7.0/images/lifespan-left.png
index 64bfbe7fc2..64bfbe7fc2 100644
--- a/themes/xenea/css-1.6.2/images/lifespan-left.png
+++ b/themes/xenea/css-1.7.0/images/lifespan-left.png
diff --git a/themes/xenea/css-1.6.2/images/lifespan-right.png b/themes/xenea/css-1.7.0/images/lifespan-right.png
index fbdb784be9..fbdb784be9 100644
--- a/themes/xenea/css-1.6.2/images/lifespan-right.png
+++ b/themes/xenea/css-1.7.0/images/lifespan-right.png
diff --git a/themes/xenea/css-1.6.2/images/lifespan-up.png b/themes/xenea/css-1.7.0/images/lifespan-up.png
index 287b46d2e8..287b46d2e8 100644
--- a/themes/xenea/css-1.6.2/images/lifespan-up.png
+++ b/themes/xenea/css-1.7.0/images/lifespan-up.png
diff --git a/themes/xenea/css-1.6.2/images/lists.png b/themes/xenea/css-1.7.0/images/lists.png
index fe2d8123ed..fe2d8123ed 100644
--- a/themes/xenea/css-1.6.2/images/lists.png
+++ b/themes/xenea/css-1.7.0/images/lists.png
diff --git a/themes/xenea/css-1.6.2/images/loading.gif b/themes/xenea/css-1.7.0/images/loading.gif
index 5bb90fd6a4..5bb90fd6a4 100644
--- a/themes/xenea/css-1.6.2/images/loading.gif
+++ b/themes/xenea/css-1.7.0/images/loading.gif
diff --git a/themes/xenea/css-1.6.2/images/mapquest.png b/themes/xenea/css-1.7.0/images/mapquest.png
index c62ccd1e52..c62ccd1e52 100644
--- a/themes/xenea/css-1.6.2/images/mapquest.png
+++ b/themes/xenea/css-1.7.0/images/mapquest.png
diff --git a/themes/xenea/css-1.6.2/images/media.png b/themes/xenea/css-1.7.0/images/media.png
index 20ce2aeea8..20ce2aeea8 100644
--- a/themes/xenea/css-1.6.2/images/media.png
+++ b/themes/xenea/css-1.7.0/images/media.png
diff --git a/themes/xenea/css-1.6.2/images/minus.png b/themes/xenea/css-1.7.0/images/minus.png
index 8ed68808da..8ed68808da 100644
--- a/themes/xenea/css-1.6.2/images/minus.png
+++ b/themes/xenea/css-1.7.0/images/minus.png
diff --git a/themes/xenea/css-1.6.2/images/mypage.png b/themes/xenea/css-1.7.0/images/mypage.png
index 24621d43d5..24621d43d5 100644
--- a/themes/xenea/css-1.6.2/images/mypage.png
+++ b/themes/xenea/css-1.7.0/images/mypage.png
diff --git a/themes/xenea/css-1.6.2/images/notes.png b/themes/xenea/css-1.7.0/images/notes.png
index 8f2395f006..8f2395f006 100644
--- a/themes/xenea/css-1.6.2/images/notes.png
+++ b/themes/xenea/css-1.7.0/images/notes.png
diff --git a/themes/xenea/css-1.6.2/images/osm.png b/themes/xenea/css-1.7.0/images/osm.png
index 899e2a58b6..899e2a58b6 100644
--- a/themes/xenea/css-1.6.2/images/osm.png
+++ b/themes/xenea/css-1.7.0/images/osm.png
diff --git a/themes/xenea/css-1.6.2/images/patriarch.png b/themes/xenea/css-1.7.0/images/patriarch.png
index 2e6731daf8..2e6731daf8 100644
--- a/themes/xenea/css-1.6.2/images/patriarch.png
+++ b/themes/xenea/css-1.7.0/images/patriarch.png
diff --git a/themes/xenea/css-1.6.2/images/pedigree.png b/themes/xenea/css-1.7.0/images/pedigree.png
index df97fdb5f5..df97fdb5f5 100644
--- a/themes/xenea/css-1.6.2/images/pedigree.png
+++ b/themes/xenea/css-1.7.0/images/pedigree.png
diff --git a/themes/xenea/css-1.6.2/images/place.png b/themes/xenea/css-1.7.0/images/place.png
index caf0792516..caf0792516 100644
--- a/themes/xenea/css-1.6.2/images/place.png
+++ b/themes/xenea/css-1.7.0/images/place.png
diff --git a/themes/xenea/css-1.6.2/images/plus.png b/themes/xenea/css-1.7.0/images/plus.png
index 64e15fc9f3..64e15fc9f3 100644
--- a/themes/xenea/css-1.6.2/images/plus.png
+++ b/themes/xenea/css-1.7.0/images/plus.png
diff --git a/themes/xenea/css-1.7.0/images/powered-by-webtrees.png b/themes/xenea/css-1.7.0/images/powered-by-webtrees.png
new file mode 100644
index 0000000000..6a5cf0fb3e
--- /dev/null
+++ b/themes/xenea/css-1.7.0/images/powered-by-webtrees.png
diff --git a/themes/xenea/css-1.6.2/images/rarrow.png b/themes/xenea/css-1.7.0/images/rarrow.png
index fe1f6a9fa3..fe1f6a9fa3 100644
--- a/themes/xenea/css-1.6.2/images/rarrow.png
+++ b/themes/xenea/css-1.7.0/images/rarrow.png
diff --git a/themes/xenea/css-1.6.2/images/rarrow2.png b/themes/xenea/css-1.7.0/images/rarrow2.png
index 7a747874e2..7a747874e2 100644
--- a/themes/xenea/css-1.6.2/images/rarrow2.png
+++ b/themes/xenea/css-1.7.0/images/rarrow2.png
diff --git a/themes/xenea/css-1.6.2/images/rdarrow.png b/themes/xenea/css-1.7.0/images/rdarrow.png
index 3b1dd7781a..3b1dd7781a 100644
--- a/themes/xenea/css-1.6.2/images/rdarrow.png
+++ b/themes/xenea/css-1.7.0/images/rdarrow.png
diff --git a/themes/xenea/css-1.7.0/images/rdarrow2.png b/themes/xenea/css-1.7.0/images/rdarrow2.png
new file mode 100644
index 0000000000..88bd528dd7
--- /dev/null
+++ b/themes/xenea/css-1.7.0/images/rdarrow2.png
diff --git a/themes/xenea/css-1.6.2/images/readme.txt b/themes/xenea/css-1.7.0/images/readme.txt
index f0e0f12bcb..f0e0f12bcb 100644
--- a/themes/xenea/css-1.6.2/images/readme.txt
+++ b/themes/xenea/css-1.7.0/images/readme.txt
diff --git a/themes/xenea/css-1.6.2/images/reminder.png b/themes/xenea/css-1.7.0/images/reminder.png
index fa5bbcf507..fa5bbcf507 100644
--- a/themes/xenea/css-1.6.2/images/reminder.png
+++ b/themes/xenea/css-1.7.0/images/reminder.png
diff --git a/themes/xenea/css-1.6.2/images/reorder.png b/themes/xenea/css-1.7.0/images/reorder.png
index 2cfe889ad1..2cfe889ad1 100644
--- a/themes/xenea/css-1.6.2/images/reorder.png
+++ b/themes/xenea/css-1.7.0/images/reorder.png
diff --git a/themes/xenea/css-1.6.2/images/repository.png b/themes/xenea/css-1.7.0/images/repository.png
index 7b569c7bde..7b569c7bde 100644
--- a/themes/xenea/css-1.6.2/images/repository.png
+++ b/themes/xenea/css-1.7.0/images/repository.png
diff --git a/themes/xenea/css-1.6.2/images/resn_confidential.png b/themes/xenea/css-1.7.0/images/resn_confidential.png
index 4e5449b25a..4e5449b25a 100644
--- a/themes/xenea/css-1.6.2/images/resn_confidential.png
+++ b/themes/xenea/css-1.7.0/images/resn_confidential.png
diff --git a/themes/xenea/css-1.6.2/images/resn_locked.png b/themes/xenea/css-1.7.0/images/resn_locked.png
index 43fa09b350..43fa09b350 100644
--- a/themes/xenea/css-1.6.2/images/resn_locked.png
+++ b/themes/xenea/css-1.7.0/images/resn_locked.png
diff --git a/themes/xenea/css-1.6.2/images/resn_none.png b/themes/xenea/css-1.7.0/images/resn_none.png
index 62c4030e9b..62c4030e9b 100644
--- a/themes/xenea/css-1.6.2/images/resn_none.png
+++ b/themes/xenea/css-1.7.0/images/resn_none.png
diff --git a/themes/xenea/css-1.6.2/images/resn_privacy.png b/themes/xenea/css-1.7.0/images/resn_privacy.png
index ca462fd84d..ca462fd84d 100644
--- a/themes/xenea/css-1.6.2/images/resn_privacy.png
+++ b/themes/xenea/css-1.7.0/images/resn_privacy.png
diff --git a/themes/xenea/css-1.6.2/images/rings.png b/themes/xenea/css-1.7.0/images/rings.png
index 698927d4b8..698927d4b8 100644
--- a/themes/xenea/css-1.6.2/images/rings.png
+++ b/themes/xenea/css-1.7.0/images/rings.png
diff --git a/themes/xenea/css-1.6.2/images/search.png b/themes/xenea/css-1.7.0/images/search.png
index 36f3426d28..36f3426d28 100644
--- a/themes/xenea/css-1.6.2/images/search.png
+++ b/themes/xenea/css-1.7.0/images/search.png
diff --git a/themes/xenea/css-1.6.2/images/selected.png b/themes/xenea/css-1.7.0/images/selected.png
index 4dad33445e..4dad33445e 100644
--- a/themes/xenea/css-1.6.2/images/selected.png
+++ b/themes/xenea/css-1.7.0/images/selected.png
diff --git a/themes/xenea/css-1.6.2/images/sex_f_15x15.png b/themes/xenea/css-1.7.0/images/sex_f_15x15.png
index 2d3abae32a..2d3abae32a 100644
--- a/themes/xenea/css-1.6.2/images/sex_f_15x15.png
+++ b/themes/xenea/css-1.7.0/images/sex_f_15x15.png
diff --git a/themes/xenea/css-1.6.2/images/sex_f_9x9.png b/themes/xenea/css-1.7.0/images/sex_f_9x9.png
index e35e46ccd4..e35e46ccd4 100644
--- a/themes/xenea/css-1.6.2/images/sex_f_9x9.png
+++ b/themes/xenea/css-1.7.0/images/sex_f_9x9.png
diff --git a/themes/xenea/css-1.6.2/images/sex_m_15x15.png b/themes/xenea/css-1.7.0/images/sex_m_15x15.png
index 4ac7956421..4ac7956421 100644
--- a/themes/xenea/css-1.6.2/images/sex_m_15x15.png
+++ b/themes/xenea/css-1.7.0/images/sex_m_15x15.png
diff --git a/themes/xenea/css-1.6.2/images/sex_m_9x9.png b/themes/xenea/css-1.7.0/images/sex_m_9x9.png
index 32a8484b1f..32a8484b1f 100644
--- a/themes/xenea/css-1.6.2/images/sex_m_9x9.png
+++ b/themes/xenea/css-1.7.0/images/sex_m_9x9.png
diff --git a/themes/xenea/css-1.6.2/images/sex_u_15x15.png b/themes/xenea/css-1.7.0/images/sex_u_15x15.png
index 158c3f9a10..158c3f9a10 100644
--- a/themes/xenea/css-1.6.2/images/sex_u_15x15.png
+++ b/themes/xenea/css-1.7.0/images/sex_u_15x15.png
diff --git a/themes/xenea/css-1.6.2/images/sex_u_9x9.png b/themes/xenea/css-1.7.0/images/sex_u_9x9.png
index d113a1898c..d113a1898c 100644
--- a/themes/xenea/css-1.6.2/images/sex_u_9x9.png
+++ b/themes/xenea/css-1.7.0/images/sex_u_9x9.png
diff --git a/themes/xenea/css-1.6.2/images/sfamily.png b/themes/xenea/css-1.7.0/images/sfamily.png
index 34047fa973..34047fa973 100644
--- a/themes/xenea/css-1.6.2/images/sfamily.png
+++ b/themes/xenea/css-1.7.0/images/sfamily.png
diff --git a/themes/xenea/css-1.6.2/images/silhouette_female.png b/themes/xenea/css-1.7.0/images/silhouette_female.png
index bb8d503371..bb8d503371 100644
--- a/themes/xenea/css-1.6.2/images/silhouette_female.png
+++ b/themes/xenea/css-1.7.0/images/silhouette_female.png
diff --git a/themes/xenea/css-1.6.2/images/silhouette_female_small.png b/themes/xenea/css-1.7.0/images/silhouette_female_small.png
index ff153f7e5e..ff153f7e5e 100644
--- a/themes/xenea/css-1.6.2/images/silhouette_female_small.png
+++ b/themes/xenea/css-1.7.0/images/silhouette_female_small.png
diff --git a/themes/xenea/css-1.6.2/images/silhouette_male.png b/themes/xenea/css-1.7.0/images/silhouette_male.png
index 0615900224..0615900224 100644
--- a/themes/xenea/css-1.6.2/images/silhouette_male.png
+++ b/themes/xenea/css-1.7.0/images/silhouette_male.png
diff --git a/themes/xenea/css-1.6.2/images/silhouette_male_small.png b/themes/xenea/css-1.7.0/images/silhouette_male_small.png
index 6c7c175c76..6c7c175c76 100644
--- a/themes/xenea/css-1.6.2/images/silhouette_male_small.png
+++ b/themes/xenea/css-1.7.0/images/silhouette_male_small.png
diff --git a/themes/xenea/css-1.6.2/images/silhouette_unknown.png b/themes/xenea/css-1.7.0/images/silhouette_unknown.png
index d0417439ee..d0417439ee 100644
--- a/themes/xenea/css-1.6.2/images/silhouette_unknown.png
+++ b/themes/xenea/css-1.7.0/images/silhouette_unknown.png
diff --git a/themes/xenea/css-1.6.2/images/silhouette_unknown_small.png b/themes/xenea/css-1.7.0/images/silhouette_unknown_small.png
index 9602cffaa0..9602cffaa0 100644
--- a/themes/xenea/css-1.6.2/images/silhouette_unknown_small.png
+++ b/themes/xenea/css-1.7.0/images/silhouette_unknown_small.png
diff --git a/themes/xenea/css-1.6.2/images/sombra.png b/themes/xenea/css-1.7.0/images/sombra.png
index 44bb5ec2a7..44bb5ec2a7 100644
--- a/themes/xenea/css-1.6.2/images/sombra.png
+++ b/themes/xenea/css-1.7.0/images/sombra.png
diff --git a/themes/xenea/css-1.6.2/images/source.png b/themes/xenea/css-1.7.0/images/source.png
index 4704b29cdc..4704b29cdc 100644
--- a/themes/xenea/css-1.6.2/images/source.png
+++ b/themes/xenea/css-1.7.0/images/source.png
diff --git a/themes/xenea/css-1.6.2/images/spacer.png b/themes/xenea/css-1.7.0/images/spacer.png
index a31b396979..a31b396979 100644
--- a/themes/xenea/css-1.6.2/images/spacer.png
+++ b/themes/xenea/css-1.7.0/images/spacer.png
diff --git a/themes/xenea/css-1.6.2/images/sprites-sub-menu.png b/themes/xenea/css-1.7.0/images/sprites-sub-menu.png
index e25285c1b7..e25285c1b7 100644
--- a/themes/xenea/css-1.6.2/images/sprites-sub-menu.png
+++ b/themes/xenea/css-1.7.0/images/sprites-sub-menu.png
diff --git a/themes/xenea/css-1.6.2/images/sprites-top-menu.png b/themes/xenea/css-1.7.0/images/sprites-top-menu.png
index b9a0380f3d..b9a0380f3d 100644
--- a/themes/xenea/css-1.6.2/images/sprites-top-menu.png
+++ b/themes/xenea/css-1.7.0/images/sprites-top-menu.png
diff --git a/themes/xenea/css-1.6.2/images/stop.png b/themes/xenea/css-1.7.0/images/stop.png
index c39360cfda..c39360cfda 100644
--- a/themes/xenea/css-1.6.2/images/stop.png
+++ b/themes/xenea/css-1.7.0/images/stop.png
diff --git a/themes/xenea/css-1.6.2/images/tree.png b/themes/xenea/css-1.7.0/images/tree.png
index 1abac01166..1abac01166 100644
--- a/themes/xenea/css-1.6.2/images/tree.png
+++ b/themes/xenea/css-1.7.0/images/tree.png
diff --git a/themes/xenea/css-1.6.2/images/uarrow.png b/themes/xenea/css-1.7.0/images/uarrow.png
index 0c6c2ed3f8..0c6c2ed3f8 100644
--- a/themes/xenea/css-1.6.2/images/uarrow.png
+++ b/themes/xenea/css-1.7.0/images/uarrow.png
diff --git a/themes/xenea/css-1.6.2/images/uarrow2.png b/themes/xenea/css-1.7.0/images/uarrow2.png
index 60b7ccc53e..60b7ccc53e 100644
--- a/themes/xenea/css-1.6.2/images/uarrow2.png
+++ b/themes/xenea/css-1.7.0/images/uarrow2.png
diff --git a/themes/xenea/css-1.6.2/images/udarrow.png b/themes/xenea/css-1.7.0/images/udarrow.png
index 3a0947697d..3a0947697d 100644
--- a/themes/xenea/css-1.6.2/images/udarrow.png
+++ b/themes/xenea/css-1.7.0/images/udarrow.png
diff --git a/themes/xenea/css-1.6.2/images/user_add.png b/themes/xenea/css-1.7.0/images/user_add.png
index 9865fcd247..9865fcd247 100644
--- a/themes/xenea/css-1.6.2/images/user_add.png
+++ b/themes/xenea/css-1.7.0/images/user_add.png
diff --git a/themes/xenea/css-1.6.2/images/vline.png b/themes/xenea/css-1.7.0/images/vline.png
index b00ff9ea3e..b00ff9ea3e 100644
--- a/themes/xenea/css-1.6.2/images/vline.png
+++ b/themes/xenea/css-1.7.0/images/vline.png
diff --git a/themes/xenea/css-1.6.2/images/w_button.png b/themes/xenea/css-1.7.0/images/w_button.png
index 31af28a377..31af28a377 100644
--- a/themes/xenea/css-1.6.2/images/w_button.png
+++ b/themes/xenea/css-1.7.0/images/w_button.png
diff --git a/themes/xenea/css-1.6.2/images/warning.png b/themes/xenea/css-1.7.0/images/warning.png
index d484c33341..d484c33341 100644
--- a/themes/xenea/css-1.6.2/images/warning.png
+++ b/themes/xenea/css-1.7.0/images/warning.png
diff --git a/themes/xenea/css-1.6.2/images/zoomin.png b/themes/xenea/css-1.7.0/images/zoomin.png
index b40b34c4e5..b40b34c4e5 100644
--- a/themes/xenea/css-1.6.2/images/zoomin.png
+++ b/themes/xenea/css-1.7.0/images/zoomin.png
diff --git a/themes/xenea/css-1.6.2/images/zoomout.png b/themes/xenea/css-1.7.0/images/zoomout.png
index ce56e5042c..ce56e5042c 100644
--- a/themes/xenea/css-1.6.2/images/zoomout.png
+++ b/themes/xenea/css-1.7.0/images/zoomout.png
diff --git a/themes/xenea/css-1.6.2/style.css b/themes/xenea/css-1.7.0/style.css
index 04c8076220..4a0c18f620 100644
--- a/themes/xenea/css-1.6.2/style.css
+++ b/themes/xenea/css-1.7.0/style.css
@@ -5,7 +5,9 @@
 * Copyright (C) 2014 webtrees development team.
 *
 * Derived from PhpGedView
-* Copyright (C) 2002 to 2010 PGV Development Team.
+* Copyright (C) 2002 to 2009 PGV Development Team.
+*
+* Mime-type icons from http://gnome-look.org, published under GPL (v2)
 *
 * 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
@@ -22,6 +24,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+/* ======== Globals ========== */
+
 /* Add a permanent scrollbar, to prevent "flickering" when hover effects lengthen page */
 html {
 	overflow-y: scroll;
@@ -36,32 +40,30 @@ body {
 
 main {
 	display: block;
+	clear: both;
 }
 
-a {
-	color: #00f;
-	text-decoration: none;
+#content #home-page {
+    margin-left: 5px;
 }
 
-a:hover {
-	color: #f00;
-	text-decoration: none;
+#content h2 {
+	margin-left: 10px;
 }
 
-a.link:link,
-a.link:active,
-a.link:visited {
-	color: #fff;
-	font-weight: bold;
+[dir=rtl] #content #home-page {
+    margin-right: 5px;
 }
 
-a.link:hover {
-	color: #336;
-	font-weight: bold;
+[dir=rtl] #content h2 {
+	margin-right: 10px;
 }
 
-:focus {
-	outline-style: none;
+/* ====== Round Corners ======== */
+
+/* ios on click workaround */
+.iconz {
+	cursor: pointer;
 }
 
 input:required:valid,
@@ -81,1062 +83,105 @@ textarea:required:invalid {
 	background-position: left top;
 }
 
-/* Header Layout */
-#header {
-	height: 40px;
-	background: #039 url(images/cabeza.png) left top;
-}
-
-header h1 {
-	display: block;
-	float: left;
-	margin: 10px 12px;
-	font-size: 24px;
-	font-weight: normal;
-}
-
-[dir=rtl] header h1 {
-	float: right;
-}
-
-.hsearch {
-	display: block;
-	float: right;
-	margin-top: 10px;
-	margin-right: 5px;
-}
-
-/* LTR to RTL Translation */
-[dir=rtl] #header {
-	background: url(images/cabeza_rtl.png) right top;
-}
-
-[dir=rtl] .hsearch {
-	float: left;
-	padding-left: 10px;
+a {
+	color: #00f;
+	text-decoration: none;
 }
 
-#bodydiv .title {
-	margin: 0;
+a:hover {
+	color: #f00;
+	text-decoration: none;
 }
 
-#header {
-	color: #fff;
+:focus {
+	outline-style: none;
 }
 
 #flash-messages {
 	clear: both;
 }
 
-/* Set stack level for top two header menu rows */
-.makeMenu ul,
-#main-menu ul {
-	z-index: 210;
+dl {
+	margin: 0;
 }
 
-/* Options Menu Layout */
-#header-user-links {
-	background: #84beff url(images/barra.png);
-	width: 100%;
-	color: #fff;
+dt {
+	float: left;
 	font-weight: bold;
-	font-size: 11px;
-	height: 40px;
-	position: relative;
-}
-
-#theme-menu {
-	position: absolute;
-	margin-left: 10px;
-	margin-top: 5px;
-}
-
-#fav-menu {
-	position: absolute;
-	left: 80px;
-	top: 5px;
-}
-
-#login-menu {
-	position: absolute;
-	left: 50%;
-	top: 15px;
-}
-
-#lang-menu {
-	float: right;
 	margin-right: 10px;
-	margin-top: 5px;
-	text-align: right;
-}
-
-#lang-menu .makeMenu li ul {
-	left: auto;
-	right: 0;
 }
 
-.lang-active,
-.theme-active {
-	color: #006;
-	font-weight: 900;
-}
-
-/* LTR to RTL Translation */
-[dir=rtl] #theme-menu {
-	position: absolute;
-	margin-right: 10px;
-}
-
-[dir=rtl] #fav-menu {
-	position: absolute;
-	right: 80px;
-}
-
-[dir=rtl] #login-menu {
-	position: absolute;
-	left: auto;
-	right: 50%;
-}
-
-[dir=rtl] #lang-menu {
-	float: left;
+[dir=rtl] dt {
+	float: right;
+	margin-right: auto;
 	margin-left: 10px;
-	text-align: left;
-}
-
-[dir=rtl] #lang-menu .makeMenu li ul {
-	right: auto;
-	left: 0;
-}
-
-.makeMenu li {
-	display: inline;
-	position: relative;
-	white-space: nowrap;
 }
 
-.makeMenu a {
-	color: #fff;
+h2 {
+	color: #006;
+	font-size: 18px;
 	font-weight: bold;
 }
 
-.makeMenu a:hover {
-	color: #f00;
-}
-
-.makeMenu li ul {
-	display: none;
-	position: absolute;
-	left: 0;
-	right: auto;
-	top: 1.1em;
-	background-color: #fff;
-	border: thin solid #c3dfff;
-}
-
-.makeMenu li ul li {
-	padding: 2px;
-	display: block;
-	text-align: left;
-}
-
-.makeMenu li ul li a {
-	color: #000;
-	font-weight: normal;
-}
-
-.makeMenu li ul li a:hover {
-	color: #f00;;
-}
-
-.makeMenu,
-.makeMenu li ul {
-	list-style: none;
-	margin: 0;
-	padding: 1px;
-}
-
-.makeMenu li:hover > ul {
-	display: block;
-}
-
-.makeMenu li ul li a.lang-active,
-.makeMenu li ul li a.theme-active {
+h4 {
 	color: #006;
-	font-weight: 900;
-}
-
-[dir=rtl] li ul li {
-	text-align: right;
-}
-
-[dir=rtl] .makeMenu li ul {
-	left: auto;
-	right: 0;
-}
-
-[dir=rtl] .makeMenu li ul li {
-	text-align: right !important;
-}
-
-[dir=rtl] #extra-menu {
-	text-align: left;
-}
-
-[dir=rtl] #extra-menu.makeMenu li ul {
-	left: 0;
-	right: auto;
-}
-
-/* ======= Main menu items ========== */
-header nav {
-	border-bottom: 2px solid #0073cf;
-	float: left;
-	height: 40px;
-	margin-bottom: 14px;
-	padding: 10px 0;
-	position: relative;
-	width: 100%;
-	clear: both;
-}
-
-#main-menu {
-	margin: 0 auto;
-	display: table;
-}
-
-#main-menu,
-#main-menu ul {
-	padding: 0;
-	list-style-type: none;
+	font-size: 12px;
+	font-weight: bold;
 }
 
-#main-menu li {
-	float: left;
-	position: relative;
+th {
+	font-weight: 100;
 }
 
-#main-menu li li {
-	clear: both;
+ul {
+	padding-left: 15px;
+	padding-right: 15px;
+	margin: 8px;
 }
 
-#main-menu li:hover > ul {
-	display: block;
-	position: absolute;
-	top: 0;
-	left: 100%;
-	right: auto;
-	margin-top: 0;
+img {
+	border: 0;
 }
 
-#main-menu > li:hover > ul {
-	left: 0;
-	right: auto;
-	top: 42px;
+legend img {
+	height: 20px;
+	vertical-align: middle;
+	width: 20px;
 }
 
-#main-menu a {
-	display: block;
-	white-space: nowrap;
-	overflow: hidden;
+img.block,
+#mycart img {
+	border: 0;
+	height: 25px;
+	vertical-align: middle;
 }
 
-#main-menu ul {
-	position: absolute;
-	display: none;
-	background: #fff;
-	border: thin solid #aaa;
-	padding: 0;
+input,
+button,
+textarea {
+	border-width: 1px;
+	border-color: #fff #555 #555 #fff;
+	font-size: 12px;
 }
 
-#main-menu li a {
-	margin: auto;
-	padding-top: 22px;
-	width: 100%;
+input,
+textarea {
+	padding: 0 3px;
 }
 
-#main-menu li li a {
-	display: block;
-	position: relative;
-	float: left;
-	font-size: 11px;
-	line-height: 1.5;
-	padding: 0 10px 1px 5px;
+textarea {
+	border-style: inset;
 }
 
-/* Menu icons */
-#main-menu > li {
-	background-image: url(images/sprites-top-menu.png);
-	background-repeat: no-repeat;
-	width: 80px;
+.topbottombar {
+	background-color: #c3dfff;
+	color: #fff;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 4px;
 	text-align: center;
-	height: 28px;
-	line-height: 28px;
-	text-indent: 0;
-}
-
-#main-menu li li {
-	background-image: url(images/sprites-sub-menu.png);
-	background-repeat: no-repeat;
-	height: 23px;
-	left: auto;
-	line-height: 23px;
-	text-align: left;
-	text-indent: 26px;
-	width: 100%;
-}
-
-/* Reverse left and right on RTL pages */
-[dir=rtl] #main-menu li {
-	float: right;
-}
-
-[dir=rtl] #main-menu li:hover > ul {
-	right: 100%;
-	left: auto;
-}
-
-[dir=rtl] #main-menu > li:hover > ul {
-	left: auto;
-	right: 0;
-}
-
-[dir=rtl] #main-menu li li {
-	text-align: right;
-}
-
-[dir=rtl] #main-menu li li a {
-	float: right;
-	padding: 1px 5px 1px 10px;
-}
-
-/********************Menu Top Row Icons **********************/
-
-#menu-tree {
-	background-position: center -0px;
-}
-
-#menu-chart {
-	background-position: center -29px;
-}
-
-#menu-list {
-	background-position: center -58px;
-}
-
-#menu-calendar {
-	background-position: center -87px;
-}
-
-#menu-report {
-	background-position: center -116px;
-}
-
-#menu-search {
-	background-position: center -145px;
-}
-
-#menu-help {
-	background-position: center -174px;
 }
 
-#menu-mymenu {
-	background-position: center -203px;
-}
-
-#menu-clippings {
-	background-position: center -232px;
-}
-
-#menu-indi {
-	background-position: center -261px;
-}
-
-#menu-sour {
-	background-position: center -319px;
-}
-
-#menu-fam {
-	background-position: center -290px;
-}
-
-#menu-note {
-	background-position: center -348px;
-}
-
-#menu-obje {
-	background-position: center -377px;
-}
-
-#menu-repo {
-	background-position: center -406px;
-}
-
-#menu-story {
-	background-position: center -435px;
-}
-
-/*******************Menu submenu Icons**********************/
-/* Chart Icons */
-#menu-chart-ancestry {
-	background-position: left -0px;
-}
-
-[dir=rtl] #menu-chart-ancestry {
-	background-position: right -0px;
-}
-
-#menu-chart-fanchart {
-	background-position: left -23px;
-}
-
-[dir=rtl] #menu-chart-fanchart {
-	background-position: right -23px;
-}
-
-#menu-chart-compact {
-	background-position: left -46px;
-}
-
-[dir=rtl] #menu-chart-compact {
-	background-position: right -46px;
-}
-
-#menu-chart-descendancy {
-	background-position: left -69px;
-}
-
-[dir=rtl] #menu-chart-descendancy {
-	background-position: right -69px;
-}
-
-#menu-chart-familybook {
-	background-position: left -92px;
-}
-
-[dir=rtl] #menu-chart-familybook {
-	background-position: right -92px;
-}
-
-#menu-chart-hourglass {
-	background-position: left -115px;
-}
-
-[dir=rtl] #menu-chart-hourglass {
-	background-position: right -115px;
-}
-
-#menu-chart-tree {
-	background-position: left -138px;
-}
-
-[dir=rtl] #menu-chart-tree {
-	background-position: right -138px;
-}
-
-#menu-chart-lifespan {
-	background-position: left -161px;
-}
-
-[dir=rtl] #menu-chart-lifespan {
-	background-position: right -161px;
-}
-
-#menu-chart-pedigree {
-	background-position: left -184px;
-}
-
-[dir=rtl] #menu-chart-pedigree {
-	background-position: right -184px;
-}
-
-#menu-chart-pedigree_map {
-	background-position: left -207px;
-}
-
-[dir=rtl] #menu-chart-pedigree_map {
-	background-position: right -207px;
-}
-
-#menu-chart-relationship {
-	background-position: left -230px;
-}
-
-[dir=rtl] #menu-chart-relationship {
-	background-position: right -230px;
-}
-
-#menu-chart-relationship li {
-	background-position: left -230px;
-}
-
-[dir=rtl] #menu-chart-relationship li {
-	background-position: right -230px;
-}
-
-#menu-chart-statistics {
-	background-position: left -253px;
-}
-
-[dir=rtl] #menu-chart-statistics {
-	background-position: right -253px;
-}
-
-#menu-chart-timeline {
-	background-position: left -276px;
-}
-
-[dir=rtl] #menu-chart-timeline {
-	background-position: right -276px;
-}
-
-#menu-chart-timeline li {
-	background-position: left -276px;
-}
-
-[dir=rtl] #menu-chart-timeline li {
-	background-position: right -276px;
-}
-
-/* Lists Icons */
-#menu-list-obje {
-	background-position: left -299px;
-}
-
-[dir=rtl] #menu-list-obje {
-	background-position: right -299px;
-}
-
-#menu-list-plac {
-	background-position: left -322px;
-}
-
-[dir=rtl] #menu-list-plac {
-	background-position: right -322px;
-}
-
-#menu-list-repo {
-	background-position: left -345px;
-}
-
-[dir=rtl] #menu-list-repo {
-	background-position: right -345px;
-}
-
-#menu-list-note {
-	background-position: left -368px;
-}
-
-[dir=rtl] #menu-list-note {
-	background-position: right -368px;
-}
-
-#menu-list-sour {
-	background-position: left -391px;
-}
-
-[dir=rtl] #menu-list-sour {
-	background-position: right -391px;
-}
-
-#menu-branches {
-	background-position: left -414px;
-}
-
-[dir=rtl] #menu-branches {
-	background-position: right -414px;
-}
-
-#menu-list-fam {
-	background-position: left -437px;
-}
-
-[dir=rtl] #menu-list-fam {
-	background-position: right -437px;
-}
-
-#menu-list-indi {
-	background-position: left -460px;
-}
-
-[dir=rtl] #menu-list-indi {
-	background-position: right -460px;
-}
-
-/* Report Icons */
-#menu-report li {
-	background-position: left -483px;
-}
-
-[dir=rtl] #menu-report li {
-	background-position: right -483px;
-}
-
-/* Calendar Icons */
-#menu-calendar-day {
-	background-position: left -506px;
-}
-
-[dir=rtl] #menu-calendar-day {
-	background-position: right -506px;
-}
-
-#menu-calendar-month {
-	background-position: left -506px;
-}
-
-[dir=rtl] #menu-calendar-month {
-	background-position: right -506px;
-}
-
-#menu-calendar-year {
-	background-position: left -506px;
-}
-
-[dir=rtl] #menu-calendar-year {
-	background-position: right -506px;
-}
-
-/* Search Icons */
-#menu-search-general {
-	background-position: left -529px;
-}
-
-[dir=rtl] #menu-search-general {
-	background-position: right -529px;
-}
-
-#menu-search-soundex {
-	background-position: left -529px;
-}
-
-[dir=rtl] #menu-search-soundex {
-	background-position: right -529px;
-}
-
-#menu-search-advanced {
-	background-position: left -529px;
-}
-
-[dir=rtl] #menu-search-advanced {
-	background-position: right -529px;
-}
-
-#menu-search-replace {
-	background-position: left -529px;
-}
-
-[dir=rtl] #menu-search-replace {
-	background-position: right -529px;
-}
-
-/* Help Icons */
-#menu-help-genealogy {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-genealogy {
-	background-position: right -552px;
-}
-
-#menu-help-show {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-show {
-	background-position: right -552px;
-}
-
-#menu-help-contents {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-contents {
-	background-position: right -552px;
-}
-
-#menu-help-hide {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-hide {
-	background-position: right -552px;
-}
-
-#menu-help-faq {
-	background-position: left -552px;
-}
-
-[dir=rtl] #menu-help-faq {
-	background-position: right -552px;
-}
-
-#menu-help-wiki {
-	background-position: left -575px;
-}
-
-[dir=rtl] #menu-help-wiki {
-	background-position: right -575px;
-}
-
-#menu-help-technical {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-help-technical {
-	background-position: right -598px;
-}
-
-/* MyPage Icons */
-#menu-mypage {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-mypage {
-	background-position: right -598px;
-}
-
-#menu-myaccount {
-	background-position: left -598px;
-}
-
-[dir=rtl] #menu-myaccount {
-	background-position: right -598px;
-}
-
-#menu-mypedigree {
-	background-position: left -828px;
-}
-
-[dir=rtl] #menu-mypedigree {
-	background-position: right -828px;
-}
-
-#menu-myrecord {
-	background-position: left -460px;
-}
-
-[dir=rtl] #menu-myrecord {
-	background-position: right -460px;
-}
-
-#menu-admin {
-	background-position: left -644px;
-}
-
-[dir=rtl] #menu-admin {
-	background-position: right -644px;
-}
-
-#menu-tree li {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-tree li {
-	background-position: right -667px;
-}
-
-/* Family Icons */
-#menu-fam-addchil {
-	background-position: left -759px;
-}
-
-[dir=rtl] #menu-fam-addchil {
-	background-position: right -759px;
-}
-
-#menu-fam-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-fam-addfav {
-	background-position: right -736px;
-}
-
-#menu-fam-change {
-	background-position: left -759px;
-}
-
-[dir=rtl] #menu-fam-change {
-	background-position: right -759px;
-}
-
-#menu-fam-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-fam-editraw {
-	background-position: right -667px;
-}
-
-#menu-fam-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-fam-del {
-	background-position: right -713px;
-}
-
-#menu-fam-orderchil {
-	background-position: left -759px;
-}
-
-[dir=rtl] #menu-fam-orderchil {
-	background-position: right -759px;
-}
-
-/* Clipping Icons */
-#menu-clippingscart {
-	background-position: left -621px;
-}
-
-[dir=rtl] #menu-clippingscart {
-	background-position: right -621px;
-}
-
-#menu-clippingsadd {
-	background-position: left -621px;
-}
-
-[dir=rtl] #menu-clippingsadd {
-	background-position: right -621px;
-}
-
-/* Edit Icons */
-#menu-indi-addname {
-	background-position: left -690px;
-}
-
-[dir=rtl] #menu-indi-addname {
-	background-position: right -690px;
-}
-
-#menu-indi-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-indi-editraw {
-	background-position: right -667px;
-}
-
-#menu-indi-editsex {
-	background-position: left -690px;
-}
-
-[dir=rtl] #menu-indi-editsex {
-	background-position: right -690px;
-}
-
-#menu-indi-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-indi-del {
-	background-position: right -713px;
-}
-
-#menu-indi-orderfam {
-	background-position: left 0;
-}
-
-[dir=rtl] #menu-indi-orderfam {
-	background-position: right 0;
-}
-
-#menu-indi-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-indi-addfav {
-	background-position: right -736px;
-}
-
-/* Edit Notes */
-#menu-note-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-note-fav {
-	background-position: right -736px;
-}
-
-#menu-note-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-note-del {
-	background-position: right -713px;
-}
-
-#menu-note-edit {
-	background-position: left -805px;
-}
-
-[dir=rtl] #menu-note-edit {
-	background-position: right -805px;
-}
-
-#menu-note-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-note-editraw {
-	background-position: right -667px;
-}
-
-/* Objects */
-#menu-obje-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-obje-addfav {
-	background-position: right -736px;
-}
-
-#menu-obje-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-obje-del {
-	background-position: right -713px;
-}
-
-#menu-obje-edit {
-	background-position: left -852px;
-}
-
-[dir=rtl] #menu-obje-edit {
-	background-position: right -852px;
-}
-
-#menu-obje-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-obje-editraw {
-	background-position: right -667px;
-}
-
-#menu-obje-link {
-	background-position: left -875px;
-}
-
-[dir=rtl] #menu-obje-link {
-	background-position: right -875px;
-}
-
-#menu-obje-link-fam {
-	background-position: left -437px;
-}
-
-[dir=rtl] #menu-obje-link-fam {
-	background-position: right -437px;
-}
-
-#menu-obje-link-indi {
-	background-position: left -460px;
-}
-
-[dir=rtl] #menu-obje-link-indi {
-	background-position: right -460px;
-}
-
-#menu-obje-link-sour {
-	background-position: left -391px;
-}
-
-[dir=rtl] #menu-obje-link-sour {
-	background-position: right -391px;
-}
-
-/* Repository */
-#menu-repo-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-repo-addfav {
-	background-position: right -736px;
-}
-
-#menu-repo-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-repo-del {
-	background-position: right -713px;
-}
-
-#menu-repo-edit {
-	background-position: left -897px;
-}
-
-[dir=rtl] #menu-repo-edit {
-	background-position: right -897px;
-}
-
-#menu-repo-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-repo-editraw {
-	background-position: right -667px;
-}
-
-/* Source */
-#menu-sour-addfav {
-	background-position: left -736px;
-}
-
-[dir=rtl] #menu-sour-addfav {
-	background-position: right -736px;
-}
-
-#menu-sour-del {
-	background-position: left -713px;
-}
-
-[dir=rtl] #menu-sour-del {
-	background-position: right -713px;
-}
-
-#menu-sour-edit {
-	background-position: left -782px;
-}
-
-[dir=rtl] #menu-sour-edit {
-	background-position: right -782px;
-}
-
-#menu-sour-editraw {
-	background-position: left -667px;
-}
-
-[dir=rtl] #menu-sour-editraw {
-	background-position: right -667px;
-}
-
-/* Stories */
-#menu-story-sub {
-	background-position: left -920px;
-}
-
-[dir=rtl] #menu-story-sub {
-	background-position: right -920px;
-}
-
-#menu-language li {
-	text-align: left;
-}
-
-/* The language menu is always LTR, even on RTL pages */
-#menu-theme li {
-	text-align: left;
-}
-
-/* The theme menu is always LTR, even on RTL pages */
-
-/* Header end */
-
 fieldset {
 	margin: 8px 8px 4px;
 	text-align: left;
@@ -1150,36 +195,32 @@ legend {
 	font-weight: bold;
 }
 
-img {
-	border: 0;
-}
-
-ul {
-	padding-left: 15px;
-	padding-right: 15px;
-	margin: 8px;
-}
-
-.center {
-	text-align: center;
+select {
+	border: 1px solid #555;
+	font-size: 12px;
+	margin: 0 7px;
+	padding: 1px;
 }
 
-table.center {
-	margin-left: auto;
-	margin-right: auto;
+header form {
+	font-size: 12px;
 }
 
-th {
-	font-weight: 100;
+#mycart a img {
+	height: 15px;
 }
 
 .button {
 	width: 60px;
 }
 
+.alpha_index {
+	color: #999;
+}
+
 .person_box {
 	background: #f0f9ff;
-	border: 1px solid #84beff;
+	border: solid #84beff 1px;
 	padding: 3px;
 }
 
@@ -1213,26 +254,33 @@ th {
 	min-height: 50px;
 }
 
-.list_table {
+.center {
+	text-align: center;
+}
+
+table.center {
 	margin-left: auto;
 	margin-right: auto;
 }
 
+.list_table {
+	margin: 0 auto;
+}
+
 .list_label,
 .list_label_wrap {
-	color: #006;
-	background-color: #c3dfff;
-	font-weight: bold;
+	color: #fff;
 	font-size: 12px;
+	background-color: #81a9cb;
+	font-weight: bold;
 	text-align: center;
 }
 
 .list_value,
 .list_value_wrap {
-	background-color: #ecf5ff;
-	border: solid #c3dfff 1px;
-	color: #006;
+	background-color: #edf7f9;
 	font-size: 12px;
+	border: solid #81a9cb 1px;
 	vertical-align: top;
 }
 
@@ -1251,7 +299,7 @@ th {
 }
 
 .facts_table {
-	width: 99%;
+	width: 100%;
 }
 
 div.fact_SHARED_NOTE {
@@ -1259,8 +307,8 @@ div.fact_SHARED_NOTE {
 }
 
 .facts_label {
-	color: #006;
 	background-color: #c3dfff;
+	color: #006;
 	font-size: 12px;
 	padding: 4px;
 	width: 20%;
@@ -1278,72 +326,67 @@ div.fact_SHARED_NOTE {
 
 .facts_value {
 	background-color: #ecf5ff;
-	border: solid #c3dfff 1px;
-	color: #006;
 	font-size: 12px;
+	border: solid #c3dfff 1px;
 	padding: 4px;
 }
 
 .quickfacts a {
-	font-size: 9px;
 	padding: 0 3px;
+	font-size: 9px;
 }
 
 .tabs_table {
 	width: 99%;
 }
 
-.name1 {
-	color: #006;
-	font-weight: bold;
-	font-size: 11px;
-}
-
-a:hover .name1 {
-	color: #f00;
+.name1, .name2 {
+	color: #555;
 	font-weight: bold;
-	font-size: 11px;
+	font-size: 12px;
 }
 
-a:hover .name2 {
+a:hover .name1, a:hover .name2 {
 	color: #f00;
 	font-weight: bold;
-	font-size: 11px;
+	font-size: 12px;
 }
 
 a:hover .nameZoom {
 	color: #f00;
-	font-weight: bold;
 	font-size: 14px;
-}
-
-.name2 {
-	color: #006;
 	font-weight: bold;
-	font-size: 11px;
 }
 
 .details0,
 .details1 {
-	font-size: 10px;
+	font-size: 11px;
 }
 
 .details2 {
-	color: #006;
-	font-size: 11px;
-	text-decoration: none;
+	font-size: 12px;
 }
 
 .nameZoom {
-	color: #006;
-	font-weight: bold;
+	color: #555;
 	font-size: 14px;
+	font-weight: bold;
 }
 
-.name_head {
-	color: #006;
+.details_label {
 	font-weight: bold;
+}
+
+.name_head {
+	color: #555;
 	font-size: 16px;
+	font-weight: bold;
+	line-height: 2;
+	padding: 0 5px;
+}
+
+.date {
+	color: #337;
 }
 
 .label {
@@ -1367,71 +410,45 @@ a:hover .nameZoom {
 }
 
 .indent {
-	padding-left: 7px;
+	padding-left: 20px;
 }
 
 .image {
 	height: 150px;
 	padding: 5px;
+	margin: 2px;
 }
 
 .gender_image {
-	padding-left: 3px;
-	padding-right: 3px;
+	margin: 0 3px;
 	border: 0;
 	vertical-align: middle;
 }
 
-.pedigree_form {
-	width: 60px;
-}
-
 .thumbnail {
 	height: auto;
-	padding: 5px;
+	padding: 3px;
 }
 
 .icon {
 	border: 0;
-	padding-left: 0;
-	padding-right: 5px;
-}
-
-[dir=rtl] .icon {
-	padding-left: 5px;
-	padding-right: 0;
-}
-
-.link {
-	font-size: 11px;
-	text-align: center;
+	padding: 0 5px;
 }
 
 .sublinks_cell {
-	font-size: 11px;
-	background-color: #ecf5ff;
-}
-
-.menuitem .icon {
-	width: 32px;
-	height: 32px;
-}
-
-.menuitem_hover .icon {
-	width: 32px;
-	height: 32px;
+	background-color: #edf7fd;
+	font-size: 12px;
 }
 
 .submenu .icon {
 	vertical-align: middle;
-	width: 25px;
-	height: 25px;
+	width: 20px;
+	height: 20px;
 }
 
 .subheaders {
 	font-weight: bold;
-	font-size: 16px;
-	text-indent: 20px;
+	font-size: 15px;
 	margin-top: 15px;
 	vertical-align: bottom;
 }
@@ -1441,7 +458,7 @@ a:hover .nameZoom {
 }
 
 .parentdeath {
-	border: thin solid #808080;
+	border: thin solid #888;
 	padding: 1px;
 }
 
@@ -1449,87 +466,66 @@ a:hover .nameZoom {
 	display: none;
 }
 
-.contact_links {
-	margin-top: 15px;
-	text-align: center;
-}
-
-.theme_form {
-	margin-top: 0;
-	font-size: 14px;
-	color: #fff;
-}
-
-.hit-counter {
-	background: #000;
-	color: #fff;
-	font-weight: bold;
+.selected-option {
+	background-color: #edf7fd;
 }
 
 .border1 {
 	border: solid #000 1px;
 }
 
-.selected-option {
-	background-color: #ecf5ff;
-	border: solid #84beff 1px;
-}
-
 .menuitem {
-	color: #000;
-	font-size: 11px;
 	text-decoration: none;
-	text-align: center;
+	font-size: 11px;
 	padding: 1px;
 }
 
 .menuitem_hover {
-	color: #000;
-	font-size: 11px;
 	text-decoration: none;
-	text-align: center;
+	font-size: 11px;
 	padding: 1px;
 }
 
+.menuitem .icon, .menuitem_hover .icon {
+	width: 50px;
+	height: 50px;
+}
+
 .submenu {
-	visibility: hidden;
-	position: absolute;
-	color: #000;
 	text-decoration: none;
 	font-size: 11px;
-	background-color: #ecf5ff;
-	border: solid #84beff 1px;
+	background-color: #edf7fd;
+	border: solid #81a9cb 1px;
+	visibility: hidden;
+	position: absolute;
+	padding: 5px;
 }
 
-.submenuitem {
+.submenuitem  {
 	vertical-align: middle;
-	height: 22px;
-	color: #000;
 	font-size: 11px;
+	height: 20px;
 	text-decoration: none;
-	background-color: #ecf5ff;
+	background-color: #edf7fd;
 	padding: 1px;
 	white-space: nowrap;
 }
 
-.submenuitem a,
-.submenuitem_hover a {
-	color: #000;
-	display: inline-block;
-	vertical-align: middle;
-}
-
 .submenuitem_hover {
 	vertical-align: middle;
-	height: 22px;
-	color: #000;
+	height: 20px;
 	font-size: 11px;
-	text-decoration: none;
-	background-color: #fff;
+	background-color: #e6f0fa;
 	white-space: nowrap;
 	padding: 1px;
 }
 
+.submenuitem a,
+.submenuitem_hover a {
+	display: inline-block;
+	vertical-align: middle;
+}
+
 .journal_box {
 	padding: 3pt;
 	border: thin solid #aaa;
@@ -1537,26 +533,19 @@ a:hover .nameZoom {
 }
 
 .news_box {
-	background-color: #f0f9ff;
-	border: 1px solid #84beff;
+	background-color: #edf7fd;
+	border-top: solid #81a9cb 1px;
 }
 
 .news_title {
 	font-weight: bold;
 	font-size: 14px;
-	color: #000;
 }
 
 .news_date {
-	font-size: 12px;
-	color: #000;
 	margin-bottom: 12px;
 }
 
-.menuitem a {
-	color: #000;
-}
-
 .current_day {
 	font-weight: bold;
 	font-size: 16px;
@@ -1583,195 +572,8 @@ a:hover .nameZoom {
 	clear: both;
 }
 
-#content {
-	clear: both;
-	margin-left: 1px;
-}
-
-#footer {
-	clear: both;
-	color: #006;
-	font-size: 12px;
-	width: 99%;
-}
-
-/*-- index.php specific style sheets -- */
-.small_inner_block {
-	max-height: 190px;
-	overflow: auto;
-	text-decoration: none;
-}
-
-.normal_inner_block {
-	overflow: auto;
-}
-
-.block {
-	background-color: #ecf5ff;
-	border: solid #84beff 1px;
-	color: #000;
-	font-size: 12px;
-	vertical-align: top;
-	margin-bottom: 5px;
-	padding: 1px;
-}
-
-.blockcontent {
-	margin-left: auto;
-	margin-right: 5px;
-	margin-bottom: 10px;
-	font-size: 13px;
-	overflow: auto;
-}
-
-.blockcontent .list_table {
-	border-spacing: 0;
-	border: solid #84beff 1px;
-	border-right: 0;
-}
-
-.blockcontent .list_value,
-.blockcontent .list_value_wrap {
-	border: 0;
-	border-top: solid #84beff 1px;
-	border-right: solid #84beff 1px;
-}
-
-.blockheader {
-	font-weight: bold;
-}
-
-img.block {
-	border: 0;
-	height: 20px;
-	vertical-align: middle;
-}
-
-.line1,
-.line2,
-.line3 {
-	vertical-align: middle;
-}
-
-#hourglass_chart img.line4 {
-	vertical-align: middle;
-}
-
-.line5 {
-	vertical-align: top;
-}
-
-#index_main_blocks {
-	clear: none;
-	width: 66%;
-	float: left;
-}
-
-#index_small_blocks {
-	clear: none;
-	width: 33%;
-	float: right;
-}
-
-#index_full_blocks {
-	clear: none;
-	width: 100%;
-}
-
-[dir=rtl] #index_main_blocks {
-	float: right;
-}
-
-[dir=rtl] #index_small_blocks {
-	float: left;
-}
-
-#main_select,
-#available_select,
-#right_select {
-	min-width: 150px;
-}
-
-.user_welcome_block table,
-.gedcom_block_block table {
-	margin: auto;
-}
-
-.user_welcome_block td,
-.gedcom_block_block td {
-	width: 33%;
-	text-align: center;
-	vertical-align: top;
-}
-
-#link_change_blocks {
-	clear: both;
-	margin: 0 auto;
-	padding: 25px 0 0;
-	text-align: center;
-	width: 400px;
-}
-
-#link_change_blocks span {
-	padding: 0 50px;
-}
-
-#link_change_blocks span span {
-	padding: 0 3px;
-}
-
-#random_picture {
-	text-align: center;
-}
-
-#random_picture_box {
-	width: 100%;
-}
-
-#familybook_chart {
-	margin-left: 10px;
-}
-
-#familybook_chart table {
-	border-collapse: collapse;
-	empty-cells: show;
-}
-
-#familybook_chart td {
-	margin: 0;
-	padding: 0;
-}
-
-#familybook_chart h2 {
-	text-align: center;
-}
-
-#familybook_chart .line3,
-#familybook_chart .pvline,
-#familybook_chart .spacer {
-	width: 3px;
-}
-
-#familybook_chart .line4 {
-	width: 7px;
-	vertical-align: middle;
-}
-
-[ID^="vline"] {
-	width: 3px;
-}
-
-#familybook_chart h3 {
-	font-size: 16px;
-	text-align: center;
-}
-
-#relationship-page h3 {
-	margin: 20px 0 0 20px;
-}
-
-#relationship_chart {
-	margin: 0 20px;
+#my-page h1 {
+	margin: 0.25em auto 0.6em;
 }
 
 .tdtop {
@@ -1787,41 +589,14 @@ img.block {
 	vertical-align: bottom;
 }
 
-[dir=rtl] #familybook_chart {
-	margin-right: 10px;
-}
-
-/*-- pedigree chart specific stylesheets --*/
-#pedigree-page table.list_table {
-	margin: 0 auto;
-	width: 500px;
-}
-
-.pedigree_chart_table {
-	border: 0;
-	border-collapse: collapse;
-	padding: 0;
-	width: 100%;
-}
-
-#pedigree_chart {
-	position: relative;
-	top: -200px;
-	left: 0;
-}
-
-#pedigree_canvas {
-	color: #81a9cb;
-	position: absolute;
-	top: 200px;
-	z-index: -1000;
+.line1,
+.line2,
+.line3 {
+	vertical-align: middle;
 }
 
-#pedigree_chart #childarrow,
-#pedigree_chart #uparrow,
-#pedigree_chart .shadow,
-.ancestorarrow {
-	position: absolute;
+.line5 {
+	vertical-align: top;
 }
 
 #childbox {
@@ -1850,144 +625,9 @@ img.block {
 	margin-left: 5px;
 }
 
-#hourglass_chart table,
-.charts_block table {
-	border-collapse: collapse;
-}
-
-#hourglass_chart td,
-.charts_block td {
-	padding: 0;
-	empty-cells: show;
-}
-
-#pedigree_chart #childbox {
-	border: 1px solid;
-	background-color: #fff;
-}
-
-/*-- pedigree chart rtl specific stylesheets --*/
-[dir=rtl] #pedigree_chart {
-	left: auto;
-	right: 0;
-}
-
-/*-- descendancy chart specific stylesheets --*/
-#descendancy_chart {
-	margin: 20px;
-}
-
-#descendancy_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	margin: 0 0 5px 15px; /* top right bottom left */
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#descendancy_chart li {
-	list-style: none;
-	margin: 5px 0 0 -15px; /* top right bottom left */
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#descendancy_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-#descendancy_chart td.details1 {
-	padding-top: 5px;
-}
-
-/*-- descendancy chart rtl specific stylesheets --*/
-[dir=rtl] #descendancy_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
-}
-
-/*-- ancestry chart specific stylesheets --*/
-#ancestry_chart ul {
-	background-image:url(images/vline.png);
-	background-position:left top;background-repeat:repeat-y;
-	list-style: none;
-	display: block;
-	margin: 0 0 0 15px; /* top right bottom left */
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#ancestry_chart li {
-	list-style: none;
-	margin: 0 0 2px -15px; /* top right bottom left */
-	padding-top: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-#ancestry_chart li table {
-	margin: 5px 0;
-}
-
-#ancestry_chart span.details1 div[class^="fact_"] {
-	display: inline-block;
-}
-
-/*-- ancestry chart rtl specific stylesheets --*/
-[dir=rtl] #ancestry_chart ul {
-	background-position: right top;
-	margin: 0 15px 0 0;
-	left: auto;
-}
-
-[dir=rtl] #ancestry_chart li {
-	margin: 0;
-	padding: 0 2px 0 0;
-	left: auto;
-}
-
-#compact_chart,
-#fan_chart,
-#ancestry_chart,
-#familybook_chart,
-#hourglass_chart {
-	margin: 20px;
-}
-
-.fan_chart_menu {
-	position: absolute;
-	display: none;
-	z-index: 100;
-}
-
-#fan_chart ul {
-	list-style-type: none;
-	margin: 0;
-}
-
-#fan_chart ul.children li:before {
-	content: "< ";
-	font-weight: bold;
-}
-
-#fan_chart_img {
-	text-align: center;
-}
-
-/*-- timeline chart specific styles --*/
-#timeline_chart {
-	position: relative;
-	top: 0;
-}
-
 .person0 {
-	background-color: #ecf5ff;
-	border: outset #84beff 1px;
+	background-color: #aaf;
+	border: outset #aaf 1px;
 	vertical-align: top;
 }
 
@@ -2004,7 +644,7 @@ img.block {
 }
 
 .person3 {
-	background-color: #aad;
+	background-color: #55f;
 	border: outset #55f 1px;
 	vertical-align: top;
 }
@@ -2023,44 +663,6 @@ img.block {
 
 .listlog {
 	line-height: 20pt;
-	color: #555;
-}
-
-input,
-button,
-textarea {
-	border-color: #fff #006 #006 #fff;
-	border-width: 1px;
-	font-family: inherit;
-	font-size: 12px;
-}
-
-input,
-textarea {
-	padding-left: 3px;
-	padding-right: 3px;
-}
-
-select {
-	border: 1px #84beff;
-	font-family: inherit;
-	font-size: 12px;
-}
-
-form {
-	font-size: 12px;
-}
-
-h2 {
-	color: #006;
-	font-weight: bold;
-	font-size: 18px;
-}
-
-h4 {
-	color: #006;
-	font-weight: bold;
-	font-size: 12px;
 }
 
 .formField {
@@ -2079,45 +681,27 @@ h4 {
 	font-weight: 600;
 }
 
-.details_label {
-	font-weight: bold;
-}
-
-/* Style for the top and bottom bar */
-.topbottombar {
-	color: #fff;
-	background-color: #84beff;
-	font-weight: bold;
-	font-size: 12px;
-	padding: 4px;
-	text-align: center;
-}
-
-/* Style for the descriptionbox */
 .descriptionbox {
 	color: #006;
-	background-color: #c3dfff;
 	font-size: 12px;
-	padding: 4px;
+	background-color: #c3dfff;
 	vertical-align: top;
+	padding: 3px;
 }
 
-/* Style for the optionbox */
 .optionbox {
 	background-color: #ecf5ff;
-	border: solid #c3dfff 1px;
-	color: #006;
 	font-size: 12px;
-	padding: 3px;
+	border: solid #c3dfff 1px;
 	vertical-align: top;
 	white-space: nowrap;
+	padding: 3px;
 }
 
 .vmiddle {
 	vertical-align: middle;
 }
 
-/* Colors */
 .red {
 	color: #f00;
 }
@@ -2127,7 +711,6 @@ h4 {
 	opacity: 0.8;
 }
 
-/* Width settings */
 .width10 {
 	width: 10%;
 }
@@ -2184,18 +767,20 @@ h4 {
 	width: 100%;
 }
 
-/* Font sizes */
 .font9 {
 	font-size: 9px;
 }
 
-/* Message box */
+.font11 {
+	font-size: 11px;
+}
+
 .messagebox {
-	background-color: #dfeeff;
-	border: solid #c3dfff 1px;
+	background-color: #c2ceef;
+	border: solid #81a9cb 1px;
 }
 
-/* Pending edits - TODO perhaps show differently in different contexts? */
+/* ---Pending edits--- */
 .new {
 	border: solid blue 1px;
 	overflow: hidden;
@@ -2209,7 +794,6 @@ h4 {
 a.showit {
 	position: relative;
 	z-index: 24;
-	color: #000;
 	text-decoration: none;
 }
 
@@ -2229,10 +813,10 @@ a.showit:hover > span {
 	top: 22px;
 	left: 0;
 	width: 225px;
-	border-left: 15px outset #1f1f1f;
-	border-top: 2px solid #1f1f1f;
-	border-bottom: 2px solid #000;
-	border-right: 2px solid #000;
+	border: 2px solid #1f1f1f;
+	border-right-color: #000;
+	border-bottom-color: #000;
+	border-left: 15px outset;
 	padding: 3px;
 	background: #4f4f4f;
 	color: #fff;
@@ -2240,55 +824,17 @@ a.showit:hover > span {
 	text-align: left;
 	opacity: .85;
 	z-index: 5;
-	white-space: normal;
 }
 
-.lifespan_people span:first-letter {
-	font-variant: small-caps;
-	font-weight: bold;
-	font-size: 16px;
-	padding: 1px;
-}
-
-.lifespan_outer {
-	position: relative;
-	width: 99.5%;
-	height: 600px;
-	overflow: hidden;
-	border: solid #00f 1px;
-}
-
-.lifespan_outer a {
-	color: #000;
-}
-
-.lifespan_outer a:hover {
-	color: #f00;
-	text-decoration: none;
-}
-
-.lifespan_timeline {
-	position: absolute;
-	width: 100%;
-	left: -10px;
-	top: -65px;
-	z-index: 2;
-	background-color: #fff;
-}
-
-.lifespan_people {
-	position: absolute;
-	width: 500px;
-	left: -10px;
-	top: -60px;
-	z-index: 1;
+.tag_cloud {
+	text-align: center;
 }
 
 .tag_cloud a {
 	white-space: nowrap;
 }
 
-/* Autocomplete styles*/
+/* ---Autocomplete styles--- */
 .ui-autocomplete-input {
 	background-color: #eee8aa;
 }
@@ -2301,25 +847,20 @@ a.showit:hover > span {
 	list-style: none outside none;
 	margin: 0;
 	max-height: 200px;
-	overflow-y: auto;
+	overflow-x: hidden;
+	overflow-y: scroll;
 }
 
 .ui-autocomplete li {
 	margin: 0;
 	padding: 2px 5px;
+	font-size: 12px;
 	cursor: default;
 	display: block;
-	/*
-	if width will be 100% horizontal scrollbar will apear
-	when scroll mode will be used
-	*/
-	/*width:100%;*/
+	/* if width will be 100% horizontal scrollbar will apear when scroll mode will be used */
+	/* width: 100%; */
 	font: menu;
-	font-size: 12px;
-	/*
-	it is very important, if line-height not setted or setted
-	in relative units scroll will be broken in firefox
-	*/
+	/* it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */
 	line-height: 14px;
 	overflow: hidden;
 }
@@ -2344,7 +885,7 @@ a.showit:hover > span {
 	display: none;
 }
 
-/* End of Autocomplete styles*/
+/* ---End of Autocomplete styles--- */
 
 .nowrap {
 	white-space: nowrap;
@@ -2354,39 +895,37 @@ a.showit:hover > span {
 	white-space: normal;
 }
 
-ul.clist {
-	list-style-image: none;
-	margin: 0;
-}
-
 .statistics-page {
 	text-align: center;
 }
 
-.execution_stats {
-	padding-top: 12px;
+.center2 {
 	text-align: center;
 }
 
-.clearfloat {
-	clear: both;
+.gchart {
+	border: solid #81a9cb 1px;
 }
 
-dl {
-	margin: 0;
+/* ---Find special characters--- */
+.largechars {
+	font-family: monospace;
+	font-size: 200%;
 }
 
-dt {
+#facts_content dd {
 	float: left;
-	font-weight: bold;
-	margin-right: 10px;
+	width: 70%;
+}
+
+.clearfloat {
 	clear: both;
 }
 
-[dir=rtl] dt {
-	float: right;
-	margin-right: auto;
-	margin-left: 10px;
+/* this keeps the tag color the same when it is a link as when not */
+
+.place {
+	padding-top: 5px;
 }
 
 #pending h2 {
@@ -2399,65 +938,7 @@ dt {
 	margin-top: 20px;
 }
 
-/* ============= Statistics block ============ */
-.gedcom_stats_block table td {
-	vertical-align: top;
-}
-
-.gedcom_stats_block table td td {
-	vertical-align: middle;
-}
-
-.gedcom_stats_block td .stats_value {
-	text-align: center;
-}
-
-/* ============= Theme select block ============ */
-.theme_form ul {
-	margin: -10px auto;
-}
-
-.theme_form li {
-	visibility: hidden;
-}
-
-.theme_form li ul li {
-	display: inline-block;
-	padding: 10px;
-	visibility: visible;
-}
-
-/* ======= Favourites block ========== */
-.blockcontent .person_box_template .details2 {
-	min-height: 40px;
-}
-
-.blockcontent [class*='box-style2'] {
-	margin: 5px 0;
-}
-
-.add_fav_head {
-	font-weight: 900;
-	margin: 5px 0;
-}
-
-.add_fav_head i {
-	margin: 0 5px 1px;
-}
-
-.add_fav_ref label {
-	display: inline-block;
-	min-width: 100px;
-}
-
-.add_fav_ref label:after {
-	content: ":";
-}
-
-.add_fav_ref input {
-	margin: 0 5px;
-}
-
+/* ======== Person box ======= */
 .gedcom_favorites_block,
 .user_favorites_block,
 .person_box_template {
@@ -2486,11 +967,11 @@ dt {
 	height: auto;
 }
 
-.person_box_template .namedef i {
+.person_box_template .namedef i[class^="icon-sex"] {
 	margin-left: 3px;
 }
 
-[dir=rtl] .person_box_template .namedef i {
+[dir=rtl] .person_box_template .namedef i[class^="icon-sex"] {
 	margin-right: 3px;
 }
 
@@ -2521,7 +1002,7 @@ dt {
 .person_box_template a.gallery {
 	float: left;
 	height: 50px;
-	margin: 0 3px 0 0;
+	margin: 0 4px 0 0;
 	max-width: 80px;
 	width: auto;
 }
@@ -2529,7 +1010,7 @@ dt {
 [dir=rtl] .person_box_template img,
 [dir=rtl] .person_box_template a.gallery {
 	float: right;
-	margin: 0 0 0 3px;
+	margin: 0 0 0 4px;
 }
 
 .person_box_template i[class^="icon-silhouette"] {
@@ -2546,16 +1027,67 @@ dt {
 	margin: 0 auto;
 }
 
-#medialist-page .list_table_controls {
+#medialist-page form .list_table {
+	width: 75%;
+}
+
+#medialist-page div .list_table,
+#medialist-page .media-col,
+#medialist-page .media-col1,
+#medialist-page .list_value_wrap,
+#medialist-page div .list_table_controls {
 	width: 100%;
 }
 
+#medialist-page .optionbox, 
+#medialist-page .descriptionbox {
+	width: 25%;
+}
+
+#medialist-page .media-col2 {
+	width: 50%;
+}
+
+#medialist-page .media-col {
+	padding-left: 5px; 
+	border: none;
+}
+
+[dir=rtl] #medialist-page .media-col {
+	padding-left: 0;
+	padding-right: 5px;
+}
+
+#medialist-page .media-image {
+	vertical-align:top; 
+	white-space:normal;
+}
+
+#medialist-page p {
+	text-align: center;
+}
+
 .list_table_controls td {
 	min-width: 40px;
 	text-align: center;
 }
+/* ======== medialist.php ==== */
+.makeMenu li ul {
+	border: thin solid #AAA;
+	position: absolute;
+	margin:0;
+}
+
+.makeMenu, .makeMenu li ul {
+	padding: 1px;
+}
+
+.makeMenu li {
+	display: inline;
+	position: relative;
+	white-space: nowrap;
+}
 
-/* ============== medialist.php ======================= */
 .lb-menu {
 	display: inline-block;
 	margin: 0;
@@ -2564,6 +1096,7 @@ dt {
 .lb-menu ul {
 	display: block;
 	list-style-type: none;
+	margin: 0;
 }
 
 .lb-menu > li {
@@ -2590,23 +1123,16 @@ dt {
 }
 
 .lb-menu li a {
-	color: #00f;
-	font-weight: normal;
-	padding-top: 24px;
-}
-
-.lb-menu li a:hover {
-	color: #f00;
-	font-weight: normal;
+	padding: 24px 10px 1px 5px;
 }
 
 .lb-menu li li a {
-	padding: 1px 10px 1px 5px;
+	background-color: #fff;
+	padding: 5px 10px 5px 5px;
 }
 
-.lb-image_edit,
-.lb-image_link {
-	padding-right: 5px;
+.lb-menu li {
+	border: 0;
 }
 
 [dir=rtl] .lb-menu > li {
@@ -2625,7 +1151,7 @@ dt {
 	background: url(images/image_view.png) no-repeat 50% 20%;
 }
 
-/* ============== login.php ======================= */
+/* login.php */
 #login-register-page h2 {
 	text-align: center;
 }
@@ -2648,8 +1174,8 @@ dt {
 }
 
 #login-register-page .confirm p {
-	font-size: 14px;
 	font-weight: bold;
+	font-size: 14px;
 }
 
 #login-register-page .confirm p + p {
@@ -2674,18 +1200,24 @@ dt {
 #new_passwd_form,
 #register-form,
 #verify-form {
-	background-color: #c3dfff;
+	background-color: #edf7fd;
+	border: 1px outset #81a9cb;
 	display: inline-block;
 	margin: 10px auto 0;
 	padding: 5px;
 }
 
+#register-form,
+#verify-form {
+	width: 440px;
+}
+
 #login-form div,
 #login-form div a,
 #new_passwd_form div,
 #register-form div,
 #verify-form div {
-	color: #006;
+	margin: auto;
 	padding: 5px;
 	text-align: center;
 }
@@ -2704,9 +1236,13 @@ dt {
 	margin: 0 10px;
 }
 
+#register-form p,
+#verify-form p {
+	text-align: left;
+}
+
 #new_passwd_form h4,
 #register-form h4 {
-	color: #006;
 	font-weight: normal;
 	text-align: center;
 }
@@ -2721,15 +1257,15 @@ dt {
 #register-form textarea {
 	width: 220px;
 	margin: 0 10px;
+	padding: 3px;
 }
 
 #register-form label select {
-	margin: 0 9px;
-	width: 223px;
+	margin: 0 10px;
+	width: 228px;
 }
 
 #register-form textarea {
-	margin: 0 3px;
 	vertical-align: top;
 }
 
@@ -2750,7 +1286,17 @@ dt {
 	text-align: left;
 }
 
-/* ============== reportengine.php ======================= */
+[dir=rtl] #register-form div,
+[dir=rtl] #verify-form div {
+	text-align: left;
+}
+
+[dir=rtl] #register-form p, 
+[dir=rtl] #verify-form p {
+	text-align: right;
+}
+
+/* --- reportengine.php --- */
 #reportengine-page table {
 	margin: 20px auto;
 }
@@ -2771,59 +1317,51 @@ dt {
 	text-align: center;
 }
 
+/* styles for popup menus */
 .itr {
-	position: absolute;
+	position: relative;
 	line-height: 1.5;
 }
 
-.block .itr,
-#family-table .itr,
-#ancestry_chart .itr,
-#descendancy_chart .itr,
-#familybook_chart .itr,
-#hourglass_chart .itr,
-#relatives_content .itr {
-	position: relative;
-	top: 0;
+.popup {
+	position: absolute;
+	top: 20px;
+	right: 0;
+	left: auto;
+	visibility: hidden;
+	opacity: 0;
+	transition: visibility 0s ease .25s,opacity .25s ease;
+	z-index: 9999;
+	-webkit-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	-moz-box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
+	box-shadow: 5px 5px 5px 0 rgba(0,0,0,.4);
 }
 
-.popup {
-	display: none;
+[dir=rtl] .popup {
+	left: 0;
+	right: auto;
 }
 
 .popup ul {
-	background-image: none !important;
-	font-size: 9px;
+	white-space: nowrap;
 	list-style: none;
 	margin: 0;
 	padding: 0 10px;
+	font-size: smaller;
 }
 
-.popup li {
-	padding: 1px 5px;
+.popup > ul {
+	padding: 2px 10px;
 }
 
-.popup li span {
+.popup li .NAME {
 	padding: 0 5px;
 }
 
-.popup li ul,
-.popup li ul li,
-.popup li span span {
-	padding: 0;
-}
-
 .itr:hover .popup {
-	display: block;
-	position: absolute;
-	width: 12em;
-	right: 0;
-	z-index: 9999;
-}
-
-[dir=rtl] .itr:hover .popup {
-	left: 0;
-	right: auto;
+	visibility: visible;
+	opacity: 1;
+	transition-delay: 0s;
 }
 
 /* styles for FindFacts pop-up */
@@ -2894,7 +1432,346 @@ dt {
 	text-align: center;
 }
 
-/* FAQ table styles */
+/* ======== List styles ====== */
+.source-list,
+.note-list,
+.repo-list,
+.media-list,
+.indi-list,
+.fam-list {
+	visibility: hidden;
+}
+
+.recent_changes_block,
+.upcoming_events_block,
+.todays_events_block,
+.todo_block {
+	width: 98%;
+}
+
+.surname-list,
+.givn-list {
+	margin: 5px auto;
+}
+
+.source-list table,
+.note-list table,
+.repo-list table,
+.media-list table,
+.indi-list table,
+.fam-list table {
+	width: 100%;
+}
+
+.source-list td,
+.note-list td,
+.repo-list td,
+.media-list td,
+.indi-list td,
+.fam-list td,
+.recent_changes_block td,
+.upcoming_events_block td,
+.surname-list td,
+.givn-list td {
+	padding: 2px 5px;
+}
+
+.surname-list td {
+	vertical-align: top;
+}
+
+.indi-list .stats,
+.fam-list .stats {
+	margin: 0 auto;
+	width: auto;
+}
+
+.source-list th,
+.note-list th,
+.repo-list th,
+.media-list th,
+.indi-list th,
+.fam-list th,
+.recent_changes_block th,
+.upcoming_events_block th,
+.todays_events_block th,
+.todo_block th,
+.yahrzeit_block th,
+.surname-list th,
+.givn-list th {
+	cursor: pointer;
+	font-weight: 600;
+	padding: 2px 4px;
+	white-space: nowrap;
+}
+
+.source-list th:last-child,
+.note-list th:last-child,
+.repo-list th:last-child {
+	margin: 0 -2px 1px 1px;
+	padding: 3px 0 4px;
+	width: 24px;
+}
+
+.givn-list th {
+	cursor: pointer;
+	white-space: nowrap;
+	padding: 2px;
+	text-align: center;
+}
+
+#source-details h2,
+#sourcelist-page h2,
+#note-details h2,
+#notelist-page h2,
+#repo-details h2,
+#repolist-page h2,
+#media-details h2,
+#medialist-page h2,
+#statistics-page h2 {
+	margin-bottom: 20px;
+	text-align: center;
+}
+
+#source-tabs,
+#note-tabs,
+#repo-tabs,
+#media-tabs {
+	margin: auto;
+	visibility: hidden;
+	width: 80%;
+}
+
+#statistics_chart {
+	margin: auto;
+	visibility: hidden;
+	width: 90%;
+}
+
+#source-edit,
+#note-edit,
+#repo-edit,
+#media-edit {
+	overflow-x: auto;
+}
+
+.media-list td img {
+	display: block;
+	height: 40px;
+	width: auto;
+	margin: 3px auto;
+}
+
+.filtersH,
+.filtersF {
+	margin: 4px;
+}
+
+.filtersH img {
+	margin-bottom: 2px;
+}
+
+.loading-image {
+	background: transparent url(images/loading.gif) 50% 50% no-repeat;
+	height: 50px;
+	margin: 50px;
+}
+
+.list-charts {
+	text-align: center;
+}
+
+#search-result-tabs,
+#places-tabs {
+	margin: auto;
+	width: 98%;
+	visibility: hidden;
+}
+
+#search-result-tabs h3 {
+	text-align: center;
+}
+
+#searchAccordion-indi,
+#searchAccordion-fam,
+#searchAccordion-source,
+#searchAccordion-note {
+	margin: auto;
+	width: 99%;
+}
+
+#place-hierarchy h2,
+#place-hierarchy h4 {
+	text-align: center;
+}
+
+[dir=rtl] .source-list th:last-child,
+[dir=rtl] .note-list th:last-child,
+[dir=rtl] .repo-list th:last-child {
+	margin: 0 1px 1px -2px;
+}
+
+/* ======== Block styles ===== */
+#index_main_blocks {
+	clear: none;
+	width: 66%;
+	float: left;
+}
+
+#index_small_blocks {
+	clear: none;
+	width: 33%;
+	float: right;
+}
+
+#index_full_blocks {
+	clear: none;
+	width: 100%;
+}
+
+[dir=rtl] #index_main_blocks {
+	float: right;
+}
+
+[dir=rtl] #index_small_blocks {
+	float: left;
+}
+
+.small_inner_block {
+	max-height: 200px;
+	overflow: auto;
+}
+
+.normal_inner_block {
+	overflow: auto;
+}
+
+.block {
+	background-color: #edf7fd;
+	border: solid #81a9cb 1px;
+	margin-top: 10px;
+	padding: 3px;
+	vertical-align: top;
+}
+
+.blockcontent {
+	margin: 5px;
+	overflow: auto;
+}
+
+.blockcontent .list_table {
+	border-spacing: 0;
+	border: solid #81a9cb 1px;
+	border-right: 0;
+}
+
+.blockcontent .list_value,
+.blockcontent .list_value_wrap {
+	border: 0;
+	border-top: solid #81a9cb 1px;
+	border-right: solid #81a9cb 1px;
+}
+
+.blockheader {
+	font-weight: bold;
+}
+
+/* end Block styles */
+
+#main_select,
+#available_select,
+#right_select {
+	min-width: 150px;
+}
+
+.user_welcome_block table,
+.gedcom_block_block table {
+	margin: auto;
+}
+
+.user_welcome_block td,
+.gedcom_block_block td {
+	width: 33%;
+	text-align: center;
+	vertical-align: top;
+}
+
+/* Random picture block */
+#random_picture {
+	text-align: center;
+}
+
+#random_picture_box {
+	width: 100%;
+}
+
+/* ==== Favourites block ===== */
+.blockcontent .person_box_template .details2 {
+	min-height: 40px;
+}
+
+.blockcontent [class*='box-style2'] {
+	margin: 5px 0;
+}
+
+.add_fav_head {
+	font-weight: 900;
+	margin: 5px 0;
+}
+
+.add_fav_head i {
+	margin: 0 5px 1px;
+}
+
+.add_fav_ref label {
+	display: inline-block;
+	min-width: 100px;
+}
+
+.add_fav_ref label:after {
+	content: ":";
+}
+
+.add_fav_ref input {
+	margin: 0 5px;
+}
+
+/* === Who is online block === */
+.logged_in_list {
+	margin: 5px 0 0;
+	padding: 0;
+	line-height: 20px;
+}
+
+/* Statistics block */
+.gedcom_stats_block table td {
+	vertical-align: top;
+}
+
+.gedcom_stats_block table td td {
+	vertical-align: middle;
+}
+
+.gedcom_stats_block td .stats_value {
+	text-align: center;
+}
+
+/* ==== Theme select block === */
+.theme_form ul {
+	margin: -10px auto;
+}
+
+.theme_form li {
+	visibility: hidden;
+}
+
+.theme_form li ul li {
+	display: inline-block;
+	padding: 10px;
+	visibility: visible;
+}
+
+/* ==== FAQ table styles ===== */
 table.faq {
 	background-color: #e0e0e0;
 	margin: 5px 0 50px 5px;
@@ -2915,8 +1792,7 @@ div.faq_title {
 
 div.faq_body {
 	clear: both;
-	margin: 1em 0;
-	padding: 1em;
+	padding: 0 1em;
 }
 
 .faq_italic {
@@ -2942,22 +1818,7 @@ div.faq_body {
 	float: left;
 }
 
-td.descriptionbox a {
-	/* this keeps the tag color the same when it is a link as when not */
-	color: #00f;
-}
-
-.logo {
-	text-align: center;
-}
-
-/* Find special characters */
-.largechars {
-	font-family: monospace;
-	font-size: 200%;
-}
-
-/* ========= Positioning edit, copy, delete links ============= */
+/* === Positioning edit, copy, delete links === */
 /* General use */
 .editfacts {
 	clear: left;
@@ -2965,55 +1826,45 @@ td.descriptionbox a {
 }
 
 /* a container for the following three links */
+
 .editlink,
 .copylink,
 .deletelink {
 	float: left;
 }
 
+[dir=rtl] .editlink,
+[dir=rtl] .copylink,
+[dir=rtl] .deletelink {
+	float: right;
+}
+
 span.link_text {
 	display: none;
 }
 
-/* Indi header */
+/* ======== Indi header ====== */
 .field .editlink,
 .field .deletelink,
 .field .copylink {
 	float: right;
 }
 
-[dir=rtl] .editlink,
-[dir=rtl] .copylink,
-[dir=rtl] .deletelink {
-	float: right;
-}
-
 [dir=rtl].field .editlink,
 [dir=rtl].field .deletelink {
 	float: left;
 }
 
-/* =========== end edit, copy, delete links ==================== */
-
-/* =========== Indi header ================== */
 #indi_header {
 	overflow: hidden;
 	border-radius: 3px;
 	border: 1px solid #b2c7d7;
 	margin: 0 0 5px;
 	padding: 10px 0;
-	background: #e8f5f8; /* Old browsers */
-	background: -moz-linear-gradient(top, #e8f5f8 0%, #f5fafb 60%, #fefefe 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e8f5f8), color-stop(60%, #f5fafb), color-stop(100%, #fefefe)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(top, #e8f5f8 0%, #f5fafb 60%, #fefefe 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top, #e8f5f8 0%, #f5fafb 60%, #fefefe 100%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(top, #e8f5f8 0%, #f5fafb 60%, #fefefe 100%); /* IE10+ */
-	background: linear-gradient(to bottom, #e8f5f8 0%, #f5fafb 60%, #fefefe 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e8f5f8', endColorstr='#fefefe', GradientType=0); /* IE6-9 */
 }
 
 #indi_header h3 {
-	color: #555;
+	font-size: 90%;
 	font-weight: bold;
 	margin: 0;
 	padding: 0 10px 0 30px;
@@ -3026,27 +1877,18 @@ span.link_text {
 	font-size: 1.5em;
 }
 
-#indi_header h3 span.details1 {
-	font-size: 1em;
-}
-
-#indi_header h3.person_box {
-	background-color: #f0f9ff;
-	border: 1px solid #84beff;
-}
-
-#indi_header h3.person_boxF {
-	background-color: #fff0f0;
-	border: 1px solid #ff2080;
+#indi_header h3 .details1 {
+	font-size: 1.0em;
 }
 
+#indi_header h3.person_box,
+#indi_header h3.person_boxF,
 #indi_header h3.person_boxNN {
-	background-color: #fff;
-	border: 1px dashed #008080;
+	border: 1px solid #2694e8;
 }
 
 #indi_header h3 .header_age {
-	padding: 5px 0 5px 15px;
+	padding: 5px 0 5px 5px;
 	float: right;
 	font-weight: normal;
 	font-size: 65%;
@@ -3066,17 +1908,18 @@ span.link_text {
 	color: #f00;
 }
 
-#main_name {
-	color: #555;
+#indi_mainimage {
 	float: left;
-	font-size: 2em;
-	margin: 10px;
-	font-weight: bold;
+	padding: 0 10px;
 }
 
 #header_accordion1 {
+	padding: 0 10px 0 0;
 	overflow: hidden;
-	padding: 0 10px;
+}
+
+[dir='rtl'] #header_accordion1 {
+	padding: 0 0 0 10px;
 }
 
 #header_accordion1 .indi_name_details {
@@ -3085,29 +1928,49 @@ span.link_text {
 	padding: 5px;
 }
 
-#indi_header a.warning {
-	color: #f00;
-	font-size: 1em;
-}
-
 .indi_name_details dt:after {
 	content: ":";
 }
 
 .indi_name_details .name1 {
-	color: #000;
 	font-weight: normal;
 	padding-top: 5px;
 	font-size: inherit;
 }
 
+#indi_header a.warning {
+	color: #f00;
+	font-size: 1em;
+}
+
 #indi_note {
 	margin: 0 0 5px;
 }
 
+.indi_table {
+	clear: left;
+}
+
+#sex {
+	float: right;
+}
+
+#dates {
+	float: right;
+}
+
+dd .editlink,
+dd .deletelink {
+	float: right;
+}
+
 #indi_note .fact_NOTE {
 	float: left;
-	margin: 0 10px 0 0;
+	margin: 0 5px 0 0;
+}
+
+#indi_note .fact_SOUR {
+	margin: 3px 0;
 }
 
 #indi_note .fact_SOUR a {
@@ -3138,38 +2001,16 @@ span.link_text {
 	padding: 3px;
 }
 
-.indi_table {
-	clear: left;
-}
-
-#sex {
-	float: right;
-}
-
-#dates {
-	color: #555;
-	float: right;
-}
-
-dd .editlink,
-dd .deletelink {
-	float: right;
-}
-
 [dir=rtl] #indi_header h3 {
 	padding: 0 30px 0 10px;
 	text-align: right;
 }
 
 [dir=rtl] #indi_header h3 .header_age {
-	padding: 5px 15px 5px 0;
+	padding: 5px 5px 5px 0;
 	float: left;
 }
 
-[dir=rtl] #main_name {
-	float: right;
-}
-
 [dir=rtl] #indi_mainimage {
 	float: right;
 }
@@ -3196,7 +2037,13 @@ dd .deletelink {
 	float: left;
 }
 
-/* INDI IMAGE SPRITE */
+.hit-counter {
+	background: #000;
+	color: #fff;
+	font-weight: bold;
+}
+
+/* ======= General sprite ==== */
 .male_gender,
 .female_gender,
 .unknown_gender,
@@ -3243,7 +2090,7 @@ dd .deletelink {
 	height: 16px;
 }
 
-/* =========== Indi tabs ================== */
+/* ======== Indi tabs ======== */
 /* Facts & Events tab */
 #personal_facts_content .fact_NOTE,
 #personal_facts_content .fact_SOUR,
@@ -3284,7 +2131,7 @@ dd .deletelink {
 	padding-right: 5px;
 }
 
-/* Album tab */
+/* ======== Album tab =========*/
 .album-list {
 	list-style-type: none;
 }
@@ -3317,140 +2164,23 @@ dd .deletelink {
 	width: 100%;
 }
 
-/* ========= jquery-ui.custom.css changes ============ */
-.ui-widget-content {
-	color: #000;
-	border-color: #999;
-}
-
-.ui-widget-content a {
-	color: #00f;
-}
-
-.ui-widget-content a:hover {
-	color: #f00;
-}
-
-.ui-state-active,
-.ui-widget-content .ui-state-active {
-	border: 1px solid #c3dfff;
-	background: #c3dfff;
-	font-weight: normal;
-	color: #000;
-	outline: none;
-}
-
-.ui-state-active .ui-icon {
-	background-image: url(../jquery-ui-1.11.2/images/ui-icons_222222_256x240.png);
-}
-
-.ui-state-default .ui-icon {
-	background-image: url(../jquery-ui-1.11.2/images/ui-icons_222222_256x240.png);
-}
-
-.ui-tabs,
-.ui-tabs .ui-tabs-nav li a {
-	padding: 0;
-}
-
-.ui-tabs .ui-tabs-nav li a span {
-	padding: .5em 1em;
-}
-
-.ui-tabs .ui-tabs-nav {
-	padding: .3em .3em 0;
-	border-color: #888;
-}
-
-.ui-tabs .ui-tabs-nav li {
-	font-size: 1em;
-	bottom: 0;
-	margin: 0 0.15em 0 0.1em;
-	border-color: #888;
-	background: #eff8f8;
-}
-
-.ui-tabs .ui-tabs-nav li a {
-	color: #555;
-}
-
-.ui-tabs .ui-tabs-nav li:hover {
-	color: #f00;
-	background: #dfe8e8;
-}
-
-.ui-tabs .ui-tabs-nav li a:hover {
-	color: #f00;
-}
-
-.ui-tabs-nav li.ui-tabs-active {
-	color: #00f;
-	padding-top: 0;
-	top: 1px;
-	bottom: 0;
-	border-color: #888;
-	border-bottom-width: 0;
-	background: #f8f8f8;
-}
-
-.ui-tabs-nav li.ui-tabs-active a {
-	font-weight: 600;
-	color: #00f;
-}
-
-.ui-tabs-nav li.ui-tabs-active a:hover {
-	font-weight: 600;
-	color: #00f;
-	background: #f8f8f8;
-}
-
-.ui-tabs-nav li.ui-tabs-active:hover {
-	background: #f8f8f8;
-}
-
-.ui-tabs .ui-tabs-panel {
-	background: #f8f8f8;
-}
-
-.ui-accordion .ui-accordion-header .ui-icon {
-	position: absolute;
-	left: .5em;
-	top: 50%;
-	margin-top: -8px;
-}
-
+/* === jquery-ui.css changes === */
 .ui-accordion .ui-accordion-content {
-	border-top: 0;
-	margin-top: 1px;
+	border: 0;
 	position: relative;
-	top: 1px;
 	padding: 0 5px;
 	overflow: visible;
-	display: none;
-}
-
-.ui-accordion .ui-accordion-content-active {
-	display: block;
 }
 
-.ui-accordion .ui-accordion-header a {
-	padding: 0.5em;
-}
-
-.ui-helper-reset {
-	line-height: 1.6;
-}
-
-.ui-state-highlight a {
-	color: #f00;
+#sidebarAccordion .ui-accordion-header {
+	text-align: center;
 }
 
-[dir=rtl] .ui-tabs {
-	direction: rtl;
+.ui-widget-header {
+	padding: 3px;
 }
 
-[dir=rtl] .ui-tabs .ui-tabs-nav li.ui-tabs-active,
-[dir=rtl] .ui-tabs .ui-tabs-nav li.ui-state-default {
+[dir=rtl] .ui-tabs .ui-tabs-nav li {
 	float: right;
 }
 
@@ -3467,13 +2197,13 @@ dd .deletelink {
 	right: auto;
 }
 
-/* ========= jQuery.datatable styling over-rides ============ */
+/* === jQuery.datatable styling general over-rides === */
 .odd {
-	background-color: #dcdcdc;
+	background-color: #e7eef3;
 }
 
 .even {
-	background-color: #fff;
+	background-color: #e6e6e6;
 }
 
 .css_right {
@@ -3486,22 +2216,22 @@ dd .deletelink {
 
 .dataTables_paginate {
 	float: left;
-	margin: 5px;
+	margin-bottom: 3px;
 }
 
 .dataTables_processing {
 	float: left;
-	margin: 5px;
 }
 
 .dataTables_filter {
 	float: right;
-	margin: 4px;
+	font-weight: normal;
 }
 
 .dataTables_info {
 	float: left;
-	margin: 5px;
+	font-weight: normal;
+	padding: 4px;
 }
 
 .recent_changes_block .dataTables_info,
@@ -3519,12 +2249,12 @@ dd .deletelink {
 
 .upcoming_events_block button,
 .todays_events_block button {
-	margin: 5px 20px;
+	margin: 0 20px;
 }
 
 .dataTables_length {
 	float: right;
-	margin: 5px;
+	font-weight: normal;
 }
 
 .dataTables_length select,
@@ -3533,10 +2263,6 @@ dd .deletelink {
 	padding: 1px;
 }
 
-.ui-widget-header {
-	font-weight: normal;
-}
-
 .dt-clear {
 	clear: both;
 }
@@ -3558,6 +2284,10 @@ dd .deletelink {
 	top: 50%;
 }
 
+.dataTables_wrapper {
+	margin-bottom: 10px;
+}
+
 [dir=rtl] .css_right {
 	float: right;
 }
@@ -3592,186 +2322,7 @@ dd .deletelink {
 	margin-right: -20px;
 }
 
-/* ========= List styles ================= */
-.source-list,
-.note-list,
-.repo-list,
-.media-list,
-.indi-list,
-.fam-list {
-	margin: 5px auto;
-	visibility: hidden;
-	width: 98%;
-}
-
-.surname-list,
-.givn-list {
-	margin: 5px auto;
-}
-
-.source-list table,
-.note-list table,
-.repo-list table,
-.media-list table,
-.indi-list table,
-.fam-list table {
-	width: 100%;
-}
-
-.source-list td,
-.note-list td,
-.repo-list td,
-.media-list td,
-.indi-list td,
-.fam-list td,
-.recent_changes_block td,
-.upcoming_events_block,
-.surname-list td,
-.givn-list td {
-	padding: 2px 5px;
-}
-
-.indi-list td,
-.fam-list td {
-	color: #555;
-}
-
-.surname-list td {
-	vertical-align: top;
-}
-
-.indi-list .stats,
-.fam-list .stats {
-	margin: 0 auto;
-	width: auto;
-}
-
-.source-list th,
-.note-list th,
-.repo-list th,
-.media-list th,
-.indi-list th,
-.fam-list th,
-.recent_changes_block th,
-.upcoming_events_block th,
-.todays_events_block th,
-.todo_block th,
-.yahrzeit_block th,
-.surname-list th,
-.givn-list th {
-	cursor: pointer;
-	white-space: nowrap;
-}
-
-.source-list th:last-child,
-.note-list th:last-child,
-.repo-list th:last-child {
-	margin: 0 -2px 1px 1px;
-	padding: 3px 0 4px;
-	width: 24px;
-}
-
-.givn-list th {
-	cursor: pointer;
-	white-space: nowrap;
-	padding: 2px;
-	text-align: center;
-}
-
-#source-details h2,
-#sourcelist-page h2,
-#note-details h2,
-#notelist-page h2,
-#repo-details h2,
-#repolist-page h2,
-#media-details h2,
-#medialist-page h2,
-#statistics-page h2 {
-	margin-bottom: 20px;
-	text-align: center;
-}
-
-#source-tabs,
-#note-tabs,
-#repo-tabs,
-#media-tabs {
-	margin: auto;
-	visibility: hidden;
-	width: 80%;
-}
-
-#statistics_chart {
-	margin: auto;
-	visibility: hidden;
-	width: 90%;
-}
-
-#source-edit,
-#note-edit,
-#repo-edit,
-#media-edit {
-	overflow-x: auto;
-}
-
-.media-list td img {
-	display: block;
-	height: 40px;
-	width: auto;
-	margin: 3px auto;
-}
-
-.filtersH,
-.filtersF {
-	margin: 4px;
-}
-
-.filtersH img {
-	margin-bottom: 2px;
-}
-
-.filtersH .ui-state-default,
-.filtersF .ui-state-default {
-	margin: 0 2px;
-	padding: 2px;
-}
-
-.loading-image {
-	background: transparent url(images/loading.gif) 50% 50% no-repeat;
-	height: 50px;
-	margin: 50px;
-}
-
-#search-result-tabs,
-#places-tabs {
-	margin: auto;
-	width: 98%;
-	visibility: hidden;
-}
-
-#search-result-tabs h3 {
-	text-align: center;
-}
-
-#searchAccordion-indi,
-#searchAccordion-fam,
-#searchAccordion-source,
-#searchAccordion-note {
-	margin: auto;
-	width: 99%;
-}
-
-#place-hierarchy h2,
-#place-hierarchy h4 {
-	text-align: center;
-}
-
-[dir=rtl] .source-list th:last-child,
-[dir=rtl] .note-list th:last-child,
-[dir=rtl] .repo-list th:last-child {
-	margin: 0 1px 1px -2px;
-}
-
-/* ========= Sidebar ============== */
+/* ======= Sidebar setup ===== */
 #main {
 	min-width: 600px;
 	width: 100%;
@@ -3783,6 +2334,14 @@ dd .deletelink {
 	display: table-cell;
 }
 
+#indi_left .ui-tabs-panel {
+	padding: 0;
+}
+
+#indi_left .ui-tabs-nav {
+	margin: 0 2px;
+}
+
 #tabs {
 	background-color: #fff;
 	border-color: #ddd;
@@ -3794,16 +2353,7 @@ dd .deletelink {
 	float: right;
 }
 
-#sidebarAccordion {
-	width: auto;
-}
-
-#sidebarAccordion h3 {
-	height: 30px;
-	text-align: center;
-	border-color: #999;
-}
-
+/* sidebar */
 #sidebar {
 	width: 20%;
 	display: table-cell;
@@ -3821,8 +2371,8 @@ dd .deletelink {
 #separator:after {
 	position: absolute;
 	top: 0;
-	left: auto;
 	right: 0;
+	left: auto;
 	width: 10px;
 	height: 99999px;
 	content: "";
@@ -3832,8 +2382,8 @@ dd .deletelink {
 }
 
 [dir=rtl] #separator:after {
-	left: 0;
 	right: auto;
+	left: 0;
 }
 
 .separator-hidden:after,
@@ -3846,14 +2396,14 @@ dd .deletelink {
 	background: #c3dfff url(images/indi_sprite.png) no-repeat -1px 100px;
 }
 
-/* ============== Sidebar content items ============== */
+/* Sidebar content items */
 /* Family navigator */
 #sb_content_family_nav {
 	padding: 0;
 }
 
 #sb_family_nav_content {
-	margin-top: 2px;
+	margin-top: 8px;
 }
 
 .nam a:hover {
@@ -3862,17 +2412,15 @@ dd .deletelink {
 
 .nav_content {
 	width: 100%;
-	padding: 10px 0;
+	padding: 0;
 }
 
 .nav_content .facts_label {
 	width: 75px;
 }
 
-.famnav_link {
-	font-size: 12px;
-	padding: 0;
-	width: 100%;
+#sb_family_nav_content .clist {
+	margin: 0;
 }
 
 .famnav_title {
@@ -3883,7 +2431,6 @@ dd .deletelink {
 
 .flyout {
 	left: 40px;
-	padding: 3px;
 }
 
 [dir=rtl] .flyout {
@@ -3898,25 +2445,23 @@ dd .deletelink {
 }
 
 .flyout2 {
-	font-weight: 700;
+	font-weight: bold;
 }
 
 .flyout3 {
-	cursor: pointer;
 	color: #362b36;
 }
 
 .flyout3:hover {
+	cursor: pointer;
 	color: #f00;
 }
 
-.sb_indi_surname_li,
-.sb_fam_surname_li {
-	list-style-image: url(images/plus.png);
-	white-space: nowrap;
+/* Sidebar*/
+#sb_content_descendancy {
+	margin-top: 5px;
 }
 
-/* Descendancy */
 #sb_desc_content {
 	margin-left: 3px;
 	font-size: 0.8em;
@@ -3951,21 +2496,27 @@ dd .deletelink {
 	margin-left: 0;
 }
 
-/* Individuals, Families */
+/* Individuals and Families */
+#sb_content_individuals,
+#sb_content_families {
+	margin-top: 5px;
+}
+
 .sb_indi_surname_li,
 .sb_fam_surname_li {
 	list-style-image: url(images/plus.png);
 }
 
-.name_tree_div li,
-.name_tree_div_visible li {
-	white-space: normal;
-}
-
 .name_tree_div {
 	display: none;
 }
 
+.name_tree_div ul,
+.name_tree_div_visible ul {
+	padding: 0;
+	margin: 0;
+}
+
 .name_tree_div li,
 .name_tree_div_visible li {
 	list-style: none;
@@ -3973,22 +2524,21 @@ dd .deletelink {
 	padding: 0;
 }
 
-.name_tree_div ul,
-.name_tree_div_visible ul {
+/* Clippings */
+#sb_content_clippings {
+	margin-top: 5px;
+}
+
+#sb_clippings_content ul {
 	padding: 0;
 	margin: 0;
 }
 
-/* Clippings */
 #sb_clippings_content li {
 	list-style: none;
 	margin: 0;
 	padding: 0;
-}
-
-#sb_clippings_content ul {
-	padding: 0;
-	margin: 0;
+	white-space: nowrap;
 }
 
 /* Extra info */
@@ -4027,7 +2577,7 @@ dd .deletelink {
 	float: left;
 }
 
-/* ============== find.php ======================= */
+/* ===== find.php =====  */
 #find-page h3,
 #find-page h4 {
 	margin: 10px;
@@ -4035,7 +2585,8 @@ dd .deletelink {
 }
 
 #find-header {
-	background-color: #c3dfff;
+	background-color: #81a9cb;
+	border: 1px outset #81a9cb;
 	margin: 10px auto;
 	padding: 5px 20px;
 	width: 50%;
@@ -4047,19 +2598,20 @@ dd .deletelink {
 }
 
 #find-header span {
+	color: #fff;
 	font-weight: bold;
 }
 
 #find-output,
 #find-output-special {
-	background-color: #ecf5ff;
-	border: 1px solid #c3dfff;
+	background-color: #edf7f9;
+	border: 1px outset #81a9cb;
 	margin: 20px 5px;
 	padding: 10px;
 }
 
 #find-output p {
-	border-top: 1px solid #c3dfff;
+	border-top: 1px solid #81a9cb;
 	font-weight: bold;
 	margin: 0;
 	padding-top: 10px;
@@ -4067,7 +2619,9 @@ dd .deletelink {
 }
 
 #find-media {
-	background-color: #c3dfff;
+	background-color: #81a9cb;
+	border: 1px outset #81a9cb;
+	color: #fff;
 	padding: 5px;
 	text-align: center;
 }
@@ -4080,12 +2634,12 @@ dd .deletelink {
 }
 
 #find-output .find-media-dirs {
-	border-bottom: 1px solid #c3dfff;
+	border-bottom: 1px solid #81a9cb;
 	padding: 3px;
 }
 
 #find-output .find-media-media {
-	border: 1px solid #c3dfff;
+	border: 1px solid #81a9cb;
 	overflow: hidden;
 	margin: 1px;
 	padding: 2px;
@@ -4126,7 +2680,7 @@ dd .deletelink {
 	text-align: inherit;
 }
 
-/* ============== search.php ======================= */
+/* ===== search.php ===== */
 #search-page h2,
 #search_submit {
 	margin: 20px;
@@ -4134,14 +2688,16 @@ dd .deletelink {
 }
 
 #search-page-table {
-	background-color: #c3dfff;
-	border: 1px solid #c3dfff;
+	background-color: #81a9cb;
+	border: 1px outset #ccc;
 	border-top: 0;
 	margin: 20px auto 0;
 	width: 580px;
 }
 
 #search-page-table .label {
+	border-top: 1px solid #ccc;
+	color: #fff;
 	float: left;
 	font-weight: bold;
 	padding: 5px 10px 0;
@@ -4149,8 +2705,8 @@ dd .deletelink {
 }
 
 #search-page-table .value {
-	background-color: #ecf5ff;
-	border-top: 1px solid #c3dfff;
+	background-color: #edf7f9;
+	border-top: 1px solid #ccc;
 	margin: 0 0 0 170px;
 	padding: 5px;
 	white-space: nowrap;
@@ -4168,7 +2724,7 @@ dd .deletelink {
 	margin: 0 170px 0 0;
 }
 
-/* ============== edituser.php ======================= */
+/*  edituser.php  */
 #edituser-page h2,
 #edituser_submit {
 	margin: 20px;
@@ -4176,14 +2732,16 @@ dd .deletelink {
 }
 
 #edituser-table {
-	background-color: #c3dfff;
-	border: 1px solid #c3dfff;
+	background-color: #81a9cb;
+	border: 1px outset #ccc;
 	border-top: 0;
 	margin: 20px auto 0;
 	width: 800px;
 }
 
 #edituser-table .label {
+	border-top: 1px solid #ccc;
+	color: #fff;
 	float: left;
 	font-weight: bold;
 	padding: 5px 10px 0;
@@ -4192,8 +2750,8 @@ dd .deletelink {
 }
 
 #edituser-table .value {
-	background-color: #ecf5ff;
-	border-top: 1px solid #c3dfff;
+	background-color: #edf7f9;
+	border-top: 1px solid #ccc;
 	margin: 0 0 0 260px;
 	padding: 5px;
 }
@@ -4214,61 +2772,665 @@ dd .deletelink {
 	margin: 0 260px 0 0;
 }
 
-/* ======= Who is online block ========== */
-.logged_in_list {
-	margin: 5px 0 0;
+/* ===== Edit interface pop-ups ===== */
+#edit_interface-page h4 {
+	color: #555;
+	margin: 5px;
+}
+
+#edit_interface-page .optionbox span {
+	margin: 0 5px;
+}
+
+#edit_interface-page #LATI,
+#edit_interface-page #LONG,
+#edit_interface-page #SPFX,
+#edit_interface-page #NSFX,
+#edit_interface-page #NPFX {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 88px;
+}
+
+#edit_interface-page #GIVN,
+#edit_interface-page #SURN,
+#edit_interface-page #_MARNM {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 180px;
+}
+
+#edit_interface-page input[type="text"],
+#edit_interface-page #NAME_display {
+	line-height: 18px;
+	margin: 0 5px;
+	vertical-align: top;
+	width: 240px;
+}
+
+#edit_interface-page input[type="text"][id*="PAGE"],
+#edit_interface-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR"],
+#edit_interface-page input[type="text"][id*="REPO"],
+#edit_interface-page input[type="text"][id*="OBJE"],
+#edit_interface-page input[type="text"][id*="FAMC"],
+#edit_interface-page input[type="text"][id*="ASSO"],
+#edit_interface-page input[type="text"][id^="AGE"],
+#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 250px;
+}
+
+#edit_interface-page input[type="text"][id$="DATE"] {
+	width: 160px;
+}
+
+#edit_interface-page input[type="text"][id^="TIME"] {
+	width: 100px;
+}
+
+#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
+	width: 200px;
+}
+
+#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
+	width: 250px;
+}
+
+#edit_interface-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#edit_interface-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#edit_interface-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#edit_interface-page textarea[id*="TEXT"],
+#edit_interface-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+#edit_interface-page textarea[id^="newgedrec"] {
+	line-height: 18px;
+	width: 605px;
+}
+
+#edit_interface-page textarea#gedcom {
+	height: 364px;
+}
+
+#edit_interface-page textarea[id*="ADDR"],
+#edit_interface-page input[id*="ADDR"] {
+	height: 80px;
+	width: 300px;
+}
+
+#edit_interface-page #changefam {
+	padding: 5px;
+}
+
+#edit_interface-page #changefam table {
+	margin: 10px auto;
+	min-width: 400px;
+	max-width: 650px;
+}
+
+#edit_interface-page #changefam span {
+	margin: 0;
+}
+
+#edit_interface-page #changefam td {
+	padding: 5px;
+	white-space: normal;
+}
+
+#edit_interface-page #changefam td.child {
+	text-align: center;
+}
+
+#save-cancel {
+	position: fixed;
+	bottom: 0;
+	background-color: #d1d9ef;
+	width: 98%;
+	border: solid #81a9cb 1px;
+	margin: 0;
+}
+
+#save-cancel input {
+	padding: 2px 8px;
+}
+
+#save-cancel .save {
+	float: left;
+	margin: 5px;
+}
+
+#save-cancel .cancel {
+	float: right;
+	margin: 5px;
+}
+
+[dir=rtl] #save-cancel .save {
+	float: right;
+}
+
+[dir=rtl] #save-cancel .cancel {
+	float: left;
+}
+
+#edit_interface-page,
+#addmedia-page {
+	margin-bottom: 50px;
+}
+
+/* ===== Addmedia pop-ups ===== */
+#addmedia-page input[type="text"] {
+	line-height: 18px;
+	margin: 0 5px;
+	width: 300px;
+}
+
+#addmedia-page .optionbox select {
+	margin: 0 5px;
+}
+
+#addmedia-page .optionbox p.sub{
+	margin: 0 5px;
+	font-size: 11px;
+}
+
+#addmedia-page input[type="text"][id*="PAGE"],
+#addmedia-page input[type="text"][id*="_UID"] {
+	width: 350px;
+}
+
+#addmedia-page input[type="text"][id*="SOUR"],
+#addmedia-page input[type="text"][id*="REPO"],
+#addmedia-page input[type="text"][id*="OBJE"],
+#addmedia-page input[type="text"][id*="FAMC"],
+#addmedia-page input[type="text"][id*="ASSO"],
+#addmedia-page input[type="text"][id^="AGE"],
+#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
+	width: 70px;
+}
+
+#addmedia-page input[id*="TEXT"] {
+	height: 140px;
+	width: 440px;
+}
+
+#addmedia-page textarea {
+	margin: 0 5px;
+	width: 440px;
+}
+
+#addmedia-page textarea[id*="NOTE"] {
+	height: 240px;
+}
+
+#addmedia-page textarea[id*="TEXT"],
+#addmedia-page textarea[id*="PUBL"] {
+	height: 140px;
+}
+
+/* ===== Styling for the jquery.colorbox gallery ===== */
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+#colorbox {
+	border: 2px solid #ccc;
+}
+
+#cboxOverlay {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	background: #ccc;
+}
+
+#cboxContent {
+	background: #fff;
+	border: 5px solid #888;
+}
+
+#cboxLoadedContent {
+	overflow: auto;
+	background: #fff;
+	margin-bottom: 30px;
+	margin-top: 35px;
+}
+
+#cboxTitle {
+	position: absolute;
+	left: 0;
+	top: 10px;
+	font-size: 14px;
+	color: #949494;
+	text-align: center;
+	width: 100%;
+	font-weight: 800;
+}
+
+.cboxPhoto {
+	float: left;
+	margin: auto;
+	border: 0;
+	display: block;
+	max-width: none;
+}
+
+.cboxIframe {
+	width: 100%;
+	height: 100%;
+	display: block;
+	border: 0;
+}
+
+#cboxPrevious {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	background: url(images/controls.png) no-repeat -75px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxPrevious:hover {
+	background-position: -75px -25px;
+}
+
+#cboxNext {
+	position: absolute;
+	bottom: 0;
+	left: 27px;
+	background: url(images/controls.png) no-repeat -50px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxNext:hover {
+	background-position: -50px -25px;
+}
+
+#cboxSlideshow {
+	position: absolute;
+	bottom: 5px;
+	font-size: 14px;
+	left: 57px;
+	margin: 10px;
+	border: 0;
+	background: none;
+}
+
+#cboxSlideshow:hover {
+	color: #f00;
+	background: #fff;
+}
+
+#cboxClose {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	background: url(images/controls.png) no-repeat -25px 0;
+	width: 25px;
+	height: 25px;
+	text-indent: -9999px;
+	margin: 10px;
+	border: 0;
+}
+
+#cboxClose:hover {
+	background-position: -25px -25px;
+}
+
+#cboxCurrent {
+	bottom: 4px;
+	color: #949494;
+	left: 58px;
+	position: absolute;
+}
+
+[dir=rtl] #cboxPrevious {
+	right: 27px;
+	left: auto;
+}
+
+[dir=rtl] #cboxNext {
+	right: 0;
+	left: auto;
+}
+
+[dir=rtl] #cboxCurrent {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxClose {
+	right: auto;
+	left: 0;
+}
+
+[dir=rtl] #cboxSlideshow {
+	right: 57px;
+	left: auto;
+}
+
+/* ===== Census assistant module ===== */
+table.table-census-assistant th {
+	font-weight: bold;
+	text-align: left;
+}
+
+/* Stories module */
+.story_title {
+	padding-top: 12px;
+	font-size: 13px;
+	height: 32px;
+	font-weight: bold;
+}
+
+.story_body {
+	padding: 20px;
+	white-space: normal;
+}
+
+.story_edit {
+	padding: 12px;
+}
+
+.btn-group {
+	display: inline-block;
+	margin: 0 4px;
+}
+
+.btn-group button:first-child,
+[dir=rtl] .btn-group button:last-child {
+	border-radius: 3px 0 0 3px;
+}
+
+.btn-group button:last-child,
+[dir=rtl] .btn-group button:first-child {
+	border-radius: 0 3px 3px 0;
+}
+
+/* ====== Charts Styles ======== */
+#compact_chart,
+#fan_chart,
+.chart_common,
+#ancestry_booklet,
+#descendancy_booklet,
+#familybook_chart,
+#hourglass_chart {
+	margin: 20px;
+}
+
+/* styles for vertical lines in ancestry and descendancy charts */
+.chart_common li {
+	list-style: none;
+}
+
+.chart_common li > span.details1 {
+	white-space: nowrap;
+}
+
+.chart_common .generation {
+	background: transparent url(images/vline.png) left top repeat-y;
+	margin: 0 0 0 15px;
 	padding: 0;
-	line-height: 20px;
+	display: block;
 }
 
-@media print {
-	header,
-	footer,
-	#backprint,
-	#sidebar,
-	#separator,
-	form,
-	#CB_All,
-	.noprint {
-		display: none !important;
-	}
+[dir=rtl] .chart_common .generation {
+	margin: 0 15px 0 0;
+	background-position: right top
+;
+}
 
-	#pedigree_chart {
-		right: auto;
-		left: -80px;
-	}
+.chart_common .generation > li {
+	margin: 5px 0;
+}
 
-	#header_accordion1 {
-		width: 500px !important;
-	}
+.chart_common table {
+	padding: 0;
+	border-spacing: 0;
+	border-collapse: collapse;
+	margin: 5px 0;
+}
 
-	[dir=rtl] #pedigree_chart {
-		left: auto;
-		right: -80px;
-	}
+.chart_common td {
+	border: 0;
+	padding: 0;
+}
 
-	#familybook_chart h3 {
-		margin-bottom: 10px;
-	}
+.chart_common span.details1 div[class^=fact_] {
+	display: inline-block;
+}
 
-	.lifespan_outer {
-		position: relative;
-		width: auto;
-		height: auto;
-		overflow: visible;
-		border: 0;
-	}
+.chart_common span.details1 .date {
+	color: inherit;
+}
 
-	.lifespan_people {
-		position: absolute;
-		width: auto;
-		left: -10px;
-		top: -60px;
-		z-index: 1;
-	}
+/*-- Family book  --*/
+#familybook_chart {
+	margin-left: 10px;
+}
+
+#familybook_chart table {
+	border-collapse: collapse;
+	empty-cells: show;
+}
+
+#familybook_chart td {
+	margin: 0;
+	padding: 0;
+}
+
+#familybook_chart h2 {
+	text-align: center;
+}
+
+#familybook_chart .line3,
+#familybook_chart .pvline,
+#familybook_chart .spacer {
+	width: 3px;
+}
+
+#familybook_chart .line4 {
+	width: 7px;
+	vertical-align: middle;
+}
+
+[ID^="vline"] {
+	width: 3px;
+}
+
+#familybook_chart h3 {
+	color: #006;
+	font-size: 16px;
+	text-align: center;
+}
+
+[dir=rtl] #familybook_chart {
+	margin-right: 10px;
+}
+
+/*-- Fan chart ---- */
+.fan_chart_menu {
+	position: absolute;
+	display: none;
+	z-index: 100;
+}
+
+#fan_chart ul {
+	list-style-type: none;
+	margin: 0;
+}
+
+#fan_chart ul.children li:before {
+	content: "< ";
+	font-weight: bold;
+}
+
+#fan_chart_img {
+	text-align: center;
+}
+
+/*-- Hourglass ---- */
+#hourglass_chart img.line4 {
+	vertical-align: middle;
+}
+
+#hourglass_chart table,
+.charts_block table {
+	border-collapse: collapse;
+}
+
+#hourglass_chart td,
+.charts_block td {
+	padding: 0;
+	empty-cells: show;
+}
+
+/*-- Lifespan ---- */
+#lifespan-page .person0 {
+	padding: 5px;
+}
+
+#lifespan-page .person0 div{
+	text-align: center;
+}
+
+#lifespan_chart .div-controls {
+	opacity: 0.67;
+	position: relative;
+	top: 80px;
+	width: 180px;
+	z-index: 100;
+	margin-left: 20px;
+}
+
+.lifespan_people span:first-letter {
+	font-variant: small-caps;
+	font-size: 16px;
+	padding: 1px;
+}
+
+.lifespan_outer {
+	position: relative;
+	width: 99.5%;
+	height: 600px;
+	overflow: hidden;
+	border: solid #00f 1px;
 }
 
-/* Icons */
+.lifespan_outer a:hover {
+	color: #f00;
+	text-decoration: none;
+}
+
+.lifespan_timeline {
+	position: absolute;
+	width: 100%;
+	left: -10px;
+	top: -65px;
+	z-index: 2;
+	background-color: #fff;
+}
+
+.lifespan_people {
+	position: absolute;
+	width: 500px;
+	left: -10px;
+	top: -60px;
+	z-index: 1;
+}
+
+/*-- Pedigree ---- */
+#pedigree_chart #childbox {
+	border: 1px solid;
+	background-color: #fff;
+}
+
+.pedigree_form {
+	width: 60px;
+}
+
+#pedigree-page table.list_table {
+	margin: 0 auto;
+	width: 500px;
+}
+
+.pedigree_chart_table {
+	border: 0;
+	border-collapse: collapse;
+	padding: 0;
+	width: 100%;
+}
+
+#pedigree_chart {
+	position: relative;
+	top: -200px;
+	left: 0;
+}
+
+[dir=rtl] #pedigree_chart {
+	left: auto;
+	right: 0;
+}
+
+#pedigree_canvas {
+	color: #81a9cb;
+	position: absolute;
+	top: 200px;
+	z-index: -1000;
+}
+
+#pedigree_chart #childarrow,
+#pedigree_chart #uparrow,
+#pedigree_chart .shadow,
+.ancestorarrow {
+	position: absolute;
+}
+
+/*-- Relationship ---- */
+#relationship-page h3 {
+	margin: 20px 0 0 20px;
+}
+
+#relationship_chart {
+	margin: 0 20px;
+}
+
+/*-- timeline  --*/
+#timeline_chart {
+	position: relative;
+	top: 0;
+	left: 0;
+}
+
+/* ====== Common Icons ========= */
 [class^="icon-"],
 [class*=" icon-"] {
 	display: inline-block;
@@ -4286,6 +3448,7 @@ dd .deletelink {
 	width: 25px;
 	height: 25px;
 	background-image: url(images/admin.png);
+	margin: 0 5px;
 }
 
 .icon-bing {
@@ -4298,6 +3461,7 @@ dd .deletelink {
 	width: 18px;
 	height: 16px;
 	background-image: url(images/buttons/addmedia.png);
+	vertical-align: middle;
 }
 
 .icon-button_addnote {
@@ -4322,6 +3486,7 @@ dd .deletelink {
 	width: 19px;
 	height: 15px;
 	background-image: url(images/buttons/calendar.png);
+	vertical-align: middle;
 }
 
 .icon-button_family {
@@ -4330,6 +3495,18 @@ dd .deletelink {
 	background-image: url(images/buttons/family.png);
 }
 
+.icon-button_find {
+	width: 17px;
+	height: 15px;
+	background-image: url(images/buttons/find.png);
+}
+
+.icon-button_find {
+	width: 17px;
+	height: 15px;
+	background-image: url(images/buttons/find.png);
+}
+
 .icon-button_find_facts {
 	width: 20px;
 	height: 20px;
@@ -4352,12 +3529,14 @@ dd .deletelink {
 	width: 30px;
 	height: 15px;
 	background-image: url(images/buttons/keyboard.png);
+	vertical-align: middle;
 }
 
 .icon-button_media {
 	width: 18px;
 	height: 16px;
 	background-image: url(images/buttons/media.png);
+	vertical-align: middle;
 }
 
 .icon-button_note {
@@ -4370,6 +3549,7 @@ dd .deletelink {
 	width: 15px;
 	height: 15px;
 	background-image: url(images/buttons/place.png);
+	vertical-align: middle;
 }
 
 .icon-button_repository {
@@ -4385,9 +3565,9 @@ dd .deletelink {
 }
 
 .icon-cfamily {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/cfamily.png);
+	width: 20px;
+	height: 20px;
+	background-image: url(images/family.png);
 }
 
 .icon-childless {
@@ -4403,8 +3583,8 @@ dd .deletelink {
 }
 
 .icon-clippings {
-	width: 25px;
-	height: 25px;
+	width: 22px;
+	height: 22px;
 	background-image: url(images/clippings.png);
 }
 
@@ -4426,9 +3606,15 @@ a.icon-darrow:hover {
 	background-image: url(images/ddarrow.png);
 }
 
+a.icon-ddarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/ddarrow2.png);
+}
+
 .icon-edit_indi {
-	width: 25px;
-	height: 25px;
+	width: 20px;
+	height: 20px;
 	background-image: url(images/edit_indi.png);
 }
 
@@ -4439,9 +3625,9 @@ a.icon-darrow:hover {
 }
 
 .icon-fam-list {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/sfamily.png);
+	width: 20px;
+	height: 20px;
+	background-image: url(images/family.png);
 }
 
 .icon-googlemaps {
@@ -4452,20 +3638,15 @@ a.icon-darrow:hover {
 
 .icon-help {
 	cursor: help;
+	margin: 0 5px;
 	width: 15px;
 	height: 15px;
-	background-image: url(images/help.png);
+	background-image: url(images/help2.png);
 }
 
 .icon-indi-list {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/indis.png);
-}
-
-.icon-indis {
-	width: 25px;
-	height: 25px;
+	width: 20px;
+	height: 20px;
 	background-image: url(images/indis.png);
 }
 
@@ -4487,16 +3668,28 @@ a.icon-larrow:hover {
 	background-image: url(images/ldarrow.png);
 }
 
+a.icon-ldarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/ldarrow2.png);
+}
+
 .icon-lifespan-chunk {
 	width: 50px;
 	height: 37px;
 	background-image: url(images/lifespan-chunk.png);
 }
 
-.icon-lists {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/lists.png);
+.icon-loading-small {
+	width: 16px;
+	height: 16px;
+	background-image: url(images/indicator.gif);
+}
+
+.icon-loading-large {
+	width: 32px;
+	height: 32px;
+	background-image: url(images/loading.gif);
 }
 
 .icon-lsdnarrow {
@@ -4523,27 +3716,15 @@ a.icon-larrow:hover {
 	background-image: url(images/lifespan-up.png);
 }
 
-.icon-loading-small {
-	width: 16px;
-	height: 16px;
-	background-image: url(images/indicator.gif);
-}
-
-.icon-loading-large {
-	width: 32px;
-	height: 32px;
-	background-image: url(images/loading.gif);
-}
-
 .icon-media {
-	width: 25px;
-	height: 25px;
+	width: 20px;
+	height: 20px;
 	background-image: url(images/media.png);
 }
 
 .icon-media-list {
-	width: 25px;
-	height: 25px;
+	width: 20px;
+	height: 20px;
 	background-image: url(images/media.png);
 }
 
@@ -4584,20 +3765,20 @@ a.icon-larrow:hover {
 }
 
 .icon-mypage {
-	width: 25px;
-	height: 25px;
+	width: 24px;
+	height: 24px;
 	background-image: url(images/mypage.png);
 }
 
 .icon-note {
-	width: 50px;
-	height: 50px;
+	width: 20px;
+	height: 20px;
 	background-image: url(images/notes.png);
 }
 
 .icon-note-list {
-	width: 50px;
-	height: 50px;
+	width: 20px;
+	height: 20px;
 	background-image: url(images/notes.png);
 }
 
@@ -4607,24 +3788,6 @@ a.icon-larrow:hover {
 	background-image: url(images/osm.png);
 }
 
-.icon-patriarch {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/patriarch.png);
-}
-
-.icon-pedigree {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/pedigree.png);
-}
-
-.icon-place {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/place.png);
-}
-
 .icon-plus {
 	width: 11px;
 	height: 11px;
@@ -4649,6 +3812,12 @@ a.icon-rarrow:hover {
 	background-image: url(images/rdarrow.png);
 }
 
+a.icon-rdarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/rdarrow2.png);
+}
+
 .icon-reminder {
 	width: 15px;
 	height: 12px;
@@ -4656,21 +3825,9 @@ a.icon-rarrow:hover {
 }
 
 .icon-remove {
-	width: 16px;
-	height: 16px;
-	background-image: url(images/delete.png);
-}
-
-.icon-repo-list {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/repository.png);
-}
-
-.icon-repository {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/repository.png);
+	width: 20px;
+	height: 20px;
+	background-image: url(images/remove.png);
 }
 
 .icon-resn-confidential {
@@ -4703,12 +3860,6 @@ a.icon-rarrow:hover {
 	background-image: url(images/rings.png);
 }
 
-.icon-search {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/search.png);
-}
-
 .icon-selected {
 	width: 12px;
 	height: 12px;
@@ -4751,21 +3902,9 @@ a.icon-rarrow:hover {
 	background-image: url(images/sex_u_9x9.png);
 }
 
-.icon-sfamily {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/sfamily.png);
-}
-
 .icon-source {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/source.png);
-}
-
-.icon-source-list {
-	width: 25px;
-	height: 25px;
+	width: 20px;
+	height: 20px;
 	background-image: url(images/source.png);
 }
 
@@ -4773,12 +3912,7 @@ a.icon-rarrow:hover {
 	width: 15px;
 	height: 15px;
 	background-image: url(images/buttons/target.png);
-}
-
-.icon-tree {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/tree.png);
+	vertical-align: middle;
 }
 
 .icon-uarrow {
@@ -4799,10 +3933,10 @@ a.icon-uarrow:hover {
 	background-image: url(images/udarrow.png);
 }
 
-.icon-user_add {
-	width: 25px;
-	height: 25px;
-	background-image: url(images/user_add.png);
+a.icon-udarrow:hover {
+	width: 20px;
+	height: 20px;
+	background-image: url(images/udarrow2.png);
 }
 
 .icon-warning {
@@ -4811,23 +3945,12 @@ a.icon-uarrow:hover {
 	background-image: url(images/warning.png);
 }
 
-.icon-webtrees {
-	width: 100px;
-	height: 21px;
-	background-image: url(images/webtrees.png);
-}
-
 .icon-wiki {
 	width: 16px;
 	height: 16px;
 	background-image: url(images/w_button.png);
 }
 
-/* ios on click workaround */
-.iconz {
-	cursor: pointer;
-}
-
 .icon-zoomin {
 	width: 25px;
 	height: 25px;
@@ -4840,6 +3963,43 @@ a.icon-uarrow:hover {
 	background-image: url(images/zoomout.png);
 }
 
+/* Silhouettes on charts */
+.icon-silhouette-F {
+	width: 37px;
+	height: 50px;
+	background-image: url(images/silhouette_female_small.png);
+}
+
+.icon-silhouette-M {
+	width: 37px;
+	height: 50px;
+	background-image: url(images/silhouette_male_small.png);
+}
+
+.icon-silhouette-U {
+	width: 37px;
+	height: 50px;
+	background-image: url(images/silhouette_unknown_small.png);
+}
+
+#indi_mainimage .icon-silhouette-F {
+	width: 99px;
+	height: 106px;
+	background-image: url(images/silhouette_female.png);
+}
+
+#indi_mainimage .icon-silhouette-M {
+	width: 99px;
+	height: 99px;
+	background-image: url(images/silhouette_male.png);
+}
+
+#indi_mainimage .icon-silhouette-U {
+	width: 100px;
+	height: 97px;
+	background-image: url(images/silhouette_unknown.png);
+}
+
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
 	display: inline-block;
@@ -4848,7 +4008,7 @@ a.icon-uarrow:hover {
 	height: 48px;
 }
 
-/* Generic MIME types */
+/* ===== Generic MIME types ===== */
 [class^="icon-mime-"],
 [class*=" icon-mime-"] {
 	background-position: -99px -49px;
@@ -4879,7 +4039,7 @@ a.icon-uarrow:hover {
 	background-position: -148px -147px;
 }
 
-/* Specific MIME types */
+/* ===== Specific MIME types ===== */
 .icon-mime-application-pdf {
 	background-position: -1px -49px;
 }
@@ -4963,455 +4123,1099 @@ a.icon-uarrow:hover {
 .icon-mime-video-x-ms-wmv {
 	background-position: -50px -196px;
 }
+/* ====== End Icon styles ====== */
 
-/* Silhouettes on charts */
-.icon-silhouette-F {
-	width: 37px;
-	height: 50px;
-	background-image: url(images/silhouette_female_small.png);
+/* ====== Theme Header ========= */
+header h1 {
+	clear: left;
+	float: left;
+	font-size: 24px;
+	font-weight: normal;
+	height: 20px;
+	margin: 10px 12px;
 }
 
-.icon-silhouette-M {
-	width: 37px;
-	height: 50px;
-	background-image: url(images/silhouette_male_small.png);
+[dir=rtl] header h1 {
+	float: right;
 }
 
-.icon-silhouette-U {
-	width: 37px;
-	height: 50px;
-	background-image: url(images/silhouette_unknown_small.png);
+.header-upper {
+	height: 40px;
+	color: #fff;
+	background: #039 url(images/cabeza.png) left top;
 }
 
-/* Silhouettes on individual pages */
-#indi_mainimage {
-	float: left;
-	padding: 0 10px;
+[dir=rtl] .header-upper {
+	background: url(images/cabeza_rtl.png) right top;
 }
 
-#indi_mainimage .icon-silhouette-F {
-	width: 99px;
-	height: 106px;
-	background-image: url(images/silhouette_female.png);
+.header-search {
+	display: block;
+	float: right;
+	margin-top: 10px;
+	margin-right: 5px;
 }
 
-#indi_mainimage .icon-silhouette-M {
-	width: 99px;
-	height: 99px;
-	background-image: url(images/silhouette_male.png);
+[dir=rtl] .header-search {
+	float: left;
+	padding-left: 10px;
 }
 
-#indi_mainimage .icon-silhouette-U {
-	width: 100px;
-	height: 97px;
-	background-image: url(images/silhouette_unknown.png);
+/* Set stack level for top two header menu rows */
+.secondary-menu ul,
+.primary-menu ul {
+	z-index: 210;
 }
 
-/* Edit interface pop-ups*/
-#edit_interface-page h4 {
-	color: #555;
-	margin: 5px;
+/* ====== Secondary menu ======= */
+.header-lower {
+	background: #84beff url(images/barra.png);
+	width: 100%;
+	color: #fff;
+	font-weight: bold;
+	height: 40px;
+	position: relative;
 }
 
-#edit_interface-page .optionbox span {
-	margin: 0 5px;
+#menu-theme,
+#menu-favorites {
+	float: left;
 }
 
-#edit_interface-page #LATI,
-#edit_interface-page #LONG,
-#edit_interface-page #SPFX,
-#edit_interface-page #NSFX,
-#edit_interface-page #NPFX {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 88px;
+[dir=rtl] #menu-theme,
+[dir=rtl] #menu-favorites {
+	float: right;
 }
 
-#edit_interface-page #GIVN,
-#edit_interface-page #SURN,
-#edit_interface-page #_MARNM {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 180px;
+#menu-language {
+	float: right;
 }
 
-#edit_interface-page input[type="text"],
-#edit_interface-page #NAME_display {
-	line-height: 18px;
-	margin: 0 5px;
-	vertical-align: top;
-	width: 240px;
+[dir=rtl] #menu-language {
+	float: left;
 }
 
-#edit_interface-page input[type="text"][id*="PAGE"],
-#edit_interface-page input[type="text"][id*="_UID"] {
-	width: 350px;
+#menu-language ul {
+	left: auto;
+	right: 0;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR"],
-#edit_interface-page input[type="text"][id*="REPO"],
-#edit_interface-page input[type="text"][id*="OBJE"],
-#edit_interface-page input[type="text"][id*="FAMC"],
-#edit_interface-page input[type="text"][id*="ASSO"],
-#edit_interface-page input[type="text"][id^="AGE"],
-#edit_interface-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 250px;
+[dir=rtl] #menu-language ul {
+	left: 0;
+	right: auto;
 }
 
-#edit_interface-page input[type="text"][id$="DATE"] {
-	width: 160px;
+.secondary-menu {
+	clear: both;
+	text-align: center;
+	margin: 0;
+	list-style: none;
 }
 
-#edit_interface-page input[type="text"][id^="TIME"] {
-	width: 100px;
+.secondary-menu li {
+	display: inline-block;
+	position: relative;
+	white-space: nowrap;
+	padding: 12px 10px 0 5px;
 }
 
-#edit_interface-page input[type="text"][id*="OBJE_FILE"] {
-	width: 200px;
+.secondary-menu a {
+	color: #fff;
+	font-weight: bold;
 }
 
-#edit_interface-page input[type="text"][id*="SOUR_TITL"] {
-	width: 250px;
+.secondary-menu a:hover {
+	color: #f00;
 }
 
-#edit_interface-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+.secondary-menu ul {
+	list-style: none;
+	display: none;
+	position: absolute;
+	left: 0;
+	right: auto;
+	top: 18px;
+	background-color: #fff;
+	border: thin solid #c3dfff;
+	padding: 1px;
 }
 
-#edit_interface-page textarea {
-	margin: 0 5px;
-	width: 440px;
+[dir=rtl] .secondary-menu ul {
+	left: auto;
+	right: 0;
 }
 
-#edit_interface-page textarea[id*="NOTE"] {
-	height: 240px;
+.secondary-menu li li {
+	padding: 2px;
+	display: block;
+	text-align: left;
 }
 
-#edit_interface-page textarea[id*="TEXT"],
-#edit_interface-page textarea[id*="PUBL"] {
-	height: 140px;
+[dir=rtl] .secondary-menu li li {
+	text-align: right;
 }
 
-#edit_interface-page textarea[id^="newgedrec"] {
-	line-height: 18px;
-	width: 605px;
+[dir=rtl] li li {
+	text-align: right;
 }
 
-#edit_interface-page textarea#gedcom {
-	height: 364px;
+.secondary-menu li li a {
+	color: #000;
+	font-weight: normal;
 }
 
-#edit_interface-page textarea[id*="ADDR"],
-#edit_interface-page input[id*="ADDR"] {
-	height: 80px;
-	width: 300px;
+.secondary-menu li li a:hover {
+	color: #f00;
 }
 
-#edit_interface-page #changefam {
-	padding: 5px;
+.secondary-menu li:hover ul {
+	display: block;
 }
 
-#edit_interface-page #changefam table {
-	margin: 10px auto;
-	min-width: 400px;
-	max-width: 650px;
+.secondary-menu .active {
+	color: #006;
+	font-weight: 900;
 }
 
-#edit_interface-page #changefam span {
+/* ====== Primary menu ========= */
+header nav {
+	border-bottom: 2px solid #0073cf;
+	float: left;
+	height: 40px;
+	margin-bottom: 14px;
+	padding: 10px 0;
+	position: relative;
+	width: 100%;
+	clear: both;
+}
+
+.primary-menu,
+.primary-menu ul {
 	margin: 0;
+	list-style-type: none;
 }
 
-#edit_interface-page #changefam td {
-	padding: 5px;
-	white-space: normal;
+.primary-menu {
+	margin: 0 auto;
+	display: table;
 }
 
-#edit_interface-page #changefam td.child {
-	text-align: center;
+.primary-menu li {
+	float: left;
+	position: relative;
 }
 
-#save-cancel {
-	position: fixed;
-	bottom: 0;
-	background-color: #c3dfff;
-	margin: 0;
-	width: 98%;
+.primary-menu li li {
+	clear: both;
 }
 
-#save-cancel input {
-	padding: 2px 8px;
+.primary-menu li:hover > ul {
+	display: block;
+	position: absolute;
+	top: 0;
+	left: 100%;
+	right: auto;
+	margin-top: 0;
 }
 
-#save-cancel .save {
+.primary-menu > li:hover > ul {
+	left: 0;
+	right: auto;
+	top: 42px;
+}
+
+.primary-menu a {
+	display: block;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.primary-menu ul {
+	position: absolute;
+	display: none;
+	background: #fff;
+	border: thin solid #aaa;
+	padding: 0;
+}
+
+.primary-menu li a {
+	margin: auto;
+	padding-top: 22px;
+	width: 100%;
+}
+
+.primary-menu li li a {
+	display: block;
+	position: relative;
 	float: left;
-	margin: 5px;
+	font-size: 11px;
+	line-height: 1.5;
+	padding: 0 10px 1px 5px;
 }
 
-#save-cancel .cancel {
+.primary-menu > li {
+	background-image: url(images/sprites-top-menu.png);
+	background-repeat: no-repeat;
+	width: 80px;
+	text-align: center;
+	height: 28px;
+	line-height: 28px;
+	text-indent: 0;
+}
+
+.primary-menu li li {
+	background-image: url(images/sprites-sub-menu.png);
+	background-repeat: no-repeat;
+	height: 23px;
+	left: auto;
+	line-height: 23px;
+	text-align: left;
+	text-indent: 26px;
+	width: 100%;
+}
+
+/* Reverse left and right on RTL pages */
+[dir=rtl] .primary-menu li {
 	float: right;
-	margin: 5px;
 }
 
-[dir=rtl] #save-cancel .save {
+[dir=rtl] .primary-menu li:hover > ul {
+	right: 100%;
+	left: auto;
+}
+
+[dir=rtl] .primary-menu > li:hover > ul {
+	left: auto;
+	right: 0;
+}
+
+[dir=rtl] .primary-menu li li {
+	text-align: right;
+}
+
+[dir=rtl] .primary-menu li li a {
 	float: right;
+	padding: 1px 5px 1px 10px;
 }
 
-[dir=rtl] #save-cancel .cancel {
-	float: left;
+/* ====== End Theme Header ===== */
+
+/* ====== Theme Footer ========= */
+
+footer {
+	clear: both;
+	font-size: 12px;
+	padding-top: 10px;
+	text-align: center;
 }
 
-#edit_interface-page,
-#addmedia-page {
-	margin-bottom: 50px;
+.contact-links {
+	margin-top: 15px;
 }
 
-/* Addmedia pop-ups*/
-#addmedia-page input[type="text"] {
-	line-height: 18px;
-	margin: 0 5px;
-	width: 300px;
+.powered-by-webtrees {
+	display: inline-block;
+	margin-top: 10px;
+	width: 100px;
+	height: 21px;
 }
 
-#addmedia-page .optionbox select {
-	margin: 0 5px;
+.powered-by-webtrees:after {
+	content: url(images/powered-by-webtrees.png);
 }
 
-#addmedia-page .optionbox p.sub {
-	font-size: 11px;
-	margin: 0 5px;
+#link_change_blocks {
+	clear: both;
+	margin: 0 auto;
+	padding: 25px 0 0;
+	text-align: center;
+	width: 400px;
 }
 
-#addmedia-page input[type="text"][id*="PAGE"],
-#addmedia-page input[type="text"][id*="_UID"] {
-	width: 350px;
+#link_change_blocks span {
+	padding: 0 50px;
 }
 
-#addmedia-page input[type="text"][id*="SOUR"],
-#addmedia-page input[type="text"][id*="REPO"],
-#addmedia-page input[type="text"][id*="OBJE"],
-#addmedia-page input[type="text"][id*="FAMC"],
-#addmedia-page input[type="text"][id*="ASSO"],
-#addmedia-page input[type="text"][id^="AGE"],
-#addmedia-page input[type="text"][id*="SHARED_NOTE"] {
-	width: 70px;
+#link_change_blocks span span {
+	padding: 0 3px;
 }
 
-#addmedia-page input[id*="TEXT"] {
-	height: 140px;
-	width: 440px;
+/* ====== End Theme Footer ===== */
+
+/* ====== Theme Icons ========== */
+/* ***** Header icons **** */
+#menu-tree {
+	background-position:center -0px;
 }
 
-#addmedia-page textarea {
-	margin: 0 5px;
-	width: 440px;
+#menu-mymenu {
+	background-position:center -203px;
 }
 
-#addmedia-page textarea[id*="NOTE"] {
-	height: 240px;
+#menu-chart {
+	background-position:center -29px;
 }
 
-/* Styling for the jquery.colorbox gallery */
-#colorbox,
-#cboxOverlay,
-#cboxWrapper {
-	position: absolute;
-	top: 0;
-	left: 0;
-	z-index: 9999;
-	overflow: hidden;
+#menu-list {
+	background-position:center -58px;
 }
 
-#colorbox {
-	border: 2px solid #ccc;
+#menu-report {
+	background-position:center -116px;
 }
 
-#cboxOverlay {
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	background: #ccc;
+#menu-calendar {
+	background-position:center -87px;
 }
 
-#cboxContent {
-	background: #fff;
-	border: 5px solid #888;
+#menu-search {
+	background-position:center -145px;
 }
 
-#cboxLoadedContent {
-	overflow: auto;
-	background: #fff;
-	margin-bottom: 30px;
-	margin-top: 35px;
+#menu-help {
+	background-position:center -174px;
 }
 
-#cboxTitle {
-	position: absolute;
-	left: 0;
-	top: 10px;
-	color: #949494;
-	text-align: center;
-	width: 100%;
-	font-weight: 800;
-	font-size: 14px;
+#menu-clippings {
+	background-position:center -232px;
 }
 
-.cboxPhoto {
-	float: left;
-	margin: auto;
-	border: 0;
-	display: block;
-	max-width: none;
+#menu-indi {
+	background-position:center -261px;
 }
 
-.cboxIframe {
-	width: 100%;
-	height: 100%;
-	display: block;
-	border: 0;
+#menu-sour {
+	background-position:center -319px;
 }
 
-#cboxPrevious {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	background: url(images/controls.png) no-repeat -75px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#menu-fam {
+	background-position:center -290px;
 }
 
-#cboxPrevious:hover {
-	background-position: -75px -25px;
+#menu-obje {
+	background-position: center -377px;
 }
 
-#cboxNext {
-	position: absolute;
-	bottom: 0;
-	left: 27px;
-	background: url(images/controls.png) no-repeat -50px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+#menu-note {
+	background-position:center -348px;
 }
 
-#cboxNext:hover {
-	background-position: -50px -25px;
+#menu-repo {
+	background-position: center -406px;
 }
 
-#cboxSlideshow {
-	position: absolute;
-	bottom: 5px;
-	left: 57px;
-	margin: 10px;
-	border: 0;
-	background: none;
-	font-size: 14px;
+#menu-story {
+	background-position: center -435px;
 }
 
-#cboxSlideshow:hover {
-	color: #f00;
-	background: #fff;
+/* Header Sub-menu icons */
+#menu-admin {
+	background-position: left -644px;
 }
 
-#cboxClose {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	background: url(images/controls.png) no-repeat -25px 0;
-	width: 25px;
-	height: 25px;
-	text-indent: -9999px;
-	margin: 10px;
-	border: 0;
+[dir=rtl] #menu-admin {
+	background-position: right -644px;
 }
 
-#cboxClose:hover {
-	background-position: -25px -25px;
+#menu-branches {
+	background-position: left -414px;
 }
 
-#cboxCurrent {
-	bottom: 4px;
-	color: #949494;
-	left: 58px;
-	position: absolute;
+[dir=rtl] #menu-branches {
+	background-position: right -414px;
 }
 
-[dir=rtl] #cboxPrevious {
-	right: 27px;
-	left: auto;
+#menu-calendar-day {
+	background-position: left -506px;
 }
 
-[dir=rtl] #cboxNext {
-	right: 0;
-	left: auto;
+[dir=rtl] #menu-calendar-day {
+	background-position: right -506px;
 }
 
-[dir=rtl] #cboxCurrent {
-	right: auto;
-	left: 0;
+#menu-calendar-month {
+	background-position: left -506px;
 }
 
-[dir=rtl] #cboxClose {
-	right: auto;
-	left: 0;
+[dir=rtl] #menu-calendar-month {
+	background-position: right -506px;
 }
 
-[dir=rtl] #cboxSlideshow {
-	right: 57px;
-	left: auto;
+#menu-calendar-year {
+	background-position: left -506px;
 }
 
-/* Census assistant module */
-table.table-census-assistant th {
-	font-weight: bold;
-	text-align: left;
+[dir=rtl] #menu-calendar-year {
+	background-position: right -506px;
 }
 
-/* Stories module */
-.story_title {
-	padding-top: 12px;
-	height: 32px;
-	font-size: 13px;
-	font-weight: 700;
+#menu-chart-ancestry {
+	background-position: left -0px;
 }
 
-.story_body {
-	padding: 20px;
-	white-space: normal;
+[dir=rtl] #menu-chart-ancestry {
+	background-position: right -0px;
 }
 
-.story_edit {
-	padding: 12px;
+#menu-chart-compact {
+	background-position: left -46px;
 }
 
-/* User content in stories tab */
-#stories h2,
-#stories h3,
-#stories h4,
-#stories h5 {
-	padding-top: 20px;
+[dir=rtl] #menu-chart-compact {
+	background-position: right -46px;
 }
 
-#stories p {
-	padding-top: 8px;
+#menu-chart-descendants {
+	background-position: left -69px;
 }
 
-.btn-group {
-	display: inline-block;
-	margin: 0 4px;
+[dir=rtl] #menu-chart-descendants {
+	background-position: right -69px;
 }
 
-.btn-group button:first-child,
-[dir=rtl] .btn-group button:last-child {
-	border-radius: 3px 0 0 3px;
+#menu-chart-familybook {
+	background-position: left -92px;
 }
 
-.btn-group button:last-child,
-[dir=rtl] .btn-group button:first-child {
-	border-radius: 0 3px 3px 0;
+[dir=rtl] #menu-chart-familybook {
+	background-position: right -92px;
+}
+
+#menu-chart-fanchart {
+	background-position: left -23px;
+}
+
+[dir=rtl] #menu-chart-fanchart {
+	background-position: right -23px;
+}
+
+#menu-chart-hourglass {
+	background-position: left -115px;
+}
+
+[dir=rtl] #menu-chart-hourglass {
+	background-position: right -115px;
+}
+
+#menu-chart-lifespan {
+	background-position: left -161px;
+}
+
+[dir=rtl] #menu-chart-lifespan {
+	background-position: right -161px;
+}
+
+#menu-chart-pedigree {
+	background-position: left -184px;
+}
+
+[dir=rtl] #menu-chart-pedigree {
+	background-position: right -184px;
+}
+
+#menu-chart-pedigree_map {
+	background-position: left -207px;
+}
+
+[dir=rtl] #menu-chart-pedigree_map {
+	background-position: right -207px;
+}
+
+#menu-chart-relationship {
+	background-position: left -230px;
+}
+
+[dir=rtl] #menu-chart-relationship {
+	background-position: right -230px;
+}
+
+#menu-chart-statistics {
+	background-position: left -253px;
+}
+
+[dir=rtl] #menu-chart-statistics {
+	background-position: right -253px;
+}
+
+#menu-chart-timeline {
+	background-position: left -276px;
+}
+
+[dir=rtl] #menu-chart-timeline {
+	background-position: right -276px;
+}
+
+#menu-chart-tree {
+	background-position: left -138px;
+}
+
+[dir=rtl] #menu-chart-tree {
+	background-position: right -138px;
+}
+
+#menu-clippingsadd {
+	background-position: left -621px;
+}
+
+[dir=rtl] #menu-clippingsadd {
+	background-position: right -621px;
+}
+
+#menu-clippingscart {
+	background-position: left -621px;
+}
+
+[dir=rtl] #menu-clippingscart {
+	background-position: right -621px;
+}
+
+#menu-fam-addchil {
+	background-position: left -759px;
+}
+
+[dir=rtl] #menu-fam-addchil {
+	background-position: right -759px;
+}
+
+#menu-fam-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-fam-addfav {
+	background-position: right -736px;
+}
+
+#menu-fam-change {
+	background-position: left -759px;
+}
+
+[dir=rtl] #menu-fam-change {
+	background-position: right -759px;
+}
+
+#menu-fam-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-fam-del {
+	background-position: right -713px;
+}
+
+#menu-fam-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-fam-editraw {
+	background-position: right -667px;
+}
+
+#menu-fam-orderchil {
+	background-position: left -759px;
+}
+
+[dir=rtl] #menu-fam-orderchil {
+	background-position: right -759px;
+}
+
+#menu-help-contents {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-contents {
+	background-position: right -552px;
+}
+
+#menu-help-faq {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-faq {
+	background-position: right -552px;
+}
+
+#menu-help-genealogy {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-genealogy {
+	background-position: right -552px;
+}
+
+#menu-help-hide {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-hide {
+	background-position: right -552px;
+}
+
+#menu-help-show {
+	background-position: left -552px;
+}
+
+[dir=rtl] #menu-help-show {
+	background-position: right -552px;
+}
+
+#menu-help-technical {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-help-technical {
+	background-position: right -598px;
+}
+
+#menu-help-wiki {
+	background-position: left -575px;
+}
+
+[dir=rtl] #menu-help-wiki {
+	background-position: right -575px;
+}
+
+#menu-indi-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-indi-addfav {
+	background-position: right -736px;
+}
+
+#menu-indi-addname {
+	background-position: left -690px;
+}
+
+[dir=rtl] #menu-indi-addname {
+	background-position: right -690px;
+}
+
+#menu-indi-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-indi-del {
+	background-position: right -713px;
+}
+
+#menu-indi-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-indi-editraw {
+	background-position: right -667px;
+}
+
+#menu-indi-editsex {
+	background-position: left -690px;
+}
+
+[dir=rtl] #menu-indi-editsex {
+	background-position: right -690px;
+}
+
+#menu-list-fam {
+	background-position: left -437px;
+}
+
+[dir=rtl] #menu-list-fam {
+	background-position: right -437px;
+}
+
+#menu-list-indi {
+	background-position: left -460px;
+}
+
+[dir=rtl] #menu-list-indi {
+	background-position: right -460px;
+}
+
+#menu-list-note {
+	background-position: left -368px;
+}
+
+[dir=rtl] #menu-list-note {
+	background-position: right -368px;
+}
+
+#menu-list-obje {
+	background-position: left -299px;
+}
+
+[dir=rtl] #menu-list-obje {
+	background-position: right -299px;
+}
+
+#menu-list-plac {
+	background-position: left -322px;
+}
+
+[dir=rtl] #menu-list-plac {
+	background-position: right -322px;
+}
+
+#menu-list-repo {
+	background-position: left -345px;
+}
+
+[dir=rtl] #menu-list-repo {
+	background-position: right -345px;
+}
+
+#menu-list-sour {
+	background-position: left -391px;
+}
+
+[dir=rtl] #menu-list-sour {
+	background-position: right -391px;
+}
+
+#menu-myaccount {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-myaccount {
+	background-position: right -598px;
+}
+
+#menu-mypage {
+	background-position: left -598px;
+}
+
+[dir=rtl] #menu-mypage {
+	background-position: right -598px;
+}
+
+#menu-mypedigree {
+	background-position: left -828px;
+}
+
+[dir=rtl] #menu-mypedigree {
+	background-position: right -828px;
+}
+
+#menu-myrecord {
+	background-position: left -460px;
+}
+
+[dir=rtl] #menu-myrecord {
+	background-position: right -460px;
+}
+
+#menu-note-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-note-addfav {
+	background-position: right -736px;
+}
+
+#menu-note-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-note-del {
+	background-position: right -713px;
+}
+
+#menu-note-edit {
+	background-position: left -805px;
+}
+
+[dir=rtl] #menu-note-edit {
+	background-position: right -805px;
+}
+
+#menu-note-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-note-editraw {
+	background-position: right -667px;
+}
+
+#menu-obje-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-obje-addfav {
+	background-position: right -736px;
+}
+
+#menu-obje-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-obje-del {
+	background-position: right -713px;
+}
+
+#menu-obje-edit {
+	background-position: left -852px;
+}
+
+[dir=rtl] #menu-obje-edit {
+	background-position: right -852px;
+}
+
+#menu-obje-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-obje-editraw {
+	background-position: right -667px;
+}
+
+#menu-obje-link {
+	background-position: left -875px;
+}
+
+[dir=rtl] #menu-obje-link {
+	background-position: right -875px;
+}
+
+#menu-obje-link-fam {
+	background-position: left -437px;
+}
+
+[dir=rtl] #menu-obje-link-fam {
+	background-position: right -437px;
+}
+
+#menu-obje-link-indi {
+	background-position: left -460px;
+}
+
+[dir=rtl] #menu-obje-link-indi {
+	background-position: right -460px;
+}
+
+#menu-obje-link-sour {
+	background-position: left -391px;
+}
+
+[dir=rtl] #menu-obje-link-sour {
+	background-position: right -391px;
+}
+
+#menu-repo-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-repo-addfav {
+	background-position: right -736px;
+}
+
+#menu-repo-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-repo-del {
+	background-position: right -713px;
+}
+
+#menu-repo-edit {
+	background-position: left -897px;
+}
+
+[dir=rtl] #menu-repo-edit {
+	background-position: right -897px;
+}
+
+#menu-repo-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-repo-editraw {
+	background-position: right -667px;
+}
+
+#menu-report li {
+	background-position: left -483px;
+}
+
+[dir=rtl] #menu-report li {
+	background-position: right -483px;
+}
+
+#menu-search-advanced {
+	background-position: left -529px;
+}
+
+[dir=rtl] #menu-search-advanced {
+	background-position: right -529px;
+}
+
+#menu-search-general {
+	background-position: left -529px;
+}
+
+[dir=rtl] #menu-search-general {
+	background-position: right -529px;
+}
+
+#menu-search-replace {
+	background-position: left -529px;
+}
+
+[dir=rtl] #menu-search-replace {
+	background-position: right -529px;
+}
+
+#menu-search-soundex {
+	background-position: left -529px;
+}
+
+[dir=rtl] #menu-search-soundex {
+	background-position: right -529px;
+}
+
+#menu-sour-addfav {
+	background-position: left -736px;
+}
+
+[dir=rtl] #menu-sour-addfav {
+	background-position: right -736px;
+}
+
+#menu-sour-del {
+	background-position: left -713px;
+}
+
+[dir=rtl] #menu-sour-del {
+	background-position: right -713px;
+}
+
+#menu-sour-edit {
+	background-position: left -782px;
+}
+
+[dir=rtl] #menu-sour-edit {
+	background-position: right -782px;
+}
+
+#menu-sour-editraw {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-sour-editraw {
+	background-position: right -667px;
+}
+
+#menu-tree li {
+	background-position: left -667px;
+}
+
+[dir=rtl] #menu-tree li {
+	background-position: right -667px;
+}
+
+.icon-indis {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/indis.png);
+}
+
+.icon-patriarch {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/patriarch.png);
+}
+
+.icon-pedigree {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/pedigree.png);
+}
+
+.icon-place {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/place.png);
+}
+
+.icon-repo-list {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/repository.png);
+}
+
+.icon-repository {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/repository.png);
+}
+
+.icon-search {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/search.png);
+}
+
+.icon-sfamily {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/sfamily.png);
+}
+
+.icon-source-list {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/source.png);
+}
+
+.icon-tree {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/tree.png);
+}
+
+.icon-user_add {
+	width: 25px;
+	height: 25px;
+	background-image: url(images/user_add.png);
+}
+
+@media print {
+	header,
+	footer,
+	form,
+	#sidebar,
+	#separator,
+	.noprint {
+		display: none;
+	}
+
+	#pedigree_chart {
+		left: -30px;
+		top:  -260px;
+	}
+
+	[dir=rtl] #pedigree_chart {
+		left: auto;
+		right: -20px;
+	}
+	
+	#header_accordion1 {
+		width: 500px;
+	}
+	
+	#familybook_chart h3 {
+		margin-bottom: 10px;
+	}
+
+	.lifespan_outer {
+		position: relative;
+		width: auto;
+		height: auto;
+		overflow: visible;
+		border: 0;
+	}
+
+	.lifespan_people {
+		position: absolute;
+		width: auto;
+		left: -10px;
+		top: -60px;
+		z-index: 1;
+	}
 }
diff --git a/themes/xenea/footer.php b/themes/xenea/footer.php
deleted file mode 100644
index 7865eb974c..0000000000
--- a/themes/xenea/footer.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Footer for Xenea theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo '</main>';
-if ($view!='simple') {
-	echo '<footer>';
-	echo contact_links();
-	echo '<p class="logo">';
-	echo '<a href="', WT_WEBTREES_URL, '" target="_blank" class="icon-webtrees" title="', WT_WEBTREES, ' ', WT_VERSION, '"></a>';
-	echo '</p>';
-	if ($WT_TREE && $WT_TREE->getPreference('SHOW_STATS')) {
-		echo execution_stats();
-	}
-	if (exists_pending_change()) {
-		echo '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;">';
-		echo '<p class="error center">', WT_I18N::translate('There are pending changes for you to moderate.'), '</p>';
-		echo '</a>';
-	}
-	echo '</footer>';
-}
diff --git a/themes/xenea/header.php b/themes/xenea/header.php
deleted file mode 100644
index 86f1d8996a..0000000000
--- a/themes/xenea/header.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-// Header for xenea theme
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use WT\Auth;
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-// This theme uses the jQuery “colorbox” plugin to display images
-$this
-	->addExternalJavascript(WT_JQUERY_COLORBOX_URL)
-	->addExternalJavascript(WT_JQUERY_WHEELZOOM_URL)
-	->addInlineJavascript('activate_colorbox();')
-	->addInlineJavascript('jQuery.extend(jQuery.colorbox.settings, {width:"85%", height:"85%", transition:"none", slideshowStart:"'. WT_I18N::translate('Play').'", slideshowStop:"'. WT_I18N::translate('Stop').'"});')
-	->addInlineJavascript('
-		jQuery.extend(jQuery.colorbox.settings, {
-			title: function() {
-				var img_title = jQuery(this).data("title");
-				return img_title;
-			}
-		});
-	');
-?>
-<!DOCTYPE html>
-<html <?php echo WT_I18N::html_markup(); ?>>
-<head>
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<?php echo header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL); ?>
-	<title><?php echo WT_Filter::escapeHtml($title); ?></title>
-	<link rel="icon" href="<?php echo WT_CSS_URL; ?>favicon.png" type="image/png">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_THEME_URL; ?>jquery-ui-1.11.2/jquery-ui.css">
-	<link rel="stylesheet" type="text/css" href="<?php echo WT_CSS_URL; ?>style.css">
-	<!--[if IE 8]>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-	<![endif]-->
-</head>
-<body id="body">
-	<?php if ($view !== 'simple') { ?>
-	<header>
-		<div id="header">
-			<h1><?php echo WT_TREE_TITLE; ?></h1>
-			<div class="hsearch">
-				<form action="search.php" method="post" role="search">
-					<input type="hidden" name="action" value="general">
-					<input type="hidden" name="ged" value="<?php echo WT_GEDCOM; ?>">
-					<input type="hidden" name="topsearch" value="yes">
-					<input type="search" name="query" size="12" placeholder="<?php echo WT_I18N::translate('Search'); ?>">
-					<input type="submit" name="search" value="&gt;">
-				</form>
-			</div>
-		</div>
-		<div id="header-user-links">
-			<div id="theme-menu">
-				<ul class="makeMenu">
-					<?php echo WT_MenuBar::getThemeMenu(); ?>
-				</ul>
-			</div>
-			<div id="fav-menu">
-				<ul class="makeMenu">
-					<?php echo WT_MenuBar::getFavoritesMenu(); ?>
-				</ul>
-			</div>
-			<div id="login-menu">
-				<ul class="makeMenu">
-					<?php
-					if (Auth::check()) {
-						echo '<li><a href="edituser.php">', WT_Filter::escapeHtml(Auth::user()->getRealName()), '</a></li> <li>', logout_link(), '</li>';
-						if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
-							echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
-						}
-					} else {
-						echo '<li>', login_link(), '</li> ';
-					}
-					?>
-				</ul>
-			</div>
-			<div id="lang-menu" class="makeMenu">
-				<ul class="makeMenu">
-					<?php echo WT_MenuBar::getLanguageMenu(); ?>
-				</ul>
-			</div>
-		</div>
-		<nav>
-			<ul id="main-menu" role="menubar">
-				<?php echo WT_MenuBar::getGedcomMenu();   ?>
-				<?php echo WT_MenuBar::getMyPageMenu();   ?>
-				<?php echo WT_MenuBar::getChartsMenu();   ?>
-				<?php echo WT_MenuBar::getListsMenu();    ?>
-				<?php echo WT_MenuBar::getCalendarMenu(); ?>
-				<?php echo WT_MenuBar::getReportsMenu();  ?>
-				<?php echo WT_MenuBar::getSearchMenu();   ?>
-				<?php echo implode('', WT_MenuBar::getModuleMenus()); ?>
-			</ul>
-		</nav>
-	</header>
-	<?php } ?>
-	<?php echo WT_FlashMessages::getHtmlMessages(); ?>
-	<main id="content">
diff --git a/themes/xenea/jquery-ui-1.11.2/jquery-ui.css b/themes/xenea/jquery-ui-1.11.2/jquery-ui.css
index f6b05a7dfb..f0070a07fd 100644
--- a/themes/xenea/jquery-ui-1.11.2/jquery-ui.css
+++ b/themes/xenea/jquery-ui-1.11.2/jquery-ui.css
@@ -991,7 +991,7 @@ body .ui-tooltip {
 	background-image: url("images/ui-icons_2694e8_256x240.png");
 }
 .ui-state-active .ui-icon {
-	background-image: url("images/ui-icons_ffffff_256x240.png");
+	background-image: url("images/ui-icons_222222_256x240.png");
 }
 .ui-state-highlight .ui-icon {
 	background-image: url("images/ui-icons_2e83ff_256x240.png");
diff --git a/themes/xenea/templates/block_main_temp.php b/themes/xenea/templates/block_main_temp.php
deleted file mode 100644
index 0f0b4416e0..0000000000
--- a/themes/xenea/templates/block_main_temp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-// Template for drawing the main blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2008 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<div class="blockheader">
-		<?php echo $title; ?>
-	</div>
-	<div class="blockcontent normal_inner_block <?php echo $class; ?>">
-		<?php echo $content; ?>
-	</div>
-</div>
diff --git a/themes/xenea/templates/block_small_temp.php b/themes/xenea/templates/block_small_temp.php
deleted file mode 100644
index 37e618400c..0000000000
--- a/themes/xenea/templates/block_small_temp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-// Template for drawing the height-restricted blocks on the portal pages
-//
-// This template expects that the following variables will be set
-// $id - the DOM id for the block div
-// $title - the title of the block
-// $class - the additional class of the block
-// $content - the content of the block
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2008 to 2009 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-?>
-<div id="<?php echo $id; ?>" class="block" >
-	<div class="blockheader">
-		<?php echo $title; ?>
-	</div>
-	<div class="blockcontent small_inner_block <?php echo $class; ?>">
-		<?php echo $content; ?>
-	</div>
-</div>
diff --git a/themes/xenea/templates/compactbox_template.php b/themes/xenea/templates/compactbox_template.php
deleted file mode 100644
index 4a3386f801..0000000000
--- a/themes/xenea/templates/compactbox_template.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-//  $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $outBoxAdd, $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '"' , $outBoxAdd, '>
-	<div class="compact_view">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'">
-			<span class="namedef name',$style,'">', $shortname, '</span>
-		</a>
-	</div>
-	<div class="inout2 details',$style,'">',
-		$person->getLifeSpan(), '
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/xenea/templates/personbox_template.php b/themes/xenea/templates/personbox_template.php
deleted file mode 100644
index b1fdc7ade2..0000000000
--- a/themes/xenea/templates/personbox_template.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-// Template for drawing person boxes
-// This template expects that the following variables will be set
-// $pid, $boxID, $icons, $GEDCOM, $style,
-// $name, $genderImage, $BirthDeath, $outBoxAdd,
-// $addname
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2010 PGV Development Team. All rights reserved.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-echo
-'<div data-pid="'. $pid . '" ',$outBoxAdd,'>
-	<div class="noprint icons">', $icons, '</div>',
-	'<div class="chart_textbox" style="max-height:', $bheight,'px;">',
-		$thumbnail,
-		'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '">
-			<span class="namedef name',$style,'">',
-				$name,
-				$genderImage,'
-				<span class="details',$style,'">' . $LDSord . '</span>
-			</span>
-		</a>
-		<div class="namedef name',$style,'">',$addname,'</div>
-		<div class="inout2 details',$style,'">',
-			$BirthDeath,
-		'</div>
-	</div>
-	<div class="inout"></div>
-</div>';
-
diff --git a/themes/xenea/theme.php b/themes/xenea/theme.php
index e54bfcfd58..4e7fe5a4ff 100644
--- a/themes/xenea/theme.php
+++ b/themes/xenea/theme.php
@@ -2,10 +2,7 @@
 // Xenea theme
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// Derived from PhpGedView
-// Copyright (C) 2002 to 2010 PGV Development Team.
+// Copyright (C) 2015 webtrees development team.
 //
 // 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
@@ -21,88 +18,4 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-if (!defined('WT_WEBTREES')) {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-// Theme name - this needs double quotes, as file is scanned/parsed by script
-$theme_name = "xenea"; /* I18N: Name of a theme. */ WT_I18N::translate('xenea');
-
-// A version number in the path prevents browser-cache problems during upgrade
-define('WT_CSS_URL', WT_THEME_URL . 'css-1.6.2/');
-
-$headerfile = WT_THEME_DIR.'header.php';
-$footerfile = WT_THEME_DIR.'footer.php';
-
-//-- variables for image names
-$WT_IMAGES = array(
-	// used to draw charts
-	'dline'           => WT_CSS_URL . 'images/dline.png',
-	'dline2'          => WT_CSS_URL . 'images/dline2.png',
-	'hline'           => WT_CSS_URL . 'images/hline.png',
-	'spacer'          => WT_CSS_URL . 'images/spacer.png',
-	'vline'           => WT_CSS_URL . 'images/vline.png',
-
-	// used in button images and javascript
-	'add'             => WT_CSS_URL . 'images/add.png',
-	'button_family'   => WT_CSS_URL . 'images/buttons/family.png',
-	'minus'           => WT_CSS_URL . 'images/minus.png',
-	'plus'            => WT_CSS_URL . 'images/plus.png',
-	'remove'          => WT_CSS_URL . 'images/remove.png',
-	'search'          => WT_CSS_URL . 'images/search.png',
-
-	// need different sizes before moving to CSS
-	'default_image_F' => WT_CSS_URL . 'images/silhouette_female.png',
-	'default_image_M' => WT_CSS_URL . 'images/silhouette_male.png',
-	'default_image_U' => WT_CSS_URL . 'images/silhouette_unknown.png',
-);
-
-// Variables for the Fan chart
-$fanChart = array(
-	'font'     => WT_ROOT . 'includes/fonts/DejaVuSans.ttf',
-	'size'     => 7,
-	'color'    => '#000000',
-	'bgColor'  => '#eeeeee',
-	'bgMColor' => '#b1cff0',
-	'bgFColor' => '#e9daf1'
-);
-
-// This section defines variables for the pedigree chart
-$bwidth        = 250; // width of boxes on pedigree chart
-$bheight       = 80;  // height of boxes on pedigree chart
-$baseyoffset   = 10;  // position the entire pedigree tree relative to the top of the page
-$basexoffset   = 10;  // position the entire pedigree tree relative to the left of the page
-$bxspacing     = 1;   // horizontal spacing between boxes on the pedigree chart
-$byspacing     = 5;   // vertical spacing between boxes on the pedigree chart
-$brborder      = 1;   // box right border thickness
-$linewidth     = 1.5; // width of joining lines
-$shadowcolor   = '';  // shadow color for joining lines
-$shadowblur    = 0;   // shadow blur for joining lines
-$shadowoffsetX = 0;   // shadowOffsetX for joining lines
-$shadowoffsetY = 0;   // shadowOffsetY for joining lines
-
-// Global variables for the descendancy chart
-$Dbaseyoffset  = 20;  // position the entire descendancy tree relative to the top of the page
-$Dbasexoffset  = 20;  // position the entire descendancy tree relative to the left of the page
-$Dbxspacing    = 5;   // horizontal spacing between boxes
-$Dbyspacing    = 10;  // vertical spacing between boxes
-$Dbwidth       = 260; // width of DIV layer boxes
-$Dbheight      = 80;  // height of DIV layer boxes
-$Dindent       = 15;  // width to indent descendancy boxes
-$Darrowwidth   = 30;  // additional width to include for the up arrows
-
-// Dimensions for compact version of chart displays
-$cbwidth=240;
-$cbheight=50;
-
-// The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels
-$WT_STATS_S_CHART_X = 440;
-$WT_STATS_S_CHART_Y = 125;
-$WT_STATS_L_CHART_X = 900;
-// For map charts, the maximum size is 440 pixels wide by 220 pixels high
-$WT_STATS_MAP_X = 440;
-$WT_STATS_MAP_Y = 220;
-$WT_STATS_CHART_COLOR1 = "ffffff";
-$WT_STATS_CHART_COLOR2 = "84beff";
-$WT_STATS_CHART_COLOR3 = "c3dfff";
+return new WT\Theme\Xenea;