diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm
index a1e758040..bb5a313f2 100644
--- a/lib/WebGUI/Operation/FormHelpers.pm
+++ b/lib/WebGUI/Operation/FormHelpers.pm
@@ -90,7 +90,7 @@ sub www_richEditPageTree {
 		-value=>$i18n->get('done'),
 		-extras=>'onclick="createLink()"'
 		);
-	$session->style->setScript($session->config->get("extrasURL")."/tinymce/jscripts/tiny_mce/tiny_mce_popup.js",{type=>"text/javascript"});
+	$session->style->setScript($session->config->get("extrasURL")."/tinymce2/jscripts/tiny_mce/tiny_mce_popup.js",{type=>"text/javascript"});
 	my $output = '<fieldset><legend>'.$i18n->get('insert a link').'</legend>
 		<fieldset><legend>'.$i18n->get('insert a link').'</legend>'.$f->print.'</fieldset>
 	<script type="text/javascript">
@@ -100,7 +100,10 @@ function createLink() {
            alert("'.$i18n->get("link enter alert").'");
            document.getElementById("url_formId").focus();
         }
-window.opener.tinyMCE.insertLink("^" + "/" + ";" + document.getElementById("url_formId").value,document.getElementById("target_formId").value);
+	var link = \'<a href="\'+"^" + "/" + ";" + document.getElementById("url_formId").value+\'">\';
+	link += window.opener.tinyMceSelectedText; 
+	link += \'</a>\';
+	window.opener.tinyMCE.execCommand("mceInsertContent",false,link);
      window.close();
     }
 }
@@ -205,7 +208,7 @@ sub www_richEditViewThumbnail {
     		    </script>\n";
 		return $output;
 	}
-	return '<div align="center"><img src="'.$session->config->get("extrasURL").'/tinymce/images/icon.gif" style="border-style:none;" alt="'.$i18n->get('image manager').'" /></div>';
+	return '<div align="center"><img src="'.$session->config->get("extrasURL").'/tinymce2/images/icon.gif" style="border-style:none;" alt="'.$i18n->get('image manager').'" /></div>';
 }
 
 #-------------------------------------------------------------------
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/collateral.html b/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/collateral.html
index ab31607eb..c57533bcf 100644
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/collateral.html
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/collateral.html
@@ -32,23 +32,24 @@ function returnSelected(in_values) {
 
 <select name="textPulldown" onchange="returnSelected(this.value)">
 <option value=''>Navigation...</option>
-<option value='^Navigation(crumbTrail);'>Crumb Trail</option>
-<option value='^Navigation(FlexMenu);'>FlexMenu</option>
-<option value='^Navigation(dtree);'>Dynamic Tree</option>
-<option value='^Navigation(coolmenu);'>Cool Menu (Horizontal)</option>
-<option value='^Navigation(currentMenuVertical);'>Current Menu (Vertical)</option>
-<option value='^Navigation(currentMenuHorizontal);'>Current Menu (Horizontal)</option>
-<option value='^Navigation(previousMenuVertical);'>Previous Menu (Vertical)</option>
-<option value='^Navigation(previousMenuHorizontal);'>Previous Menu (Horizontal)</option>
-<option value='^Navigation(PreviousDropMenu);'>Previous Dropdown Menu</option>
-<option value='^Navigation(SpecificMenuVertical);'>Specific SubMenu (Vertical)</option>
-<option value='^Navigation(SpecificMenuHorizontal);'>Specific SubMenu (Horizontal)</option>
-<option value='^Navigation(SpecificDropMenu);'>Specific Dropdown Menu</option>
-<option value='^Navigation(TopLevelMenuVertical);'>Top Level Menu (Vertical)</option>
-<option value='^Navigation(TopLevelMenuHorizontal);'>Top Level Menu (Horizontal)</option>
-<option value='^Navigation(TopDropMenu);'>Top Dropdown Menu</option>
-<option value='^Navigation(RootTab);'>Root Tabs Menu</option>
-<option value='^Navigation(rootmenu);'>Root Menu (Horizontal)</option>
+<option value='^AssetProxy(crumbtrail);'>Crumb Trail</option>
+<option value='^AssetProxy(flexmenu);'>FlexMenu</option>
+<option value='^AssetProxy(dtree);'>Dynamic Tree</option>
+<option value='^AssetProxy(coolmenu);'>Cool Menu (Horizontal)</option>
+<option value='^AssetProxy(currentmenuvertical);'>Current Menu (Vertical)</option>
+<option value='^AssetProxy(currentmenuhorizontal);'>Current Menu (Horizontal)</option>
+<option value='^AssetProxy(previousmenuvertical);'>Previous Menu (Vertical)</option>
+<option value='^AssetProxy(previousmenuhorizontal);'>Previous Menu (Horizontal)</option>
+<option value='^AssetProxy(previousdropmenu);'>Previous Dropdown Menu</option>
+<option value='^AssetProxy(specificmenuvertical);'>Specific SubMenu (Vertical)</option>
+<option value='^AssetProxy(specificmenuhorizontal);'>Specific SubMenu (Horizontal)</option>
+<option value='^AssetProxy(specificdropmenu);'>Specific Dropdown Menu</option>
+<option value='^AssetProxy(synopsis);'>Synopsis Menu</option>
+<option value='^AssetProxy(toplevelmenuvertical);'>Top Level Menu (Vertical)</option>
+<option value='^AssetProxy(topLevelmenuhorizontal);'>Top Level Menu (Horizontal)</option>
+<option value='^AssetProxy(topdropmenu);'>Top Dropdown Menu</option>
+<option value='^AssetProxy(roottab);'>Root Tabs Menu</option>
+<option value='^AssetProxy(rootmenu);'>Root Menu (Horizontal)</option>
 <option value='^H;'>Home Link</option>
 <option value='^/;'>System URL</option>
 <option value='^PageUrl;'>Current Page URL</option>
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/editor_plugin.js b/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/editor_plugin.js
index 3be0970c5..d8abfd11e 100644
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/editor_plugin.js
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/editor_plugin.js
@@ -1,5 +1,5 @@
 /* Import theme specific language pack */
-//tinyMCE.importPluginLanguagePack('emotions', 'uk,se');
+tinyMCE.importPluginLanguagePack('collateral', 'en');
 
 /**
  * Returns the HTML contents of the emotions control.
@@ -7,7 +7,7 @@
 function TinyMCE_collateral_getControlHTML(control_name) {
         switch (control_name) {
 		case "collateral":
-			return '<img id="{$editor_id}_collateral" src="{$pluginurl}/images/macro.gif" title="Add a WebGUI macro" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wgCollateral\');">';
+			return tinyMCE.getButtonHTML(control_name, 'lang_insert_macro', '{$pluginurl}/images/macro.gif', 'wgCollateral');
 	}
 
 	return "";
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/langs/en.js b/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/langs/en.js
new file mode 100644
index 000000000..f53af5e84
--- /dev/null
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/collateral/langs/en.js
@@ -0,0 +1,5 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+insert_macro : 'Insert WebGUI Macro'
+});
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/editor_plugin.js b/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/editor_plugin.js
index 2ac962531..7d8bf81fe 100755
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/editor_plugin.js
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/editor_plugin.js
@@ -7,8 +7,7 @@ tinyMCE.importPluginLanguagePack('insertImage', 'en');
 function TinyMCE_insertImage_getControlHTML(control_name) {
         switch (control_name) {
 		case "insertImage":
-			case "insertdate":
-				return tinyMCE.getButtonHTML(control_name, 'lang_insert_webgui_image', '{$pluginurl}/images/insertImage.gif', 'insertImage');
+			return tinyMCE.getButtonHTML(control_name, 'lang_insert_webgui_image', '{$pluginurl}/images/insertImage.gif', 'insertImage');
 	}
 
 	return "";
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js b/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js
index 25fdc18bb..953cbc026 100755
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js
@@ -1,4 +1,5 @@
 /* Import theme specific language pack */
+tinyMCE.importPluginLanguagePack('pagetree', 'en');
 
 /**
  * Returns the HTML contents of the emotions control.
@@ -6,7 +7,7 @@
 function TinyMCE_pagetree_getControlHTML(control_name) {
         switch (control_name) {
 		case "pagetree":
-			return '<img id="{$editor_id}_collateral" src="{$pluginurl}/images/pagetree.gif" title="Link to a page in the WebGUI page tree" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wgPageTree\');">';
+			return tinyMCE.getButtonHTML(control_name, 'lang_link_to_page', '{$pluginurl}/images/pagetree.gif', 'wgPageTree');
 	}
 
 	return "";
@@ -15,25 +16,22 @@ function TinyMCE_pagetree_getControlHTML(control_name) {
 /**
  * Executes the mceEmotion command.
  */
+var tinyMceSelectedText = '';
 function TinyMCE_pagetree_execCommand(editor_id, element, command, user_interface, value) {
 	// Handle commands
         switch (command) {
 		case "wgPageTree":
+			var inst = tinyMCE.getInstanceById(editor_id);
+                        var focusElm = inst.getFocusElement();
+                        tinyMceSelectedText = inst.selection.getSelectedText();
 			var template = new Array();
-						
-			//alert(getWebguiProperty("pageURL"));
-			
 			//Check for proper get delimiter
 			var seperator = '';
 			if (getWebguiProperty ("pageURL").match(/\?/)) { seperator = ';' } else { seperator = '?'}
 			template['file'] = "../../../../../.." + getWebguiProperty ("pageURL") + seperator + 'op=richEditPageTree';
-			
-		//	alert(template['file']);
 			template['width'] = 500;
 			template['height'] = 500;
-
 			tinyMCE.openWindow(template, {editor_id : editor_id, scrollbars : "yes"} );
-
 			return true;
 	}
 
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/langs/en.js b/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/langs/en.js
new file mode 100644
index 000000000..28b744065
--- /dev/null
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/langs/en.js
@@ -0,0 +1,5 @@
+// UK lang variables
+
+tinyMCE.addToLang('',{
+link_to_page : 'Link to a Page in the WebGUI Asset Tree'
+});
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/pagetree.html b/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/pagetree.html
deleted file mode 100755
index 2c5c75c30..000000000
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/pagetree.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<html style="width:600px; Height: 50px;">
- <head>
-  <title>Insert WebGUI macro</title>
-<script language="javascript" src="../../tiny_mce_popup.js"></script>
-
-<script language="javascript">
-
-function returnSelected(in_values) {
-    var text = in_values;  
-    if (window.opener) {
-        tinyMCE.execCommand("mceInsertContent", false, text);
-	window.close();
-    }
-}
-
-</script>
-</head>
-<body bgcolor="#D6D3CE" topmargin=15 leftmargin=0>
-<form name="macros" method=get onSubmit="Set(document.all.ColorHex.value); return false;">
-<div align=center>
-
-
-<select name="textPulldown" onchange="returnSelected(this.value)">
-<option value=''>Collateral...</option>
-<option value='^I("logo");'>Image</option>
-<option value='^SI("logo","100");'>Scaled Image</option>
-<option value='^Thumbnail("logo");'>Thumbnail</option>
-<option value='^ThumbnailLinker("logo");'>Linked Thumbnail</option>
-<option value='^File("product specs");'>File with Icon</option>
-<option value='^i("status report");'>File URL</option>
-<option value='^RandomImage("collateral folder");'>Random Image</option>
-<option value='^RandomSnippet("collateral folder");'>Random Snippet</option>
-<option value='^Snippet("flash code");'>Snippet</option>
-</select>
-
-
-
-<select name="textPulldown" onchange="returnSelected(this.value)">
-<option value=''>Navigation...</option>
-<option value='^AssetProxy(crumbTrail);'>Crumb Trail</option>
-<option value='^AssetProxy(FlexMenu);'>FlexMenu</option>
-<option value='^AssetProxy(dtree);'>Dynamic Tree</option>
-<option value='^AssetProxy(coolmenu);'>Cool Menu (Horizontal)</option>
-<option value='^AssetProxy(currentMenuVertical);'>Current Menu (Vertical)</option>
-<option value='^AssetProxy(currentMenuHorizontal);'>Current Menu (Horizontal)</option>
-<option value='^AssetProxy(previousMenuVertical);'>Previous Menu (Vertical)</option>
-<option value='^AssetProxy(previousMenuHorizontal);'>Previous Menu (Horizontal)</option>
-<option value='^AssetProxy(PreviousDropMenu);'>Previous Dropdown Menu</option>
-<option value='^AssetProxy(SpecificMenuVertical);'>Specific SubMenu (Vertical)</option>
-<option value='^AssetProxy(SpecificMenuHorizontal);'>Specific SubMenu (Horizontal)</option>
-<option value='^AssetProxy(SpecificDropMenu);'>Specific Dropdown Menu</option>
-<option value='^AssetProxy(TopLevelMenuVertical);'>Top Level Menu (Vertical)</option>
-<option value='^AssetProxy(TopLevelMenuHorizontal);'>Top Level Menu (Horizontal)</option>
-<option value='^AssetProxy(TopDropMenu);'>Top Dropdown Menu</option>
-<option value='^AssetProxy(RootTab);'>Root Tabs Menu</option>
-<option value='^AssetProxy(rootmenu);'>Root Menu (Horizontal)</option>
-<option value='^H;'>Home Link</option>
-<option value='^/;'>System URL</option>
-<option value='^\;'>Current Page URL</option>
-</select>
-
-
-<select onchange="returnSelected(this.value)">
-<option value=''>User...</option>
-<option value='^L;'>Login Form</option>
-<option value='^a("Account Info");'>My Account Link</option>
-<option value='^CanEditText("You can edit this page.");'>Can Edit Page Message</option>
-<option value='^AdminText("You are in admin mode!");'>Admin Mode Message</option>
-<option value='^GroupAdd("Newsletter","Click here to join our newsletter.");'>Join Group</option>
-<option value='^GroupDelete("Newsletter","Click here to unsubscribe from our newsletter.");'>Leave Group</option>
-<option value='^GroupText("Visitors","You need an account to do anything cool on this site!");'>Group Message</option>
-<option value='^EditableToggle;'>Page Editable Toggle</option>
-<option value='^AdminToggle;'>Admin Toggle</option>
-<option value='^LoginToggle;'>Login Toggle</option>
-<option value='^@;'>Username</option>
-<option value='^#;'>User ID</option>
-</select>
-
-<select onchange="returnSelected(this.value)">
-<option value=''>Style...</option>
-<option value='^Spacer("10","100");'>Spacer</option>
-<option value='^c;'>Company Name</option>
-<option value='^u;'>Company URL</option>
-<option value='^e;'>Company Email Address</option>
-<option value='^LastModified;'>Last Modified Date</option>
-<option value='^PageTitle;'>Page Title</option>
-<option value='^r;'>Make Page Printable</option>
-<option value='^RootTitle;'>Root Title</option>
-<option value='^Extras;'>Extras Folder</option>
-<option value='^AdminBar(2);'>Admin Bar</option>
-</select>
-
-
-</div>
-</form>
-</body></html>
\ No newline at end of file