Combine WT_THEME_DIR with WT_IMAGES. This reduces repetition, and will allow themes to share common images, e.g. in the images directory.

127 files changed, 1551 insertions, 1647 deletions

diff --git a/branches.php b/branches.php
index 2974eb635e..61fbe7d53c 100644
--- a/branches.php
+++ b/branches.php
@@ -33,7 +33,7 @@ require './includes/session.php';
 //-- const
 $fact='MARR';
 define('WT_ICON_RINGS', '<img src="images/small/rings.gif" alt="'.translate_fact('MARR').'" title="'.translate_fact('MARR').'" />');
-define('WT_ICON_BRANCHES', "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["patriarch"]["small"]."\" alt=\"\" align=\"middle\" />");
+define('WT_ICON_BRANCHES', "<img src=\"".$WT_IMAGES["patriarch"]["small"]."\" alt=\"\" align=\"middle\" />");
 
 //-- args
 $surn = safe_GET('surn', '[^<>&%{};]*');
diff --git a/calendar.php b/calendar.php
index d3790a95c2..d7aedbc311 100644
--- a/calendar.php
+++ b/calendar.php
@@ -397,8 +397,8 @@ case 'year':
 case 'today':
 	echo "<table class=\"center {$TEXT_DIRECTION} width100\"><tr>";
 	// Table headings
-	echo "<td class=\"descriptionbox center width50\"><img src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['indis']['small']}\" border=\"0\" title=\"", i18n::translate('Individuals'), "\" alt=\"", i18n::translate('Individuals'), "\" />&nbsp;&nbsp;&nbsp;", i18n::translate('Individuals'), "</td>";
-	echo "<td class=\"descriptionbox center width50\"><img src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['cfamily']['small']}\" border=\"0\" title=\"", i18n::translate('Families'), "\" alt=\"", i18n::translate('Families'), "\" />&nbsp;&nbsp;&nbsp;", i18n::translate('Families'), "</td>";
+	echo "<td class=\"descriptionbox center width50\"><img src=\"{$WT_IMAGES['indis']['small']}\" border=\"0\" title=\"", i18n::translate('Individuals'), "\" alt=\"", i18n::translate('Individuals'), "\" />&nbsp;&nbsp;&nbsp;", i18n::translate('Individuals'), "</td>";
+	echo "<td class=\"descriptionbox center width50\"><img src=\"{$WT_IMAGES['cfamily']['small']}\" border=\"0\" title=\"", i18n::translate('Families'), "\" alt=\"", i18n::translate('Families'), "\" />&nbsp;&nbsp;&nbsp;", i18n::translate('Families'), "</td>";
 	echo "</tr><tr>";
 	// Table rows
 	$males=0;
@@ -562,8 +562,8 @@ function calendar_fact_text($fact, $show_places) {
 // Format a list of facts for display
 ////////////////////////////////////////////////////////////////////////////////
 function calendar_list_text($list, $tag1, $tag2, $show_sex_symbols) {
-	global $WT_IMAGE_DIR, $WT_IMAGES;
-	global $males, $females;
+	global $WT_IMAGES, $males, $females;
+
 	foreach ($list as $id=>$facts) {
 		$tmp=GedcomRecord::GetInstance($id);
 		echo "{$tag1}<a href=\"".encode_url($tmp->getLinkUrl())."\">".PrintReady($tmp->getFullName())."</a>&nbsp;";
diff --git a/compact.php b/compact.php
index 3d4276007c..d4792b76ad 100644
--- a/compact.php
+++ b/compact.php
@@ -287,7 +287,7 @@ print "<br />";
 print_footer();
 
 function print_td_person($n) {
-	global $treeid, $WT_IMAGE_DIR, $WT_IMAGES;
+	global $treeid, $WT_IMAGES;
 	global $TEXT_DIRECTION, $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $USE_SILHOUETTE, $WT_IMAGES;
 	global $showthumbs;
 
@@ -333,13 +333,13 @@ function print_td_person($n) {
 				$sex = $indi->getSex();
 				$text = "<img src=\"";
 				if ($sex == 'F') {
-					$text .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_F"]["other"];
+					$text .= $WT_IMAGES["default_image_F"]["other"];
 				}
 				else if ($sex == 'M') {
-					$text .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_M"]["other"];
+					$text .= $WT_IMAGES["default_image_M"]["other"];
 				}
 				else {
-					$text .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_U"]["other"];
+					$text .= $WT_IMAGES["default_image_U"]["other"];
 				} 
 				$text .="\" class=\"".$class."\" border=\"none\" alt=\"\" />";
 			}
@@ -390,9 +390,7 @@ function print_td_person($n) {
 }
 
 function print_arrow_person($n, $arrow_dir) {
-	global $treeid;
-	global $showthumbs;
-	global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES;
+	global $treeid, $showthumbs, $TEXT_DIRECTION, $WT_IMAGES;
 
 	$pid = $treeid[$n];
 
@@ -411,8 +409,8 @@ function print_arrow_person($n, $arrow_dir) {
 	} else {
 		$title = $pid." :".i18n::translate('Compact Chart');
 	}
-	$arrow_img = "<img id='arrow$n' src='".$WT_IMAGE_DIR."/".$WT_IMAGES[$arrow_dir."arrow"]["other"]."' border='0' align='middle' alt='$title' title='$title' />";
-	$hideArrow = "<img id='arrow$n' src='".$WT_IMAGE_DIR."/".$WT_IMAGES[$arrow_dir."arrow"]["other"]."' border='0' align='middle' alt='$title' title='$title' style='visibility:hidden;' />";
+	$arrow_img = "<img id='arrow$n' src='".$WT_IMAGES[$arrow_dir."arrow"]["other"]."' border='0' align='middle' alt='$title' title='$title' />";
+	$hideArrow = "<img id='arrow$n' src='".$WT_IMAGES[$arrow_dir."arrow"]["other"]."' border='0' align='middle' alt='$title' title='$title' style='visibility:hidden;' />";
 
 	$text = "";
 	if ($pid) {
diff --git a/dir_editor.php b/dir_editor.php
index 9225d3941e..50b782350a 100644
--- a/dir_editor.php
+++ b/dir_editor.php
@@ -154,7 +154,7 @@ function warnuser(cbox) {
 
 		print "<div style=\"margin-bottom:2px;\">";
 		print "<table><tr><td>";
-		if (isset($WT_IMAGES["trashcan"]["medium"])) print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["trashcan"]["medium"]."\" align=\"left\" alt=\"\" />";
+		if (isset($WT_IMAGES["trashcan"]["medium"])) print "<img src=\"".$WT_IMAGES["trashcan"]["medium"]."\" align=\"left\" alt=\"\" />";
 		else print "<img src=\"images/trashcan.gif\" align=\"left\" alt=\"\" />";
 		print "</td>";
 		print "<td valign=\"top\"><ul id=\"trashlist\">";
diff --git a/edit_interface.php b/edit_interface.php
index 02325e410e..be657b9633 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -740,7 +740,7 @@ case 'addnewsource':
 			}
 		?>
 		</table>
-			<a href="#"  onclick="return expand_layer('events');"><img id="events_img" src="<?php echo $WT_IMAGE_DIR, "/", $WT_IMAGES["plus"]["other"]; ?>" border="0" width="11" height="11" alt="" title="" />
+			<a href="#"  onclick="return expand_layer('events');"><img id="events_img" src="<?php echo $WT_IMAGES["plus"]["other"]; ?>" border="0" width="11" height="11" alt="" title="" />
 			<?php echo i18n::translate('Associate events with this source'); ?></a><?php echo help_link('edit_SOUR_EVEN'); ?>
 			<div id="events" style="display: none;">
 			<table class="facts_table">
diff --git a/familybook.php b/familybook.php
index 8d94954f61..fcd9c1212c 100644
--- a/familybook.php
+++ b/familybook.php
@@ -58,7 +58,7 @@ $name  =$person->getFullName();
 
 function print_descendency($pid, $count) {
 	global $show_spouse, $dgenerations, $bwidth, $bheight, $bhalfheight;
-	global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $generations, $box_width, $show_full;
+	global $TEXT_DIRECTION, $WT_IMAGES, $generations, $box_width, $show_full;
 	if ($count>=$dgenerations) return 0;
 	print "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n";
 	print "<tr>";
@@ -89,18 +89,18 @@ function print_descendency($pid, $count) {
 				print "</td>\n";
 				$twidth = 7;
 				if ($ct==1) $twidth+=3;
-				print "<td rowspan=\"$rowspan\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" width=\"$twidth\" height=\"3\" alt=\"\" /></td>\n";
+				print "<td rowspan=\"$rowspan\"><img src=\"".$WT_IMAGES["hline"]["other"]."\" width=\"$twidth\" height=\"3\" alt=\"\" /></td>\n";
 				if ($ct>1) {
 					if ($i==0) {
-						print "<td height=\"".($bhalfheight+3)."\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td></tr>\n";
-						print "<tr><td height=\"".($bhalfheight+3)."\" style=\"background: url('".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>\n";
+						print "<td height=\"".($bhalfheight+3)."\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td></tr>\n";
+						print "<tr><td height=\"".($bhalfheight+3)."\" style=\"background: url('".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>\n";
 					}
 					else if ($i==$ct-1) {
-						print "<td height=\"".($bhalfheight+4)."\" style=\"background: url('".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td></tr>\n";
-						print "<tr><td height=\"".($bhalfheight+4)."\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>\n";
+						print "<td height=\"".($bhalfheight+4)."\" style=\"background: url('".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td></tr>\n";
+						print "<tr><td height=\"".($bhalfheight+4)."\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>\n";
 					}
 					else {
-						print "<td style=\"background: url('".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>\n";
+						print "<td style=\"background: url('".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>\n";
 					}
 				}
 				print "</tr>\n";
@@ -172,7 +172,7 @@ function print_descendency($pid, $count) {
 				print "\n\t\t<div class=\"center\" id=\"childarrow.$pid\" dir=\"".$TEXT_DIRECTION."\"";
 				print " style=\"position:absolute; width:".$bwidth."px; \">";
 				print "<a href=\"javascript: ".i18n::translate('Show')."\" onclick=\"return togglechildrenbox('$pid');\" onmouseover=\"swap_image('larrow.$pid',3);\" onmouseout=\"swap_image('larrow.$pid',3);\">";
-				print "<img id=\"larrow.$pid\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["darrow"]["other"]."\" border=\"0\" alt=\"\" />";
+				print "<img id=\"larrow.$pid\" src=\"".$WT_IMAGES["darrow"]["other"]."\" border=\"0\" alt=\"\" />";
 				print "</a>";
 				print "\n\t\t<div id=\"childbox.$pid\" dir=\"".$TEXT_DIRECTION."\" style=\"width:".$bwidth."px; height:".$bheight."px; visibility: hidden;\">";
 				print "\n\t\t\t<table class=\"person_box\"><tr><td>";
@@ -291,7 +291,7 @@ function max_descendency_generations($pid, $depth) {
 }
 
 function print_person_pedigree($pid, $count) {
-	global $generations, $SHOW_EMPTY_BOXES, $WT_IMAGE_DIR, $WT_IMAGES, $bheight, $bhalfheight;
+	global $generations, $SHOW_EMPTY_BOXES, $WT_IMAGES, $bheight, $bhalfheight;
 	if ($count>=$generations) return;
 	$famids = find_family_ids($pid);
 	$hheight = ($bhalfheight+3) * pow(2,($generations-$count-1));
@@ -301,8 +301,8 @@ function print_person_pedigree($pid, $count) {
 		$height="100%";
 		print "<tr>";
 		if ($count<$generations-1) {
-			print "<td height=\"".$hheight."\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>\n";
-			print "<td rowspan=\"2\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>\n";
+			print "<td height=\"".$hheight."\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>\n";
+			print "<td rowspan=\"2\"><img src=\"".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>\n";
 		}
 		print "<td rowspan=\"2\">\n";
 		print_pedigree_person($parents["HUSB"]);
@@ -311,11 +311,11 @@ function print_person_pedigree($pid, $count) {
 		print_person_pedigree($parents["HUSB"], $count+1);
 		print "</td>\n";
 		print "</tr>\n<tr>\n<td height=\"".$hheight."\"";
-		if ($count<$generations-1) print " style=\"background: url('".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."');\" ";
-		print "><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td></tr>\n<tr>\n";
+		if ($count<$generations-1) print " style=\"background: url('".$WT_IMAGES["vline"]["other"]."');\" ";
+		print "><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td></tr>\n<tr>\n";
 		if ($count<$generations-1) {
-			print "<td height=\"".$hheight."\" style=\"background: url('".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>";
-			print "<td rowspan=\"2\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>\n";
+			print "<td height=\"".$hheight."\" style=\"background: url('".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>";
+			print "<td rowspan=\"2\"><img src=\"".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>\n";
 		}
 		print "<td rowspan=\"2\">\n";
 		print_pedigree_person($parents["WIFE"]);
@@ -324,7 +324,7 @@ function print_person_pedigree($pid, $count) {
 		print_person_pedigree($parents["WIFE"], $count+1);
 		print "</td>\n";
 		print "</tr>\n";
-		if ($count<$generations-1) print "<tr>\n<td height=\"".$hheight."\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td></tr>\n";
+		if ($count<$generations-1) print "<tr>\n<td height=\"".$hheight."\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td></tr>\n";
 		print "</table>\n";
 	}
 }
diff --git a/fanchart.php b/fanchart.php
index 115801b2ff..6c24059150 100644
--- a/fanchart.php
+++ b/fanchart.php
@@ -97,21 +97,18 @@ function split_align_text($data, $maxlen) {
  * @param int $fandeg fan size in deg (default=270)
  */
 function print_fan_chart($treeid, $fanw=640, $fandeg=270) {
-	global $PEDIGREE_GENERATIONS, $fan_width, $fan_style;
-	global $name, $TEXT_DIRECTION;
-	global $stylesheet;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $LINK_ICONS, $GEDCOM;
-	global $fanChart;
+	global $PEDIGREE_GENERATIONS, $fan_width, $fan_style, $name, $TEXT_DIRECTION;
+	global $stylesheet, $WT_IMAGES, $LINK_ICONS, $GEDCOM, $fanChart;
 
 	// check for GD 2.x library
 	if (!defined("IMG_ARC_PIE")) {
 		echo "<span class=\"error\">".i18n::translate('PHP server misconfiguration: GD 2.x library required to use image functions.')."</span>";
-		echo " <a href=\"" . i18n::translate('http://www.php.net/gd') . "\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["help"]["small"]."\" class=\"icon\" alt=\"\" /></a><br /><br />";
+		echo " <a href=\"" . i18n::translate('http://www.php.net/gd') . "\"><img src=\"".$WT_IMAGES["help"]["small"]."\" class=\"icon\" alt=\"\" /></a><br /><br />";
 		return false;
 	}
 	if (!function_exists("ImageTtfBbox")) {
 		echo "<span class=\"error\">".i18n::translate('PHP server misconfiguration: FreeType library required to use TrueType fonts.')."</span>";
-		echo " <a href=\"" . i18n::translate('http://www.php.net/gd') . "\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["help"]["small"]."\" class=\"icon\" alt=\"\" /></a><br /><br />";
+		echo " <a href=\"" . i18n::translate('http://www.php.net/gd') . "\"><img src=\"".$WT_IMAGES["help"]["small"]."\" class=\"icon\" alt=\"\" /></a><br /><br />";
 		return false;
 	}
 
diff --git a/help_text.php b/help_text.php
index c6634df5c3..7f5ab9a189 100644
--- a/help_text.php
+++ b/help_text.php
@@ -2770,7 +2770,7 @@ case 'USE_RIN':
 
 case 'USE_SILHOUETTE':
 	$title=i18n::translate('Use silhouettes');
-	$text=i18n::translate('Use silhouette images when no highlighted image for that person has been specified.  The images used are specific to the gender of the person in question.<br /><br /><table><tr><td wrap valign="middle">This image might be used when the gender of the person is unknown:')." </td><td><img src=\"$WT_IMAGE_DIR/".$WT_IMAGES["default_image_U"]["other"]."\" width=\"40\" alt=\"Silhouette image\" title=\"Silhouette image\" /></td></tr></table>";
+	$text=i18n::translate('Use silhouette images when no highlighted image for that person has been specified.  The images used are specific to the gender of the person in question.<br /><br /><table><tr><td wrap valign="middle">This image might be used when the gender of the person is unknown:')." </td><td><img src=\"".$WT_IMAGES["default_image_U"]["other"]."\" width=\"40\" alt=\"Silhouette image\" title=\"Silhouette image\" /></td></tr></table>";
 	break;
 	
 case 'USE_THUMBS_MAIN':
@@ -3054,16 +3054,16 @@ case 'treenav.php':
 		'<br /></li><li><b>'.i18n::translate('Expanding Details').'</b><br />'.
 		i18n::translate('Clicking on any box will expand the box and display a more detailed view.  While in expanded mode, clicking on a person\'s name will open their Individual Information page.').
 		'<br />'.
-		i18n::translate('Clicking %s will redraw the tree with that person as the new root.', '<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['gedcom']['small'].'" width="15px" height="15px" alt="">').
+		i18n::translate('Clicking %s will redraw the tree with that person as the new root.', '<img src="'.$WT_IMAGES['gedcom']['small'].'" width="15px" height="15px" alt="">').
 		'<br />'.
-		i18n::translate('Clicking %s will take you to that family\'s detail page.', '<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['family']['button'].'" width="15px" height="15px" alt="">').
+		i18n::translate('Clicking %s will take you to that family\'s detail page.', '<img src="'.$WT_IMAGES['family']['button'].'" width="15px" height="15px" alt="">').
 		'<br /></li><li><b>'.i18n::translate('Toggle Spouses').'</b><br />'.
-		i18n::translate('The %s icon directly under the Zoom buttons will toggle the display of all spouses on or off on the descendancy side.  When the display is set to show spouses, all of a person\'s spouses will appear in the box with them.  All of the person\'s children will be shown as well.  When the option to show spouses is off, only the person\'s last spouse and children with that spouse will be shown.', '<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['sfamily']['small'].'" width="15px" height="15px" alt="">').
+		i18n::translate('The %s icon directly under the Zoom buttons will toggle the display of all spouses on or off on the descendancy side.  When the display is set to show spouses, all of a person\'s spouses will appear in the box with them.  All of the person\'s children will be shown as well.  When the option to show spouses is off, only the person\'s last spouse and children with that spouse will be shown.', '<img src="'.$WT_IMAGES['sfamily']['small'].'" width="15px" height="15px" alt="">').
 		'<br /></li><li><b>'.i18n::translate('Large Tree').'</b>'.
 		'<br />'.
 		i18n::translate('The Interactive Tree is available from many different pages including the Tree tab on the Individual Information page and the Charts block on the Home Page.  When viewing the tree from one of these other pages, you will also have a Tree icon under the Zoom icons.').
 		'<br />'.
-		i18n::translate('Clicking %s will take you to the Interactive Tree page.', '<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['gedcom']['small'].'" width="15px" height="15px" alt="">').
+		i18n::translate('Clicking %s will take you to the Interactive Tree page.', '<img src="'.$WT_IMAGES['gedcom']['small'].'" width="15px" height="15px" alt="">').
 		'</li></ul>';
 	break;
 
@@ -4244,7 +4244,7 @@ print_simple_header(i18n::translate('Help for «%s»', htmlspecialchars(strip_ta
 echo '<div class="helpheader">', htmlspecialchars($title),'</div>';
 echo '<div class="helpcontent">', nl2br($text),'</div>';
 echo '<div class="helpfooter"><br />';
-echo '<a href="javascript:;" onclick="window.history.go(-1)">',"<img src=\"$WT_IMAGE_DIR/".$WT_IMAGES["larrow"]["other"]."\" alt=\"<\"><br />";
+echo '<a href="javascript:;" onclick="window.history.go(-1)">',"<img src=\"".$WT_IMAGES["larrow"]["other"]."\" alt=\"<\"><br />";
 echo '<a href="help_text.php?help=help_contents_help"><b>', i18n::translate('Help Contents'), '</b></a><br />';
 echo '<a href="javascript:;" onclick="window.close();"><b>', i18n::translate('Close Window'), '</b></a>';
 echo '</div>';
diff --git a/includes/classes/class_event.php b/includes/classes/class_event.php
index de2d249431..6a1df711e5 100644
--- a/includes/classes/class_event.php
+++ b/includes/classes/class_event.php
@@ -299,8 +299,6 @@ class Event {
  * Examples: 1900_CENS.gif 1910_CENS.gif 1900_OCCU_FARM.gif 1800_OCCU_FARM.gif
  */
  function Icon() {
-		global $WT_IMAGE_DIR;
-
 		// Need the gregorian century/decade
 		$date=$this->getDate();
 
@@ -313,7 +311,7 @@ class Event {
 		$decade=floor($gdate->y/10).'0';
 
 		$tag=$this->getTag();
-		$dir="{$WT_IMAGE_DIR}/facts";
+		$dir=WT_THEME_DIR."images/facts";
 
 		// Which era (century/decade)
 		$eras=array("{$decade}_", "{$century}_", '');
diff --git a/includes/classes/class_menu.php b/includes/classes/class_menu.php
index de1344bb9b..f1137a583c 100644
--- a/includes/classes/class_menu.php
+++ b/includes/classes/class_menu.php
@@ -192,26 +192,17 @@ class Menu {
 
 	function getMenu()
 	{
-		global
-			$menucount,
-			$TEXT_DIRECTION,
-			$WT_IMAGE_DIR,
-			$WT_IMAGES
-		;
+		global $menucount, $TEXT_DIRECTION, $WT_IMAGES;
 
-		if (!isset($menucount))
-		{
+		if (!isset($menucount)) {
 			$menucount = 0;
-		}
-		else
-		{
+		} else {
 			$menucount++;
 		}
 		$id = $menucount.rand();
-		if ($this->separator)
-		{
+		if ($this->separator) {
 			$output = "<div id=\"menu{$id}\" class=\"menu_separator center\">"
-			."<img src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['hline']['other']}\" alt=\"\" />"
+			."<img src=\"{$WT_IMAGES['hline']['other']}\" alt=\"\" />"
 			."</div>";
 			return $output;
 		}
@@ -219,37 +210,29 @@ class Menu {
 		$output = "<div id=\"menu{$id}\" class=\"{$this->class}\">\n";
 		if ($this->link=="#") $this->link = "javascript:;";
 		$link = "<a href=\"{$this->link}\" onmouseover=\"";
-		if ($c >= 0)
-		{
+		if ($c >= 0) {
 			$link .= "show_submenu('menu{$id}_subs', 'menu{$id}', '{$this->flyout}'); ";
 		}
-		if ($this->hoverclass !== null)
-		{
+		if ($this->hoverclass !== null) {
 			$link .= "change_class('menu{$id}', '{$this->hoverclass}'); ";
 		}
-		if ($this->hovericon !== null)
-		{
+		if ($this->hovericon !== null) {
 			$link .= "change_icon('menu{$id}_icon', '{$this->hovericon}'); ";
 		}
 		$link .= '" onmouseout="';
-		if ($c >= 0)
-		{
+		if ($c >= 0) {
 			$link .= "timeout_submenu('menu{$id}_subs'); ";
 		}
-		if ($this->hoverclass !== null)
-		{
+		if ($this->hoverclass !== null) {
 			$link .= "change_class('menu{$id}', '{$this->class}'); ";
 		}
-		if ($this->hovericon !== null)
-		{
+		if ($this->hovericon !== null) {
 			$link .= "change_icon('menu{$id}_icon', '{$this->icon}'); ";
 		}
-		if ($this->onclick !== null)
-		{
+		if ($this->onclick !== null) {
 			$link .= "\" onclick=\"{$this->onclick}";
 		}
-		if ($this->target !== null)
-		{
+		if ($this->target !== null) {
 			$link .= '" target="'.$this->target;
 		}
 		$link .= "\">";
@@ -288,40 +271,29 @@ class Menu {
 				$output .= $MenuIcon;
 				$output .= "</a>";
 			}
-		}
-		else
-		{
+		} else {
 			$output .= $link;
 			$output .= $this->label;
 			$output .= "</a>";
 		}
 
-		if ($c > 0)
-		{
+		if ($c > 0) {
 			$submenuid = "menu{$id}_subs";
-			if ($TEXT_DIRECTION == 'ltr')
-			{
+			if ($TEXT_DIRECTION == 'ltr') {
 				$output .= '<div style="text-align: left;">';
-			}
-			else
-			{
+			} else {
 				$output .= '<div style="text-align: right;">';
 			}
 			$output .= "<div id=\"menu{$id}_subs\" class=\"{$this->submenuclass}\" style=\"position: absolute; visibility: hidden; z-index: 100;";
-			if ($this->flyout == 'right')
-			{
-				if ($TEXT_DIRECTION == 'ltr')
-				{
+			if ($this->flyout == 'right') {
+				if ($TEXT_DIRECTION == 'ltr') {
 					$output .= ' left: 80px;';
-				}
-				else
-				{
+				} else {
 					$output .= ' right: 50px;';
 				}
 			}
 			$output .= "\" onmouseover=\"show_submenu('{$this->parentmenu}'); show_submenu('{$submenuid}');\" onmouseout=\"timeout_submenu('menu{$id}_subs');\">\n";
-			foreach($this->submenus as $submenu)
-			{
+			foreach($this->submenus as $submenu) {
 				$submenu->parentmenu = $submenuid;
 				$output .= $submenu->getMenu();
 			}
diff --git a/includes/classes/class_menubar.php b/includes/classes/class_menubar.php
index fb37379a96..544cd363f5 100644
--- a/includes/classes/class_menubar.php
+++ b/includes/classes/class_menubar.php
@@ -45,12 +45,12 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getHomeMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $HOME_SITE_URL, $HOME_SITE_TEXT;
+		global $TEXT_DIRECTION, $WT_IMAGES, $HOME_SITE_URL, $HOME_SITE_TEXT;
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 		//-- main home menu item
 		$menu = new Menu($HOME_SITE_TEXT, $HOME_SITE_URL, "down");
 		if (!empty($WT_IMAGES["home"]["large"]))
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["home"]["large"]);
+			$menu->addIcon($WT_IMAGES["home"]["large"]);
 		$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_home");
 		return $menu;
 	}
@@ -60,13 +60,13 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getGedcomMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES;
+		global $TEXT_DIRECTION, $WT_IMAGES;
 
 		if ($TEXT_DIRECTION=='rtl') $ff='_rtl'; else $ff='';
 		//-- main menu
 		$menu = new Menu(i18n::translate('Home page'), 'index.php?ctype=gedcom', 'down');
 		if (!empty($WT_IMAGES['gedcom']['large']))
-			$menu->addIcon($WT_IMAGE_DIR.'/'.$WT_IMAGES['gedcom']['large']);
+			$menu->addIcon($WT_IMAGES['gedcom']['large']);
 		$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", 'icon_large_gedcom');
 		//-- gedcom list
 		$gedcom_titles=get_gedcom_titles();
@@ -74,7 +74,7 @@ class MenuBar
 			foreach ($gedcom_titles as $gedcom_title) {
 				$submenu = new Menu(PrintReady($gedcom_title->gedcom_title, true), encode_url('index.php?ctype=gedcom&ged='.$gedcom_title->gedcom_name));
 				if (!empty($WT_IMAGES['gedcom']['small'])) {
-					$submenu->addIcon($WT_IMAGE_DIR.'/'.$WT_IMAGES['gedcom']['small']);
+					$submenu->addIcon($WT_IMAGES['gedcom']['small']);
 				}
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_gedcom');
 				$menu->addSubmenu($submenu);
@@ -95,7 +95,7 @@ class MenuBar
 	*/
 	static function getMyPageMenu() {
 		global $MEDIA_DIRECTORY, $MULTI_MEDIA;
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES;
+		global $TEXT_DIRECTION, $WT_IMAGES;
 		global $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT;
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -109,23 +109,23 @@ class MenuBar
 		//-- main menu
 		$menu = new Menu(i18n::translate('My Page'), "index.php?ctype=user", "down");
 		if (!empty($WT_IMAGES["mypage"]["large"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["mypage"]["large"]);
+			$menu->addIcon($WT_IMAGES["mypage"]["large"]);
 		} elseif (!empty($WT_IMAGES["gedcom"]["large"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["large"]);
+			$menu->addIcon($WT_IMAGES["gedcom"]["large"]);
 		}
 		$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_mypage");
 
 		//-- mypage submenu
 		$submenu = new Menu(i18n::translate('My Page'), "index.php?ctype=user");
 		if (!empty($WT_IMAGES["mypage"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["mypage"]["small"]);
+			$submenu->addIcon($WT_IMAGES["mypage"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_mypage");
 		$menu->addSubmenu($submenu);
 		//-- editaccount submenu
 		if (get_user_setting(WT_USER_ID, 'editaccount')) {
 			$submenu = new Menu(i18n::translate('My account'), "edituser.php");
 			if (!empty($WT_IMAGES["mypage"]["small"]))
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["mypage"]["small"]);
+				$submenu->addIcon($WT_IMAGES["mypage"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_mypage");
 			$menu->addSubmenu($submenu);
 		}
@@ -133,14 +133,13 @@ class MenuBar
 			//-- my_pedigree submenu
 			$submenu = new Menu(i18n::translate('My Pedigree'), encode_url("pedigree.php?rootid=".WT_USER_GEDCOM_ID."&show_full={$showFull}&talloffset={$showLayout}"));
 			if (!empty($WT_IMAGES["pedigree"]["small"]))
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["pedigree"]["small"]);
-			//$submenu->addIcon($WT_IMAGE_DIR."/small/pedigree.gif");
+				$submenu->addIcon($WT_IMAGES["pedigree"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_pedigree");
 			$menu->addSubmenu($submenu);
 			//-- my_indi submenu
 			$submenu = new Menu(i18n::translate('My Individual Record'), "individual.php?pid=".WT_USER_GEDCOM_ID);
 			if (!empty($WT_IMAGES["indis"]["small"]))
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["indis"]["small"]);
+				$submenu->addIcon($WT_IMAGES["indis"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_indis");
 			$menu->addSubmenu($submenu);
 		}
@@ -149,27 +148,27 @@ class MenuBar
 			//-- admin submenu
 			$submenu = new Menu(i18n::translate('Admin'), "admin.php");
 			if (!empty($WT_IMAGES["admin"]["small"]))
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["admin"]["small"]);
+				$submenu->addIcon($WT_IMAGES["admin"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_admin");
 			$menu->addSubmenu($submenu);
 			//-- manage_gedcoms submenu
 			$submenu = new Menu(i18n::translate('GEDCOM administration'), "editgedcoms.php");
 			if (!empty($WT_IMAGES["admin"]["small"]))
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["admin"]["small"]);
+				$submenu->addIcon($WT_IMAGES["admin"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_admin");
 			$menu->addSubmenu($submenu);
 			//-- user_admin submenu
 			if (WT_USER_IS_ADMIN) {
 				$submenu = new Menu(i18n::translate('User administration'), "useradmin.php");
 				if (!empty($WT_IMAGES["admin"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["admin"]["small"]);
+					$submenu->addIcon($WT_IMAGES["admin"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_admin");
 				$menu->addSubmenu($submenu);
 				//-- manage_media submenu
 				if (is_writable($MEDIA_DIRECTORY) && $MULTI_MEDIA) {
 					$submenu = new Menu(i18n::translate('Manage multimedia'), "media.php");
 					if (!empty($WT_IMAGES["menu_media"]["small"]))
-						$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_media"]["small"]);
+						$submenu->addIcon($WT_IMAGES["menu_media"]["small"]);
 					$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_media");
 					$menu->addSubmenu($submenu);
 				}
@@ -181,7 +180,7 @@ class MenuBar
 				$menu->addSeparator();
 				$submenu = new Menu(i18n::translate('Upload media files'), "uploadmedia.php");
 				if (!empty($WT_IMAGES["menu_media"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_media"]["small"]);
+					$submenu->addIcon($WT_IMAGES["menu_media"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_media");
 				$menu->addSubmenu($submenu);
 			}
@@ -194,7 +193,7 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getChartsMenu($rootid='') {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $SEARCH_SPIDER;
+		global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER;
 		global $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT;
 		global $controller;
 		
@@ -222,14 +221,14 @@ class MenuBar
 		if ($style=="sub") {
 			$menu = new Menu(i18n::translate('Charts'), encode_url($link));
 			if (!empty($WT_IMAGES["pedigree"]["small"]))
-				$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["pedigree"]["small"]);
+				$menu->addIcon($WT_IMAGES["pedigree"]["small"]);
 			$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "", "icon_small_pedigree");
 		}
 		else {
 			// top menubar
 			$menu = new Menu(i18n::translate('Charts'), encode_url($link), "down");
 			if (!empty($WT_IMAGES["pedigree"]["large"]))
-				$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["pedigree"]["large"]);
+				$menu->addIcon($WT_IMAGES["pedigree"]["large"]);
 			$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_pedigree");
 		}
 
@@ -261,7 +260,7 @@ class MenuBar
 				if ($rootid) $link .= "&rootid={$rootid}";
 				$submenu = new Menu(i18n::translate('Pedigree Chart'), encode_url($link));
 				if (!empty($WT_IMAGES["pedigree"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["pedigree"]["small"]);
+					$submenu->addIcon($WT_IMAGES["pedigree"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_pedigree");
 				$menu->addSubmenu($submenu);
 				break;
@@ -272,7 +271,7 @@ class MenuBar
 				if ($rootid) $link .= "&pid={$rootid}&show_full={$showFull}";
 				$submenu = new Menu(i18n::translate('Descendancy chart'), encode_url($link));
 				if (!empty($WT_IMAGES["descendant"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["descendant"]["small"]);
+					$submenu->addIcon($WT_IMAGES["descendant"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_descendant");
 				$menu->addSubmenu($submenu);
 				break;
@@ -283,7 +282,7 @@ class MenuBar
 				if ($rootid) $link .= "&rootid={$rootid}&show_full={$showFull}";
 				$submenu = new Menu(i18n::translate('Ancestry chart'), encode_url($link));
 				if (!empty($WT_IMAGES["ancestry"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["ancestry"]["small"]);
+					$submenu->addIcon($WT_IMAGES["ancestry"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_ancestry");
 				$menu->addSubmenu($submenu);
 				break;
@@ -294,7 +293,7 @@ class MenuBar
 				if ($rootid) $link .= "&rootid=".$rootid;
 				$submenu = new Menu(i18n::translate('Compact Chart'), encode_url($link));
 				if (!empty($WT_IMAGES["ancestry"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["ancestry"]["small"]);
+					$submenu->addIcon($WT_IMAGES["ancestry"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_ancestry");
 				$menu->addSubmenu($submenu);
 				break;
@@ -305,7 +304,7 @@ class MenuBar
 				if ($rootid) $link .= "&rootid=".$rootid;
 				$submenu = new Menu(i18n::translate('Circle diagram'), encode_url($link));
 				if (!empty($WT_IMAGES["fanchart"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["fanchart"]["small"]);
+					$submenu->addIcon($WT_IMAGES["fanchart"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_fanchart");
 				$menu->addSubmenu($submenu);
 				break;
@@ -316,7 +315,7 @@ class MenuBar
 				if ($rootid) $link .= "&pid={$rootid}&show_full={$showFull}";
 				$submenu = new Menu(i18n::translate('Hourglass chart'), encode_url($link));
 				if (!empty($WT_IMAGES["hourglass"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["hourglass"]["small"]);
+					$submenu->addIcon($WT_IMAGES["hourglass"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_hourglass");
 				$menu->addSubmenu($submenu);
 				break;
@@ -327,7 +326,7 @@ class MenuBar
 				if ($rootid) $link .= "&pid={$rootid}&show_full={$showFull}";
 				$submenu = new Menu(i18n::translate('Family book chart'), encode_url($link));
 				if (!empty($WT_IMAGES["fambook"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["fambook"]["small"]);
+					$submenu->addIcon($WT_IMAGES["fambook"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_fambook");
 				$menu->addSubmenu($submenu);
 				break;
@@ -338,7 +337,7 @@ class MenuBar
 				if ($rootid) $link .= "&amp;pids[]=".$rootid;
 				$submenu = new Menu(i18n::translate('Timeline chart'), $link);
 				if (!empty($WT_IMAGES["timeline"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["timeline"]["small"]);
+					$submenu->addIcon($WT_IMAGES["timeline"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_timeline");
 				$menu->addSubmenu($submenu);
 				if (isset($controller) && !empty($controller->famid)) {
@@ -356,7 +355,7 @@ class MenuBar
 							// charts / parents_timeline
 							$submenu = new Menu(i18n::translate('Show couple on timeline chart'), encode_url('timeline.php?pids[0]='.$controller->getHusband().'&pids[1]='.$controller->getWife()));
 							if (!empty($WT_IMAGES["timeline"]["small"])) {
-								$submenu->addIcon("{$WT_IMAGE_DIR}/{$WT_IMAGES['timeline']['small']}");
+								$submenu->addIcon("{$WT_IMAGES['timeline']['small']}");
 							}
 							$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
 							$menu->addSubmenu($submenu);
@@ -366,7 +365,7 @@ class MenuBar
 							// charts / children_timeline
 							$submenu = new Menu(i18n::translate('Show children on timeline chart'), encode_url('timeline.php?'.$controller->getChildrenUrlTimeline()));
 							if (!empty($WT_IMAGES["timeline"]["small"])) {
-								$submenu->addIcon("{$WT_IMAGE_DIR}/{$WT_IMAGES['timeline']['small']}");
+								$submenu->addIcon("{$WT_IMAGES['timeline']['small']}");
 							}
 							$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
 							$menu->addSubmenu($submenu);
@@ -376,7 +375,7 @@ class MenuBar
 							// charts / family_timeline
 							$submenu = new Menu(i18n::translate('Show family on timeline chart'), encode_url('timeline.php?pids[0]='.$controller->getHusband().'&pids[1]='.$controller->getWife().'&'.$controller->getChildrenUrlTimeline(2)));
 							if (!empty($WT_IMAGES["timeline"]["small"])) {
-								$submenu->addIcon("{$WT_IMAGE_DIR}/{$WT_IMAGES['timeline']['small']}");
+								$submenu->addIcon("{$WT_IMAGES['timeline']['small']}");
 							}
 							$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
 							$menu->addSubmenu($submenu);
@@ -394,7 +393,7 @@ class MenuBar
 				if ($rootid) $link .= "&pids[]={$rootid}&addFamily=1";
 				$submenu = new Menu(i18n::translate('Lifespan chart'), encode_url($link));
 				if (!empty($WT_IMAGES["timeline"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["timeline"]["small"]);
+					$submenu->addIcon($WT_IMAGES["timeline"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_timeline");
 				$menu->addSubmenu($submenu);
 				break;
@@ -433,7 +432,7 @@ class MenuBar
 								);
 							}
 							if (!empty($WT_IMAGES["relationship"]["small"])) {
-								$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["relationship"]["small"]);
+								$submenu->addIcon($WT_IMAGES["relationship"]["small"]);
 							}
 							$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_relationship");
 							$menu->addSubmenu($submenu);
@@ -446,7 +445,7 @@ class MenuBar
 				//-- statistics plot
 				$submenu = new Menu(i18n::translate('Statistics'), encode_url("statistics.php?ged=".WT_GEDCOM));
 				if (!empty($WT_IMAGES["statistic"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["statistic"]["small"]);
+					$submenu->addIcon($WT_IMAGES["statistic"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_statistic");
 				$menu->addSubmenu($submenu);
 				break;
@@ -457,7 +456,7 @@ class MenuBar
 				if ($rootid) $link .= "&rootid=".$rootid;
 				$submenu = new Menu(i18n::translate('Interactive tree'), encode_url($link));
 				if (!empty($WT_IMAGES["tree"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["tree"]["small"]);
+					$submenu->addIcon($WT_IMAGES["tree"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_gedcom");
 				$menu->addSubmenu($submenu);
 				break;
@@ -483,9 +482,7 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getListsMenu($surname="") {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES;
-		global $MULTI_MEDIA, $SEARCH_SPIDER;
-		global $controller;
+		global $TEXT_DIRECTION, $WT_IMAGES, $MULTI_MEDIA, $SEARCH_SPIDER, $controller;
 		
 		$style = "top";
 		if ($surname) $style = "sub";
@@ -510,13 +507,13 @@ class MenuBar
 				$link .= "&surname={$surname}";
 				$menu = new Menu(i18n::translate('Lists'), encode_url($link));
 				if (!empty($WT_IMAGES["indis"]["small"]))
-					$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["indis"]["small"]);
+					$menu->addIcon($WT_IMAGES["indis"]["small"]);
 				$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_small_indis");
 			}
 			else {
 				$menu = new Menu(i18n::translate('Lists'), encode_url($link), "down");
 				if (!empty($WT_IMAGES["indis"]["large"]))
-					$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["indis"]["large"]);
+					$menu->addIcon($WT_IMAGES["indis"]["large"]);
 				$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_indis");
 			}
 
@@ -525,7 +522,7 @@ class MenuBar
 				foreach (get_all_gedcoms() as $ged_id=>$gedcom) {
 					$submenu = new Menu(i18n::translate('Individuals')." - ".PrintReady(get_gedcom_setting($ged_id, 'title')), encode_url('indilist.php?ged='.$gedcom));
 					if (!empty($WT_IMAGES["gedcom"]["small"]))
-						$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+						$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 					$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_gedcom");
 					$menu->addSubmenu($submenu);
 				}
@@ -538,13 +535,13 @@ class MenuBar
 			$link .= "&surname=".$surname;
 			$menu = new Menu(i18n::translate('Lists'), encode_url($link));
 			if (!empty($WT_IMAGES["indis"]["small"]))
-				$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["indis"]["small"]);
+				$menu->addIcon($WT_IMAGES["indis"]["small"]);
 			$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_indis");
 		}
 		else {
 			$menu = new Menu(i18n::translate('Lists'), $link, "down");
 			if (!empty($WT_IMAGES["indis"]["large"]))
-				$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["indis"]["large"]);
+				$menu->addIcon($WT_IMAGES["indis"]["large"]);
 			$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_indis");
 		}
 
@@ -570,7 +567,7 @@ class MenuBar
 				if ($surname) $link .= "&surname=".$surname;
 				$submenu = new Menu(i18n::translate('Individuals'), encode_url($link));
 				if (!empty($WT_IMAGES["indis"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["indis"]["small"]);
+					$submenu->addIcon($WT_IMAGES["indis"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_indis");
 				$menu->addSubmenu($submenu);
 				break;
@@ -581,7 +578,7 @@ class MenuBar
 				if ($surname) $link .= "&amp;surname=".$surname;
 				$submenu = new Menu(i18n::translate('Families'), $link);
 				if (!empty($WT_IMAGES["cfamily"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["cfamily"]["small"]);
+					$submenu->addIcon($WT_IMAGES["cfamily"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_cfamily");
 				$menu->addSubmenu($submenu);
 				break;
@@ -592,7 +589,7 @@ class MenuBar
 				if ($surname) $link .= "&amp;surn=".$surname;
 				$submenu = new Menu(i18n::translate('Branches'), $link);
 				if (!empty($WT_IMAGES["patriarch"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["patriarch"]["small"]);
+					$submenu->addIcon($WT_IMAGES["patriarch"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_patriarch");
 				$menu->addSubmenu($submenu);
 				break;
@@ -601,7 +598,7 @@ class MenuBar
 				//-- source
 				$submenu = new Menu(i18n::translate('Sources'), encode_url('sourcelist.php?ged='.WT_GEDCOM));
 				if (!empty($WT_IMAGES["menu_source"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_source"]["small"]);
+					$submenu->addIcon($WT_IMAGES["menu_source"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_source");
 				$menu->addSubmenu($submenu);
 				break;
@@ -610,9 +607,9 @@ class MenuBar
 				//-- shared note
 				$submenu = new Menu(i18n::translate('Shared Notes'), encode_url('notelist.php?ged='.WT_GEDCOM));
 				if (!empty($WT_IMAGES["menu_note"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_note"]["small"]);
+					$submenu->addIcon($WT_IMAGES["menu_note"]["small"]);
 				else if (!empty($WT_IMAGES["notes"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["notes"]["small"]);
+					$submenu->addIcon($WT_IMAGES["notes"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_notes");
 				$menu->addSubmenu($submenu);
 				break;
@@ -621,7 +618,7 @@ class MenuBar
 				//-- repository
 				$submenu = new Menu(i18n::translate('Repositories'), "repolist.php");
 				if (!empty($WT_IMAGES["menu_repository"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_repository"]["small"]);
+					$submenu->addIcon($WT_IMAGES["menu_repository"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_repository");
 				$menu->addSubmenu($submenu);
 				break;
@@ -630,7 +627,7 @@ class MenuBar
 				//-- places
 				$submenu = new Menu(i18n::translate('Place hierarchy'), encode_url('placelist.php?ged='.WT_GEDCOM));
 				if (!empty($WT_IMAGES["place"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["place"]["small"]);
+					$submenu->addIcon($WT_IMAGES["place"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_place");
 				$menu->addSubmenu($submenu);
 				break;
@@ -639,7 +636,7 @@ class MenuBar
 				//-- medialist
 				$submenu = new Menu(i18n::translate('Multimedia'), encode_url('medialist.php?ged='.WT_GEDCOM));
 				if (!empty($WT_IMAGES["menu_media"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_media"]["small"]);
+					$submenu->addIcon($WT_IMAGES["menu_media"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_media");
 				$menu->addSubmenu($submenu);
 				break;
@@ -654,7 +651,8 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getCalendarMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $SEARCH_SPIDER;
+		global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER;
+
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 		if ((!file_exists(WT_ROOT.'calendar.php')) || (!empty($SEARCH_SPIDER))) {
 			$menu = new Menu("", "", "");
@@ -664,24 +662,24 @@ class MenuBar
 		//-- main calendar menu item
 		$menu = new Menu(i18n::translate('Calendar'), encode_url('calendar.php?ged='.WT_GEDCOM), "down");
 		if (!empty($WT_IMAGES["calendar"]["large"]))
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["calendar"]["large"]);
+			$menu->addIcon($WT_IMAGES["calendar"]["large"]);
 		$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_calendar");
 		//-- viewday sub menu
 		$submenu = new Menu(i18n::translate('View Day'), encode_url('calendar.php?ged='.WT_GEDCOM));
 		if (!empty($WT_IMAGES["calendar"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["calendar"]["small"]);
+			$submenu->addIcon($WT_IMAGES["calendar"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_calendar");
 		$menu->addSubmenu($submenu);
 		//-- viewmonth sub menu
 		$submenu = new Menu(i18n::translate('View Month'), encode_url("calendar.php?ged=".WT_GEDCOM."&action=calendar"));
 		if (!empty($WT_IMAGES["calendar"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["calendar"]["small"]);
+			$submenu->addIcon($WT_IMAGES["calendar"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_calendar");
 		$menu->addSubmenu($submenu);
 		//-- viewyear sub menu
 		$submenu = new Menu(i18n::translate('View Year'), encode_url("calendar.php?ged=".WT_GEDCOM."&action=year"));
 		if (!empty($WT_IMAGES["calendar"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["calendar"]["small"]);
+			$submenu->addIcon($WT_IMAGES["calendar"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_calendar");
 		$menu->addSubmenu($submenu);
 		return $menu;
@@ -692,9 +690,7 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getReportsMenu($pid="", $famid="") {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES;
-		global $SEARCH_SPIDER;
-		global $controller;
+		global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER, $controller;
 
 		$style = "top";
 		if ($pid || $famid) $style = "sub";
@@ -720,14 +716,14 @@ class MenuBar
 		if ($style=="sub") {
 			$menu = new Menu(i18n::translate('Reports'), "#");
 			if (!empty($WT_IMAGES["reports"]["small"]))
-				$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["reports"]["small"]);
+				$menu->addIcon($WT_IMAGES["reports"]["small"]);
 			$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		}
 		else {
 			// top menubar
 			$menu = new Menu(i18n::translate('Reports'), encode_url('reportengine.php?ged='.WT_GEDCOM), "down");
 			if (!empty($WT_IMAGES["reports"]["large"]))
-				$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["reports"]["large"]);
+				$menu->addIcon($WT_IMAGES["reports"]["large"]);
 			$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_reports");
 		}
 
@@ -744,7 +740,8 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getOptionalMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $SEARCH_SPIDER;
+		global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER;
+
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 		if (!file_exists(WT_ROOT.'includes/extras/optional_menu.php') || !empty($SEARCH_SPIDER)) {
 			$menu = new Menu("", "", "");
@@ -760,8 +757,8 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getSearchMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES;
-		global $SHOW_MULTISITE_SEARCH, $SEARCH_SPIDER;
+		global $TEXT_DIRECTION, $WT_IMAGES, $SHOW_MULTISITE_SEARCH, $SEARCH_SPIDER;
+
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 		if ((!file_exists(WT_ROOT.'search.php')) || (!empty($SEARCH_SPIDER))) {
 			$menu = new Menu("", "", "");
@@ -771,31 +768,31 @@ class MenuBar
 		//-- main search menu item
 		$menu = new Menu(i18n::translate('Search'), encode_url('search.php?ged='.WT_GEDCOM), "down");
 		if (!empty($WT_IMAGES["search"]["large"]))
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["search"]["large"]);
+			$menu->addIcon($WT_IMAGES["search"]["large"]);
 		$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_search");
 		//-- search_general sub menu
 		$submenu = new Menu(i18n::translate('General Search'), encode_url("search.php?ged=".WT_GEDCOM."&action=general"));
 		if (!empty($WT_IMAGES["search"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["search"]["small"]);
+			$submenu->addIcon($WT_IMAGES["search"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search");
 		$menu->addSubmenu($submenu);
 		//-- search_soundex sub menu
 		$submenu = new Menu(i18n::translate('Soundex Search'), encode_url("search.php?ged=".WT_GEDCOM."&action=soundex"));
 		if (!empty($WT_IMAGES["search"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["search"]["small"]);
+			$submenu->addIcon($WT_IMAGES["search"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search");
 		$menu->addSubmenu($submenu);
 		//-- advanced search
 		$submenu = new Menu(i18n::translate('Advanced search'), encode_url("search_advanced.php?ged=".WT_GEDCOM));
 		if (!empty($WT_IMAGES["search"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["search"]["small"]);
+			$submenu->addIcon($WT_IMAGES["search"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search");
 		$menu->addSubmenu($submenu);
 		//-- search_replace sub menu
 		if (WT_USER_CAN_EDIT) {
 			$submenu = new Menu(i18n::translate('Search and replace'), encode_url("search.php?ged=".WT_GEDCOM."&action=replace"));
 			if (!empty($WT_IMAGES["search"]["small"]))
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["search"]["small"]);
+				$submenu->addIcon($WT_IMAGES["search"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search");
 			$menu->addSubmenu($submenu);
 		}
@@ -806,7 +803,7 @@ class MenuBar
 			if (count($sitelist)>0) {
 				$submenu = new Menu(i18n::translate('Multi Site Search'), encode_url("search.php?ged=".WT_GEDCOM."&action=multisite"));
 				if (!empty($WT_IMAGES["search"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["search"]["small"]);
+					$submenu->addIcon($WT_IMAGES["search"]["small"]);
 				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search");
 				$menu->addSubmenu($submenu);
 			}
@@ -834,8 +831,8 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getHelpMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $SEARCH_SPIDER;
-		global $QUERY_STRING, $helpindex, $action;
+		global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER, $QUERY_STRING, $helpindex, $action;
+
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 		if (!empty($SEARCH_SPIDER)) {
 			$menu = new Menu("", "", "");
@@ -845,7 +842,7 @@ class MenuBar
 		//-- main help menu item
 		$menu = new Menu(i18n::translate('Help'), "#", "down");
 		if (!empty($WT_IMAGES["help"]["large"]))
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["help"]["large"]);
+			$menu->addIcon($WT_IMAGES["help"]["large"]);
 		if (empty($helpindex))
 			$menu->addOnclick("return helpPopup('".WT_SCRIPT_NAME."');");
 		else
@@ -855,7 +852,7 @@ class MenuBar
 		//-- help_for_this_page sub menu
 		$submenu = new Menu(i18n::translate('Help with this page'), "#");
 		if (!empty($WT_IMAGES["menu_help"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_help"]["small"]);
+			$submenu->addIcon($WT_IMAGES["menu_help"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help");
 		if (empty($helpindex))
 			$submenu->addOnclick("return helpPopup('".WT_SCRIPT_NAME."');");
@@ -865,7 +862,7 @@ class MenuBar
 		//-- help_contents sub menu
 		$submenu = new Menu(i18n::translate('Help Contents'), "#");
 		if (!empty($WT_IMAGES["menu_help"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_help"]["small"]);
+			$submenu->addIcon($WT_IMAGES["menu_help"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help");
 		$submenu->addOnclick("return helpPopup('help_contents_help');");
 		$menu->addSubmenu($submenu);
@@ -874,7 +871,7 @@ class MenuBar
 
 			$submenu = new Menu(i18n::translate('FAQ'), "module.php?mod=faq&mod_action=show");
 			if (!empty($WT_IMAGES["menu_help"]["small"]))
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_help"]["small"]);
+				$submenu->addIcon($WT_IMAGES["menu_help"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help");
 			$menu->addSubmenu($submenu);
 		}
@@ -882,7 +879,7 @@ class MenuBar
 		$menu->addSeparator();
 		$submenu = new Menu(i18n::translate('Wiki Main Page'), WT_WEBTREES_WIKI.'" target="_blank');
 		if (!empty($WT_IMAGES["wiki"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["wiki"]["small"]);
+			$submenu->addIcon($WT_IMAGES["wiki"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_wiki");
 		$menu->addSubmenu($submenu);
 // These two sub menu items temporarily removed as the WIKI pages do not exist
@@ -902,7 +899,7 @@ class MenuBar
 		foreach($menuitems as $menuitem) {
 			$submenu = new Menu($menuitem["label"], $menuitem["link"]);
 			if (!empty($WT_IMAGES["mypage"]["small"]))
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["mypage"]["small"]);
+				$submenu->addIcon($WT_IMAGES["mypage"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_contact");
 			if (!empty($menuitem["onclick"])) $submenu->addOnclick($menuitem["onclick"]);
 			$menu->addSubmenu($submenu);
@@ -914,7 +911,7 @@ class MenuBar
 		else
 			$submenu = new Menu(i18n::translate('Show contextual help'), WT_SCRIPT_NAME.normalize_query_string($QUERY_STRING."&amp;show_context_help=yes"));
 		if (!empty($WT_IMAGES["menu_help"]["small"]))
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_help"]["small"]);
+			$submenu->addIcon($WT_IMAGES["menu_help"]["small"]);
 		$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help");
 		$menu->addSubmenu($submenu);
 		return $menu;
@@ -995,7 +992,7 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getLanguageMenu() {
-		global $QUERY_STRING, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $QUERY_STRING, $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -1022,7 +1019,7 @@ class MenuBar
 	* @return Menu the menu item
 	*/
 	static function getFavoritesMenu() {
-		global $REQUIRE_AUTHENTICATION, $GEDCOM, $QUERY_STRING, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $REQUIRE_AUTHENTICATION, $GEDCOM, $QUERY_STRING, $WT_IMAGES, $TEXT_DIRECTION;
 		global $SEARCH_SPIDER;
 		global $controller; // Pages with a controller can be added to the favorites
 
@@ -1034,7 +1031,7 @@ class MenuBar
 
 		$menu=new Menu(i18n::translate('Favorites'), '#', 'down');
 		if (!empty($WT_IMAGES['gedcom']['large'])) {
-			$menu->addIcon($WT_IMAGE_DIR.'/'.$WT_IMAGES['gedcom']['large']);
+			$menu->addIcon($WT_IMAGES['gedcom']['large']);
 		}
 		$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_gedcom");
 
diff --git a/includes/classes/class_person.php b/includes/classes/class_person.php
index 6399d21ea2..14a9b908f5 100644
--- a/includes/classes/class_person.php
+++ b/includes/classes/class_person.php
@@ -465,23 +465,24 @@ class Person extends GedcomRecord {
 	}
 
 	static function sexImage($sex, $size='small', $style='', $title='') {
-		global $WT_IMAGE_DIR, $WT_IMAGES;
+		global $WT_IMAGES;
+
 		switch ($sex) {
 		case 'M':
 			if (isset($WT_IMAGES['sex'][$size])) {
-				return "<img src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['sex'][$size]}\" class=\"gender_image\" style=\"{$style}\" alt=\"{$title}\" title=\"{$title}\" />";
+				return "<img src=\"{$WT_IMAGES['sex'][$size]}\" class=\"gender_image\" style=\"{$style}\" alt=\"{$title}\" title=\"{$title}\" />";
 			} else {
 				return '<span style="size:'.$size.'">'.WT_UTF8_MALE.'</span>';
 			}
 		case 'F':
 			if (isset($WT_IMAGES['sex'][$size])) {
-				return "<img src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['sexf'][$size]}\" class=\"gender_image\" style=\"{$style}\" alt=\"{$title}\" title=\"{$title}\" />";
+				return "<img src=\"{$WT_IMAGES['sexf'][$size]}\" class=\"gender_image\" style=\"{$style}\" alt=\"{$title}\" title=\"{$title}\" />";
 			} else {
 				return '<span style="size:'.$size.'">'.WT_UTF8_FEMALE.'</span>';
 			}
 		default:
 			if (isset($WT_IMAGES['sex'][$size])) {
-				return "<img src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['sexn'][$size]}\" class=\"gender_image\" style=\"{$style}\" alt=\"{$title}\" title=\"{$title}\" />";
+				return "<img src=\"{$WT_IMAGES['sexn'][$size]}\" class=\"gender_image\" style=\"{$style}\" alt=\"{$title}\" title=\"{$title}\" />";
 			} else {
 				return '<span style="size:'.$size.'">?</span>';
 			}
diff --git a/includes/classes/class_treenav.php b/includes/classes/class_treenav.php
index 1c5b04bbfa..5a312275fa 100644
--- a/includes/classes/class_treenav.php
+++ b/includes/classes/class_treenav.php
@@ -152,7 +152,8 @@ class TreeNav {
 	* @param string $height the height parameter for the outer style
 	*/
 	function drawViewport($id='', $width='', $height='') {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+		global $WT_IMAGES, $GEDCOM;
+
 		if (empty($id)) $id = $this->rootPerson->getXref();
 		$widthS = "";
 		$heightS = "";
@@ -170,10 +171,10 @@ class TreeNav {
 			</div>
 			<div id="controls" style="position: absolute; left: 0px; top: 0px; z-index: 100; background-color: #EEEEEE">
 			<table>
-				<tr><td><a href="#" onclick="<?php print $this->name; ?>.zoomIn(); return false;"><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['zoomin']['other'];?>" border="0" alt="zoomin" /></a></td></tr>
-				<tr><td><a href="#" onclick="<?php print $this->name; ?>.zoomOut(); return false;"><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['zoomout']['other'];?>" border="0" alt="zoomout" /></a></td></tr>
-				<tr><td <?php if (is_null($this->rootPerson) || WT_SCRIPT_NAME=='treenav.php') print "style=\"display: none;\"";?>><a id="biglink" href="#" onclick="<?php print $this->name; ?>.loadBigTree('<?php if (!is_null($this->rootPerson)) print $this->rootPerson->getXref();?>','<?php print htmlentities($GEDCOM,ENT_COMPAT,'UTF-8');?>'); return false;" title="<?php print i18n::translate('View this tree in the full page interactive tree'); ?>"><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['tree']['small'];?>" border="0" alt="" /></a></td></tr>
-				<tr><td><a href="#" onclick="<?php print $this->name; ?>.toggleSpouses('<?php if ($this->rootPerson!=null) print $this->rootPerson->getXref(); ?>'); return false;" title="<?php print i18n::translate('Show or hide multiple spouses'); ?>"><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['sfamily']['small']; ?>" border="0" alt="" /></a></td></tr>
+				<tr><td><a href="#" onclick="<?php print $this->name; ?>.zoomIn(); return false;"><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['zoomin']['other'];?>" border="0" alt="zoomin" /></a></td></tr>
+				<tr><td><a href="#" onclick="<?php print $this->name; ?>.zoomOut(); return false;"><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['zoomout']['other'];?>" border="0" alt="zoomout" /></a></td></tr>
+				<tr><td <?php if (is_null($this->rootPerson) || WT_SCRIPT_NAME=='treenav.php') print "style=\"display: none;\"";?>><a id="biglink" href="#" onclick="<?php print $this->name; ?>.loadBigTree('<?php if (!is_null($this->rootPerson)) print $this->rootPerson->getXref();?>','<?php print htmlentities($GEDCOM,ENT_COMPAT,'UTF-8');?>'); return false;" title="<?php print i18n::translate('View this tree in the full page interactive tree'); ?>"><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['tree']['small'];?>" border="0" alt="" /></a></td></tr>
+				<tr><td><a href="#" onclick="<?php print $this->name; ?>.toggleSpouses('<?php if ($this->rootPerson!=null) print $this->rootPerson->getXref(); ?>'); return false;" title="<?php print i18n::translate('Show or hide multiple spouses'); ?>"><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['sfamily']['small']; ?>" border="0" alt="" /></a></td></tr>
 				<tr><td><?php echo help_link('help_treenav.php'); ?></td></tr>
 				<tr><td><img id="<?php print $this->name; ?>_loading" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH; ?>images/loading.gif" style="display: none;" alt="Loading..." /></td></tr>
 			</table>
@@ -250,8 +251,7 @@ class TreeNav {
 	* @param Person $person the person to print the details for
 	*/
 	function getDetails(&$person) {
-		global $USE_SILHOUETTE, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
-		global $TEXT_DIRECTION;
+		global $USE_SILHOUETTE, $WT_IMAGES, $GEDCOM, $TEXT_DIRECTION;
 
 		if (empty($person)) $person = $this->rootPerson;
 		//if (!$person->canDisplayDetails()) return;
@@ -296,19 +296,19 @@ class TreeNav {
 			$sex = $person->getSex();
 			$thumbnail = "<img src=\"";
 			if ($sex == 'F') {
-				$thumbnail .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_F"]["other"];
+				$thumbnail .= $WT_IMAGES["default_image_F"]["other"];
 			}
 			else if ($sex == 'M') {
-				$thumbnail .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_M"]["other"];
+				$thumbnail .= $WT_IMAGES["default_image_M"]["other"];
 			}
 			else {
-				$thumbnail .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_U"]["other"];
+				$thumbnail .= $WT_IMAGES["default_image_U"]["other"];
 			} 
 			$thumbnail .="\" class=\"".$class."\" border=\"none\" alt=\"\" />";
 			echo $thumbnail;
 		} ?>
 		<a href="<?php print $person->getLinkUrl(); ?>" onclick="if (!<?php print $this->name;?>.collapseBox) return false;"><?php print $person->getSexImage().PrintReady($name); ?></a>
-		<img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES["tree"]["small"];?>" border="0" width="15" onclick="<?php print $this->name;?>.newRoot('<?php print $person->getXref();?>', <?php print $this->name;?>.innerPort, '<?php print htmlentities($GEDCOM,ENT_COMPAT,'UTF-8'); ?>');" />
+		<img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES["tree"]["small"];?>" border="0" width="15" onclick="<?php print $this->name;?>.newRoot('<?php print $person->getXref();?>', <?php print $this->name;?>.innerPort, '<?php print htmlentities($GEDCOM,ENT_COMPAT,'UTF-8'); ?>');" />
 		</span><br />
 		<div class="details1 indent">
 			<?php
@@ -334,27 +334,27 @@ class TreeNav {
 					$sex = $spouse->getSex();
 					$thumbnail = "<img src=\"";
 					if ($sex == 'F') {
-						$thumbnail .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_F"]["other"];
+						$thumbnail .= $WT_IMAGES["default_image_F"]["other"];
 					}
 					else if ($sex == 'M') {
-						$thumbnail .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_M"]["other"];
+						$thumbnail .= $WT_IMAGES["default_image_M"]["other"];
 					}
 					else {
-						$thumbnail .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_U"]["other"];
+						$thumbnail .= $WT_IMAGES["default_image_U"]["other"];
 					} 
 					$thumbnail .="\" class=\"".$class."\" border=\"none\" alt=\"\" />";
 					echo $thumbnail;
 				} ?>
 				<a href="<?php print $spouse->getLinkUrl(); ?>" onclick="if (!<?php print $this->name;?>.collapseBox) return false;">
 				<?php print $spouse->getSexImage().PrintReady($name); ?></a>
-				<img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES["tree"]["small"];?>" border="0" width="15" onclick="<?php print $this->name;?>.newRoot('<?php print $spouse->getXref();?>', <?php print $this->name;?>.innerPort, '<?php print htmlentities($GEDCOM,ENT_COMPAT,'UTF-8'); ?>');" />
+				<img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES["tree"]["small"];?>" border="0" width="15" onclick="<?php print $this->name;?>.newRoot('<?php print $spouse->getXref();?>', <?php print $this->name;?>.innerPort, '<?php print htmlentities($GEDCOM,ENT_COMPAT,'UTF-8'); ?>');" />
 				<br />
 				<div class="details1 indent">
 					<?php
 						echo '<b>', abbreviate_fact('BIRT'), '</b> ', $spouse->getBirthDate()->Display(), ' ', PrintReady($spouse->getBirthPlace()), '<br />';
 						echo '<b>', abbreviate_fact('MARR'), '</b> ', $family->getMarriageDate()->Display(), ' ', $family->getMarriagePlace();
 					?>
-					<a href="family.php?famid=<?php print $family->getXref(); ?>" onclick="if (!<?php print $this->name;?>.collapseBox) return false;"><img id="d_<?php print $family->getXref(); ?>" alt="<?php print $family->getXref(); ?>" class="draggable" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['family']['button']; ?>" border="0" /></a><br />
+					<a href="family.php?famid=<?php print $family->getXref(); ?>" onclick="if (!<?php print $this->name;?>.collapseBox) return false;"><img id="d_<?php print $family->getXref(); ?>" alt="<?php print $family->getXref(); ?>" class="draggable" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['family']['button']; ?>" border="0" /></a><br />
 					<?php
 						if ($spouse->isDead()) {
 							echo '<b>', abbreviate_fact('DEAT'), '</b> ', $spouse->getDeathDate()->Display(), ' ', PrintReady($spouse->getDeathPlace()), '<br />';
@@ -443,7 +443,7 @@ class TreeNav {
 	* @param int $state Whether we are going up or down the tree, -1 for descendents +1 for ancestors
 	*/
 	function drawPersonAllSpouses(&$person, $gen, $state) {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($gen<0) {
 			return;
@@ -491,11 +491,11 @@ class TreeNav {
 						?>
 					</td>
 					<?php
-					if ($hasChildren && $person->getNumberOfChildren()>1) { ?><td valign="top"><img style="position: absolute;" id="cline_<?php print $person->getXref();?>" name="vertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['vline']['other']; ?>" width="3" alt="" /></td><?php }
-					else if ($hasChildren) { ?><td valign="top"><img style="position: absolute;" id="cline_<?php print $person->getXref();?>" name="vertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['hline']['other']; ?>" width="3"  alt=""/></td><?php }
+					if ($hasChildren && $person->getNumberOfChildren()>1) { ?><td valign="top"><img style="position: absolute;" id="cline_<?php print $person->getXref();?>" name="vertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['vline']['other']; ?>" width="3" alt="" /></td><?php }
+					else if ($hasChildren) { ?><td valign="top"><img style="position: absolute;" id="cline_<?php print $person->getXref();?>" name="vertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['hline']['other']; ?>" width="3"  alt=""/></td><?php }
 					}
 					if ($state>0) {
-						?><td><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['hline']['other']; ?>" width="8" height="3" alt="" /></td><?php
+						?><td><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['hline']['other']; ?>" width="8" height="3" alt="" /></td><?php
 					}
 					/* print the person */ ?>
 					<td>
@@ -520,7 +520,7 @@ class TreeNav {
 					</td>
 					<?php
 					if ($state<0) {
-						?><td><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['hline']['other']; ?>" width="8" height="3" alt="" /></td><?php
+						?><td><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['hline']['other']; ?>" width="8" height="3" alt="" /></td><?php
 					}
 					/* print the father */
 					if ($state>=0 && (!empty($father) || !empty($mother))) {
@@ -529,7 +529,7 @@ class TreeNav {
 						$lineid.="_";
 						if (!empty($mother)) $lineid.=$mother->getXref();
 						?>
-					<?php if (!empty($father) && (!empty($mother))) { ?><td><img style="position: absolute;" id="<?php print $lineid;?>" name="pvertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['vline']['other']; ?>" width="3" alt="" /></td><?php } ?>
+					<?php if (!empty($father) && (!empty($mother))) { ?><td><img style="position: absolute;" id="<?php print $lineid;?>" name="pvertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['vline']['other']; ?>" width="3" alt="" /></td><?php } ?>
 					<td align="left">
 						<table cellpadding="0" cellspacing="0" border="0">
 							<tbody>
@@ -576,7 +576,7 @@ class TreeNav {
 	* @param Family $pfamily
 	*/
 	function drawPerson(&$person, $gen, $state, &$pfamily) {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		$gen++;
 		if ($gen<0) {
@@ -625,10 +625,10 @@ class TreeNav {
 						?>
 					</td>
 					<?php
-					if ($hasChildren && $family->getNumberOfChildren()>1) { ?><td valign="top"><img style="position: absolute;" id="cline_<?php print $person->getXref();?>" name="vertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['vline']['other']; ?>" width="3" alt="" /></td><?php }
+					if ($hasChildren && $family->getNumberOfChildren()>1) { ?><td valign="top"><img style="position: absolute;" id="cline_<?php print $person->getXref();?>" name="vertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['vline']['other']; ?>" width="3" alt="" /></td><?php }
 					}
 					if ($state>0) {
-						?><td><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['hline']['other']; ?>" width="8" height="3" alt="" /></td><?php
+						?><td><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['hline']['other']; ?>" width="8" height="3" alt="" /></td><?php
 					}
 					/* print the person */ ?>
 					<td>
@@ -645,7 +645,7 @@ class TreeNav {
 					</td>
 					<?php
 					if ($state<0) {
-						?><td><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['hline']['other']; ?>" width="8" height="3" alt="" /></td><?php
+						?><td><img src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['hline']['other']; ?>" width="8" height="3" alt="" /></td><?php
 					}
 					/* print the father */
 					if ($state>=0 && (!empty($father) || !empty($mother))) {
@@ -654,7 +654,7 @@ class TreeNav {
 						$lineid.="_";
 						if (!empty($mother)) $lineid.=$mother->getXref();
 						?>
-					<?php if (!empty($father) && (!empty($mother))) { ?><td><img style="position: absolute;" id="<?php print $lineid;?>" name="pvertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGE_DIR."/".$WT_IMAGES['vline']['other']; ?>" width="3" alt="" /></td><?php } ?>
+					<?php if (!empty($father) && (!empty($mother))) { ?><td><img style="position: absolute;" id="<?php print $lineid;?>" name="pvertline" src="<?php print WT_SERVER_NAME.WT_SCRIPT_PATH.$WT_IMAGES['vline']['other']; ?>" width="3" alt="" /></td><?php } ?>
 					<td align="left">
 						<table cellpadding="0" cellspacing="0" border="0">
 							<tbody>
diff --git a/includes/controllers/ancestry_ctrl.php b/includes/controllers/ancestry_ctrl.php
index b2c3dce9af..35f3811078 100644
--- a/includes/controllers/ancestry_ctrl.php
+++ b/includes/controllers/ancestry_ctrl.php
@@ -100,19 +100,17 @@ class AncestryController extends BaseController {
 	 * @param int $depth the ascendancy depth to show
 	 */
 	function print_child_ascendancy($pid, $sosa, $depth) {
-		global $TEXT_DIRECTION, $OLD_PGENS;
-		global $WT_IMAGE_DIR, $WT_IMAGES, $Dindent;
-		global $SHOW_EMPTY_BOXES, $pidarr, $box_width;
+		global $TEXT_DIRECTION, $OLD_PGENS, $WT_IMAGES, $Dindent, $SHOW_EMPTY_BOXES, $pidarr, $box_width;
 
 		$person = Person::getInstance($pid);
 		// child
 		print "\r\n<li>";
 		print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td><a name=\"sosa".$sosa."\"></a>";
 		$new=($pid=="" or !isset($pidarr["$pid"]));
-		if ($sosa==1) print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n";
+		if ($sosa==1) print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n";
 		else {
-			print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"2\" border=\"0\" alt=\"\" />";
-			print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-2)."\" border=\"0\" alt=\"\" /></td><td>\n";
+			print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"2\" border=\"0\" alt=\"\" />";
+			print "<img src=\"".$WT_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-2)."\" border=\"0\" alt=\"\" /></td><td>\n";
 		}
 		print_pedigree_person($pid, 1);
 		print "</td>";
@@ -153,7 +151,7 @@ class AncestryController extends BaseController {
 		if (($parents || $SHOW_EMPTY_BOXES) && $new && $depth>0) {
 			// print marriage info
 			print "<span class=\"details1\" style=\"white-space: nowrap;\" >";
-			print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"$Dindent\" border=\"0\" align=\"middle\" alt=\"\" /><a href=\"javascript: ".i18n::translate('View Family')."\" onclick=\"expand_layer('sosa_".$sosa."'); return false;\" class=\"top\"><img id=\"sosa_".$sosa."_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".i18n::translate('View Family')."\" /></a> ";
+			print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"$Dindent\" border=\"0\" align=\"middle\" alt=\"\" /><a href=\"javascript: ".i18n::translate('View Family')."\" onclick=\"expand_layer('sosa_".$sosa."'); return false;\" class=\"top\"><img id=\"sosa_".$sosa."_img\" src=\"".$WT_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".i18n::translate('View Family')."\" /></a> ";
 			print "&nbsp;<span class=\"person_box\">&nbsp;".($sosa*2)."&nbsp;</span>&nbsp;".i18n::translate('and');
 			print "&nbsp;<span class=\"person_boxF\">&nbsp;".($sosa*2+1)." </span>&nbsp;";
 			if (!empty($family)) {
diff --git a/includes/controllers/descendancy_ctrl.php b/includes/controllers/descendancy_ctrl.php
index d75d4288d0..99bb5a8c18 100644
--- a/includes/controllers/descendancy_ctrl.php
+++ b/includes/controllers/descendancy_ctrl.php
@@ -151,17 +151,16 @@ class DescendancyController extends BaseController {
  * @param int $depth the descendancy depth to show
  */
 function print_child_descendancy(&$person, $depth) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $Dindent;
-	global $personcount;
+	global $WT_IMAGES, $Dindent, $personcount;
 
 	if (is_null($person)) return;
 	//print_r($person);
 	print "<li>";
 	print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
-	if ($depth==$this->generations) print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n";
+	if ($depth==$this->generations) print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n";
 	else {
-		print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"3\" border=\"0\" alt=\"\" />";
-		print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-3)."\" border=\"0\" alt=\"\" /></td><td>\n";
+		print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"3\" border=\"0\" alt=\"\" />";
+		print "<img src=\"".$WT_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-3)."\" border=\"0\" alt=\"\" /></td><td>\n";
 	}
 	print_pedigree_person($person->getXref(), 1, 0, $personcount);
 	print "</td>";
@@ -218,7 +217,7 @@ function print_child_descendancy(&$person, $depth) {
  * @param int $depth the descendancy depth to show
  */
 function print_family_descendancy(&$person, &$family, $depth) {
-	global $GEDCOM, $WT_IMAGE_DIR, $WT_IMAGES, $Dindent, $personcount;
+	global $GEDCOM, $WT_IMAGES, $Dindent, $personcount;
 
 	if (is_null($family)) return;
 	if (is_null($person)) return;
@@ -234,9 +233,9 @@ function print_family_descendancy(&$person, &$family, $depth) {
 
 		// print marriage info
 		print "<li>";
-		print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"".($Dindent+4)."\" border=\"0\" alt=\"\" />";
+		print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"".($Dindent+4)."\" border=\"0\" alt=\"\" />";
 		print "<span class=\"details1\" style=\"white-space: nowrap; \" >";
-		print "<a href=\"#\" onclick=\"expand_layer('".$famid.$personcount."'); return false;\" class=\"top\"><img id=\"".$famid.$personcount."_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".i18n::translate('View Family')."\" /></a>";
+		print "<a href=\"#\" onclick=\"expand_layer('".$famid.$personcount."'); return false;\" class=\"top\"><img id=\"".$famid.$personcount."_img\" src=\"".$WT_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".i18n::translate('View Family')."\" /></a>";
 		$marriage = $family->getMarriage();
 		if ($marriage->canShow()) {
 			echo ' <a href="', encode_url($family->getLinkUrl()), '" class="details1">';
diff --git a/includes/controllers/family_ctrl.php b/includes/controllers/family_ctrl.php
index 894e34a60e..2ada9a3799 100644
--- a/includes/controllers/family_ctrl.php
+++ b/includes/controllers/family_ctrl.php
@@ -217,7 +217,8 @@ class FamilyController extends BaseController {
 	* @return Menu
 	*/
 	function getChartsMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+		global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM;
+
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
 		else $ff="";
 
@@ -240,7 +241,7 @@ class FamilyController extends BaseController {
 		// charts menu
 		$menu = new Menu(i18n::translate('Charts'), encode_url('timeline.php?'.$link));
 		if (!empty($WT_IMAGES["timeline"]["small"])) {
-			$menu->addIcon("{$WT_IMAGE_DIR}/{$WT_IMAGES['timeline']['small']}");
+			$menu->addIcon($WT_IMAGES['timeline']['small']);
 		}
 		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 		// Build a sortable list of submenu items and then sort it in localized name order
@@ -258,7 +259,7 @@ class FamilyController extends BaseController {
 				// charts / parents_timeline
 				$submenu = new Menu(i18n::translate('Show couple on timeline chart'), encode_url('timeline.php?'.$link));
 				if (!empty($WT_IMAGES["timeline"]["small"])) {
-					$submenu->addIcon("{$WT_IMAGE_DIR}/{$WT_IMAGES['timeline']['small']}");
+					$submenu->addIcon($WT_IMAGES['timeline']['small']);
 				}
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
@@ -268,7 +269,7 @@ class FamilyController extends BaseController {
 				// charts / children_timeline
 				$submenu = new Menu(i18n::translate('Show children on timeline chart'), encode_url('timeline.php?'.$this->getChildrenUrlTimeline()));
 				if (!empty($WT_IMAGES["timeline"]["small"])) {
-					$submenu->addIcon("{$WT_IMAGE_DIR}/{$WT_IMAGES['timeline']['small']}");
+					$submenu->addIcon($WT_IMAGES['timeline']['small']);
 				}
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
@@ -278,7 +279,7 @@ class FamilyController extends BaseController {
 				// charts / family_timeline
 				$submenu = new Menu(i18n::translate('Show family on timeline chart'), encode_url('timeline.php?'.$link.'&'.$this->getChildrenUrlTimeline($c)));
 				if (!empty($WT_IMAGES["timeline"]["small"])) {
-					$submenu->addIcon("{$WT_IMAGE_DIR}/{$WT_IMAGES['timeline']['small']}");
+					$submenu->addIcon($WT_IMAGES['timeline']['small']);
 				}
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
@@ -294,7 +295,8 @@ class FamilyController extends BaseController {
 	* get edit menu
 	*/
 	function getEditMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+		global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+
 		if ($TEXT_DIRECTION=="rtl") {
 			$ff="_rtl";
 		} else {
@@ -303,9 +305,9 @@ class FamilyController extends BaseController {
 		// edit menu
 		$menu = new Menu(i18n::translate('Edit'));
 		if (!empty($WT_IMAGES["edit_fam"]["large"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["large"]);
+			$menu->addIcon($WT_IMAGES["edit_fam"]["large"]);
 		} elseif (!empty($WT_IMAGES["edit_fam"]["small"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+			$menu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 		}
 		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 
@@ -314,7 +316,7 @@ class FamilyController extends BaseController {
 			$submenu = new Menu(i18n::translate('Edit Family'));
 			$submenu->addOnclick("return edit_family('".$this->getFamilyID()."');");
 			if (!empty($WT_IMAGES["edit_fam"]["small"])) {
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 			}
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
@@ -323,7 +325,7 @@ class FamilyController extends BaseController {
 			$submenu = new Menu(i18n::translate('Change Family Members'));
 			$submenu->addOnclick("return change_family_members('".$this->getFamilyID()."');");
 			if (!empty($WT_IMAGES["edit_fam"]["small"])) {
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 			}
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
@@ -332,7 +334,7 @@ class FamilyController extends BaseController {
 			$submenu = new Menu(i18n::translate('Add a child to this family'));
 			$submenu->addOnclick("return addnewchild('".$this->getFamilyID()."');");
 			if (!empty($WT_IMAGES["edit_fam"]["small"])) {
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 			}
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
@@ -342,7 +344,7 @@ class FamilyController extends BaseController {
 				$submenu = new Menu(i18n::translate('Re-order children'));
 				$submenu->addOnclick("return reorder_children('".$this->getFamilyID()."');");
 				if (!empty($WT_IMAGES["edit_fam"]["small"])) {
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+					$submenu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 				}
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
@@ -361,17 +363,17 @@ class FamilyController extends BaseController {
 				$link = $this->family->getLinkUrl().'&show_changes=no';
 			}
 			$submenu = new Menu($label, encode_url($link));
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 
 			if (WT_USER_CAN_ACCEPT) {
 				$submenu = new Menu(i18n::translate('Undo all changes'), encode_url("family.php?famid={$this->famid}&action=undo"));
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 				$menu->addSubmenu($submenu);
 				$submenu = new Menu(i18n::translate('Accept all changes'), encode_url("family.php?famid={$this->famid}&action=accept"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
 			}
@@ -383,12 +385,12 @@ class FamilyController extends BaseController {
 		if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('Edit raw GEDCOM record'));
 			$submenu->addOnclick("return edit_raw('".$this->getFamilyID()."');");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		} elseif ($SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('View GEDCOM Record'));
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			if ($this->show_changes && WT_USER_CAN_EDIT) {
 				$submenu->addOnclick("return show_gedcom_record('new');");
 			} else {
@@ -402,14 +404,14 @@ class FamilyController extends BaseController {
 		if (WT_USER_CAN_EDIT) {
 			$submenu = new Menu(i18n::translate('Delete family'));
 			$submenu->addOnclick("if (confirm('".i18n::translate('Deleting the family will unlink all of the individuals from each other but will leave the individuals in place.  Are you sure you want to delete this family?')."')) return delete_family('".$this->getFamilyID()."'); else return false;");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_fam"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_fam"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		}
 
 		// add to favorites
 		$submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url('family.php?action=addfav&famid='.$this->getFamilyID().'&gid='.$this->getFamilyID()));
-		$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["favorites"]["small"]);
+		$submenu->addIcon($WT_IMAGES["favorites"]["small"]);
 		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 		$menu->addSubmenu($submenu);
 
diff --git a/includes/controllers/hourglass_ctrl.php b/includes/controllers/hourglass_ctrl.php
index 20e2ff7268..fbaddcf804 100644
--- a/includes/controllers/hourglass_ctrl.php
+++ b/includes/controllers/hourglass_ctrl.php
@@ -73,7 +73,7 @@ class HourglassController extends BaseController {
 	 */
 	function init($rootid='', $show_full=1, $generations=3) {
 		global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bheight, $bwidth, $bhalfheight, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS;
-		global $WT_IMAGES, $WT_IMAGE_DIR, $TEXT_DIRECTION, $show_full;
+		global $WT_IMAGES, $TEXT_DIRECTION, $show_full;
 
 		// Extract parameters from from
 		$this->pid        =safe_GET_xref('pid');
@@ -95,8 +95,8 @@ class HourglassController extends BaseController {
 			$WT_IMAGES['rarrow']['other'] = $temp;
 		}
 		//-- get the width and height of the arrow images for adjusting spacing
-		if (file_exists($WT_IMAGE_DIR."/".$WT_IMAGES['larrow']['other'])) {
-			$temp = getimagesize($WT_IMAGE_DIR."/".$WT_IMAGES['larrow']['other']);
+		if (file_exists($WT_IMAGES['larrow']['other'])) {
+			$temp = getimagesize($WT_IMAGES['larrow']['other']);
 			$this->arrwidth = $temp[0];
 			$this->arrheight= $temp[1];
 		}
@@ -128,7 +128,8 @@ class HourglassController extends BaseController {
 	 * @return void
 	 */
 	function print_person_pedigree($pid, $count) {
-		global $SHOW_EMPTY_BOXES, $WT_IMAGE_DIR, $WT_IMAGES, $bhalfheight;
+		global $SHOW_EMPTY_BOXES, $WT_IMAGES, $bhalfheight;
+
 		if ($count>=$this->generations) return;
 		$person = Person::getInstance($pid);
 		if (is_null($person)) return;
@@ -140,8 +141,8 @@ class HourglassController extends BaseController {
 			$parents = find_parents($famid);
 			$height="100%";
 			print "<tr>";
-			print "<td valign=\"bottom\"><img name=\"pvline\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"$lh\" alt=\"\" /></td>";
-			print "<td><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>";
+			print "<td valign=\"bottom\"><img name=\"pvline\" src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"$lh\" alt=\"\" /></td>";
+			print "<td><img src=\"".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>";
 			print "<td>";
 			//-- print the father box
 			print_pedigree_person($parents["HUSB"]);
@@ -151,14 +152,14 @@ class HourglassController extends BaseController {
 
 			//-- print an Ajax arrow on the last generation of the adult male
 			if ($count==$this->generations-1 && (count(find_family_ids($ARID))>0) && !is_null (find_family_ids($ARID))) {
-				print "<a href=\"#\" onclick=\"return ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."')\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["rarrow"]["other"]."\" border=\"0\" alt=\"\" /></a> ";
+				print "<a href=\"#\" onclick=\"return ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."')\"><img src=\"".$WT_IMAGES["rarrow"]["other"]."\" border=\"0\" alt=\"\" /></a> ";
 			}
 			//-- recursively get the father's family
 			$this->print_person_pedigree($parents["HUSB"], $count+1);
 			print "</td>";
 			print "</tr>\n<tr>\n";
-			print "<td valign=\"top\"><img name=\"pvline\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"$lh\" alt=\"\" /></td>";
-			print "<td><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>";
+			print "<td valign=\"top\"><img name=\"pvline\" src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"$lh\" alt=\"\" /></td>";
+			print "<td><img src=\"".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>";
 			print "<td>";
 			//-- print the mother box
 			print_pedigree_person($parents["WIFE"]);
@@ -169,7 +170,7 @@ class HourglassController extends BaseController {
 
 			//-- print an ajax arrow on the last generation of the adult female
 			if ($count==$this->generations-1 && (count(find_family_ids($ARID))>0) && !is_null (find_family_ids($ARID))) {
-				print "<a href=\"#\" onclick=\"ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."'); return false;\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["rarrow"]["other"]."\" border=\"0\" alt=\"\" /></a> ";
+				print "<a href=\"#\" onclick=\"ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."'); return false;\"><img src=\"".$WT_IMAGES["rarrow"]["other"]."\" border=\"0\" alt=\"\" /></a> ";
 			}
 
 			//-- recursively print the mother's family
@@ -190,8 +191,7 @@ class HourglassController extends BaseController {
 	 * @return void
 	 */
 	function print_descendency($pid, $count, $showNav=true) {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $bheight, $bwidth, $bhalfheight;
-		global $lastGenSecondFam;
+		global $TEXT_DIRECTION, $WT_IMAGES, $bheight, $bwidth, $bhalfheight, $lastGenSecondFam;
 
 		if ($count>$this->dgenerations) return 0;
 		$person = Person::getInstance($pid);
@@ -249,16 +249,16 @@ class HourglassController extends BaseController {
 						if ($i==0) {
 							//-- adjust for the number of kids
 							$h = ($bhalfheight+3)*$numkids;
-							print "<td valign=\"bottom\"><img name=\"tvertline\" id=\"vline_$chil\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"$h\" alt=\"\" /></td>";
+							print "<td valign=\"bottom\"><img name=\"tvertline\" id=\"vline_$chil\" src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"$h\" alt=\"\" /></td>";
 						} else if ($i==$ct-1) {
 							$h = ($bhalfheight+3)*$kids;
 							if ($count<$this->dgenerations-1) {
 								if ($this->show_spouse) $h-=15;
 								else $h += 15;
 							}
-							print "<td valign=\"top\"><img name=\"bvertline\" id=\"vline_$chil\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"".$h."\" alt=\"\" /></td>";
+							print "<td valign=\"top\"><img name=\"bvertline\" id=\"vline_$chil\" src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"".$h."\" alt=\"\" /></td>";
 						} else {
-							print "<td style=\"background: url('".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>";
+							print "<td style=\"background: url('".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>";
 						}
 					}
 					print "</tr>";
@@ -283,7 +283,7 @@ class HourglassController extends BaseController {
 			if ($kcount==0) {
 				print "<div style=\"width: ".($this->arrwidth)."px;\"><br /></div>\n</td>\n<td width=\"$bwidth\">";
 			} else {
-				print "<div style=\"width: ".($this->arrwidth)."px;\"><a href=\"$pid\" onclick=\"return ChangeDis('td_".$pid."','".$pid."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."')\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["larrow"]["other"]."\" border=\"0\" alt=\"\" /></a></div>\n";
+				print "<div style=\"width: ".($this->arrwidth)."px;\"><a href=\"$pid\" onclick=\"return ChangeDis('td_".$pid."','".$pid."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."')\"><img src=\"".$WT_IMAGES["larrow"]["other"]."\" border=\"0\" alt=\"\" /></a></div>\n";
 				//-- move the arrow up to line up with the correct box
 				if ($this->show_spouse) {
 					foreach($families as $famid => $family) {
@@ -302,7 +302,7 @@ class HourglassController extends BaseController {
 
 		print "<table id=\"table2_$pid\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\"><tr><td>";
 		print_pedigree_person($pid);
-		print "</td><td><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" />";
+		print "</td><td><img src=\"".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" />";
 
 		//----- Print the spouse
 		if ($this->show_spouse) {
@@ -349,7 +349,7 @@ class HourglassController extends BaseController {
 					print "\n\t\t<div class=\"center\" id=\"childarrow\" dir=\"".$TEXT_DIRECTION."\"";
 					print " style=\"position:absolute; width:".$bwidth."px; \">";
 					print "<a href=\"javascript: ".i18n::translate('Show')."\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow',3);\" onmouseout=\"swap_image('larrow',3);\">";
-					print "<img id=\"larrow\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["darrow"]["other"]."\" border=\"0\" alt=\"\" />";
+					print "<img id=\"larrow\" src=\"".$WT_IMAGES["darrow"]["other"]."\" border=\"0\" alt=\"\" />";
 					print "</a><br />";
 					print "\n\t\t<div id=\"childbox\" dir=\"".$TEXT_DIRECTION."\" style=\"width:".$bwidth."px; height:".$bheight."px; visibility: hidden;\">";
 					print "\n\t\t\t<table class=\"person_box\"><tr><td>";
@@ -387,7 +387,7 @@ class HourglassController extends BaseController {
 						}
 					}
 					//-- do we need to print this arrow?
-					print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["rarrow"]["other"]."\" border=\"0\" alt=\"\" /> ";
+					print "<img src=\"".$WT_IMAGES["rarrow"]["other"]."\" border=\"0\" alt=\"\" /> ";
 
 					//-- print the siblings
 					foreach($cfamids as $famid=>$family) {
diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php
index 9191d34f1b..6881e9b361 100644
--- a/includes/controllers/individual_ctrl.php
+++ b/includes/controllers/individual_ctrl.php
@@ -334,7 +334,8 @@ class IndividualController extends BaseController {
 	* @return string HTML string for the <img> tag
 	*/
 	function getHighlightedObject() {
-		global $USE_THUMBS_MAIN, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER, $GEDCOM, $WT_IMAGE_DIR, $WT_IMAGES, $USE_SILHOUETTE, $sex;
+		global $USE_THUMBS_MAIN, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER, $GEDCOM, $WT_IMAGES, $USE_SILHOUETTE, $sex;
+
 		if ($this->canShowHighlightedObject()) {
 			$firstmediarec = $this->indi->findHighlightedMedia();
 			if (!empty($firstmediarec)) {
@@ -373,13 +374,11 @@ class IndividualController extends BaseController {
 			$sex = $this->indi->getSex();
 			$result = "<img src=\"";
 			if ($sex == 'F') {
-				$result .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_F"]["other"];
-			} 
-			else if ($sex == 'M') {
-				$result .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_M"]["other"];
-			}
-			else {
-				$result .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_U"]["other"];
+				$result .= $WT_IMAGES["default_image_F"]["other"];
+			} elseif ($sex == 'M') {
+				$result .= $WT_IMAGES["default_image_M"]["other"];
+			} else {
+				$result .= $WT_IMAGES["default_image_U"]["other"];
 			} 
 			$result .="\" class=\"".$class."\" border=\"none\" alt=\"\" />";
 			return $result;
@@ -511,7 +510,8 @@ class IndividualController extends BaseController {
 	* get edit menu
 	*/
 	function getEditMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+		global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+
 		if ($TEXT_DIRECTION=="rtl") {
 			$ff="_rtl";
 		} else {
@@ -520,9 +520,9 @@ class IndividualController extends BaseController {
 		// edit menu
 		$menu = new Menu(i18n::translate('Edit'));
 		if (!empty($WT_IMAGES["edit_indi"]["large"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_indi"]["large"]);
+			$menu->addIcon($WT_IMAGES["edit_indi"]["large"]);
 		} elseif (!empty($WT_IMAGES["edit_indi"]["small"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_indi"]["small"]);
+			$menu->addIcon($WT_IMAGES["edit_indi"]["small"]);
 		}
 		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 
@@ -569,17 +569,17 @@ class IndividualController extends BaseController {
 				$link = $this->indi->getLinkUrl().'&show_changes=no';
 			}
 			$submenu = new Menu($label, encode_url($link));
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_indi"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_indi"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 
 			if (WT_USER_CAN_ACCEPT) {
 				$submenu = new Menu(i18n::translate('Undo all changes'), encode_url($this->indi->getLinkUrl()."&action=undo"));
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_indi"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_indi"]["small"]);
 				$menu->addSubmenu($submenu);
 				$submenu = new Menu(i18n::translate('Accept all changes'), encode_url($this->indi->getLinkUrl()."&action=accept"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_indi"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_indi"]["small"]);
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
 			}
@@ -591,12 +591,12 @@ class IndividualController extends BaseController {
 		if (WT_USER_IS_ADMIN || $this->canShowGedcomRecord()) {
 			$submenu = new Menu(i18n::translate('Edit raw GEDCOM record'));
 			$submenu->addOnclick("return edit_raw('".$this->pid."');");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_indi"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_indi"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		} elseif ($SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('View GEDCOM Record'));
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			if ($this->show_changes && WT_USER_CAN_EDIT) {
 				$submenu->addOnclick("return show_gedcom_record('new');");
 			} else {
@@ -610,14 +610,14 @@ class IndividualController extends BaseController {
 		if (WT_USER_CAN_EDIT) {
 			$submenu = new Menu(i18n::translate('Delete this individual'));
 			$submenu->addOnclick("return deleteperson('".$this->pid."');");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_indi"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_indi"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		}
 
 		// add to favorites
 		$submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url($this->indi->getLinkUrl()."&action=addfav&gid={$this->pid}"));
-		$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["favorites"]["small"]);
+		$submenu->addIcon($WT_IMAGES["favorites"]["small"]);
 		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 		$menu->addSubmenu($submenu);
 
diff --git a/includes/controllers/media_ctrl.php b/includes/controllers/media_ctrl.php
index 1bb0faf1b4..e56dc36e68 100644
--- a/includes/controllers/media_ctrl.php
+++ b/includes/controllers/media_ctrl.php
@@ -163,7 +163,8 @@ class MediaController extends BaseController{
 	* get edit menu
 	*/
 	function getEditMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+		global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+
 		if ($TEXT_DIRECTION=="rtl") {
 			$ff="_rtl";
 		} else {
@@ -179,16 +180,16 @@ class MediaController extends BaseController{
 		// edit menu
 		$menu = new Menu(i18n::translate('Edit'));
 		if (!empty($WT_IMAGES["edit_media"]["large"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_media"]["large"]);
+			$menu->addIcon($WT_IMAGES["edit_media"]["large"]);
 		} elseif (!empty($WT_IMAGES["edit_media"]["small"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_media"]["small"]);
+			$menu->addIcon($WT_IMAGES["edit_media"]["small"]);
 		}
 		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 		
 		if (WT_USER_CAN_EDIT) {
 			$submenu = new Menu(i18n::translate('Edit media'));
 			$submenu->addOnclick("window.open('addmedia.php?action=editmedia&pid={$this->pid}&linktoid={$linktoid}', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1')");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_media"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_media"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 
@@ -196,7 +197,7 @@ class MediaController extends BaseController{
 				$submenu = new Menu(i18n::translate('Edit raw GEDCOM record'));
 				$submenu->addOnclick("return edit_raw('".$this->pid."');");
 				if (!empty($WT_IMAGES["edit_media"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_media"]["small"]);
+					$submenu->addIcon($WT_IMAGES["edit_media"]["small"]);
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
 			}
@@ -212,7 +213,7 @@ class MediaController extends BaseController{
 			if (WT_USER_GEDCOM_ADMIN && file_exists(WT_ROOT.'modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php')) {
 				$submenu->addOnclick("return ilinkitem('".$this->pid."','manage');");
 				if (!empty($WT_IMAGES["edit_media"]["small"]))
-					$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_media"]["small"]);
+					$submenu->addIcon($WT_IMAGES["edit_media"]["small"]);
 					$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				// Do not print ssubmunu
 			} else {
@@ -255,10 +256,10 @@ class MediaController extends BaseController{
 			if (WT_USER_CAN_ACCEPT) {
 				$submenu = new Menu(i18n::translate('Undo all changes'), encode_url("mediaviewer.php?mid={$this->pid}&action=undo"));
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["notes"]["small"]);
+				$submenu->addIcon($WT_IMAGES["notes"]["small"]);
 				$menu->addSubmenu($submenu);
 				$submenu = new Menu(i18n::translate('Accept all changes'), encode_url("mediaviewer.php?mid={$this->pid}&action=accept"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["notes"]["small"]);
+				$submenu->addIcon($WT_IMAGES["notes"]["small"]);
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
 			}
@@ -270,12 +271,12 @@ class MediaController extends BaseController{
 		if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('Edit raw GEDCOM record'));
 			$submenu->addOnclick("return edit_raw('".$this->pid."');");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		} elseif ($SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('View GEDCOM Record'));
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			if ($this->show_changes && WT_USER_CAN_EDIT) {
 				$submenu->addOnclick("return show_gedcom_record('new');");
 			} else {
@@ -290,14 +291,14 @@ class MediaController extends BaseController{
 			$submenu = new Menu(i18n::translate('Remove object'));
 			$submenu->addLink(encode_url("media.php?action=removeobject&xref=".$this->pid));
 			$submenu->addOnclick("return confirm('".i18n::translate('Are you sure you want to remove this object from the database?')."')");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_media"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_media"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		}
 
 		// add to favorites
 		$submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url("mediaviewer.php?action=addfav&mid={$this->mid}&gid={$this->mid}"));
-		$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["favorites"]["small"]);
+		$submenu->addIcon($WT_IMAGES["favorites"]["small"]);
 		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 		$menu->addSubmenu($submenu);
 
diff --git a/includes/controllers/note_ctrl.php b/includes/controllers/note_ctrl.php
index d3d355076c..5aa3109a51 100644
--- a/includes/controllers/note_ctrl.php
+++ b/includes/controllers/note_ctrl.php
@@ -153,7 +153,8 @@ class NoteController extends BaseController {
 	* get edit menu
 	*/
 	function getEditMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+		global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+
 		if ($TEXT_DIRECTION=="rtl") {
 			$ff="_rtl";
 		} else {
@@ -162,16 +163,16 @@ class NoteController extends BaseController {
 		// edit menu
 		$menu = new Menu(i18n::translate('Edit'));
 		if (!empty($WT_IMAGES["edit_note"]["large"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_note"]["large"]);
+			$menu->addIcon($WT_IMAGES["edit_note"]["large"]);
 		} elseif (!empty($WT_IMAGES["edit_note"]["small"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_note"]["small"]);
+			$menu->addIcon($WT_IMAGES["edit_note"]["small"]);
 		}
 		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 
 		if (WT_USER_CAN_EDIT) {
 			$submenu = new Menu(i18n::translate('Edit note'));
 			$submenu->addOnclick('return edit_note(\''.$this->nid.'\');');
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["notes"]["small"]);
+			$submenu->addIcon($WT_IMAGES["notes"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 			
@@ -182,10 +183,10 @@ class NoteController extends BaseController {
 		if (find_updated_record($this->nid, WT_GED_ID)!==null) {
 			if (!$this->show_changes) {
 				$submenu = new Menu(i18n::translate('This record has been updated.  Click here to show changes.'), encode_url("note.php?nid={$this->nid}&show_changes=yes"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["notes"]["small"]);
+				$submenu->addIcon($WT_IMAGES["notes"]["small"]);
 			} else {
 				$submenu = new Menu(i18n::translate('Click here to hide changes.'), encode_url("note.php?nid={$this->nid}&show_changes=no"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["notes"]["small"]);
+				$submenu->addIcon($WT_IMAGES["notes"]["small"]);
 			}
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
@@ -193,10 +194,10 @@ class NoteController extends BaseController {
 			if (WT_USER_CAN_ACCEPT) {
 				$submenu = new Menu(i18n::translate('Undo all changes'), encode_url("note.php?nid={$this->nid}&action=undo"));
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["notes"]["small"]);
+				$submenu->addIcon($WT_IMAGES["notes"]["small"]);
 				$menu->addSubmenu($submenu);
 				$submenu = new Menu(i18n::translate('Accept all changes'), encode_url("note.php?nid={$this->nid}&action=accept"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["notes"]["small"]);
+				$submenu->addIcon($WT_IMAGES["notes"]["small"]);
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
 			}
@@ -208,12 +209,12 @@ class NoteController extends BaseController {
 		if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('Edit raw GEDCOM record'));
 			$submenu->addOnclick("return edit_raw('".$this->nid."');");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		} elseif ($SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('View GEDCOM Record'));
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			if ($this->show_changes && WT_USER_CAN_EDIT) {
 				$submenu->addOnclick("return show_gedcom_record('new');");
 			} else {
@@ -227,14 +228,14 @@ class NoteController extends BaseController {
 		if (WT_USER_CAN_EDIT) {
 			$submenu = new Menu(i18n::translate('Delete this Shared Note'));
 			$submenu->addOnclick("if (confirm('".i18n::translate('Are you sure you want to delete this Shared Note?')."')) return deletenote('".$this->nid."'); else return false;");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["notes"]["small"]);
+			$submenu->addIcon($WT_IMAGES["notes"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		}
 
 		// add to favorites
 		$submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url("note.php?action=addfav&nid={$this->nid}&gid={$this->nid}"));
-		$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["favorites"]["small"]);
+		$submenu->addIcon($WT_IMAGES["favorites"]["small"]);
 		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 		$menu->addSubmenu($submenu);
 
diff --git a/includes/controllers/repository_ctrl.php b/includes/controllers/repository_ctrl.php
index 8ba315a6fb..9d9d7c78cf 100644
--- a/includes/controllers/repository_ctrl.php
+++ b/includes/controllers/repository_ctrl.php
@@ -153,7 +153,8 @@ class RepositoryController extends BaseController {
 	* get edit menu
 	*/
 	function getEditMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+		global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+
 		if ($TEXT_DIRECTION=="rtl") {
 			$ff="_rtl";
 		} else {
@@ -162,9 +163,9 @@ class RepositoryController extends BaseController {
 		// edit menu
 		$menu = new Menu(i18n::translate('Edit'));
 		if (!empty($WT_IMAGES["edit_repo"]["large"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_repo"]["large"]);
+			$menu->addIcon($WT_IMAGES["edit_repo"]["large"]);
 		} elseif (!empty($WT_IMAGES["edit_repo"]["small"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_repo"]["small"]);
+			$menu->addIcon($WT_IMAGES["edit_repo"]["small"]);
 		}
 		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 
@@ -176,10 +177,10 @@ class RepositoryController extends BaseController {
 		if (find_updated_record($this->rid, WT_GED_ID)!==null) {
 			if (!$this->show_changes) {
 				$submenu = new Menu(i18n::translate('This record has been updated.  Click here to show changes.'), encode_url("repo.php?rid={$this->rid}&show_changes=yes"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_repo"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_repo"]["small"]);
 			} else {
 				$submenu = new Menu(i18n::translate('Click here to hide changes.'), encode_url("repo.php?rid={$this->rid}&show_changes=no"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_repo"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_repo"]["small"]);
 			}
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
@@ -187,10 +188,10 @@ class RepositoryController extends BaseController {
 			if (WT_USER_CAN_ACCEPT) {
 				$submenu = new Menu(i18n::translate('Undo all changes'), encode_url("repo.php?rid={$this->rid}&action=undo"));
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_repo"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_repo"]["small"]);
 				$menu->addSubmenu($submenu);
 				$submenu = new Menu(i18n::translate('Accept all changes'), encode_url("repo.php?rid={$this->rid}&action=accept"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_repo"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_repo"]["small"]);
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
 			}
@@ -202,12 +203,12 @@ class RepositoryController extends BaseController {
 		if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('Edit raw GEDCOM record'));
 			$submenu->addOnclick("return edit_raw('".$this->rid."');");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		} elseif ($SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('View GEDCOM Record'));
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			if ($this->show_changes && WT_USER_CAN_EDIT) {
 				$submenu->addOnclick("return show_gedcom_record('new');");
 			} else {
@@ -221,14 +222,14 @@ class RepositoryController extends BaseController {
 		if (WT_USER_CAN_EDIT) {
 			$submenu = new Menu(i18n::translate('Delete repository'));
 			$submenu->addOnclick("if (confirm('".i18n::translate('Are you sure you want to delete this Repository?')."')) return deleterepository('".$this->rid."'); else return false;");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_repo"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_repo"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		}
 
 		// add to favorites
 		$submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url("repo.php?action=addfav&rid={$this->rid}&gid={$this->rid}"));
-		$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["favorites"]["small"]);
+		$submenu->addIcon($WT_IMAGES["favorites"]["small"]);
 		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 		$menu->addSubmenu($submenu);
 
diff --git a/includes/controllers/search_ctrl.php b/includes/controllers/search_ctrl.php
index 3e7927a8ea..f8b5b3b6fa 100644
--- a/includes/controllers/search_ctrl.php
+++ b/includes/controllers/search_ctrl.php
@@ -716,7 +716,8 @@ class SearchController extends BaseController {
 
 	function printResults() {
 		require_once WT_ROOT.'includes/functions/functions_print_lists.php';
-		global $GEDCOM, $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES;
+		global $GEDCOM, $TEXT_DIRECTION, $WT_IMAGES;
+
 		$somethingPrinted = false;	// whether anything printed
 		// ---- section to search and display results on a general keyword search
 		if ($this->action=="general" || $this->action=="soundex" || $this->action=="replace") {
@@ -853,7 +854,7 @@ class SearchController extends BaseController {
 										if (!$displayed_once) {
 											if (!$no_results_found) {
 												$no_results_found = true;
-												print "<tr><td class=\"list_label\" colspan=\"2\" width=\"100%\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["indis"]["large"]."\" border=\"0\" width=\"25\" alt=\"\" /> ".i18n::translate('People')."</td></tr>";
+												print "<tr><td class=\"list_label\" colspan=\"2\" width=\"100%\"><img src=\"".$WT_IMAGES["indis"]["large"]."\" border=\"0\" width=\"25\" alt=\"\" /> ".i18n::translate('People')."</td></tr>";
 												print "<tr><td><table id=\"multiResultsInTbl\" align=\"center\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" ><tr>";
 											}
 											$displayed_once = true;
diff --git a/includes/controllers/source_ctrl.php b/includes/controllers/source_ctrl.php
index 25b36db06e..07f6e2ff01 100644
--- a/includes/controllers/source_ctrl.php
+++ b/includes/controllers/source_ctrl.php
@@ -153,7 +153,8 @@ class SourceController extends BaseController {
 	* get edit menu
 	*/
 	function getEditMenu() {
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+		global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM, $SHOW_GEDCOM_RECORD;
+
 		if ($TEXT_DIRECTION=="rtl") {
 			$ff="_rtl";
 		} else {
@@ -162,16 +163,16 @@ class SourceController extends BaseController {
 		// edit menu
 		$menu = new Menu(i18n::translate('Edit'));
 		if (!empty($WT_IMAGES["edit_source"]["large"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_source"]["large"]);
+			$menu->addIcon($WT_IMAGES["edit_source"]["large"]);
 		} elseif (!empty($WT_IMAGES["edit_source"]["small"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_source"]["small"]);
+			$menu->addIcon($WT_IMAGES["edit_source"]["small"]);
 		}
 		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 
 		if (WT_USER_CAN_EDIT) {
 			$submenu = new Menu(i18n::translate('Edit Source'));
 			$submenu->addOnclick('return edit_source(\''.$this->sid.'\');');
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_sour"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_sour"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		}
@@ -180,10 +181,10 @@ class SourceController extends BaseController {
 		if (find_updated_record($this->sid, WT_GED_ID)!==null) {
 			if (!$this->show_changes) {
 				$submenu = new Menu(i18n::translate('This record has been updated.  Click here to show changes.'), encode_url("source.php?sid={$this->sid}&show_changes=yes"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_sour"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_sour"]["small"]);
 			} else {
 				$submenu = new Menu(i18n::translate('Click here to hide changes.'), encode_url("source.php?sid={$this->sid}&show_changes=no"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_sour"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_sour"]["small"]);
 			}
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
@@ -191,10 +192,10 @@ class SourceController extends BaseController {
 			if (WT_USER_CAN_ACCEPT) {
 				$submenu = new Menu(i18n::translate('Undo all changes'), encode_url("source.php?sid={$this->sid}&action=undo"));
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_sour"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_sour"]["small"]);
 				$menu->addSubmenu($submenu);
 				$submenu = new Menu(i18n::translate('Accept all changes'), encode_url("source.php?sid={$this->sid}&action=accept"));
-				$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_sour"]["small"]);
+				$submenu->addIcon($WT_IMAGES["edit_sour"]["small"]);
 				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 				$menu->addSubmenu($submenu);
 			}
@@ -206,12 +207,12 @@ class SourceController extends BaseController {
 		if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('Edit raw GEDCOM record'));
 			$submenu->addOnclick("return edit_raw('".$this->sid."');");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		} elseif ($SHOW_GEDCOM_RECORD) {
 			$submenu = new Menu(i18n::translate('View GEDCOM Record'));
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["gedcom"]["small"]);
+			$submenu->addIcon($WT_IMAGES["gedcom"]["small"]);
 			if ($this->show_changes && WT_USER_CAN_EDIT) {
 				$submenu->addOnclick("return show_gedcom_record('new');");
 			} else {
@@ -225,14 +226,14 @@ class SourceController extends BaseController {
 		if (WT_USER_CAN_EDIT) {
 			$submenu = new Menu(i18n::translate('Delete this Source'));
 			$submenu->addOnclick("if (confirm('".i18n::translate('Are you sure you want to delete this Source?')."')) return deletesource('".$this->sid."'); else return false;");
-			$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["edit_sour"]["small"]);
+			$submenu->addIcon($WT_IMAGES["edit_sour"]["small"]);
 			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 			$menu->addSubmenu($submenu);
 		}
 
 		// add to favorites
 		$submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url("source.php?action=addfav&sid={$this->sid}&gid={$this->sid}"));
-		$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["favorites"]["small"]);
+		$submenu->addIcon($WT_IMAGES["favorites"]["small"]);
 		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
 		$menu->addSubmenu($submenu);
 
diff --git a/includes/controllers/timeline_ctrl.php b/includes/controllers/timeline_ctrl.php
index 351e6199f2..16b155dbcc 100644
--- a/includes/controllers/timeline_ctrl.php
+++ b/includes/controllers/timeline_ctrl.php
@@ -167,9 +167,8 @@ class TimelineController extends BaseController {
 	}
 
 	function print_time_fact($event) {
-		global $basexoffset, $baseyoffset, $factcount, $TEXT_DIRECTION;
-		global $WT_IMAGE_DIR, $WT_IMAGES, $SHOW_PEDIGREE_PLACES, $placements;
-		global $familyfacts, $GEDCOM;
+		global $basexoffset, $baseyoffset, $factcount, $TEXT_DIRECTION, $WT_IMAGES, $SHOW_PEDIGREE_PLACES, $placements, $familyfacts, $GEDCOM;
+
 		/* @var $event Event */
 		$factrec = $event->getGedComRecord();
 			$fact = $event->getTag();
@@ -216,7 +215,7 @@ class TimelineController extends BaseController {
 
 				print "\n\t\t<div id=\"fact$factcount\" style=\"position:absolute; ".($TEXT_DIRECTION =="ltr"?"left: ".($xoffset):"right: ".($xoffset))."px; top:".($yoffset)."px; font-size: 8pt; height: ".($this->bheight)."px; \" onmousedown=\"factMD(this, '".$factcount."', ".($yoffset-$tyoffset).");\">\n";
 				print "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"cursor: hand;\"><tr><td>\n";
-				print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" name=\"boxline$factcount\" id=\"boxline$factcount\" height=\"3\" align=\"left\" hspace=\"0\" width=\"10\" vspace=\"0\" alt=\"\" style=\"padding-";
+				print "<img src=\"".$WT_IMAGES["hline"]["other"]."\" name=\"boxline$factcount\" id=\"boxline$factcount\" height=\"3\" align=\"left\" hspace=\"0\" width=\"10\" vspace=\"0\" alt=\"\" style=\"padding-";
 				if ($TEXT_DIRECTION=="ltr") print "left";
 				else print "right";
 				print ": 3px;\" />\n";
@@ -323,7 +322,7 @@ class TimelineController extends BaseController {
 				}
 				//-- print the diagnal line
 				print "\n\t\t<div id=\"dbox$factcount\" style=\"position:absolute; ".($TEXT_DIRECTION =="ltr"?"left: ".($basexoffset+25):"right: ".($basexoffset+25))."px; top:".($dyoffset)."px; font-size: 8pt; height: ".(abs($tyoffset))."px; width: ".(abs($tyoffset))."px;";
-				print " background-image: url('".$WT_IMAGE_DIR."/".$WT_IMAGES[$img]["other"]."');";
+				print " background-image: url('".$WT_IMAGES[$img]["other"]."');";
 				print " background-position: 0% $ypos; \" >\n";
 				print "</div>\n";
 	}
diff --git a/includes/family_nav.php b/includes/family_nav.php
index 52f8871a4e..1b6111110d 100644
--- a/includes/family_nav.php
+++ b/includes/family_nav.php
@@ -66,7 +66,7 @@ if (isset($_COOKIE['lastclick'])) {
 
 //     Start Family Nav Table ----------------------------
 	echo "<table class=\"facts_table\" width='230' cellpadding=\"0\">";
-		global $WT_IMAGE_DIR, $WT_IMAGES, $WT_MENUS_AS_LISTS;
+		global $WT_IMAGES, $WT_MENUS_AS_LISTS;
 		global $spouselinks, $parentlinks, $DeathYr, $BirthYr;
 		global $TEXT_DIRECTION;
 
@@ -517,7 +517,7 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") {
 	global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $GEDCOM;
 	global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES;
 	global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
+	global $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
 	global $chart_style, $box_width, $generations, $show_spouse, $show_full;
 	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
 	global $SEARCH_SPIDER;
diff --git a/includes/functions/functions.php b/includes/functions/functions.php
index 0b5056daa7..8448198f21 100644
--- a/includes/functions/functions.php
+++ b/includes/functions/functions.php
@@ -950,7 +950,7 @@ function find_visible_families_in_record($indirec, $tag) {
  * @return array an object array with indexes "thumb" and "file" for thumbnail and filename
  */
 function find_highlighted_object($pid, $ged_id, $indirec) {
-	global $MEDIA_DIRECTORY, $MEDIA_DIRECTORY_LEVELS, $WT_IMAGE_DIR, $WT_IMAGES, $MEDIA_EXTERNAL;
+	global $MEDIA_DIRECTORY, $MEDIA_DIRECTORY_LEVELS, $WT_IMAGES, $MEDIA_EXTERNAL;
 
 	$media = array();
 	$objectA = array();
@@ -3358,7 +3358,7 @@ function isFileExternal($file) {
  * Get useful information on how to handle this media file
  */
 function mediaFileInfo($fileName, $thumbName, $mid, $name='', $notes='', $obeyViewerOption=true) {
-	global $THUMBNAIL_WIDTH, $WT_IMAGE_DIR, $WT_IMAGES;
+	global $THUMBNAIL_WIDTH, $WT_IMAGES;
 	global $LB_URL_WIDTH, $LB_URL_HEIGHT;
 	global $GEDCOM, $USE_MEDIA_VIEWER, $USE_MEDIA_FIREWALL, $MEDIA_FIREWALL_THUMBS;
 
@@ -3481,30 +3481,30 @@ function mediaFileInfo($fileName, $thumbName, $mid, $name='', $notes='', $obeyVi
 	$width = '';
 	switch ($type) {
 		case 'url_flv':
-			$thumb = isset($WT_IMAGES["media"]["flashrem"]) ? $WT_IMAGE_DIR.'/'.$WT_IMAGES["media"]["flashrem"] : 'images/media/flashrem.png';
+			$thumb = isset($WT_IMAGES["media"]["flashrem"]) ? $WT_IMAGES["media"]["flashrem"] : 'images/media/flashrem.png';
 			break;
 		case 'local_flv':
-			$thumb = isset($WT_IMAGES["media"]["flash"]) ? $WT_IMAGE_DIR.'/'.$WT_IMAGES["media"]["flash"] : 'images/media/flash.png';
+			$thumb = isset($WT_IMAGES["media"]["flash"]) ? $WT_IMAGES["media"]["flash"] : 'images/media/flash.png';
 			break;
 		case 'url_wmv':
-			$thumb = isset($WT_IMAGES["media"]["wmvrem"]) ? $WT_IMAGE_DIR.'/'.$WT_IMAGES["media"]["wmvrem"] : 'images/media/wmvrem.png';
+			$thumb = isset($WT_IMAGES["media"]["wmvrem"]) ? $WT_IMAGES["media"]["wmvrem"] : 'images/media/wmvrem.png';
 			break;
 		case 'local_wmv':
-			$thumb = isset($WT_IMAGES["media"]["wmv"]) ? $WT_IMAGE_DIR.'/'.$WT_IMAGES["media"]["wmv"] : 'images/media/wmv.png';
+			$thumb = isset($WT_IMAGES["media"]["wmv"]) ? $WT_IMAGES["media"]["wmv"] : 'images/media/wmv.png';
 			break;
 		case 'url_picasa':
-			$thumb = isset($WT_IMAGES["media"]["picasa"]) ? $WT_IMAGE_DIR.'/'.$WT_IMAGES["media"]["picasa"] : 'images/media/picasa.png';
+			$thumb = isset($WT_IMAGES["media"]["picasa"]) ? $WT_IMAGES["media"]["picasa"] : 'images/media/picasa.png';
 			break;
 		case 'url_page':
 		case 'url_other':
-			$thumb = isset($WT_IMAGES["media"]["globe"]) ? $WT_IMAGE_DIR.'/'.$WT_IMAGES["media"]["globe"] : 'images/media/globe.png';
+			$thumb = isset($WT_IMAGES["media"]["globe"]) ? $WT_IMAGES["media"]["globe"] : 'images/media/globe.png';
 			break;
 		case 'local_page':
-			$thumb = ($WT_IMAGES["media"]["doc"]) ? $WT_IMAGE_DIR.'/'.$WT_IMAGES["media"]["doc"] : 'images/media/doc.gif';
+			$thumb = ($WT_IMAGES["media"]["doc"]) ? $WT_IMAGES["media"]["doc"] : 'images/media/doc.gif';
 			break;
 		case 'url_audio':
 		case 'local_audio':
-			$thumb = isset($WT_IMAGES["media"]["audio"]) ? $WT_IMAGE_DIR.'/'.$WT_IMAGES["media"]["audio"] : 'images/media/audio.png';
+			$thumb = isset($WT_IMAGES["media"]["audio"]) ? $WT_IMAGES["media"]["audio"] : 'images/media/audio.png';
 			break;
 		case 'url_streetview':
 			$thumb = null;
@@ -3533,12 +3533,12 @@ function mediaFileInfo($fileName, $thumbName, $mid, $name='', $notes='', $obeyVi
 	$realThumb = $thumb;
 	if (substr($type, 0, 6)=='local_' && !file_exists($thumb)) {
 		if (!$USE_MEDIA_FIREWALL || !$MEDIA_FIREWALL_THUMBS) {
-			$thumb = $WT_IMAGE_DIR.'/'.$WT_IMAGES['media']['large'];
+			$thumb = $WT_IMAGES['media']['large'];
 			$realThumb = $thumb;
 		} else {
 			$realThumb = get_media_firewall_path($thumb);
 			if (!file_exists($realThumb)) {
-				$thumb = $WT_IMAGE_DIR.'/'.$WT_IMAGES['media']['large'];
+				$thumb = $WT_IMAGES['media']['large'];
 				$realThumb = $thumb;
 			}
 		}
diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php
index 205b258c64..b88e5faef3 100644
--- a/includes/functions/functions_charts.php
+++ b/includes/functions/functions_charts.php
@@ -44,8 +44,7 @@ require_once WT_ROOT.'includes/classes/class_person.php';
  * @param string $arrowDirection   direction of link arrow
  */
 function print_sosa_number($sosa, $pid = "", $arrowDirection = "up") {
-	global $pbwidth, $pbheight;
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $pbwidth, $pbheight, $WT_IMAGES;
 
 	if (substr($sosa,-1,1)==".") {
 		$personLabel = substr($sosa,0,-1);
@@ -98,11 +97,8 @@ function print_family_header($famid) {
  * @param string $gparid optional gd-parent ID (descendancy booklet)
  */
 function print_family_parents($famid, $sosa = 0, $label="", $parid="", $gparid="", $personcount="1") {
-	global $show_full;
-	global $TEXT_DIRECTION, $SHOW_EMPTY_BOXES;
-	global $pbwidth, $pbheight;
-	global $WT_IMAGE_DIR, $WT_IMAGES;
-	global $show_changes, $GEDCOM;
+	global $show_full, $TEXT_DIRECTION, $SHOW_EMPTY_BOXES, $pbwidth, $pbheight, $WT_IMAGES, $show_changes, $GEDCOM;
+
 	$ged_id=get_id_from_gedcom($GEDCOM);
 
 	$family = Family::getInstance($famid);
@@ -154,8 +150,8 @@ function print_family_parents($famid, $sosa = 0, $label="", $parid="", $gparid="
 	$hparents = false;
 	$upfamid = "";
 	if (count($hfams) > 0 or ($sosa != 0 and $SHOW_EMPTY_BOXES)) {
-		print "<td rowspan=\"2\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td rowspan=\"2\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"" . ($pbheight) . "\" alt=\"\" /></td>";
-		print "<td><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
+		print "<td rowspan=\"2\"><img src=\"".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td rowspan=\"2\"><img src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"" . ($pbheight) . "\" alt=\"\" /></td>";
+		print "<td><img src=\"".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
 		$hparents = false;
 		foreach($hfams as $hfamid=>$hfamily) {
 			if (!is_null($hfamily)) {
@@ -182,7 +178,7 @@ function print_family_parents($famid, $sosa = 0, $label="", $parid="", $gparid="
 	}
 	if ($hparents or ($sosa != 0 and $SHOW_EMPTY_BOXES)) {
 		// husband's mother
-		print "</tr><tr><td><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
+		print "</tr><tr><td><img src=\"".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
 		print "\n\t<table style=\"width: " . ($pbwidth) . "px; height: " . $pbheight . "px;\" border=\"0\"><tr>";
 		if ($sosa > 0) print_sosa_number($sosa * 4 + 1, $hparents['WIFE'], "down");
 		if (!empty($gparid) and $hparents['WIFE']==$gparid) print_sosa_number(trim(substr($label,0,-3),".").".");
@@ -227,8 +223,8 @@ function print_family_parents($famid, $sosa = 0, $label="", $parid="", $gparid="
 	$hparents = false;
 	$upfamid = "";
 	if (count($hfams) > 0 or ($sosa != 0 and $SHOW_EMPTY_BOXES)) {
-		print "<td rowspan=\"2\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td rowspan=\"2\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"" . ($pbheight) . "\" alt=\"\" /></td>";
-		print "<td><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
+		print "<td rowspan=\"2\"><img src=\"".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td rowspan=\"2\"><img src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"" . ($pbheight) . "\" alt=\"\" /></td>";
+		print "<td><img src=\"".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
 		$j = 0;
 		foreach($hfams as $hfamid=>$hfamily) {
 			if (!is_null($hfamily)) {
@@ -255,7 +251,7 @@ function print_family_parents($famid, $sosa = 0, $label="", $parid="", $gparid="
 	}
 	if ($hparents or ($sosa != 0 and $SHOW_EMPTY_BOXES)) {
 		// wife's mother
-		print "</tr><tr><td><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
+		print "</tr><tr><td><img src=\"".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
 		print "\n\t<table style=\"width: " . ($pbwidth) . "px; height: " . $pbheight . "px;\"><tr>";
 		if ($sosa > 0) print_sosa_number($sosa * 4 + 3, $hparents['WIFE'], "down");
 		if (!empty($gparid) and $hparents['WIFE']==$gparid) print_sosa_number(trim(substr($label,0,-3),".").".");
@@ -276,8 +272,8 @@ function print_family_parents($famid, $sosa = 0, $label="", $parid="", $gparid="
  * @param string $label optional indi label (descendancy booklet)
  */
 function print_family_children($famid, $childid = "", $sosa = 0, $label="", $personcount="1") {
-	global $pbwidth, $pbheight, $show_cousins;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $show_changes, $GEDCOM, $TEXT_DIRECTION;
+	global $pbwidth, $pbheight, $show_cousins, $WT_IMAGES, $show_changes, $GEDCOM, $TEXT_DIRECTION;
+
 	$ged_id=get_id_from_gedcom($GEDCOM);
 
 	$family=Family::getInstance($famid);
@@ -375,7 +371,7 @@ function print_family_children($famid, $childid = "", $sosa = 0, $label="", $per
 							//else print "<img height=\"100%\"";
 							if ($f==$maxfam) print "<img height=\"".($pbheight/2-3)."px\"";
 							else print "<img height=\"".$pbheight."px\"";
-							print " width=\"3\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."\" alt=\"\" />";
+							print " width=\"3\" src=\"".$WT_IMAGES["vline"]["other"]."\" alt=\"\" />";
 							print "</td>";
 						}
 						print "<td class=\"details1\" valign=\"middle\" align=\"center\">!!!";
@@ -390,7 +386,7 @@ function print_family_children($famid, $childid = "", $sosa = 0, $label="", $per
 							$ct = preg_match("/2 DATE.*(\d\d\d\d)/", $divrec, $match);
 							if ($ct>0) print "-<span class=\"date\">".trim($match[1])."</span>";
 						}
-						print "<br /><img width=\"100%\" height=\"3\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" alt=\"\" />";
+						print "<br /><img width=\"100%\" height=\"3\" src=\"".$WT_IMAGES["hline"]["other"]."\" alt=\"\" />";
 						// family link
 						if ($famid) {
 							print "<br />";
@@ -674,8 +670,7 @@ function ancestry_array($rootid, $maxgen=0) {
  * @param string $dir arrow direction 0=left 1=right 2=up 3=down (default=2)
  */
 function print_url_arrow($id, $url, $label, $dir=2) {
-	global $WT_IMAGE_DIR, $WT_IMAGES;
-	global $TEXT_DIRECTION;
+	global $WT_IMAGES, $TEXT_DIRECTION;
 
 	if ($id=="" or $url=="") return;
 
@@ -688,7 +683,7 @@ function print_url_arrow($id, $url, $label, $dir=2) {
 	$array_style=array("larrow", "rarrow", "uarrow", "darrow");
 	$astyle=$array_style[$adir];
 
-	print "<a href=\"$url\" onmouseover=\"swap_image('".$astyle.$id."',$adir); window.status ='" . $label . "'; return true; \" onmouseout=\"swap_image('".$astyle.$id."',$adir); window.status=''; return true; \"><img id=\"".$astyle.$id."\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES[$astyle]["other"]."\" hspace=\"0\" vspace=\"0\" border=\"0\" alt=\"$label\" title=\"$label\" /></a>";
+	print "<a href=\"$url\" onmouseover=\"swap_image('".$astyle.$id."',$adir); window.status ='" . $label . "'; return true; \" onmouseout=\"swap_image('".$astyle.$id."',$adir); window.status=''; return true; \"><img id=\"".$astyle.$id."\" src=\"".$WT_IMAGES[$astyle]["other"]."\" hspace=\"0\" vspace=\"0\" border=\"0\" alt=\"$label\" title=\"$label\" /></a>";
 }
 
 /**
@@ -747,9 +742,8 @@ function find_last_spouse($pid) {
  * @param string $famid family ID
  */
 function print_cousins($famid, $personcount="1") {
-	global $show_full, $bheight, $bwidth;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
-	global $GEDCOM;
+	global $show_full, $bheight, $bwidth, $WT_IMAGES, $TEXT_DIRECTION, $GEDCOM;
+
 	$ged_id=get_id_from_gedcom($GEDCOM);
 
 	$family=Family::getInstance($famid);
@@ -765,14 +759,14 @@ function print_cousins($famid, $personcount="1") {
 	print "<td valign=\"middle\" height=\"100%\">";
 	if ($kids) {
 		print "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" ><tr valign=\"middle\">";
-		if ($kids>1) print "<td rowspan=\"".$kids."\" valign=\"middle\" align=\"right\"><img width=\"3px\" height=\"". (($bheight+5) * ($kids-1)) ."px\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]."\" alt=\"\" /></td>";
+		if ($kids>1) print "<td rowspan=\"".$kids."\" valign=\"middle\" align=\"right\"><img width=\"3px\" height=\"". (($bheight+5) * ($kids-1)) ."px\" src=\"".$WT_IMAGES["vline"]["other"]."\" alt=\"\" /></td>";
 		$ctkids = count($fchildren);
 		$i = 1;
 		foreach ($fchildren as $indexval => $fchil) {
 			print "<td><img width=\"10px\" height=\"3px\" style=\"padding-";
 			if ($TEXT_DIRECTION=="ltr") print "right";
 			else print "left";
-			print ": 2px;\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
+			print ": 2px;\" src=\"".$WT_IMAGES["hline"]["other"]."\" alt=\"\" /></td><td>";
 			print_pedigree_person($fchil, 1 , 0, $personcount);
 			$personcount++;
 			print "</td></tr>";
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index 9a55330be4..79099be370 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -501,7 +501,7 @@ function remove_subline($oldrecord, $linenum) {
 * @param string $famtag how the new person is added to the family
 */
 function print_indi_form($nextaction, $famid, $linenum='', $namerec='', $famtag="CHIL", $sextag='') {
-	global $pid, $WT_IMAGE_DIR, $WT_IMAGES, $WORD_WRAPPED_NOTES;
+	global $pid, $WT_IMAGES, $WORD_WRAPPED_NOTES;
 	global $NPFX_accept, $SPFX_accept, $NSFX_accept, $FILE_FORM_accept;
 	global $bdm, $TEXT_DIRECTION, $STANDARD_NAME_FACTS, $REVERSED_NAME_FACTS, $ADVANCED_NAME_FACTS, $ADVANCED_PLAC_FACTS;
 	global $QUICK_REQUIRED_FACTS, $QUICK_REQUIRED_FAMFACTS, $NO_UPDATE_CHAN;
@@ -1022,11 +1022,11 @@ function print_indi_form($nextaction, $famid, $linenum='', $namerec='', $famtag=
 * @see init_calendar_popup()
 */
 function print_calendar_popup($id, $asString=false) {
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $WT_IMAGES;
 
 	// calendar button
 	$text = i18n::translate('Select a date');
-	if (isset($WT_IMAGES["calendar"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["calendar"]["button"]."\" name=\"img".$id."\" id=\"img".$id."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["calendar"]["button"])) $Link = "<img src=\"".$WT_IMAGES["calendar"]["button"]."\" name=\"img".$id."\" id=\"img".$id."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	$out = ' ';
 	$out .= "<a href=\"javascript: ".$text."\" onclick=\"cal_toggleDate('caldiv".$id."', '".$id."'); return false;\">";
@@ -1040,10 +1040,10 @@ function print_calendar_popup($id, $asString=false) {
 * @todo add comments
 */
 function print_addnewmedia_link($element_id) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $pid;
+	global $WT_IMAGES, $pid;
 	
 	$text = i18n::translate('Add a new media item');
-	if (isset($WT_IMAGES["addmedia"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["addmedia"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["addmedia"]["button"])) $Link = "<img src=\"".$WT_IMAGES["addmedia"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	echo '&nbsp;&nbsp;&nbsp;<a href="javascript:;" onclick="pastefield=document.getElementById(\'', $element_id, '\'); window.open(\'addmedia.php?action=showmediaform&linktoid={$linkToID}&level={$level}\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">';
 	echo $Link;
@@ -1053,10 +1053,10 @@ function print_addnewmedia_link($element_id) {
 * @todo add comments
 */
 function print_addnewrepository_link($element_id) {
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $WT_IMAGES;
 
 	$text = i18n::translate('Create Repository');
-	if (isset($WT_IMAGES["addrepository"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["addrepository"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["addrepository"]["button"])) $Link = "<img src=\"".$WT_IMAGES["addrepository"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	echo "&nbsp;&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"addnewrepository(document.getElementById('", $element_id, "')); return false;\">";
 	echo $Link;
@@ -1067,10 +1067,10 @@ function print_addnewrepository_link($element_id) {
 * @todo add comments
 */
 function print_addnewnote_link($element_id) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $pid;
+	global $WT_IMAGES, $pid;
 	
 	$text = i18n::translate('Create a new Shared Note');
-	if (isset($WT_IMAGES["addnote"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["addnote"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["addnote"]["button"])) $Link = "<img src=\"".$WT_IMAGES["addnote"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	echo "&nbsp;&nbsp;&nbsp;<a href=\"javascript:ADD;\" onclick=\"addnewnote(document.getElementById('", $element_id, "')); return false;\">";
 	echo $Link;
@@ -1081,9 +1081,10 @@ function print_addnewnote_link($element_id) {
 * // Used in GEDFact CENS assistant =====================
 */
 function print_addnewnote_assisted_link($element_id) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $pid;
+	global $WT_IMAGES, $pid;
+
 	$text = i18n::translate('Create a new Shared Note using Assistant');
-	if (isset($WT_IMAGES["addnote"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["addnote"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["addnote"]["button"])) $Link = "<img src=\"".$WT_IMAGES["addnote"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	echo "&nbsp;&nbsp;&nbsp;<a href=\"javascript:ADD;\" onclick=\"addnewnote_assisted(document.getElementById('", $element_id, "'), '", $pid, "' ); return false;\">";
 	echo $Link;
@@ -1095,9 +1096,10 @@ function print_addnewnote_assisted_link($element_id) {
 */
 
 function print_editnote_link($note_id) {
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $WT_IMAGES;
+
 	$text = i18n::translate('Edit Shared Note');
-	if (isset($WT_IMAGES["note"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["note"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["note"]["button"])) $Link = "<img src=\"".$WT_IMAGES["note"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	echo "<a href=\"javascript: var win02=window.open('edit_interface.php?action=editnote&pid=$note_id', 'win02', 'top=70, left=70, width=620, height=500, resizable=1, scrollbars=1 ' )\">";
 	echo $Link;
@@ -1108,10 +1110,10 @@ function print_editnote_link($note_id) {
 * @todo add comments
 */
 function print_addnewsource_link($element_id) {
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $WT_IMAGES;
 
 	$text = i18n::translate('Create a new source');
-	if (isset($WT_IMAGES["addsource"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["addsource"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["addsource"]["button"])) $Link = "<img src=\"".$WT_IMAGES["addsource"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	echo "&nbsp;&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"addnewsource(document.getElementById('", $element_id, "')); return false;\">";
 	echo $Link;
@@ -1138,7 +1140,7 @@ function print_addnewsource_link($element_id) {
 * @param boolean $rowDisplay True to have the row displayed by default, false to hide it by default
 */
 function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose='', $rowDisplay=true) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $MEDIA_DIRECTORY, $TEMPLE_CODES;
+	global $WT_IMAGES, $MEDIA_DIRECTORY, $TEMPLE_CODES;
 	global $tags, $emptyfacts, $main_fact, $TEXT_DIRECTION;
 	global $NPFX_accept, $SPFX_accept, $NSFX_accept, $FILE_FORM_accept, $upload_count;
 	global $tabkey, $STATUS_CODES, $SPLIT_PLACES, $pid, $gender, $linkToID;
@@ -1538,7 +1540,7 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose=
 		echo "<input type=\"hidden\" id=\"", $element_id, "\" name=\"", $element_name, "\" onchange=\"updateTextName('", $element_id, "');\" value=\"", PrintReady(htmlspecialchars($value, ENT_COMPAT, 'UTF-8')), "\" />";
 		echo "<span id=\"", $element_id, "_display\">", PrintReady(htmlspecialchars($value, ENT_COMPAT, 'UTF-8')), "</span>";
 		echo " <a href=\"#edit_name\" onclick=\"convertHidden('", $element_id, "'); return false;\"> ";
-		if (isset($WT_IMAGES["edit_indi"]["small"])) echo "<img src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["edit_indi"]["small"], "\" border=\"0\" width=\"20\" alt=\"", i18n::translate('Edit name'), "\" align=\"top\" />";
+		if (isset($WT_IMAGES["edit_indi"]["small"])) echo "<img src=\"", $WT_IMAGES["edit_indi"]["small"], "\" border=\"0\" width=\"20\" alt=\"", i18n::translate('Edit name'), "\" align=\"top\" />";
 		else echo "<span class=\"age\">[", i18n::translate('Edit name'), "]</span>";
 		echo "</a>";
 	} else {
@@ -1757,13 +1759,11 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose=
 * @param string $tag Gedcom tag name
 */
 function print_add_layer($tag, $level=2, $printSaveButton=true) {
-	global $WT_IMAGE_DIR, $WT_IMAGES;
-	global $MEDIA_DIRECTORY, $TEXT_DIRECTION;
-	global $gedrec, $FULL_SOURCES;
-	global $islink;
+	global $WT_IMAGES, $MEDIA_DIRECTORY, $TEXT_DIRECTION, $gedrec, $FULL_SOURCES, $islink;
+
 	if ($tag=="SOUR") {
 		//-- Add new source to fact
-		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newsource');\"><img id=\"newsource_img\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new source citation'), "</a>";
+		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newsource');\"><img id=\"newsource_img\" src=\"", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new source citation'), "</a>";
 		echo help_link('edit_add_SOUR');
 		echo "<br />";
 		echo "<div id=\"newsource\" style=\"display: none;\">\n";
@@ -1794,12 +1794,12 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) {
 	if ($tag=="ASSO" || $tag=="ASSO2") {
 		//-- Add a new ASSOciate
 		if ($tag=="ASSO") {
-			echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newasso');\"><img id=\"newasso_img\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new associate'), "</a>";
+			echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newasso');\"><img id=\"newasso_img\" src=\"", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new associate'), "</a>";
 			echo help_link('edit_add_ASSO');
 			echo "<br />";
 			echo "<div id=\"newasso\" style=\"display: none;\">\n";
 		} else {
-			echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newasso2');\"><img id=\"newasso2_img\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new associate'), "</a>";
+			echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newasso2');\"><img id=\"newasso2_img\" src=\"", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new associate'), "</a>";
 			echo help_link('edit_add_ASSO');
 			echo "<br />";
 			echo "<div id=\"newasso2\" style=\"display: none;\">\n";
@@ -1819,7 +1819,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) {
 	if ($tag=="NOTE") {
 		//-- Retrieve existing note or add new note to fact
 		$text = '';
-		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newnote');\"><img id=\"newnote_img\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new note'), "</a>";
+		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newnote');\"><img id=\"newnote_img\" src=\"", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new note'), "</a>";
 		echo help_link('edit_add_NOTE');
 		echo "<br />\n";
 		echo "<div id=\"newnote\" style=\"display: none;\">\n";
@@ -1832,7 +1832,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) {
 	if ($tag=="SHARED_NOTE") {
 		//-- Retrieve existing shared note or add new shared note to fact
 		$text = '';
-		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newshared_note');\"><img id=\"newshared_note_img\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new shared note'), "</a>";
+		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newshared_note');\"><img id=\"newshared_note_img\" src=\"", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new shared note'), "</a>";
 		echo help_link('edit_add_SHARED_NOTE');
 		echo "<br />\n";
 		echo "<div id=\"newshared_note\" style=\"display: none;\">\n";
@@ -1845,7 +1845,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) {
 	}
 	if ($tag=="OBJE") {
 		//-- Add new obje to fact
-		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newobje');\"><img id=\"newobje_img\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new Multimedia object'), "</a>";
+		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newobje');\"><img id=\"newobje_img\" src=\"", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", i18n::translate('Add a new Multimedia object'), "</a>";
 		echo help_link('add_media');
 		echo "<br />";
 		echo "<div id=\"newobje\" style=\"display: none;\">\n";
@@ -1857,7 +1857,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) {
 	if ($tag=="RESN") {
 		//-- Retrieve existing resn or add new resn to fact
 		$text = '';
-		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newresn');\"><img id=\"newresn_img\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", translate_fact('RESN'), "</a>";
+		echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newresn');\"><img id=\"newresn_img\" src=\"", $WT_IMAGES["plus"]["other"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", translate_fact('RESN'), "</a>";
 		echo help_link('RESN');
 		echo "<br />\n";
 		echo "<div id=\"newresn\" style=\"display: none;\">\n";
diff --git a/includes/functions/functions_media_reorder.php b/includes/functions/functions_media_reorder.php
index f9a4bb4759..fe0fc4c75f 100644
--- a/includes/functions/functions_media_reorder.php
+++ b/includes/functions/functions_media_reorder.php
@@ -41,11 +41,10 @@ if (!defined('WT_WEBTREES')) {
  * @param string $pid        The record id this media item was attached to
  */
 function media_reorder_row($rtype, $rowm, $pid) {
-
-    global $WT_IMAGE_DIR, $WT_IMAGES, $MEDIA_DIRECTORY, $TEXT_DIRECTION;
-    global $GEDCOM, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER;
-    global $SEARCH_SPIDER;
-    global $t, $n, $item, $items, $p, $edit, $reorder, $LB_AL_THUMB_LINKS, $note, $rowm;
+	global $WT_IMAGES, $MEDIA_DIRECTORY, $TEXT_DIRECTION;
+	global $GEDCOM, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER;
+	global $SEARCH_SPIDER;
+	global $t, $n, $item, $items, $p, $edit, $reorder, $LB_AL_THUMB_LINKS, $note, $rowm;
 	global $LB_URL_WIDTH, $LB_URL_HEIGHT, $order1, $mediaType;
 	global $MEDIA_TYPES;
 
diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php
index 3ae677ef2c..d9f5f309ad 100644
--- a/includes/functions/functions_mediadb.php
+++ b/includes/functions/functions_mediadb.php
@@ -594,7 +594,7 @@ function filterMedia($media, $filter, $acceptExt) {
 * @return string the location of the thumbnail
 */
 function thumbnail_file($filename, $generateThumb = true, $overwrite = false) {
-	global $MEDIA_DIRECTORY, $WT_IMAGE_DIR, $WT_IMAGES, $MEDIA_DIRECTORY_LEVELS, $MEDIA_EXTERNAL;
+	global $MEDIA_DIRECTORY, $WT_IMAGES, $MEDIA_DIRECTORY_LEVELS, $MEDIA_EXTERNAL;
 
 	if (strlen($filename) == 0)
 		return false;
@@ -654,7 +654,7 @@ function thumbnail_file($filename, $generateThumb = true, $overwrite = false) {
 		default :
 			$which = "large";
 	}
-	return $WT_IMAGE_DIR . "/" . $WT_IMAGES["media"][$which];
+	return $WT_IMAGES["media"][$which];
 }
 
 /**
diff --git a/includes/functions/functions_places.php b/includes/functions/functions_places.php
index f8f291ecf0..c755f19a21 100644
--- a/includes/functions/functions_places.php
+++ b/includes/functions/functions_places.php
@@ -51,8 +51,7 @@ function get_plac_label() {
 }
 
 function setup_place_subfields($element_id) {
-	global $WT_PLACES_SETUP;
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $WT_PLACES_SETUP, $WT_IMAGES;
 
 	if (!empty($WT_PLACES_SETUP)) return;
 	$WT_PLACES_SETUP = true;
@@ -282,14 +281,14 @@ function setup_place_subfields($element_id) {
  * @param string $element_id	id of PLAC input element in the form
  */
 function print_place_subfields($element_id) {
-	global $iso3166, $WT_IMAGE_DIR, $WT_IMAGES;
+	global $iso3166, $WT_IMAGES;
 
 	//if ($element_id=="DEAT_PLAC") return; // known bug - waiting for a patch
 	$plac_label = get_plac_label();
 	print "<div id='mapdata'></div>";
 
 	$cols=40;
-	print "&nbsp;<a href=\"javascript:;\" onclick=\"expand_layer('".$element_id."_div'); toggleplace('".$element_id."'); return false;\"><img id=\"".$element_id."_div_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["plus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" />&nbsp;</a>";
+	print "&nbsp;<a href=\"javascript:;\" onclick=\"expand_layer('".$element_id."_div'); toggleplace('".$element_id."'); return false;\"><img id=\"".$element_id."_div_img\" src=\"".$WT_IMAGES["plus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" />&nbsp;</a>";
 	print "<br /><div id=\"".$element_id."_div\" style=\"display: none; border-width:thin; border-style:none; padding:0px\">\n";
 	// subtags creation : _0 _1 _2 etc...
 	$icountry=-1;
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index e92bd24344..329c2fed39 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -53,7 +53,7 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") {
 	global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $GEDCOM;
 	global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES;
 	global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
-	global $USE_SILHOUETTE, $WT_IMAGE_DIR, $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
+	global $USE_SILHOUETTE, $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
 	global $chart_style, $box_width, $generations, $show_spouse, $show_full;
 	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
 	global $SEARCH_SPIDER;
@@ -202,7 +202,7 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") {
 				if ($ZOOM_BOXES=="mouseover") $icons .= $mouseAction2;
 				if ($ZOOM_BOXES=="mousedown") $icons .= $mouseAction3;
 				if ($ZOOM_BOXES=="click") $icons .= $mouseAction4;
-				$icons .= "><img id=\"iconz-$boxID\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["zoomin"]["other"]."\" width=\"25\" height=\"25\" border=\"0\" alt=\"".i18n::translate('Zoom in/out on this box.')."\" title=\"".i18n::translate('Zoom in/out on this box.')."\" /></a>";
+				$icons .= "><img id=\"iconz-$boxID\" src=\"".$WT_IMAGES["zoomin"]["other"]."\" width=\"25\" height=\"25\" border=\"0\" alt=\"".i18n::translate('Zoom in/out on this box.')."\" title=\"".i18n::translate('Zoom in/out on this box.')."\" /></a>";
 			}
 			if ($LINK_ICONS!="disabled") {
 				$click_link="javascript:;";
@@ -248,7 +248,7 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") {
 				$icons .= "onmouseout=\"family_box_timeout('".$boxID."');";
 				$icons .= " return false;\"";
 				if (($click_link=="#")&&($LINK_ICONS!="click")) $icons .= "onclick=\"return false;\"";
-				$icons .= "><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["pedigree"]["small"]."\" width=\"25\" border=\"0\" vspace=\"0\" hspace=\"0\" alt=\"".i18n::translate('Links to charts, families, and close relatives of this person. Click this icon to view this page, starting at this person.')."\" title=\"".i18n::translate('Links to charts, families, and close relatives of this person. Click this icon to view this page, starting at this person.')."\" /></a>";
+				$icons .= "><img src=\"".$WT_IMAGES["pedigree"]["small"]."\" width=\"25\" border=\"0\" vspace=\"0\" hspace=\"0\" alt=\"".i18n::translate('Links to charts, families, and close relatives of this person. Click this icon to view this page, starting at this person.')."\" title=\"".i18n::translate('Links to charts, families, and close relatives of this person. Click this icon to view this page, starting at this person.')."\" /></a>";
 			}
 		}
 		else {
@@ -301,13 +301,13 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") {
 			$sex = $person->getSex();
 			$thumbnail = "<img id=\"box-$boxID-thumb\" src=\"";
 			if ($sex == 'F') {
-				$thumbnail .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_F"]["other"]."\"";
+				$thumbnail .= $WT_IMAGES["default_image_F"]["other"]."\"";
 			}
 			else if ($sex == 'M') {
-				$thumbnail .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_M"]["other"]."\"";
+				$thumbnail .= $WT_IMAGES["default_image_M"]["other"]."\"";
 			}
 			else {
-				$thumbnail .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_U"]["other"]."\"";
+				$thumbnail .= $WT_IMAGES["default_image_U"]["other"]."\"";
 			}
 			if (!$show_full) $thumbnail .= " style=\"display: none;\"";
 			$thumbnail .=" class=\"".$class."\" border=\"none\" alt=\"\" />";
@@ -402,12 +402,8 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") {
 * @param boolean $use_alternate_styles
 */
 function print_header($title, $head="", $use_alternate_styles=true) {
-	global $bwidth;
-	global $HOME_SITE_URL, $HOME_SITE_TEXT;
-	global $BROWSERTYPE, $SEARCH_SPIDER;
-	global $view, $cart;
-	global $WT_IMAGE_DIR, $GEDCOM, $GEDCOM_TITLE, $COMMON_NAMES_THRESHOLD;
-	global $QUERY_STRING, $action, $query, $theme_name;
+	global $bwidth, $HOME_SITE_URL, $HOME_SITE_TEXT, $BROWSERTYPE, $SEARCH_SPIDER, $view, $cart;
+	global $GEDCOM, $GEDCOM_TITLE, $COMMON_NAMES_THRESHOLD, $QUERY_STRING, $action, $query, $theme_name;
 	global $FAVICON, $stylesheet, $print_stylesheet, $rtl_stylesheet, $headerfile, $toplinks, $THEME_DIR, $print_headerfile;
 	global $WT_IMAGES, $TEXT_DIRECTION, $ONLOADFUNCTION, $REQUIRE_AUTHENTICATION;
 
@@ -445,25 +441,25 @@ function print_header($title, $head="", $use_alternate_styles=true) {
 		var accesstime = "'.time().'";
 		var plusminus = new Array();
 		plusminus[0] = new Image();
-		plusminus[0].src = "'.$WT_IMAGE_DIR."/".$WT_IMAGES["plus"]["other"].'";
+		plusminus[0].src = "'.$WT_IMAGES["plus"]["other"].'";
 		plusminus[0].title = "'.i18n::translate('Show Details').'";
 		plusminus[1] = new Image();
-		plusminus[1].src = "'.$WT_IMAGE_DIR."/".$WT_IMAGES["minus"]["other"].'";
+		plusminus[1].src = "'.$WT_IMAGES["minus"]["other"].'";
 		plusminus[1].title = "'.i18n::translate('Hide Details').'";
 		var zoominout = new Array();
 		zoominout[0] = new Image();
-		zoominout[0].src = "'.$WT_IMAGE_DIR."/".$WT_IMAGES["zoomin"]["other"].'";
+		zoominout[0].src = "'.$WT_IMAGES["zoomin"]["other"].'";
 		zoominout[1] = new Image();
-		zoominout[1].src = "'.$WT_IMAGE_DIR."/".$WT_IMAGES["zoomout"]["other"].'";
+		zoominout[1].src = "'.$WT_IMAGES["zoomout"]["other"].'";
 		var arrows = new Array();
 		arrows[0] = new Image();
-		arrows[0].src = "'.$WT_IMAGE_DIR."/".$WT_IMAGES["larrow2"]["other"].'";
+		arrows[0].src = "'.$WT_IMAGES["larrow2"]["other"].'";
 		arrows[1] = new Image();
-		arrows[1].src = "'.$WT_IMAGE_DIR."/".$WT_IMAGES["rarrow2"]["other"].'";
+		arrows[1].src = "'.$WT_IMAGES["rarrow2"]["other"].'";
 		arrows[2] = new Image();
-		arrows[2].src = "'.$WT_IMAGE_DIR."/".$WT_IMAGES["uarrow2"]["other"].'";
+		arrows[2].src = "'.$WT_IMAGES["uarrow2"]["other"].'";
 		arrows[3] = new Image();
-		arrows[3].src = "'.$WT_IMAGE_DIR."/".$WT_IMAGES["darrow2"]["other"].'";
+		arrows[3].src = "'.$WT_IMAGES["darrow2"]["other"].'";
 	';
 	$javascript .= 'function delete_record(pid, linenum, mediaid) {
 		if (!mediaid) mediaid="";
@@ -527,8 +523,7 @@ function print_simple_header($title) {
 
 // -- print the html to close the page
 function print_footer() {
-	global $SHOW_STATS, $QUERY_STRING, $footerfile, $printlink;
-	global $WT_IMAGE_DIR, $theme_name, $WT_IMAGES, $TEXT_DIRECTION, $footer_count;
+	global $SHOW_STATS, $QUERY_STRING, $footerfile, $printlink, $theme_name, $WT_IMAGES, $TEXT_DIRECTION, $footer_count;
 
 	if (!isset($footer_count)) $footer_count = 1;
 	else $footer_count++;
@@ -754,7 +749,7 @@ function contact_menus($ged_id=WT_GED_ID) {
 //-- print user favorites
 function print_favorite_selector($option=0) {
 	global $GEDCOM, $QUERY_STRING;
-	global $TEXT_DIRECTION, $REQUIRE_AUTHENTICATION, $WT_IMAGE_DIR, $WT_IMAGES, $SEARCH_SPIDER;
+	global $TEXT_DIRECTION, $REQUIRE_AUTHENTICATION, $WT_IMAGES, $SEARCH_SPIDER;
 	global $controller; // Pages with a controller can be added to the favorites
 
 	if (!empty($SEARCH_SPIDER)) {
@@ -945,7 +940,8 @@ function print_favorite_selector($option=0) {
 * @return boolean
 */
 function print_note_record($text, $nlevel, $nrec, $textOnly=false, $return=false) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $EXPAND_SOURCES, $EXPAND_NOTES;
+	global $WT_IMAGES, $EXPAND_SOURCES, $EXPAND_NOTES;
+
 	if (!isset($EXPAND_NOTES)) $EXPAND_NOTES = $EXPAND_SOURCES; // FIXME
 	$elementID = "N-".floor(microtime()*1000000);
 	$text = trim($text);
@@ -994,7 +990,7 @@ function print_note_record($text, $nlevel, $nrec, $textOnly=false, $return=false
 		$data .= "<span class=\"label\">";
 		if ($brpos !== false) {
 			if ($EXPAND_NOTES) $plusminus="minus"; else $plusminus="plus";
-			$data .= "<a href=\"javascript:;\" onclick=\"expand_layer('$elementID'); return false;\"><img id=\"{$elementID}_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES[$plusminus]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"";
+			$data .= "<a href=\"javascript:;\" onclick=\"expand_layer('$elementID'); return false;\"><img id=\"{$elementID}_img\" src=\"".$WT_IMAGES[$plusminus]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"";
 			if ($plusminus=="plus") $data .= i18n::translate('Show Details')."\" title=\"".i18n::translate('Show Details')."\" /></a> ";
 			else $data .= i18n::translate('Hide Details')."\" title=\"".i18n::translate('Hide Details')."\" /></a> ";
 		}
@@ -1126,12 +1122,12 @@ function print_privacy_error() {
 
 // Print a link for a popup help window
 function help_link($help_topic, $module='') {
-	global $WT_USE_HELPIMG, $WT_IMAGES, $WT_IMAGE_DIR, $SEARCH_SPIDER;
+	global $WT_USE_HELPIMG, $WT_IMAGES, $SEARCH_SPIDER;
 
 	if ($_SESSION['show_context_help']) {
 		return
 			'<a class="help" tabindex="0" href="javascript: '.$help_topic.'" onclick="helpPopup(\''.$help_topic.'\',\''.$module.'\'); return false;">&nbsp;'.
-			($WT_USE_HELPIMG ?  '<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['help']['small'].'" class="icon" width="15" height="15" alt="" />' : i18n::translate('?')).
+			($WT_USE_HELPIMG ?  '<img src="'.$WT_IMAGES['help']['small'].'" class="icon" width="15" height="15" alt="" />' : i18n::translate('?')).
 			'&nbsp;</a>';
 	} else {
 		return '';
@@ -1408,7 +1404,7 @@ function PrintReady($text, $InHeaders=false, $trim=true) {
 * @param string $linebr optional linebreak
 */
 function print_asso_rela_record($pid, $factrec, $linebr=false, $type='INDI') {
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $WT_IMAGES;
 
 	// Level 1 ASSO
 	if (preg_match('/^1 ASSO @('.WT_REGEX_XREF.')@(\n[2-9].*)*/', $factrec, $amatch)) {
@@ -1435,14 +1431,14 @@ function print_asso_rela_record($pid, $factrec, $linebr=false, $type='INDI') {
 						if (!$relationship1) {
 							$relationship1=i18n::translate('Relationship Chart');
 						}
-						$relationship.=' - <a href="relationship.php?pid1='.$parents["HUSB"].'&amp;pid2='.$amatch[1].'&amp;ged='.urlencode(WT_GEDCOM).'">'.$relationship1.'<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['sex']['small'].'" class="gender_image" /></a>';
+						$relationship.=' - <a href="relationship.php?pid1='.$parents["HUSB"].'&amp;pid2='.$amatch[1].'&amp;ged='.urlencode(WT_GEDCOM).'">'.$relationship1.'<img src="'.$WT_IMAGES['sex']['small'].'" class="gender_image" /></a>';
 					}
 					if ($parents["WIFE"]) {
 						$relationship2=get_relationship_name(get_relationship($parents["WIFE"], $amatch[1], true, 4));
 						if (!$relationship2) {
 							$relationship2=i18n::translate('Relationship Chart');
 						}
-						$relationship.=' - <a href="relationship.php?pid1='.$parents["WIFE"].'&amp;pid2='.$amatch[1].'&amp;ged='.urlencode(WT_GEDCOM).'">'.$relationship2.'<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['sexf']['small'].'" class="gender_image" /></a>';
+						$relationship.=' - <a href="relationship.php?pid1='.$parents["WIFE"].'&amp;pid2='.$amatch[1].'&amp;ged='.urlencode(WT_GEDCOM).'">'.$relationship2.'<img src="'.$WT_IMAGES['sexf']['small'].'" class="gender_image" /></a>';
 					}
 				}
 				break;
@@ -1498,14 +1494,14 @@ function print_asso_rela_record($pid, $factrec, $linebr=false, $type='INDI') {
 						if (!$relationship1) {
 							$relationship1=i18n::translate('Relationship Chart');
 						}
-						$relationship.=' - <a href="relationship.php?pid1='.$parents["HUSB"].'&amp;pid2='.$amatch[1].'&amp;ged='.urlencode(WT_GEDCOM).'">'.$relationship1.'<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['sex']['small'].'" class="gender_image" /></a>';
+						$relationship.=' - <a href="relationship.php?pid1='.$parents["HUSB"].'&amp;pid2='.$amatch[1].'&amp;ged='.urlencode(WT_GEDCOM).'">'.$relationship1.'<img src="'.$WT_IMAGES['sex']['small'].'" class="gender_image" /></a>';
 					}
 					if ($parents["WIFE"]) {
 						$relationship2=get_relationship_name(get_relationship($parents["WIFE"], $amatch[1], true, 4));
 						if (!$relationship2) {
 							$relationship2=i18n::translate('Relationship Chart');
 						}
-						$relationship.=' - <a href="relationship.php?pid1='.$parents["WIFE"].'&amp;pid2='.$amatch[1].'&amp;ged='.urlencode(WT_GEDCOM).'">'.$relationship2.'<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['sexf']['small'].'" class="gender_image" /></a>';
+						$relationship.=' - <a href="relationship.php?pid1='.$parents["WIFE"].'&amp;pid2='.$amatch[1].'&amp;ged='.urlencode(WT_GEDCOM).'">'.$relationship2.'<img src="'.$WT_IMAGES['sexf']['small'].'" class="gender_image" /></a>';
 					}
 				}
 				break;
@@ -2016,11 +2012,11 @@ function init_calendar_popup() {
 * @param string $ged The GEDCOM to search in
 */
 function print_findindi_link($element_id, $indiname, $asString=false, $multiple=false, $ged='', $filter='') {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+	global $WT_IMAGES, $GEDCOM;
 
 	$text = i18n::translate('Find individual ID');
 	if (empty($ged)) $ged=$GEDCOM;
-	if (isset($WT_IMAGES["indi"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["indi"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["indi"]["button"])) $Link = "<img src=\"".$WT_IMAGES["indi"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	$out = " <a href=\"javascript:;\" onclick=\"findIndi(document.getElementById('".$element_id."'), document.getElementById('".$indiname."'), '".$multiple."', '".$ged."', '".$filter."'); findtype='individual'; return false;\">";
 	$out .= $Link;
@@ -2030,11 +2026,11 @@ function print_findindi_link($element_id, $indiname, $asString=false, $multiple=
 }
 
 function print_findplace_link($element_id, $ged='', $asString=false) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+	global $WT_IMAGES, $GEDCOM;
 
 	if (empty($ged)) $ged=$GEDCOM;
 	$text = i18n::translate('Find Place');
-	if (isset($WT_IMAGES["place"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["place"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["place"]["button"])) $Link = "<img src=\"".$WT_IMAGES["place"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	$out = " <a href=\"javascript:;\" onclick=\"findPlace(document.getElementById('".$element_id."'), '".$ged."'); return false;\">";
 	$out .= $Link;
@@ -2044,11 +2040,11 @@ function print_findplace_link($element_id, $ged='', $asString=false) {
 }
 
 function print_findfamily_link($element_id, $ged='', $asString=false) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+	global $WT_IMAGES, $GEDCOM;
 
 	if (empty($ged)) $ged=$GEDCOM;
 	$text = i18n::translate('Find Family ID');
-	if (isset($WT_IMAGES["family"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["family"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["family"]["button"])) $Link = "<img src=\"".$WT_IMAGES["family"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	$out = " <a href=\"javascript:;\" onclick=\"findFamily(document.getElementById('".$element_id."'), '".$ged."'); return false;\">";
 	$out .= $Link;
@@ -2058,10 +2054,10 @@ function print_findfamily_link($element_id, $ged='', $asString=false) {
 }
 
 function print_specialchar_link($element_id, $vert, $asString=false) {
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $WT_IMAGES;
 
 	$text = i18n::translate('Find Special Characters');
-	if (isset($WT_IMAGES["keyboard"]["button"])) $Link = "<img id=\"".$element_id."_spec\" name=\"".$element_id."_spec\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["keyboard"]["button"]."\"  alt=\"".$text."\"  title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["keyboard"]["button"])) $Link = "<img id=\"".$element_id."_spec\" name=\"".$element_id."_spec\" src=\"".$WT_IMAGES["keyboard"]["button"]."\"  alt=\"".$text."\"  title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	$out = " <a href=\"javascript:;\" onclick=\"findSpecialChar(document.getElementById('".$element_id."')); updatewholename(); return false;\">";
 	$out .= $Link;
@@ -2084,11 +2080,11 @@ function print_autopaste_link($element_id, $choices, $concat=1, $name=1, $submit
 }
 
 function print_findsource_link($element_id, $sourcename="", $asString=false, $ged='') {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+	global $WT_IMAGES, $GEDCOM;
 
 	if (empty($ged)) $ged=$GEDCOM;
 	$text = i18n::translate('Find Source ID');
-	if (isset($WT_IMAGES["source"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["source"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["source"]["button"])) $Link = "<img src=\"".$WT_IMAGES["source"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	$out = " <a href=\"javascript:;\" onclick=\"findSource(document.getElementById('".$element_id."'), document.getElementById('".$sourcename."'), '".$ged."'); findtype='source'; return false;\">";
 	$out .= $Link;
@@ -2098,11 +2094,11 @@ function print_findsource_link($element_id, $sourcename="", $asString=false, $ge
 }
 
 function print_findnote_link($element_id, $notename="", $asString=false, $ged='') {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+	global $WT_IMAGES, $GEDCOM;
 
 	if (empty($ged)) $ged=$GEDCOM;
 	$text = i18n::translate('Find Shared Note');
-	if (isset($WT_IMAGES["note"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["note"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["note"]["button"])) $Link = "<img src=\"".$WT_IMAGES["note"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	$out = " <a href=\"javascript:;\" onclick=\"findnote(document.getElementById('".$element_id."'), document.getElementById('".$notename."'), '".$ged."'); findtype='note'; return false;\">";
 	$out .= $Link;
@@ -2112,11 +2108,11 @@ function print_findnote_link($element_id, $notename="", $asString=false, $ged=''
 }
 
 function print_findrepository_link($element_id, $ged='', $asString=false) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+	global $WT_IMAGES, $GEDCOM;
 
 	if (empty($ged)) $ged=$GEDCOM;
 	$text = i18n::translate('Find Repository');
-	if (isset($WT_IMAGES["repository"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["repository"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["repository"]["button"])) $Link = "<img src=\"".$WT_IMAGES["repository"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	$out = " <a href=\"javascript:;\" onclick=\"findRepository(document.getElementById('".$element_id."'), '".$ged."'); return false;\">";
 	$out .= $Link;
@@ -2126,11 +2122,11 @@ function print_findrepository_link($element_id, $ged='', $asString=false) {
 }
 
 function print_findmedia_link($element_id, $choose="", $ged='', $asString=false) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+	global $WT_IMAGES, $GEDCOM;
 
 	if (empty($ged)) $ged=$GEDCOM;
 	$text = i18n::translate('Find media');
-	if (isset($WT_IMAGES["media"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["media"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+	if (isset($WT_IMAGES["media"]["button"])) $Link = "<img src=\"".$WT_IMAGES["media"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 	else $Link = $text;
 	$out = " <a href=\"javascript:;\" onclick=\"findMedia(document.getElementById('".$element_id."'), '".$choose."', '".$ged."'); return false;\">";
 	$out .= $Link;
@@ -2140,11 +2136,11 @@ function print_findmedia_link($element_id, $choose="", $ged='', $asString=false)
 }
 
 function print_findfact_link($element_id, $ged='', $asString=false) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM;
+	global $WT_IMAGES, $GEDCOM;
 
 	$text = i18n::translate('Find fact tag');
 	if (empty($ged)) $ged=$GEDCOM;
-	if (isset($WT_IMAGES["find_facts"]["button"])) $Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["find_facts"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"top\" />";
+	if (isset($WT_IMAGES["find_facts"]["button"])) $Link = "<img src=\"".$WT_IMAGES["find_facts"]["button"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"top\" />";
 	else $Link = $text;
 	$out = " <a href=\"javascript:;\" onclick=\"findFact(document.getElementById('".$element_id."'), '".$ged."'); return false;\">";
 	$out .= $Link;
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index 3d3931e5a7..0f2d07db94 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -72,14 +72,9 @@ function expand_urls($text) {
  * @param boolean $noedit	Hide or show edit links
  */
 function print_fact(&$eventObj, $noedit=false) {
-	global $nonfacts;
-	global $WT_IMAGE_DIR, $WT_MENUS_AS_LISTS;
-	global $GEDCOM, $RESN_CODES;
-	global $WORD_WRAPPED_NOTES;
-	global $TEXT_DIRECTION;
-	global $HIDE_GEDCOM_ERRORS, $SHOW_FACT_ICONS, $SHOW_MEDIA_FILENAME;
-	global $n_chil, $n_gchi, $n_ggch;
-	global $SEARCH_SPIDER;
+	global $nonfacts, $WT_MENUS_AS_LISTS, $GEDCOM, $RESN_CODES, $WORD_WRAPPED_NOTES;
+	global $TEXT_DIRECTION, $HIDE_GEDCOM_ERRORS, $SHOW_FACT_ICONS, $SHOW_MEDIA_FILENAME;
+	global $n_chil, $n_gchi, $n_ggch, $SEARCH_SPIDER;
 
 	if (!$eventObj->canShow()) {
 		return false;
@@ -328,9 +323,9 @@ function print_fact(&$eventObj, $noedit=false) {
 		// -- print BURIal -> CEMEtery
 		$ct = preg_match("/2 CEME (.*)/", $factrec, $match);
 		if ($ct>0) {
-			if ($SHOW_FACT_ICONS && file_exists($WT_IMAGE_DIR."/facts/CEME.gif"))
+			if ($SHOW_FACT_ICONS && file_exists(WT_THEME_DIR."images/facts/CEME.gif"))
 				//echo $eventObj->Icon(), ' '; // echo incorrect fact icon !!!
-				echo "<img src=\"{$WT_IMAGE_DIR}/facts/CEME.gif\" alt=\"".translate_fact('CEME')."\" title=\"".translate_fact('CEME')."\" align=\"middle\" /> ";
+				echo "<img src=\"".WT_THEME_DIR."images/facts/CEME.gif\" alt=\"".translate_fact('CEME')."\" title=\"".translate_fact('CEME')."\" align=\"middle\" /> ";
 			echo "<b>", translate_fact('CEME'), ":</b> ", $match[1], "<br />\n";
 		}
 		//-- print address structure
@@ -402,9 +397,9 @@ function print_fact(&$eventObj, $noedit=false) {
 				$factref = $match[$i][1];
 				if (!in_array($factref, $special_facts)) {
 					$label = translate_fact($fact.':'.$factref, $label_person);
-					if ($SHOW_FACT_ICONS && file_exists($WT_IMAGE_DIR."/facts/".$factref.".gif"))
+					if ($SHOW_FACT_ICONS && file_exists(WT_THEME_DIR."images/facts/".$factref.".gif"))
 						//echo $eventObj->Icon(), ' '; // print incorrect fact icon !!!
-						echo "<img src=\"{$WT_IMAGE_DIR}/facts/", $factref, ".gif\" alt=\"{$label}\" title=\"{$label}\" align=\"middle\" /> ";
+						echo "<img src=\"".WT_THEME_DIR."images/facts/", $factref, ".gif\" alt=\"{$label}\" title=\"{$label}\" align=\"middle\" /> ";
 					else echo "<span class=\"label\">", $label, ": </span>";
 					echo htmlspecialchars($match[$i][2], ENT_COMPAT, 'UTF-8');
 					echo "<br />";
@@ -478,7 +473,8 @@ function print_repository_record($sid) {
  * @param boolean $return	whether to return the data or print the data
  */
 function print_fact_sources($factrec, $level, $return=false) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $EXPAND_SOURCES;
+	global $WT_IMAGES, $EXPAND_SOURCES;
+
 	$printDone = false;
 	$data = "";
 	$nlevel = $level+1;
@@ -510,7 +506,7 @@ function print_fact_sources($factrec, $level, $return=false) {
 			$elementID = $sid."-".floor(microtime()*1000000);
 			if ($EXPAND_SOURCES) $plusminus="minus"; else $plusminus="plus";
 			if ($lt>0) {
-				$data .= "<a href=\"javascript:;\" onclick=\"expand_layer('$elementID'); return false;\"><img id=\"{$elementID}_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES[$plusminus]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"";
+				$data .= "<a href=\"javascript:;\" onclick=\"expand_layer('$elementID'); return false;\"><img id=\"{$elementID}_img\" src=\"".$WT_IMAGES[$plusminus]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"";
 				if ($plusminus=="plus") $data .= i18n::translate('Show Details')."\" title=\"".i18n::translate('Show Details')."\" /></a> ";
 				else $data .= i18n::translate('Hide Details')."\" title=\"".i18n::translate('Hide Details')."\" /></a> ";
 			}
@@ -827,8 +823,7 @@ function print_address_structure($factrec, $level) {
 }
 
 function print_main_sources($factrec, $level, $pid, $linenum, $noedit=false) {
-	global $RESN_CODES;
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $RESN_CODES, $WT_IMAGES;
 
 	if (!canDisplayFact($pid, WT_GED_ID, $factrec)) {
 		return;
@@ -853,7 +848,7 @@ function print_main_sources($factrec, $level, $pid, $linenum, $noedit=false) {
 			echo "<td class=\"descriptionbox";
 			if ($level==2) echo " rela";
 			echo " $styleadd center width20\">";
-			if ($level==1) echo "<img class=\"icon\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["source"]["small"], "\" alt=\"\" /><br />";
+			if ($level==1) echo "<img class=\"icon\" src=\"", $WT_IMAGES["source"]["small"], "\" alt=\"\" /><br />";
 			$temp = preg_match("/^\d (\w*)/", $factrec, $factname);
 			$factlines = explode("\n", $factrec); // 1 BIRT Y\n2 SOUR ...
 			$factwords = explode(" ", $factlines[0]); // 1 BIRT Y
@@ -1080,10 +1075,8 @@ function getSourceStructure($srec) {
  * @param boolean $noedit	Whether or not to allow this fact to be edited
  */
 function print_main_notes($factrec, $level, $pid, $linenum, $noedit=false) {
-	global $GEDCOM, $RESN_CODES;
-	global $WT_IMAGE_DIR;
-	global $WT_IMAGES;
-	global $TEXT_DIRECTION;
+	global $GEDCOM, $RESN_CODES, $WT_IMAGES, $TEXT_DIRECTION;
+
 	$ged_id=get_id_from_gedcom($GEDCOM);
 	$styleadd="";
 	if (strpos($factrec, "WT_NEW")!==false) $styleadd="change_new";
@@ -1108,7 +1101,7 @@ function print_main_notes($factrec, $level, $pid, $linenum, $noedit=false) {
 		if ($level>=2) echo " rela";
 		echo " $styleadd center width20\">";
 		if ($level<2) {
-			echo "<img class=\"icon\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["notes"]["small"], "\" alt=\"\" />";
+			echo "<img class=\"icon\" src=\"", $WT_IMAGES["notes"]["small"], "\" alt=\"\" />";
 			if (strstr($factrec, "1 NOTE @" )) {
 				echo "<br />", translate_fact('SHARED_NOTE');
 			} else {
@@ -1420,9 +1413,7 @@ function print_main_media($pid, $level=1, $related=false, $noedit=false) {
  * @param string $pid	The record id this media item was attached to
  */
 function print_main_media_row($rtype, $rowm, $pid) {
-	global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
-	global $GEDCOM, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER;
-	global $SEARCH_SPIDER, $MEDIA_TYPES;
+	global $WT_IMAGES, $TEXT_DIRECTION, $GEDCOM, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER, $SEARCH_SPIDER, $MEDIA_TYPES;
 
 	if (!canDisplayRecord($rowm['m_gedfile'], $rowm['m_gedrec']) || !canDisplayFact($rowm['m_media'], $rowm['m_gedfile'], $rowm['mm_gedrec'])) {
 		return false;
@@ -1436,7 +1427,7 @@ function print_main_media_row($rtype, $rowm, $pid) {
 	$isExternal = isFileExternal($thumbnail);
 
 	$linenum = 0;
-	echo "\n\t\t<tr><td class=\"descriptionbox $styleadd center width20\"><img class=\"icon\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["media"]["small"], "\" alt=\"\" /><br />", translate_fact('OBJE');
+	echo "\n\t\t<tr><td class=\"descriptionbox $styleadd center width20\"><img class=\"icon\" src=\"", $WT_IMAGES["media"]["small"], "\" alt=\"\" /><br />", translate_fact('OBJE');
 	if ($rowm['mm_gid']==$pid && WT_USER_CAN_EDIT && (!FactEditRestricted($rowm['m_media'], $rowm['m_gedrec'])) && ($styleadd!="change_old")) {
 		$menu = new Menu(i18n::translate('Edit'), "#", "right", "down");
 		$menu->addOnclick("return window.open('addmedia.php?action=editmedia&pid={$rowm['m_media']}&linktoid={$rowm['mm_gid']}', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1');");
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index 9840b36e1a..1002f6343d 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -48,8 +48,7 @@ require_once WT_ROOT.'includes/cssparser.inc.php';
  * @param string $legend optional legend of the fieldset
  */
 function print_indi_table($datalist, $legend="", $option="") {
-	global $GEDCOM, $SHOW_LAST_CHANGE, $TEXT_DIRECTION;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $SEARCH_SPIDER, $MAX_ALIVE_AGE;
+	global $GEDCOM, $SHOW_LAST_CHANGE, $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER, $MAX_ALIVE_AGE;
 
 	$SHOW_EST_LIST_DATES=get_gedcom_setting(WT_GED_ID, 'SHOW_EST_LIST_DATES');
 
@@ -73,7 +72,7 @@ function print_indi_table($datalist, $legend="", $option="") {
 		$legend=translate_fact(substr($option, 0, 4))." @ ".$legend;
 	}
 	if ($legend == "") $legend = i18n::translate('Individuals');
-	$legend = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["indis"]["small"]."\" alt=\"\" align=\"middle\" /> ".$legend;
+	$legend = "<img src=\"".$WT_IMAGES["indis"]["small"]."\" alt=\"\" align=\"middle\" /> ".$legend;
 	echo "<fieldset><legend>", $legend, "</legend>";
 	$table_id = "ID".floor(microtime()*1000000); // sorttable requires a unique ID
 	echo '<div id="', $table_id, '-table" class="center">';
@@ -430,8 +429,7 @@ function print_indi_table($datalist, $legend="", $option="") {
  * @param string $legend optional legend of the fieldset
  */
 function print_fam_table($datalist, $legend="", $option="") {
-	global $GEDCOM, $SHOW_LAST_CHANGE, $TEXT_DIRECTION;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $SEARCH_SPIDER;
+	global $GEDCOM, $SHOW_LAST_CHANGE, $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER;
 
 	if ($option=="BIRT_PLAC" || $option=="DEAT_PLAC") return;
 	if (count($datalist)<1) return;
@@ -451,7 +449,7 @@ function print_fam_table($datalist, $legend="", $option="") {
 		$legend=translate_fact('MARR')." @ ".$legend;
 	}
 	if ($legend == "") $legend = i18n::translate('Families');
-	$legend = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["sfamily"]["small"]."\" alt=\"\" align=\"middle\" /> ".$legend;
+	$legend = "<img src=\"".$WT_IMAGES["sfamily"]["small"]."\" alt=\"\" align=\"middle\" /> ".$legend;
 	echo "<fieldset><legend>", $legend, "</legend>";
 	$table_id = "ID".floor(microtime()*1000000); // sorttable requires a unique ID
 	echo '<div id="', $table_id, '-table" class="center">';
@@ -782,8 +780,7 @@ function print_fam_table($datalist, $legend="", $option="") {
  * @param string $legend optional legend of the fieldset
  */
 function print_sour_table($datalist, $legend=null) {
-	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION;
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION, $WT_IMAGES;
 
 	if (count($datalist)<1) {
 		return;
@@ -791,7 +788,7 @@ function print_sour_table($datalist, $legend=null) {
 	require_once WT_ROOT.'js/sorttable.js.htm';
 	require_once WT_ROOT.'includes/classes/class_source.php';
 
-	echo '<fieldset><legend><img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES['source']['small'], '" align="middle" alt="" /> ';
+	echo '<fieldset><legend><img src="', $WT_IMAGES['source']['small'], '" align="middle" alt="" /> ';
 	if ($legend) {
 		echo $legend;
 	} else {
@@ -909,8 +906,7 @@ T2;
  * @param string $legend optional legend of the fieldset
  */
 function print_note_table($datalist, $legend=null) {
-	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION;
-	global $WT_IMAGE_DIR, $WT_IMAGES;
+	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION, $WT_IMAGES;
 
 	if (count($datalist)<1) {
 		return;
@@ -919,9 +915,9 @@ function print_note_table($datalist, $legend=null) {
 	require_once WT_ROOT.'includes/classes/class_note.php';
 
 	if (!empty($WT_IMAGES["menu_note"]["small"])) {
-		echo '<fieldset><legend><img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["menu_note"]["small"], '" align="middle" alt="" /> ';
+		echo '<fieldset><legend><img src="', $WT_IMAGES["menu_note"]["small"], '" align="middle" alt="" /> ';
 	} else {
-		echo '<fieldset><legend><img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES['notes']['small'], '" align="middle" alt="" /> ';
+		echo '<fieldset><legend><img src="', $WT_IMAGES['notes']['small'], '" align="middle" alt="" /> ';
 	}
 	if ($legend) {
 		echo $legend;
@@ -987,8 +983,7 @@ function print_note_table($datalist, $legend=null) {
  * @param string $legend optional legend of the fieldset
  */
 function print_repo_table($repos, $legend='') {
-	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $SEARCH_SPIDER;
+	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER;
 
 	if (!$repos) {
 		return;
@@ -996,7 +991,7 @@ function print_repo_table($repos, $legend='') {
 	require_once WT_ROOT.'js/sorttable.js.htm';
 	require_once WT_ROOT.'includes/classes/class_repository.php';
 
-	echo '<fieldset><legend><img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES['repository']['small'], '" align="middle" alt="" />';
+	echo '<fieldset><legend><img src="', $WT_IMAGES['repository']['small'], '" align="middle" alt="" />';
 	if ($legend) {
 		echo htmlspecialchars($legend);
 	} else {
@@ -1044,15 +1039,14 @@ function print_repo_table($repos, $legend='') {
  * @param string $legend optional legend of the fieldset
  */
 function print_media_table($datalist, $legend="") {
-	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $SHOW_MEDIA_FILENAME;
+	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION, $WT_IMAGES, $SHOW_MEDIA_FILENAME;
 
 	if (count($datalist)<1) return;
 	require_once WT_ROOT.'js/sorttable.js.htm';
 	require_once WT_ROOT.'includes/classes/class_media.php';
 
 	if ($legend == "") $legend = i18n::translate('Media');
-	$legend = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["media"]["small"]."\" alt=\"\" align=\"middle\" /> ".$legend;
+	$legend = "<img src=\"".$WT_IMAGES["media"]["small"]."\" alt=\"\" align=\"middle\" /> ".$legend;
 	echo "<fieldset><legend>", $legend, "</legend>";
 	$table_id = "ID".floor(microtime()*1000000); // sorttable requires a unique ID
 	//-- table header
diff --git a/includes/hitcount.php b/includes/hitcount.php
index 142a8ddc10..d9afcb0767 100644
--- a/includes/hitcount.php
+++ b/includes/hitcount.php
@@ -98,7 +98,7 @@ if ($page_parameter) {
 //replace the numbers with their images
 if (array_key_exists('0', $WT_IMAGES)) {
 	for ($i=0;$i<10;$i++) {
-		$hitCount = str_replace("$i","<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES[$i]["digit"]."\" alt=\"pgv_counter\" />","$hitCount");
+		$hitCount = str_replace("$i","<img src=\"".$WT_IMAGES[$i]["digit"]."\" alt=\"pgv_counter\" />","$hitCount");
 	}
 } else {
 	$hitCount="<span class=\"hit-counter\">{$hitCount}</span>";
diff --git a/includes/media_reorder.php b/includes/media_reorder.php
index 261b9210ba..c4d3342dd5 100644
--- a/includes/media_reorder.php
+++ b/includes/media_reorder.php
@@ -42,7 +42,7 @@ require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 
 	global $MULTI_MEDIA, $MEDIA_EXTERNAL;
 	global $MEDIATYPE;
-	global $WORD_WRAPPED_NOTES, $MEDIA_DIRECTORY, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+	global $WORD_WRAPPED_NOTES, $MEDIA_DIRECTORY, $WT_IMAGES, $TEXT_DIRECTION;
 	global $is_media, $cntm1, $cntm2, $cntm3, $cntm4, $t, $mgedrec;
 	global $edit, $tabno, $currtab;
 	global $ids, $pid, $related, $level, $gedrec, $media_data, $order, $order1, $order2, $j ;
diff --git a/index_edit.php b/index_edit.php
index cae46f5536..2bcf0da779 100644
--- a/index_edit.php
+++ b/index_edit.php
@@ -68,12 +68,12 @@ if (!isset($index)) $index=1;
 $block_id=safe_REQUEST($_REQUEST, 'block_id');
 
 // Define all the icons we're going to use
-$IconUarrow = "<img src=\"".$WT_IMAGE_DIR.'/'.$WT_IMAGES['uarrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
-$IconDarrow = "<img src=\"".$WT_IMAGE_DIR.'/'.$WT_IMAGES['darrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
-$IconRarrow = "<img src=\"".$WT_IMAGE_DIR.'/'.$WT_IMAGES['rarrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
-$IconLarrow = "<img src=\"".$WT_IMAGE_DIR.'/'.$WT_IMAGES['larrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
-$IconRDarrow = "<img src=\"".$WT_IMAGE_DIR.'/'.$WT_IMAGES['rdarrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
-$IconLDarrow = "<img src=\"".$WT_IMAGE_DIR.'/'.$WT_IMAGES['ldarrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
+$IconUarrow = "<img src=\"".$WT_IMAGES['uarrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
+$IconDarrow = "<img src=\"".$WT_IMAGES['darrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
+$IconRarrow = "<img src=\"".$WT_IMAGES['rarrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
+$IconLarrow = "<img src=\"".$WT_IMAGES['larrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
+$IconRDarrow = "<img src=\"".$WT_IMAGES['rdarrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
+$IconLDarrow = "<img src=\"".$WT_IMAGES['ldarrow']['other']."\" width=\"20\" height=\"20\" alt=\"\" />";
 
 $all_blocks=array();
 foreach (WT_Module::getActiveBlocks() as $name=>$block) {
diff --git a/individual.php b/individual.php
index 73996cdbf3..1c1e5e05d4 100644
--- a/individual.php
+++ b/individual.php
@@ -88,7 +88,6 @@ var pinned = false;
 
 jQuery(document).ready(function(){
 	// TODO: change images directory when the common images will be deleted.
-	// jQuery('#tabs').tabs({ spinner: '<img src=\"<?php echo $WT_IMAGE_DIR; ?>/loading.gif\" height=\"18\" border=\"0\" />' });
 	jQuery('#tabs').tabs({ spinner: '<img src=\"images/loading.gif\" height=\"18\" border=\"0\" alt=\"\" />' });
 	jQuery("#tabs").tabs({ cache: true });
 	var $tabs = jQuery('#tabs');
diff --git a/lifespan.php b/lifespan.php
index 178b64f5e3..8ebeb65c05 100644
--- a/lifespan.php
+++ b/lifespan.php
@@ -341,18 +341,18 @@ var oldMx = 0;
 		<table style="margin-left: 20px" dir="ltr" border="0" cellpadding="0">
 		<tr>
 			<td></td>
-			<td colspan="2" align="center"><a href="#" onclick="return false;" onmousedown="startScroll('down')" onmouseup="stopScroll()"><img src="<?php print $WT_IMAGE_DIR.'/'.$WT_IMAGES["lsuparrow"]["other"]; ?>" border="0" alt="" /></a></td>
+			<td colspan="2" align="center"><a href="#" onclick="return false;" onmousedown="startScroll('down')" onmouseup="stopScroll()"><img src="<?php print $WT_IMAGES["lsuparrow"]["other"]; ?>" border="0" alt="" /></a></td>
 			<td></td>
 		</tr>
 		<tr>
-			<td><a href="#" onclick="return false;" onmousedown="startScroll('right')" onmouseup="stopScroll()"><img src="<?php print $WT_IMAGE_DIR.'/'.$WT_IMAGES["lsltarrow"]["other"]; ?>" border="0" alt="" /></a></td>
-			<td align="center"><!-- <a href="#" onclick="return false;" onmousedown="startZoom('increase')"><img src="<?php print $WT_IMAGE_DIR.'/'.$WT_IMAGES["zoomin"]["other"]; ?>" border="0" alt="" /></a> --></td>
-			<td align="center"><!-- <a href="#" onclick="return false;" onmousedown="startZoom('decrease')"><img src="<?php print $WT_IMAGE_DIR.'/'.$WT_IMAGES["zoomout"]["other"]; ?>" border="0" alt="" /></a> --></td>
-			<td><a href="#" onclick="return false;" onmousedown="startScroll('left')" onmouseup="stopScroll()"><img src="<?php print $WT_IMAGE_DIR.'/'.$WT_IMAGES["lsrtarrow"]["other"]; ?>" border="0" alt="" /></a></td>
+			<td><a href="#" onclick="return false;" onmousedown="startScroll('right')" onmouseup="stopScroll()"><img src="<?php print $WT_IMAGES["lsltarrow"]["other"]; ?>" border="0" alt="" /></a></td>
+			<td align="center"><!-- <a href="#" onclick="return false;" onmousedown="startZoom('increase')"><img src="<?php print $WT_IMAGES["zoomin"]["other"]; ?>" border="0" alt="" /></a> --></td>
+			<td align="center"><!-- <a href="#" onclick="return false;" onmousedown="startZoom('decrease')"><img src="<?php print $WT_IMAGES["zoomout"]["other"]; ?>" border="0" alt="" /></a> --></td>
+			<td><a href="#" onclick="return false;" onmousedown="startScroll('left')" onmouseup="stopScroll()"><img src="<?php print $WT_IMAGES["lsrtarrow"]["other"]; ?>" border="0" alt="" /></a></td>
 		</tr>
 		<tr>
 		<td> </td>
-		<td colspan="2" align="center"><a href="#" onclick="return false;" onmousedown="startScroll('up')" onmouseup="stopScroll()"><img src="<?php print $WT_IMAGE_DIR.'/'.$WT_IMAGES["lsdnarrow"]["other"]; ?>" border="0" alt="" /></a></td>
+		<td colspan="2" align="center"><a href="#" onclick="return false;" onmousedown="startScroll('up')" onmouseup="stopScroll()"><img src="<?php print $WT_IMAGES["lsdnarrow"]["other"]; ?>" border="0" alt="" /></a></td>
 	<td> </td>
 	</tr>
 	</table>
diff --git a/manageservers.php b/manageservers.php
index ea754619c0..bfad46c96b 100644
--- a/manageservers.php
+++ b/manageservers.php
@@ -225,7 +225,7 @@ echo '<p class="center"><input TYPE="button" VALUE="', i18n::translate('Return t
 			foreach ($search_engines as $ip_address=>$ip_comment) {
 				echo '<tr><td>';
 				if (isset($WT_IMAGES["remove"]["other"])) {
-					echo '<input type="image" src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["remove"]["other"], '" alt="', i18n::translate('Delete'), '" name="deleteSearch" value="', $ip_address, '">';
+					echo '<input type="image" src="', $WT_IMAGES["remove"]["other"], '" alt="', i18n::translate('Delete'), '" name="deleteSearch" value="', $ip_address, '">';
 				} else {
 					echo '<button name="deleteSearch" value="', $ip_address, '" type="submit">', i18n::translate('Remove'), '</button>';
 				}
@@ -234,7 +234,7 @@ echo '<p class="center"><input TYPE="button" VALUE="', i18n::translate('Return t
 			}
 			echo '<tr><td valign="top"><input name="action" type="hidden" value="addSearch"/>';
 			if (isset($WT_IMAGES["add"]["other"])) {
-				echo '<input type="image" src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["add"]["other"], '" alt="', i18n::translate('Add'), '">';
+				echo '<input type="image" src="', $WT_IMAGES["add"]["other"], '" alt="', i18n::translate('Add'), '">';
 			} else {
 				echo '<input type="submit" value="', i18n::translate('Add'), '" />';
 			}
@@ -272,7 +272,7 @@ echo '<p class="center"><input TYPE="button" VALUE="', i18n::translate('Return t
 	foreach ($banned as $ip_address=>$ip_comment) {
 		echo '<tr><td>';
 		if (isset($WT_IMAGES["remove"]["other"])) {
-			echo '<input type="image" src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["remove"]["other"], '" alt="', i18n::translate('Delete'), '" name="deleteBanned" value="', $ip_address, '">';
+			echo '<input type="image" src="', $WT_IMAGES["remove"]["other"], '" alt="', i18n::translate('Delete'), '" name="deleteBanned" value="', $ip_address, '">';
 		} else {
 			echo '<button name="deleteBanned" value="', $ip_address, '" type="submit">', i18n::translate('Remove'), '</button>';
 		}
@@ -281,7 +281,7 @@ echo '<p class="center"><input TYPE="button" VALUE="', i18n::translate('Return t
 	}
 	echo '<tr><td valign="top"><input name="action" type="hidden" value="addBanned"/>';
 	if (isset($WT_IMAGES["add"]["other"])) {
-		echo '<input type="image" src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["add"]["other"], '" alt="', i18n::translate('Add'), '">';
+		echo '<input type="image" src="', $WT_IMAGES["add"]["other"], '" alt="', i18n::translate('Add'), '">';
 	} else {
 		echo '<input type="submit" value="', i18n::translate('Add'), '" />';
 	}
diff --git a/media.php b/media.php
index 619daa084b..6d11ee4024 100644
--- a/media.php
+++ b/media.php
@@ -861,7 +861,7 @@ if (check_media_structure()) {
 			if ($TEXT_DIRECTION=="rtl") $uplink .= getLRM();
 			$uplink .= "</a>\n";
 
-			$uplink2 = "<a href=\"".encode_url("media.php?directory={$pdir}&sortby={$sortby}&level=".($level-1).$thumbget)."\"><img class=\"icon\" src=\"".$WT_IMAGE_DIR."/";
+			$uplink2 = "<a href=\"".encode_url("media.php?directory={$pdir}&sortby={$sortby}&level=".($level-1).$thumbget)."\"><img class=\"icon\" src=\"";
 			$uplink2 .= $WT_IMAGES["larrow"]["other"];
 			$uplink2 .= "\" alt=\"\" /></a>\n";
 		}
@@ -1002,7 +1002,7 @@ if (check_media_structure()) {
 						print "<input type=\"hidden\" name=\"action\" value=\"\" />";
 						print "<input type=\"hidden\" name=\"showthumb\" value=\"{$showthumb}\" />";
 						print "<input type=\"hidden\" name=\"sortby\" value=\"{$sortby}\" />";
-						print "<input type=\"image\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["remove"]["other"]."\" alt=\"".i18n::translate('Delete')."\" onclick=\"this.form.action.value='deletedir';return confirm('".i18n::translate('Are you sure you want to delete this folder?')."');\" />";
+						print "<input type=\"image\" src=\"".$WT_IMAGES["remove"]["other"]."\" alt=\"".i18n::translate('Delete')."\" onclick=\"this.form.action.value='deletedir';return confirm('".i18n::translate('Are you sure you want to delete this folder?')."');\" />";
 						if ($USE_MEDIA_FIREWALL) {
 							print "<br /><input type=\"submit\" value=\"".i18n::translate('Move to standard')."\" onclick=\"this.form.level.value=(this.form.level.value*1)+1;this.form.action.value='movedirstandard';\" />";
 							print "<br /><input type=\"submit\" value=\"".i18n::translate('Move to protected')."\" onclick=\"this.form.level.value=(this.form.level.value*1)+1;this.form.action.value='movedirprotected';\" />";
diff --git a/medialist.php b/medialist.php
index 17f3c20877..51260e3d8c 100644
--- a/medialist.php
+++ b/medialist.php
@@ -424,10 +424,10 @@ if ($show == "yes") {
 
 	$currentPage = ((int) ($start / $max)) + 1;
 	$lastPage = (int) (($ct + $max - 1) / $max);
-	$IconRarrow = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["rarrow"]["other"]."\" width=\"20\" height=\"20\" border=\"0\" alt=\"\" />";
-	$IconLarrow = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["larrow"]["other"]."\" width=\"20\" height=\"20\" border=\"0\" alt=\"\" />";
-	$IconRDarrow = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["rdarrow"]["other"]."\" width=\"20\" height=\"20\" border=\"0\" alt=\"\" />";
-	$IconLDarrow = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["ldarrow"]["other"]."\" width=\"20\" height=\"20\" border=\"0\" alt=\"\" />";
+	$IconRarrow = "<img src=\"".$WT_IMAGES["rarrow"]["other"]."\" width=\"20\" height=\"20\" border=\"0\" alt=\"\" />";
+	$IconLarrow = "<img src=\"".$WT_IMAGES["larrow"]["other"]."\" width=\"20\" height=\"20\" border=\"0\" alt=\"\" />";
+	$IconRDarrow = "<img src=\"".$WT_IMAGES["rdarrow"]["other"]."\" width=\"20\" height=\"20\" border=\"0\" alt=\"\" />";
+	$IconLDarrow = "<img src=\"".$WT_IMAGES["ldarrow"]["other"]."\" width=\"20\" height=\"20\" border=\"0\" alt=\"\" />";
 
 	print"\n\t<table class=\"list_table\">\n";
 
diff --git a/module_admin.php b/module_admin.php
index b55824b11d..40149ed1cf 100644
--- a/module_admin.php
+++ b/module_admin.php
@@ -339,7 +339,7 @@ print_header(i18n::translate('Module administration'));
 							"SELECT status FROM `##module` WHERE module_name=?"
 						)->execute(array($module->getName()))->fetchOne();
 						echo '<tr><td>', two_state_checkbox('status-'.$module->getName(), $status=='enabled'), '</td><td>';
-						if ($module instanceof WT_Module_Config) echo '<a href="', $module->getConfigLink(), '"><img class="adminicon" src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["admin"]["small"], '" border="0" alt="', $module->getName(), '" /></a>'; ?></td>
+						if ($module instanceof WT_Module_Config) echo '<a href="', $module->getConfigLink(), '"><img class="adminicon" src="', $WT_IMAGES["admin"]["small"], '" border="0" alt="', $module->getName(), '" /></a>'; ?></td>
 						<td><?php echo $module->getTitle()?></td>
 						<td><?php echo $module->getDescription()?></td>
 						<td><?php if ($module instanceof WT_Module_Menu) echo i18n::translate('Yes'); else echo i18n::translate('No');?></td>
@@ -359,11 +359,11 @@ print_header(i18n::translate('Module administration'));
 		</form>
 		<div id="pager" class="pager">
 			<form>
-				<img src="<?php echo $WT_IMAGE_DIR; ?>/jquery/first.png" class="first"/>
-				<img src="<?php echo $WT_IMAGE_DIR; ?>/jquery/prev.png" class="prev"/>
+				<img src="<?php echo WT_THEME_DIR; ?>images/jquery/first.png" class="first"/>
+				<img src="<?php echo WT_THEME_DIR; ?>images/jquery/prev.png" class="prev"/>
 				<input type="text" class="pagedisplay"/>
-				<img src="<?php echo $WT_IMAGE_DIR; ?>/jquery/next.png" class="next"/>
-				<img src="<?php echo $WT_IMAGE_DIR; ?>/jquery/last.png" class="last"/>
+				<img src="<?php echo WT_THEME_DIR; ?>images/jquery/next.png" class="next"/>
+				<img src="<?php echo WT_THEME_DIR; ?>images/jquery/last.png" class="last"/>
 				<select class="pagesize">
 					<option value="10">10</option>
 					<option selected="selected"  value="15">15</option>
@@ -394,10 +394,10 @@ print_header(i18n::translate('Module administration'));
 					<tr class="sortme">
 						<td class="list_value"><?php echo $module->getTitle()?></td>
 						<td class="list_value"><input type="text" size="5" value="<?php echo $order; ?>" name="menuorder-<?php echo $module->getName() ?>" />
-							<img class="uarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["uarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move up')?>" />
-							<img class="udarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["udarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to top')?>" />
-							<img class="darrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["darrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move down')?>" />
-							<img class="ddarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["ddarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to bottom')?>" />
+							<img class="uarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["uarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move up')?>" />
+							<img class="udarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["udarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to top')?>" />
+							<img class="darrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["darrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move down')?>" />
+							<img class="ddarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["ddarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to bottom')?>" />
 						</td>
 						<td class="list_value_wrap">
 							 <table>
@@ -445,10 +445,10 @@ print_header(i18n::translate('Module administration'));
 					<tr class="sortme">
 						<td class="list_value"><?php echo $module->getTitle()?></td>
 						<td class="list_value"><input type="text" size="5" value="<?php echo $order; ?>" name="taborder-<?php echo $module->getName() ?>" />
-							<img class="uarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["uarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move up')?>" />
-							<img class="udarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["udarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to top')?>" />
-							<img class="darrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["darrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move down')?>" />
-							<img class="ddarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["ddarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to bottom')?>" />
+							<img class="uarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["uarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move up')?>" />
+							<img class="udarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["udarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to top')?>" />
+							<img class="darrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["darrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move down')?>" />
+							<img class="ddarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["ddarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to bottom')?>" />
 						</td>
 						<td class="list_value_wrap">
 						<table>
@@ -496,10 +496,10 @@ print_header(i18n::translate('Module administration'));
 						<tr class="sortme">
 							<td class="list_value"><?php echo $module->getTitle()?></td>
 							<td class="list_value"><input type="text" size="5" value="<?php echo $order; ?>" name="sidebarorder-<?php echo $module->getName() ?>" />
-								<img class="uarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["uarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move up')?>" />
-							<img class="udarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["udarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to top')?>" />
-							<img class="darrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["darrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move down')?>" />
-							<img class="ddarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES["ddarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to bottom')?>" />
+								<img class="uarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["uarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move up')?>" />
+							<img class="udarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["udarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to top')?>" />
+							<img class="darrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["darrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move down')?>" />
+							<img class="ddarrow" style="vertical-align:bottom;" src="<?php echo $WT_IMAGES["ddarrow"]["other"];?>" border="0" title="<?php echo i18n::translate('Move to bottom')?>" />
 							</td>
 							<td class="list_value_wrap">
 								<table>
diff --git a/modules/GEDFact_assistant/CENS_ctrl.php b/modules/GEDFact_assistant/CENS_ctrl.php
index 42717026b1..1dacf8df62 100644
--- a/modules/GEDFact_assistant/CENS_ctrl.php
+++ b/modules/GEDFact_assistant/CENS_ctrl.php
@@ -37,7 +37,7 @@ global $USE_THUMBS_MAIN, $mediacnt, $tabno;
 global $linkToID;
 global $SEARCH_SPIDER, $GOOGLEMAP_PH_CONTROLS;
 
-		global $WT_IMAGE_DIR, $WT_IMAGES, $SHOW_AGE_DIFF;
+		global $WT_IMAGES, $SHOW_AGE_DIFF;
 		global $GEDCOM, $ABBREVIATE_CHART_LABELS;
 		global $show_full; 
 		global $famid;
diff --git a/modules/GEDFact_assistant/MEDIA_ctrl.php b/modules/GEDFact_assistant/MEDIA_ctrl.php
index 890ae850f6..896494094a 100644
--- a/modules/GEDFact_assistant/MEDIA_ctrl.php
+++ b/modules/GEDFact_assistant/MEDIA_ctrl.php
@@ -38,7 +38,7 @@ global $USE_THUMBS_MAIN, $mediacnt, $tabno;
 global $linkToID;
 global $SEARCH_SPIDER, $GOOGLEMAP_PH_CONTROLS;
 
-		global $WT_IMAGE_DIR, $WT_IMAGES, $SHOW_AGE_DIFF;
+		global $WT_IMAGES, $SHOW_AGE_DIFF;
 		global $GEDCOM, $ABBREVIATE_CHART_LABELS;
 		global $show_full; 
 		global $famid, $censyear, $censdate;
diff --git a/modules/GEDFact_assistant/_CENS/census_3_search_add.php b/modules/GEDFact_assistant/_CENS/census_3_search_add.php
index b1c60cb315..6becd6a5ab 100644
--- a/modules/GEDFact_assistant/_CENS/census_3_search_add.php
+++ b/modules/GEDFact_assistant/_CENS/census_3_search_add.php
@@ -76,7 +76,7 @@ if (!defined('WT_WEBTREES')) {
 
 				<?php
 				//-- Add Family Members to Census  -------------------------------------------
-				global $WT_IMAGE_DIR, $WT_IMAGES, $WT_MENUS_AS_LISTS;
+				global $WT_IMAGES, $WT_MENUS_AS_LISTS;
 				global $spouselinks, $parentlinks, $DeathYr, $BirthYr;
 				global $TEXT_DIRECTION, $GEDCOM; 
 				// echo "CENS = " . $censyear;
@@ -91,8 +91,8 @@ if (!defined('WT_WEBTREES')) {
 								<?php
 								// Header text with "Head" button =================================================
 								if (isset($WT_IMAGES["head"]["button"])) {
-									$headImg  = "<img class=\"headimg vmiddle\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["head"]["button"]."\" />";
-									$headImg2 = "<img class=\"headimg2 vmiddle\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["head"]["button"]."\" alt=\"".i18n::translate('Click to choose person as Head of family.')."\" title=\"".i18n::translate('Click to choose person as Head of family.')."\" />";
+									$headImg  = "<img class=\"headimg vmiddle\" src=\"".$WT_IMAGES["head"]["button"]."\" />";
+									$headImg2 = "<img class=\"headimg2 vmiddle\" src=\"".$WT_IMAGES["head"]["button"]."\" alt=\"".i18n::translate('Click to choose person as Head of family.')."\" title=\"".i18n::translate('Click to choose person as Head of family.')."\" />";
 								} else {
 									$headImg  = "<img class=\"headimg vmiddle\" src=\"images/buttons/head.gif\" />";
 									$headImg2 = "<img class=\"headimg2 vmiddle\" src=\"images/buttons/head.gif\" alt=\"".i18n::translate('Click to choose person as Head of family.')."\" title=\"".i18n::translate('Click to choose person as Head of family.')."\" />";
@@ -1478,7 +1478,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 	global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $SCRIPT_NAME, $GEDCOM;
 	global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES;
 	global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
+	global $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
 	global $chart_style, $box_width, $generations, $show_spouse, $show_full;
 	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
 	global $SEARCH_SPIDER;
diff --git a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 17eea80213..cc3348ed40 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -181,7 +181,7 @@ if ($action == "choose" && $paramok) {
 	echo '</td><td style=" padding-bottom:2px; vertical-align:middle">';
 		echo '&nbsp;';
 		if (isset($WT_IMAGES["add"]["other"])) { 
-			echo '<a href="#"><img style="border-style:none;" src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["add"]["other"], '" alt="', i18n::translate('Add'), ' "title="', i18n::translate('Add'), '" align="middle" name="addLink" value="" onClick="javascript:blankwin(); return false;" />';
+			echo '<a href="#"><img style="border-style:none;" src="', $WT_IMAGES["add"]["other"], '" alt="', i18n::translate('Add'), ' "title="', i18n::translate('Add'), '" align="middle" name="addLink" value="" onClick="javascript:blankwin(); return false;" />';
 			} else {
 			echo '<button name="addLink" value="" type="button" onClick="javascript:blankwin(); return false;">', i18n::translate('Add'), '</button>';
 		}
diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
index 4054c6ce17..449d77e033 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
@@ -77,7 +77,7 @@ if (!defined('WT_WEBTREES')) {
 
 	<?php
 	//-- Add Family Members to Census  -------------------------------------------
-	global $WT_IMAGE_DIR, $WT_IMAGES, $WT_MENUS_AS_LISTS;
+	global $WT_IMAGES, $WT_MENUS_AS_LISTS;
 	global $spouselinks, $parentlinks, $DeathYr, $BirthYr;
 	global $TEXT_DIRECTION, $GEDCOM, $censyear, $censdate; 
 	// echo "CENS = " . $censyear;
@@ -90,8 +90,8 @@ if (!defined('WT_WEBTREES')) {
 				<?php
 				// Header text with "Head" button =================================================
 				if (isset($WT_IMAGES["head"]["button"])) {
-					$headImg  = "<img class=\"headimg vmiddle\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["head"]["button"]."\" />";
-					$headImg2 = "<img class=\"headimg2 vmiddle\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["head"]["button"]."\" alt=\"".i18n::translate('Click to choose person as Head of family.')."\" title=\"".i18n::translate('Click to choose person as Head of family.')."\" />";
+					$headImg  = "<img class=\"headimg vmiddle\" src=\"".$WT_IMAGES["head"]["button"]."\" />";
+					$headImg2 = "<img class=\"headimg2 vmiddle\" src=\"".$WT_IMAGES["head"]["button"]."\" alt=\"".i18n::translate('Click to choose person as Head of family.')."\" title=\"".i18n::translate('Click to choose person as Head of family.')."\" />";
 				} else {
 					$headImg  = "<img class=\"headimg vmiddle\" src=\"images/buttons/head.gif\" />";
 					$headImg2 = "<img class=\"headimg2 vmiddle\" src=\"images/buttons/head.gif\" alt=\"".i18n::translate('Click to choose person as Head of family.')."\" title=\"".i18n::translate('Click to choose person as Head of family.')."\" />";
@@ -1035,7 +1035,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 	global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $GEDCOM;
 	global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES;
 	global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
-	global $WT_IMAGE_DIR, $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
+	global $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
 	global $chart_style, $box_width, $generations, $show_spouse, $show_full;
 	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
 	global $SEARCH_SPIDER;
diff --git a/modules/GEDFact_assistant/_MEDIA/media_5_input.php b/modules/GEDFact_assistant/_MEDIA/media_5_input.php
index b3745e402f..423b40aa7e 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_5_input.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_5_input.php
@@ -63,7 +63,7 @@
 	var ifamily			= "<?php echo i18n::translate('Open Family Navigator');		?>";
 	var remove			= "<?php echo i18n::translate('Remove');			?>";
 	var linkExists		= "<?php echo i18n::translate('This link already exists');		?>";
-	var imageDir		= "<?php echo $WT_IMAGE_DIR;				?>";
+	var imageDir		= "<?php echo WT_THEME_DIR.'images/';				?>";
 </script>
 
 <?php
diff --git a/modules/GEDFact_assistant/_MEDIA/media_query_1a.php b/modules/GEDFact_assistant/_MEDIA/media_query_1a.php
index b1011c77c8..dc1e22574e 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_query_1a.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_query_1a.php
@@ -87,11 +87,11 @@ if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
 
 		if ($record->getType()=='INDI') {
 			?>
-			<td align="center"><a href="#"><img style="border-style:none; margin-top:5px;" src="<?php echo $WT_IMAGE_DIR;?>/buttons/family.gif" alt="<?php echo i18n::translate('Open Family Navigator'); ?>" title="<?php echo i18n::translate('Open Family Navigator'); ?>" name="family_'<?php echo $link; ?>'" onclick="javascript:openFamNav('<?php echo $link; ?>');" /></a></td>
+			<td align="center"><a href="#"><img style="border-style:none; margin-top:5px;" src="<?php echo $WT_IMAGES['family']['button']; ?>" alt="<?php echo i18n::translate('Open Family Navigator'); ?>" title="<?php echo i18n::translate('Open Family Navigator'); ?>" name="family_'<?php echo $link; ?>'" onclick="javascript:openFamNav('<?php echo $link; ?>');" /></a></td>
 			<?php
 		} elseif ($record->getType()=='FAM') {
 			?>
-			<td align="center"><a href="#"><img style="border-style:none; margin-top:5px;" src="<?php echo $WT_IMAGE_DIR;?>/buttons/family.gif" alt="<?php echo i18n::translate('Open Family Navigator'); ?>" title="<?php echo i18n::translate('Open Family Navigator'); ?>" name="family_'<?php echo $link; ?>'" onclick="javascript:openFamNav('<?php echo $head; ?>');" /></a></td>
+			<td align="center"><a href="#"><img style="border-style:none; margin-top:5px;" src="<?php echo $WT_IMAGES['family']['button']; ?>" alt="<?php echo i18n::translate('Open Family Navigator'); ?>" title="<?php echo i18n::translate('Open Family Navigator'); ?>" name="family_'<?php echo $link; ?>'" onclick="javascript:openFamNav('<?php echo $head; ?>');" /></a></td>
 			<?php
 		} else { 
 			echo '<td></td>';
diff --git a/modules/address_label_report/module.php b/modules/address_label_report/module.php
index 4a543f6766..3dfacbae5a 100644
--- a/modules/address_label_report/module.php
+++ b/modules/address_label_report/module.php
@@ -51,13 +51,13 @@ class address_label_report_WT_Module extends WT_Module implements WT_Module_Repo
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['place']['small']);
+		$menu->addIcon($WT_IMAGES['place']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/address_report/module.php b/modules/address_report/module.php
index 40bf2ddc73..ab786f2a69 100644
--- a/modules/address_report/module.php
+++ b/modules/address_report/module.php
@@ -51,13 +51,13 @@ class address_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['place']['small']);
+		$menu->addIcon($WT_IMAGES['place']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/ahnentafel_report/module.php b/modules/ahnentafel_report/module.php
index 041d5acc30..42ab439877 100644
--- a/modules/ahnentafel_report/module.php
+++ b/modules/ahnentafel_report/module.php
@@ -51,7 +51,7 @@ class ahnentafel_report_WT_Module extends WT_Module implements WT_Module_Report
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $controller, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $controller, $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -65,7 +65,7 @@ class ahnentafel_report_WT_Module extends WT_Module implements WT_Module_Report
 		
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['ancestry']['small']);
+		$menu->addIcon($WT_IMAGES['ancestry']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/bdm_report/module.php b/modules/bdm_report/module.php
index 6340dc65ff..5aef86aca5 100644
--- a/modules/bdm_report/module.php
+++ b/modules/bdm_report/module.php
@@ -51,13 +51,13 @@ class bdm_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['place']['small']);
+		$menu->addIcon($WT_IMAGES['place']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/birth_report/module.php b/modules/birth_report/module.php
index d669489856..d4cf0a9439 100644
--- a/modules/birth_report/module.php
+++ b/modules/birth_report/module.php
@@ -51,13 +51,13 @@ class birth_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['place']['small']);
+		$menu->addIcon($WT_IMAGES['place']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/cemetery_report/module.php b/modules/cemetery_report/module.php
index 95e0a9f555..d7a9362f14 100644
--- a/modules/cemetery_report/module.php
+++ b/modules/cemetery_report/module.php
@@ -51,13 +51,13 @@ class cemetery_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['place']['small']);
+		$menu->addIcon($WT_IMAGES['place']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/change_report/module.php b/modules/change_report/module.php
index acfa41b52b..7e1803b34f 100644
--- a/modules/change_report/module.php
+++ b/modules/change_report/module.php
@@ -51,13 +51,13 @@ class change_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['place']['small']);
+		$menu->addIcon($WT_IMAGES['place']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/charts/module.php b/modules/charts/module.php
index 42f01d0269..e90e13207f 100644
--- a/modules/charts/module.php
+++ b/modules/charts/module.php
@@ -47,7 +47,7 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $WT_IMAGE_DIR, $WT_IMAGES, $PEDIGREE_ROOT_ID, $PEDIGREE_FULL_DETAILS, $show_full, $bwidth, $bheight, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $PEDIGREE_ROOT_ID, $PEDIGREE_FULL_DETAILS, $show_full, $bwidth, $bheight, $THEME_DIR;
 
 		$details=get_block_setting($block_id, 'details', false);
 		$type   =get_block_setting($block_id, 'type', 'treenav');
@@ -85,7 +85,7 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block {
 		$title='';
 		if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) {
 			$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=700,height=400,scrollbars=1,resizable=1'); return false;\">";
-			$title .= "<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+			$title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 		}
 		if ($person) {
 			switch($type) {
diff --git a/modules/clippings/index.php b/modules/clippings/index.php
index f66a2a4af8..08f9c3132b 100644
--- a/modules/clippings/index.php
+++ b/modules/clippings/index.php
@@ -32,8 +32,7 @@
 

 require_once WT_ROOT.'modules/clippings/clippings_ctrl.php';

 

-global $ENABLE_AUTOCOMPLETE, $cart, $MAX_PEDIGREE_GENERATIONS, $TEXT_DIRECTION, $GEDCOM;

-global $WT_IMAGE_DIR, $WT_IMAGES;

+global $ENABLE_AUTOCOMPLETE, $cart, $MAX_PEDIGREE_GENERATIONS, $TEXT_DIRECTION, $GEDCOM, $WT_IMAGES;

 

 $controller = new ClippingsController();

 $controller->init();

@@ -307,7 +306,7 @@ if ($ct==0) {
 			if ($tag=='OBJE') $icon = "media";

 			?>

 			<tr><td class="list_value">

-				<?php if (!empty($icon)) { ?><img src="<?php echo $WT_IMAGE_DIR, "/", $WT_IMAGES[$icon]["small"];?>" border="0" alt="<?php echo $tag;?>" title="<?php echo $tag;?>" /><?php } ?>

+				<?php if (!empty($icon)) { ?><img src="<?php echo $WT_IMAGES[$icon]["small"];?>" border="0" alt="<?php echo $tag;?>" title="<?php echo $tag;?>" /><?php } ?>

 			</td>

 			<td class="list_value ltr"><?php echo $clipping['id']?></td>

 			<td class="list_value">

@@ -316,7 +315,7 @@ if ($ct==0) {
 			if ($record) echo '<a href="', encode_url($record->getLinkUrl()), '">', PrintReady($record->getListName()), '</a>';

 			?>

 			</td>

-			<td class="list_value center vmiddle"><a href="module.php?mod=clippings&amp;mod_action=index&amp;action=remove&amp;item=<?php echo $i;?>"><img src="<?php echo $WT_IMAGE_DIR, "/", $WT_IMAGES["remove"]["other"];?>" border="0" alt="<?php echo i18n::translate('Remove')?>" title="<?php echo i18n::translate('Remove');?>" /></a></td>

+			<td class="list_value center vmiddle"><a href="module.php?mod=clippings&amp;mod_action=index&amp;action=remove&amp;item=<?php echo $i;?>"><img src="<?php echo $WT_IMAGES["remove"]["other"];?>" border="0" alt="<?php echo i18n::translate('Remove')?>" title="<?php echo i18n::translate('Remove');?>" /></a></td>

 		</tr>

 		<?php

 		}

diff --git a/modules/clippings/module.php b/modules/clippings/module.php
index f2f8f3d95d..ddb95a2314 100644
--- a/modules/clippings/module.php
+++ b/modules/clippings/module.php
@@ -67,7 +67,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 	
 	// Implement WT_Module_Menu
 	public function getMenu() { 
-		global $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SEARCH_SPIDER, $controller;
+		global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM, $SEARCH_SPIDER, $controller;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 		if ($SEARCH_SPIDER) {
@@ -76,37 +76,37 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 		//-- main clippings menu item
 		$menu = new Menu($this->getTitle(), encode_url('module.php?mod=clippings&mod_action=index&amp;ged='.$GEDCOM), "down");
 		if (!empty($WT_IMAGES["clippings"]["large"])) {
-			$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["clippings"]["large"]);
+			$menu->addIcon($WT_IMAGES["clippings"]["large"]);
 		}
 		$menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_clippings");
 		if (isset($controller->indi) && $controller->indi->canDisplayDetails()) {
 			$submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->pid}&type=indi"));
-			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["clippings"]["small"]);
+			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
 			$menu->addSubmenu($submenu);
 		} else if (isset($controller->family) && $controller->family->canDisplayDetails()) {
 			$submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->famid}&type=fam"));
-			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["clippings"]["small"]);
+			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
 			$menu->addSubmenu($submenu);
 		} else if (isset($controller->mediaobject) && $controller->mediaobject->canDisplayDetails()) {
 			$submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->mid}&type=obje"));
-			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["clippings"]["small"]);
+			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
 			$menu->addSubmenu($submenu);
 		} else if (isset($controller->source) && $controller->source->canDisplayDetails()) {
 			$submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->sid}&type=sour"));
-			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["clippings"]["small"]);
+			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
 			$menu->addSubmenu($submenu);
 		} else if (isset($controller->note) && $controller->note->canDisplayDetails()) {
 			$submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->nid}&type=note"));
-			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["clippings"]["small"]);
+			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
 			$menu->addSubmenu($submenu);
 		} else if (isset($controller->repository) && $controller->repository->canDisplayDetails()) {
 			$submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->rid}&type=repo"));
-			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["clippings"]["small"]);
+			if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]);
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
 			$menu->addSubmenu($submenu);
 		}
@@ -125,8 +125,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 
 	// Impelement WT_Module_Sidebar
 	public function getSidebarContent() {
-		global $WT_IMAGE_DIR, $WT_IMAGES;
-		global $cart, $GEDCOM;
+		global $WT_IMAGES, $cart, $GEDCOM;
 
 		$out = '';
 
@@ -148,7 +147,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 				$root = GedcomRecord::getInstance($this->controller->pid);
 				if ($root && $root->canDisplayDetails()) 
 					$out .= '<a href="sidebar.php?sb_action=clippings&amp;add='.$root->getXref().'" class="add_cart">
-					<img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['clippings']['small'].'" width="20" /> '.i18n::translate('Add %s to cart', $root->getListName()).'</a>';
+					<img src="'.$WT_IMAGES['clippings']['small'].'" width="20" /> '.i18n::translate('Add %s to cart', $root->getListName()).'</a>';
 			}
 			else if ($this->controller->famid && !id_in_cart($this->controller->pid)) {
 				$fam = Family::getInstance($this->controller->famid);
@@ -292,8 +291,8 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 	}
 
 	public function getCartList() {
-		global $WT_IMAGE_DIR, $WT_IMAGES;
-		global $cart, $GEDCOM;
+		global $WT_IMAGES, $cart, $GEDCOM;
+
 		$out ='<ul>';
 		$ct = count($cart);
 		if ($ct==0) $out .= '<br /><br />'.i18n::translate('Your Clippings Cart is empty.').'<br /><br />';
@@ -314,7 +313,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 					if (!empty($icon)) {
 						$out .= '<li>';
 						if (!empty($icon)) {
-							$out .= '<img src="'.$WT_IMAGE_DIR."/".$WT_IMAGES[$icon]["small"].'" border="0" alt="'.$tag.'" title="'.$tag.'" width="20" />';
+							$out .= '<img src="'.$WT_IMAGES[$icon]["small"].'" border="0" alt="'.$tag.'" title="'.$tag.'" width="20" />';
 						}
 						$record=GedcomRecord::getInstance($clipping['id']);
 						if ($record) {
@@ -328,7 +327,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 							$out .= '</a>';
 						}
 						$out .= '<a	class="remove_cart" href="sidebar.php?sb_action=clippings&amp;remove='.$i.'">
-						<img src="'. $WT_IMAGE_DIR. "/". $WT_IMAGES["remove"]["other"].'" border="0" alt="'.i18n::translate('Remove').'" title="'.i18n::translate('Remove').'" /></a>';
+						<img src="'. $WT_IMAGES["remove"]["other"].'" border="0" alt="'.i18n::translate('Remove').'" title="'.i18n::translate('Remove').'" /></a>';
 						$out .='</li>';
 					}
 				}
diff --git a/modules/death_report/module.php b/modules/death_report/module.php
index 385f630b68..b0cffd797c 100644
--- a/modules/death_report/module.php
+++ b/modules/death_report/module.php
@@ -51,13 +51,13 @@ class death_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['place']['small']);
+		$menu->addIcon($WT_IMAGES['place']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/descendancy/module.php b/modules/descendancy/module.php
index 90d04ef5d2..bd5f68b4e1 100644
--- a/modules/descendancy/module.php
+++ b/modules/descendancy/module.php
@@ -71,7 +71,7 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 
 	// Implement WT_Module_Sidebar
 	public function getSidebarContent() {
-		global $WT_IMAGE_DIR, $WT_IMAGES;
+		global $WT_IMAGES;
 
 		$out = '<script type="text/javascript">
 		<!--
@@ -98,18 +98,18 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				if (!dloadedNames[pid]) {
 					jQuery("#sb_desc_"+pid+" div").load(this.href);
 					jQuery("#sb_desc_"+pid+" div").show();
-					jQuery("#sb_desc_"+pid+" .plusminus").attr("src", "'.$WT_IMAGE_DIR."/".$WT_IMAGES['minus']['other'].'");
+					jQuery("#sb_desc_"+pid+" .plusminus").attr("src", "'.$WT_IMAGES['minus']['other'].'");
 					dloadedNames[pid]=2;
 				}
 				else if (dloadedNames[pid]==1) {
 					dloadedNames[pid]=2;
 					jQuery("#sb_desc_"+pid+" div").show();
-					jQuery("#sb_desc_"+pid+" .plusminus").attr("src", "'.$WT_IMAGE_DIR."/".$WT_IMAGES['minus']['other'].'");
+					jQuery("#sb_desc_"+pid+" .plusminus").attr("src", "'.$WT_IMAGES['minus']['other'].'");
 				}
 				else {
 					dloadedNames[pid]=1;
 					jQuery("#sb_desc_"+pid+" div").hide();
-					jQuery("#sb_desc_"+pid+" .plusminus").attr("src", "'.$WT_IMAGE_DIR."/".$WT_IMAGES['plus']['other'].'");
+					jQuery("#sb_desc_"+pid+" .plusminus").attr("src", "'.$WT_IMAGES['plus']['other'].'");
 				}
 				return false;
 			});
@@ -141,17 +141,18 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	}
 	
 	public function getPersonLi(&$person, $generations=0) {
-		global $WT_IMAGE_DIR, $WT_IMAGES;
+		global $WT_IMAGES;
+
 		$out = '';
 		$out .= '<li id="sb_desc_'.$person->getXref().'" class="sb_desc_indi_li"><a href="sidebar.php?sb_action=descendancy&amp;pid='.$person->getXref().'" title="'.$person->getXref().'" class="sb_desc_indi">';
-		if ($generations>0) $out .= '<img src="'.$WT_IMAGE_DIR."/".$WT_IMAGES['minus']['other'].'" border="0" class="plusminus" />';
-		else $out .= '<img src="'.$WT_IMAGE_DIR."/".$WT_IMAGES['plus']['other'].'" border="0" class="plusminus" />';
+		if ($generations>0) $out .= '<img src="'.$WT_IMAGES['minus']['other'].'" border="0" class="plusminus" />';
+		else $out .= '<img src="'.$WT_IMAGES['plus']['other'].'" border="0" class="plusminus" />';
 		$out .= $person->getSexImage().' '.$person->getListName().' ';
 		if ($person->canDisplayDetails()) {
 			$bd = $person->getBirthDeathYears(false,'');
 			if (!empty($bd)) $out .= PrintReady(' ('.$bd.')');
 		}
-		$out .= '</a> <a href="'.encode_url($person->getLinkUrl()).'"><img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['indi']['button'].'" border="0" alt="indi" /></a>';
+		$out .= '</a> <a href="'.encode_url($person->getLinkUrl()).'"><img src="'.$WT_IMAGES['indi']['button'].'" border="0" alt="indi" /></a>';
 		if ($generations>0) {
 			$out .= '<div class="desc_tree_div_visible">';
 			$out .= $this->loadSpouses($person->getXref());
@@ -165,18 +166,19 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	}
 	
 	public function getFamilyLi(&$family, &$person, $generations=0) {
-		global $WT_IMAGE_DIR, $WT_IMAGES;
+		global $WT_IMAGES;
+
 		$out = '';
 		$out .= '<li id="sb_desc_'.$family->getXref().'" class="sb_desc_indi_li"><a href="sidebar.php?sb_action=descendancy&amp;famid='.$family->getXref().'" title="'.$family->getXref().'" class="sb_desc_indi">';
-		$out .= '<img src="'.$WT_IMAGE_DIR."/".$WT_IMAGES['minus']['other'].'" border="0" class="plusminus" />';
+		$out .= '<img src="'.$WT_IMAGES['minus']['other'].'" border="0" class="plusminus" />';
 		$out .= $person->getSexImage().$person->getListName();
 		
 		$marryear = $family->getMarriageYear();
 		if (!empty($marryear)) {
 			$out .= ' ('.translate_fact('MARR').' '.$marryear.')';
 		}
-		$out .= '</a> <a href="'.encode_url($person->getLinkUrl()).'"><img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['indi']['button'].'" border="0" alt="indi" /></a>';
-		$out .= '<a href="'.encode_url($family->getLinkUrl()).'"><img src="'.$WT_IMAGE_DIR.'/'.$WT_IMAGES['family']['button'].'" border="0" alt="family" /></a>';
+		$out .= '</a> <a href="'.encode_url($person->getLinkUrl()).'"><img src="'.$WT_IMAGES['indi']['button'].'" border="0" alt="indi" /></a>';
+		$out .= '<a href="'.encode_url($family->getLinkUrl()).'"><img src="'.$WT_IMAGES['family']['button'].'" border="0" alt="family" /></a>';
 		$out .= '<div class="desc_tree_div_visible">';
 		$out .= $this->loadChildren($family->getXref(), $generations);
 		$out .= '</div><script type="text/javascript">dloadedNames["'.$family->getXref().'"]=2;</script>';
@@ -185,7 +187,8 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	}
 
 	public function search($query) {
-		global $WT_IMAGES, $WT_IMAGE_DIR;
+		global $WT_IMAGES;
+
 		if (strlen($query)<2) return '';
 		$sql=
 		"SELECT ? AS type, i_id AS xref, i_file AS ged_id, i_gedcom AS gedrec, i_isdead, i_sex".
diff --git a/modules/descendancy_report/module.php b/modules/descendancy_report/module.php
index b38f44968b..007c73a292 100644
--- a/modules/descendancy_report/module.php
+++ b/modules/descendancy_report/module.php
@@ -51,7 +51,7 @@ class descendancy_report_WT_Module extends WT_Module implements WT_Module_Report
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $controller, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $controller, $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -65,7 +65,7 @@ class descendancy_report_WT_Module extends WT_Module implements WT_Module_Report
 		
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['descendant']['small']);
+		$menu->addIcon($WT_IMAGES['descendant']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/families/module.php b/modules/families/module.php
index b2dd1d0b56..d71c2a845a 100644
--- a/modules/families/module.php
+++ b/modules/families/module.php
@@ -70,8 +70,7 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 
 	// Implement WT_Module_Sidebar
 	public function getSidebarContent() {
-		global $SHOW_MARRIED_NAMES;
-		global $WT_IMAGE_DIR, $WT_IMAGES;
+		global $SHOW_MARRIED_NAMES, $WT_IMAGES;
 
 		// Fetch a list of the initial letters of all surnames in the database
 		$initials=get_indilist_salpha($SHOW_MARRIED_NAMES, false, WT_GED_ID);
@@ -110,7 +109,7 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 					  success: function(html){
 					    jQuery("#sb_fam_"+surname+" div").html(html);
 					    jQuery("#sb_fam_"+surname+" div").show();
-					    jQuery("#sb_fam_"+surname).css("list-style-image", "url('.$WT_IMAGE_DIR."/".$WT_IMAGES['minus']['other'].')");
+					    jQuery("#sb_fam_"+surname).css("list-style-image", "url('.$WT_IMAGES['minus']['other'].')");
 					    famloadedNames[surname]=2;
 					  }
 					});
@@ -118,12 +117,12 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				else if (famloadedNames[surname]==1) {
 					famloadedNames[surname]=2;
 					jQuery("#sb_fam_"+surname+" div").show();
-					jQuery("#sb_fam_"+surname).css("list-style-image", "url('.$WT_IMAGE_DIR."/".$WT_IMAGES['minus']['other'].')");
+					jQuery("#sb_fam_"+surname).css("list-style-image", "url('.$WT_IMAGES['minus']['other'].')");
 				}
 				else {
 					famloadedNames[surname]=1;
 					jQuery("#sb_fam_"+surname+" div").hide();
-					jQuery("#sb_fam_"+surname).css("list-style-image", "url('.$WT_IMAGE_DIR."/".$WT_IMAGES['plus']['other'].')");
+					jQuery("#sb_fam_"+surname).css("list-style-image", "url('.$WT_IMAGES['plus']['other'].')");
 				}
 				return false;
 			});
diff --git a/modules/family_group_report/module.php b/modules/family_group_report/module.php
index cde302eafb..80a3c60e6e 100644
--- a/modules/family_group_report/module.php
+++ b/modules/family_group_report/module.php
@@ -51,7 +51,7 @@ class family_group_report_WT_Module extends WT_Module implements WT_Module_Repor
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $controller, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $controller, $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -63,7 +63,7 @@ class family_group_report_WT_Module extends WT_Module implements WT_Module_Repor
 		
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['sfamily']['small']);
+		$menu->addIcon($WT_IMAGES['sfamily']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/family_nav/module.php b/modules/family_nav/module.php
index b784ef085e..968c27a43d 100644
--- a/modules/family_nav/module.php
+++ b/modules/family_nav/module.php
@@ -59,7 +59,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	

 	// Implement WT_Module_Sidebar

 	public function getSidebarContent() {

-		global $WT_IMAGE_DIR, $WT_IMAGES;

+		global $WT_IMAGES;

 

 		$out = '<div id="sb_family_nav_content">';

 

@@ -125,9 +125,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		

 	 // Start Family Nav Table ----------------------------

 		echo "<table class=\"nav_content\" cellpadding=\"0\">"; 

-		global $WT_IMAGE_DIR, $WT_IMAGES, $WT_MENUS_AS_LISTS;

-		global $spouselinks, $parentlinks, $DeathYr, $BirthYr;

-		global $TEXT_DIRECTION;

+		global $WT_IMAGES, $WT_MENUS_AS_LISTS, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION;

 

 		$personcount=0;

 		$families = $this->controller->indi->getChildFamilies();

@@ -579,7 +577,7 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") {
 	global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $SCRIPT_NAME, $GEDCOM;

 	global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES;

 	global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;

-	global $WT_IMAGE_DIR, $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;

+	global $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;

 	global $chart_style, $box_width, $generations, $show_spouse, $show_full;

 	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;

 	global $SEARCH_SPIDER;

diff --git a/modules/faq/module.php b/modules/faq/module.php
index 0b03e79d1a..9097bb35e6 100644
--- a/modules/faq/module.php
+++ b/modules/faq/module.php
@@ -362,7 +362,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 	}
 
 	private function config() {
-		global $WT_IMAGES, $WT_IMAGE_DIR;
+		global $WT_IMAGES;
 
 		print_header($this->getTitle());
 
@@ -412,14 +412,14 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 				if ($faq->block_order==$min_block_order) {
 					echo '&nbsp;';
 				} else {
-					echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=moveup&amp;block_id=', $faq->block_id, '"><img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["uarrow"]["other"], '" border="0" alt="" /></a>';
+					echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=moveup&amp;block_id=', $faq->block_id, '"><img src="', $WT_IMAGES["uarrow"]["other"], '" border="0" alt="" /></a>';
 					echo help_link('moveup_faq_item', $this->getName());
 				}
 				echo '</td><td class="optionbox center">';
 				if ($faq->block_order==$max_block_order) {
 					echo '&nbsp;';
 				} else {
-					echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=movedown&amp;block_id=', $faq->block_id, '"><img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["darrow"]["other"], '" border="0" alt="" /></a>';
+					echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=movedown&amp;block_id=', $faq->block_id, '"><img src="', $WT_IMAGES["darrow"]["other"], '" border="0" alt="" /></a>';
 					echo help_link('movedown_faq_item', $this->getName());
 				}
 				echo '</td><td class="optionbox center">';
diff --git a/modules/gedcom_favorites/module.php b/modules/gedcom_favorites/module.php
index 2df574924f..a93e995667 100644
--- a/modules/gedcom_favorites/module.php
+++ b/modules/gedcom_favorites/module.php
@@ -53,7 +53,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $ctype, $TEXT_DIRECTION, $THEME_DIR;
+		global $WT_IMAGES, $ctype, $TEXT_DIRECTION, $THEME_DIR;
 		global $show_full, $PEDIGREE_FULL_DETAILS, $BROWSERTYPE, $ENABLE_AUTOCOMPLETE;
 
 		$action=safe_GET('action');
@@ -231,7 +231,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 			<br />
 			';
 			$uniqueID = floor(microtime() * 1000000);
-			$content .= "<b><a href=\"javascript://".i18n::translate('Add a new favorite')." \" onclick=\"expand_layer('add_ged_fav{$uniqueID}'); return false;\"><img id=\"add_ged_fav_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["plus"]["other"]."\" border=\"0\" alt=\"\" />&nbsp;".i18n::translate('Add a new favorite')."</a></b>";
+			$content .= "<b><a href=\"javascript://".i18n::translate('Add a new favorite')." \" onclick=\"expand_layer('add_ged_fav{$uniqueID}'); return false;\"><img id=\"add_ged_fav_img\" src=\"".$WT_IMAGES["plus"]["other"]."\" border=\"0\" alt=\"\" />&nbsp;".i18n::translate('Add a new favorite')."</a></b>";
 			$content .= help_link('index_add_favorites');
 			$content .= "<br /><div id=\"add_ged_fav{$uniqueID}\" style=\"display: none;\">\n";
 			$content .= "<form name=\"addgfavform\" method=\"get\" action=\"index.php\">\n";
diff --git a/modules/gedcom_news/module.php b/modules/gedcom_news/module.php
index 96d1237a66..d50199a48d 100644
--- a/modules/gedcom_news/module.php
+++ b/modules/gedcom_news/module.php
@@ -53,7 +53,7 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION, $ctype, $THEME_DIR;
+		global $WT_IMAGES, $TEXT_DIRECTION, $ctype, $THEME_DIR;
 
 		switch (safe_GET('action')) {
 		case 'deletenews':
@@ -87,7 +87,7 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block {
 				$name = WT_USER_NAME;
 			}
 			$title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-			$title.="<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";		}
+			$title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";		}
 		$title .= i18n::translate('News');
 		if(WT_USER_GEDCOM_ADMIN) {
 			$title .= help_link('index_gedcom_news_adm');
diff --git a/modules/gedcom_stats/module.php b/modules/gedcom_stats/module.php
index 883aa54a69..844d8bea27 100644
--- a/modules/gedcom_stats/module.php
+++ b/modules/gedcom_stats/module.php
@@ -45,7 +45,7 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $COMMON_NAMES_THRESHOLD, $WT_IMAGE_DIR, $WT_IMAGES, $MULTI_MEDIA, $top10_block_present, $THEME_DIR;
+		global $ctype, $COMMON_NAMES_THRESHOLD, $WT_IMAGES, $MULTI_MEDIA, $top10_block_present, $THEME_DIR;
 
 		$show_common_surnames=get_block_setting($block_id, 'show_common_surnames', true);
 		$stat_indi           =get_block_setting($block_id, 'stat_indi',            true);
@@ -72,7 +72,7 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block {
 		$title='';
 		if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) {
 			$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('".encode_url("index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}")."', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-			$title .= "<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+			$title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 		}
 		$title.=i18n::translate('GEDCOM Statistics').help_link('index_stats');
 
diff --git a/modules/googlemap/module.php b/modules/googlemap/module.php
index ea6b03e317..6b3ace9d3c 100644
--- a/modules/googlemap/module.php
+++ b/modules/googlemap/module.php
@@ -86,7 +86,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 
 	// Implement WT_Module_Tab
 	public function getTabContent() {
-		global $SEARCH_SPIDER, $SESSION_HIDE_GOOGLEMAP, $WT_IMAGE_DIR, $WT_IMAGES;
+		global $SEARCH_SPIDER, $SESSION_HIDE_GOOGLEMAP, $WT_IMAGES;
 		global $GOOGLEMAP_ENABLED, $GOOGLEMAP_API_KEY, $GOOGLEMAP_MAP_TYPE, $GOOGLEMAP_MIN_ZOOM, $GOOGLEMAP_MAX_ZOOM, $GEDCOM;
 		global $GOOGLEMAP_XSIZE, $GOOGLEMAP_YSIZE, $SHOW_LIVING_NAMES;
 		global $TEXT_DIRECTION, $GM_DEFAULT_TOP_VALUE, $GOOGLEMAP_COORD, $GOOGLEMAP_PH_CONTROLS;
@@ -118,11 +118,11 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 			$tNew = str_replace("&", "&amp;", $tNew);
 			if($SESSION_HIDE_GOOGLEMAP=="true") {
 				print "&nbsp;&nbsp;&nbsp;<span class=\"font9\"><a href=\"".$tNew."&amp;HIDE_GOOGLEMAP=false#".$this->getName()."\">";
-				print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["plus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"".i18n::translate('Activate')."\" title=\"".i18n::translate('Activate')."\" />";
+				print "<img src=\"".$WT_IMAGES["plus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"".i18n::translate('Activate')."\" title=\"".i18n::translate('Activate')."\" />";
 				print " ".i18n::translate('Activate')."</a></span>\n";
 			} else {
 				print "&nbsp;&nbsp;&nbsp;<span class=\"font9\"><a href=\"" .$tNew."&amp;HIDE_GOOGLEMAP=true#".$this->getName()."\">";
-				print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["minus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"".i18n::translate('Deactivate')."\" title=\"".i18n::translate('Deactivate')."\" />";
+				print "<img src=\"".$WT_IMAGES["minus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"".i18n::translate('Deactivate')."\" title=\"".i18n::translate('Deactivate')."\" />";
 				print " ".i18n::translate('Deactivate')."</a></span>\n";
 			}
 
@@ -174,7 +174,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 			}
 		}
 		// start
-		print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["spacer"]["other"]."\" id=\"marker6\" width=\"1\" height=\"1\" alt=\"\" />";
+		print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" id=\"marker6\" width=\"1\" height=\"1\" alt=\"\" />";
 		// end
 		?>
 		</td>
diff --git a/modules/googlemap/pedigree_map.php b/modules/googlemap/pedigree_map.php
index 2a5d665d1e..a75456e012 100644
--- a/modules/googlemap/pedigree_map.php
+++ b/modules/googlemap/pedigree_map.php
@@ -42,7 +42,7 @@ if (!defined('WT_WEBTREES')) {
 require WT_ROOT.'includes/controllers/pedigree_ctrl.php';
 require WT_ROOT.'modules/googlemap/defaultconfig.php';
 
-global $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES, $WT_IMAGE_DIR, $GEDCOM;
+global $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES, $GEDCOM;
 
 // Default is show for both of these.
 $hideflags = safe_GET('hideflags');
@@ -589,9 +589,9 @@ for ($i=0; $i<($controller->treesize); $i++) {
 				if ($TEXT_DIRECTION == "rtl") $class .= "_rtl";
 				$sex = $person->getSex();
 				$image = "<img src=\'./";
-				if ($sex == 'F') { $image .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_F"]["other"]; }
-				elseif ($sex == 'M') { $image .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_M"]["other"]; }
-				else { $image .= $WT_IMAGE_DIR."/".$WT_IMAGES["default_image_U"]["other"]; }
+				if ($sex == 'F') { $image .= $WT_IMAGES["default_image_F"]["other"]; }
+				elseif ($sex == 'M') { $image .= $WT_IMAGES["default_image_M"]["other"]; }
+				else { $image .= $WT_IMAGES["default_image_U"]["other"]; }
 				$image .="\' align=\'left\' class=\'".$class."\' border=\'none\' alt=\'\' />";
 			}
 		}
diff --git a/modules/html/module.php b/modules/html/module.php
index af0d473d21..070b9c10d6 100644
--- a/modules/html/module.php
+++ b/modules/html/module.php
@@ -46,7 +46,7 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $GEDCOM, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION, $MULTI_MEDIA, $THEME_DIR;
+		global $ctype, $GEDCOM, $WT_IMAGES, $TEXT_DIRECTION, $MULTI_MEDIA, $THEME_DIR;
 
 		// Only show this block for certain languages
 		$languages=get_block_setting($block_id, 'languages');
@@ -118,7 +118,7 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		$title='';
 		if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) {
 			$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"
-			."<img class=\"adminicon\" src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['admin']['small']}\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure').'" /></a>';
+			."<img class=\"adminicon\" src=\"{$WT_IMAGES['admin']['small']}\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure').'" /></a>';
 			$title .= help_link('index_htmlplus');
 		}
 		$title.=$title_tmp;
diff --git a/modules/individual_ext_report/module.php b/modules/individual_ext_report/module.php
index 0c7a991365..90955dbba0 100644
--- a/modules/individual_ext_report/module.php
+++ b/modules/individual_ext_report/module.php
@@ -51,7 +51,7 @@ class individual_ext_report_WT_Module extends WT_Module implements WT_Module_Rep
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $controller, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $controller, $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -65,7 +65,7 @@ class individual_ext_report_WT_Module extends WT_Module implements WT_Module_Rep
 		
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['indis']['small']);
+		$menu->addIcon($WT_IMAGES['indis']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/individual_report/module.php b/modules/individual_report/module.php
index c7560a8851..0739acb4d8 100644
--- a/modules/individual_report/module.php
+++ b/modules/individual_report/module.php
@@ -51,7 +51,7 @@ class individual_report_WT_Module extends WT_Module implements WT_Module_Report
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $controller, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $controller, $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -65,7 +65,7 @@ class individual_report_WT_Module extends WT_Module implements WT_Module_Report
 		
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['indis']['small']);
+		$menu->addIcon($WT_IMAGES['indis']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/individuals/module.php b/modules/individuals/module.php
index 0ff14f9d30..453eca4e9c 100644
--- a/modules/individuals/module.php
+++ b/modules/individuals/module.php
@@ -71,8 +71,7 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 
 	// Implement WT_Module_Sidebar
 	public function getSidebarContent() {
-		global $SHOW_MARRIED_NAMES;
-		global $WT_IMAGE_DIR, $WT_IMAGES;
+		global $SHOW_MARRIED_NAMES, $WT_IMAGES;
 
 		// Fetch a list of the initial letters of all surnames in the database
 		$initials=get_indilist_salpha($SHOW_MARRIED_NAMES, false, WT_GED_ID);
@@ -111,7 +110,7 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 					  success: function(html){
 					    jQuery("#sb_indi_"+surname+" div").html(html);
 					    jQuery("#sb_indi_"+surname+" div").show();
-					    jQuery("#sb_indi_"+surname).css("list-style-image", "url('.$WT_IMAGE_DIR."/".$WT_IMAGES['minus']['other'].')");
+					    jQuery("#sb_indi_"+surname).css("list-style-image", "url('.$WT_IMAGES['minus']['other'].')");
 					    loadedNames[surname]=2;
 					  }
 					});
@@ -119,12 +118,12 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				else if (loadedNames[surname]==1) {
 					loadedNames[surname]=2;
 					jQuery("#sb_indi_"+surname+" div").show();
-					jQuery("#sb_indi_"+surname).css("list-style-image", "url('.$WT_IMAGE_DIR."/".$WT_IMAGES['minus']['other'].')");
+					jQuery("#sb_indi_"+surname).css("list-style-image", "url('.$WT_IMAGES['minus']['other'].')");
 				}
 				else {
 					loadedNames[surname]=1;
 					jQuery("#sb_indi_"+surname+" div").hide();
-					jQuery("#sb_indi_"+surname).css("list-style-image", "url('.$WT_IMAGE_DIR."/".$WT_IMAGES['plus']['other'].')");
+					jQuery("#sb_indi_"+surname).css("list-style-image", "url('.$WT_IMAGES['plus']['other'].')");
 				}
 				return false;
 			});
diff --git a/modules/lightbox/functions/lightbox_print_media.php b/modules/lightbox/functions/lightbox_print_media.php
index 17c193dd95..4d492a89f3 100644
--- a/modules/lightbox/functions/lightbox_print_media.php
+++ b/modules/lightbox/functions/lightbox_print_media.php
@@ -53,7 +53,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 
 	global $MULTI_MEDIA, $MEDIA_EXTERNAL;
 	global $GEDCOM, $MEDIATYPE;
-	global $WORD_WRAPPED_NOTES, $MEDIA_DIRECTORY, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+	global $WORD_WRAPPED_NOTES, $MEDIA_DIRECTORY, $WT_IMAGES, $TEXT_DIRECTION;
 
 	global $is_media, $cntm1, $cntm2, $cntm3, $cntm4, $t, $mgedrec;
 	global $res, $typ2b, $edit, $tabno, $n, $item, $items, $p, $note, $rowm, $note_text, $reorder;
diff --git a/modules/lightbox/functions/lightbox_print_media_row.php b/modules/lightbox/functions/lightbox_print_media_row.php
index 16d11143f2..489fdab457 100644
--- a/modules/lightbox/functions/lightbox_print_media_row.php
+++ b/modules/lightbox/functions/lightbox_print_media_row.php
@@ -43,7 +43,7 @@ if (!defined('WT_WEBTREES')) {
  */
 function lightbox_print_media_row($rtype, $rowm, $pid) {
 
-	global $WT_IMAGE_DIR, $WT_IMAGES, $MEDIA_DIRECTORY, $TEXT_DIRECTION;
+	global $WT_IMAGES, $MEDIA_DIRECTORY, $TEXT_DIRECTION;
 	global $GEDCOM, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER;
 	global $SEARCH_SPIDER;
 	global $t, $n, $item, $items, $p, $edit, $reorder, $LB_AL_THUMB_LINKS, $note;
diff --git a/modules/lightbox/module.php b/modules/lightbox/module.php
index 9440fe88d7..a7a3e9dbd2 100644
--- a/modules/lightbox/module.php
+++ b/modules/lightbox/module.php
@@ -78,7 +78,7 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul
 	public function getTabContent() {
 		global $MULTI_MEDIA, $MEDIA_EXTERNAL;
 		global $GEDCOM, $MEDIATYPE;
-		global $WORD_WRAPPED_NOTES, $MEDIA_DIRECTORY, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION, $is_media;
+		global $WORD_WRAPPED_NOTES, $MEDIA_DIRECTORY, $WT_IMAGES, $TEXT_DIRECTION, $is_media;
 		global $cntm1, $cntm2, $cntm3, $cntm4, $t, $mgedrec ;
 		global $edit ;
 		global $pid, $tabno;
diff --git a/modules/marriage_report/module.php b/modules/marriage_report/module.php
index 776b47cfb4..a2d307b81d 100644
--- a/modules/marriage_report/module.php
+++ b/modules/marriage_report/module.php
@@ -51,13 +51,13 @@ class marriage_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['sfamily']['small']);
+		$menu->addIcon($WT_IMAGES['sfamily']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/missing_facts_report/module.php b/modules/missing_facts_report/module.php
index 69f2249830..6a4865f97c 100644
--- a/modules/missing_facts_report/module.php
+++ b/modules/missing_facts_report/module.php
@@ -51,13 +51,13 @@ class missing_facts_report_WT_Module extends WT_Module implements WT_Module_Repo
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['indis']['small']);
+		$menu->addIcon($WT_IMAGES['indis']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/pedigree_report/module.php b/modules/pedigree_report/module.php
index 58dbef7739..3d7bad7ef0 100644
--- a/modules/pedigree_report/module.php
+++ b/modules/pedigree_report/module.php
@@ -51,7 +51,7 @@ class pedigree_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $controller, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $controller, $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -65,16 +65,16 @@ class pedigree_report_WT_Module extends WT_Module implements WT_Module_Report {
 		
 		$menus=array();
 		$menu=new Menu($this->getTitle().' - '.i18n::translate('Portrait'), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report_portrait.xml'.$pid);
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['pedigree']['small']);
+		$menu->addIcon($WT_IMAGES['pedigree']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
 		$menu=new Menu($this->getTitle().' - '.i18n::translate('Landscape'), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report_landscape.xml'.$pid);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['pedigree']['small']);
+		$menu->addIcon($WT_IMAGES['pedigree']['small']);
 		$menus[]=$menu;
 
 		return $menus;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/modules/personal_facts/module.php b/modules/personal_facts/module.php
index fb157ce4ef..24fe646caf 100644
--- a/modules/personal_facts/module.php
+++ b/modules/personal_facts/module.php
@@ -52,7 +52,7 @@ class personal_facts_WT_Module extends WT_Module implements WT_Module_Tab {
 	
 	// Implement WT_Module_Tab
 	public function getTabContent() {
-		global $FACT_COUNT, $WT_IMAGE_DIR, $WT_IMAGES, $EXPAND_RELATIVES_EVENTS;
+		global $FACT_COUNT, $WT_IMAGES, $EXPAND_RELATIVES_EVENTS;
 		global $n_chil, $n_gchi, $n_ggch;
 		global $EXPAND_RELATIVES_EVENTS;
 		global $NAV_FACTS;
diff --git a/modules/random_media/module.php b/modules/random_media/module.php
index a14e4da0fe..54649293d8 100644
--- a/modules/random_media/module.php
+++ b/modules/random_media/module.php
@@ -46,7 +46,7 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $foundlist, $MULTI_MEDIA, $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES;
+		global $ctype, $foundlist, $MULTI_MEDIA, $TEXT_DIRECTION, $WT_IMAGES;
 		global $MEDIA_EXTERNAL, $MEDIA_DIRECTORY;
 		global $MEDIATYPE, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER, $THEME_DIR;;
 
@@ -176,7 +176,7 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 					$name = WT_USER_NAME;
 				}
 				$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-				$title .= "<img class=\"adminicon\" src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['admin']['small']}\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure').'" /></a>';
+				$title .= "<img class=\"adminicon\" src=\"{$WT_IMAGES['admin']['small']}\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure').'" /></a>';
 			}
 			$title .= i18n::translate('Random Picture');
 			$title .= help_link('index_media');
@@ -187,12 +187,12 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 				} else {
 					$image = "rarrow";
 				}
-				$linkNextImage = "<a href=\"javascript: ".i18n::translate('Next image')."\" onclick=\"jQuery('#block_{$block_id}').load('index.php?action=ajax&block_id={$block_id}');return false;\"><img src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['rdarrow']['other']}\" border=\"0\" alt=\"".i18n::translate('Next image')."\" title=\"".i18n::translate('Next image')."\" /></a>";
+				$linkNextImage = "<a href=\"javascript: ".i18n::translate('Next image')."\" onclick=\"jQuery('#block_{$block_id}').load('index.php?action=ajax&block_id={$block_id}');return false;\"><img src=\"{$WT_IMAGES['rdarrow']['other']}\" border=\"0\" alt=\"".i18n::translate('Next image')."\" title=\"".i18n::translate('Next image')."\" /></a>";
 
 				$content .= "<div class=\"center\" id=\"random_picture_controls$block_id\"><br />";
 				if ($TEXT_DIRECTION=="rtl") $content .= $linkNextImage;
 				$content .= "<a href=\"javascript: ".i18n::translate('Play')."/".i18n::translate('Stop')."\" onclick=\"togglePlay(); return false;\">";
-				if (isset($WT_IMAGES[$image]['other'])) $content .= "<img id=\"play_stop\" src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES[$image]['other']}\" border=\"0\" alt=\"".i18n::translate('Play')."/".i18n::translate('Stop')."\" title=\"".i18n::translate('Play')."/".i18n::translate('Stop')."\" />";
+				if (isset($WT_IMAGES[$image]['other'])) $content .= "<img id=\"play_stop\" src=\"{$WT_IMAGES[$image]['other']}\" border=\"0\" alt=\"".i18n::translate('Play')."/".i18n::translate('Stop')."\" title=\"".i18n::translate('Play')."/".i18n::translate('Stop')."\" />";
 				else $content .= i18n::translate('Play')."/".i18n::translate('Stop');
 				$content .= "</a>";
 				if ($TEXT_DIRECTION=="ltr") $content .= $linkNextImage;
@@ -205,13 +205,13 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 							if (play) {
 								play = false;
 								imgid = document.getElementById("play_stop");
-								imgid.src = \''.$WT_IMAGE_DIR."/".$WT_IMAGES["rarrow"]['other'].'\';
+								imgid.src = \''.$WT_IMAGES["rarrow"]['other'].'\';
 							}
 							else {
 								play = true;
 								playSlideShow();
 								imgid = document.getElementById("play_stop");
-								imgid.src = \''.$WT_IMAGE_DIR."/".$WT_IMAGES["stop"]['other'].'\';
+								imgid.src = \''.$WT_IMAGES["stop"]['other'].'\';
 							}
 						}
 
@@ -233,7 +233,7 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 					<!--
 						play = true;
 						imgid = document.getElementById("play_stop");
-						imgid.src = \''.$WT_IMAGE_DIR."/".$WT_IMAGES["stop"]['other'].'\';
+						imgid.src = \''.$WT_IMAGES["stop"]['other'].'\';
 						window.setTimeout("playSlideShow()", 6000);
 					//-->
 					</script>';
diff --git a/modules/recent_changes/module.php b/modules/recent_changes/module.php
index 769fb7cb55..31441add8a 100644
--- a/modules/recent_changes/module.php
+++ b/modules/recent_changes/module.php
@@ -45,7 +45,7 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $WT_IMAGE_DIR, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $THEME_DIR;
 
 		$days=get_block_setting($block_id, 'days', 7);
 		$hide_empty=get_block_setting($block_id, 'hide_empty', false);
@@ -65,7 +65,7 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block {
 				$name = WT_USER_NAME;
 			}
 			$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('".encode_url("index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}")."', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-			$title .= "<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+			$title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 		}
 		$title.= i18n::translate('Recent Changes').help_link('recent_changes', $this->getName());
 
diff --git a/modules/relative_ext_report/module.php b/modules/relative_ext_report/module.php
index d0ab138173..c3787de834 100644
--- a/modules/relative_ext_report/module.php
+++ b/modules/relative_ext_report/module.php
@@ -51,7 +51,7 @@ class relative_ext_report_WT_Module extends WT_Module implements WT_Module_Repor
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $controller, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $controller, $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -66,7 +66,7 @@ class relative_ext_report_WT_Module extends WT_Module implements WT_Module_Repor
 		
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['cfamily']['small']);
+		$menu->addIcon($WT_IMAGES['cfamily']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/relative_report/module.php b/modules/relative_report/module.php
index 5723d58b32..c215c5f9fa 100644
--- a/modules/relative_report/module.php
+++ b/modules/relative_report/module.php
@@ -51,7 +51,7 @@ class relative_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $controller, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $controller, $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
@@ -65,7 +65,7 @@ class relative_report_WT_Module extends WT_Module implements WT_Module_Report {
 		
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['cfamily']['small']);
+		$menu->addIcon($WT_IMAGES['cfamily']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/relatives/module.php b/modules/relatives/module.php
index c781dd7210..91904a7f37 100644
--- a/modules/relatives/module.php
+++ b/modules/relatives/module.php
@@ -51,11 +51,11 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 	}
 	
 	function printFamilyHeader($famid, $label) {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $SEARCH_SPIDER;
+		global $WT_IMAGES, $SEARCH_SPIDER;
 	?>
 		<table>
 			<tr>
-				<td><img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["cfamily"]["small"]; ?>" border="0" class="icon" alt="" /></td>
+				<td><img src="<?php print $WT_IMAGES["cfamily"]["small"]; ?>" border="0" class="icon" alt="" /></td>
 				<td><span class="subheaders"><?php print PrintReady($label); ?></span>
 				<?php if (empty($SEARCH_SPIDER)) { ?>
 					- <a href="family.php?famid=<?php print $famid; ?>"><?php print i18n::translate('View Family'); ?></a>
@@ -74,8 +74,8 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 	* @return html table rows
 	*/
 	function printParentsRows(&$family, &$people, $type) {
-		global $personcount;
-		global $WT_IMAGE_DIR, $WT_IMAGES;
+		global $personcount, $WT_IMAGES;
+
 		$elderdate = "";
 		//-- new father/husband
 		$styleadd = "";
@@ -247,8 +247,8 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 	* @return html table rows
 	*/
 	function printChildrenRows(&$family, &$people, $type) {
-		global $personcount;
-		global $WT_IMAGE_DIR, $WT_IMAGES;
+		global $personcount, $WT_IMAGES;
+
 		$elderdate = $family->getMarriageDate();
 		$key=0;
 		foreach($people["children"] as $child) {
@@ -338,9 +338,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 	
 	// Implement WT_Module_Tab
 	public function getTabContent() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $SHOW_AGE_DIFF;
-		global $GEDCOM, $ABBREVIATE_CHART_LABELS;
-		global $show_full, $personcount;
+		global $WT_IMAGES, $SHOW_AGE_DIFF, $GEDCOM, $ABBREVIATE_CHART_LABELS, $show_full, $personcount;
 
 		if (isset($show_full)) $saved_show_full = $show_full; // We always want to see full details here
 		$show_full = 1;
diff --git a/modules/review_changes/module.php b/modules/review_changes/module.php
index 103a2dffa3..aa7b3d8e3b 100644
--- a/modules/review_changes/module.php
+++ b/modules/review_changes/module.php
@@ -45,7 +45,7 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $QUERY_STRING, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION, $WEBTREES_EMAIL, $THEME_DIR;
+		global $ctype, $QUERY_STRING, $WT_IMAGES, $TEXT_DIRECTION, $WEBTREES_EMAIL, $THEME_DIR;
 
 		$changes=WT_DB::prepare(
 			"SELECT 1".
@@ -99,7 +99,7 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 						$name = WT_USER_NAME;
 					}
 					$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-					$title .= "<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+					$title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 				}
 				$title.=i18n::translate('Review GEDCOM changes').help_link('review_changes');
 				$content = "";
diff --git a/modules/source_report/module.php b/modules/source_report/module.php
index e621542094..e60a6d570a 100644
--- a/modules/source_report/module.php
+++ b/modules/source_report/module.php
@@ -51,13 +51,13 @@ class source_report_WT_Module extends WT_Module implements WT_Module_Report {
 
 	// Implement WT_Module_Report - a module can provide many reports
 	public function getReportMenus() {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
-		$menu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES['source']['small']);
+		$menu->addIcon($WT_IMAGES['source']['small']);
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
 
diff --git a/modules/stories/module.php b/modules/stories/module.php
index 73221a4e69..42b9ca5977 100644
--- a/modules/stories/module.php
+++ b/modules/stories/module.php
@@ -289,7 +289,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_
 	}
 
 	private function config() {
-		global $WT_IMAGES, $WT_IMAGE_DIR, $TEXT_DIRECTION;
+		global $WT_IMAGES, $TEXT_DIRECTION;
 
 		if (WT_USER_CAN_EDIT) {
 			print_header($this->getTitle());
diff --git a/modules/todays_events/module.php b/modules/todays_events/module.php
index 85b37c81eb..a2d8776d10 100644
--- a/modules/todays_events/module.php
+++ b/modules/todays_events/module.php
@@ -45,7 +45,7 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $TEXT_DIRECTION, $WT_IMAGES, $THEME_DIR;
 
 		$filter       =get_block_setting($block_id, 'filter', true);
 		$onlyBDM      =get_block_setting($block_id, 'onlyBDM', true);
@@ -63,7 +63,7 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 				$name = WT_USER_NAME;
 			}
 	  	$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-	  	$title .= "<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+	  	$title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
   	}
   	$title.=i18n::translate('On This Day ...').help_link('index_onthisday');
 
diff --git a/modules/todo/module.php b/modules/todo/module.php
index 3feede7c4f..44a89eaeaf 100644
--- a/modules/todo/module.php
+++ b/modules/todo/module.php
@@ -45,7 +45,7 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $WT_IMAGE_DIR, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $THEME_DIR;
 
 		$show_unassigned=get_block_setting($block_id, 'show_unassigned', true);
 		$show_other     =get_block_setting($block_id, 'show_other',      true);
@@ -60,7 +60,7 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block {
 				$name = WT_USER_NAME;
 			}
 			$title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-			$title.="<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+			$title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 		}
 		$title.=i18n::translate('&quot;To Do&quot; tasks').help_link('todo', $this->getName());
 		$content='';
diff --git a/modules/top10_givnnames/module.php b/modules/top10_givnnames/module.php
index 6d8423f62c..b4f2374913 100644
--- a/modules/top10_givnnames/module.php
+++ b/modules/top10_givnnames/module.php
@@ -45,7 +45,7 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $TEXT_DIRECTION, $WT_BLOCKS, $ctype, $WT_IMAGES, $WT_IMAGE_DIR, $THEME_DIR;
+		global $TEXT_DIRECTION, $WT_BLOCKS, $ctype, $WT_IMAGES, $THEME_DIR;
 
 		$num=get_block_setting($block_id, 'num', 10);
 		$infoStyle=get_block_setting($block_id, 'infoStyle', 'table');
@@ -59,7 +59,7 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block {
 		$title='';
 		if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) {
 			$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-			$title .= "<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+			$title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 		}
 		// I18N: There are separate lists of male/female names, containing %d names each
 		$title .= i18n::plural('Top Given Name', 'Top %d Given Names', $num, $num);
diff --git a/modules/top10_pageviews/module.php b/modules/top10_pageviews/module.php
index cbc58a4f99..fbfd8a90ae 100644
--- a/modules/top10_pageviews/module.php
+++ b/modules/top10_pageviews/module.php
@@ -45,7 +45,7 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $WT_IMAGES, $WT_IMAGE_DIR, $SHOW_COUNTER, $TEXT_DIRECTION, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $SHOW_COUNTER, $TEXT_DIRECTION, $THEME_DIR;
 
 		$count_placement=get_block_setting($block_id, 'count_placement', 'before');
 		$num=get_block_setting($block_id, 'num', 10);
@@ -55,7 +55,7 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block {
 		$title='';
 		if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) {
 			$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-			$title .= "<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+			$title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 		}
 		$title .= i18n::translate('Most Viewed Items');
 		$title .= help_link('index_top10_pageviews');
diff --git a/modules/top10_surnames/module.php b/modules/top10_surnames/module.php
index e4e74b2411..c9f135222d 100644
--- a/modules/top10_surnames/module.php
+++ b/modules/top10_surnames/module.php
@@ -45,7 +45,7 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $COMMON_NAMES_ADD, $COMMON_NAMES_REMOVE, $COMMON_NAMES_THRESHOLD, $WT_BLOCKS, $ctype, $WT_IMAGES, $WT_IMAGE_DIR, $SURNAME_LIST_STYLE, $THEME_DIR;
+		global $COMMON_NAMES_ADD, $COMMON_NAMES_REMOVE, $COMMON_NAMES_THRESHOLD, $WT_BLOCKS, $ctype, $WT_IMAGES, $SURNAME_LIST_STYLE, $THEME_DIR;
 
 		$num=get_block_setting($block_id, 'num', 10);
 		$infoStyle=get_block_setting($block_id, 'infoStyle', 'table');
@@ -99,7 +99,7 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block {
 				$name = WT_USER_NAME;
 			}
 			$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('".encode_url("index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}")."', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-			$title .= "<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+			$title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 		}
 		// I18N: There are separate lists of male/female names, containing %d names each
 		$title .= i18n::plural('Top surname', 'Top %d surnames', $num, $num);
diff --git a/modules/upcoming_events/module.php b/modules/upcoming_events/module.php
index eae9e2eb02..8a752a823d 100644
--- a/modules/upcoming_events/module.php
+++ b/modules/upcoming_events/module.php
@@ -46,7 +46,7 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $WT_IMAGE_DIR, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $THEME_DIR;
 
 		$days=get_block_setting($block_id, 'days', 7);
 		$filter=get_block_setting($block_id, 'filter',     true);
@@ -62,7 +62,7 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 		$title='';
 		if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) {
  			$title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
-			$title.="<img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+			$title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 		}
 		$title.= i18n::translate('Upcoming Events').help_link('upcoming_events', $this->getName());
 
diff --git a/modules/user_blog/module.php b/modules/user_blog/module.php
index 8f60f7d888..72cf94cdcd 100644
--- a/modules/user_blog/module.php
+++ b/modules/user_blog/module.php
@@ -53,7 +53,7 @@ class user_blog_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $TEXT_DIRECTION, $THEME_DIR;
 
 		switch (safe_GET('action')) {
 		case 'deletenews':
diff --git a/modules/user_favorites/module.php b/modules/user_favorites/module.php
index a9f6b86026..559740aaf3 100644
--- a/modules/user_favorites/module.php
+++ b/modules/user_favorites/module.php
@@ -53,7 +53,7 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $TEXT_DIRECTION, $MEDIA_DIRECTORY, $MULTI_MEDIA, $MEDIA_DIRECTORY_LEVELS, $ctype, $THEME_DIR;
+		global $WT_IMAGES, $GEDCOM, $TEXT_DIRECTION, $MEDIA_DIRECTORY, $MULTI_MEDIA, $MEDIA_DIRECTORY_LEVELS, $ctype, $THEME_DIR;
 		global $show_full, $PEDIGREE_FULL_DETAILS, $BROWSERTYPE, $ENABLE_AUTOCOMPLETE;
 
 		$action=safe_GET('action');
@@ -226,7 +226,7 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 		<br />
 		';
 		$uniqueID = floor(microtime() * 1000000);
-		$content .= "<b><a href=\"javascript: ".i18n::translate('Add a new favorite')." \" onclick=\"expand_layer('add_user_fav{$uniqueID}'); return false;\"><img id=\"add_user_fav_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["plus"]["other"]."\" border=\"0\" alt=\"\" />&nbsp;".i18n::translate('Add a new favorite')."</a></b>";
+		$content .= "<b><a href=\"javascript: ".i18n::translate('Add a new favorite')." \" onclick=\"expand_layer('add_user_fav{$uniqueID}'); return false;\"><img id=\"add_user_fav_img\" src=\"".$WT_IMAGES["plus"]["other"]."\" border=\"0\" alt=\"\" />&nbsp;".i18n::translate('Add a new favorite')."</a></b>";
 		$content .= help_link('index_add_favorites');
 		$content .= "<br /><div id=\"add_user_fav{$uniqueID}\" style=\"display: none;\">";
 		$content .= "<form name=\"addufavform\" method=\"get\" action=\"index.php\">";
diff --git a/modules/user_messages/module.php b/modules/user_messages/module.php
index 92b2e7f649..aff55037e3 100644
--- a/modules/user_messages/module.php
+++ b/modules/user_messages/module.php
@@ -45,7 +45,7 @@ class user_messages_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $WT_IMAGE_DIR, $TEXT_DIRECTION, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $TEXT_DIRECTION, $WT_IMAGES, $THEME_DIR;
 
 		require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 
@@ -109,7 +109,7 @@ class user_messages_WT_Module extends WT_Module implements WT_Module_Block {
 				$content .= "<td class=\"list_value_wrap\"><input type=\"checkbox\" id=\"cb_message$key\" name=\"message_id[]\" value=\"$key\" /></td>";
 				$showmsg=preg_replace("/(\w)\/(\w)/","\$1/<span style=\"font-size:1px;\"> </span>\$2",PrintReady($message["subject"]));
 				$showmsg=str_replace("@","@<span style=\"font-size:1px;\"> </span>",$showmsg);
-				$content .= "<td class=\"list_value_wrap\"><a href=\"javascript:;\" onclick=\"expand_layer('message{$key}'); return false;\"><img id=\"message{$key}_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["plus"]["other"]."\" border=\"0\" alt=\"".i18n::translate('Show Details')."\" title=\"".i18n::translate('Show Details')."\" /> <b>".$showmsg."</b></a></td>";
+				$content .= "<td class=\"list_value_wrap\"><a href=\"javascript:;\" onclick=\"expand_layer('message{$key}'); return false;\"><img id=\"message{$key}_img\" src=\"".$WT_IMAGES["plus"]["other"]."\" border=\"0\" alt=\"".i18n::translate('Show Details')."\" title=\"".i18n::translate('Show Details')."\" /> <b>".$showmsg."</b></a></td>";
 				$content .= "<td class=\"list_value_wrap\">".$message["created"]."</td>";
 				$content .= "<td class=\"list_value_wrap\">";
 				$user_id=get_user_id($message["from"]);
diff --git a/modules/user_welcome/module.php b/modules/user_welcome/module.php
index 8edbebaa82..ce6e60b376 100644
--- a/modules/user_welcome/module.php
+++ b/modules/user_welcome/module.php
@@ -45,7 +45,7 @@ class user_welcome_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $WT_IMAGE_DIR, $WT_IMAGES, $THEME_DIR;
+		global $WT_IMAGES, $THEME_DIR;
 
 		$id=$this->getName().$block_id;
 		$title=i18n::translate('Welcome')." ".getUserFullName(WT_USER_ID);
@@ -53,11 +53,11 @@ class user_welcome_WT_Module extends WT_Module implements WT_Module_Block {
 		$content = "<table class=\"blockcontent\" cellspacing=\"0\" cellpadding=\"0\" style=\" width: 100%; direction:ltr;\"><tr>";
 		$content .= "<td class=\"tab_active_bottom\" colspan=\"3\" ></td></tr><tr>";
 		if (get_user_setting(WT_USER_ID, 'editaccount')) {
-			$content .= "<td class=\"center details2\" style=\" width: 33%; clear: none; vertical-align: top; margin-top: 2px;\"><a href=\"edituser.php\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["mypage"]["small"]."\" border=\"0\" alt=\"".i18n::translate('My account')."\" title=\"".i18n::translate('My account')."\" /><br />".i18n::translate('My account')."</a></td>";
+			$content .= "<td class=\"center details2\" style=\" width: 33%; clear: none; vertical-align: top; margin-top: 2px;\"><a href=\"edituser.php\"><img src=\"".$WT_IMAGES["mypage"]["small"]."\" border=\"0\" alt=\"".i18n::translate('My account')."\" title=\"".i18n::translate('My account')."\" /><br />".i18n::translate('My account')."</a></td>";
 		}
 		if (WT_USER_GEDCOM_ID) {
-			$content .= "<td class=\"center details2\" style=\" width: 33%; clear: none; vertical-align: top; margin-top: 2px;\"><a href=\"".encode_url("pedigree.php?rootid=".WT_USER_GEDCOM_ID)."\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["pedigree"]["small"]."\" border=\"0\" alt=\"".i18n::translate('My Pedigree')."\" title=\"".i18n::translate('My Pedigree')."\" /><br />".i18n::translate('My Pedigree')."</a></td>";
-			$content .= "<td class=\"center details2\" style=\" width: 33%; clear: none; vertical-align: top; margin-top: 2px;\"><a href=\"".encode_url("individual.php?pid=".WT_USER_GEDCOM_ID)."\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["indis"]["small"]."\" border=\"0\" alt=\"".i18n::translate('My Individual Record')."\" title=\"".i18n::translate('My Individual Record')."\" /><br />".i18n::translate('My Individual Record')."</a></td>";
+			$content .= "<td class=\"center details2\" style=\" width: 33%; clear: none; vertical-align: top; margin-top: 2px;\"><a href=\"".encode_url("pedigree.php?rootid=".WT_USER_GEDCOM_ID)."\"><img src=\"".$WT_IMAGES["pedigree"]["small"]."\" border=\"0\" alt=\"".i18n::translate('My Pedigree')."\" title=\"".i18n::translate('My Pedigree')."\" /><br />".i18n::translate('My Pedigree')."</a></td>";
+			$content .= "<td class=\"center details2\" style=\" width: 33%; clear: none; vertical-align: top; margin-top: 2px;\"><a href=\"".encode_url("individual.php?pid=".WT_USER_GEDCOM_ID)."\"><img src=\"".$WT_IMAGES["indis"]["small"]."\" border=\"0\" alt=\"".i18n::translate('My Individual Record')."\" title=\"".i18n::translate('My Individual Record')."\" /><br />".i18n::translate('My Individual Record')."</a></td>";
 		}
 		$content .= "</tr><tr><td class=\"center\" colspan=\"3\">";
 		$content .= "<a href=\"javascript:;\" onclick=\"window.open('".encode_url("index_edit.php?name=".WT_USER_NAME."&ctype=user")."', '_blank', 'top=50,left=10,width=705,height=355,scrollbars=1,resizable=1');\">".i18n::translate('Customize My Page')."</a>";
diff --git a/modules/yahrzeit/module.php b/modules/yahrzeit/module.php
index 22f0665172..d07201a163 100644
--- a/modules/yahrzeit/module.php
+++ b/modules/yahrzeit/module.php
@@ -45,7 +45,7 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true) {
-		global $ctype, $TEXT_DIRECTION, $WT_IMAGE_DIR, $WT_IMAGES, $WT_BLOCKS, $SHOW_MARRIED_NAMES, $THEME_DIR;
+		global $ctype, $TEXT_DIRECTION, $WT_IMAGES, $WT_BLOCKS, $SHOW_MARRIED_NAMES, $THEME_DIR;
 
 		$days=get_block_setting($block_id, 'days', 7);
 		$infoStyle=get_block_setting($block_id, 'infoStyle', 'table');
@@ -56,7 +56,7 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block {
 
 		$id=$this->getName().$block_id;
 		if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) {
-			$title="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\"><img class=\"adminicon\" src=\"$WT_IMAGE_DIR/".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
+			$title="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\"><img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]["small"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>";
 		} else {
 			$title='';
 		}
diff --git a/note.php b/note.php
index 2430a7871b..7ea3c80e3c 100644
--- a/note.php
+++ b/note.php
@@ -92,7 +92,7 @@ if ($nt==1) {
 echo '<tr><td align="left" class="descriptionbox ', $TEXT_DIRECTION, '">';
 	echo '<center>';
 	if (!empty($WT_IMAGES["notes"]["small"]) && $SHOW_FACT_ICONS)
-		echo '<img src="', $WT_IMAGE_DIR, "/", $WT_IMAGES["notes"]["small"], '" alt="', i18n::translate('Shared note'), '" title="', i18n::translate('Shared note'), '" align="middle" /> ';
+		echo '<img src="', $WT_IMAGES["notes"]["small"], '" alt="', i18n::translate('Shared note'), '" title="', i18n::translate('Shared note'), '" align="middle" /> ';
 	echo i18n::translate('Shared note'), "</center>";
 	echo '<br /><br />';
 	if (WT_USER_CAN_EDIT) {
diff --git a/pedigree.php b/pedigree.php
index 6606ced528..05e49d1b68 100644
--- a/pedigree.php
+++ b/pedigree.php
@@ -191,7 +191,7 @@ for($i=($controller->treesize-1); $i>=0; $i--) {
 					if ($TEXT_DIRECTION=="rtl") echo 'rtl" style="position:absolute; right:';
 					else echo 'ltr" style="position:absolute; left:';
 					echo $linexoffset, 'px; top:', ($yoffset+1+$controller->pbheight/2), 'px; z-index: 0;">';
-					echo '<img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["vline"]["other"], '" width="', $linesize, '" height="', ($vlength-1), '\" alt="" />';
+					echo '<img src="', $WT_IMAGES["vline"]["other"], '" width="', $linesize, '" height="', ($vlength-1), '\" alt="" />';
 					echo '</div>';
 				}
 				else {
@@ -200,18 +200,18 @@ for($i=($controller->treesize-1); $i>=0; $i--) {
 					else echo 'ltr" style="position:absolute; left:';
 					if ($talloffset > 2) {
 						echo ($linexoffset-2+$controller->pbwidth/2+$vlength/2), 'px; top:', ($yoffset+1-$controller->pbheight/2), 'px; z-index: 0;">';
-						echo '<img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["vline"]["other"], '" width="', $linesize, '" height="', ($controller->pbheight), '" alt="" />';
+						echo '<img src="', $WT_IMAGES["vline"]["other"], '" width="', $linesize, '" height="', ($controller->pbheight), '" alt="" />';
 					}
 					else {
 						echo ($linexoffset-2+$controller->pbwidth/2+$vlength/2), "px; top:", ($yoffset+1+$controller->pbheight/2), "px; z-index: 0;\">";
-						echo '<img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["vline"]["other"], '" width="', $linesize, '" height="', ($controller->pbheight), '" alt="" />';
+						echo '<img src="', $WT_IMAGES["vline"]["other"], '" width="', $linesize, '" height="', ($controller->pbheight), '" alt="" />';
 					}
 					echo '</div>';
 					echo '<div id="line$i" dir="';
 					if ($TEXT_DIRECTION=="rtl") echo 'rtl" style="position:absolute; right:';
 					else echo 'ltr" style="position:absolute; left:';
 					echo ($linexoffset+$controller->pbwidth), 'px; top:', ($yoffset+1+$controller->pbheight/2), 'px; z-index: 0;\">';
-					echo '<img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["hline"]["other"], '" width="', ($vlength-$controller->pbwidth), '" height="', $linesize, '" alt="" />';
+					echo '<img src="', $WT_IMAGES["hline"]["other"], '" width="', ($vlength-$controller->pbwidth), '" height="', $linesize, '" alt="" />';
 					echo '</div>';
 				}
 			}
@@ -241,7 +241,7 @@ for($i=($controller->treesize-1); $i>=0; $i--) {
 				if ($i > ($controller->treesize/2) + ($controller->treesize/4)-1) $did++;
 				echo '<a href="', encode_url("pedigree.php?PEDIGREE_GENERATIONS={$controller->PEDIGREE_GENERATIONS}&rootid={$controller->treeid[$did]}&show_full={$controller->show_full}&talloffset={$controller->talloffset}"), '" ';
 				echo "onmouseover=\"swap_image('arrow$i', 2);\" onmouseout=\"swap_image('arrow$i', 2);\">";
-				echo "<img id=\"arrow$i\" src=\"", $WT_IMAGE_DIR, '/', $WT_IMAGES["uarrow"]["other"], '" border="0" alt="" />';
+				echo "<img id=\"arrow$i\" src=\"", $WT_IMAGES["uarrow"]["other"], '" border="0" alt="" />';
 				echo '</a>';
 			}
 			echo "\n\t\t</div>";
@@ -260,7 +260,7 @@ for($i=($controller->treesize-1); $i>=0; $i--) {
 		echo "\n\t\t\t<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" dir=\"$TEXT_DIRECTION\">";
 		if (($talloffset < 2) && ($curgen > $talloffset) && ($curgen < $controller->PEDIGREE_GENERATIONS)) {
 			echo "<tr><td>";
-			echo "\n\t\t\t<img src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["hline"]["other"], "\" align=\"left\" hspace=\"0\" vspace=\"0\" alt=\"\" />";
+			echo "\n\t\t\t<img src=\"", $WT_IMAGES["hline"]["other"], "\" align=\"left\" hspace=\"0\" vspace=\"0\" alt=\"\" />";
 			echo "\n\t\t\t</td><td width=\"100%\">";
 		}
 		else echo "<tr><td width=\"100%\">";
@@ -273,18 +273,18 @@ for($i=($controller->treesize-1); $i>=0; $i--) {
 				echo "\n\t\t\t\t</td></tr><tr><td align=\"center\">";
 				echo "<a href=\"", encode_url("pedigree.php?PEDIGREE_GENERATIONS={$controller->PEDIGREE_GENERATIONS}&rootid={$controller->treeid[$did]}&show_full={$controller->show_full}&talloffset={$controller->talloffset}"), "\" ";
 				echo "onmouseover=\"swap_image('arrow$i', 3);\" onmouseout=\"swap_image('arrow$i', 3);\">";
-				echo "<img id=\"arrow$i\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["darrow"]["other"], "\" border=\"0\" alt=\"\" />";
+				echo "<img id=\"arrow$i\" src=\"", $WT_IMAGES["darrow"]["other"], "\" border=\"0\" alt=\"\" />";
 			}
 			else if ($talloffset < 2) {
 				echo "\n\t\t\t\t</td><td valign=\"middle\">";
 				echo "<a href=\"", encode_url("pedigree.php?PEDIGREE_GENERATIONS={$controller->PEDIGREE_GENERATIONS}&rootid={$controller->treeid[$did]}&show_full={$controller->show_full}&talloffset={$talloffset}"), "\" ";
 				if ($TEXT_DIRECTION=="rtl") {
 					echo "onmouseover=\"swap_image('arrow$i', 0);\" onmouseout=\"swap_image('arrow$i', 0);\">";
-					echo "<img id=\"arrow$i\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["larrow"]["other"], "\" border=\"0\" alt=\"\" />";
+					echo "<img id=\"arrow$i\" src=\"", $WT_IMAGES["larrow"]["other"], "\" border=\"0\" alt=\"\" />";
 				}
 				else {
 					echo "onmouseover=\"swap_image('arrow$i', 1);\" onmouseout=\"swap_image('arrow$i', 1);\">";
-					echo "<img id=\"arrow$i\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["rarrow"]["other"], "\" border=\"0\" alt=\"\" />";
+					echo "<img id=\"arrow$i\" src=\"", $WT_IMAGES["rarrow"]["other"], "\" border=\"0\" alt=\"\" />";
 				}
 				echo "</a>";
 			}
@@ -325,14 +325,14 @@ if ($controller->rootPerson->canDisplayDetails()) {
 		if ($talloffset < 2) {
 			if ($TEXT_DIRECTION=="rtl") echo "<a href=\"javascript: ", i18n::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 1);\" onmouseout=\"swap_image('larrow', 1);\">";
 			else echo "<a href=\"javascript: ", i18n::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 0);\" onmouseout=\"swap_image('larrow', 0);\">";
-			if ($TEXT_DIRECTION=="rtl") echo "<img id=\"larrow\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["rarrow"]["other"], "\" border=\"0\" alt=\"\" />";
-			else echo "<img id=\"larrow\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["larrow"]["other"], "\" border=\"0\" alt=\"\" />";
+			if ($TEXT_DIRECTION=="rtl") echo "<img id=\"larrow\" src=\"", $WT_IMAGES["rarrow"]["other"], "\" border=\"0\" alt=\"\" />";
+			else echo "<img id=\"larrow\" src=\"", $WT_IMAGES["larrow"]["other"], "\" border=\"0\" alt=\"\" />";
 		} else if ($talloffset==3) {
 			echo "<a href=\"javascript: ", i18n::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('uarrow', 2);\" onmouseout=\"swap_image('uarrow', 2);\">";
-			echo "<img id=\"uarrow\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["uarrow"]["other"], "\" border=\"0\" alt=\"\" />";
+			echo "<img id=\"uarrow\" src=\"", $WT_IMAGES["uarrow"]["other"], "\" border=\"0\" alt=\"\" />";
 		} else {
 			echo "<a href=\"javascript: ", i18n::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('darrow', 3);\" onmouseout=\"swap_image('darrow', 3);\">";
-			echo "<img id=\"darrow\" src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["darrow"]["other"], "\" border=\"0\" alt=\"\" />";
+			echo "<img id=\"darrow\" src=\"", $WT_IMAGES["darrow"]["other"], "\" border=\"0\" alt=\"\" />";
 		}
 		echo "</a>";
 		echo "\n\t\t</div>";
diff --git a/placelist.php b/placelist.php
index d77eaa9107..2252ccfa5a 100644
--- a/placelist.php
+++ b/placelist.php
@@ -307,7 +307,7 @@ if ($display=="hierarchy") {
 				echo "colspan=\"2\"";
 			}
 			echo ">&nbsp;";
-			echo "<img src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["place"]["small"], "\" border=\"0\" title=\"", i18n::translate('Place'), "\" alt=\"", i18n::translate('Place'), "\" />&nbsp;&nbsp;";
+			echo "<img src=\"", $WT_IMAGES["place"]["small"], "\" border=\"0\" title=\"", i18n::translate('Place'), "\" alt=\"", i18n::translate('Place'), "\" />&nbsp;&nbsp;";
 			if ($level>0) {
 				echo " ", i18n::translate('Place Hierarchy after'), ": ";
 				echo PrintReady($num_place);
@@ -429,7 +429,7 @@ if ($display=="list") {
 		echo ">\n\t\t<tr>\n\t\t<td class=\"list_label\" ";
 		$ct = count($placelist);
 		echo " colspan=\"", $ct>20 ? "3" : "2", "\">&nbsp;";
-		echo "<img src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["place"]["small"], "\" border=\"0\" title=\"", i18n::translate('Place'), "\" alt=\"", i18n::translate('Place'), "\" />&nbsp;&nbsp;";
+		echo "<img src=\"", $WT_IMAGES["place"]["small"], "\" border=\"0\" title=\"", i18n::translate('Place'), "\" alt=\"", i18n::translate('Place'), "\" />&nbsp;&nbsp;";
 		echo i18n::translate('Place List');
 		echo help_link('ppp_placelist');
 		echo "</td></tr><tr><td class=\"list_value_wrap\"><ul>";
diff --git a/relationship.php b/relationship.php
index d2312c81d1..fe042753bc 100644
--- a/relationship.php
+++ b/relationship.php
@@ -365,7 +365,7 @@ if ((!empty($pid1))&&(!empty($pid2))) {
 				$indirec = find_person_record($pid, WT_GED_ID);
 				if (strpos($indirec, "1 SEX F")!==false) $mfstyle="F";
 				if (strpos($indirec, "1 SEX M")!==false) $mfstyle="";
-				$arrow_img = $WT_IMAGE_DIR."/".$WT_IMAGES["darrow"]["other"];
+				$arrow_img = $WT_IMAGES["darrow"]["other"];
 				if ($node["relations"][$index]=="father" || $node["relations"][$index]=="mother" || $node["relations"][$index]=="parent") {
 					$line = $WT_IMAGES["vline"]["other"];
 					$liney += $Dbheight;
@@ -374,7 +374,7 @@ if ((!empty($pid1))&&(!empty($pid2))) {
 					$lw = 3;
 					//check for paternal grandparent relationship
 					if ($asc==0) $asc=1;
-					if ($asc==-1) $arrow_img = $WT_IMAGE_DIR."/".$WT_IMAGES["uarrow"]["other"];
+					if ($asc==-1) $arrow_img = $WT_IMAGES["uarrow"]["other"];
 					$lh=$ys;
 					$linex=$xoffset+$Dbwidth/2;
 					// put the box up or down ?
@@ -392,17 +392,17 @@ if ((!empty($pid1))&&(!empty($pid2))) {
 						if ($asc==-1) $liney=$yoffset+$Dbheight; else $liney=$yoffset-$lh;
 						$joinx = $xoffset-$xs;
 						$joiny = $liney-2-($asc-1)/2*$lh;
-						echo "<div id=\"joina", $index, "\" style=\"position:absolute; ", $TEXT_DIRECTION=="ltr"?"left":"right", ":", $joinx + $Dbxspacing, "px; top:", $joiny + $Dbyspacing, "px; z-index:-100; \" align=\"center\"><img src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["hline"]["other"], "\" align=\"left\" width=\"", $joinw, "\" height=\"", $joinh, "\" alt=\"\" /></div>\n";
+						echo "<div id=\"joina", $index, "\" style=\"position:absolute; ", $TEXT_DIRECTION=="ltr"?"left":"right", ":", $joinx + $Dbxspacing, "px; top:", $joiny + $Dbyspacing, "px; z-index:-100; \" align=\"center\"><img src=\"", $WT_IMAGES["hline"]["other"], "\" align=\"left\" width=\"", $joinw, "\" height=\"", $joinh, "\" alt=\"\" /></div>\n";
 						$joinw = $xs/2+2;
 						$joinx = $joinx+$xs/2;
 						$joiny = $joiny+$asc*$lh;
-						echo "<div id=\"joinb", $index, "\" style=\"position:absolute; ", $TEXT_DIRECTION=="ltr"?"left":"right", ":", $joinx + $Dbxspacing, "px; top:", $joiny + $Dbyspacing, "px; z-index:-100; \" align=\"center\"><img src=\"", $WT_IMAGE_DIR, "/", $WT_IMAGES["hline"]["other"], "\" align=\"left\" width=\"", $joinw, "\" height=\"", $joinh, "\" alt=\"\" /></div>\n";
+						echo "<div id=\"joinb", $index, "\" style=\"position:absolute; ", $TEXT_DIRECTION=="ltr"?"left":"right", ":", $joinx + $Dbxspacing, "px; top:", $joiny + $Dbyspacing, "px; z-index:-100; \" align=\"center\"><img src=\"", $WT_IMAGES["hline"]["other"], "\" align=\"left\" width=\"", $joinw, "\" height=\"", $joinh, "\" alt=\"\" /></div>\n";
 					}
 					$previous2=$previous;
 					$previous="parent";
 				}
 				if ($node["relations"][$index]=="brother" || $node["relations"][$index]=="sister" || $node["relations"][$index]=="sibling") {
-					$arrow_img = $WT_IMAGE_DIR."/".$rArrow;
+					$arrow_img = $rArrow;
 					$xoffset += $Dbwidth+$Dbxspacing+70;
 					$colNum ++;
 					//$rowNum is inherited from the box immediately to the left
@@ -418,7 +418,7 @@ if ((!empty($pid1))&&(!empty($pid2))) {
 					$previous="";
 				}
 				if ($node["relations"][$index]=="husband" || $node["relations"][$index]=="wife" || $node["relations"][$index]=="spouse") {
-					$arrow_img = $WT_IMAGE_DIR."/".$rArrow;
+					$arrow_img = $rArrow;
 					$xoffset += $Dbwidth+$Dbxspacing+70;
 					$colNum ++;
 					//$rowNum is inherited from the box immediately to the left
@@ -440,7 +440,7 @@ if ((!empty($pid1))&&(!empty($pid2))) {
 					$lh = 54;
 					$lw = 3;
 					if ($asc==0) $asc=-1;
-					if ($asc==1) $arrow_img = $WT_IMAGE_DIR."/".$WT_IMAGES["uarrow"]["other"];
+					if ($asc==1) $arrow_img = $WT_IMAGES["uarrow"]["other"];
 					$lh=$ys;
 					$linex = $xoffset+$Dbwidth/2;
 					// put the box up or down ?
@@ -458,11 +458,11 @@ if ((!empty($pid1))&&(!empty($pid2))) {
 						if ($asc==1) $liney=$yoffset+$Dbheight; else $liney=$yoffset-($lh+$Dbyspacing);
 						$joinx = $xoffset-$xs;
 						$joiny = $liney-2+($asc+1)/2*$lh;
-						print "<div id=\"joina$index\" style=\"position:absolute; ".($TEXT_DIRECTION=="ltr"?"left":"right").":".($joinx+$Dbxspacing)."px; top:".($joiny+$Dbyspacing)."px; z-index:-100; \" align=\"center\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" align=\"left\" width=\"".$joinw."\" height=\"".$joinh."\" alt=\"\" /></div>\n";
+						print "<div id=\"joina$index\" style=\"position:absolute; ".($TEXT_DIRECTION=="ltr"?"left":"right").":".($joinx+$Dbxspacing)."px; top:".($joiny+$Dbyspacing)."px; z-index:-100; \" align=\"center\"><img src=\"".$WT_IMAGES["hline"]["other"]."\" align=\"left\" width=\"".$joinw."\" height=\"".$joinh."\" alt=\"\" /></div>\n";
 						$joinw = $xs/2+2;
 						$joinx = $joinx+$xs/2;
 						$joiny = $joiny-$asc*$lh;
-						print "<div id=\"joinb$index\" style=\"position:absolute; ".($TEXT_DIRECTION=="ltr"?"left":"right").":".($joinx+$Dbxspacing)."px; top:".($joiny+$Dbyspacing)."px; z-index:-100; \" align=\"center\"><img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]."\" align=\"left\" width=\"".$joinw."\" height=\"".$joinh."\" alt=\"\" /></div>\n";
+						print "<div id=\"joinb$index\" style=\"position:absolute; ".($TEXT_DIRECTION=="ltr"?"left":"right").":".($joinx+$Dbxspacing)."px; top:".($joiny+$Dbyspacing)."px; z-index:-100; \" align=\"center\"><img src=\"".$WT_IMAGES["hline"]["other"]."\" align=\"left\" width=\"".$joinw."\" height=\"".$joinh."\" alt=\"\" /></div>\n";
 					}
 					$previous2=$previous;
 					$previous="child";
@@ -479,13 +479,13 @@ if ((!empty($pid1))&&(!empty($pid2))) {
 				if ($index>0) {
 					if ($TEXT_DIRECTION=="rtl" && $line!=$WT_IMAGES["hline"]["other"]) {
 						print "<div id=\"line$index\" dir=\"ltr\" style=\"background:none; position:absolute; right:".($plinex+$Dbxspacing)."px; top:".($liney+$Dbyspacing)."px; width:".($lw+$lh*2)."px; z-index:-100; \" align=\"right\">";
-						print "<img src=\"$WT_IMAGE_DIR/$line\" align=\"right\" width=\"$lw\" height=\"$lh\" alt=\"\" />\n";
+						print "<img src=\"$line\" align=\"right\" width=\"$lw\" height=\"$lh\" alt=\"\" />\n";
 						print "<br />";
 						print i18n::translate($node["relations"][$index])."\n";
 						print "<img src=\"$arrow_img\" border=\"0\" align=\"middle\" alt=\"\" />\n";
 					}
 					else {
-						print "<div id=\"line$index\" style=\"background:none;  position:absolute; ".($TEXT_DIRECTION=="ltr"?"left":"right").":".($plinex+$Dbxspacing)."px; top:".($liney+$Dbyspacing)."px; width:".($lw+$lh*2)."px; z-index:-100; \" align=\"".($lh==3?"center":"left")."\"><img src=\"$WT_IMAGE_DIR/$line\" align=\"left\" width=\"$lw\" height=\"$lh\" alt=\"\" />\n";
+						print "<div id=\"line$index\" style=\"background:none;  position:absolute; ".($TEXT_DIRECTION=="ltr"?"left":"right").":".($plinex+$Dbxspacing)."px; top:".($liney+$Dbyspacing)."px; width:".($lw+$lh*2)."px; z-index:-100; \" align=\"".($lh==3?"center":"left")."\"><img src=\"$line\" align=\"left\" width=\"$lw\" height=\"$lh\" alt=\"\" />\n";
 						print "<br />";
 						print "<img src=\"$arrow_img\" border=\"0\" align=\"middle\" alt=\"\" />\n";
 						if ($lh == 3) print "<br />"; // note: $lh==3 means horiz arrow
diff --git a/reportengine.php b/reportengine.php
index d762b7e219..2e4af7abc1 100644
--- a/reportengine.php
+++ b/reportengine.php
@@ -309,7 +309,7 @@ elseif ($action=="setup") {
 						} elseif ($input["lookup"]=="DATE") {
 							$text = i18n::translate('Select a date');
 							if (isset($WT_IMAGES["calendar"]["button"])) {
-								$Link = "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["calendar"]["button"]."\" name=\"a_".$input["name"]."\" id=\"a_".$input["name"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
+								$Link = "<img src=\"".$WT_IMAGES["calendar"]["button"]."\" name=\"a_".$input["name"]."\" id=\"a_".$input["name"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />";
 							} else {
 								$Link = $text;
 							}
@@ -330,8 +330,8 @@ elseif ($action=="setup") {
 		<tr><td class="descriptionbox width30 wrap"></td>
 		<td class="optionbox">
 		<table><tr>
-		<td><img src="<?php echo isset($WT_IMAGES["media"]["pdf"]) ? $WT_IMAGE_DIR."/".$WT_IMAGES["media"]["pdf"] : "images/media/pdf.gif";?>" alt="PDF" title="PDF" /></td>
-		<td><img src="<?php echo isset($WT_IMAGES["media"]["html"]) ? $WT_IMAGE_DIR."/".$WT_IMAGES["media"]["html"] : "images/media/html.gif";?>" alt="HTML" title="HTML" /></td>
+		<td><img src="<?php echo isset($WT_IMAGES["media"]["pdf"]) ? $WT_IMAGES["media"]["pdf"] : "images/media/pdf.gif";?>" alt="PDF" title="PDF" /></td>
+		<td><img src="<?php echo isset($WT_IMAGES["media"]["html"]) ? $WT_IMAGES["media"]["html"] : "images/media/html.gif";?>" alt="HTML" title="HTML" /></td>
 		</tr><tr>
 		<td><center><input type="radio" name="output" value="PDF" checked="checked" /></center></td>
 		<td><center><input type="radio" name="output" value="HTML" <?php if ($output=="HTML") echo " checked=\"checked\"";?> /></center></td>
diff --git a/sidebar.php b/sidebar.php
index 7a7d2b261c..48c57d63bc 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -77,7 +77,7 @@ if ($sb_action!='none') {
 				<h3 title="<?php echo $mod->getName()?>"><a href="#"><?php echo $mod->getTitle()?></a></h3>
 				<div id="sb_content_<?php echo $mod->getName()?>">
 				<?php if ($counter==0) echo $mod->getSidebarContent();
-				else {?><img src="<?php echo $WT_IMAGE_DIR ?>/loading.gif" /><?php }?>
+				else {?><img src="<?php echo WT_THEME_DIR ?>images/loading.gif" /><?php }?>
 				</div>
 				<?php 
 				$counter++;
@@ -164,13 +164,13 @@ jQuery(document).ready(function() {
 	// Sidebar Pin Function 
 	jQuery('#sidebar_pin').toggle(
    		   	function() {
-   	   		   	jQuery('#sidebar_pin img').attr('src', '<?php echo $WT_IMAGE_DIR.'/'.$WT_IMAGES['pin-in']['other'];?>').attr('title', '<?php echo i18n::translate('Unpin Sidebar');?>');
+   	   		   	jQuery('#sidebar_pin img').attr('src', '<?php echo $WT_IMAGES['pin-in']['other'];?>').attr('title', '<?php echo i18n::translate('Unpin Sidebar');?>');
    	   			jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=true');
    	   			pinned = true;
    		   	},
    		   	
    		   	function() {
-   		   		jQuery('#sidebar_pin img').attr('src', '<?php echo $WT_IMAGE_DIR.'/'.$WT_IMAGES['pin-out']['other'];?>').attr('title', '<?php echo i18n::translate('Pin Sidebar');?>');
+   		   		jQuery('#sidebar_pin img').attr('src', '<?php echo $WT_IMAGES['pin-out']['other'];?>').attr('title', '<?php echo i18n::translate('Pin Sidebar');?>');
    		   		jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=false');
    		   		pinned = false;
    		   	});
@@ -184,7 +184,7 @@ jQuery(document).ready(function() {
 	// Sidebar Open/Close Function 
 	// Sidebar Open 
 	jQuery('#sidebar_open').toggle(function() {
-		jQuery('#sidebar_open img').attr('style', 'margin-left:255px;' ).attr('src', '<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES['slide_close']['other'];?>').attr('title', '<?php echo i18n::translate('Sidebar Close');?>');
+		jQuery('#sidebar_open img').attr('style', 'margin-left:255px;' ).attr('src', '<?php echo $WT_IMAGES['slide_close']['other'];?>').attr('title', '<?php echo i18n::translate('Sidebar Close');?>');
 		jQuery('#sidebar').animate({
 			right: "0px",
 			width: "260px"
@@ -222,7 +222,7 @@ jQuery(document).ready(function() {
 		
 	// Sidebar Close 
 	}, function() {
-		jQuery('#sidebar_open img').attr('style', 'margin-left:0px;' ).attr('src', '<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES['slide_open']['other'];?>').attr('title', '<?php echo i18n::translate('Sidebar Open');?>');
+		jQuery('#sidebar_open img').attr('style', 'margin-left:0px;' ).attr('src', '<?php echo $WT_IMAGES['slide_open']['other'];?>').attr('title', '<?php echo i18n::translate('Sidebar Open');?>');
 		jQuery('#sidebar').css('left', '');
 		jQuery('#sidebar').animate({
 			right: "4px",
@@ -268,15 +268,15 @@ jQuery(document).ready(function() {
 	if ( isset($_SESSION['WT_pin']) && $_SESSION['WT_pin'] && $sidebar_state == "open") {
 	?>
 		<div id="sidebar_controls" class="ui-accordion-header ui-helper-reset ui-state-active ui-corner-top ui-state-focus">
-			<a id="sidebar_open" href="#open"><img style="margin-left:0px;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES['slide_close']['other'];?>" border="0" title="<?php echo i18n::translate('Sidebar Open');?>" alt="" /></a> 
-			<a id="sidebar_pin" href="#pin"><img src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES['pin-out']['other'];?>" border="0" title="<?php echo i18n::translate('Pin Sidebar');?>" alt="" /></a> 
+			<a id="sidebar_open" href="#open"><img style="margin-left:0px;" src="<?php echo $WT_IMAGES['slide_close']['other'];?>" border="0" title="<?php echo i18n::translate('Sidebar Open');?>" alt="" /></a> 
+			<a id="sidebar_pin" href="#pin"><img src="<?php echo $WT_IMAGES['pin-out']['other'];?>" border="0" title="<?php echo i18n::translate('Pin Sidebar');?>" alt="" /></a> 
 		</div>
 	<?php
 	} else {
 	?>
 		<div id="sidebar_controls" class="ui-accordion-header ui-helper-reset ui-state-active ui-corner-top ui-state-focus">
-			<a id="sidebar_open" href="#open"><img style="margin-left:0px;" src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES['slide_open']['other'];?>" border="0" title="<?php echo i18n::translate('Sidebar Open');?>" alt="" /></a> 
-			<a id="sidebar_pin" href="#pin"><img src="<?php echo $WT_IMAGE_DIR."/".$WT_IMAGES['pin-out']['other'];?>" border="0" title="<?php echo i18n::translate('Pin Sidebar');?>" alt="" /></a> 
+			<a id="sidebar_open" href="#open"><img style="margin-left:0px;" src="<?php echo $WT_IMAGES['slide_open']['other'];?>" border="0" title="<?php echo i18n::translate('Sidebar Open');?>" alt="" /></a> 
+			<a id="sidebar_pin" href="#pin"><img src="<?php echo $WT_IMAGES['pin-out']['other'];?>" border="0" title="<?php echo i18n::translate('Pin Sidebar');?>" alt="" /></a> 
 		</div>
 	<?php
 	}
diff --git a/statistics.php b/statistics.php
index e56c3dec20..2b9b679ce7 100644
--- a/statistics.php
+++ b/statistics.php
@@ -765,7 +765,6 @@ if (isset($content) && $content==1) {
 
 	jQuery(document).ready(function(){
 		// TODO: change images directory when the common images will be deleted.
-		// jQuery('#tabs').tabs({ spinner: '<img src=\"<?php echo $WT_IMAGE_DIR; ?>/loading.gif\" height=\"18\" border=\"0\" />' });
 		jQuery('#tabs').tabs({ spinner: '<img src=\"images/loading.gif\" height=\"18\" border=\"0\" />' });
 		jQuery("#tabs").tabs({ cache: true, selected: selectedTab });
 		var $tabs = jQuery('#tabs');
diff --git a/themes/clouds/footer.php b/themes/clouds/footer.php
index 0d4702ceeb..02e0acf2a7 100644
--- a/themes/clouds/footer.php
+++ b/themes/clouds/footer.php
@@ -38,7 +38,7 @@ echo "<div id=\"footer\" class=\"$TEXT_DIRECTION\">";
 echo "\n\t<br /><div align=\"center\" style=\"width:99%;\">";
 echo contact_links();
 echo "\n\t<br />";
-echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
+echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
 echo "\n\t<br />";
 
 
diff --git a/themes/clouds/header.php b/themes/clouds/header.php
index 10443a74f7..1ab7e4d55e 100644
--- a/themes/clouds/header.php
+++ b/themes/clouds/header.php
@@ -109,7 +109,7 @@ flush(); // Allow the browser to start fetching external stylesheets, javascript
 	echo '<div id="rapcontainer">',
 		 '<div id="header" class="', $TEXT_DIRECTION, '">';
 ?>
-<table class="header" style="background:url('<?php echo $WT_IMAGE_DIR; ?>/clouds.gif')" >
+<table class="header" style="background:url('<?php echo WT_THEME_DIR; ?>images/clouds.gif')" >
 <?php
 	echo '<tr>',
 		 '<td align="', $TEXT_DIRECTION=="ltr"?"left":"right", '" valign="middle" >',
@@ -130,7 +130,7 @@ if(empty($SEARCH_SPIDER)) {
 		 '<input type="hidden" name="action" value="general" />',
 		 '<input type="hidden" name="topsearch" value="yes" />',
 		 '<input type="text" class="formbut" name="query" size="15" value="', i18n::translate('Search'), '" onfocus="if (this.value==\'', i18n::translate('Search'), '\') this.value=\'\'; focusHandler();" onblur="if (this.value==\'\') this.value=\'', i18n::translate('Search'), '\';" />',
-		 '<input type="image" src="', $WT_IMAGE_DIR, '/go.gif', '" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />', 
+		 '<input type="image" src="', WT_THEME_DIR, 'images/go.gif', '" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />', 
 		 '</form>',
 		 '</div>';
 }
diff --git a/themes/clouds/theme.php b/themes/clouds/theme.php
index 13b8a6f119..5c1de33e0b 100644
--- a/themes/clouds/theme.php
+++ b/themes/clouds/theme.php
@@ -33,175 +33,177 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-$theme_name       = "clouds";
-$modules 		  = WT_THEME_DIR . "modules.css";
-$stylesheet       = WT_THEME_DIR . "style.css";
-$print_stylesheet = WT_THEME_DIR . "print.css";			//-- CSS level 2 print stylesheet to use
-$headerfile       = WT_THEME_DIR . "header.php";		//-- Header information for the site
-$rtl_stylesheet   = WT_THEME_DIR . "style_rtl.css";		//-- CSS level 2 stylesheet to use   
-$footerfile       = WT_THEME_DIR . "footer.php";		//-- Footer information for the site     
-$WT_IMAGE_DIR     = WT_THEME_DIR . "images";			//-- directory to look for images
-$FAVICON          = $WT_IMAGE_DIR. "/favicon.ico";
-$WT_USE_HELPIMG   = true;                                // set to true to use image for help questionmark, set to false to use $wt_lang["qm"]
-$WT_MENU_LOCATION = "top";
+$theme_name       = "clouds"; // need double quotes, as file is scanned/parsed by script
+$modules          = WT_THEME_DIR . 'modules.css';
+$stylesheet       = WT_THEME_DIR . 'style.css';
+$print_stylesheet = WT_THEME_DIR . 'print.css';
+$headerfile       = WT_THEME_DIR . 'header.php';
+$rtl_stylesheet   = WT_THEME_DIR . 'style_rtl.css';
+$footerfile       = WT_THEME_DIR . 'footer.php';
+$FAVICON          = WT_THEME_DIR . 'images/favicon.ico';
+$WT_USE_HELPIMG   = true;
+$WT_MENU_LOCATION = 'top';
 
 //-- variables for image names
 //- WT main icons
-$WT_IMAGES["calendar"]["large"] = "calendar.gif";
-$WT_IMAGES["clippings"]["large"] = "clippings.gif";
-$WT_IMAGES["favorite"]["large"] = "fav.gif";
-$WT_IMAGES["gedcom"]["large"] = "gedcom.gif";
-$WT_IMAGES["help"]["large"] = "help.gif";
-$WT_IMAGES["home"]["large"] = "home.gif";
-$WT_IMAGES["indis"]["large"] = "indis.gif";
-$WT_IMAGES["lists"]["large"] = "lists.gif";
-$WT_IMAGES["media"]["large"] = "media.gif";
-$WT_IMAGES["menu_repository"]["large"] = "menu_repository.gif";
-$WT_IMAGES["menu_source"]["large"] = "menu_source.gif";
-$WT_IMAGES["mypage"]["large"] = "mypage.gif";
-$WT_IMAGES["notes"]["large"] = "notes.gif";
-$WT_IMAGES["pedigree"]["large"] = "pedigree.gif";
-$WT_IMAGES["printer"]["large"] = "printer.gif";
-$WT_IMAGES["reports"]["large"] = "report.gif";
-$WT_IMAGES["repository"]["large"] = "repository.gif";
-$WT_IMAGES["search"]["large"] = "search.gif";
-$WT_IMAGES["sfamily"]["large"] = "sfamily.gif";
-$WT_IMAGES["source"]["large"] = "source.gif";
-$WT_IMAGES["sex"]["large"] = "male.gif";
-$WT_IMAGES["sexf"]["large"] = "female.gif";
-$WT_IMAGES["sexn"]["large"] = "fe_male.gif";
-$WT_IMAGES["edit_source"]["large"] = "small/edit_sour.gif";
+$WT_IMAGES['calendar']['large'] = WT_THEME_DIR.'images/calendar.gif';
+$WT_IMAGES['clippings']['large'] = WT_THEME_DIR.'images/clippings.gif';
+$WT_IMAGES['favorite']['large'] = WT_THEME_DIR.'images/fav.gif';
+$WT_IMAGES['gedcom']['large'] = WT_THEME_DIR.'images/gedcom.gif';
+$WT_IMAGES['help']['large'] = WT_THEME_DIR.'images/help.gif';
+$WT_IMAGES['home']['large'] = WT_THEME_DIR.'images/home.gif';
+$WT_IMAGES['indis']['large'] = WT_THEME_DIR.'images/indis.gif';
+$WT_IMAGES['lists']['large'] = WT_THEME_DIR.'images/lists.gif';
+$WT_IMAGES['media']['large'] = WT_THEME_DIR.'images/media.gif';
+$WT_IMAGES['menu_repository']['large'] = WT_THEME_DIR.'images/menu_repository.gif';
+$WT_IMAGES['menu_source']['large'] = WT_THEME_DIR.'images/menu_source.gif';
+$WT_IMAGES['mypage']['large'] = WT_THEME_DIR.'images/mypage.gif';
+$WT_IMAGES['notes']['large'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['pedigree']['large'] = WT_THEME_DIR.'images/pedigree.gif';
+$WT_IMAGES['printer']['large'] = WT_THEME_DIR.'images/printer.gif';
+$WT_IMAGES['reports']['large'] = WT_THEME_DIR.'images/report.gif';
+$WT_IMAGES['repository']['large'] = WT_THEME_DIR.'images/repository.gif';
+$WT_IMAGES['search']['large'] = WT_THEME_DIR.'images/search.gif';
+$WT_IMAGES['sfamily']['large'] = WT_THEME_DIR.'images/sfamily.gif';
+$WT_IMAGES['source']['large'] = WT_THEME_DIR.'images/source.gif';
+$WT_IMAGES['sex']['large'] = WT_THEME_DIR.'images/male.gif';
+$WT_IMAGES['sexf']['large'] = WT_THEME_DIR.'images/female.gif';
+$WT_IMAGES['sexn']['large'] = WT_THEME_DIR.'images/fe_male.gif';
+$WT_IMAGES['edit_source']['large'] = WT_THEME_DIR.'images/small/edit_sour.gif';
 
-$WT_IMAGES["edit_fam"]["large"] = "edit_fam.gif";
-$WT_IMAGES["edit_indi"]["large"] = "edit_indi.gif";
-$WT_IMAGES["edit_media"]["large"] = "edit_indi.gif";
-$WT_IMAGES["edit_note"]["large"] = "edit_indi.gif";
-$WT_IMAGES["edit_sour"]["large"] = "edit_sour.gif";
-$WT_IMAGES["edit_repo"]["large"] = "Sedit_repo.gif";
+$WT_IMAGES['edit_fam']['large'] = WT_THEME_DIR.'images/edit_fam.gif';
+$WT_IMAGES['edit_indi']['large'] = WT_THEME_DIR.'images/edit_indi.gif';
+$WT_IMAGES['edit_media']['large'] = WT_THEME_DIR.'images/edit_indi.gif';
+$WT_IMAGES['edit_note']['large'] = WT_THEME_DIR.'images/edit_indi.gif';
+$WT_IMAGES['edit_sour']['large'] = WT_THEME_DIR.'images/edit_sour.gif';
+$WT_IMAGES['edit_repo']['large'] = WT_THEME_DIR.'images/Sedit_repo.gif';
 
 //- PGV small icons
-$WT_IMAGES["admin"]["small"] = "small/admin.gif";
-$WT_IMAGES["ancestry"]["small"] = "small/ancestry.gif";
-$WT_IMAGES["calendar"]["small"] = "small/calendar.gif";
-$WT_IMAGES["cfamily"]["small"] = "small/cfamily.gif";
-$WT_IMAGES["childless"]["small"] = "small/childless.gif";
-$WT_IMAGES["clippings"]["small"] = "small/clippings.gif";
-$WT_IMAGES["descendant"]["small"] = "small/descendancy.gif";
-$WT_IMAGES["edit_fam"]["small"] = "small/edit_fam.gif";
-$WT_IMAGES["edit_sour"]["small"] = "small/edit_sour.gif";
-$WT_IMAGES["edit_repo"]["small"] = "small/edit_repo.gif";
-$WT_IMAGES["fambook"]["small"] = "small/fambook.gif";
-$WT_IMAGES["fanchart"]["small"] = "small/fanchart.gif";
-$WT_IMAGES["favorite"]["small"] = "small/fav.gif";
-$WT_IMAGES["favorites"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["gedcom"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["help"]["small"] = "small/help.gif";
-$WT_IMAGES["home"]["small"] = "small/home.gif";
-$WT_IMAGES["hourglass"]["small"] = "small/hourglass.gif";
-$WT_IMAGES["indis"]["small"] = "small/indis.gif";
-$WT_IMAGES["lists"]["small"] = "small/lists.gif";
-$WT_IMAGES["media"]["small"] = "small/media.gif";
-$WT_IMAGES["menu_help"]["small"] = "small/menu_help.gif";
-$WT_IMAGES["menu_media"]["small"] = "small/menu_media.gif";
-$WT_IMAGES["menu_repository"]["small"] = "small/menu_repository.gif";
-$WT_IMAGES["menu_source"]["small"] = "small/menu_source.gif";
-$WT_IMAGES["mypage"]["small"] = "small/mypage.gif";
-$WT_IMAGES["notes"]["small"] = "small/notes.gif";
-$WT_IMAGES["patriarch"]["small"] = "small/patriarch.gif";
-$WT_IMAGES["pedigree"]["small"] = "small/pedigree.gif";
-$WT_IMAGES["place"]["small"] = "small/place.gif";
-$WT_IMAGES["printer"]["small"] = "small/printer.gif";
-$WT_IMAGES["relationship"]["small"] = "small/relationship.gif";
-$WT_IMAGES["reports"]["small"] = "small/report.gif";
-$WT_IMAGES["repository"]["small"] = "small/repository.gif";
-$WT_IMAGES["rings"]["small"] = "small/rings.gif";
-$WT_IMAGES["search"]["small"] = "small/search.gif";
-$WT_IMAGES["sex"]["small"] = "small/male.gif";
-$WT_IMAGES["sexf"]["small"] = "small/female.gif";
-$WT_IMAGES["sexn"]["small"] = "small/fe_male.gif";
-$WT_IMAGES["sfamily"]["small"] = "small/sfamily.gif";
-$WT_IMAGES["source"]["small"] = "small/source.gif";
-$WT_IMAGES["statistic"]["small"] = "small/statistic.gif";
-$WT_IMAGES["timeline"]["small"] = "small/timeline.gif";
-$WT_IMAGES["tree"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["wiki"]["small"] = "small/w_22.png";
+$WT_IMAGES['admin']['small'] = WT_THEME_DIR.'images/small/admin.gif';
+$WT_IMAGES['ancestry']['small'] = WT_THEME_DIR.'images/small/ancestry.gif';
+$WT_IMAGES['calendar']['small'] = WT_THEME_DIR.'images/small/calendar.gif';
+$WT_IMAGES['cfamily']['small'] = WT_THEME_DIR.'images/small/cfamily.gif';
+$WT_IMAGES['childless']['small'] = WT_THEME_DIR.'images/small/childless.gif';
+$WT_IMAGES['clippings']['small'] = WT_THEME_DIR.'images/small/clippings.gif';
+$WT_IMAGES['descendant']['small'] = WT_THEME_DIR.'images/small/descendancy.gif';
+$WT_IMAGES['edit_fam']['small'] = WT_THEME_DIR.'images/small/edit_fam.gif';
+$WT_IMAGES['edit_indi']['small'] = WT_THEME_DIR.'images/small/edit_indi.gif';
+$WT_IMAGES['edit_media']['small'] = WT_THEME_DIR.'images/small/edit_media.gif';
+$WT_IMAGES['edit_note']['small'] = WT_THEME_DIR.'images/small/edit_note.gif';
+$WT_IMAGES['edit_sour']['small'] = WT_THEME_DIR.'images/small/edit_sour.gif';
+$WT_IMAGES['edit_repo']['small'] = WT_THEME_DIR.'images/small/edit_repo.gif';
+$WT_IMAGES['fambook']['small'] = WT_THEME_DIR.'images/small/fambook.gif';
+$WT_IMAGES['fanchart']['small'] = WT_THEME_DIR.'images/small/fanchart.gif';
+$WT_IMAGES['favorite']['small'] = WT_THEME_DIR.'images/small/fav.gif';
+$WT_IMAGES['favorites']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['gedcom']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['help']['small'] = WT_THEME_DIR.'images/small/help.gif';
+$WT_IMAGES['home']['small'] = WT_THEME_DIR.'images/small/home.gif';
+$WT_IMAGES['hourglass']['small'] = WT_THEME_DIR.'images/small/hourglass.gif';
+$WT_IMAGES['indis']['small'] = WT_THEME_DIR.'images/small/indis.gif';
+$WT_IMAGES['lists']['small'] = WT_THEME_DIR.'images/small/lists.gif';
+$WT_IMAGES['media']['small'] = WT_THEME_DIR.'images/small/media.gif';
+$WT_IMAGES['menu_help']['small'] = WT_THEME_DIR.'images/small/menu_help.gif';
+$WT_IMAGES['menu_media']['small'] = WT_THEME_DIR.'images/small/menu_media.gif';
+$WT_IMAGES['menu_repository']['small'] = WT_THEME_DIR.'images/small/menu_repository.gif';
+$WT_IMAGES['menu_source']['small'] = WT_THEME_DIR.'images/small/menu_source.gif';
+$WT_IMAGES['mypage']['small'] = WT_THEME_DIR.'images/small/mypage.gif';
+$WT_IMAGES['notes']['small'] = WT_THEME_DIR.'images/small/notes.gif';
+$WT_IMAGES['patriarch']['small'] = WT_THEME_DIR.'images/small/patriarch.gif';
+$WT_IMAGES['pedigree']['small'] = WT_THEME_DIR.'images/small/pedigree.gif';
+$WT_IMAGES['place']['small'] = WT_THEME_DIR.'images/small/place.gif';
+$WT_IMAGES['printer']['small'] = WT_THEME_DIR.'images/small/printer.gif';
+$WT_IMAGES['relationship']['small'] = WT_THEME_DIR.'images/small/relationship.gif';
+$WT_IMAGES['reports']['small'] = WT_THEME_DIR.'images/small/report.gif';
+$WT_IMAGES['repository']['small'] = WT_THEME_DIR.'images/small/repository.gif';
+$WT_IMAGES['rings']['small'] = WT_THEME_DIR.'images/small/rings.gif';
+$WT_IMAGES['search']['small'] = WT_THEME_DIR.'images/small/search.gif';
+$WT_IMAGES['sex']['small'] = WT_THEME_DIR.'images/small/male.gif';
+$WT_IMAGES['sexf']['small'] = WT_THEME_DIR.'images/small/female.gif';
+$WT_IMAGES['sexn']['small'] = WT_THEME_DIR.'images/small/fe_male.gif';
+$WT_IMAGES['sfamily']['small'] = WT_THEME_DIR.'images/small/sfamily.gif';
+$WT_IMAGES['source']['small'] = WT_THEME_DIR.'images/small/source.gif';
+$WT_IMAGES['statistic']['small'] = WT_THEME_DIR.'images/small/statistic.gif';
+$WT_IMAGES['timeline']['small'] = WT_THEME_DIR.'images/small/timeline.gif';
+$WT_IMAGES['tree']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['wiki']['small'] = WT_THEME_DIR.'images/small/w_22.png';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES["addmedia"]["button"] = "buttons/addmedia.gif";
-$WT_IMAGES["addrepository"]["button"] = "buttons/addrepository.gif";
-$WT_IMAGES["addsource"]["button"] = "buttons/addsource.gif";
-$WT_IMAGES["addnote"]["button"] = "buttons/addnote.gif";
-$WT_IMAGES["autocomplete"]["button"] = "buttons/autocomplete.gif";
-$WT_IMAGES["calendar"]["button"] = "buttons/calendar.gif";
-$WT_IMAGES["family"]["button"] = "buttons/family.gif";
-$WT_IMAGES["head"]["button"] = "buttons/head.gif";
-$WT_IMAGES["indi"]["button"] = "buttons/indi.gif";
-$WT_IMAGES["keyboard"]["button"] = "buttons/keyboard.gif";
-$WT_IMAGES["media"]["button"] = "buttons/media.gif";
-$WT_IMAGES["note"]["button"] = "buttons/note.gif";
-$WT_IMAGES["place"]["button"] = "buttons/place.gif";
-$WT_IMAGES["refresh"]["button"] = "buttons/refresh.gif";
-$WT_IMAGES["repository"]["button"] = "buttons/repository.gif";
-$WT_IMAGES["source"]["button"] = "buttons/source.gif";
-$WT_IMAGES["note"]["button"] = "buttons/note.gif";
-$WT_IMAGES["head"]["button"] = "buttons/head.gif";
-$WT_IMAGES["find_facts"]["button"] = "buttons/find_facts.png";
+$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['autocomplete']['button'] = WT_THEME_DIR.'images/buttons/autocomplete.gif';
+$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['refresh']['button'] = WT_THEME_DIR.'images/buttons/refresh.gif';
+$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES["media"]["audio"] = "media/audio.png";
-$WT_IMAGES["media"]["doc"] = "media/doc.gif";
-$WT_IMAGES["media"]["flash"] = "media/flash.png";
-$WT_IMAGES["media"]["flashrem"] = "media/flashrem.png";
-$WT_IMAGES["media"]["ged"] = "media/ged.gif";
-$WT_IMAGES["media"]["globe"] = "media/globe.png";
-$WT_IMAGES["media"]["html"] = "media/html.gif";
-$WT_IMAGES["media"]["picasa"] = "media/picasa.png";
-$WT_IMAGES["media"]["pdf"] = "media/pdf.gif";
-$WT_IMAGES["media"]["tex"] = "media/tex.gif";
-$WT_IMAGES["media"]["wmv"] = "media/wmv.png";
-$WT_IMAGES["media"]["wmvrem"] = "media/wmvrem.png";
+$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES["add"]["other"] = "add.gif";
-$WT_IMAGES["darrow"]["other"] = "darrow.gif";
-$WT_IMAGES["darrow2"]["other"] = "darrow2.gif";
-$WT_IMAGES["ddarrow"]["other"] = "ddarrow.gif";
-$WT_IMAGES["dline"]["other"] = "dline.gif";
-$WT_IMAGES["dline2"]["other"] = "dline2.gif";
-$WT_IMAGES["webtrees"]["other"] = "webtrees.png";
-$WT_IMAGES["hline"]["other"] = "hline.gif";
-$WT_IMAGES["larrow"]["other"] = "larrow.gif";
-$WT_IMAGES["larrow2"]["other"] = "larrow2.gif";
-$WT_IMAGES["ldarrow"]["other"] = "ldarrow.gif";
-$WT_IMAGES["minus"]["other"] = "minus.gif";
-$WT_IMAGES["note"]["other"] = "notes.gif";
-$WT_IMAGES["plus"]["other"] = "plus.gif";
-$WT_IMAGES["rarrow"]["other"] = "rarrow.gif";
-$WT_IMAGES["rarrow2"]["other"] = "rarrow2.gif";
-$WT_IMAGES["rdarrow"]["other"] = "rdarrow.gif";
-$WT_IMAGES["remove"]["other"] = "remove.gif";
-$WT_IMAGES["spacer"]["other"] = "spacer.gif";
-$WT_IMAGES["uarrow"]["other"] = "uarrow.gif";
-$WT_IMAGES["uarrow2"]["other"] = "uarrow2.gif";
-$WT_IMAGES["uarrow3"]["other"] = "uarrow3.gif";
-$WT_IMAGES["udarrow"]["other"] = "udarrow.gif";
-$WT_IMAGES["vline"]["other"] = "vline.gif";
-$WT_IMAGES["zoomin"]["other"] = "zoomin.gif";
-$WT_IMAGES["zoomout"]["other"] = "zoomout.gif";
-$WT_IMAGES["stop"]["other"] = "stop.gif";
-$WT_IMAGES["pin-out"]["other"] = "pin-out.png";
-$WT_IMAGES["pin-in"]["other"] = "pin-in.png";
-$WT_IMAGES["default_image_M"]["other"] = "silhouette_male.gif";
-$WT_IMAGES["default_image_F"]["other"] = "silhouette_female.gif";
-$WT_IMAGES["default_image_U"]["other"] = "silhouette_unknown.gif";
-$WT_IMAGES['slide_open']['other'] = "open.png";
-$WT_IMAGES['slide_close']['other'] = "close.png";
+$WT_IMAGES['add']['other'] = WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.png';
+$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']['other'] = WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES["lsltarrow"]["other"] = "lsltarrow.gif";
-$WT_IMAGES["lsrtarrow"]["other"] = "lsrtarrow.gif";
-$WT_IMAGES["lsdnarrow"]["other"] = "lsdnarrow.gif";
-$WT_IMAGES["lsuparrow"]["other"] = "lsuparrow.gif";
+$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(
@@ -247,8 +249,4 @@ $WT_STATS_CHART_COLOR2 = "95b8e0";
 $WT_STATS_CHART_COLOR3 = "c8e7ff";
 
 // Arrow symbol or icon for up-page links on Help pages
-// This icon is referred to in Help text by: #GLOBALS[UpArrow]#
-if (file_exists($WT_IMAGE_DIR."/uarrow3.gif")) $UpArrow = "<img src=\"{$WT_IMAGE_DIR}/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
-else $UpArrow = "<b>^^&nbsp;&nbsp;</b>";
-
-?>
+$UpArrow = "<img src=\"".WT_THEME_DIR."images/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
diff --git a/themes/colors/footer.php b/themes/colors/footer.php
index fcc9af9b3e..519889cb75 100644
--- a/themes/colors/footer.php
+++ b/themes/colors/footer.php
@@ -38,7 +38,7 @@ echo "<div id=\"footer\" class=\"$TEXT_DIRECTION\">";
 echo "\n\t<br /><div align=\"center\" style=\"width:99%;\">";
 echo contact_links();
 echo "\n\t<br />";
-echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
+echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
 echo "\n\t<br />";
 
 if ($SHOW_STATS || WT_DEBUG) {
diff --git a/themes/colors/header.php b/themes/colors/header.php
index b0ce2a3cbc..5b8a226aa9 100644
--- a/themes/colors/header.php
+++ b/themes/colors/header.php
@@ -149,7 +149,7 @@ if ($view!='simple') {
 			'<input type="hidden" name="action" value="general" />',
 			'<input type="hidden" name="topsearch" value="yes" />',
 			'<input type="text" name="query" size="15" value="', i18n::translate('Search'), '" onfocus="if (this.value==\'', i18n::translate('Search'), '\') this.value=\'\'; focusHandler();" onblur="if (this.value==\'\') this.value=\'', i18n::translate('Search'), '\';" />',
-            '<input type="image" src="', $WT_IMAGE_DIR, '/go.gif', '" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />',
+            '<input type="image" src="', WT_THEME_DIR, 'images/go.gif', '" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />',
 			'</form>',
 			'</ui></div>'; 
 		}
diff --git a/themes/colors/theme.php b/themes/colors/theme.php
index f849619da6..f6bd07b269 100644
--- a/themes/colors/theme.php
+++ b/themes/colors/theme.php
@@ -94,175 +94,177 @@ if (isset($_GET['themecolor']) && array_key_exists($_GET['themecolor'], $COLOR_T
 
 $_SESSION['themecolor']=$subColor;
 
-$theme_name       = "colors";
-$stylesheet       = WT_THEME_DIR . "css/" . $subColor . ".css";
-$modules 		  = WT_THEME_DIR . "modules.css";
-$print_stylesheet = WT_THEME_DIR . "print.css";			//-- CSS level 2 print stylesheet to use
-$headerfile       = WT_THEME_DIR . "header.php";		//-- Header information for the site
-$rtl_stylesheet   = WT_THEME_DIR . "style_rtl.css";		//-- CSS level 2 stylesheet to use
-$footerfile       = WT_THEME_DIR . "footer.php";		//-- Footer information for the site     
-$WT_IMAGE_DIR     = WT_THEME_DIR . "images";			//-- directory to look for images
-$FAVICON          = $WT_IMAGE_DIR. "/favicon.ico";
-$WT_USE_HELPIMG   = true;                                // set to true to use image for help questionmark, set to false to use $wt_lang["qm"]
-$WT_MENU_LOCATION = "top";
+$theme_name       = "colors"; // need double quotes, as file is scanned/parsed by script
+$stylesheet       = WT_THEME_DIR . 'css/' . $subColor . '.css';
+$modules          = WT_THEME_DIR . 'modules.css';
+$print_stylesheet = WT_THEME_DIR . 'print.css';
+$headerfile       = WT_THEME_DIR . 'header.php';
+$rtl_stylesheet   = WT_THEME_DIR . 'style_rtl.css';
+$footerfile       = WT_THEME_DIR . 'footer.php';
+$FAVICON          = WT_THEME_DIR . 'images/favicon.ico';
+$WT_USE_HELPIMG   = true;
+$WT_MENU_LOCATION = 'top';
 
 //-- variables for image names
 //- WT main icons
-$WT_IMAGES["calendar"]["large"] = "calendar.gif";
-$WT_IMAGES["clippings"]["large"] = "clippings.gif";
-$WT_IMAGES["favorite"]["large"] = "fav.gif";
-$WT_IMAGES["gedcom"]["large"] = "gedcom.gif";
-$WT_IMAGES["help"]["large"] = "help.gif";
-$WT_IMAGES["home"]["large"] = "home.gif";
-$WT_IMAGES["indis"]["large"] = "indis.gif";
-$WT_IMAGES["lists"]["large"] = "lists.gif";
-$WT_IMAGES["media"]["large"] = "media.gif";
-$WT_IMAGES["menu_repository"]["large"] = "menu_repository.gif";
-$WT_IMAGES["menu_source"]["large"] = "menu_source.gif";
-$WT_IMAGES["mypage"]["large"] = "mypage.gif";
-$WT_IMAGES["notes"]["large"] = "notes.gif";
-$WT_IMAGES["pedigree"]["large"] = "pedigree.gif";
-$WT_IMAGES["printer"]["large"] = "printer.gif";
-$WT_IMAGES["reports"]["large"] = "report.gif";
-$WT_IMAGES["repository"]["large"] = "repository.gif";
-$WT_IMAGES["search"]["large"] = "search.gif";
-$WT_IMAGES["sfamily"]["large"] = "sfamily.gif";
-$WT_IMAGES["source"]["large"] = "source.gif";
-$WT_IMAGES["sex"]["large"] = "male.gif";
-$WT_IMAGES["sexf"]["large"] = "female.gif";
-$WT_IMAGES["sexn"]["large"] = "fe_male.gif";
-$WT_IMAGES["edit_source"]["large"] = "small/edit_sour.gif";
+$WT_IMAGES['calendar']['large'] = WT_THEME_DIR.'images/calendar.gif';
+$WT_IMAGES['clippings']['large'] = WT_THEME_DIR.'images/clippings.gif';
+$WT_IMAGES['favorite']['large'] = WT_THEME_DIR.'images/fav.gif';
+$WT_IMAGES['gedcom']['large'] = WT_THEME_DIR.'images/gedcom.gif';
+$WT_IMAGES['help']['large'] = WT_THEME_DIR.'images/help.gif';
+$WT_IMAGES['home']['large'] = WT_THEME_DIR.'images/home.gif';
+$WT_IMAGES['indis']['large'] = WT_THEME_DIR.'images/indis.gif';
+$WT_IMAGES['lists']['large'] = WT_THEME_DIR.'images/lists.gif';
+$WT_IMAGES['media']['large'] = WT_THEME_DIR.'images/media.gif';
+$WT_IMAGES['menu_repository']['large'] = WT_THEME_DIR.'images/menu_repository.gif';
+$WT_IMAGES['menu_source']['large'] = WT_THEME_DIR.'images/menu_source.gif';
+$WT_IMAGES['mypage']['large'] = WT_THEME_DIR.'images/mypage.gif';
+$WT_IMAGES['notes']['large'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['pedigree']['large'] = WT_THEME_DIR.'images/pedigree.gif';
+$WT_IMAGES['printer']['large'] = WT_THEME_DIR.'images/printer.gif';
+$WT_IMAGES['reports']['large'] = WT_THEME_DIR.'images/report.gif';
+$WT_IMAGES['repository']['large'] = WT_THEME_DIR.'images/repository.gif';
+$WT_IMAGES['search']['large'] = WT_THEME_DIR.'images/search.gif';
+$WT_IMAGES['sfamily']['large'] = WT_THEME_DIR.'images/sfamily.gif';
+$WT_IMAGES['source']['large'] = WT_THEME_DIR.'images/source.gif';
+$WT_IMAGES['sex']['large'] = WT_THEME_DIR.'images/male.gif';
+$WT_IMAGES['sexf']['large'] = WT_THEME_DIR.'images/female.gif';
+$WT_IMAGES['sexn']['large'] = WT_THEME_DIR.'images/fe_male.gif';
+$WT_IMAGES['edit_source']['large'] = WT_THEME_DIR.'images/small/edit_sour.gif';
 
-$WT_IMAGES["edit_fam"]["large"] = "edit_fam.gif";
-$WT_IMAGES["edit_indi"]["large"] = "edit_indi.gif";
-$WT_IMAGES["edit_media"]["large"] = "edit_indi.gif";
-$WT_IMAGES["edit_note"]["large"] = "edit_indi.gif";
-$WT_IMAGES["edit_sour"]["large"] = "edit_sour.gif";
-$WT_IMAGES["edit_repo"]["large"] = "Sedit_repo.gif";
+$WT_IMAGES['edit_fam']['large'] = WT_THEME_DIR.'images/edit_fam.gif';
+$WT_IMAGES['edit_indi']['large'] = WT_THEME_DIR.'images/edit_indi.gif';
+$WT_IMAGES['edit_media']['large'] = WT_THEME_DIR.'images/edit_indi.gif';
+$WT_IMAGES['edit_note']['large'] = WT_THEME_DIR.'images/edit_indi.gif';
+$WT_IMAGES['edit_sour']['large'] = WT_THEME_DIR.'images/edit_sour.gif';
+$WT_IMAGES['edit_repo']['large'] = WT_THEME_DIR.'images/Sedit_repo.gif';
 
 //- PGV small icons
-$WT_IMAGES["admin"]["small"] = "small/admin.gif";
-$WT_IMAGES["ancestry"]["small"] = "small/ancestry.gif";
-$WT_IMAGES["calendar"]["small"] = "small/calendar.gif";
-$WT_IMAGES["cfamily"]["small"] = "small/cfamily.gif";
-$WT_IMAGES["childless"]["small"] = "small/childless.gif";
-$WT_IMAGES["clippings"]["small"] = "small/clippings.gif";
-$WT_IMAGES["descendant"]["small"] = "small/descendancy.gif";
-$WT_IMAGES["edit_fam"]["small"] = "small/edit_fam.gif";
-$WT_IMAGES["edit_sour"]["small"] = "small/edit_sour.gif";
-$WT_IMAGES["edit_repo"]["small"] = "small/edit_repo.gif";
-$WT_IMAGES["fambook"]["small"] = "small/fambook.gif";
-$WT_IMAGES["fanchart"]["small"] = "small/fanchart.gif";
-$WT_IMAGES["favorite"]["small"] = "small/fav.gif";
-$WT_IMAGES["favorites"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["gedcom"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["help"]["small"] = "small/help.gif";
-$WT_IMAGES["home"]["small"] = "small/home.gif";
-$WT_IMAGES["hourglass"]["small"] = "small/hourglass.gif";
-$WT_IMAGES["indis"]["small"] = "small/indis.gif";
-$WT_IMAGES["lists"]["small"] = "small/lists.gif";
-$WT_IMAGES["media"]["small"] = "small/media.gif";
-$WT_IMAGES["menu_help"]["small"] = "small/menu_help.gif";
-$WT_IMAGES["menu_media"]["small"] = "small/menu_media.gif";
-$WT_IMAGES["menu_repository"]["small"] = "small/menu_repository.gif";
-$WT_IMAGES["menu_source"]["small"] = "small/menu_source.gif";
-$WT_IMAGES["mypage"]["small"] = "small/mypage.gif";
-$WT_IMAGES["notes"]["small"] = "small/notes.gif";
-$WT_IMAGES["patriarch"]["small"] = "small/patriarch.gif";
-$WT_IMAGES["pedigree"]["small"] = "small/pedigree.gif";
-$WT_IMAGES["place"]["small"] = "small/place.gif";
-$WT_IMAGES["printer"]["small"] = "small/printer.gif";
-$WT_IMAGES["relationship"]["small"] = "small/relationship.gif";
-$WT_IMAGES["reports"]["small"] = "small/report.gif";
-$WT_IMAGES["repository"]["small"] = "small/repository.gif";
-$WT_IMAGES["rings"]["small"] = "small/rings.gif";
-$WT_IMAGES["search"]["small"] = "small/search.gif";
-$WT_IMAGES["sex"]["small"] = "small/male.gif";
-$WT_IMAGES["sexf"]["small"] = "small/female.gif";
-$WT_IMAGES["sexn"]["small"] = "small/fe_male.gif";
-$WT_IMAGES["sfamily"]["small"] = "small/sfamily.gif";
-$WT_IMAGES["source"]["small"] = "small/source.gif";
-$WT_IMAGES["statistic"]["small"] = "small/statistic.gif";
-$WT_IMAGES["timeline"]["small"] = "small/timeline.gif";
-$WT_IMAGES["tree"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["wiki"]["small"] = "small/w_22.png";
+$WT_IMAGES['admin']['small'] = WT_THEME_DIR.'images/small/admin.gif';
+$WT_IMAGES['ancestry']['small'] = WT_THEME_DIR.'images/small/ancestry.gif';
+$WT_IMAGES['calendar']['small'] = WT_THEME_DIR.'images/small/calendar.gif';
+$WT_IMAGES['cfamily']['small'] = WT_THEME_DIR.'images/small/cfamily.gif';
+$WT_IMAGES['childless']['small'] = WT_THEME_DIR.'images/small/childless.gif';
+$WT_IMAGES['clippings']['small'] = WT_THEME_DIR.'images/small/clippings.gif';
+$WT_IMAGES['descendant']['small'] = WT_THEME_DIR.'images/small/descendancy.gif';
+$WT_IMAGES['edit_fam']['small'] = WT_THEME_DIR.'images/small/edit_fam.gif';
+$WT_IMAGES['edit_indi']['small'] = WT_THEME_DIR.'images/small/edit_indi.gif';
+$WT_IMAGES['edit_media']['small'] = WT_THEME_DIR.'images/small/edit_media.gif';
+$WT_IMAGES['edit_note']['small'] = WT_THEME_DIR.'images/small/edit_note.gif';
+$WT_IMAGES['edit_sour']['small'] = WT_THEME_DIR.'images/small/edit_sour.gif';
+$WT_IMAGES['edit_repo']['small'] = WT_THEME_DIR.'images/small/edit_repo.gif';
+$WT_IMAGES['fambook']['small'] = WT_THEME_DIR.'images/small/fambook.gif';
+$WT_IMAGES['fanchart']['small'] = WT_THEME_DIR.'images/small/fanchart.gif';
+$WT_IMAGES['favorite']['small'] = WT_THEME_DIR.'images/small/fav.gif';
+$WT_IMAGES['favorites']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['gedcom']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['help']['small'] = WT_THEME_DIR.'images/small/help.gif';
+$WT_IMAGES['home']['small'] = WT_THEME_DIR.'images/small/home.gif';
+$WT_IMAGES['hourglass']['small'] = WT_THEME_DIR.'images/small/hourglass.gif';
+$WT_IMAGES['indis']['small'] = WT_THEME_DIR.'images/small/indis.gif';
+$WT_IMAGES['lists']['small'] = WT_THEME_DIR.'images/small/lists.gif';
+$WT_IMAGES['media']['small'] = WT_THEME_DIR.'images/small/media.gif';
+$WT_IMAGES['menu_help']['small'] = WT_THEME_DIR.'images/small/menu_help.gif';
+$WT_IMAGES['menu_media']['small'] = WT_THEME_DIR.'images/small/menu_media.gif';
+$WT_IMAGES['menu_repository']['small'] = WT_THEME_DIR.'images/small/menu_repository.gif';
+$WT_IMAGES['menu_source']['small'] = WT_THEME_DIR.'images/small/menu_source.gif';
+$WT_IMAGES['mypage']['small'] = WT_THEME_DIR.'images/small/mypage.gif';
+$WT_IMAGES['notes']['small'] = WT_THEME_DIR.'images/small/notes.gif';
+$WT_IMAGES['patriarch']['small'] = WT_THEME_DIR.'images/small/patriarch.gif';
+$WT_IMAGES['pedigree']['small'] = WT_THEME_DIR.'images/small/pedigree.gif';
+$WT_IMAGES['place']['small'] = WT_THEME_DIR.'images/small/place.gif';
+$WT_IMAGES['printer']['small'] = WT_THEME_DIR.'images/small/printer.gif';
+$WT_IMAGES['relationship']['small'] = WT_THEME_DIR.'images/small/relationship.gif';
+$WT_IMAGES['reports']['small'] = WT_THEME_DIR.'images/small/report.gif';
+$WT_IMAGES['repository']['small'] = WT_THEME_DIR.'images/small/repository.gif';
+$WT_IMAGES['rings']['small'] = WT_THEME_DIR.'images/small/rings.gif';
+$WT_IMAGES['search']['small'] = WT_THEME_DIR.'images/small/search.gif';
+$WT_IMAGES['sex']['small'] = WT_THEME_DIR.'images/small/male.gif';
+$WT_IMAGES['sexf']['small'] = WT_THEME_DIR.'images/small/female.gif';
+$WT_IMAGES['sexn']['small'] = WT_THEME_DIR.'images/small/fe_male.gif';
+$WT_IMAGES['sfamily']['small'] = WT_THEME_DIR.'images/small/sfamily.gif';
+$WT_IMAGES['source']['small'] = WT_THEME_DIR.'images/small/source.gif';
+$WT_IMAGES['statistic']['small'] = WT_THEME_DIR.'images/small/statistic.gif';
+$WT_IMAGES['timeline']['small'] = WT_THEME_DIR.'images/small/timeline.gif';
+$WT_IMAGES['tree']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['wiki']['small'] = WT_THEME_DIR.'images/small/w_22.png';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES["addmedia"]["button"] = "buttons/addmedia.gif";
-$WT_IMAGES["addrepository"]["button"] = "buttons/addrepository.gif";
-$WT_IMAGES["addsource"]["button"] = "buttons/addsource.gif";
-$WT_IMAGES["addnote"]["button"] = "buttons/addnote.gif";
-$WT_IMAGES["autocomplete"]["button"] = "buttons/autocomplete.gif";
-$WT_IMAGES["calendar"]["button"] = "buttons/calendar.gif";
-$WT_IMAGES["family"]["button"] = "buttons/family.gif";
-$WT_IMAGES["head"]["button"] = "buttons/head.gif";
-$WT_IMAGES["indi"]["button"] = "buttons/indi.gif";
-$WT_IMAGES["keyboard"]["button"] = "buttons/keyboard.gif";
-$WT_IMAGES["media"]["button"] = "buttons/media.gif";
-$WT_IMAGES["note"]["button"] = "buttons/note.gif";
-$WT_IMAGES["place"]["button"] = "buttons/place.gif";
-$WT_IMAGES["refresh"]["button"] = "buttons/refresh.gif";
-$WT_IMAGES["repository"]["button"] = "buttons/repository.gif";
-$WT_IMAGES["source"]["button"] = "buttons/source.gif";
-$WT_IMAGES["note"]["button"] = "buttons/note.gif";
-$WT_IMAGES["head"]["button"] = "buttons/head.gif";
-$WT_IMAGES["find_facts"]["button"] = "buttons/find_facts.png";
+$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['autocomplete']['button'] = WT_THEME_DIR.'images/buttons/autocomplete.gif';
+$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['refresh']['button'] = WT_THEME_DIR.'images/buttons/refresh.gif';
+$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES["media"]["audio"] = "media/audio.png";
-$WT_IMAGES["media"]["doc"] = "media/doc.gif";
-$WT_IMAGES["media"]["flash"] = "media/flash.png";
-$WT_IMAGES["media"]["flashrem"] = "media/flashrem.png";
-$WT_IMAGES["media"]["ged"] = "media/ged.gif";
-$WT_IMAGES["media"]["globe"] = "media/globe.png";
-$WT_IMAGES["media"]["html"] = "media/html.gif";
-$WT_IMAGES["media"]["picasa"] = "media/picasa.png";
-$WT_IMAGES["media"]["pdf"] = "media/pdf.gif";
-$WT_IMAGES["media"]["tex"] = "media/tex.gif";
-$WT_IMAGES["media"]["wmv"] = "media/wmv.png";
-$WT_IMAGES["media"]["wmvrem"] = "media/wmvrem.png";
+$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES["add"]["other"] = "add.gif";
-$WT_IMAGES["darrow"]["other"] = "darrow.gif";
-$WT_IMAGES["darrow2"]["other"] = "darrow2.gif";
-$WT_IMAGES["ddarrow"]["other"] = "ddarrow.gif";
-$WT_IMAGES["dline"]["other"] = "dline.gif";
-$WT_IMAGES["dline2"]["other"] = "dline2.gif";
-$WT_IMAGES["webtrees"]["other"] = "webtrees.png";
-$WT_IMAGES["hline"]["other"] = "hline.gif";
-$WT_IMAGES["larrow"]["other"] = "larrow.gif";
-$WT_IMAGES["larrow2"]["other"] = "larrow2.gif";
-$WT_IMAGES["ldarrow"]["other"] = "ldarrow.gif";
-$WT_IMAGES["minus"]["other"] = "minus.gif";
-$WT_IMAGES["note"]["other"] = "notes.gif";
-$WT_IMAGES["plus"]["other"] = "plus.gif";
-$WT_IMAGES["rarrow"]["other"] = "rarrow.gif";
-$WT_IMAGES["rarrow2"]["other"] = "rarrow2.gif";
-$WT_IMAGES["rdarrow"]["other"] = "rdarrow.gif";
-$WT_IMAGES["remove"]["other"] = "remove.gif";
-$WT_IMAGES["spacer"]["other"] = "spacer.gif";
-$WT_IMAGES["uarrow"]["other"] = "uarrow.gif";
-$WT_IMAGES["uarrow2"]["other"] = "uarrow2.gif";
-$WT_IMAGES["uarrow3"]["other"] = "uarrow3.gif";
-$WT_IMAGES["udarrow"]["other"] = "udarrow.gif";
-$WT_IMAGES["vline"]["other"] = "vline.gif";
-$WT_IMAGES["zoomin"]["other"] = "zoomin.gif";
-$WT_IMAGES["zoomout"]["other"] = "zoomout.gif";
-$WT_IMAGES["stop"]["other"] = "stop.gif";
-$WT_IMAGES["pin-out"]["other"] = "pin-out.png";
-$WT_IMAGES["pin-in"]["other"] = "pin-in.png";
-$WT_IMAGES["default_image_M"]["other"] = "silhouette_male.gif";
-$WT_IMAGES["default_image_F"]["other"] = "silhouette_female.gif";
-$WT_IMAGES["default_image_U"]["other"] = "silhouette_unknown.gif";
-$WT_IMAGES['slide_open']['other'] = "open.png";
-$WT_IMAGES['slide_close']['other'] = "close.png";
+$WT_IMAGES['add']['other'] = WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.png';
+$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']['other'] = WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES["lsltarrow"]["other"] = "lsltarrow.gif";
-$WT_IMAGES["lsrtarrow"]["other"] = "lsrtarrow.gif";
-$WT_IMAGES["lsdnarrow"]["other"] = "lsdnarrow.gif";
-$WT_IMAGES["lsuparrow"]["other"] = "lsuparrow.gif";
+$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(
@@ -308,8 +310,4 @@ $WT_STATS_CHART_COLOR2 = "95b8e0";
 $WT_STATS_CHART_COLOR3 = "c8e7ff";
 
 // Arrow symbol or icon for up-page links on Help pages
-// This icon is referred to in Help text by: #GLOBALS[UpArrow]#
-if (file_exists($WT_IMAGE_DIR."/uarrow3.gif")) $UpArrow = "<img src=\"{$WT_IMAGE_DIR}/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
-else $UpArrow = "<b>^^&nbsp;&nbsp;</b>";
-
-?>
+$UpArrow = "<img src=\"".WT_THEME_DIR."images/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
diff --git a/themes/fab/theme.php b/themes/fab/theme.php
index 28715d3f13..bd5342bd27 100644
--- a/themes/fab/theme.php
+++ b/themes/fab/theme.php
@@ -36,147 +36,147 @@ if (!defined('WT_WEBTREES')) {
 $date_and_time=array();
 unset ($level2_tags['CEME']);
 
-$theme_name="F.A.B."; /* need double quotes, as file is scanned/parsed by script */
-
-$stylesheet=WT_THEME_DIR.'style.css';
-$headerfile=WT_THEME_DIR.'header.php';
-$footerfile=WT_THEME_DIR.'footer.php';
-
-$WT_USE_HELPIMG=false;
-$WT_IMAGE_DIR = WT_THEME_DIR."images";        //-- directory to look for images
-$FAVICON=$WT_IMAGE_DIR."/favicon.ico";
-$WT_MENU_LOCATION="top";
+$theme_name       = "F.A.B."; // need double quotes, as file is scanned/parsed by script
+$stylesheet       = WT_THEME_DIR.'style.css';
+$headerfile       = WT_THEME_DIR.'header.php';
+$footerfile       = WT_THEME_DIR.'footer.php';
+$FAVICON          = WT_THEME_DIR.'images/favicon.ico';
+$WT_USE_HELPIMG   = false;
+$WT_MENU_LOCATION = 'top';
 
 //-- variables for image names
 //- PGV main icons
-$WT_IMAGES["calendar"]["large"] = "calendar.gif";
-$WT_IMAGES["clippings"]["large"] = "clippings.gif";
-$WT_IMAGES["gedcom"]["large"] = "gedcom.gif";
-$WT_IMAGES["help"]["large"] = "help.gif";
-$WT_IMAGES["indis"]["large"] = "indis.gif";
-$WT_IMAGES["media"]["large"] = "media.gif";
-$WT_IMAGES["notes"]["large"] = "notes.gif";
-$WT_IMAGES["pedigree"]["large"] = "pedigree.gif";
-$WT_IMAGES["reports"]["large"] = "reports.gif";
-$WT_IMAGES["repository"]["large"] = "repository.gif";
-$WT_IMAGES["search"]["large"] = "search.gif";
-$WT_IMAGES["sfamily"]["large"] = "sfamily.gif";
-$WT_IMAGES["source"]["large"] = "source.gif";
-$WT_IMAGES["sex"]["large"] = "male.gif";
-$WT_IMAGES["sexf"]["large"] = "female.gif";
-$WT_IMAGES["sexn"]["large"] = "fe_male.gif";
+$WT_IMAGES['calendar']['large'] = WT_THEME_DIR.'images/calendar.gif';
+$WT_IMAGES['clippings']['large'] = WT_THEME_DIR.'images/clippings.gif';
+$WT_IMAGES['gedcom']['large'] = WT_THEME_DIR.'images/gedcom.gif';
+$WT_IMAGES['help']['large'] = WT_THEME_DIR.'images/help.gif';
+$WT_IMAGES['indis']['large'] = WT_THEME_DIR.'images/indis.gif';
+$WT_IMAGES['media']['large'] = WT_THEME_DIR.'images/media.gif';
+$WT_IMAGES['notes']['large'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['pedigree']['large'] = WT_THEME_DIR.'images/pedigree.gif';
+$WT_IMAGES['reports']['large'] = WT_THEME_DIR.'images/reports.gif';
+$WT_IMAGES['repository']['large'] = WT_THEME_DIR.'images/repository.gif';
+$WT_IMAGES['search']['large'] = WT_THEME_DIR.'images/search.gif';
+$WT_IMAGES['sfamily']['large'] = WT_THEME_DIR.'images/sfamily.gif';
+$WT_IMAGES['source']['large'] = WT_THEME_DIR.'images/source.gif';
+$WT_IMAGES['sex']['large'] = WT_THEME_DIR.'images/male.gif';
+$WT_IMAGES['sexf']['large'] = WT_THEME_DIR.'images/female.gif';
+$WT_IMAGES['sexn']['large'] = WT_THEME_DIR.'images/fe_male.gif';
 
 //- PGV main icons for optional modules
-$WT_IMAGES["menu_gallery"]["large"] = "menu_gallery.gif";
-$WT_IMAGES["menu_punbb"]["large"] = "menu_punbb.gif";
-$WT_IMAGES["menu_research"]["large"] = "menu_research.gif";
+$WT_IMAGES['menu_gallery']['large'] = WT_THEME_DIR.'images/menu_gallery.gif';
+$WT_IMAGES['menu_punbb']['large'] = WT_THEME_DIR.'images/menu_punbb.gif';
+$WT_IMAGES['menu_research']['large'] = WT_THEME_DIR.'images/menu_research.gif';
 
 //- PGV small icons
-$WT_IMAGES["admin"]["small"] = "small/admin.gif";
-$WT_IMAGES["ancestry"]["small"] = "small/ancestry.gif";
-$WT_IMAGES["calendar"]["small"] = "small/calendar.gif";
-$WT_IMAGES["cfamily"]["small"] = "small/cfamily.gif";
-$WT_IMAGES["clippings"]["small"] = "small/clippings.gif";
-$WT_IMAGES["descendant"]["small"] = "small/descendancy.gif";
-$WT_IMAGES["edit_fam"]["small"] = "small/edit_fam.gif";
-$WT_IMAGES["edit_indi"]["small"] = "small/edit_indi.gif";
-$WT_IMAGES["edit_sour"]["small"] = "small/edit_sour.gif";
-$WT_IMAGES["edit_repo"]["small"] = "small/edit_repo.gif";
-$WT_IMAGES["fambook"]["small"] = "small/fambook.gif";
-$WT_IMAGES["fanchart"]["small"] = "small/fanchart.gif";
-$WT_IMAGES["gedcom"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["help"]["small"] = "small/help.gif";
-$WT_IMAGES["hourglass"]["small"] = "small/hourglass.gif";
-$WT_IMAGES["indis"]["small"] = "small/indis.gif";
-$WT_IMAGES["media"]["small"] = "small/media.gif";
-$WT_IMAGES["menu_help"]["small"] = "small/help.gif";
-$WT_IMAGES["menu_media"]["small"] = "small/media.gif";
-$WT_IMAGES["menu_repository"]["small"] = "small/repository.gif";
-$WT_IMAGES["menu_source"]["small"] = "small/source.gif";
-$WT_IMAGES["mypage"]["small"] = "small/mypage.gif";
-$WT_IMAGES["notes"]["small"] = "small/notes.gif";
-$WT_IMAGES["patriarch"]["small"] = "small/patriarch.gif";
-$WT_IMAGES["pedigree"]["small"] = "small/pedigree.gif";
-$WT_IMAGES["place"]["small"] = "small/place.gif";
-$WT_IMAGES["relationship"]["small"] = "small/relationship.gif";
-$WT_IMAGES["reports"]["small"] = "small/reports.gif";
-$WT_IMAGES["repository"]["small"] = "small/repository.gif";
-$WT_IMAGES["search"]["small"] = "small/search.gif";
-$WT_IMAGES["sex"]["small"] = "small/male.gif";
-$WT_IMAGES["sexf"]["small"] = "small/female.gif";
-$WT_IMAGES["sexn"]["small"] = "small/fe_male.gif";
-$WT_IMAGES["sfamily"]["small"] = "small/sfamily.gif";
-$WT_IMAGES["source"]["small"] = "small/source.gif";
-$WT_IMAGES["statistic"]["small"] = "small/statistic.gif";
-$WT_IMAGES["timeline"]["small"] = "small/timeline.gif";
-$WT_IMAGES["tree"]["small"] = "small/gedcom.gif";
+$WT_IMAGES['admin']['small'] = WT_THEME_DIR.'images/small/admin.gif';
+$WT_IMAGES['ancestry']['small'] = WT_THEME_DIR.'images/small/ancestry.gif';
+$WT_IMAGES['calendar']['small'] = WT_THEME_DIR.'images/small/calendar.gif';
+$WT_IMAGES['cfamily']['small'] = WT_THEME_DIR.'images/small/cfamily.gif';
+$WT_IMAGES['clippings']['small'] = WT_THEME_DIR.'images/small/clippings.gif';
+$WT_IMAGES['descendant']['small'] = WT_THEME_DIR.'images/small/descendancy.gif';
+$WT_IMAGES['edit_fam']['small'] = WT_THEME_DIR.'images/small/edit_fam.gif';
+$WT_IMAGES['edit_indi']['small'] = WT_THEME_DIR.'images/small/edit_indi.gif';
+$WT_IMAGES['edit_media']['small'] = WT_THEME_DIR.'images/small/edit_indi.gif';
+$WT_IMAGES['edit_note']['small'] = WT_THEME_DIR.'images/small/edit_indi.gif';
+$WT_IMAGES['edit_sour']['small'] = WT_THEME_DIR.'images/small/edit_sour.gif';
+$WT_IMAGES['edit_repo']['small'] = WT_THEME_DIR.'images/small/edit_repo.gif';
+$WT_IMAGES['fambook']['small'] = WT_THEME_DIR.'images/small/fambook.gif';
+$WT_IMAGES['favorites']['small'] = WT_THEME_DIR.'images/small/favorites.gif';
+$WT_IMAGES['fanchart']['small'] = WT_THEME_DIR.'images/small/fanchart.gif';
+$WT_IMAGES['gedcom']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['help']['small'] = WT_THEME_DIR.'images/small/help.gif';
+$WT_IMAGES['hourglass']['small'] = WT_THEME_DIR.'images/small/hourglass.gif';
+$WT_IMAGES['indis']['small'] = WT_THEME_DIR.'images/small/indis.gif';
+$WT_IMAGES['media']['small'] = WT_THEME_DIR.'images/small/media.gif';
+$WT_IMAGES['menu_help']['small'] = WT_THEME_DIR.'images/small/help.gif';
+$WT_IMAGES['menu_media']['small'] = WT_THEME_DIR.'images/small/media.gif';
+$WT_IMAGES['menu_repository']['small'] = WT_THEME_DIR.'images/small/repository.gif';
+$WT_IMAGES['menu_source']['small'] = WT_THEME_DIR.'images/small/source.gif';
+$WT_IMAGES['mypage']['small'] = WT_THEME_DIR.'images/small/mypage.gif';
+$WT_IMAGES['notes']['small'] = WT_THEME_DIR.'images/small/notes.gif';
+$WT_IMAGES['patriarch']['small'] = WT_THEME_DIR.'images/small/patriarch.gif';
+$WT_IMAGES['pedigree']['small'] = WT_THEME_DIR.'images/small/pedigree.gif';
+$WT_IMAGES['place']['small'] = WT_THEME_DIR.'images/small/place.gif';
+$WT_IMAGES['relationship']['small'] = WT_THEME_DIR.'images/small/relationship.gif';
+$WT_IMAGES['reports']['small'] = WT_THEME_DIR.'images/small/reports.gif';
+$WT_IMAGES['repository']['small'] = WT_THEME_DIR.'images/small/repository.gif';
+$WT_IMAGES['search']['small'] = WT_THEME_DIR.'images/small/search.gif';
+$WT_IMAGES['sex']['small'] = WT_THEME_DIR.'images/small/male.gif';
+$WT_IMAGES['sexf']['small'] = WT_THEME_DIR.'images/small/female.gif';
+$WT_IMAGES['sexn']['small'] = WT_THEME_DIR.'images/small/fe_male.gif';
+$WT_IMAGES['sfamily']['small'] = WT_THEME_DIR.'images/small/sfamily.gif';
+$WT_IMAGES['source']['small'] = WT_THEME_DIR.'images/small/source.gif';
+$WT_IMAGES['statistic']['small'] = WT_THEME_DIR.'images/small/statistic.gif';
+$WT_IMAGES['timeline']['small'] = WT_THEME_DIR.'images/small/timeline.gif';
+$WT_IMAGES['tree']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES["addmedia"]["button"] = "buttons/addmedia.gif";
-$WT_IMAGES["addrepository"]["button"] = "buttons/addrepository.gif";
-$WT_IMAGES["addsource"]["button"] = "buttons/addsource.gif";
-$WT_IMAGES["addnote"]["button"] = "buttons/addnote.gif";
-$WT_IMAGES["calendar"]["button"] = "buttons/calendar.gif";
-$WT_IMAGES["family"]["button"] = "buttons/family.gif";
-$WT_IMAGES["indi"]["button"] = "buttons/indi.gif";
-$WT_IMAGES["keyboard"]["button"] = "buttons/keyboard.gif";
-$WT_IMAGES["media"]["button"] = "buttons/media.gif";
-$WT_IMAGES["place"]["button"] = "buttons/place.gif";
-$WT_IMAGES["repository"]["button"] = "buttons/repository.gif";
-$WT_IMAGES["source"]["button"] = "buttons/source.gif";
-$WT_IMAGES["note"]["button"] = "buttons/note.gif";
-$WT_IMAGES["head"]["button"] = "buttons/head.gif";
-$WT_IMAGES["find_facts"]["button"] = "buttons/find_facts.png";
+$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES["media"]["audio"] = "media/audio.png";
-$WT_IMAGES["media"]["doc"] = "media/doc.gif";
-$WT_IMAGES["media"]["flash"] = "media/flash.png";
-$WT_IMAGES["media"]["flashrem"] = "media/flashrem.png";
-$WT_IMAGES["media"]["ged"] = "media/ged.gif";
-$WT_IMAGES["media"]["globe"] = "media/globe.png";
-$WT_IMAGES["media"]["html"] = "media/html.gif";
-$WT_IMAGES["media"]["picasa"] = "media/picasa.png";
-$WT_IMAGES["media"]["pdf"] = "media/pdf.gif";
-$WT_IMAGES["media"]["tex"] = "media/tex.gif";
-$WT_IMAGES["media"]["wmv"] = "media/wmv.png";
-$WT_IMAGES["media"]["wmvrem"] = "media/wmvrem.png";
+$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES["add"]["other"]	= "add.gif";
-$WT_IMAGES["darrow"]["other"] = "darrow.gif";
-$WT_IMAGES["darrow2"]["other"] = "darrow2.gif";
-$WT_IMAGES["ddarrow"]["other"] = "ddarrow.gif";
-$WT_IMAGES["dline"]["other"] = "dline.gif";
-$WT_IMAGES["dline2"]["other"] = "dline2.gif";
-$WT_IMAGES["webtrees"]["other"] = "webtrees.png";
-$WT_IMAGES["hline"]["other"] = "hline.gif";
-$WT_IMAGES["larrow"]["other"] = "larrow.gif";
-$WT_IMAGES["larrow2"]["other"] = "larrow2.gif";
-$WT_IMAGES["ldarrow"]["other"] = "ldarrow.gif";
-$WT_IMAGES["minus"]["other"] = "minus.gif";
-$WT_IMAGES["note"]["other"] = "notes.gif";
-$WT_IMAGES["plus"]["other"] = "plus.gif";
-$WT_IMAGES["rarrow"]["other"] = "rarrow.gif";
-$WT_IMAGES["rarrow2"]["other"] = "rarrow2.gif";
-$WT_IMAGES["rdarrow"]["other"] = "rdarrow.gif";
-$WT_IMAGES["remove"]["other"]	= "remove.gif";
-$WT_IMAGES["spacer"]["other"] = "spacer.gif";
-$WT_IMAGES["uarrow"]["other"] = "uarrow.gif";
-$WT_IMAGES["uarrow2"]["other"] = "uarrow2.gif";
-$WT_IMAGES["uarrow3"]["other"] = "uarrow3.gif";
-$WT_IMAGES["udarrow"]["other"] = "udarrow.gif";
-$WT_IMAGES["vline"]["other"] = "vline.gif";
-$WT_IMAGES["zoomin"]["other"] = "zoomin.gif";
-$WT_IMAGES["zoomout"]["other"] = "zoomout.gif";
-$WT_IMAGES["stop"]["other"] = "stop.gif";
-$WT_IMAGES["pin-out"]["other"] = "pin-out.png";
-$WT_IMAGES["pin-in"]["other"] = "pin-in.png";
-$WT_IMAGES["default_image_M"]["other"] = "silhouette_male.gif";
-$WT_IMAGES["default_image_F"]["other"] = "silhouette_female.gif";
-$WT_IMAGES["default_image_U"]["other"] = "silhouette_unknown.gif";
-$WT_IMAGES['slide_open']['other'] = "open.png";
-$WT_IMAGES['slide_close']['other'] = "close.png";
+$WT_IMAGES['add']['other']	= WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.png';
+$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']['other']	= WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
 
 //-- Variables for the Fan chart
 $fanChart = array(
@@ -228,8 +228,6 @@ $WT_STATS_CHART_COLOR2 = "9ca3d4";
 $WT_STATS_CHART_COLOR3 = "e5e6ef";
 
 // Arrow symbol or icon for up-page links on Help pages
-// This icon is referred to in Help text by: #GLOBALS[UpArrow]#
-if (file_exists($WT_IMAGE_DIR."/uarrow3.gif")) $UpArrow = "<img src=\"{$WT_IMAGE_DIR}/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
-else $UpArrow = "<b>^^&nbsp;&nbsp;</b>";
+$UpArrow = "<img src=\"".WT_THEME_DIR."images/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
 
 $WT_MENUS_AS_LISTS=false;//'makeMenu';
diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php
index 82b48c9eeb..09ee4fc6d8 100644
--- a/themes/minimal/theme.php
+++ b/themes/minimal/theme.php
@@ -32,124 +32,120 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-$theme_name = "minimal";		//-- the name of this theme
-
-$stylesheet = WT_THEME_DIR."style.css";	//-- CSS level 2 stylesheet to use
-$rtl_stylesheet = WT_THEME_DIR."style_rtl.css";	//-- CSS level 2 stylesheet to use
-$print_stylesheet = WT_THEME_DIR."print.css";	//-- CSS level 2 print stylesheet to use
-$toplinks = WT_THEME_DIR."toplinks.php";	//-- File to display the icons and links to different sections
-$headerfile = WT_THEME_DIR."header.php";	//-- Header information for the site
-$footerfile = WT_THEME_DIR."footer.php";	//-- Footer information for the site
-
-$WT_USE_HELPIMG = false;		// set to true to use image for help questionmark, set to false to use i18n::translate('?')
-
-$WT_IMAGE_DIR = WT_THEME_DIR."images";        //-- directory to look for images
-$FAVICON=$WT_IMAGE_DIR."/favicon.ico";
+$theme_name       = "minimal"; // need double quotes, as file is scanned/parsed by script
+$stylesheet       = WT_THEME_DIR.'style.css';
+$rtl_stylesheet   = WT_THEME_DIR.'style_rtl.css';
+$print_stylesheet = WT_THEME_DIR.'print.css';
+$toplinks         = WT_THEME_DIR.'toplinks.php';
+$headerfile       = WT_THEME_DIR.'header.php';
+$footerfile       = WT_THEME_DIR.'footer.php';
+$FAVICON          = WT_THEME_DIR.'images/favicon.ico';
+$WT_USE_HELPIMG   = false;
 
 //-- variables for image names
 //- PGV main icons
-$WT_IMAGES["gedcom"]["large"] = "gedcom.gif";
-$WT_IMAGES["help"]["large"] = "help.gif";
-$WT_IMAGES["indis"]["large"] = "indis.gif";
-$WT_IMAGES["media"]["large"] = "media.gif";
-$WT_IMAGES["notes"]["large"] = "notes.gif";
-$WT_IMAGES["pedigree"]["large"] = "pedigree.gif";
-$WT_IMAGES["reports"]["large"] = "report.gif";
-$WT_IMAGES["search"]["large"] = "search.gif";
-$WT_IMAGES["sfamily"]["large"] = "sfamily.gif";
-$WT_IMAGES["source"]["large"] = "source.gif";
+$WT_IMAGES['gedcom']['large'] = WT_THEME_DIR.'images/gedcom.gif';
+$WT_IMAGES['help']['large'] = WT_THEME_DIR.'images/help.gif';
+$WT_IMAGES['indis']['large'] = WT_THEME_DIR.'images/indis.gif';
+$WT_IMAGES['media']['large'] = WT_THEME_DIR.'images/media.gif';
+$WT_IMAGES['notes']['large'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['pedigree']['large'] = WT_THEME_DIR.'images/pedigree.gif';
+$WT_IMAGES['reports']['large'] = WT_THEME_DIR.'images/report.gif';
+$WT_IMAGES['search']['large'] = WT_THEME_DIR.'images/search.gif';
+$WT_IMAGES['sfamily']['large'] = WT_THEME_DIR.'images/sfamily.gif';
+$WT_IMAGES['source']['large'] = WT_THEME_DIR.'images/source.gif';
 
 //- PGV small icons
-$WT_IMAGES["admin"]["small"] = "small/admin.gif";
-$WT_IMAGES["ancestry"]["small"] = "small/ancestry.gif";
-$WT_IMAGES["calendar"]["small"] = "small/calendar.gif";
-$WT_IMAGES["cfamily"]["small"] = "small/cfamily.gif";
-$WT_IMAGES["clippings"]["small"] = "small/clippings.gif";
-$WT_IMAGES["descendant"]["small"] = "small/descendancy.gif";
-$WT_IMAGES["fambook"]["small"] = "small/fambook.gif";
-$WT_IMAGES["fanchart"]["small"] = "small/fanchart.gif";
-$WT_IMAGES["gedcom"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["help"]["small"] = "small/help.gif";
-$WT_IMAGES["indis"]["small"] = "small/indis.gif";
-$WT_IMAGES["media"]["small"] = "small/media.gif";
-$WT_IMAGES["mypage"]["small"] = "small/mypage.gif";
-$WT_IMAGES["notes"]["small"] = "small/notes.gif";
-$WT_IMAGES["patriarch"]["small"] = "small/patriarch.gif";
-$WT_IMAGES["pedigree"]["small"] = "small/pedigree.gif";
-$WT_IMAGES["place"]["small"] = "small/place.gif";
-$WT_IMAGES["repository"]["small"] = "small/repository.gif";
-$WT_IMAGES["search"]["small"] = "small/search.gif";
-$WT_IMAGES["sfamily"]["small"] = "sfamily.gif";
-$WT_IMAGES["source"]["small"] = "small/source.gif";
-$WT_IMAGES["timeline"]["small"] = "small/timeline.gif";
-$WT_IMAGES["tree"]["small"] = "small/gedcom.gif";
+$WT_IMAGES['admin']['small'] = WT_THEME_DIR.'images/small/admin.gif';
+$WT_IMAGES['ancestry']['small'] = WT_THEME_DIR.'images/small/ancestry.gif';
+$WT_IMAGES['calendar']['small'] = WT_THEME_DIR.'images/small/calendar.gif';
+$WT_IMAGES['cfamily']['small'] = WT_THEME_DIR.'images/small/cfamily.gif';
+$WT_IMAGES['clippings']['small'] = WT_THEME_DIR.'images/small/clippings.gif';
+$WT_IMAGES['descendant']['small'] = WT_THEME_DIR.'images/small/descendancy.gif';
+$WT_IMAGES['fambook']['small'] = WT_THEME_DIR.'images/small/fambook.gif';
+$WT_IMAGES['fanchart']['small'] = WT_THEME_DIR.'images/small/fanchart.gif';
+$WT_IMAGES['gedcom']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['help']['small'] = WT_THEME_DIR.'images/small/help.gif';
+$WT_IMAGES['indis']['small'] = WT_THEME_DIR.'images/small/indis.gif';
+$WT_IMAGES['media']['small'] = WT_THEME_DIR.'images/small/media.gif';
+$WT_IMAGES['mypage']['small'] = WT_THEME_DIR.'images/small/mypage.gif';
+$WT_IMAGES['notes']['small'] = WT_THEME_DIR.'images/small/notes.gif';
+$WT_IMAGES['patriarch']['small'] = WT_THEME_DIR.'images/small/patriarch.gif';
+$WT_IMAGES['pedigree']['small'] = WT_THEME_DIR.'images/small/pedigree.gif';
+$WT_IMAGES['place']['small'] = WT_THEME_DIR.'images/small/place.gif';
+$WT_IMAGES['repository']['small'] = WT_THEME_DIR.'images/small/repository.gif';
+$WT_IMAGES['search']['small'] = WT_THEME_DIR.'images/small/search.gif';
+$WT_IMAGES['sfamily']['small'] = WT_THEME_DIR.'images/sfamily.gif';
+$WT_IMAGES['source']['small'] = WT_THEME_DIR.'images/small/source.gif';
+$WT_IMAGES['timeline']['small'] = WT_THEME_DIR.'images/small/timeline.gif';
+$WT_IMAGES['tree']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES["addmedia"]["button"] = "buttons/addmedia.gif";
-$WT_IMAGES["addsource"]["button"] = "buttons/addsource.gif";
-$WT_IMAGES["addnote"]["button"] = "buttons/addnote.gif";
-$WT_IMAGES["keyboard"]["button"] = "buttons/keyboard.gif";
-$WT_IMAGES["media"]["button"] = "buttons/media.gif";
-$WT_IMAGES["source"]["button"] = "buttons/source.gif";
-$WT_IMAGES["note"]["button"] = "buttons/note.gif";
-$WT_IMAGES["head"]["button"] = "buttons/head.gif";
-$WT_IMAGES["find_facts"]["button"] = "buttons/find_facts.png";
+$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES["media"]["audio"] = "../../../images/media/audio.png";
-$WT_IMAGES["media"]["doc"] = "../../../images/media/doc.gif";
-$WT_IMAGES["media"]["flash"] = "../../../images/media/flash.png";
-$WT_IMAGES["media"]["flashrem"] = "../../../images/media/flashrem.png";
-$WT_IMAGES["media"]["ged"] = "../../../images/media/ged.gif";
-$WT_IMAGES["media"]["globe"] = "../../../images/media/globe.png";
-$WT_IMAGES["media"]["html"] = "../../../images/media/html.gif";
-$WT_IMAGES["media"]["picasa"] = "../../../images/media/picasa.png";
-$WT_IMAGES["media"]["pdf"] = "../../../images/media/pdf.gif";
-$WT_IMAGES["media"]["tex"] = "../../../images/media/tex.gif";
-$WT_IMAGES["media"]["wmv"] = "../../../images/media/wmv.png";
-$WT_IMAGES["media"]["wmvrem"] = "../../../images/media/wmvrem.png";
+$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/../../../images/media/audio.png';
+$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/../../../images/media/doc.gif';
+$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/../../../images/media/flash.png';
+$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/../../../images/media/flashrem.png';
+$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/../../../images/media/ged.gif';
+$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/../../../images/media/globe.png';
+$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/../../../images/media/html.gif';
+$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/../../../images/media/picasa.png';
+$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/../../../images/media/pdf.gif';
+$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/../../../images/media/tex.gif';
+$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/../../../images/media/wmv.png';
+$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/../../../images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES["add"]["other"] = "add.gif";
-$WT_IMAGES["darrow"]["other"] = "darrow.gif";
-$WT_IMAGES["darrow2"]["other"] = "darrow2.gif";
-$WT_IMAGES["ddarrow"]["other"] = "ddarrow.gif";
-$WT_IMAGES["dline"]["other"] = "dline.gif";
-$WT_IMAGES["dline2"]["other"] = "dline2.gif";
-$WT_IMAGES["webtrees"]["other"] = "webtrees.gif";
-$WT_IMAGES["hline"]["other"] = "hline.gif";
-$WT_IMAGES["larrow"]["other"] = "larrow.gif";
-$WT_IMAGES["larrow2"]["other"] = "larrow2.gif";
-$WT_IMAGES["ldarrow"]["other"] = "ldarrow.gif";
-$WT_IMAGES["minus"]["other"] = "minus.gif";
-$WT_IMAGES["note"]["other"] = "notes.gif";
-$WT_IMAGES["plus"]["other"] = "plus.gif";
-$WT_IMAGES["rarrow"]["other"] = "rarrow.gif";
-$WT_IMAGES["rarrow2"]["other"] = "rarrow2.gif";
-$WT_IMAGES["rdarrow"]["other"] = "rdarrow.gif";
-$WT_IMAGES["remove"]["other"]	= "remove.gif";
-$WT_IMAGES["spacer"]["other"] = "spacer.gif";
-$WT_IMAGES["uarrow"]["other"] = "uarrow.gif";
-$WT_IMAGES["uarrow2"]["other"] = "uarrow2.gif";
-$WT_IMAGES["uarrow3"]["other"] = "uarrow3.gif";
-$WT_IMAGES["udarrow"]["other"] = "udarrow.gif";
-$WT_IMAGES["vline"]["other"] = "vline.gif";
-$WT_IMAGES["zoomin"]["other"] = "zoomin.gif";
-$WT_IMAGES["zoomout"]["other"] = "zoomout.gif";
-$WT_IMAGES["stop"]["other"] = "stop.gif";
-$WT_IMAGES["pin-out"]["other"] = "pin-out.png";
-$WT_IMAGES["pin-in"]["other"] = "pin-in.png";
-$WT_IMAGES["default_image_M"]["other"] = "silhouette_male.gif";
-$WT_IMAGES["default_image_F"]["other"] = "silhouette_female.gif";
-$WT_IMAGES["default_image_U"]["other"] = "silhouette_unknown.gif";
-$WT_IMAGES['slide_open']['other'] = "open.png";
-$WT_IMAGES['slide_close']['other'] = "close.png";
+$WT_IMAGES['add']['other'] = WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.gif';
+$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']['other']	= WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES["lsltarrow"]["other"] = "lsltarrow.gif";
-$WT_IMAGES["lsrtarrow"]["other"] = "lsrtarrow.gif";
-$WT_IMAGES["lsdnarrow"]["other"] = "lsdnarrow.gif";
-$WT_IMAGES["lsuparrow"]["other"] = "lsuparrow.gif";
+$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(
@@ -195,8 +191,4 @@ $WT_STATS_CHART_COLOR2 = "555555";
 $WT_STATS_CHART_COLOR3 = "cccccc";
 
 // Arrow symbol or icon for up-page links on Help pages
-// This icon is referred to in Help text by: #GLOBALS[UpArrow]#
-if (file_exists($WT_IMAGE_DIR."/uarrow3.gif")) $UpArrow = "<img src=\"{$WT_IMAGE_DIR}/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
-else $UpArrow = "<b>^^&nbsp;&nbsp;</b>";
-
-?>
+$UpArrow = "<b>^^&nbsp;&nbsp;</b>";
diff --git a/themes/minimal/toplinks.php b/themes/minimal/toplinks.php
index e1963e17c0..62b0cf075f 100644
--- a/themes/minimal/toplinks.php
+++ b/themes/minimal/toplinks.php
@@ -121,7 +121,7 @@ $menubar = new MenuBar();
 	?>
 	</tr>
 </table>
-<img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]; ?>" width="100%" height="3" alt="" />
+<img src="<?php print $WT_IMAGES["hline"]["other"]; ?>" width="100%" height="3" alt="" />
 </div>
 <!-- close div for div id="header" -->
 
diff --git a/themes/webtrees/footer.php b/themes/webtrees/footer.php
index 5a8229eb36..d68e1300f8 100644
--- a/themes/webtrees/footer.php
+++ b/themes/webtrees/footer.php
@@ -41,7 +41,7 @@ echo '<div id="footer" class="', $TEXT_DIRECTION, '">';
 		'<div align="center" style="width:99%;">',
 			'<br />',
 			'<a href="', WT_WEBTREES_URL, '" target="_blank">',
-			'<img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '"',
+			'<img src="', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '"',
 				'title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "" , '" /></a><br />',
 			'<br />';
 
@@ -57,4 +57,4 @@ echo '<div id="footer" class="', $TEXT_DIRECTION, '">';
 			}
 	echo '</div>',
 '</div>'; // close div id=\"footer\"
-?>
\ No newline at end of file
+?>
diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php
index 86b81ba37c..8fc51e9c79 100644
--- a/themes/webtrees/header.php
+++ b/themes/webtrees/header.php
@@ -94,7 +94,7 @@ if ($view!='simple') {
 	echo '<div id="header" class="', $TEXT_DIRECTION, '">',
 	'<table width="100%">',
 		'<tr>',
-			'<td><img src="', $WT_IMAGE_DIR, '/header.jpg" width="281" height="50" alt="" /></td>',
+			'<td><img src="', WT_THEME_DIR, 'images/header.jpg" width="281" height="50" alt="" /></td>',
 			'<td>',
 				'<table width="100%">',
 				'<tr>',
@@ -131,7 +131,7 @@ if ($view!='simple') {
 						'<input type="text" name="query" size="15" value="', i18n::translate('Search'), '"',
 							'onfocus="if (this.value==\'', i18n::translate('Search'), '\') this.value=\'\'; focusHandler();"',
 							'onblur="if (this.value==\'\') this.value=\'', i18n::translate('Search'), '\';" />',
-						'<input type="image" src="', $WT_IMAGE_DIR, '/', $WT_IMAGES['search']['small'], '" width="17" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />',	
+						'<input type="image" src="', $WT_IMAGES['search']['small'], '" width="17" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />',	
 					'</form>';
 				}
 			echo '</td>',
@@ -140,7 +140,7 @@ if ($view!='simple') {
 	$menubar = new MenuBar();
 
 	echo '<div>',
-		'<img src="', $WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"], '" width="100%" height="3" alt="" />',
+		'<img src="', $WT_IMAGES["hline"]["other"], '" width="100%" height="3" alt="" />',
 		'<table id="topMenu">',
 			'<tr>';
 				$menu = $menubar->getGedcomMenu();
@@ -211,7 +211,7 @@ if ($view!='simple') {
 				}
 			echo '</tr>',
 		'</table>',
-		'<img align="middle" src="', $WT_IMAGE_DIR, '/', $WT_IMAGES["hline"]["other"], '" width="100%" height="3" alt="" />',
+		'<img align="middle" src="', $WT_IMAGES["hline"]["other"], '" width="100%" height="3" alt="" />',
 	'</div>',
 '</div>',
 // end header section -->
diff --git a/themes/webtrees/theme.php b/themes/webtrees/theme.php
index 415f0dede4..8956529017 100644
--- a/themes/webtrees/theme.php
+++ b/themes/webtrees/theme.php
@@ -34,163 +34,160 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-$theme_name = "webtrees";		//-- the name of this theme
-
-$stylesheet = WT_THEME_DIR."style.css";	//-- CSS level 2 stylesheet to use
-$rtl_stylesheet = WT_THEME_DIR."style_rtl.css";           //-- CSS level 2 stylesheet to use
-$print_stylesheet = WT_THEME_DIR."print.css";	//-- CSS level 2 print stylesheet to use
-$toplinks = WT_THEME_DIR."toplinks.php";	//-- File to display the icons and links to different sections
-$headerfile = WT_THEME_DIR."header.php";	//-- Header information for the site
-$footerfile = WT_THEME_DIR."footer.php";	//-- Footer information for the site
-
-$WT_USE_HELPIMG = true;		// set to true to use image for help questionmark, set to false to use i18n::translate('?')
-$WT_IMAGE_DIR = WT_THEME_DIR."images";		//-- directory to look for images
-$FAVICON=$WT_IMAGE_DIR."/favicon.ico";
-$WT_MENU_LOCATION = "top";
+$theme_name = "webtrees"; // need double quotes, as file is scanned/parsed by script
+$stylesheet       = WT_THEME_DIR.'style.css';
+$rtl_stylesheet   = WT_THEME_DIR.'style_rtl.css';
+$print_stylesheet = WT_THEME_DIR.'print.css';
+$toplinks         = WT_THEME_DIR.'toplinks.php';
+$headerfile       = WT_THEME_DIR.'header.php';
+$footerfile       = WT_THEME_DIR.'footer.php';
+$FAVICON          = WT_THEME_DIR.'images/favicon.ico';
+$WT_USE_HELPIMG   = true;
+$WT_MENU_LOCATION = 'top';
 
 //-- variables for image names
 //- PGV main icons
-$WT_IMAGES["calendar"]["large"] = "calendar.png";
-$WT_IMAGES["clippings"]["large"] = "clippings.png";
-$WT_IMAGES["gedcom"]["large"] = "gedcom.png";
-$WT_IMAGES["help"]["large"] = "help.png";
-$WT_IMAGES["indis"]["large"] = "indis.png";
-$WT_IMAGES["media"]["large"] = "media.gif";
-$WT_IMAGES["mypage"]["large"] = "mypage.png";
-$WT_IMAGES["notes"]["large"] = "notes.gif";
-$WT_IMAGES["other"]["large"] = "other.png";
-$WT_IMAGES["pedigree"]["large"] = "pedigree.png";
-$WT_IMAGES["reports"]["large"] = "reports.png";
-$WT_IMAGES["repository"]["large"] = "repository.gif";
-$WT_IMAGES["search"]["large"] = "search.png";
-$WT_IMAGES["sfamily"]["large"] = "sfamily.gif";
-$WT_IMAGES["source"]["large"] = "source.gif";
-$WT_IMAGES["sex"]["large"] = "male.gif";
-$WT_IMAGES["sexf"]["large"] = "female.gif";
-$WT_IMAGES["sexn"]["large"] = "fe_male.gif";
-$WT_IMAGES["edit_fam"]["large"] = "edit_fam.png";
-$WT_IMAGES["edit_indi"]["large"] = "edit_indi.png";
-$WT_IMAGES["edit_media"]["large"] = "edit_media.png";
-$WT_IMAGES["edit_note"]["large"] = "edit_note.png";
-$WT_IMAGES["edit_repo"]["large"] = "edit_repo.png";
-$WT_IMAGES["edit_source"]["large"] = "edit_source.png";
+$WT_IMAGES['calendar']['large'] = WT_THEME_DIR.'images/calendar.png';
+$WT_IMAGES['clippings']['large'] = WT_THEME_DIR.'images/clippings.png';
+$WT_IMAGES['gedcom']['large'] = WT_THEME_DIR.'images/gedcom.png';
+$WT_IMAGES['help']['large'] = WT_THEME_DIR.'images/help.png';
+$WT_IMAGES['indis']['large'] = WT_THEME_DIR.'images/indis.png';
+$WT_IMAGES['media']['large'] = WT_THEME_DIR.'images/media.gif';
+$WT_IMAGES['mypage']['large'] = WT_THEME_DIR.'images/mypage.png';
+$WT_IMAGES['notes']['large'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['other']['large'] = WT_THEME_DIR.'images/other.png';
+$WT_IMAGES['pedigree']['large'] = WT_THEME_DIR.'images/pedigree.png';
+$WT_IMAGES['reports']['large'] = WT_THEME_DIR.'images/reports.png';
+$WT_IMAGES['repository']['large'] = WT_THEME_DIR.'images/repository.gif';
+$WT_IMAGES['search']['large'] = WT_THEME_DIR.'images/search.png';
+$WT_IMAGES['sfamily']['large'] = WT_THEME_DIR.'images/sfamily.gif';
+$WT_IMAGES['source']['large'] = WT_THEME_DIR.'images/source.gif';
+$WT_IMAGES['sex']['large'] = WT_THEME_DIR.'images/male.gif';
+$WT_IMAGES['sexf']['large'] = WT_THEME_DIR.'images/female.gif';
+$WT_IMAGES['sexn']['large'] = WT_THEME_DIR.'images/fe_male.gif';
+$WT_IMAGES['edit_fam']['large'] = WT_THEME_DIR.'images/edit_fam.png';
+$WT_IMAGES['edit_indi']['large'] = WT_THEME_DIR.'images/edit_indi.png';
+$WT_IMAGES['edit_media']['large'] = WT_THEME_DIR.'images/edit_media.png';
+$WT_IMAGES['edit_note']['large'] = WT_THEME_DIR.'images/edit_note.png';
+$WT_IMAGES['edit_repo']['large'] = WT_THEME_DIR.'images/edit_repo.png';
+$WT_IMAGES['edit_source']['large'] = WT_THEME_DIR.'images/edit_source.png';
 
 //- PGV small icons
-$WT_IMAGES["admin"]["small"] = "small/admin.png";
-$WT_IMAGES["ancestry"]["small"] = "small/ancestry.png";
-$WT_IMAGES["calendar"]["small"] = "small/calendar.png";
-$WT_IMAGES["cfamily"]["small"] = "small/cfamily.png";
-$WT_IMAGES["clippings"]["small"] = "small/clippings.png";
-$WT_IMAGES["descendant"]["small"] = "small/descendancy.png";
-$WT_IMAGES["favorites"]["small"] = "small/favorites.png";
-$WT_IMAGES["edit_fam"]["small"] = "small/edit_fam.png";
-$WT_IMAGES["edit_indi"]["small"] = "small/edit_indi.gif";
-$WT_IMAGES["edit_media"]["small"] = "small/edit_media.png";
-$WT_IMAGES["edit_note"]["small"] = "small/edit_note.png";
-$WT_IMAGES["edit_repo"]["small"] = "small/edit_repo.png";
-$WT_IMAGES["edit_sour"]["small"] = "small/edit_source.png";
-$WT_IMAGES["fambook"]["small"] = "small/fambook.png";
-$WT_IMAGES["fanchart"]["small"] = "small/fanchart.png";
-$WT_IMAGES["gedcom"]["small"] = "small/tree.png";
-$WT_IMAGES["help"]["small"] = "small/help.png";
-$WT_IMAGES["hourglass"]["small"] = "small/hourglass.png";
-$WT_IMAGES["indis"]["small"] = "small/indis.png";
-$WT_IMAGES["media"]["small"] = "small/media.gif";
-$WT_IMAGES["menu_help"]["small"] = "small/help2.png";
-$WT_IMAGES["menu_media"]["small"] = "small/media.png";
-$WT_IMAGES["menu_repository"]["small"] = "small/repository.png";
-$WT_IMAGES["menu_source"]["small"] = "small/source.png";
-$WT_IMAGES["mypage"]["small"] = "small/mypage.png";
-$WT_IMAGES["notes"]["small"] = "small/notes.png";
-$WT_IMAGES["patriarch"]["small"] = "small/patriarch.png";
-$WT_IMAGES["pedigree"]["small"] = "small/pedigree.png";
-$WT_IMAGES["place"]["small"] = "small/place.png";
-$WT_IMAGES["relationship"]["small"] = "small/relationship.gif";
-$WT_IMAGES["reports"]["small"] = "small/reports.gif";
-$WT_IMAGES["repository"]["small"] = "small/repository.png";
-$WT_IMAGES["search"]["small"] = "small/search.png";
-$WT_IMAGES["sex"]["small"] = "small/male.gif";
-$WT_IMAGES["sexf"]["small"] = "small/female.gif";
-$WT_IMAGES["sexn"]["small"] = "small/fe_male.gif";
-$WT_IMAGES["sfamily"]["small"] = "small/sfamily.png";
-$WT_IMAGES["source"]["small"] = "small/source.png";
-$WT_IMAGES["statistic"]["small"] = "small/statistic.png";
-$WT_IMAGES["timeline"]["small"] = "small/timeline.png";
-$WT_IMAGES["tree"]["small"] = "small/tree.png";
-$WT_IMAGES["wiki"]["small"] = "small/w_22.png";
+$WT_IMAGES['admin']['small'] = WT_THEME_DIR.'images/small/admin.png';
+$WT_IMAGES['ancestry']['small'] = WT_THEME_DIR.'images/small/ancestry.png';
+$WT_IMAGES['calendar']['small'] = WT_THEME_DIR.'images/small/calendar.png';
+$WT_IMAGES['cfamily']['small'] = WT_THEME_DIR.'images/small/cfamily.png';
+$WT_IMAGES['clippings']['small'] = WT_THEME_DIR.'images/small/clippings.png';
+$WT_IMAGES['descendant']['small'] = WT_THEME_DIR.'images/small/descendancy.png';
+$WT_IMAGES['favorites']['small'] = WT_THEME_DIR.'images/small/favorites.png';
+$WT_IMAGES['edit_fam']['small'] = WT_THEME_DIR.'images/small/edit_fam.png';
+$WT_IMAGES['edit_indi']['small'] = WT_THEME_DIR.'images/small/edit_indi.gif';
+$WT_IMAGES['edit_media']['small'] = WT_THEME_DIR.'images/small/edit_media.png';
+$WT_IMAGES['edit_note']['small'] = WT_THEME_DIR.'images/small/edit_note.png';
+$WT_IMAGES['edit_repo']['small'] = WT_THEME_DIR.'images/small/edit_repo.png';
+$WT_IMAGES['edit_sour']['small'] = WT_THEME_DIR.'images/small/edit_source.png';
+$WT_IMAGES['fambook']['small'] = WT_THEME_DIR.'images/small/fambook.png';
+$WT_IMAGES['fanchart']['small'] = WT_THEME_DIR.'images/small/fanchart.png';
+$WT_IMAGES['gedcom']['small'] = WT_THEME_DIR.'images/small/tree.png';
+$WT_IMAGES['help']['small'] = WT_THEME_DIR.'images/small/help.png';
+$WT_IMAGES['hourglass']['small'] = WT_THEME_DIR.'images/small/hourglass.png';
+$WT_IMAGES['indis']['small'] = WT_THEME_DIR.'images/small/indis.png';
+$WT_IMAGES['media']['small'] = WT_THEME_DIR.'images/small/media.gif';
+$WT_IMAGES['menu_help']['small'] = WT_THEME_DIR.'images/small/help2.png';
+$WT_IMAGES['menu_media']['small'] = WT_THEME_DIR.'images/small/media.png';
+$WT_IMAGES['menu_repository']['small'] = WT_THEME_DIR.'images/small/repository.png';
+$WT_IMAGES['menu_source']['small'] = WT_THEME_DIR.'images/small/source.png';
+$WT_IMAGES['mypage']['small'] = WT_THEME_DIR.'images/small/mypage.png';
+$WT_IMAGES['notes']['small'] = WT_THEME_DIR.'images/small/notes.png';
+$WT_IMAGES['patriarch']['small'] = WT_THEME_DIR.'images/small/patriarch.png';
+$WT_IMAGES['pedigree']['small'] = WT_THEME_DIR.'images/small/pedigree.png';
+$WT_IMAGES['place']['small'] = WT_THEME_DIR.'images/small/place.png';
+$WT_IMAGES['relationship']['small'] = WT_THEME_DIR.'images/small/relationship.gif';
+$WT_IMAGES['reports']['small'] = WT_THEME_DIR.'images/small/reports.gif';
+$WT_IMAGES['repository']['small'] = WT_THEME_DIR.'images/small/repository.png';
+$WT_IMAGES['search']['small'] = WT_THEME_DIR.'images/small/search.png';
+$WT_IMAGES['sex']['small'] = WT_THEME_DIR.'images/small/male.gif';
+$WT_IMAGES['sexf']['small'] = WT_THEME_DIR.'images/small/female.gif';
+$WT_IMAGES['sexn']['small'] = WT_THEME_DIR.'images/small/fe_male.gif';
+$WT_IMAGES['sfamily']['small'] = WT_THEME_DIR.'images/small/sfamily.png';
+$WT_IMAGES['source']['small'] = WT_THEME_DIR.'images/small/source.png';
+$WT_IMAGES['statistic']['small'] = WT_THEME_DIR.'images/small/statistic.png';
+$WT_IMAGES['timeline']['small'] = WT_THEME_DIR.'images/small/timeline.png';
+$WT_IMAGES['tree']['small'] = WT_THEME_DIR.'images/small/tree.png';
+$WT_IMAGES['wiki']['small'] = WT_THEME_DIR.'images/small/w_22.png';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES["addmedia"]["button"] = "buttons/addmedia.gif";
-$WT_IMAGES["addrepository"]["button"] = "buttons/addrepository.gif";
-$WT_IMAGES["addsource"]["button"] = "buttons/addsource.gif";
-$WT_IMAGES["addnote"]["button"] = "buttons/addnote.gif";
-$WT_IMAGES["calendar"]["button"] = "buttons/calendar.gif";
-$WT_IMAGES["family"]["button"] = "buttons/family.gif";
-$WT_IMAGES["indi"]["button"] = "buttons/indi.gif";
-$WT_IMAGES["keyboard"]["button"] = "buttons/keyboard.gif";
-$WT_IMAGES["media"]["button"] = "buttons/media.gif";
-$WT_IMAGES["place"]["button"] = "buttons/place.gif";
-$WT_IMAGES["repository"]["button"] = "buttons/repository.gif";
-$WT_IMAGES["source"]["button"] = "buttons/source.gif";
-$WT_IMAGES["note"]["button"] = "buttons/note.gif";
-$WT_IMAGES["head"]["button"] = "buttons/head.gif";
-$WT_IMAGES["find_facts"]["button"] = "buttons/find_facts.png";
+$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES["media"]["audio"] = "media/audio.png";
-$WT_IMAGES["media"]["doc"] = "media/doc.gif";
-$WT_IMAGES["media"]["flash"] = "media/flash.png";
-$WT_IMAGES["media"]["flashrem"] = "media/flashrem.png";
-$WT_IMAGES["media"]["ged"] = "media/ged.gif";
-$WT_IMAGES["media"]["globe"] = "media/globe.png";
-$WT_IMAGES["media"]["html"] = "media/html.gif";
-$WT_IMAGES["media"]["picasa"] = "media/picasa.png";
-$WT_IMAGES["media"]["pdf"] = "media/pdf.gif";
-$WT_IMAGES["media"]["tex"] = "media/tex.gif";
-$WT_IMAGES["media"]["wmv"] = "media/wmv.png";
-$WT_IMAGES["media"]["wmvrem"] = "media/wmvrem.png";
+$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES["add"]["other"]	= "add.gif";
-$WT_IMAGES["darrow"]["other"] = "darrow.gif";
-$WT_IMAGES["darrow2"]["other"] = "darrow2.gif";
-$WT_IMAGES["ddarrow"]["other"] = "ddarrow.gif";
-$WT_IMAGES["dline"]["other"] = "dline.gif";
-$WT_IMAGES["dline2"]["other"] = "dline2.gif";
-$WT_IMAGES["webtrees"]["other"] = "webtrees_s.png";
-$WT_IMAGES["hline"]["other"] = "hline.gif";
-$WT_IMAGES["larrow"]["other"] = "larrow.gif";
-$WT_IMAGES["larrow2"]["other"] = "larrow2.gif";
-$WT_IMAGES["ldarrow"]["other"] = "ldarrow.gif";
-$WT_IMAGES["minus"]["other"] = "minus.gif";
-$WT_IMAGES["note"]["other"] = "notes.gif";
-$WT_IMAGES["plus"]["other"] = "plus.gif";
-$WT_IMAGES["rarrow"]["other"] = "rarrow.gif";
-$WT_IMAGES["rarrow2"]["other"] = "rarrow2.gif";
-$WT_IMAGES["rdarrow"]["other"] = "rdarrow.gif";
-$WT_IMAGES["remove"]["other"]	= "remove.gif";
-$WT_IMAGES["spacer"]["other"] = "spacer.gif";
-$WT_IMAGES["uarrow"]["other"] = "uarrow.gif";
-$WT_IMAGES["uarrow2"]["other"] = "uarrow2.gif";
-$WT_IMAGES["uarrow3"]["other"] = "uarrow3.gif";
-$WT_IMAGES["udarrow"]["other"] = "udarrow.gif";
-$WT_IMAGES["vline"]["other"] = "vline.gif";
-$WT_IMAGES["zoomin"]["other"] = "zoomin.gif";
-$WT_IMAGES["zoomout"]["other"] = "zoomout.gif";
-$WT_IMAGES["stop"]["other"] = "stop.gif";
-$WT_IMAGES["pin-out"]["other"] = "pin-out.png";
-$WT_IMAGES["pin-in"]["other"] = "pin-in.png";
-$WT_IMAGES["default_image_M"]["other"] = "silhouette_male.gif";
-$WT_IMAGES["default_image_F"]["other"] = "silhouette_female.gif";
-$WT_IMAGES["default_image_U"]["other"] = "silhouette_unknown.gif";
-$WT_IMAGES['slide_open']['other'] = "open.png";
-$WT_IMAGES['slide_close']['other'] = "close.png";
+$WT_IMAGES['add']['other']	= WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees_s.png';
+$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']['other']	= WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES["lsltarrow"]["other"] = "lsltarrow.gif";
-$WT_IMAGES["lsrtarrow"]["other"] = "lsrtarrow.gif";
-$WT_IMAGES["lsdnarrow"]["other"] = "lsdnarrow.gif";
-$WT_IMAGES["lsuparrow"]["other"] = "lsuparrow.gif";
+$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(
@@ -236,8 +233,4 @@ $WT_STATS_CHART_COLOR2 = "9ca3d4";
 $WT_STATS_CHART_COLOR3 = "e5e6ef";
 
 // Arrow symbol or icon for up-page links on Help pages
-// This icon is referred to in Help text by: #GLOBALS[UpArrow]#
-if (file_exists($WT_IMAGE_DIR."/uarrow3.gif")) $UpArrow = "<img src=\"{$WT_IMAGE_DIR}/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
-else $UpArrow = "<b>^^&nbsp;&nbsp;</b>";
-
-?>
+$UpArrow = "<img src=\"".WT_THEME_DIR."images/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
diff --git a/themes/xenea/footer.php b/themes/xenea/footer.php
index 6c473d217b..1cc525abfe 100644
--- a/themes/xenea/footer.php
+++ b/themes/xenea/footer.php
@@ -36,7 +36,7 @@ echo "</div> <!-- closing div id=\"content\" -->\n";//FIXME uncomment as soon as
 echo "<div id=\"footer\" class=\"$TEXT_DIRECTION\">";
 echo "\n\t<div align=\"center\" style=\"width:99%;\">";
 echo contact_links();
-echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGE_DIR, '/', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
+echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
 echo "\n\t<br />";
 if ($SHOW_STATS || WT_DEBUG) {
 	echo execution_stats();
diff --git a/themes/xenea/header.php b/themes/xenea/header.php
index f3e9ceb3e2..e6125c8af9 100644
--- a/themes/xenea/header.php
+++ b/themes/xenea/header.php
@@ -95,15 +95,15 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA
 	  <td>
 	  <table width="100%" border="0" cellspacing="0" cellpadding="0" style="background-image:url('<?php
 			if ($TEXT_DIRECTION=="ltr") {
-				echo $WT_IMAGE_DIR,"/cabeza.jpg'); ";
+				echo WT_THEME_DIR,"images/cabeza.jpg'); ";
 				echo "background-position:left top; ";
 			} else {
-				echo $WT_IMAGE_DIR,"/cabeza_rtl.jpg'); ";
+				echo WT_THEME_DIR,"images/cabeza_rtl.jpg'); ";
 				echo "background-position:right top; ";
 			}
 			?>background-repeat:repeat-y; height:40px;">
 			  <tr>
-				<td width="10"><img src="<?php echo $WT_IMAGE_DIR; ?>/pixel.gif" width="1" height="1" alt="" /></td>
+				<td width="10"><img src="<?php echo WT_THEME_DIR; ?>images/pixel.gif" width="1" height="1" alt="" /></td>
 				<td valign="middle"><font color="#FFFFFF" size="5" face="Verdana, Arial, Helvetica, sans-serif">
 				<?php echo PrintReady($GEDCOM_TITLE, true); ?>
 				</font></td>
@@ -116,20 +116,20 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA
 				<input type="submit" name="search" value="&gt;" />
 				</form>
 				</td>
-				<td width="10"><img src="<?php echo $WT_IMAGE_DIR; ?>/pixel.gif" width="1" height="1" alt="" /></td>
+				<td width="10"><img src="<?php echo WT_THEME_DIR; ?>images/pixel.gif" width="1" height="1" alt="" /></td>
 		<?php } ?>
 			  </tr></table>
 		<?php if (empty($SEARCH_SPIDER)) { ?>
-			  <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#84beff" style="background-image:url('<?php echo $WT_IMAGE_DIR; ?>/barra.gif');">
+			  <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#84beff" style="background-image:url('<?php echo WT_THEME_DIR; ?>images/barra.gif');">
 			  <tr>
-				<td width="10"  height="40"><img src="<?php echo $WT_IMAGE_DIR; ?>/pixel.gif" width="1" height="18" alt="" /></td>
+				<td width="10"  height="40"><img src="<?php echo WT_THEME_DIR; ?>images/pixel.gif" width="1" height="18" alt="" /></td>
 				<td width="115"><div id="favtheme" align="<?php echo $TEXT_DIRECTION=="rtl"?"right":"left" ?>" class="blanco"><?php print_theme_dropdown(1); ?><?php print_favorite_selector(1); ?></div></td>
 				<td><div align="center"><?php print_user_links(); ?></div></td>
 				<td width="120" align="<?php echo $TEXT_DIRECTION=="rtl"?"left":"right" ?>" >
 					<div class="makeMenu"><?php echo MenuBar::getLanguageMenu()->getMenuAsList();?></div>
 					<div id="favdate" class="blanco" align="right" ><?php echo $displayDate; ?></div>
 				</td>
-				<td width="10"><img src="<?php echo $WT_IMAGE_DIR; ?>/pixel.gif" width="1" height="1" alt="" /></td></tr></table>
+				<td width="10"><img src="<?php echo WT_THEME_DIR; ?>images/pixel.gif" width="1" height="1" alt="" /></td></tr></table>
 		<?php } ?>
 <?php include($toplinks);
 } ?>
diff --git a/themes/xenea/theme.php b/themes/xenea/theme.php
index 4a6f10ce14..abe33ab69e 100644
--- a/themes/xenea/theme.php
+++ b/themes/xenea/theme.php
@@ -32,158 +32,155 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-$theme_name = "xenea";		//-- the name of this theme
-
-$stylesheet = WT_THEME_DIR."style.css";	//-- CSS level 2 stylesheet to use
-$rtl_stylesheet = WT_THEME_DIR."style_rtl.css";	//-- CSS level 2 stylesheet to use
-$print_stylesheet = WT_THEME_DIR."print.css";	//-- CSS level 2 print stylesheet to use
-$toplinks = WT_THEME_DIR."toplinks.php";	//-- File to display the icons and links to different sections
-$headerfile = WT_THEME_DIR."header.php";	//-- Header information for the site
-$footerfile = WT_THEME_DIR."footer.php";	//-- Footer information for the site
-$WT_IMAGE_DIR = WT_THEME_DIR."images";		//-- directory to look for images
-$FAVICON=$WT_IMAGE_DIR."/favicon.ico";
-
-$WT_USE_HELPIMG = true;		// set to true to use image for help questionmark, set to false to use i18n::translate('?')
+$theme_name = "xenea"; // need double quotes, as file is scanned/parsed by script
+$stylesheet       = WT_THEME_DIR.'style.css';
+$rtl_stylesheet   = WT_THEME_DIR.'style_rtl.css';
+$print_stylesheet = WT_THEME_DIR.'print.css';
+$toplinks         = WT_THEME_DIR.'toplinks.php';
+$headerfile       = WT_THEME_DIR.'header.php';
+$footerfile       = WT_THEME_DIR.'footer.php';
+$FAVICON          = WT_THEME_DIR.'images/favicon.ico';
+$WT_USE_HELPIMG   = true;
 
 //-- variables for image names
 //- PGV main icons
-$WT_IMAGES["calendar"]["large"] = "calendar.gif";
-$WT_IMAGES["clippings"]["large"] = "clippings.gif";
-$WT_IMAGES["gedcom"]["large"] = "gedcom.gif";
-$WT_IMAGES["help"]["large"] = "help.gif";
-$WT_IMAGES["home"]["large"] = "home.gif";
-$WT_IMAGES["indis"]["large"] = "indis.gif";
-$WT_IMAGES["media"]["large"] = "media.gif";
-$WT_IMAGES["mypage"]["large"] = "mypage.gif";
-$WT_IMAGES["notes"]["large"] = "notes.gif";
-$WT_IMAGES["pedigree"]["large"] = "pedigree.gif";
-$WT_IMAGES["reports"]["large"] = "report.gif";
-$WT_IMAGES["repository"]["large"] = "repository.gif";
-$WT_IMAGES["search"]["large"] = "search.gif";
-$WT_IMAGES["sfamily"]["large"] = "sfamily.gif";
-$WT_IMAGES["source"]["large"] = "source.gif";
-$WT_IMAGES["sex"]["large"] = "male.gif";
-$WT_IMAGES["sexf"]["large"] = "female.gif";
-$WT_IMAGES["sexn"]["large"] = "fe_male.gif";
-$WT_IMAGES["edit_source"]["large"] = "small/edit_sour.gif";
+$WT_IMAGES['calendar']['large'] = WT_THEME_DIR.'images/calendar.gif';
+$WT_IMAGES['clippings']['large'] = WT_THEME_DIR.'images/clippings.gif';
+$WT_IMAGES['gedcom']['large'] = WT_THEME_DIR.'images/gedcom.gif';
+$WT_IMAGES['help']['large'] = WT_THEME_DIR.'images/help.gif';
+$WT_IMAGES['home']['large'] = WT_THEME_DIR.'images/home.gif';
+$WT_IMAGES['indis']['large'] = WT_THEME_DIR.'images/indis.gif';
+$WT_IMAGES['media']['large'] = WT_THEME_DIR.'images/media.gif';
+$WT_IMAGES['mypage']['large'] = WT_THEME_DIR.'images/mypage.gif';
+$WT_IMAGES['notes']['large'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['pedigree']['large'] = WT_THEME_DIR.'images/pedigree.gif';
+$WT_IMAGES['reports']['large'] = WT_THEME_DIR.'images/report.gif';
+$WT_IMAGES['repository']['large'] = WT_THEME_DIR.'images/repository.gif';
+$WT_IMAGES['search']['large'] = WT_THEME_DIR.'images/search.gif';
+$WT_IMAGES['sfamily']['large'] = WT_THEME_DIR.'images/sfamily.gif';
+$WT_IMAGES['source']['large'] = WT_THEME_DIR.'images/source.gif';
+$WT_IMAGES['sex']['large'] = WT_THEME_DIR.'images/male.gif';
+$WT_IMAGES['sexf']['large'] = WT_THEME_DIR.'images/female.gif';
+$WT_IMAGES['sexn']['large'] = WT_THEME_DIR.'images/fe_male.gif';
+$WT_IMAGES['edit_source']['large'] = WT_THEME_DIR.'images/small/edit_sour.gif';
 
 //- PGV small icons
-$WT_IMAGES["admin"]["small"] = "small/admin.gif";
-$WT_IMAGES["ancestry"]["small"] = "small/ancestry.gif";
-$WT_IMAGES["calendar"]["small"] = "small/calendar.gif";
-$WT_IMAGES["cfamily"]["small"] = "small/cfamily.gif";
-$WT_IMAGES["clippings"]["small"] = "small/clippings.gif";
-$WT_IMAGES["descendant"]["small"] = "small/descendancy.gif";
-$WT_IMAGES["edit_fam"]["small"] = "small/edit_fam.gif";
-$WT_IMAGES["edit_indi"]["small"] = "small/edit_indi.gif";
-$WT_IMAGES["edit_media"]["small"] = "small/edit_indi.gif";
-$WT_IMAGES["edit_note"]["small"] = "small/edit_indi.gif";
-$WT_IMAGES["edit_sour"]["small"] = "small/edit_sour.gif";
-$WT_IMAGES["edit_repo"]["small"] = "small/edit_repo.gif";
-$WT_IMAGES["fambook"]["small"] = "small/fambook.gif";
-$WT_IMAGES["fanchart"]["small"] = "small/fanchart.gif";
-$WT_IMAGES["favorites"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["gedcom"]["small"] = "small/gedcom.gif";
-$WT_IMAGES["help"]["small"] = "small/help.gif";
-$WT_IMAGES["hourglass"]["small"] = "small/hourglass.gif";
-$WT_IMAGES["indis"]["small"] = "small/indis.gif";
-$WT_IMAGES["media"]["small"] = "small/media.gif";
-$WT_IMAGES["menu_help"]["small"] = "small/menu_help.gif";
-$WT_IMAGES["menu_media"]["small"] = "small/menu_media.gif";
-$WT_IMAGES["menu_repository"]["small"] = "small/menu_repository.gif";
-$WT_IMAGES["menu_source"]["small"] = "small/menu_source.gif";
-$WT_IMAGES["mypage"]["small"] = "small/mypage.gif";
-$WT_IMAGES["notes"]["small"] = "small/notes.gif";
-$WT_IMAGES["patriarch"]["small"] = "small/patriarch.gif";
-$WT_IMAGES["pedigree"]["small"] = "small/pedigree.gif";
-$WT_IMAGES["place"]["small"] = "small/place.gif";
-$WT_IMAGES["relationship"]["small"] = "small/relationship.gif";
-$WT_IMAGES["reports"]["small"] = "small/report.gif";
-$WT_IMAGES["repository"]["small"] = "small/repository.gif";
-$WT_IMAGES["search"]["small"] = "small/search.gif";
-$WT_IMAGES["sex"]["small"] = "small/male.gif";
-$WT_IMAGES["sexf"]["small"] = "small/female.gif";
-$WT_IMAGES["sexn"]["small"] = "small/fe_male.gif";
-$WT_IMAGES["sfamily"]["small"] = "small/sfamily.gif";
-$WT_IMAGES["source"]["small"] = "small/source.gif";
-$WT_IMAGES["statistic"]["small"] = "small/statistic.gif";
-$WT_IMAGES["timeline"]["small"] = "small/timeline.gif";
-$WT_IMAGES["tree"]["small"] = "small/tree.gif";
-$WT_IMAGES["wiki"]["small"] = "small/w_22.png";
+$WT_IMAGES['admin']['small'] = WT_THEME_DIR.'images/small/admin.gif';
+$WT_IMAGES['ancestry']['small'] = WT_THEME_DIR.'images/small/ancestry.gif';
+$WT_IMAGES['calendar']['small'] = WT_THEME_DIR.'images/small/calendar.gif';
+$WT_IMAGES['cfamily']['small'] = WT_THEME_DIR.'images/small/cfamily.gif';
+$WT_IMAGES['clippings']['small'] = WT_THEME_DIR.'images/small/clippings.gif';
+$WT_IMAGES['descendant']['small'] = WT_THEME_DIR.'images/small/descendancy.gif';
+$WT_IMAGES['edit_fam']['small'] = WT_THEME_DIR.'images/small/edit_fam.gif';
+$WT_IMAGES['edit_indi']['small'] = WT_THEME_DIR.'images/small/edit_indi.gif';
+$WT_IMAGES['edit_media']['small'] = WT_THEME_DIR.'images/small/edit_indi.gif';
+$WT_IMAGES['edit_note']['small'] = WT_THEME_DIR.'images/small/edit_indi.gif';
+$WT_IMAGES['edit_sour']['small'] = WT_THEME_DIR.'images/small/edit_sour.gif';
+$WT_IMAGES['edit_repo']['small'] = WT_THEME_DIR.'images/small/edit_repo.gif';
+$WT_IMAGES['fambook']['small'] = WT_THEME_DIR.'images/small/fambook.gif';
+$WT_IMAGES['fanchart']['small'] = WT_THEME_DIR.'images/small/fanchart.gif';
+$WT_IMAGES['favorites']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['gedcom']['small'] = WT_THEME_DIR.'images/small/gedcom.gif';
+$WT_IMAGES['help']['small'] = WT_THEME_DIR.'images/small/help.gif';
+$WT_IMAGES['hourglass']['small'] = WT_THEME_DIR.'images/small/hourglass.gif';
+$WT_IMAGES['indis']['small'] = WT_THEME_DIR.'images/small/indis.gif';
+$WT_IMAGES['media']['small'] = WT_THEME_DIR.'images/small/media.gif';
+$WT_IMAGES['menu_help']['small'] = WT_THEME_DIR.'images/small/menu_help.gif';
+$WT_IMAGES['menu_media']['small'] = WT_THEME_DIR.'images/small/menu_media.gif';
+$WT_IMAGES['menu_repository']['small'] = WT_THEME_DIR.'images/small/menu_repository.gif';
+$WT_IMAGES['menu_source']['small'] = WT_THEME_DIR.'images/small/menu_source.gif';
+$WT_IMAGES['mypage']['small'] = WT_THEME_DIR.'images/small/mypage.gif';
+$WT_IMAGES['notes']['small'] = WT_THEME_DIR.'images/small/notes.gif';
+$WT_IMAGES['patriarch']['small'] = WT_THEME_DIR.'images/small/patriarch.gif';
+$WT_IMAGES['pedigree']['small'] = WT_THEME_DIR.'images/small/pedigree.gif';
+$WT_IMAGES['place']['small'] = WT_THEME_DIR.'images/small/place.gif';
+$WT_IMAGES['relationship']['small'] = WT_THEME_DIR.'images/small/relationship.gif';
+$WT_IMAGES['reports']['small'] = WT_THEME_DIR.'images/small/report.gif';
+$WT_IMAGES['repository']['small'] = WT_THEME_DIR.'images/small/repository.gif';
+$WT_IMAGES['search']['small'] = WT_THEME_DIR.'images/small/search.gif';
+$WT_IMAGES['sex']['small'] = WT_THEME_DIR.'images/small/male.gif';
+$WT_IMAGES['sexf']['small'] = WT_THEME_DIR.'images/small/female.gif';
+$WT_IMAGES['sexn']['small'] = WT_THEME_DIR.'images/small/fe_male.gif';
+$WT_IMAGES['sfamily']['small'] = WT_THEME_DIR.'images/small/sfamily.gif';
+$WT_IMAGES['source']['small'] = WT_THEME_DIR.'images/small/source.gif';
+$WT_IMAGES['statistic']['small'] = WT_THEME_DIR.'images/small/statistic.gif';
+$WT_IMAGES['timeline']['small'] = WT_THEME_DIR.'images/small/timeline.gif';
+$WT_IMAGES['tree']['small'] = WT_THEME_DIR.'images/small/tree.gif';
+$WT_IMAGES['wiki']['small'] = WT_THEME_DIR.'images/small/w_22.png';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES["addmedia"]["button"] = "buttons/addmedia.gif";
-$WT_IMAGES["addrepository"]["button"] = "buttons/addrepository.gif";
-$WT_IMAGES["addsource"]["button"] = "buttons/addsource.gif";
-$WT_IMAGES["addnote"]["button"] = "buttons/addnote.gif";
-$WT_IMAGES["autocomplete"]["button"] = "buttons/autocomplete.gif";
-$WT_IMAGES["calendar"]["button"] = "buttons/calendar.gif";
-$WT_IMAGES["family"]["button"] = "buttons/family.gif";
-$WT_IMAGES["indi"]["button"] = "buttons/indi.gif";
-$WT_IMAGES["keyboard"]["button"] = "buttons/keyboard.gif";
-$WT_IMAGES["media"]["button"] = "buttons/media.gif";
-$WT_IMAGES["place"]["button"] = "buttons/place.gif";
-$WT_IMAGES["repository"]["button"] = "buttons/repository.gif";
-$WT_IMAGES["source"]["button"] = "buttons/source.gif";
-$WT_IMAGES["note"]["button"] = "buttons/note.gif";
-$WT_IMAGES["head"]["button"] = "buttons/head.gif";
-$WT_IMAGES["find_facts"]["button"] = "buttons/find_facts.png";
+$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['autocomplete']['button'] = WT_THEME_DIR.'images/buttons/autocomplete.gif';
+$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES["media"]["audio"] = "media/audio.png";
-$WT_IMAGES["media"]["doc"] = "media/doc.gif";
-$WT_IMAGES["media"]["flash"] = "media/flash.png";
-$WT_IMAGES["media"]["flashrem"] = "media/flashrem.png";
-$WT_IMAGES["media"]["ged"] = "media/ged.gif";
-$WT_IMAGES["media"]["globe"] = "media/globe.png";
-$WT_IMAGES["media"]["html"] = "media/html.gif";
-$WT_IMAGES["media"]["picasa"] = "media/picasa.png";
-$WT_IMAGES["media"]["pdf"] = "media/pdf.gif";
-$WT_IMAGES["media"]["tex"] = "media/tex.gif";
-$WT_IMAGES["media"]["wmv"] = "media/wmv.png";
-$WT_IMAGES["media"]["wmvrem"] = "media/wmvrem.png";
+$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES["add"]["other"] = "add.gif";
-$WT_IMAGES["darrow"]["other"] = "darrow.gif";
-$WT_IMAGES["darrow2"]["other"] = "darrow2.gif";
-$WT_IMAGES["ddarrow"]["other"] = "ddarrow.gif";
-$WT_IMAGES["dline"]["other"] = "dline.gif";
-$WT_IMAGES["dline2"]["other"] = "dline2.gif";
-$WT_IMAGES["webtrees"]["other"] = "webtrees.png";
-$WT_IMAGES["hline"]["other"] = "hline.gif";
-$WT_IMAGES["larrow"]["other"] = "larrow.gif";
-$WT_IMAGES["larrow2"]["other"] = "larrow2.gif";
-$WT_IMAGES["ldarrow"]["other"] = "ldarrow.gif";
-$WT_IMAGES["minus"]["other"] = "minus.gif";
-$WT_IMAGES["note"]["other"] = "notes.gif";
-$WT_IMAGES["plus"]["other"] = "plus.gif";
-$WT_IMAGES["rarrow"]["other"] = "rarrow.gif";
-$WT_IMAGES["rarrow2"]["other"] = "rarrow2.gif";
-$WT_IMAGES["rdarrow"]["other"] = "rdarrow.gif";
-$WT_IMAGES["remove"]["other"]	= "remove.gif";
-$WT_IMAGES["spacer"]["other"] = "spacer.gif";
-$WT_IMAGES["uarrow"]["other"] = "uarrow.gif";
-$WT_IMAGES["uarrow2"]["other"] = "uarrow2.gif";
-$WT_IMAGES["uarrow3"]["other"] = "uarrow3.gif";
-$WT_IMAGES["udarrow"]["other"] = "udarrow.gif";
-$WT_IMAGES["vline"]["other"] = "vline.gif";
-$WT_IMAGES["zoomin"]["other"] = "zoomin.gif";
-$WT_IMAGES["zoomout"]["other"] = "zoomout.gif";
-$WT_IMAGES["stop"]["other"] = "stop.gif";
-$WT_IMAGES["pin-out"]["other"] = "pin-out.png";
-$WT_IMAGES["pin-in"]["other"] = "pin-in.png";
-$WT_IMAGES["default_image_M"]["other"] = "silhouette_male.gif";
-$WT_IMAGES["default_image_F"]["other"] = "silhouette_female.gif";
-$WT_IMAGES["default_image_U"]["other"] = "silhouette_unknown.gif";
-$WT_IMAGES['slide_open']['other'] = "open.png";
-$WT_IMAGES['slide_close']['other'] = "close.png";
+$WT_IMAGES['add']['other'] = WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.png';
+$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']['other']	= WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES["lsltarrow"]["other"] = "lsltarrow.gif";
-$WT_IMAGES["lsrtarrow"]["other"] = "lsrtarrow.gif";
-$WT_IMAGES["lsdnarrow"]["other"] = "lsdnarrow.gif";
-$WT_IMAGES["lsuparrow"]["other"] = "lsuparrow.gif";
+$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(
@@ -229,8 +226,4 @@ $WT_STATS_CHART_COLOR2 = "84beff";
 $WT_STATS_CHART_COLOR3 = "c3dfff";
 
 // Arrow symbol or icon for up-page links on Help pages
-// This icon is referred to in Help text by: #GLOBALS[UpArrow]#
-if (file_exists($WT_IMAGE_DIR."/uarrow3.gif")) $UpArrow = "<img src=\"{$WT_IMAGE_DIR}/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
-else $UpArrow = "<b>^^&nbsp;&nbsp;</b>";
-
-?>
+$UpArrow = "<img src=\"".WT_THEME_DIR."images/uarrow3.gif\" class=\"icon\" border=\"0\" alt=\"^\" />";
diff --git a/themes/xenea/toplinks.php b/themes/xenea/toplinks.php
index 7dccddd496..1b6f1ed742 100644
--- a/themes/xenea/toplinks.php
+++ b/themes/xenea/toplinks.php
@@ -118,9 +118,9 @@ $menubar = new MenuBar();
 </table>
 </td></tr></table>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="0" style="background-image:url('<?php print $WT_IMAGE_DIR; ?>/sombra.gif'); height:4px;">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" style="background-image:url('<?php print WT_THEME_DIR; ?>images/sombra.gif'); height:4px;">
 	<tr>
-		<td><img src="<?php print $WT_IMAGE_DIR; ?>/pixel.gif" width="1" height="1" alt="" /></td>
+		<td><img src="<?php print WT_THEME_DIR; ?>images/pixel.gif" width="1" height="1" alt="" /></td>
 	</tr>
 </table>
 <br />
diff --git a/timeline.php b/timeline.php
index f0f9876660..d711289840 100644
--- a/timeline.php
+++ b/timeline.php
@@ -187,11 +187,11 @@ function MM(e) {
 			// check if we are above the starting point and switch the background image
 			if (newy < boxmean) {
 				if (textDirection=='ltr') {
-					dbox.style.backgroundImage = "url('<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["dline"]["other"]; ?>')";
+					dbox.style.backgroundImage = "url('<?php print $WT_IMAGES["dline"]["other"]; ?>')";
 					dbox.style.backgroundPosition = "0% 100%";
 				}
 				else {
-					dbox.style.backgroundImage = "url('<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["dline2"]["other"]; ?>')";
+					dbox.style.backgroundImage = "url('<?php print $WT_IMAGES["dline2"]["other"]; ?>')";
 					dbox.style.backgroundPosition = "0% 0%";
 				}
 				dy = (-1)*dy;
@@ -200,11 +200,11 @@ function MM(e) {
 			}
 			else {
 				if (textDirection=='ltr') {
-					dbox.style.backgroundImage = "url('<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["dline2"]["other"]; ?>')";
+					dbox.style.backgroundImage = "url('<?php print $WT_IMAGES["dline2"]["other"]; ?>')";
 					dbox.style.backgroundPosition = "0% 0%";
 				}
 				else {
-					dbox.style.backgroundImage = "url('<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["dline"]["other"]; ?>')";
+					dbox.style.backgroundImage = "url('<?php print $WT_IMAGES["dline"]["other"]; ?>')";
 					dbox.style.backgroundPosition = "0% 100%";
 				}
 
@@ -324,8 +324,8 @@ $controller->checkPrivacy();
 		$scalemod = round($controller->scale*.2) + 1;
 		?>
 		<td class="list_value" style="padding: 5px">
-			<a href="<?php echo WT_SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale+$scalemod); ?>"><img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES['zoomin']['other']; ?>" title="<?php print i18n::translate('Zoom in'); ?>" alt="<?php print i18n::translate('Zoom in'); ?>" border="0" /></a><br />
-			<a href="<?php echo WT_SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale-$scalemod); ?>"><img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES['zoomout']['other']; ?>" title="<?php print i18n::translate('Zoom out'); ?>" alt="<?php print i18n::translate('Zoom out'); ?>" border="0" /></a><br />
+			<a href="<?php echo WT_SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale+$scalemod); ?>"><img src="<?php print $WT_IMAGES['zoomin']['other']; ?>" title="<?php print i18n::translate('Zoom in'); ?>" alt="<?php print i18n::translate('Zoom in'); ?>" border="0" /></a><br />
+			<a href="<?php echo WT_SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale-$scalemod); ?>"><img src="<?php print $WT_IMAGES['zoomout']['other']; ?>" title="<?php print i18n::translate('Zoom out'); ?>" alt="<?php print i18n::translate('Zoom out'); ?>" border="0" /></a><br />
 			<input type="button" value="<?php print i18n::translate('Clear Chart'); ?>" onclick="window.location = 'timeline.php?clear=1';" />
 		</td>
 	<?php } ?>
@@ -339,7 +339,7 @@ if (count($controller->people)>0) {
 <div id="timeline_chart">
 	<!-- print the timeline line image -->
 	<div id="line" style="position:absolute; <?php print $TEXT_DIRECTION =="ltr"?"left: ".($basexoffset+22):"right: ".($basexoffset+22); ?>px; top: <?php print $baseyoffset; ?>px; ">
-		<img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]; ?>" width="3" height="<?php print ($baseyoffset+(($controller->topyear-$controller->baseyear)*$controller->scale)); ?>" alt="" />
+		<img src="<?php print $WT_IMAGES["vline"]["other"]; ?>" width="3" height="<?php print ($baseyoffset+(($controller->topyear-$controller->baseyear)*$controller->scale)); ?>" alt="" />
 	</div>
 	<!-- print divs for the grid -->
 	<div id="scale<?php print $controller->baseyear; ?>" style="font-family: Arial; position:absolute; <?php print ($TEXT_DIRECTION =="ltr"?"left: $basexoffset":"right: $basexoffset"); ?>px; top: <?php print ($baseyoffset-5); ?>px; font-size: 7pt; text-align: <?php print ($TEXT_DIRECTION =="ltr"?"left":"right"); ?>;">
@@ -376,7 +376,7 @@ if (count($controller->people)>0) {
 			<table cellspacing="0" cellpadding="0">
 				<tr>
 					<td>
-						<img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]; ?>" name="ageline<?php print $p; ?>" id="ageline<?php print $p; ?>" align="left" hspace="0" vspace="0" width="25" height="3" alt="" />
+						<img src="<?php print $WT_IMAGES["hline"]["other"]; ?>" name="ageline<?php print $p; ?>" id="ageline<?php print $p; ?>" align="left" hspace="0" vspace="0" width="25" height="3" alt="" />
 					</td>
 					<td valign="top">
 						<?php
diff --git a/useradmin.php b/useradmin.php
index 4cc7c46548..eaebaafc56 100644
--- a/useradmin.php
+++ b/useradmin.php
@@ -505,7 +505,7 @@ if ($action == "listusers") {
 	<td class="descriptionbox" style="padding-left:2px"><a href="javascript: <?php echo i18n::translate('Privileges'); ?>" onclick="<?php
 	$k = 1;
 	for ($i=1, $max=count($users)+1; $i<=$max; $i++) echo "expand_layer('user-geds", $i, "'); ";
-	echo " return false;\"><img id=\"user-geds", $k, "_img\" src=\"", $WT_IMAGE_DIR, "/";
+	echo " return false;\"><img id=\"user-geds", $k, "_img\" src=\"";
 	echo $WT_IMAGES["plus"]["other"];
 	echo "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" /></a>";
 	echo "<div id=\"user-geds", $k, "\" style=\"display:none\">";
@@ -544,12 +544,12 @@ if ($action == "listusers") {
 		else echo "\t<td class=\"optionbox wrap\">", $user_name;
 		if (get_user_setting($user_id, "comment")) {
 			$tempTitle = PrintReady(get_user_setting($user_id, "comment"));
-			echo "<br /><img class=\"adminicon\" align=\"top\" alt=\"{$tempTitle}\" title=\"{$tempTitle}\" src=\"{$WT_IMAGE_DIR}/{$WT_IMAGES['notes']['small']}\" />";
+			echo "<br /><img class=\"adminicon\" align=\"top\" alt=\"{$tempTitle}\" title=\"{$tempTitle}\" src=\"{$WT_IMAGES['notes']['small']}\" />";
 		}
 		echo "</td>\n";
 		echo "\t<td class=\"optionbox wrap\">", Zend_Locale::getTranslation(get_user_setting($user_id, 'language'), 'language', WT_LOCALE), "</td>\n";
 		echo "\t<td class=\"optionbox\">";
-		echo "<a href=\"javascript: ", i18n::translate('Privileges'), "\" onclick=\"expand_layer('user-geds", $k, "'); return false;\"><img id=\"user-geds", $k, "_img\" src=\"", $WT_IMAGE_DIR, "/";
+		echo "<a href=\"javascript: ", i18n::translate('Privileges'), "\" onclick=\"expand_layer('user-geds", $k, "'); return false;\"><img id=\"user-geds", $k, "_img\" src=\"";
 		echo $WT_IMAGES["plus"]["other"];
 		echo "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" />";
 		echo "</a>";