diff --git a/e107_admin/ad_links.php b/e107_admin/ad_links.php
index 39b172f5b..1c1c8ac82 100644
--- a/e107_admin/ad_links.php
+++ b/e107_admin/ad_links.php
@@ -9,8 +9,8 @@
  * Admin Navigation
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/ad_links.php,v $
- * $Revision: 1.19 $
- * $Date: 2009-11-07 11:20:25 $
+ * $Revision: 1.20 $
+ * $Date: 2009-11-08 13:21:56 $
  * $Author: e107coders $
 */
 
@@ -608,12 +608,15 @@ $array_sub_functions[17][] = array(e_ADMIN.'newspost.php', LAN_MANAGE, ADLAN_3,
 $array_sub_functions[17][] = array(e_ADMIN.'newspost.php?create', LAN_CREATE, ADLAN_2, 'H', 3, E_16_CREATE, E_32_CREATE);
 $array_sub_functions[17][] = array(e_ADMIN.'newspost.php?pref', LAN_PREFS, ADLAN_4, 'H', 3, E_16_SETTINGS, E_32_SETTINGS);
 
-foreach($array_functions as $val)
+if(!defset('e_PAGETITLE'))
 {
-    $link = str_replace("../","",$val[0]);
-	if(strpos(e_SELF,$link)!==FALSE)
+	foreach($array_functions as $val)
 	{
-    	define(e_PAGETITLE,$val[1]);
+	    $link = str_replace("../","",$val[0]);
+		if(strpos(e_SELF,$link)!==FALSE)
+		{
+	    	define('e_PAGETITLE',$val[1]);
+		}
 	}
 }
 
diff --git a/e107_admin/image.php b/e107_admin/image.php
index 7fddf87f8..1ea62c2ec 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -9,8 +9,8 @@
  * Image Administration Area
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
- * $Revision: 1.27 $
- * $Date: 2009-11-08 09:14:22 $
+ * $Revision: 1.28 $
+ * $Date: 2009-11-08 13:21:56 $
  * $Author: e107coders $
  *
 */
@@ -102,16 +102,16 @@ class media_admin_ui extends e_admin_ui
 		//TODO - finish 'user' type, set 'data' to all editable fields, set 'noedit' for all non-editable fields
     	protected $fields = array(
 			'checkboxes'			=> array('title'=> '',				'type' => null,			'data'=> null,		'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),
-			'media_id'				=> array('title'=> ID,				'type' => 'int',		'data'=> 'int',		'width' =>'5%', 'forced'=> TRUE),
+			'media_id'				=> array('title'=> LAN_ID,				'type' => 'int',		'data'=> 'int',		'width' =>'5%', 'forced'=> TRUE),
        		'media_preview' 		=> array('title'=> "Preview",		'type' => null,			'data'=> null,		'width' => '10%'), // Generate on the fly.
        		'media_upload' 			=> array('title'=> "Upload File",	'type' => 'upload',		'data'=> null,		'readParm' => 'hidden',	'width' => '10%'), // Generate on the fly.  
-			'media_title' 			=> array('title'=> "Title",			'type' => 'text',		'data'=> 'str',		'width' => '5%'),
+			'media_title' 			=> array('title'=> LAN_TITLE,			'type' => 'text',		'data'=> 'str',		'width' => '5%'),
 			'media_caption' 		=> array('title'=> "Caption",		'type' => 'text',		'data'=> 'str',		'width' => '5%'),
-         	'media_description' 	=> array('title'=> "Description",	'type' => 'textarea',	'data'=> 'str',		'width' => 'auto', 'thclass' => 'left first'), // Display name
-         	'media_category' 		=> array('title'=> "Category",		'type' => 'int',		'data'=> 'int',		'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name
-			'media_datestamp' 		=> array('title'=> "datestamp",		'type' => 'datestamp',	'data'=> 'int',		'width' => 'auto'),	// User date
-            'media_url' 			=> array('title'=> "URL",			'type' => 'url',		'data'=> 'str',		'thclass' => 'center', 'class'=>'center', 'filter' => true, 'batch' => true,	'width' => 'auto'),	 	// Photo
-			'media_userclass' 		=> array('title'=> "Userclass",		'type' => 'userclass',	'data'=> 'str',		'width' => '10%', 'thclass' => 'center' ),	 // Real name (no real vetting)
+         	'media_description' 	=> array('title'=> LAN_DESCRIPTION,	'type' => 'textarea',	'data'=> 'str',		'width' => 'auto', 'thclass' => 'left first'), // Display name
+         	'media_category' 		=> array('title'=> LAN_CATEGORY,		'type' => 'int',		'data'=> 'int',		'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name
+			'media_datestamp' 		=> array('title'=> LAN_DATESTAMP,		'type' => 'datestamp',	'data'=> 'int',		'width' => 'auto'),	// User date
+            'media_url' 			=> array('title'=> LAN_URL,			'type' => 'url',		'data'=> 'str',		'thclass' => 'center', 'class'=>'center', 'filter' => true, 'batch' => true,	'width' => 'auto'),	 	// Photo
+			'media_userclass' 		=> array('title'=> LAN_USERCLASS,		'type' => 'userclass',	'data'=> 'str',		'width' => '10%', 'thclass' => 'center' ),	 // Real name (no real vetting)
 			'media_tags' 			=> array('title'=> "Tags/Keywords",	'type' => 'text',		'data'=> 'str',		'width' => '10%',  'filter'=>TRUE,'batch'=>TRUE ),	 // No real vetting
 			'options' 				=> array('title'=> LAN_OPTIONS,		'type' => null,			'data'=> null,		'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center')
 		);
@@ -159,17 +159,17 @@ if(isset($_POST['delpref']) || (isset($_POST['delpref_checked']) && isset($_POST
 	del_pref_val();
 }
 
-if($_GET['action'] == "icons")
+if(varset($_GET['action']) == "icons")
 {
 	icon_editor();
 }
 
-if($_GET['action'] == "avatars")
+if(varset($_GET['action']) == "avatars")
 {
 	show_avatars();
 }
 
-if($_GET['action'] == 'settings')
+if(varset($_GET['action']) == 'settings')
 {
 	main_config();
 }
@@ -464,7 +464,7 @@ function show_avatars()
 	}
 
 
-	$ns->tablerender(LAN_IMAGEMANAGER." :: ".IMALAN_18, $mes->render().$text);
+	$ns->tablerender(LAN_MEDIAMANAGER." :: ".IMALAN_18, $mes->render().$text);
 }
 
 /*
@@ -773,7 +773,7 @@ if (isset($_POST['check_avatar_sizes']))
 			</fieldset>
 		</form>";
 
-		$ns->tablerender(LAN_IMAGEMANAGER." :: ".IMALAN_7, $mes->render().$text);
+		$ns->tablerender(LAN_MEDIAMANAGER." :: ".IMALAN_7, $mes->render().$text);
 }
 //Just in case...
 if(!e_AJAX_REQUEST) require_once("footer.php");
@@ -863,7 +863,7 @@ function icon_editor()
 
 		";
 	//$text .= "<div style='text-align:center'><a href='".e_SELF."'>".DBLAN_13."</a></div>\n";
-	$ns->tablerender(LAN_IMAGEMANAGER." :: ".IMALAN_71, $mes->render().$text);
+	$ns->tablerender(LAN_MEDIAMANAGER." :: ".IMALAN_71, $mes->render().$text);
 
 	return $text;
 }
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 62fcbe7f5..4652cd154 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -9,8 +9,8 @@
  * Form Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
- * $Revision: 1.71 $
- * $Date: 2009-11-08 12:08:24 $
+ * $Revision: 1.72 $
+ * $Date: 2009-11-08 13:21:56 $
  * $Author: e107coders $
  *
 */
@@ -1407,11 +1407,10 @@ class e_form
 			foreach ($form['fieldsets'] as $elid => $data) 
 			{
 				$elid = $form['id'].'-'.$elid;
-				$text .= "
-					{$data['fieldset_pre']}
+				$text .= vartrue($data['fieldset_pre'])."
 					<fieldset id='{$elid}'>
-						<legend>{$data['legend']}</legend>
-						{$data['table_pre']}
+						<legend>".vartrue($data['legend'])."</legend>
+						".vartrue($data['table_pre'])."
 						<table cellpadding='0' cellspacing='0' class='adminedit'>
 							<colgroup span='2'>
 								<col class='col-label' />
@@ -1449,7 +1448,7 @@ class e_form
 				$text .= "
 							</tbody>
 						</table>	
-						{$data['table_post']}
+						".vartrue($data['table_post'])."
 						<div class='buttons-bar center'>
 				";
 							// After submit options
@@ -1497,7 +1496,7 @@ class e_form
 				$text .= "
 						</div>
 					</fieldset>
-					{$data['fieldset_post']}
+					".vartrue($data['fieldset_post'])."
 				";	
 			}
 			$text .= "
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index f464270c5..1ee13e237 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
-|     $Revision: 1.113 $
-|     $Date: 2009-11-07 02:28:54 $
+|     $Revision: 1.114 $
+|     $Date: 2009-11-08 13:21:56 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -1603,6 +1603,7 @@ class e107plugin
 		$function = 'install';
 		$sql = e107::getDb();
 		$mes = e107::getMessage();
+		$mySQLprefix = MPREFIX; // Fix for some plugin.php files. 
 				
 		$plug = $this->getinfo($id);
 		$_path = e_PLUGIN.$plug['plugin_path'].'/';
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index ebeb8b470..103560223 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_admin.php,v 1.36 2009-11-08 12:08:35 e107coders Exp $
+ * $Id: lan_admin.php,v 1.37 2009-11-08 13:22:02 e107coders Exp $
  *
  * Admin Language File
 */
@@ -310,5 +310,9 @@ define("LAN_STATUS", "Status");
 define("LAN_URL", "URL");
 define("LAN_USER", "User");
 define("LAN_ID", "ID");
+define("LAN_TITLE", "Title");
+define("LAN_DESCRIPTION", "Description");
+
+