diff --git a/admin/bm.php b/admin/bm.php
new file mode 100644
index 0000000..d539de3
--- /dev/null
+++ b/admin/bm.php
@@ -0,0 +1,221 @@
+<?php
+if(!defined('entry'))define('entry', true);
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
+?>
+<?php
+
+require('../entry.php');
+global $user, $conf, $tumble;
+$template = new plantillas("admin");
+
+if ($user->isAdmin()) {
+
+	if(isset($_POST["btnAdd"]))	{
+		unset($_POST["btnAdd"]);
+		
+		if ($_POST["type"]=="2") { // is Photo type			
+			if (isset($_POST["url"]) && $_POST["url"]!="")  {			
+				$photoName = getFileName($_POST["url"]);
+				if (!$tumble->savePhoto($_POST["url"])) {
+					header("Location: ".$conf->urlGelato."/admin/index.php?photo=false");
+					die();
+				}
+				$_POST["url"] = "../uploads/".sanitizeName($photoName);
+			}
+			
+			if ( move_uploaded_file( $_FILES['photo']['tmp_name'], "../uploads/".sanitizeName($_FILES['photo']['name']) ) ) {
+				$_POST["url"] = "../uploads/".sanitizeName($_FILES['photo']['name']);
+			}
+			
+			unset($_POST["photo"]);
+			unset($_POST["MAX_FILE_SIZE"]);
+		}
+		
+		if ($_POST["type"]=="7") { // is MP3 type
+			set_time_limit(300);
+			$mp3Name = getFileName($_POST["url"]);
+			if (!$tumble->saveMP3($_POST["url"])) {
+				header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false");
+				die();
+			}
+			if (isMP3($remoteFileName)) {
+				$_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name;
+			}
+		}		
+				
+		if (!get_magic_quotes_gpc()) {	
+			$_POST["title"] = addslashes($_POST["title"]);
+			$_POST["description"] = addslashes($_POST["description"]);
+		}	
+		
+		$_POST["title"] = strip_tags($_POST["title"]);
+		$_POST["description"] = strip_tags($_POST["description"]);
+		
+		if ($tumble->addPost($_POST)) {
+			header("Location: ".$conf->urlGelato."/admin/index.php?added=true");
+			die();
+		} else {
+			header("Location: ".$conf->urlGelato."/admin/index.php?error=2&des=".$this->merror);
+			die();
+		}
+	} else {
+	
+		if (isset($_GET["url"])) {
+			$url = $_GET["url"];
+		} else {
+			$url = null;
+		}
+		if (isset($url)) {	
+			
+			if (isMP3($url)) {
+				$postType = "mp3";
+			} elseif (isGoEar($url)) {
+				$postType = "mp3";
+			} elseif (isImageFile($url)) {
+				$postType = "photo";
+			} elseif (isVideo($url)) {
+				$postType = "video";
+			} else {
+				if (isset($_GET["sel"]) && !$_GET["sel"]=="" ) {
+					$postType = "post";
+				} else {
+					$postType = "url";
+				}
+			}
+			
+		} else { 
+			die(__("Must be a valid URL")); 
+		}
+?>	
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="generator" content="gelato cms <?php echo version();?>" />
+		<title>gelato :: <?php echo __("bookmarklet")?></title>
+		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
+		<style type="text/css" media="screen">	
+			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
+		</style>
+	</head>
+	
+	<body>
+		<div id="cont">
+			<div id="main">
+				<div class="box">
+					<h3><?php echo __("New Post")?></h3>
+					<ul class="menu">
+<?php
+						switch ($postType) {
+								case "post":
+?>
+									<li class="selected"><a href="#"><img src="css/images/page.png" alt="New post" /> <?php echo __("Regular")?></a></li>
+<?php
+									break;
+								case "photo":
+?>
+									<li class="selected"><a href="#"><img src="css/images/image.png" alt="New picture" /> <?php echo __("Picture")?></a></li>
+<?php									
+									break;
+								case "url":
+?>
+									<li class="selected"><a href="#"><img src="css/images/world.png" alt="New link" /> <?php echo __("Link")?></a></li>
+<?php									
+									break;								
+								case "video":
+?>
+									<li class="selected"><a href="#"><img src="css/images/film.png" alt="New video" /> <?php echo __("Video")?></a></li>
+<?php									
+									break;
+								case "mp3":
+?>
+									<li class="selected"><a href="#"><img src="css/images/music.png" alt="New audio" /> <?php echo __("Audio")?></a></li>
+<?php									
+									break;
+							}
+?>					
+					</ul>
+					<p>&nbsp;</p>
+					<form action="index.php" method="post" <?php echo (isset($_GET["new"]) && $_GET["new"]=="photo") ? "enctype=\"multipart/form-data\"" : ""?> name="frmAdd" class="newpost">
+						<fieldset>
+<?php					
+							$date = gmmktime();
+							$title = "";
+							$body = (isset($_GET["sel"])) ? $_GET["sel"] : "";
+							$url = (isset($url)) ? $url : "";
+							
+							switch ($postType) {
+								case "post":
+									$input = array("{type}", "{date}", "{id_user}", "{editTitle}", "{editBody}");
+									$output = array("1", $date, $_SESSION['user_id'], $title, $body);
+									
+									$template->cargarPlantilla($input, $output, "template_add_post");
+									$template->mostrarPlantilla();
+									break;
+								case "photo":
+									$input = array("{type}", "{date}", "{id_user}", "{editUrl}", "{editBody}");
+									$output = array("2", $date, $_SESSION['user_id'], $url, $body);
+									
+									$template->cargarPlantilla($input, $output, "template_add_photo");
+									$template->mostrarPlantilla();							   
+									break;
+								case "url":
+									
+									$input = array("{type}", "{date}", "{id_user}", "{editTitle}", "{editUrl}", "{editBody}");
+									$output = array("4", $date, $_SESSION['user_id'], $title, $url, $body);
+									
+									$template->cargarPlantilla($input, $output, "template_add_link");
+									$template->mostrarPlantilla();
+									break;								
+								case "video":
+									$input = array("{type}", "{date}", "{id_user}", "{editUrl}", "{editBody}");
+									$output = array("6", $date, $_SESSION['user_id'], $url, $body);
+									
+									$template->cargarPlantilla($input, $output, "template_add_video");
+									$template->mostrarPlantilla();
+									break;
+								case "mp3":
+									$input = array("{type}", "{date}", "{id_user}", "{editUrl}", "{editBody}");
+									$output = array("7", $date, $_SESSION['user_id'], $url, $body);
+									
+									$template->cargarPlantilla($input, $output, "template_add_mp3");
+									$template->mostrarPlantilla();
+									break;
+							}
+?>
+								<p>
+									<span style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;"><a href="http://hobix.com/textile/">Textile</a> <?php echo __("syntax is supported.")?></span>
+								</p>
+								<p>
+									<input class="btn" type="submit" name="btnAdd" value="<?php echo ($isEdition) ? "Modify" : "Create"; ?> post" />
+								</p>
+						</fieldset>
+					</form>					
+					<div class="footer-box">&nbsp;</div>
+				</div>
+
+			</div>
+<?php
+			}
+?>
+			<div id="foot">
+				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
+			</div>
+		</div>
+	</body>
+	</html>
+<?php	
+} else {
+	header("Location: ".$conf->urlGelato."/login.php");
+}
+?>
\ No newline at end of file
diff --git a/admin/index.php b/admin/index.php
index e8712c2..003eb5d 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -296,7 +296,11 @@ if ($user->isAdmin()) {
 							}
 ?>
 								<p>
-									<span style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;"><a href="http://hobix.com/textile/">Textile</a> <?php echo __("syntax is supported.")?></span>
+									<span style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;">
+                                    	<a href="http://hobix.com/textile/">Textile</a> <?php echo __("syntax is supported.")?>
+                                        <br />
+                                        Bookmarklet - <a href="javascript:g=window.getSelection();win=window.open('<?php echo $conf->urlGelato;?>/admin/bm.php?url='+encodeURIComponent(location.href)+'&sel='+encodeURIComponent(g),'w','toolbar=0,resizable=0,status=1,width=650,height=430'); void(win.document.close ())"><?php echo __("add to gelato")?></a>
+                                    </span>
 								</p>
 								<p>
 									<input class="btn" type="submit" name="btnAdd" value="<?php echo ($isEdition) ? "Modify" : "Create"; ?> post" />