diff --git a/addon/oembed/oembed.js b/addon/oembed/oembed.js
index 54547a86ec..f8e957413c 100644
--- a/addon/oembed/oembed.js
+++ b/addon/oembed/oembed.js
@@ -1,10 +1,6 @@
 function oembed(){
-  $("#oembed").toggleClass('hide');
-}
-
-function oembed_do(){
-  embed = "[embed]"+$('#oembed_url').attr('value')+"[/embed]";
-  
-  tinyMCE.execCommand('mceInsertRawHTML',false,embed);
-  oembed();
+	var reply = prompt("$oembed_message:");
+	if(reply && reply.length) { 
+		  tinyMCE.execCommand('mceInsertRawHTML',false, "[embed]"+reply+"[/embed]" );
+	}
 }
diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php
index d9b205a3a5..45f533cc5b 100644
--- a/addon/oembed/oembed.php
+++ b/addon/oembed/oembed.php
@@ -6,7 +6,9 @@
  * http://www.oembed.com/
  * 
  */
- 
+
+require_once('include/oembed.php');
+
 function oembed_install() {
   register_hook('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool');
   register_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header');
@@ -18,32 +20,7 @@ function oembed_uninstall() {
 }
 
 function oembed_hook_page_header($a, &$b){
-
-	if(($a->module !== 'network') && ($a->module !== 'profile'))
-		return; 
-
-  $b .= '<script src="addon/oembed/oembed.js"></script>
-  <style>#oembed.hide { display: none } 
-  #oembed {
-     display:block; position: absolute; width: 300px; height:200px;
-     background-color:#fff; color: #000;
-     border:2px solid #8888FF; padding: 1em;
-     top: 200px; left: 400px; z-index:2000;  
-   }
-  #oembed_url { width: 100%; margin-bottom:3px;}
-   </style>';
-  
-  $b .= '
-  <div id="oembed" class="hide"><input id="oembed_url">&nbsp;
-    <input type="button" value="Embed" onclick="oembed_do()" style="float:left;">
-    <a onclick="oembed(); return false;" style="float:right;"><img onmouseout="imgdull(this);" onmouseover="imgbright(this);" class="wall-item-delete-icon" src="images/b_drophide.gif" style="width: 16px; height: 16px;"></a>
-    <div style="clear:both">Paste a link from 5min.com, Amazon Product Image, blip.tv, Clikthrough, CollegeHumor Video, 
-      Daily Show with Jon Stewart, Dailymotion, dotSUB.com, Flickr Photos, Funny or Die Video, 
-      Google Video, Hulu, Kinomap, LiveJournal UserPic, Metacafe, National Film Board of Canada, 
-      Phodroid Photos, Photobucket, Qik Video, Revision3, Scribd, SlideShare, TwitPic, Twitter Status, 
-      Viddler Video, Vimeo, Wikipedia, Wordpress.com, XKCD Comic, YFrog, YouTube</div> 
-  </div>
-  ';
+  $a->page['htmlhead'] .= sprintf('<script src="%s/oembed/oembed.js"></script>', $a->get_baseurl());
 }
 
 
@@ -56,6 +33,30 @@ function oembed_hook_jot_tool($a, &$b) {
 }
 
 
+function oembed_module() {
+	return;
+}
 
+function oembed_init(&$a) {
+	if ($a->argv[1]=='oembed.js'){
+		$tpl = file_get_contents('addon/oembed/oembed.js');
+		echo replace_macros($tpl, array(
+			'$oembed_message' =>  t('URL to embed:'),
+		));
+	}
+	
+	if ($a->argv[1]=='b2h'){
+		$url = array( "", trim(hex2bin($_GET['url'])));
+		echo "<span class='oembed'>".oembed_replacecb($url)."</span>";
+	}
+	
+	if ($a->argv[1]=='h2b'){
+		$text = trim(hex2bin($_GET['text']));
+		echo oembed_html2bbcode($text);
+	}
+	
+	killme();
+	
+}
 
 ?>
\ No newline at end of file
diff --git a/include/oembed.php b/include/oembed.php
index 4d2b7185e9..10d458ff38 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -16,13 +16,14 @@ function oembed_replacecb($matches){
 		dbesc(datetime_convert()));
   }
   $j = json_decode($txt);
-  $ret="<span class='oembed'>";
+  $ret="<span class='oembed ".$j->type."'>";
   switch ($j->type) {
     case "video": {
        if (isset($j->thumbnail_url)) {
-         $tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
-         $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;
-         $ret = "<a href='".$embedurl."' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' >";
+         /*$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
+         $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;*/
+		$tw=150; $th=120; 
+         $ret = "<a href='".$embedurl."' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' style='float:left; margin: 1em; '>";
          $ret.= "<img width='$tw' height='$th' src='".$j->thumbnail_url."'>";
          $ret.= "</a>";
        } else {
@@ -47,7 +48,7 @@ function oembed_replacecb($matches){
   $ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
   if (isset($j->author_name)) $ret.=" by ".$j->author_name;
   if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
-  $ret.="</span>";
+  $ret.="<br style='clear:left'></span>";
   return $ret;
 }
 
@@ -98,7 +99,7 @@ function oembed_html2bbcode($text) {
 		$xattr = oe_build_xpath("rel","oembed");
 		foreach($entries as $e) {
 			$href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
-			if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[embed]"), $e);
+			if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
 		}
 		return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );
 	} else {
diff --git a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index aad83280d4..997bc54fa0 100644
--- a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -47,6 +47,27 @@
 			function rep(re, str) {
 				s = s.replace(re, str);
 			};
+
+
+
+
+			/* oembed */
+			function _h2b_cb(match) {
+				text = bin2hex(match);
+				function s_h2b(data) {
+						match = data;
+				}
+				$.ajax({
+					url: 'oembed/h2b?text=' + text,
+					async: false,
+					success: s_h2b,
+					dataType: 'html'
+				});
+				return match;
+			}
+			s = s.replace(/<span class=\"oembed\">(.*?)<\/span>/gi, _h2b_cb);
+			/* /oembed */
+
 
 			// example: <strong> to [b]
 			rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
@@ -55,8 +76,8 @@
 			rep(/<font>(.*?)<\/font>/gi,"$1");
 			rep(/<img.*?width=\"(.*?)\".*?height=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$1x$2]$3[/img]");
 			rep(/<img.*?height=\"(.*?)\".*?width=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$2x$1]$3[/img]");
-      rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");
-      rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");
+			rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");
+			rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");
 			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
 			rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");
 			rep(/<\/(strong|b)>/gi,"[/b]");
@@ -106,6 +127,25 @@
 			rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");
 			rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");
 			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");
+
+			/* oembed */
+			function _b2h_cb(match) {
+				url = match.replace(/\[\/*embed\]/gi, "")
+				url = bin2hex(url);
+				function s_b2h(data) {
+						match = data;
+				}
+				$.ajax({
+					url: 'oembed/b2h?url=' + url,
+					async: false,
+					success: s_b2h,
+					dataType: 'html'
+				});
+				return match;
+			}
+			s = s.replace(/\[embed\](.*?)\[\/embed\]/gi, _b2h_cb);
+			
+			/* /oembed */
 
 			return s; 
 		}