Use constant WT_THEME_DIR instead of global variable $THEME_DIR

29 files changed, 66 insertions, 86 deletions

diff --git a/includes/functions/functions.php b/includes/functions/functions.php
index ec920b8d6c..c536a5ef8c 100644
--- a/includes/functions/functions.php
+++ b/includes/functions/functions.php
@@ -305,7 +305,6 @@ function load_gedcom_settings($ged_id=WT_GED_ID) {
 	global $SOURCE_ID_PREFIX;             $SOURCE_ID_PREFIX             =get_gedcom_setting($ged_id, 'SOURCE_ID_PREFIX');
 	global $SPLIT_PLACES;                 $SPLIT_PLACES                 =get_gedcom_setting($ged_id, 'SPLIT_PLACES');
 	global $SURNAME_LIST_STYLE;           $SURNAME_LIST_STYLE           =get_gedcom_setting($ged_id, 'SURNAME_LIST_STYLE');
-	global $THEME_DIR;                    $THEME_DIR                    =get_gedcom_setting($ged_id, 'THEME_DIR');
 	global $THUMBNAIL_WIDTH;              $THUMBNAIL_WIDTH              =get_gedcom_setting($ged_id, 'THUMBNAIL_WIDTH');
 	global $UNDERLINE_NAME_QUOTES;        $UNDERLINE_NAME_QUOTES        =get_gedcom_setting($ged_id, 'UNDERLINE_NAME_QUOTES');
 	global $USE_GEONAMES;                 $USE_GEONAMES                 =get_gedcom_setting($ged_id, 'USE_GEONAMES');
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 7da6ccb775..13a5b374e3 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -357,8 +357,7 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") {
 				}
 			}
 		}
-	global $THEME_DIR;
-	require $THEME_DIR.'templates/personbox_template.php';
+	require WT_THEME_DIR.'templates/personbox_template.php';
 }
 
 /**
@@ -375,7 +374,7 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") {
 function print_header($title) {
 	global $bwidth, $BROWSERTYPE, $SEARCH_SPIDER, $view, $cart;
 	global $GEDCOM, $GEDCOM_TITLE, $action, $query, $theme_name;
-	global $stylesheet, $print_stylesheet, $rtl_stylesheet, $headerfile, $THEME_DIR, $print_headerfile;
+	global $stylesheet, $print_stylesheet, $rtl_stylesheet, $headerfile, $print_headerfile;
 	global $WT_IMAGES, $TEXT_DIRECTION, $REQUIRE_AUTHENTICATION;
 
 	header('Content-Type: text/html; charset=UTF-8');
diff --git a/modules/GEDFact_assistant/_MEDIA/media_5_input.php b/modules/GEDFact_assistant/_MEDIA/media_5_input.php
index 0cde96136b..c979b6cf32 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_5_input.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_5_input.php
@@ -30,25 +30,11 @@
  */
 
 ?>
-<?php if ($THEME_DIR=="themes/simplygreen/" || $THEME_DIR=="themes/simplyred/" || $THEME_DIR=="themes/simplyblue/") { ?>
-	<script>
-	var txtcolor="#ffffff";
-	</script>
-<?php } else { ?>
+
 	<script>
 	var txtcolor="#000000";
 	</script>
-<?php } ?>
 
-<?php if ($THEME_DIR=="themes/simplygreen/" || $THEME_DIR=="themes/simplyred/" || $THEME_DIR=="themes/simplyblue/") { ?>
-	<style type="text/css">
-	<!--
-	#addlinkQueue td, th { padding: 0.2em; }
-	.classy0 { font-family: Verdana, Arial, Helvetica, sans-serif; background-color: transparent; color: #ffffff; font-size: 10px; }
-	.classy1 { font-family: Verdana, Arial, Helvetica, sans-serif; background-color: transparent; color: #ffffff; font-size: 10px; }
-	-->
-	</style>
-<?php } else { ?>
 	<style type="text/css">
 	<!--
 	#addlinkQueue td, th { padding: 0.2em; }
@@ -56,7 +42,7 @@
 	.classy1 { font-family: Verdana, Arial, Helvetica, sans-serif; background-color: transparent; color: #000000; font-size: 10px; }
 	-->
 	</style>
-<?php }
+<?php 
 
 // Various JavaScript variables required --------------------------------- ?>
 <script language="javascript" type="text/javascript">
diff --git a/modules/charts/module.php b/modules/charts/module.php
index e060b8f31c..6099c1e171 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, $cfg=null) {
-		global $ctype, $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;
 
 		$details=get_block_setting($block_id, 'details', false);
 		$type   =get_block_setting($block_id, 'type', 'treenav');
@@ -152,9 +152,9 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/gedcom_block/module.php b/modules/gedcom_block/module.php
index bc9448d77a..4d9dbe01dc 100644
--- a/modules/gedcom_block/module.php
+++ b/modules/gedcom_block/module.php
@@ -45,7 +45,7 @@ class gedcom_block_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true, $cfg=null) {
-		global $hitCount, $SHOW_COUNTER, $THEME_DIR;
+		global $hitCount, $SHOW_COUNTER;
 
 		$id=$this->getName().$block_id;
 		$title=get_gedcom_setting(WT_GED_ID, 'title');
@@ -60,7 +60,7 @@ class gedcom_block_WT_Module extends WT_Module implements WT_Module_Block {
 		$content .=  "</div>";
 
 		if ($template) {
-			require $THEME_DIR.'templates/block_main_temp.php';
+			require WT_THEME_DIR.'templates/block_main_temp.php';
 		} else {
 			return $content;
 		}
diff --git a/modules/gedcom_favorites/module.php b/modules/gedcom_favorites/module.php
index 9699e875d6..dcf226da8a 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, $cfg=null) {
-		global $WT_IMAGES, $ctype, $TEXT_DIRECTION, $THEME_DIR;
+		global $WT_IMAGES, $ctype, $TEXT_DIRECTION;
 		global $show_full, $PEDIGREE_FULL_DETAILS, $BROWSERTYPE, $ENABLE_AUTOCOMPLETE;
 
 		$action=safe_GET('action');
@@ -273,9 +273,9 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/gedcom_news/module.php b/modules/gedcom_news/module.php
index 727dc5b0f7..620360315b 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, $cfg=null) {
-		global $WT_IMAGES, $TEXT_DIRECTION, $ctype, $THEME_DIR;
+		global $WT_IMAGES, $TEXT_DIRECTION, $ctype;
 
 		switch (safe_GET('action')) {
 		case 'deletenews':
@@ -153,7 +153,7 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block {
 		}
 
 		if ($template) {
-			require $THEME_DIR.'templates/block_main_temp.php';
+			require WT_THEME_DIR.'templates/block_main_temp.php';
 		} else {
 			return $content;
 		}
diff --git a/modules/gedcom_stats/module.php b/modules/gedcom_stats/module.php
index 25efe17754..1405eed030 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, $cfg=null) {
-		global $ctype, $WT_IMAGES, $MULTI_MEDIA, $top10_block_present, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $MULTI_MEDIA, $top10_block_present;
 
 		$show_common_surnames=get_block_setting($block_id, 'show_common_surnames', true);
 		$stat_indi           =get_block_setting($block_id, 'stat_indi',            true);
@@ -227,7 +227,7 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block {
 		}
 
 		if ($template) {
-			require $THEME_DIR.'templates/block_main_temp.php';
+			require WT_THEME_DIR.'templates/block_main_temp.php';
 		} else {
 			return $content;
 		}
diff --git a/modules/html/module.php b/modules/html/module.php
index f654108252..7422b7cf90 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, $cfg=null) {
-		global $ctype, $GEDCOM, $WT_IMAGES, $TEXT_DIRECTION, $MULTI_MEDIA, $THEME_DIR;
+		global $ctype, $GEDCOM, $WT_IMAGES, $TEXT_DIRECTION, $MULTI_MEDIA;
 
 		// Only show this block for certain languages
 		$languages=get_block_setting($block_id, 'languages');
@@ -127,9 +127,9 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if (get_block_setting($block_id, 'block', false)) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/logged_in/module.php b/modules/logged_in/module.php
index 06aaec5cc1..7d26fd6003 100644
--- a/modules/logged_in/module.php
+++ b/modules/logged_in/module.php
@@ -45,8 +45,6 @@ class logged_in_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true, $cfg=null) {
-		global $THEME_DIR;
-
 		// List active users
 		$NumAnonymous = 0;
 		$loggedusers = array ();
@@ -83,7 +81,7 @@ class logged_in_WT_Module extends WT_Module implements WT_Module_Block {
 		$content .= "</table>";
 
 		if ($template) {
-			require $THEME_DIR.'templates/block_main_temp.php';
+			require WT_THEME_DIR.'templates/block_main_temp.php';
 		} else {
 			return $content;
 		}
diff --git a/modules/login_block/module.php b/modules/login_block/module.php
index e53e8a7dc8..1f40ed09dc 100644
--- a/modules/login_block/module.php
+++ b/modules/login_block/module.php
@@ -45,7 +45,7 @@ class login_block_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true, $cfg=null) {
-		global $TEXT_DIRECTION, $THEME_DIR;
+		global $TEXT_DIRECTION;
 
 		$id=$this->getName().$block_id;
 		if (WT_USER_ID) {
@@ -141,7 +141,7 @@ class login_block_WT_Module extends WT_Module implements WT_Module_Block {
 		}
 
 		if ($template) {
-			require $THEME_DIR.'templates/block_main_temp.php';
+			require WT_THEME_DIR.'templates/block_main_temp.php';
 		} else {
 			return $content;
 		}
diff --git a/modules/random_media/module.php b/modules/random_media/module.php
index ef307dc04b..2d5d8480ec 100644
--- a/modules/random_media/module.php
+++ b/modules/random_media/module.php
@@ -48,7 +48,7 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template=true, $cfg=null) {
 		global $ctype, $foundlist, $MULTI_MEDIA, $TEXT_DIRECTION, $WT_IMAGES;
 		global $MEDIA_EXTERNAL, $MEDIA_DIRECTORY;
-		global $MEDIATYPE, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER, $THEME_DIR;;
+		global $MEDIATYPE, $THUMBNAIL_WIDTH, $USE_MEDIA_VIEWER;
 
 		if (!$MULTI_MEDIA) return;
 
@@ -308,7 +308,7 @@ function openPic(filename, width, height) {
 			$content .= "</div>"; // random_picture_content
 			$content .= "</div>"; // random_picture_container
 			if ($template) {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			} else {
 				return $content;
 			}
diff --git a/modules/recent_changes/module.php b/modules/recent_changes/module.php
index f2a3fd7066..12264406b8 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, $cfg=null) {
-		global $ctype, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $WT_IMAGES;
 
 		$days=get_block_setting($block_id, 'days', 7);
 		$hide_empty=get_block_setting($block_id, 'hide_empty', false);
@@ -92,9 +92,9 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/review_changes/module.php b/modules/review_changes/module.php
index 074a01b4da..a2484ef506 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, $cfg=null) {
-		global $ctype, $WT_IMAGES, $TEXT_DIRECTION, $WEBTREES_EMAIL, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $TEXT_DIRECTION, $WEBTREES_EMAIL;
 
 		$changes=WT_DB::prepare(
 			"SELECT 1".
@@ -143,9 +143,9 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 
 				if ($template) {
 					if ($block) {
-						require $THEME_DIR.'templates/block_small_temp.php';
+						require WT_THEME_DIR.'templates/block_small_temp.php';
 					} else {
-						require $THEME_DIR.'templates/block_main_temp.php';
+						require WT_THEME_DIR.'templates/block_main_temp.php';
 					}
 				} else {
 					return $content;
diff --git a/modules/theme_select/module.php b/modules/theme_select/module.php
index b978918931..a000d0f9cf 100644
--- a/modules/theme_select/module.php
+++ b/modules/theme_select/module.php
@@ -45,8 +45,6 @@ class theme_select_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true, $cfg=null) {
-		global $THEME_DIR;
-
 		$id=$this->getName().$block_id;
 		$title=i18n::translate('Change theme').help_link('change_theme');
 		$menu=MenuBar::getThemeMenu();
@@ -54,7 +52,7 @@ class theme_select_WT_Module extends WT_Module implements WT_Module_Block {
 			$content='<br /><div class="center theme_form">'.MenuBar::getThemeMenu()->getMenuAsDropdown().'</div><br />';
 
 			if ($template) {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			} else {
 				return $content;
 			}
diff --git a/modules/todays_events/module.php b/modules/todays_events/module.php
index 4fa00ac207..43bb8dd4a7 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, $cfg=null) {
-		global $ctype, $TEXT_DIRECTION, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $TEXT_DIRECTION, $WT_IMAGES;
 
 		$filter       =get_block_setting($block_id, 'filter',   true);
 		$onlyBDM      =get_block_setting($block_id, 'onlyBDM',  true);
@@ -91,9 +91,9 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/todo/module.php b/modules/todo/module.php
index 3c6a834133..81b9faf912 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, $cfg=null) {
-		global $ctype, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $WT_IMAGES;
 
 		$show_unassigned=get_block_setting($block_id, 'show_unassigned', true);
 		$show_other     =get_block_setting($block_id, 'show_other',      true);
@@ -116,9 +116,9 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/top10_givnnames/module.php b/modules/top10_givnnames/module.php
index f887524e25..27f54a1c8e 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, $cfg=null) {
-		global $TEXT_DIRECTION, $ctype, $WT_IMAGES, $THEME_DIR;
+		global $TEXT_DIRECTION, $ctype, $WT_IMAGES;
 
 		$num=get_block_setting($block_id, 'num', 10);
 		$infoStyle=get_block_setting($block_id, 'infoStyle', 'table');
@@ -109,9 +109,9 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/top10_pageviews/module.php b/modules/top10_pageviews/module.php
index 11781c8f5d..0d3c480533 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, $cfg=null) {
-		global $ctype, $WT_IMAGES, $SHOW_COUNTER, $TEXT_DIRECTION, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $SHOW_COUNTER, $TEXT_DIRECTION;
 
 		$count_placement=get_block_setting($block_id, 'count_placement', 'before');
 		$num=(int)get_block_setting($block_id, 'num', 10);
@@ -111,9 +111,9 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/top10_surnames/module.php b/modules/top10_surnames/module.php
index 35f3f4451a..43f0ded2ac 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, $cfg=null) {
-		global $ctype, $WT_IMAGES, $SURNAME_LIST_STYLE, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $SURNAME_LIST_STYLE;
 
 		$COMMON_NAMES_REMOVE=get_gedcom_setting(WT_GED_ID, 'COMMON_NAMES_REMOVE');
 		$COMMON_NAMES_THRESHOLD=get_gedcom_setting(WT_GED_ID, 'COMMON_NAMES_THRESHOLD');
@@ -115,9 +115,9 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/upcoming_events/module.php b/modules/upcoming_events/module.php
index 80010d8774..84d5016f20 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, $cfg=null) {
-		global $ctype, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $WT_IMAGES;
 
 		$days     =get_block_setting($block_id, 'days',      7);
 		$filter   =get_block_setting($block_id, 'filter',    true);
@@ -90,9 +90,9 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/user_blog/module.php b/modules/user_blog/module.php
index 0d8ba12da8..d3a2aab22a 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, $cfg=null) {
-		global $ctype, $WT_IMAGES, $TEXT_DIRECTION, $THEME_DIR;
+		global $ctype, $WT_IMAGES, $TEXT_DIRECTION;
 
 		switch (safe_GET('action')) {
 		case 'deletenews':
@@ -101,9 +101,9 @@ class user_blog_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/user_favorites/module.php b/modules/user_favorites/module.php
index 08815d86fd..859a2c7b6a 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, $cfg=null) {
-		global $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;
 		global $show_full, $PEDIGREE_FULL_DETAILS, $BROWSERTYPE, $ENABLE_AUTOCOMPLETE;
 
 		$action=safe_GET('action');
@@ -267,9 +267,9 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/user_messages/module.php b/modules/user_messages/module.php
index 07970b00b1..50b0aa2610 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, $cfg=null) {
-		global $ctype, $TEXT_DIRECTION, $WT_IMAGES, $THEME_DIR;
+		global $ctype, $TEXT_DIRECTION, $WT_IMAGES;
 
 		require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 
@@ -157,9 +157,9 @@ class user_messages_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/modules/user_welcome/module.php b/modules/user_welcome/module.php
index adfba6ad2c..2bb7cfa7b5 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, $cfg=null) {
-		global $WT_IMAGES, $THEME_DIR;
+		global $WT_IMAGES;
 
 		$id=$this->getName().$block_id;
 		$title=/* I18N: A greeting; %s is the user's name */ i18n::translate('Welcome %s', getUserFullName(WT_USER_ID));
@@ -66,7 +66,7 @@ class user_welcome_WT_Module extends WT_Module implements WT_Module_Block {
 		$content .= "</td></tr></table>";
 
 		if ($template) {
-			require $THEME_DIR.'templates/block_main_temp.php';
+			require WT_THEME_DIR.'templates/block_main_temp.php';
 		} else {
 			return $content;
 		}
diff --git a/modules/yahrzeit/module.php b/modules/yahrzeit/module.php
index 9e667799a2..93d3dc0a90 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, $cfg=null) {
-		global $ctype, $TEXT_DIRECTION, $WT_IMAGES, $SHOW_MARRIED_NAMES, $THEME_DIR;
+		global $ctype, $TEXT_DIRECTION, $WT_IMAGES, $SHOW_MARRIED_NAMES;
 
 		$days=get_block_setting($block_id, 'days', 7);
 		$infoStyle=get_block_setting($block_id, 'infoStyle', 'table');
@@ -201,9 +201,9 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if ($template) {
 			if ($block) {
-				require $THEME_DIR.'templates/block_small_temp.php';
+				require WT_THEME_DIR.'templates/block_small_temp.php';
 			} else {
-				require $THEME_DIR.'templates/block_main_temp.php';
+				require WT_THEME_DIR.'templates/block_main_temp.php';
 			}
 		} else {
 			return $content;
diff --git a/themes/clouds/header.php b/themes/clouds/header.php
index f9a82d340b..7d8ed23dd7 100644
--- a/themes/clouds/header.php
+++ b/themes/clouds/header.php
@@ -87,7 +87,7 @@ echo
 	'<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />';
 
 if ($BROWSERTYPE!='other') { ?>
-	<link rel="stylesheet" href="<?php echo $THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
+	<link rel="stylesheet" href="<?php echo WT_THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
 <?php
 }
 
diff --git a/themes/colors/header.php b/themes/colors/header.php
index f618e112b9..ca436738d2 100644
--- a/themes/colors/header.php
+++ b/themes/colors/header.php
@@ -88,7 +88,7 @@ echo
 	'<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />';
 
 if ($BROWSERTYPE!='other') { ?>
-	<link rel="stylesheet" href="<?php echo $THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
+	<link rel="stylesheet" href="<?php echo WT_THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
 <?php
 }
 
diff --git a/themes/xenea/header.php b/themes/xenea/header.php
index ae67ebe3aa..234070453a 100644
--- a/themes/xenea/header.php
+++ b/themes/xenea/header.php
@@ -50,7 +50,7 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA
 		<link rel="stylesheet" href="<?php echo $stylesheet; ?>" type="text/css" media="all" />
 		<?php if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) { ?> <link rel="stylesheet" href="<?php echo $rtl_stylesheet; ?>" type="text/css" media="all" /> <?php } ?>
 		<?php if ($BROWSERTYPE!='other') { ?>
-			<link rel="stylesheet" href="<?php echo $THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
+			<link rel="stylesheet" href="<?php echo WT_THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
 		<?php }
 		// Additional css files required (Only if Lightbox installed)
 		if (WT_USE_LIGHTBOX) {