diff --git a/admin/bm.php b/admin/bm.php
index b31ce8a..bb1b0dd 100644
--- a/admin/bm.php
+++ b/admin/bm.php
@@ -55,14 +55,14 @@ if ($user->isAdmin()) {
 		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"]);
+		$textile = new Textile();
+		
+		$_POST["title"] = $textile->TextileThis(removeBadTags($_POST["title"]));
+		$_POST["description"] = $textile->TextileThis(removeBadTags($_POST["description"]));
 		
 		if ($tumble->addPost($_POST)) {
-			//header("Location: ".$conf->urlGelato."/admin/index.php?added=true");
-			//die();
 			$input = array("{type}");
 			$output = array("1");
 			
diff --git a/admin/comments.php b/admin/comments.php
index 8cdd0ea..601ab41 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -22,9 +22,12 @@ $commentId = ($isEdition) ? $_GET["edit"] : NULL;
 	
 if(isset($_POST["btnAdd"]))	{		
 	unset($_POST["btnAdd"]);
-	$_POST["username"] = strip_tags($_POST["username"]);
-	$_POST["email"] = strip_tags($_POST["email"]);	
-	$_POST["web"] = strip_tags($_POST["web"]);
+	
+	$textile = new Textile();
+	
+	$_POST["username"] = $textile->TextileThis(removeBadTags($_POST["username"]));
+	$_POST["email"] = $textile->TextileThis(removeBadTags($_POST["email"]));
+	$_POST["web"] = $textile->TextileThis(removeBadTags($_POST["web"]));
 		
 	if (isset($_POST["id_comment"])) {
 		if ($isAdmin) {
diff --git a/admin/index.php b/admin/index.php
index 3e05547..3236fc9 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -66,11 +66,12 @@ if ($user->isAdmin()) {
 		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"]);
+		$textile = new Textile();
 		
+		$_POST["title"] = $textile->TextileThis(removeBadTags($_POST["title"]));
+		$_POST["description"] = $textile->TextileThis(removeBadTags($_POST["description"]));
 		
 		if (isset($_POST["id_post"])) {
 			$tumble->modifyPost($_POST, $_POST["id_post"]);
@@ -109,6 +110,16 @@ if ($user->isAdmin()) {
 		Lightbox.fileLoadingImage = "css/images/loading.gif";
 		Lightbox.fileBottomNavCloseImage = "css/images/closelabel.gif";		
 		</script>
+<?php
+		if($conf->richText) {
+?>
+        	<script src="<?php echo $conf->urlGelato;?>/admin/scripts/nicEdit.js" type="text/javascript"></script>
+			<script type="text/javascript">
+                 bkLib.onDomLoaded(nicEditors.allTextAreas);
+            </script>
+<?php
+		}
+?>
 		<style type="text/css" media="screen">	
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
 			@import "<?php echo $conf->urlGelato;?>/admin/css/lightbox.css";
@@ -328,10 +339,7 @@ if ($user->isAdmin()) {
 					if ($tumble->contarRegistros()>0) {				
 						while($register = mysql_fetch_array($rs)) {			
 							$formatedDate = gmdate("M d", strtotime($register["date"])+transform_offset($conf->offsetTime));
-							$permalink = $conf->urlGelato."/index.php/post/".$register["id_post"]."/";							
-							
-							$textile = new Textile();				
-							$register["description"] = $textile->TextileThis($register["description"]);
+							$permalink = $conf->urlGelato."/index.php/post/".$register["id_post"]."/";
 							
 							$register["title"] = stripslashes($register["title"]);
 							$register["description"] = stripslashes($register["description"]);
diff --git a/admin/scripts/nicEdit.js b/admin/scripts/nicEdit.js
new file mode 100644
index 0000000..ac3273e
--- /dev/null
+++ b/admin/scripts/nicEdit.js
@@ -0,0 +1,55 @@
+/* NicEdit - Micro Inline WYSIWYG
+ * Copyright 2007 Brian Kirchoff
+ *
+ * NicEdit is distributed under the terms of the MIT license
+ * For more information visit http://nicedit.com/
+ * Do not remove this copyright message
+ */
+ 
+ var nicEditorConfig = {
+	buttons : {
+		'save' : {name : 'Click to Save', type : 'nicEditorSaveButton', tile : 1},
+		'undo' : {name : 'Undo', command : 'undo', noActive : true, tile : 23},
+		'redo' : {name : 'Redo', command : 'redo', noActive : true, tile : 24},
+		'bold' : {name : 'Click to Bold', command : 'Bold', tags : ['B','STRONG'], css : {'font-weight' : 'bold'}, tile : 2},
+		'italic' : {name : 'Click to Italic', command : 'Italic', tags : ['EM','I'], css : {'font-style' : 'italic'}, tile : 3},
+		'underline' : {name : 'Click to Underline', command : 'Underline', tags : ['U'], css : {'text-decoration' : 'underline'}, tile : 4},
+		'left' : {name : 'Left Align', command : 'justifyleft', noActive : true, tile : 8},
+		'center' : {name : 'Center Align', command : 'justifycenter', noActive : true, tile : 9},
+		'right' : {name : 'Right Align', command : 'justifyright', noActive : true, tile : 10},
+		'ol' : {name : 'Insert Ordered List', command : 'insertorderedlist', tags : ['OL'], tile : 12},
+		'ul' : 	{name : 'Insert Unordered List', command : 'insertunorderedlist', tags : ['UL'], tile : 13},
+		'fontSize' : {name : 'Select Font Size', type : 'nicEditorFontSizeSelect', command : 'fontsize'},
+		'fontFamily' : {name : 'Select Font Family', type : 'nicEditorFontFamilySelect', command : 'fontname'},
+		'fontFormat' : {name : 'Select Font Format', type : 'nicEditorFontFormatSelect', command : 'formatBlock'},
+		'subscript' : {name : 'Click to Subscript', command : 'subscript', tags : ['SUB'], tile : 6, disabled : true},
+		'superscript' : {name : 'Click to Superscript', command : 'superscript', tags : ['SUP'], tile : 5, disabled : true},
+		'strikeThrough' : {name : 'Click to Strike Through', command : 'strikeThrough', css : {'text-decoration' : 'line-through'}, tile : 7, disabled : true},
+		'indent' : {name : 'Indent Text', command : 'indent', noActive : true, tile : 20},
+		'unindent' : {name : 'Remove Indent', command : 'outdent', noActive : true, tile : 21},
+		'hr' : {name : 'Horizontal Rule', command : 'insertHorizontalRule', noActive : true, tile : 22},
+		'color' : {name : 'Change Color', type : 'nicEditorColorButton', tile : 25},
+		'image' : {name : 'Add Image', type : 'nicEditorImageButton', tile : 14},
+		'html' : {name : 'Edit HTML', type : 'nicEditorHTMLButton', tile : 16},
+		'link' : {name : 'Add Link', type : 'nicEditorLinkButton', tile : 17}
+	},
+	iconsPath : 'scripts/nicEditorIcons.gif',
+	fullPanel : false,
+	onSubmit : null,
+	buttonList : ['bold','italic','underline','strikeThrough','ol','ul','indent','unindent','link', 'html'],
+	toolTipOn : false,
+	toolTipText : 'Click to Edit'
+};
+
+function bkClass(){}bkClass.prototype.construct=function(){};bkClass.extend=function(E){var A=function(){if(arguments[0]!==bkClass){this.construct.apply(this,arguments)}};var D=new this(bkClass);var B=this.prototype;for(var F in E){var C=E[F];if(C instanceof Function){C.$=B}D[F]=C}A.prototype=D;A.extend=this.extend;return A};Function.prototype.closure=function(){var A=this,B=bkLib.toArray(arguments),C=B.shift();return function(){return A.apply(C,B.concat(bkLib.toArray(arguments)))}};Function.prototype.closureListener=function(){var A=this,C=bkLib.toArray(arguments),B=C.shift();return function(E){E=E||window.event;if(E.target){var D=E.target}else{var D=E.srcElement}return A.apply(B,[E,D].concat(C))}};function $N(A){return document.getElementById(A)}var bkLib={getStyle:function(B,A,D){var C=(!D)?document.defaultView:D;return(C&&C.getComputedStyle)?C.getComputedStyle(B,"").getPropertyValue(A):B.currentStyle[A]},setStyle:function(B,A){var C=B.style;for(itm in A){switch(itm){case"float":C["cssFloat"]=C["styleFloat"]=A[itm];break;case"opacity":C.opacity=A[itm];C.filter="alpha(opacity="+Math.round(A[itm]*100)+")";break;case"className":B.className=A[itm];break;default:if(document.compatMode||itm!="cursor"){C[itm]=A[itm]}}}},cancelEvent:function(A){A=A||window.event;if(A.preventDefault&&A.stopPropagation){A.preventDefault();A.stopPropagation()}return false},domLoad:[],domLoaded:function(){if(arguments.callee.done){return }arguments.callee.done=true;for(i=0;i<bkLib.domLoad.length;i++){bkLib.domLoad[i]()}},onDomLoaded:function(fireThis){this.domLoad.push(fireThis);if(document.addEventListener){document.addEventListener("DOMContentLoaded",bkLib.domLoaded,null);/*@cc_on @*//*@if (@_win32)
+			var proto = "src='javascript:void(0)'";
+			if (location.protocol == "https:") proto = "src=//0";
+			document.write("<scr"+"ipt id=__ie_onload defer " + proto + "><\/scr"+"ipt>");
+			var script = document.getElementById("__ie_onload");
+			script.onreadystatechange = function() {
+			    if (this.readyState == "complete") {
+			        bkLib.domLoaded();
+			    }
+			};
+		/*@end @*/}window.onload=bkLib.domLoaded},addEvent:function(C,B,A){(C.addEventListener)?C.addEventListener(B,A,false):C.attachEvent("on"+B,A)},elmPos:function(B){var C=curtop=0;var A=B.offsetHeight;if(B.offsetParent){C=B.offsetLeft;curtop=B.offsetTop;while(B=B.offsetParent){C+=B.offsetLeft;curtop+=B.offsetTop}}return[C,curtop+A]},mousePos:function(A){return[A.pageX||A.clientX+document.body.scrollLeft+document.documentElement.scrollLeft,A.pageY||A.clientY+document.body.scrollTop+document.documentElement.scrollTop]},getElementsByClassName:function(F){if(document.getElementsByClassName){return document.getElementsByClassName(F)}var A=[];var E=new RegExp("\\b"+F+"\\b");var D=document.getElementsByTagName("*");for(var C=0,B=D.length;C<B;C++){if(E.test(D[C].className)){A.push(D[C])}}return A},inArray:function(A,B){for(i=0;i<A.length;i++){if(A[i]===B){return true}}return false},toArray:function(C){var B=C.length,A=new Array(B);while(B--){A[B]=C[B]}return A},unselectAble:function(B){if(B.setAttribute&&B.contentEditable!=true&&B.nodeName!="input"&&B.nodeName!="textarea"){B.setAttribute("unselectable","on")}for(var A=0;A<B.childNodes.length;A++){bkLib.unselectAble(B.childNodes[A])}},ajaxRequest:function(D,C,A){var B=(window.XMLHttpRequest)?new window.XMLHttpRequest():new ActiveXObject("Microsoft.XMLHTTP");B.open((!D)?"GET":D,C,true);if(D=="POST"){B.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}B.send(A)}};var bkEvent={addEvent:function(A,B){if(B){this.eventList=this.eventList||{};this.eventList[A]=this.eventList[A]||[];this.eventList[A].push(B)}},fireEvent:function(C,B){if(this.eventList&&this.eventList[C]){for(var A=0;A<this.eventList[C].length;A++){this.eventList[C][A](B)}}}}
+var nicEditors={allTextAreas:function(C){var A=document.getElementsByTagName("textarea");var D=new Array();for(var B=0;B<A.length;B++){D.push(new nicEditor(C).panelInstance(A[B]))}return D}};var nicEditor=bkClass.extend({nicInstances:[],nicPanel:null,selectedInstance:null,construct:function(B){var A=bkClass.extend(nicEditorConfig);A=(B)?A.extend(B):A;this.options=new A();bkLib.addEvent(document.body,"mousedown",this.selectCheck.closureListener(this))},selectCheck:function(C,A){var B=false;do{if(A.className&&A.className.indexOf("nicEdit")!=-1){return false}}while(A=A.parentNode);this.fireEvent("noInstanceSelect",A);this.selectedInstance=null;return false},panelInstance:function(B){if(typeof (B)=="string"){B=$N(B)}var A=document.createElement("DIV");B.parentNode.insertBefore(A,B);panelWidth=B.width||B.clientWidth;A.style.width=panelWidth+"px";this.setPanel(A);return this.addInstance(B)},findInstance:function(A){if(typeof (A)=="string"){A=$N(A)}for(i=0;i<this.nicInstances.length;i++){if(A==this.nicInstances[i].elm){return this.nicInstances[i]}}},addInstance:function(A,B){if(typeof (A)=="string"){A=$N(A)}if(A.contentEditable||!!window.opera){this.nicInstances.push(new nicEditorInstance(A,B,this))}else{this.nicInstances.push(new nicEditorIFrameInstance(A,B,this))}return this},instancesByClassName:function(B,E){var D=bkLib.getElementsByClassName(B);var C=new Array();for(var A=0;A<D.length;A++){this.addInstance(D[A],E)}},nicCommand:function(B,A){if(this.selectedInstance){this.selectedInstance.nicCommand(B,A)}},setPanel:function(A){if(typeof (A)=="string"){A=$N(A)}this.nicPanel=new nicEditorPanel(A,this.options,this);return this}});nicEditor=nicEditor.extend(bkEvent);var nicEditorInstance=bkClass.extend({nicEditor:null,elm:null,initalContent:null,isSelected:false,construct:function(G,D,C){this.nicEditor=C;this.elm=G;this.options=D||{};newX=G.width||G.clientWidth;newY=G.height||G.clientHeight;if(G.nodeName=="TEXTAREA"){G.style.display="none";var B=document.createElement("DIV");var A=document.createElement("DIV");A.innerHTML=G.value;bkLib.setStyle(B,{width:(newX)+"px",border:"1px solid #ccc",borderTop:0,overflow:"hidden"});bkLib.setStyle(A,{width:(newX-8)+"px",margin:"4px",minHeight:(newY-8)+"px"});var H=navigator.appVersion;if(H.indexOf("MSIE")!=-1&&!((typeof document.body.style.maxHeight!="undefined")&&document.compatMode=="CSS1Compat")){A.style.height=newY+"px"}B.appendChild(A);G.parentNode.insertBefore(B,G);this.elm=A;this.copyElm=G;var F=document.getElementsByTagName("FORM");for(var E=0;E<F.length;E++){bkLib.addEvent(F[E],"submit",this.saveContent.closure(this))}}this.initialHeight=newY-8;this.nicEditor.addEvent("noInstanceSelect",this.unselected.closure(this));this.init();this.unselected()},init:function(){this.elm.setAttribute("contentEditable","true");this.initialContent=this.getContent();if(this.initialContent==""){this.setContent("<br />")}this.elm.className="nicEdit";bkLib.addEvent(this.elm,"mousedown",this.mouseDown.closureListener(this))},getSel:function(){return(window.getSelection)?window.getSelection():document.selection},getRng:function(){var A=this.getSel();if(!A){return null}return(A.rangeCount>0)?A.getRangeAt(0):A.createRange()},selRng:function(A,B){if(window.getSelection){B.removeAllRanges();B.addRange(A)}else{A.select()}},saveRng:function(){this.savedRange=this.getRng();this.savedSel=this.getSel()},restoreRng:function(){if(this.savedRange){this.selRng(this.savedRange,this.savedSel)}},mouseDown:function(B,A){if(this.nicEditor.selectedInstance!=this){this.nicEditor.fireEvent("noInstanceSelect",A)}this.nicEditor.selectedInstance=this;this.nicEditor.fireEvent("instanceSelect",A);this.selected()},selected:function(){this.isSelected=true;bkLib.setStyle(this.elm,{className:"nicEdit nicEdit-instanceSelect"});if(this.toolTip){this.toolTip.remove();this.toolTip=null}},unselected:function(){this.isSelected=false;bkLib.setStyle(this.elm,{className:"nicEdit nicEdit-noInstanceSelect"});if(!this.toolTip&&(this.nicEditor.options.toolTipOn||this.options.toolTipOn)){this.addTooltip();this.toolTip.setContent((this.options.toolTipText)?this.options.toolTipText:this.nicEditor.options.toolTipText)}},addTooltip:function(){this.toolTip=new nicEditorTooltip(this.elm,this.nicEditor,this.getTipStyle())},saveContent:function(){if(this.copyElm){this.copyElm.value=this.getContent()}},getContent:function(){return this.elm.innerHTML},setContent:function(A){this.elm.innerHTML=A},getTipStyle:function(){return{padding:"3px",backgroundColor:"#ffffc9",fontSize:"12px",border:"1px solid #ccc",className:"nicEdit-instanceTip"}},getDoc:function(){return document.defaultView},nicCommand:function(B,A){document.execCommand(B,false,A)}});var nicEditorIFrameInstance=nicEditorInstance.extend({elm:null,init:function(){this.elmFrame=document.createElement("iframe");this.elmFrame.setAttribute("frameBorder","0");this.elmFrame.setAttribute("allowTransparency","true");this.elmFrame.setAttribute("scrolling","no");bkLib.setStyle(this.elmFrame,{width:"100%",overflow:"hidden",className:"nicEdit-frame"});if(this.copyElm){this.elmFrame.style.width=(this.elm.offsetWidth-4)+"px"}this.initialFontSize=bkLib.getStyle(this.elm,"font-size");this.initialFontFamily=bkLib.getStyle(this.elm,"font-family");this.initialFontWeight=bkLib.getStyle(this.elm,"font-weight");this.initialFontColor=bkLib.getStyle(this.elm,"color");this.initialContent=this.elm.innerHTML;if(this.initialContent==""){this.initialContent="<br />"}if(!this.copyElm){this.initialHeight=0}this.elm.innerHTML="";this.elm.appendChild(this.elmFrame);this.initFrame();this.heightUpdate();bkLib.addEvent(this.elmFrame.contentWindow.document,"mousedown",this.mouseDown.closureListener(this));bkLib.addEvent(this.elmFrame.contentWindow.document,"keyup",this.heightUpdate.closureListener(this))},initFrame:function(){this.frameDoc=this.elmFrame.contentWindow.document;this.frameDoc.open();this.frameDoc.write('<html><head></head><body id="nicEditContent" style="margin: 0 !important; background-color: transparent !important;">');this.frameDoc.write(this.initialContent);this.frameDoc.write("</body></html>");this.frameDoc.close();this.frameDoc.designMode="on";this.frameContent=this.elmFrame.contentWindow.document.body;bkLib.setStyle(this.frameContent,{fontSize:this.initialFontSize,fontFamily:this.initialFontFamily,fontWeight:this.initialFontWeight,color:this.initialFontColor})},getContent:function(){return this.frameContent.innerHTML},addTooltip:function(A){this.toolTip=new nicEditorTooltip(this.elmFrame,this.nicEditor,this.getTipStyle())},setContent:function(A){this.frameContent.innerHTML=A},getDoc:function(){return this.elmFrame.contentWindow.document.defaultView},getSel:function(){return(this.elmFrame.contentWindow)?this.elmFrame.contentWindow.getSelection():this.frameDoc.selection},heightUpdate:function(){this.elmFrame.style.height=(this.frameContent.offsetHeight<this.initialHeight)?this.initialHeight+"px":this.frameContent.offsetHeight+"px"},nicCommand:function(B,A){this.frameDoc.execCommand(B,false,A);setTimeout(this.heightUpdate.closure(this),100)}});var nicEditorPanel=bkClass.extend({panelId:null,panelButtons:[],panelElm:null,elm:null,construct:function(D,B,A){this.elm=D;this.options=B;this.nicEditor=A;this.panelElm=document.createElement("div");this.panelContain=document.createElement("div");bkLib.setStyle(this.panelContain,{width:"100%",border:"1px solid #cccccc",backgroundColor:"#efefef",className:"nicEdit-panelContain"});bkLib.setStyle(this.panelElm,{margin:"2px",overflow:"hidden",className:"nicEdit-panel"});this.panelButtons=new Array();if(this.options.fullPanel){for(b in this.options.buttons){this.addButton(this.options.buttons[b])}}else{for(var C=0;C<this.options.buttonList.length;C++){this.addButton(this.options.buttons[this.options.buttonList[C]])}}this.panelContain.appendChild(this.panelElm);this.elm.appendChild(this.panelContain);bkLib.unselectAble(this.elm)},addButton:function(button){var type=(button["type"])?eval(button["type"]):nicEditorButton;this.panelButtons.push(new type(this.panelElm,button,this.nicEditor))}});var nicEditorButton=bkClass.extend({isDisabled:false,isHover:false,isActive:false,construct:function(C,B,A){this.elm=C;this.options=B;this.nicEditor=A;this.buttonContain=document.createElement("div");this.buttonBorder=document.createElement("div");this.buttonElm=document.createElement("div");bkLib.setStyle(this.buttonElm,{backgroundImage:"url('"+this.nicEditor.options.iconsPath+"')",width:"18px",height:"18px",backgroundPosition:((this.options.tile-1)*-18)+"px 0px",cursor:"pointer",className:"nicEdit-button"});bkLib.setStyle(this.buttonBorder,{border:"1px solid #efefef",width:"18px",height:"18px",backgroundColor:"#efefef"});bkLib.setStyle(this.buttonContain,{"float":"left",overflow:"hidden",width:"20px",height:"20px",className:"nicEdit-buttonContain"});bkLib.addEvent(this.buttonElm,"mouseover",this.hoverOn.closure(this));bkLib.addEvent(this.buttonElm,"mouseout",this.hoverOff.closure(this));bkLib.addEvent(this.buttonElm,"click",this.mouseClick.closure(this));if(!window.opera){this.buttonElm.onmousedown=bkLib.cancelEvent;this.buttonElm.onclick=bkLib.cancelEvent}this.nicEditor.addEvent("instanceSelect",this.enable.closure(this));this.nicEditor.addEvent("noInstanceSelect",this.disable.closure(this));this.disable();this.buttonBorder.appendChild(this.buttonElm);this.buttonContain.appendChild(this.buttonBorder);this.elm.appendChild(this.buttonContain);this.init()},init:function(){},hideButton:function(){this.buttonContain.style.display="none"},updateState:function(){if(this.isDisabled){this.setBg()}else{if(this.isHover){this.setBg("hover")}else{if(this.isActive){this.setBg("active")}else{this.setBg()}}}},setBg:function(A){if(A=="hover"){bkLib.setStyle(this.buttonBorder,{border:"1px solid #666",backgroundColor:"#ddd",className:"nicEdit-buttonContain-hover"})}else{if(A=="active"){bkLib.setStyle(this.buttonBorder,{border:"1px solid #666",backgroundColor:"#ccc",className:"nicEdit-buttonContain-active"})}else{bkLib.setStyle(this.buttonBorder,{border:"1px solid #efefef",backgroundColor:"#efefef",className:"nicEdit-buttonContain-normal"})}}},checkNodes:function(A){var B=A;do{if(this.options.tags&&bkLib.inArray(this.options.tags,B.nodeName)){this.activate();return true}}while(B=B.parentNode);var B=A;if(this.options.css){for(itm in this.options.css){if(bkLib.getStyle(B,itm,this.nicEditor.selectedInstance.getDoc())==this.options.css[itm]){this.activate();return true}}}this.deactivate();return false},activate:function(){if(!this.isDisabled){this.isActive=true;this.updateState()}},deactivate:function(){this.isActive=false;this.updateState()},enable:function(A){this.isDisabled=false;bkLib.setStyle(this.buttonContain,{"opacity":1,className:"nicEdit-buttonContain-enabled"});this.updateState();this.checkNodes(A)},disable:function(A){this.isDisabled=true;bkLib.setStyle(this.buttonContain,{"opacity":0.6,className:"nicEdit-buttonContain-disabled"});this.updateState();this.removePane()},toggleActive:function(){(this.isActive)?this.deactivate():this.activate()},hoverOn:function(){if(!this.isDisabled){this.isHover=true;this.updateState();this.toolTimer=setTimeout(this.addTooltip.closure(this),500)}},addTooltip:function(){if(this.isHover&&!this.buttonPane){this.toolTip=new nicEditorPane(this.buttonContain,this.nicEditor,{margin:"4px",padding:"3px",backgroundColor:"#ffffc9",fontSize:"12px",border:"1px solid #ccc",className:"nicEdit-tooltip"});this.toolTip.setContent(this.options.name)}},removeTooltip:function(){if(this.toolTimer){clearTimeout(this.toolTimer)}if(this.toolTip){this.toolTip.remove();this.toolTip=null}},getPaneStyle:function(){return{width:"275px",fontSize:"12px",padding:"4px",textAlign:"left",border:"1px solid #ccc",backgroundColor:"#fff",className:"nicEdit-buttonPane"}},removePane:function(){if(this.buttonPane){this.buttonPane.remove();this.buttonPane=null;return true}},hoverOff:function(){this.isHover=false;this.updateState();this.removeTooltip()},mouseClick:function(){if(this.options.command){this.nicEditor.nicCommand(this.options.command,this.options.commandArgs);if(!this.options.noActive){this.toggleActive()}}else{(this.buttonPane)?this.removePane():this.addPane()}}});var nicEditorSelect=bkClass.extend({isDisabled:false,construct:function(C,B,A){this.elm=C;this.options=B;this.nicEditor=A;this.selectContain=document.createElement("DIV");this.selectItems=document.createElement("DIV");this.selectControl=document.createElement("DIV");this.selectTxt=document.createElement("DIV");this.selectOptions=new Array();bkLib.setStyle(this.selectContain,{overflow:"hidden",width:"90px",height:"20px","float":"left",cursor:"pointer",margin:"0 2px",className:"nicEdit-selectContain"});bkLib.setStyle(this.selectItems,{overflow:"hidden",border:"1px solid #ccc",paddingLeft:"3px",height:"18px",backgroundColor:"#fff"});bkLib.setStyle(this.selectControl,{backgroundImage:"url('"+this.nicEditor.options.iconsPath+"')",backgroundPosition:(17*-18)+"px 0px","float":"right",height:"16px",width:"16px",className:"nicEdit-selectControl"});bkLib.setStyle(this.selectTxt,{"float":"left",width:"66px",overflow:"hidden",height:"16px",marginTop:"1px",fontFamily:"arial",fontSize:"12px",className:"nicEdit-selectTxt"});if(!window.opera){this.selectContain.onmousedown=this.selectControl.onmousedown=this.selectTxt.onmousedown=bkLib.cancelEvent}this.selectItems.appendChild(this.selectTxt);this.selectItems.appendChild(this.selectControl);this.selectContain.appendChild(this.selectItems);this.elm.appendChild(this.selectContain);bkLib.addEvent(this.selectContain,"click",this.togglePane.closure(this));this.nicEditor.addEvent("instanceSelect",this.enable.closure(this));this.nicEditor.addEvent("noInstanceSelect",this.disable.closure(this));this.disable();this.init();bkLib.unselectAble(this.elm)},disable:function(){this.isDisabled=true;this.removePane();bkLib.setStyle(this.selectContain,{opacity:0.6})},enable:function(A){this.isDisabled=false;bkLib.setStyle(this.selectContain,{opacity:1})},setDisplay:function(A){this.selectTxt.innerHTML=A},togglePane:function(){if(!this.isDisabled){(this.selectPane)?this.removePane():this.showPane()}},showPane:function(){this.selectPane=new nicEditorPane(this.selectContain,this.nicEditor,this.getPaneStyle());for(var B=0;B<this.selectOptions.length;B++){var A=this.selectOptions[B][0];var D=this.selectOptions[B][1];var C=document.createElement("div");bkLib.setStyle(C,{overflow:"hidden",width:"88px",textAlign:"left",padding:"0 4px",cursor:"pointer",borderBottom:"1px solid #ccc"});C.id=A;C.innerHTML=D;C.onclick=this.onSelect.closure(this,A);C.onmouseover=this.optionOver.closure(this,C);C.onmouseout=this.optionOut.closure(this,C);if(!window.opera){C.onmousedown=bkLib.cancelEvent}this.selectPane.append(C);bkLib.unselectAble(C)}},removePane:function(){if(this.selectPane){this.selectPane.remove();this.selectPane=null}},getPaneStyle:function(){return{width:"88px",overflow:"hidden",fontSize:"12px",borderLeft:"1px solid #ccc",borderRight:"1px solid #ccc",backgroundColor:"#fff",className:"nicEdit-selectPane"}},optionOver:function(A){bkLib.setStyle(A,{backgroundColor:"#ccc"})},optionOut:function(A){bkLib.setStyle(A,{backgroundColor:"#fff"})},add:function(B,A){this.selectOptions.push(new Array(B,A))},onSelect:function(A){this.nicEditor.nicCommand(this.options.command,A);this.removePane()}});var nicEditorFontSizeSelect=nicEditorSelect.extend({selConfig:{1:"1&nbsp;(8pt)",2:"2&nbsp;(10pt)",3:"3&nbsp;(12pt)",4:"4&nbsp;(14pt)",5:"5&nbsp;(18pt)",6:"6&nbsp;(24pt)"},init:function(){this.setDisplay("Font&nbsp;Size..");for(itm in this.selConfig){this.add(itm,'<font size="'+itm+'">'+this.selConfig[itm]+"</font>")}}});var nicEditorFontFamilySelect=nicEditorSelect.extend({selConfig:{"arial":"Arial","comic sans ms":"Comic Sans","courier new":"Courier New","georgia":"Georgia","helvetica":"Helvetica","impact":"Impact","times new roman":"Times","trebuchet ms":"Trebuchet","verdana":"Verdana"},init:function(){this.setDisplay("Font&nbsp;Family..");for(itm in this.selConfig){this.add(itm,'<font face="'+itm+'">'+this.selConfig[itm]+"</font>")}}});var nicEditorFontFormatSelect=nicEditorSelect.extend({selConfig:{"p":"Paragraph","pre":"Pre","h6":"Heading&nbsp;6","h5":"Heading&nbsp;5","h4":"Heading&nbsp;4","h3":"Heading&nbsp;3","h2":"Heading&nbsp;2","h1":"Heading&nbsp;1"},init:function(){this.setDisplay("Font&nbsp;Format..");for(itm in this.selConfig){var A=itm.toUpperCase();this.add("<"+A+">","<"+itm+' style="padding: 0px; margin: 0px;">'+this.selConfig[itm]+"</"+A+">")}}});var nicEditorSaveButton=nicEditorButton.extend({onSave:null,init:function(){this.onSave=this.nicEditor.options.onSave;if(!this.onSave){this.hideButton()}},mouseClick:function(){if(this.nicEditor.options.onSave){this.nicEditor.options.onSave(this.nicEditor.nicInstances)}}});var nicEditorPane=bkClass.extend({nicPane:null,options:null,isVisible:true,isOver:true,construct:function(E,B,A){this.options=A;this.nicEditor=B;this.elm=E;var C=this.nicEditor.nicPanel.panelElm;this.nicPane=document.createElement("DIV");this.pos=bkLib.elmPos(E);bkLib.setStyle(this.nicPane,{position:"absolute",left:this.pos[0]+"px",top:this.pos[1]+"px",className:"nicEdit-pane"});bkLib.setStyle(this.nicPane,A);document.body.appendChild(this.nicPane);panelPos=bkLib.elmPos(C);var D=panelPos[0]+C.offsetWidth;xPos=this.pos[0]+this.nicPane.offsetWidth;if(xPos>D){bkLib.setStyle(this.nicPane,{left:(this.pos[0]-(xPos-D+1))+"px"})}this.init();bkLib.unselectAble(this.nicPane)},init:function(){},hide:function(){this.nicPane.style.display="none";this.isVisible=false},show:function(){if(this.isOver){this.nicPane.style.display="block";this.isVisible=true}},remove:function(){if(this.nicPane){document.body.removeChild(this.nicPane)}},append:function(A){this.nicPane.appendChild(A)},setContent:function(A){this.nicPane.innerHTML=A}});var nicEditorTooltip=nicEditorPane.extend({init:function(){bkLib.addEvent(this.elm,"mouseover",this.mouseOver.closureListener(this));bkLib.addEvent(this.elm,"mouseout",this.mouseOut.closureListener(this));bkLib.addEvent((this.elm.nodeName=="IFRAME")?this.elm.contentWindow.document:this.elm,"mousemove",this.mouseMove.closureListener(this));this.hide()},mouseMove:function(C){var E=bkLib.mousePos(C);var A=(this.elm.nodeName=="IFRAME");var B=A?E[0]+this.pos[0]:E[0];var D=A?E[1]+this.pos[1]-this.elm.offsetHeight:E[1];bkLib.setStyle(this.nicPane,{left:(B+10)+"px",top:(D+10)+"px"})},mouseOver:function(C,B){var A=(C.relatedTarget)?C.relatedTarget:C.toElement;while(A&&A!=this.elm){A=A.parentNode}if(A==this.elm){return }if(!this.isVisible){this.toolTimer=setTimeout(this.show.closure(this),400)}this.isOver=true},mouseOut:function(C,B){var A=(C.relatedTarget)?C.relatedTarget:C.toElement;while(A&&A!=this.elm){A=A.parentNode}if(A==this.elm){return }if(this.toolTimer){clearTimeout(this.toolTimer)}this.hide();this.isOver=false}});var nicEditorImageButton=nicEditorButton.extend({addPane:function(){this.removeTooltip();this.nicEditor.selectedInstance.saveRng();this.buttonPane=new nicEditorPane(this.buttonContain,this.nicEditor,this.getPaneStyle());var A='<form id="nicImageForm" onSubmit="return false;"><h3 style="padding: 0px; margin: 0px;">Insert Image</h3>			<label style="display: block; float: left; width: 100px" for="url">Image URL</label>			<input style="border: 1px solid #ccc; width: 150px;" type="text" name="url" id="nicImageURL" value="http://" /><br />			<input type="submit" style="border: 1px solid #ccc" id="nicImageSubmit" /></div></form>';this.buttonPane.setContent(A);this.imgURL=$N("nicImageURL");this.imgURL.focus();bkLib.addEvent($N("nicImageForm"),"submit",this.paneSubmit.closure(this))},paneSubmit:function(){var B=this.nicEditor.selectedInstance;if(B){B.restoreRng();var A=this.imgURL.value;if(A=="http://"||A==""){alert("You must enter a URL to Insert an Image");return false}this.nicEditor.nicCommand("insertImage",A);this.removePane()}}});var nicEditorLinkButton=nicEditorButton.extend({addPane:function(){this.removeTooltip();this.nicEditor.selectedInstance.saveRng();this.buttonPane=new nicEditorPane(this.buttonContain,this.nicEditor,this.getPaneStyle());var A='<form id="nicLinkForm" onSubmit="return false;"><h3 style="padding: 0px; margin: 0px;">Insert Link</h3>			<label style="display: block; float: left; width: 100px" for="url">Link URL</label>			<input type="text" style="border: 1px solid #ccc; width: 150px;" name="url" id="nicLinkURL" value="http://" /><br />			<input type="submit" style="border: 1px solid #ccc" value="Submit" /></form>';this.buttonPane.setContent(A);this.linkURL=$N("nicLinkURL");this.linkURL.focus();bkLib.addEvent($N("nicLinkForm"),"submit",this.paneSubmit.closure(this))},paneSubmit:function(){var B=this.nicEditor.selectedInstance;if(B){this.nicEditor.selectedInstance.restoreRng();var A=this.linkURL.value;if(A=="http://"||A==""){alert("You must enter a URL to Create a Link");return false}this.nicEditor.nicCommand("createlink",A)}this.removePane()}});var nicEditorHTMLButton=nicEditorButton.extend({addPane:function(){this.removeTooltip();this.buttonPane=new nicEditorPane(this.buttonContain,this.nicEditor,{width:(this.nicEditor.nicPanel.panelElm.offsetWidth-12)+"px",textAlign:"left",border:"1px solid #ccc",zIndex:"9999",backgroundColor:"#fff"});paneContent='<form id="nicHTMLForm" onSubmit="return false;"><textarea id="nicHTMLArea" style="width: 100%; text-align: left; font-size: 13px; height: 200px; border: 0; border-bottom: 1px solid #ccc;">			</textarea><input type="submit" style="margin-left: 20px; border: 1px solid #ccc" value="Update HTML" /></form>';this.buttonPane.setContent(paneContent);bkLib.addEvent($N("nicHTMLForm"),"submit",this.paneSubmit.closure(this));$N("nicHTMLArea").value=this.nicEditor.selectedInstance.getContent()},paneSubmit:function(){var A=this.nicEditor.selectedInstance;if(A){A.restoreRng();A.setContent($N("nicHTMLArea").value)}this.removePane()}});var nicEditorColorButton=nicEditorButton.extend({addPane:function(){this.removeTooltip();this.buttonPane=new nicEditorPane(this.buttonContain,this.nicEditor,this.getPaneStyle());var D={0:"00",1:"33",2:"66",3:"99",4:"CC",5:"FF"};var H=document.createElement("DIV");bkLib.setStyle(H,{width:"270px"});for(var A in D){for(var F in D){for(var E in D){var C=document.createElement("DIV");var G=document.createElement("DIV");var B=document.createElement("DIV");var I="#"+D[A]+D[E]+D[F];bkLib.setStyle(C,{"cursor":"pointer","height":"15px","float":"left"});bkLib.setStyle(G,{border:"2px solid "+I});bkLib.setStyle(B,{backgroundColor:I,overflow:"hidden",width:"11px",height:"11px"});bkLib.addEvent(C,"click",this.colorSelect.closure(this,I));bkLib.addEvent(C,"mouseover",this.borderOn.closure(this,G));bkLib.addEvent(C,"mouseout",this.borderOff.closure(this,G,I));if(!window.opera){C.onmousedown=bkLib.cancelEvent;B.onmousedown=bkLib.cancelEvent}C.appendChild(G);G.appendChild(B);H.appendChild(C)}}}bkLib.unselectAble(H);this.buttonPane.append(H)},colorSelect:function(A){this.nicEditor.nicCommand("foreColor",A);this.removePane()},borderOn:function(A){bkLib.setStyle(A,{border:"2px solid #000"})},borderOff:function(A,B){bkLib.setStyle(A,{border:"2px solid "+B})}})
\ No newline at end of file
diff --git a/admin/scripts/nicEditorIcons.gif b/admin/scripts/nicEditorIcons.gif
new file mode 100644
index 0000000..508aeb1
Binary files /dev/null and b/admin/scripts/nicEditorIcons.gif differ
diff --git a/api.php b/api.php
index 221941b..516a56e 100644
--- a/api.php
+++ b/api.php
@@ -14,10 +14,6 @@ if(!defined('entry')) define('entry',true);
 <?php
 	header("Content-type: text/xml; charset=utf-8");	
 	
-	require(dirname(__FILE__)."/config.php");
-	include("classes/configuration.class.php");
-	include("classes/gelato.class.php");
-	include("classes/textile.class.php");
 	$isFeed = true;
 	$tumble = new gelato();
 	$conf = new configuration();
@@ -29,14 +25,14 @@ if(!defined('entry')) define('entry',true);
 	
 	if (isset($_GET["action"]) && $_GET["action"] == "read") {
 		if (isset($_GET["start"])) { $start = $_GET["start"]; } else { $start = 0; }
-		if (isset($_GET["num"])) { $num = $_GET["num"]; } else { $num = 20; }
-		if (isset($_GET["type"])) { $type = $_GET["type"]; } else { $type = null; }
-		if ($num > 50) { $num = 50; }		
+		if (isset($_GET["total"])) { $total = $_GET["total"]; } else { $total = 20; }
+		if (isset($_GET["type"])) { $hasType = true; } else { $hasType = false; }
+		if ($total > 50) { $total = 50; }		
 ?>		
 		<tumblelog name="<?php echo $_SESSION["user_login"];?>" timezone="<?php echo $conf->offsetCity;?>" title="<?php echo $conf->title;?>"><?php echo $conf->description;?></tumblelog>	
 
 <?php
-		switch ($type) {
+		switch ($hasType) {
 			case "post":
 				$_GET["type"] = "1";
 				break;
@@ -59,65 +55,86 @@ if(!defined('entry')) define('entry',true);
 				$_GET["type"] = "7";
 				break;								
 		}
-		$rs = $tumble->getPosts($num, $start);
+		$rs = $tumble->getPosts($total, $start);
 		if ($tumble->contarRegistros()>0) {
 ?>
-			<posts start="<?php echo $start; ?>" total="<?php echo $num; ?>">
-<?php/*
+			<posts start="<?php echo $start; ?>" total="<?php echo $total; ?>">
+<?php 
 			while($register = mysql_fetch_array($rs)) {
-				
-				$textile = new Textile();				
-				$register["description"] = $textile->TextileThis($register["description"]);
+				$desc = $register["description"];
+				$url = $conf->urlGelato."/index.php?post=".$register["id_post"];
+				$formatedDate = gmdate("D, d M Y H:i:s", strtotime($register["date"])+transform_offset($conf->offsetTime));
 				
 				switch ($register["type"]) {
 					case "1":
-						$tit = ($register["title"]=="") ? strip_tags($register["description"]) : $register["title"];
-						$desc = $register["description"];
+
+						$tit = ($register["title"]=="") ? $register["description"] : $register["title"];
+?>
+						
+						<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="regular" date="<?php echo $formatedDate;?>">
+							<regular-title><?php echo $tit;?></regular-title>
+							<regular-body><?php echo $desc;?></regular-body>
+						</post>
+<?php						
 						break;
 					case "2":
-						$tit = ($register["description"]=="") ? "Photo" : strip_tags($register["description"]);
-						$desc = "<img src=\"".$register["url"]."\"/>";
+						$tit = ($register["description"]=="") ? "Photo" : $register["description"];
+?>
+						<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="photo" date="<?php echo $formatedDate;?>">
+<?php
+							$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
+?>
+                            <photo-caption><?php echo $tit;?></photo-caption>
+                            <photo-url><?php echo $photoPath;?></photo-url>                            
+                        </post>
+<?php
 						break;
-					case "3":
-						$tit = "\"".strip_tags($register["description"])."\"";
-						$tmpStr = ($register["title"]!="") ? "<br /><br /> - <em>".$register["title"]."</em>" : "";
-						$desc = "\"".$register["description"]."\"".$tmpStr;
+					case "3":						
+?>
+						<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="quote" date="<?php echo $formatedDate;?>">
+							<quote-text><?php echo $desc; ?></quote-text>
+							<quote-source><?php echo $register["title"]; ?></quote-source>
+						</post>
+<?php
 						break;
 					case "4":
 						$tit = ($register["title"]=="") ? $register["url"] : $register["title"];
-						$tmpStr = ($register["description"]!="") ? "<br /><br /> - <em>".$register["description"]."</em>" : "";
-						$desc = "<a href=\"".$register["url"]."\">".$tit."</a>".$tmpStr;
+?>
+						<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="link" date="<?php echo $formatedDate;?>">
+                            <link-text><?php echo $tit; ?></link-text>
+                            <link-url><?php echo $register["url"]; ?></link-url>
+                        </post>
+<?php
 						break;
 					case "5":
 						$lines = explode("\n", $register["description"]);
 						$line = $lines[0];
 						$tit = ($register["title"]=="") ? $line : $register["title"];
 						$desc = $tumble->formatConversation($register["description"]);
+?>
+						<post id="<?php echo $register["id_post"]; ?>" url="<?php echo $url;?>" type="conversation" date="<?php echo $formatedDate;?>">
+                            <conversation-title><?php echo $tit; ?></conversation-title>
+                            <conversation-text><?php echo $register["description"]; ?></conversation-text>
+                            <?php echo $tumble->formatApiConversation($register["description"]); ?>
+                        </post>
+<?php
 						break;
+/*
 					case "6":
-						$tit = ($register["description"]=="") ? "Video" : strip_tags($register["description"]);
+						$tit = ($register["description"]=="") ? "Video" : $register["description"];
 						$desc = $tumble->getVideoPlayer($register["url"]);
 						break;
 					case "7":
-						$tit = ($register["description"]=="") ? "MP3" : strip_tags($register["description"]);
+						$tit = ($register["description"]=="") ? "MP3" : $register["description"];
 						$desc = $tumble->getMp3Player($register["url"]);
 						break;
+*/
 				}
 				$url = $conf->urlGelato."/index.php/post/".$register["id_post"]."/";
-				$formatedDate = gmdate("D, d M Y H:i:s \G\M\T", strtotime($register["date"])+transform_offset($conf->offsetTime));
-?>
-
-				<item>
-					<title><?php echo $tit;?></title>
-					<description><![CDATA[<?php echo $desc;?>]]></description>
-					<link><?php echo $url;?></link>
-					<guid isPermaLink="true"><?php echo $conf->urlGelato."/index.php/post/".$register["id_post"]."/";?></guid>				
-					<pubDate><?php echo $formatedDate;?></pubDate>				
-				</item>
-
-<?php	
+				$formatedDate = gmdate("D, d M Y H:i:s", strtotime($register["date"])+transform_offset($conf->offsetTime));
 			}		
-*/?>
+ 
+?>
 				</posts>
 <?php	
 		}
diff --git a/classes/functions.php b/classes/functions.php
index eeb2aa0..5866aa7 100644
--- a/classes/functions.php
+++ b/classes/functions.php
@@ -17,7 +17,7 @@ if(!defined('entry') || !entry) die('Not a valid page');
 	}
 	
 	function codeName() {
-		return "cioccolato RC1";
+		return "vaniglia RC1";
 	}
 	
 	function beginsWith($str, $sub) {
@@ -347,4 +347,18 @@ if(!defined('entry') || !entry) die('Not a valid page');
 	    }
 	    return $value;
 	}
+	
+	function removeBadTags($source) {
+		$validTags ='<p><ul><li><a><abbr><acronym><blockquote><code><pre><em><i><strike><s><strong><b><br><span><div><img>';
+		$source = strip_tags($source, $validTags);
+		return preg_replace('/<(.*?)>/ie', "'<'.removeBadAtributes('\\1').'>'", $source);
+	}
+	
+	function removeBadAtributes($sourceTag)
+	{
+		$badAtributes = 'javascript:|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup|class';
+		$sourceTag = stripslashes($sourceTag);
+		$sourceTag = preg_replace("/$badAtributes/i", "niceTry", $sourceTag);
+		return $sourceTag;
+	}
 ?>
\ No newline at end of file
diff --git a/classes/gelato.class.php b/classes/gelato.class.php
index bcc6309..f131d7b 100644
--- a/classes/gelato.class.php
+++ b/classes/gelato.class.php
@@ -123,6 +123,24 @@ class gelato extends Conexion_Mysql {
 		return $formatedText;
 	}
 	
+	function formatApiConversation($text) {
+		$formatedText = "";
+		
+		$lines = explode("\n", $text);
+		
+		foreach ($lines as $line) {
+			$pos = strpos($line, ":") + 1;
+			
+			$name = substr($line, 0, $pos-1);
+			$label = substr($line, 0, $pos);
+			$desc = substr($line, $pos, strlen($line));
+			
+			$formatedText .= "<conversation-line name=\"".$name."\" label=\"".$label."\">".$desc."</conversation-line>\n";
+		}
+		
+		return $formatedText;
+	}
+	
 	function saveMP3($remoteFileName) {
 		if (getMP3File($remoteFileName)) {
 			return true;
diff --git a/classes/mysql_connection.class.php b/classes/mysql_connection.class.php
index f2bab77..dc59daf 100644
--- a/classes/mysql_connection.class.php
+++ b/classes/mysql_connection.class.php
@@ -103,8 +103,6 @@ class Conexion_Mysql {
 		  
 		 $cols .= "$llave,"; 
 		 
-		 $valor = htmlspecialchars($valor,ENT_QUOTES);
-		 
 		 $tipo_col = $this->obtenerTipoCampo($tabla, $llave);  // obtiene el tipo de campo
 		 if (!$tipo_col) return false;  // error!
 		 
@@ -158,8 +156,6 @@ class Conexion_Mysql {
 		foreach ($datos as $llave=>$valor) {
 			$sql .= " $llave=";
 			
-			$valor = htmlspecialchars($valor,ENT_QUOTES);
-			
 			$tipo_col = $this->obtenerTipoCampo($tabla, $llave);  // obtiene el tipo de campo
 			if (!$tipo_col) return false;  // error!
 			
diff --git a/index.php b/index.php
index e01a6ba..f7a7525 100644
--- a/index.php
+++ b/index.php
@@ -112,8 +112,7 @@ $template = new plantillas($conf->template);
                                 
 								$conversation = $register["description"];
 								
-								$textile = new Textile();				
-								$register["description"] = $textile->TextileThis($register["description"]);
+								$register["description"] = $register["description"];
 
                                 $register["title"] = stripslashes($register["title"]);
                                 $register["description"] = stripslashes($register["description"]);
@@ -212,8 +211,7 @@ $template = new plantillas($conf->template);
                 
 				$conversation = $register["description"];
 				
-				$textile = new Textile();				
-				$register["description"] = $textile->TextileThis($register["description"]);
+				$register["description"] = $register["description"];
 				
 				$register["title"] = stripslashes($register["title"]);
                 $register["description"] = stripslashes($register["description"]);
@@ -306,9 +304,6 @@ $template = new plantillas($conf->template);
 					$template->precargarPlantillaConBloque($input, $output, "template_comments", "comments");
 
 					while($rowComment = mysql_fetch_assoc($rsComments)) {
-						/*echo "<pre>";
-						print_r($rowComment);
-						echo "</pre>";*/
 						$commentAuthor = ($rowComment["web"]=="") ? $rowComment["username"] : "<a href=\"".$rowComment["web"]."\" rel=\"external\">".$rowComment["username"]."</a>";
 						$input = array("{Id_Comment}", "{Comment_Author}", "{Date}", "{Comment}");
 						$output = array($rowComment["id_comment"], $commentAuthor, gmdate("d.m.y", strtotime($rowComment["comment_date"])+transform_offset($conf->offsetTime)), $rowComment["content"]);
diff --git a/notice.txt b/notice.txt
index 2d516ad..86ba2ec 100644
--- a/notice.txt
+++ b/notice.txt
@@ -1,5 +1,5 @@
 == CREDITS==
-Gelato developers and designers (in chronological order):
+gelato CMS developers and designers (in chronological order):
 
 Pedro Santana [ http://www.pecesama.net/weblog/ ]
 Jorge Condomi [ http://www.raven.com.ar/ ]
@@ -11,6 +11,10 @@ Juan del Rio [ http://elcaminante.net/ ]
 = COPYRIGHT NOTICES =
 This product includes code and libraries developed by third parties, which are governed by different licenses.  These components, and their licenses, are listed below.
 
+= NicEdit - Micro Inline WYSIWYG =
+Copyright 2007 Brian Kirchoff, http://nicedit.com/
+NicEdit available under MIT license.
+
 = jQuery =
 Copyright (c) 2007 John Resig, http://jquery.com
 jQuery is available under a dual licensed the MIT and GPL licenses.
diff --git a/rss.php b/rss.php
index 247ebcc..ed9a9ea 100644
--- a/rss.php
+++ b/rss.php
@@ -37,27 +37,25 @@ if(!defined('entry')) define('entry',true);
 
 <?php
 	include("classes/gelato.class.php");
-	include("classes/textile.class.php");
 	$tumble = new gelato();
 	$rs = $tumble->getPosts("20");
 	if ($tumble->contarRegistros()>0) {		
 
 		while($register = mysql_fetch_array($rs)) {
-			$textile = new Textile();				
-			$register["description"] = $textile->TextileThis($register["description"]);
+			$register["description"] = $register["description"];
 			
 			switch ($register["type"]) {
 				case "1":
-					$tit = ($register["title"]=="") ? strip_tags($register["description"]) : $register["title"];
+					$tit = ($register["title"]=="") ? $register["description"] : $register["title"];
 					$desc = $register["description"];
 					break;
 				case "2":
 					$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
-					$tit = ($register["description"]=="") ? "Photo" : strip_tags($register["description"]);
+					$tit = ($register["description"]=="") ? "Photo" : $register["description"];
 					$desc = "<img src=\"".$photoPath."\"/>";
 					break;
 				case "3":
-					$tit = "\"".strip_tags($register["description"])."\"";
+					$tit = "\"".$register["description"]."\"";
 					$tmpStr = ($register["title"]!="") ? "<br /><br /> - <em>".$register["title"]."</em>" : "";
 					$desc = "\"".$register["description"]."\"".$tmpStr;
 					break;
@@ -73,16 +71,16 @@ if(!defined('entry')) define('entry',true);
 					$desc = $tumble->formatConversation($register["description"]);
 					break;
 				case "6":
-					$tit = ($register["description"]=="") ? "Video" : strip_tags($register["description"]);
+					$tit = ($register["description"]=="") ? "Video" : $register["description"];
 					$desc = $tumble->getVideoPlayer($register["url"]);
 					break;
 				case "7":
-					$tit = ($register["description"]=="") ? "MP3" : strip_tags($register["description"]);
+					$tit = ($register["description"]=="") ? "MP3" : $register["description"];
 					$desc = $tumble->getMp3Player($register["url"]);
 					break;
 			}
-			$tit = htmlspecialchars($tit);
-			$url = htmlspecialchars($url);
+			$tit = strip_tags($tit);
+			//$url = htmlspecialchars($url);
 			$strEnd=($conf->urlFriendly) ? "/" : "";
 			$url = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
 			$formatedDate = gmdate("r", strtotime($register["date"])+transform_offset($conf->offsetTime));