Refactoring class names and use autoloading.

28 files changed, 97 insertions, 97 deletions

diff --git a/modules/GEDFact_assistant/_CENS/census_3_search_add.php b/modules/GEDFact_assistant/_CENS/census_3_search_add.php
index e4cc76b15e..7178d6c0f5 100644
--- a/modules/GEDFact_assistant/_CENS/census_3_search_add.php
+++ b/modules/GEDFact_assistant/_CENS/census_3_search_add.php
@@ -164,10 +164,10 @@ if (!defined('WT_WEBTREES')) {
 									$fulmn = rtrim($nam[$i]['givn'],'*')." ".$nam[$i]['surname'];
 								}									
 							}
-							$menu = new Menu($people["husb"]->getLabel());
+							$menu = new WT_Menu($people["husb"]->getLabel());
 							$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $people["husb"]->getLabel(), $censdate);
 							$slabel .= $parentlinks;
-							$submenu = new Menu($slabel);
+							$submenu = new WT_Menu($slabel);
 							$menu->addSubMenu($submenu);
 
 							?>
@@ -299,10 +299,10 @@ if (!defined('WT_WEBTREES')) {
 									$fulmn = rtrim($nam[$i]['givn'],'*')." ".$husbnam;
 								}									
 							}
-							$menu = new Menu($people["wife"]->getLabel());
+							$menu = new WT_Menu($people["wife"]->getLabel());
 							$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $people["wife"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
-							$submenu = new Menu($slabel);
+							$submenu = new WT_Menu($slabel);
 							$menu->addSubMenu($submenu);
 							?>
 							<tr>
@@ -439,10 +439,10 @@ if (!defined('WT_WEBTREES')) {
 									}									
 								}
 
-								$menu = new Menu($child->getLabel());
+								$menu = new WT_Menu($child->getLabel());
 								$slabel  = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $child->getLabel(), $censyear);
 								$slabel .= $spouselinks;
-								$submenu = new Menu($slabel);
+								$submenu = new WT_Menu($slabel);
 								$menu->addSubMenu($submenu);
 
 								if ($child->getXref()==$pid) {
@@ -611,7 +611,7 @@ if (!defined('WT_WEBTREES')) {
 									$fulmn = rtrim($nam[$i]['givn'],'*')."&nbsp;".$nam[$i]['surname'];
 								}									
 							}
-							$menu = new Menu();
+							$menu = new WT_Menu();
 							if ($people["husb"]->getLabel() == ".") {
 								$menu->addLabel(i18n::translate('Step-Father'));
 							} else {
@@ -619,7 +619,7 @@ if (!defined('WT_WEBTREES')) {
 							}
 							$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $people["husb"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
-							$submenu = new Menu($slabel);
+							$submenu = new WT_Menu($slabel);
 							$menu->addSubMenu($submenu);
 							if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["husb"]->getDeathYear()); }
 							if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["husb"]->getBirthYear()); }
@@ -758,7 +758,7 @@ if (!defined('WT_WEBTREES')) {
 									$fulmn = rtrim($nam[$i]['givn'],'*')."&nbsp;".$husbnam;
 								}									
 							}
-							$menu = new Menu();
+							$menu = new WT_Menu();
 							if ($people["wife"]->getLabel() == ".") {
 								$menu->addLabel(i18n::translate('Step-Mother'));
 							} else {
@@ -766,7 +766,7 @@ if (!defined('WT_WEBTREES')) {
 							}
 							$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $people["wife"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
-							$submenu = new Menu($slabel);
+							$submenu = new WT_Menu($slabel);
 							$menu->addSubMenu($submenu);
 							if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["wife"]->getDeathYear()); }
 							if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["wife"]->getBirthYear()); }
@@ -900,10 +900,10 @@ if (!defined('WT_WEBTREES')) {
 										$chfulmn = rtrim($chnam[$i]['givn'],'*')."&nbsp;".$chnam[$i]['surname'];									
 									}									
 								}
-								$menu = new Menu($child->getLabel());
+								$menu = new WT_Menu($child->getLabel());
 								$slabel  = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $child->getLabel(), $censyear);
 								$slabel .= $spouselinks;
-								$submenu = new Menu($slabel);
+								$submenu = new WT_Menu($slabel);
 								$menu->addSubMenu($submenu);
 								if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($child->getDeathYear()); }
 								if (PrintReady($child->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($child->getBirthYear()); }
@@ -1054,10 +1054,10 @@ if (!defined('WT_WEBTREES')) {
 									$fulmn = rtrim($nam[$i]['givn'],'*')."&nbsp;".$nam[$i]['surname'];
 								}									
 							}
-							$menu = new Menu($people["husb"]->getLabel());
+							$menu = new WT_Menu($people["husb"]->getLabel());
 							$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $people["husb"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
-							$submenu = new Menu($slabel);
+							$submenu = new WT_Menu($slabel);
 							$menu->addSubMenu($submenu);
 							if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["husb"]->getDeathYear()); }
 							if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["husb"]->getBirthYear()); }
@@ -1201,10 +1201,10 @@ if (!defined('WT_WEBTREES')) {
 									$fulmn = rtrim($nam[$i]['givn'],'*')."&nbsp;".$husbnam;
 								}									
 							}
-							$menu = new Menu($people["wife"]->getLabel());
+							$menu = new WT_Menu($people["wife"]->getLabel());
 							$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $people["wife"]->getLabel(), $censyear);
 							$slabel .= $parentlinks;
-							$submenu = new Menu($slabel);
+							$submenu = new WT_Menu($slabel);
 							$menu->addSubMenu($submenu);
 							if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["wife"]->getDeathYear()); }
 							if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["wife"]->getBirthYear()); }
@@ -1349,10 +1349,10 @@ if (!defined('WT_WEBTREES')) {
 									$chfulmn = rtrim($chnam[$i]['givn'],'*')."&nbsp;".$chnam[$i]['surname'];									
 								}									
 							}
-							$menu = new Menu($child->getLabel());
+							$menu = new WT_Menu($child->getLabel());
 							$slabel = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $child->getLabel(), $censyear);
 							$slabel .= $spouselinks;
-							$submenu = new Menu($slabel);
+							$submenu = new WT_Menu($slabel);
 							$menu->addSubmenu($submenu);
 							?>
 							<tr>
diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
index 1e36ec43c0..d2dea6e26e 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
@@ -130,11 +130,11 @@ if (!defined('WT_WEBTREES')) {
 					$fulmn = rtrim($nam[1]['givn'],'*')."&nbsp;".$nam[1]['surname'];
 					$marn  = $nam[1]['surname'];
 				}
-				$menu = new Menu("&nbsp;" . $people["husb"]->getLabel());
+				$menu = new WT_Menu("&nbsp;" . $people["husb"]->getLabel());
 				// $menu->addClass("", "", "submenu");
 				$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 
 
@@ -214,11 +214,11 @@ if (!defined('WT_WEBTREES')) {
 					$marn  = $surn;
 				}
 
-				$menu = new Menu("&nbsp;" . $people["wife"]->getLabel());
+				$menu = new WT_Menu("&nbsp;" . $people["wife"]->getLabel());
 				//$menu->addClass("", "", "submenu");
 				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				?>
 				<tr>
@@ -308,11 +308,11 @@ if (!defined('WT_WEBTREES')) {
 						$marn  = $nam[1]['surname'];
 					}
 
-					$menu = new Menu("&nbsp;" . $child->getLabel());
+					$menu = new WT_Menu("&nbsp;" . $child->getLabel());
 					//$menu->addClass("", "", "submenu");
 					$slabel  = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $currpid, $censyear);
 					$slabel .= $spouselinks;
-					$submenu = new Menu($slabel);
+					$submenu = new WT_Menu($slabel);
 					$menu->addSubMenu($submenu);
 
 					if ($child->getXref()==$pid) {
@@ -425,7 +425,7 @@ if (!defined('WT_WEBTREES')) {
 					$fulmn = rtrim($nam[1]['givn'],'*')."&nbsp;".$nam[1]['surname'];
 					$marn  = $nam[1]['surname'];
 				}
-				$menu = new Menu();
+				$menu = new WT_Menu();
 				if ($people["husb"]->getLabel() == ".") {
 					$menu->addLabel("&nbsp;" . i18n::translate('Step-Father'));
 				} else {
@@ -434,7 +434,7 @@ if (!defined('WT_WEBTREES')) {
 				//$menu->addClass("", "", "submenu");
 				$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["husb"]->getDeathYear()); }
 				if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["husb"]->getBirthYear()); }
@@ -516,7 +516,7 @@ if (!defined('WT_WEBTREES')) {
 					$fulmn = rtrim($nam[1]['givn'],'*')."&nbsp;".$nam[1]['surname'];
 					$marn  = $nam[1]['surname'];
 				}
-				$menu = new Menu();
+				$menu = new WT_Menu();
 				if ($people["husb"]->getLabel() == ".") {
 					$menu->addLabel("&nbsp;" . i18n::translate('Step-Mother'));
 				} else {
@@ -525,7 +525,7 @@ if (!defined('WT_WEBTREES')) {
 				//$menu->addClass("", "", "submenu");
 				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["wife"]->getDeathYear()); }
 				if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["wife"]->getBirthYear()); }
@@ -616,11 +616,11 @@ if (!defined('WT_WEBTREES')) {
 						$fulmn = rtrim($nam[1]['givn'],'*')."&nbsp;".$nam[1]['surname'];
 						$marn  = $nam[1]['surname'];
 					}
-					$menu = new Menu("&nbsp;" . $child->getLabel());
+					$menu = new WT_Menu("&nbsp;" . $child->getLabel());
 					//$menu->addClass("", "", "submenu");
 					$slabel  = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $currpid, $censyear);
 					$slabel .= $spouselinks;
-					$submenu = new Menu($slabel);
+					$submenu = new WT_Menu($slabel);
 					$menu->addSubMenu($submenu); if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($child->getDeathYear()); }
 					if (PrintReady($child->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($child->getBirthYear()); }
 					?>
@@ -708,11 +708,11 @@ if (!defined('WT_WEBTREES')) {
 					$fulmn = rtrim($nam[1]['givn'],'*')."&nbsp;".$nam[1]['surname'];
 					$marn  = $nam[1]['surname'];
 				}
-				$menu = new Menu("&nbsp;" . $people["husb"]->getLabel());
+				$menu = new WT_Menu("&nbsp;" . $people["husb"]->getLabel());
 				//$menu->addClass("", "", "submenu");
 				$slabel  = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["husb"]->getDeathYear()); }
 				if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["husb"]->getBirthYear()); }
@@ -804,11 +804,11 @@ if (!defined('WT_WEBTREES')) {
 					$fulmn = $fulln;
 					$marn  = $surn;
 				}
-				$menu = new Menu("&nbsp;" . $people["wife"]->getLabel());
+				$menu = new WT_Menu("&nbsp;" . $people["wife"]->getLabel());
 				//$menu->addClass("", "", "submenu");
 				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $currpid, $censyear);
 				$slabel .= $parentlinks;
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["wife"]->getDeathYear()); }
 				if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["wife"]->getBirthYear()); }
@@ -910,11 +910,11 @@ if (!defined('WT_WEBTREES')) {
 						$fulmn = $fulln;
 						$marn  = $surn;
 					}
-					$menu = new Menu("&nbsp;" . $child->getLabel());
+					$menu = new WT_Menu("&nbsp;" . $child->getLabel());
 					//$menu->addClass("", "", "submenu");
 					$slabel = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $child->getLabel(), $censyear);
 					$slabel .= $spouselinks;
-					$submenu = new Menu($slabel);
+					$submenu = new WT_Menu($slabel);
 					$menu->addSubmenu($submenu);
 					?>
 				<tr>
diff --git a/modules/address_label_report/module.php b/modules/address_label_report/module.php
index 1fa74712ba..9374455cf5 100644
--- a/modules/address_label_report/module.php
+++ b/modules/address_label_report/module.php
@@ -56,7 +56,7 @@ class address_label_report_WT_Module extends WT_Module implements WT_Module_Repo
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('place');
 		$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 e1a9907759..bff200dc24 100644
--- a/modules/address_report/module.php
+++ b/modules/address_report/module.php
@@ -56,7 +56,7 @@ class address_report_WT_Module extends WT_Module implements WT_Module_Report {
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('place');
 		$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 5fe457f7a5..fb0e9bbd65 100644
--- a/modules/ahnentafel_report/module.php
+++ b/modules/ahnentafel_report/module.php
@@ -64,7 +64,7 @@ class ahnentafel_report_WT_Module extends WT_Module implements WT_Module_Report
 		}
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('ancestry');
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
diff --git a/modules/ancestry_report/module.php b/modules/ancestry_report/module.php
index f032b958af..f5eed203c6 100644
--- a/modules/ancestry_report/module.php
+++ b/modules/ancestry_report/module.php
@@ -61,7 +61,7 @@ class ancestry_report_WT_Module extends WT_Module implements WT_Module_Report {
 		}
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('ancestry');
 		$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 41f07f6493..73f49b85bd 100644
--- a/modules/bdm_report/module.php
+++ b/modules/bdm_report/module.php
@@ -56,7 +56,7 @@ class bdm_report_WT_Module extends WT_Module implements WT_Module_Report {
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('place');
 		$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 f445e5c9cb..30bc1390eb 100644
--- a/modules/birth_report/module.php
+++ b/modules/birth_report/module.php
@@ -56,7 +56,7 @@ class birth_report_WT_Module extends WT_Module implements WT_Module_Report {
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('place');
 		$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 2c43b137ed..d071947670 100644
--- a/modules/cemetery_report/module.php
+++ b/modules/cemetery_report/module.php
@@ -56,7 +56,7 @@ class cemetery_report_WT_Module extends WT_Module implements WT_Module_Report {
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('place');
 		$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 47f153ac94..152a79939d 100644
--- a/modules/change_report/module.php
+++ b/modules/change_report/module.php
@@ -56,7 +56,7 @@ class change_report_WT_Module extends WT_Module implements WT_Module_Report {
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('place');
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
diff --git a/modules/clippings/module.php b/modules/clippings/module.php
index 0b1cb11e0e..ebf0c42637 100644
--- a/modules/clippings/module.php
+++ b/modules/clippings/module.php
@@ -71,39 +71,39 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 		if ($SEARCH_SPIDER) {
-			return new Menu("", "", "");
+			return new WT_Menu("", "", "");
 		}
 		//-- main clippings menu item
-		$menu = new Menu($this->getTitle(), 'module.php?mod=clippings&amp;mod_action=index&amp;ged='.WT_GEDURL, "down");
+		$menu = new WT_Menu($this->getTitle(), 'module.php?mod=clippings&amp;mod_action=index&amp;ged='.WT_GEDURL, "down");
 		$menu->addIcon('clippings');
 		$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'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->pid}&amp;type=indi");
+			$submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->pid}&amp;type=indi");
 			$submenu->addIcon('clippings');
 			$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'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->famid}&amp;type=fam");
+			$submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->famid}&amp;type=fam");
 			$submenu->addIcon('clippings');
 			$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'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->mid}&amp;type=obje");
+			$submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->mid}&amp;type=obje");
 			$submenu->addIcon('clippings');
 			$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'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->sid}&amp;type=sour");
+			$submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->sid}&amp;type=sour");
 			$submenu->addIcon('clippings');
 			$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'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->nid}&amp;type=note");
+			$submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id={$controller->nid}&amp;type=note");
 			$submenu->addIcon('clippings');
 			$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'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->rid}&type=repo");
+			$submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->rid}&type=repo");
 			$submenu->addIcon('clippings');
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
 			$menu->addSubmenu($submenu);
diff --git a/modules/death_report/module.php b/modules/death_report/module.php
index caf9dfbd86..01f86d0f20 100644
--- a/modules/death_report/module.php
+++ b/modules/death_report/module.php
@@ -56,7 +56,7 @@ class death_report_WT_Module extends WT_Module implements WT_Module_Report {
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('place');
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
diff --git a/modules/descendancy_report/module.php b/modules/descendancy_report/module.php
index 33c8985a26..cab0615bbc 100644
--- a/modules/descendancy_report/module.php
+++ b/modules/descendancy_report/module.php
@@ -64,7 +64,7 @@ class descendancy_report_WT_Module extends WT_Module implements WT_Module_Report
 		}
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('descendant');
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
diff --git a/modules/fact_sources/module.php b/modules/fact_sources/module.php
index ad7dda6b0f..414bf2d652 100644
--- a/modules/fact_sources/module.php
+++ b/modules/fact_sources/module.php
@@ -53,7 +53,7 @@ class fact_sources_WT_Module extends WT_Module implements WT_Module_Report {
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('menu_source');
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
diff --git a/modules/family_group_report/module.php b/modules/family_group_report/module.php
index 1c6deb1680..e69a10a359 100644
--- a/modules/family_group_report/module.php
+++ b/modules/family_group_report/module.php
@@ -62,7 +62,7 @@ class family_group_report_WT_Module extends WT_Module implements WT_Module_Repor
 		}
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('sfamily');
 		$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 1eceba1ead..7d51217be3 100644
--- a/modules/family_nav/module.php
+++ b/modules/family_nav/module.php
@@ -142,7 +142,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			</tr>
 			<?php
 			if (isset($people["husb"])) {
-				$menu = new Menu("&nbsp;" . $people["husb"]->getLabel());
+				$menu = new WT_Menu("&nbsp;" . $people["husb"]->getLabel());
 				// $menu->addClass("", "", "submenu");
 				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
@@ -151,7 +151,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}
 				$slabel  = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, 0, $personcount++);
 				$slabel .= $parentlinks."<a>";
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				?>
 				<tr>
@@ -172,7 +172,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			}
 
 			if (isset($people["wife"])) {
-				$menu = new Menu("&nbsp;" . $people["wife"]->getLabel());
+				$menu = new WT_Menu("&nbsp;" . $people["wife"]->getLabel());
 				//$menu->addClass("", "", "submenu");
 				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
@@ -181,7 +181,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}
 				$slabel  = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, 0, $personcount++);
 				$slabel .= $parentlinks."<a>";
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				?>
 				<tr>
@@ -205,7 +205,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				$elderdate = $family->getMarriageDate();
 				foreach ($people["children"] as $key=>$child) {
 					if ($pid != $child->getXref()) {
-						$menu = new Menu("&nbsp;" . $child->getLabel());
+						$menu = new WT_Menu("&nbsp;" . $child->getLabel());
 						//$menu->addClass("", "", "submenu");
 						if ($TEXT_DIRECTION=="ltr") {
 							$menu->addClass("", "", "submenu flyout2");
@@ -214,7 +214,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 						}
 						$slabel  = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, 0, $personcount++);
 						$slabel .= $spouselinks."<a>";
-						$submenu = new Menu($slabel);
+						$submenu = new WT_Menu($slabel);
 						$menu->addSubMenu($submenu);
 					}
 					?>
@@ -273,7 +273,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 
 			//if (isset($people["husb"]) && $people["husb"]->getLabel() == ".") {
 			if (isset($people["husb"]) ) {
-				$menu = new Menu();
+				$menu = new WT_Menu();
 				if ($people["husb"]->getLabel() == ".") {
 					$menu->addLabel(i18n::translate('Step-Father'));
 				} else {
@@ -287,7 +287,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}
 				$slabel  = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, 0, $personcount++);
 				$slabel .= $parentlinks."<a>";
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				?>
 				<tr>
@@ -311,7 +311,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			$styleadd = "";
 			//if (isset($people["wife"]) && $people["wife"]->getLabel() == ".") {
 			if (isset($people["wife"]) ) {
-				$menu = new Menu();
+				$menu = new WT_Menu();
 				if ($people["wife"]->getLabel() == ".") {
 					$menu->addLabel(i18n::translate('Step-Mother'));
 				} else {
@@ -325,7 +325,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}
 				$slabel  = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, 0, $personcount++);
 				$slabel .= $parentlinks."<a>";
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				?>
 				<tr>
@@ -348,7 +348,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			if (isset($people["children"])) {
 				$elderdate = $family->getMarriageDate();
 				foreach ($people["children"] as $key=>$child) {
-					$menu = new Menu($child->getLabel());
+					$menu = new WT_Menu($child->getLabel());
 					//$menu->addClass("", "", "submenu");
 					if ($TEXT_DIRECTION=="ltr") {
 						$menu->addClass("", "", "submenu flyout2");
@@ -357,7 +357,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 					}
 					$slabel  = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, 0, $personcount++);
 					$slabel .= $spouselinks."<a>";
-					$submenu = new Menu($slabel);
+					$submenu = new WT_Menu($slabel);
 					$menu->addSubMenu($submenu);
 					?>
 					<tr>
@@ -404,7 +404,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			}
 			$styleadd = "";
 			if (isset($people["husb"]) && $spousetag == 'HUSB') {
-				$menu = new Menu("&nbsp;" . $people["husb"]->getLabel());
+				$menu = new WT_Menu("&nbsp;" . $people["husb"]->getLabel());
 				//$menu->addClass("", "", "submenu");
 				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
@@ -413,7 +413,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}
 				$slabel  = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, 0, $personcount++);
 				$slabel .= $parentlinks."<a>";
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				?>
 				<tr>
@@ -440,7 +440,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			}
 
 			if (isset($people["wife"]) && $spousetag == 'WIFE') {
-				$menu = new Menu("&nbsp;" . $people["wife"]->getLabel());
+				$menu = new WT_Menu("&nbsp;" . $people["wife"]->getLabel());
 				//$menu->addClass("", "", "submenu");
 				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
@@ -449,7 +449,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}
 				$slabel  = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, 0, $personcount++);
 				$slabel .= $parentlinks."<a>";
-				$submenu = new Menu($slabel);
+				$submenu = new WT_Menu($slabel);
 				$menu->addSubMenu($submenu);
 				?>
 				<tr>
@@ -478,7 +478,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			$styleadd = "";
 			if (isset($people["children"])) {
 				foreach ($people["children"] as $key=>$child) {
-					$menu = new Menu("&nbsp;" . $child->getLabel());
+					$menu = new WT_Menu("&nbsp;" . $child->getLabel());
 					//$menu->addClass("", "", "submenu");
 					if ($TEXT_DIRECTION=="ltr") {
 						$menu->addClass("", "", "submenu flyout2");
@@ -487,7 +487,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 					}
 					$slabel = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, 0, $personcount++);
 					$slabel .= $spouselinks."<a>";
-					$submenu = new Menu($slabel);
+					$submenu = new WT_Menu($slabel);
 					$menu->addSubmenu($submenu);
 					?>
 					<tr>
diff --git a/modules/individual_ext_report/module.php b/modules/individual_ext_report/module.php
index d7d539194d..6c4d5c9703 100644
--- a/modules/individual_ext_report/module.php
+++ b/modules/individual_ext_report/module.php
@@ -64,7 +64,7 @@ class individual_ext_report_WT_Module extends WT_Module implements WT_Module_Rep
 		}
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('indis');
 		$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 2e5cf19244..729c8ba7d2 100644
--- a/modules/individual_report/module.php
+++ b/modules/individual_report/module.php
@@ -64,7 +64,7 @@ class individual_report_WT_Module extends WT_Module implements WT_Module_Report
 		}
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('indis');
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
diff --git a/modules/lightbox/functions/lb_link.php b/modules/lightbox/functions/lb_link.php
index bec1c79980..cf8a3aef76 100644
--- a/modules/lightbox/functions/lb_link.php
+++ b/modules/lightbox/functions/lb_link.php
@@ -52,7 +52,7 @@ if (!defined('WT_WEBTREES')) {
 		if ($TEXT_DIRECTION=="rtl") $classSuffix = "_rtl";
 
 		// main link displayed on page
-		$menu = new Menu();
+		$menu = new WT_Menu();
 		if ($LB_ML_THUMB_LINKS == "icon" || $LB_ML_THUMB_LINKS == "both") {
 			$menu->addIcon('image_link');
 		}
@@ -66,17 +66,17 @@ if (!defined('WT_WEBTREES')) {
 		$menu->addClass("", "", "submenu");
 		$menu->addFlyout("left");
 
-		$submenu = new Menu(i18n::translate('To Person'), "#");
+		$submenu = new WT_Menu(i18n::translate('To Person'), "#");
 		$submenu->addOnclick("return ilinkitem('$mediaid','person')");
 		$submenu->addClass("submenuitem".$classSuffix, "submenuitem".$classSuffix);
 		$menu->addSubMenu($submenu);
 
-		$submenu = new Menu(i18n::translate('To Family'), "#");
+		$submenu = new WT_Menu(i18n::translate('To Family'), "#");
 		$submenu->addOnclick("return ilinkitem('$mediaid','family')");
 		$submenu->addClass("submenuitem".$classSuffix, "submenuitem".$classSuffix);
 		$menu->addSubMenu($submenu);
 
-		$submenu = new Menu(i18n::translate('To Source'), "#");
+		$submenu = new WT_Menu(i18n::translate('To Source'), "#");
 		$submenu->addOnclick("return ilinkitem('$mediaid','source')");
 		$submenu->addClass("submenuitem".$classSuffix, "submenuitem".$classSuffix);
 		$menu->addSubMenu($submenu);
diff --git a/modules/lightbox/functions/lightbox_print_media_row.php b/modules/lightbox/functions/lightbox_print_media_row.php
index 0a4698b4e4..23dc71d567 100644
--- a/modules/lightbox/functions/lightbox_print_media_row.php
+++ b/modules/lightbox/functions/lightbox_print_media_row.php
@@ -194,7 +194,7 @@ function lightbox_print_media_row($rtype, $rowm, $pid) {
 			$submenu_class = "submenuitem";
 			$submenu_hoverclass = "submenuitem_hover";
 		}
-		$menu = new Menu();
+		$menu = new WT_Menu();
 		// Truncate media title to 13 chars (45 chars if Streetview) and add ellipsis
 		$mtitle = $rawTitle;
 		if (strpos($rowm['m_file'], 'http://maps.google.')===0) {
@@ -222,7 +222,7 @@ function lightbox_print_media_row($rtype, $rowm, $pid) {
 
 			// View Notes
 			if (strpos($rowm['m_gedrec'], "\n1 NOTE")) {
-				$submenu = new Menu("&nbsp;&nbsp;" . i18n::translate('View Notes') . "&nbsp;&nbsp;", "#", "right");
+				$submenu = new WT_Menu("&nbsp;&nbsp;" . i18n::translate('View Notes') . "&nbsp;&nbsp;", "#", "right");
 				// Notes Tooltip ----------------------------------------------------
 				$sonclick  = "TipTog(";
 				// Contents of Notes
@@ -239,29 +239,29 @@ function lightbox_print_media_row($rtype, $rowm, $pid) {
 				$menu->addSubMenu($submenu);
 			}
 			//View Details
-			$submenu = new Menu("&nbsp;&nbsp;" . i18n::translate('View Details') . "&nbsp;&nbsp;", WT_SERVER_NAME.WT_SCRIPT_PATH . "mediaviewer.php?mid=" . $rowm["m_media"], "right");
+			$submenu = new WT_Menu("&nbsp;&nbsp;" . i18n::translate('View Details') . "&nbsp;&nbsp;", WT_SERVER_NAME.WT_SCRIPT_PATH . "mediaviewer.php?mid=" . $rowm["m_media"], "right");
 			$submenu->addClass($submenu_class, $submenu_hoverclass);
 			$menu->addSubMenu($submenu);
 			//View Source
 			if (strpos($rowm['m_gedrec'], "\n1 SOUR") && canDisplayRecord(WT_GED_ID, find_source_record($sour, WT_GED_ID))) {
-				$submenu = new Menu("&nbsp;&nbsp;" . i18n::translate('View Source') . "&nbsp;&nbsp;", WT_SERVER_NAME.WT_SCRIPT_PATH . "source.php?sid=" . $sour, "right");
+				$submenu = new WT_Menu("&nbsp;&nbsp;" . i18n::translate('View Source') . "&nbsp;&nbsp;", WT_SERVER_NAME.WT_SCRIPT_PATH . "source.php?sid=" . $sour, "right");
 				$submenu->addClass($submenu_class, $submenu_hoverclass);
 				$menu->addSubMenu($submenu);
 			}
 			if (WT_USER_CAN_EDIT) {
 				// Edit Media
-				$submenu = new Menu("&nbsp;&nbsp;" . i18n::translate('Edit media') . "&nbsp;&nbsp;", "#", "right");
+				$submenu = new WT_Menu("&nbsp;&nbsp;" . i18n::translate('Edit media') . "&nbsp;&nbsp;", "#", "right");
 				$submenu->addOnclick("return window.open('addmedia.php?action=editmedia&amp;pid={$rowm['m_media']}&amp;linktoid={$rowm['mm_gid']}', '_blank', 'top=50,left=50,width=600,height=700,resizable=1,scrollbars=1');");
 				$submenu->addClass($submenu_class, $submenu_hoverclass);
 				$menu->addSubMenu($submenu);
 				if (WT_USER_IS_ADMIN) {
 					// Manage Links
-					$submenu = new Menu("&nbsp;&nbsp;" . i18n::translate('Manage links') . "&nbsp;&nbsp;", "#", "right");
+					$submenu = new WT_Menu("&nbsp;&nbsp;" . i18n::translate('Manage links') . "&nbsp;&nbsp;", "#", "right");
 					$submenu->addOnclick("return window.open('inverselink.php?mediaid={$rowm['m_media']}&amp;linkto=manage', '_blank', 'top=50,left=50,width=570,height=650,resizable=1,scrollbars=1');");
 					$submenu->addClass($submenu_class, $submenu_hoverclass);
 					$menu->addSubMenu($submenu);
 					// Unlink Media
-					$submenu = new Menu("&nbsp;&nbsp;" . i18n::translate('Unlink Media') . "&nbsp;&nbsp;", "#", "right");
+					$submenu = new WT_Menu("&nbsp;&nbsp;" . i18n::translate('Unlink Media') . "&nbsp;&nbsp;", "#", "right");
 					$submenu->addOnclick("return delete_record('$pid', 'OBJE', '".$rowm['m_media']."');");
 					$submenu->addClass($submenu_class, $submenu_hoverclass);
 					$menu->addSubMenu($submenu);
diff --git a/modules/marriage_report/module.php b/modules/marriage_report/module.php
index ed12f9fe10..953bb838da 100644
--- a/modules/marriage_report/module.php
+++ b/modules/marriage_report/module.php
@@ -56,7 +56,7 @@ class marriage_report_WT_Module extends WT_Module implements WT_Module_Report {
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('sfamily');
 		$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 5ff5d53f5f..55844c1faa 100644
--- a/modules/missing_facts_report/module.php
+++ b/modules/missing_facts_report/module.php
@@ -56,7 +56,7 @@ class missing_facts_report_WT_Module extends WT_Module implements WT_Module_Repo
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('indis');
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
diff --git a/modules/occupation_report/module.php b/modules/occupation_report/module.php
index 946481dba3..6960fcbf88 100644
--- a/modules/occupation_report/module.php
+++ b/modules/occupation_report/module.php
@@ -53,7 +53,7 @@ class occupation_report_WT_Module extends WT_Module implements WT_Module_Report
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('indis');
 		$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 e9d8999e2e..50e49cfbcb 100644
--- a/modules/pedigree_report/module.php
+++ b/modules/pedigree_report/module.php
@@ -64,12 +64,12 @@ 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='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report_portrait.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle().' - '.i18n::translate('Portrait'), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report_portrait.xml'.$pid);
 		$menu->addIcon('pedigree');
 		$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='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report_landscape.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle().' - '.i18n::translate('Landscape'), 'reportengine.php?ged='.WT_GEDURL.'&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('pedigree');
 		$menus[]=$menu;
diff --git a/modules/relative_ext_report/module.php b/modules/relative_ext_report/module.php
index 93359d2ecf..cdb8c9e59f 100644
--- a/modules/relative_ext_report/module.php
+++ b/modules/relative_ext_report/module.php
@@ -65,7 +65,7 @@ class relative_ext_report_WT_Module extends WT_Module implements WT_Module_Repor
 
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('cfamily');
 		$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 bda1ac8a12..fed8ff5305 100644
--- a/modules/relative_report/module.php
+++ b/modules/relative_report/module.php
@@ -64,7 +64,7 @@ class relative_report_WT_Module extends WT_Module implements WT_Module_Report {
 		}
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('cfamily');
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
diff --git a/modules/source_report/module.php b/modules/source_report/module.php
index 928029cf4e..8fcf05bf7c 100644
--- a/modules/source_report/module.php
+++ b/modules/source_report/module.php
@@ -56,7 +56,7 @@ class source_report_WT_Module extends WT_Module implements WT_Module_Report {
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
 
 		$menus=array();
-		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
+		$menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml');
 		$menu->addIcon('menu_source');
 		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
 		$menus[]=$menu;
diff --git a/modules/theme_select/module.php b/modules/theme_select/module.php
index a000d0f9cf..40c74c1357 100644
--- a/modules/theme_select/module.php
+++ b/modules/theme_select/module.php
@@ -47,9 +47,9 @@ class theme_select_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template=true, $cfg=null) {
 		$id=$this->getName().$block_id;
 		$title=i18n::translate('Change theme').help_link('change_theme');
-		$menu=MenuBar::getThemeMenu();
+		$menu=WT_MenuBar::getThemeMenu();
 		if ($menu) {
-			$content='<br /><div class="center theme_form">'.MenuBar::getThemeMenu()->getMenuAsDropdown().'</div><br />';
+			$content='<br /><div class="center theme_form">'.WT_MenuBar::getThemeMenu()->getMenuAsDropdown().'</div><br />';
 
 			if ($template) {
 				require WT_THEME_DIR.'templates/block_main_temp.php';