diff --git a/index.php b/index.php
index 857c939..db80720 100644
--- a/index.php
+++ b/index.php
@@ -1,325 +1,326 @@
-<?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
-
-// Received a valid request, better start setting globals we'll need throughout the app in entry.php
-require_once('entry.php');
-global $user, $tumble, $conf;
-
-$theme = new themes;
-        // My approach to MVC
-
-        if(isset($_SERVER['PATH_INFO'])) $param_url = explode("/",$_SERVER['PATH_INFO']);
-
-        if (isset($_GET["post"])) {
-                $id_post = $_GET["post"];
-                if (!is_numeric($id_post) || $id_post < 1 ){
-                	header("Location: index.php");
-                }
-        } else {
-                if (isset($param_url[1]) && $param_url[1]=="post") {
-                        $id_post = (isset($param_url[2])) ? ((is_numeric($param_url[2])) ? $param_url[2] : NULL) : NULL;
-                } else {
-                        $id_post = NULL;
-                }
-        }
-
-        $theme->set('id_post',$id_post);
-
-        if (isset($_GET["page"])) {
-                $page_num = $_GET["page"];
-        } else {
-                if (isset($param_url[1]) && $param_url[1]=="page") {
-                        $page_num = (isset($param_url[2])) ? ((is_numeric($param_url[2])) ? $param_url[2] : NULL) : NULL;
-                } else {
-                        $page_num = NULL;
-                }
-        }
-
-        $gelato_includes = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n";
-        $gelato_includes .= "\t<meta name=\"generator\" content=\"gelato  ".codeName()." (".version().")\" />\n";
-        $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
-        $gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n";
-        $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
-        $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/admin/css/lightbox.css\" />\n";
-        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/jquery.js\"></script>\n";
-        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/lightbox.js\"></script>";
-
-		$page_title = $conf->title;
-		$page_title_divisor = " &raquo; "; // it should be set in configuration
-		$page_title_len = 50; // it should be set in configuration
-		if ($id_post) {
-			$register = $tumble->getPost($id_post);
-			$textile = new Textile();
-			if (empty($register["title"])) {
-				if (!empty($register["description"])) {
-					if (strlen($register["description"]) > $page_title_len) {
-						$page_title_data = substr($register["description"], 0, $page_title_len)."...";
-					}
-				}
-			} else {
-				$page_title_data = $register["title"];
-			}
-			$page_title_data = strip_tags($textile->TextileThis($page_title_data));
-			if (!empty($page_title_data)) {
-				$page_title .= $page_title_divisor.stripslashes($page_title_data);
-			}
-		}
-
-		$theme->set('Gelato_includes',$gelato_includes);
-		$theme->set('Title',$conf->title);
-		$theme->set('Page_Title',$page_title);
-		$theme->set('Description',$conf->description);
-		$theme->set('URL_Tumble',$conf->urlGelato);
-		$theme->set('Template_name',$conf->template);
-
-		$theme->set('isAuthenticated',$user->isAuthenticated());
-        if($user->isAuthenticated()){
-			$theme->set('User',$_SESSION["user_login"]);
-			$theme->set('URL_Tumble',$conf->urlGelato);
-        }
-
-		$rows = array();
-        if(!$id_post){
-                $limit=$conf->postLimit;
-
-                if(isset($page_num) && is_numeric($page_num) && $page_num>0) { // Is defined the page and is numeric?
-                        $from = (($page_num-1) * $limit);
-                } else {
-                        $from = 0;
-                }
-
-                $rs = $tumble->getPosts($limit, $from);
-
-                if ($tumble->contarRegistros()>0) {
-                        $dateTmp = null;
-                        while($register = mysql_fetch_assoc($rs)) {
-								$formatedDate = gmdate("M d", strtotime($register["date"])+transform_offset($conf->offsetTime));
-                                if ( $dateTmp != null && $formatedDate == $dateTmp ) { $formatedDate = ""; } else { $dateTmp = $formatedDate; }
-								$strEnd=($conf->urlFriendly) ? "/" : "";
-								$permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
-
-								$conversation = $register["description"];
-
-								$register["description"] = $register["description"];
-
-                                $register["title"] = stripslashes($register["title"]);
-                                $register["description"] = stripslashes($register["description"]);
-
-								$postType = $tumble->getType($register["id_post"]);
-
-								$row['Date_Added'] = $formatedDate;
-								$row['Permalink'] = $permalink;
-								$theme->set('postType',$postType);
-
-                                switch ($postType){
-                                        case "1":
-                                        		$row['Title'] = $register["title"];
-                                        		$row['Body'] = $register["description"];
-                                                break;
-                                        case "2":
-                                                $fileName = "uploads/".getFileName($register["url"]);
-
-                                                $x = @getimagesize($fileName);
-                                                if ($x[0] > 500) {
-													$photoPath = $conf->urlGelato."/classes/imgsize.php?w=500&img=".$register["url"];
-                                                } else {
-													$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
-                                                }
-
-												$effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
-
-												$row['PhotoURL'] = $photoPath;
-												$row['PhotoAlt'] = strip_tags($register["description"]);
-												$row['Caption'] = $register["description"];
-												$row['Effect'] = $effect;
-                                                break;
-                                        case "3":
-                                        		$row['Quote'] = $register["description"];
-                                        		$row['Source'] = $register["title"];
-                                                break;
-                                        case "4":
-                                                if($conf->shorten_links){
-													$register["url"] = _file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]);
-												}
-												$register["title"] = ($register["title"]=="")? $register["url"] : $register["title"];
-
-												$row['URL'] = $register["url"];
-												$row['Name'] = $register["title"];
-												$row['Description'] = $register["description"];
-                                                break;
-                                        case "5":
-                                        		$row['Title'] = $register["title"];
-                                        		$row['Conversation'] = $tumble->formatConversation($conversation);
-                                                break;
-                                        case "6":
-                                        		$row['Video'] = $tumble->getVideoPlayer($register["url"]);
-                                        		$row['Caption'] = $register["description"];
-                                                break;
-                                        case "7":
-                                        		$row['Mp3'] = $tumble->getMp3Player($register["url"]);
-                                        		$row['Caption'] = $register["description"];
-                                                break;
-                                }
-
-								$comment = new comments();
-								$noComments = $comment->countComments($register["id_post"]);
-
-								$user = new user();
-								$username = $user->getUserByID($register["id_user"]);
-
-								$row['User'] = $username["name"];
-								$row['Comments_Number'] = $noComments;
-
-								$rows[] = $row;
-                        }
-
-						$theme->set('rows',$rows);
-
-                        $p = new pagination;
-                        $p->Items($tumble->getPostsNumber());
-                        $p->limit($limit);
-						if($conf->urlFriendly){
-								$p->urlFriendly('[...]');
-								$p->target($conf->urlGelato."/page/[...]");
-							}else
-								$p->target($conf->urlGelato);
-
-                        $p->currentPage(isset($page_num) ? $page_num : 1);
-
-                        $theme->set('pagination',$p->getPagination());
-                } else {
-                        $theme->set('error','No posts in this tumblelog.');
-                }
-        } else {
-                $register = $tumble->getPost($id_post);
-
-				$formatedDate = gmdate("M d", strtotime($register["date"])+transform_offset($conf->offsetTime));
-				$strEnd=($conf->urlFriendly) ? "/" : "";
-				$permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
-
-				$conversation = $register["description"];
-
-				$register["description"] = $register["description"];
-
-				$register["title"] = stripslashes($register["title"]);
-                $register["description"] = stripslashes($register["description"]);
-
-				$row['Date_Added'] = $formatedDate;
-				$row['Permalink'] = $permalink;
-				$postType = $tumble->getType($register["id_post"]);
-				$theme->set('postType',$postType);
-                switch ($postType) {
-                        case "1":
-								$row['Title'] = $register["title"];
-								$row['Body'] = $register["description"];
-                                break;
-                        case "2":
-                                $fileName = "uploads/".getFileName($register["url"]);
-
-                                $x = @getimagesize($fileName);
-                                if ($x[0] > 500) {
-                                        $photoPath = $conf->urlGelato."/classes/imgsize.php?w=500&img=".$register["url"];
-                                } else {
-										$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
-                                }
-
-								$effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
-
-								$row['PhotoURL'] = $photoPath;
-								$row['PhotoAlt'] = strip_tags($register["description"]);
-								$row['Caption'] = $register["description"];
-								$row['Effect'] = $effect;
-                                break;
-                        case "3":
-								$row['Quote'] = $register["description"];
-                                $row['Source'] = $register["title"];
-                                break;
-                        case "4":
-                                if($conf->shorten_links){
-									$register["url"] = _file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]);
-								}
-								$row['URL'] = $register["url"];
-								$row['Name'] = $register["title"];
-								$row['Description'] = $register["description"];
-                                break;
-                        case "5":
-								$row['Title'] = $register["title"];
-								$row['Conversation'] = $tumble->formatConversation($conversation);
-								break;
-						case "6":
-								$row['Video'] = $tumble->getVideoPlayer($register["url"]);
-								$row['Caption'] = $register["description"];
-								break;
-						case "7":
-								$row['Mp3'] = $tumble->getMp3Player($register["url"]);
-								$row['Caption'] = $register["description"];
-								break;
-                }
-
-				if ($conf->allowComments) {
-
-					$comment = new comments();
-					$rsComments = $comment->getComments($register["id_post"]);
-
-					$user = new user();
-					$username = $user->getUserByID($register["id_user"]);
-
-					$row['User'] = $username["name"];
-
-					$textile = new Textile();
-					if (empty($register["title"])) {
-						if (!empty($register["description"])) {
-							if (strlen($register["description"]) > 30) {
-								$postTitle = substr($register["description"], 0, 30)."...";
-							}
-						}
-					} else {
-						$postTitle = $register["title"];
-					}
-					$postTitle = strip_tags($textile->TextileThis($postTitle));
-
-					$row['Post_Title'] = $postTitle;
-					$row['Comments_Number'] = $comment->countComments($register["id_post"]);
-
-					$rows[] = $row;
-					$theme->set('rows',$rows);
-
-					$comments = array();
-					while($rowComment = mysql_fetch_assoc($rsComments)) {
-						$commentAuthor = ($rowComment["web"]=="") ? $rowComment["username"] : "<a href=\"".$rowComment["web"]."\" rel=\"external\">".$rowComment["username"]."</a>";
-
-						$answers['Id_Comment'] = $rowComment["id_comment"];
-						$answers['Comment_Author'] = $commentAuthor;
-						$answers['Date'] = gmdate("d.m.y", strtotime($rowComment["comment_date"])+transform_offset($conf->offsetTime));
-						$answers['Comment'] = $rowComment["content"];
-
-						$comments[] = $answers;
-					}
-					$theme->set('comments',$comments);
-
-					$whois['User_Cookie'] = isset($_COOKIE['cookie_gel_user'])?$_COOKIE['cookie_gel_user']:'';
-					$whois['Email_Cookie'] = isset($_COOKIE['cookie_gel_email'])?$_COOKIE['cookie_gel_email']:'';
-					$whois['Web_Cookie'] = isset($_COOKIE['cookie_gel_web'])?$_COOKIE['cookie_gel_web']:'';
-					$whois['Id_Post'] = $register["id_post"];
-
-					$theme->set('Date_Added',gmmktime());
-					$theme->set('Form_Action',$conf->urlGelato."/admin/comments.php");
-					$theme->set('whois',$whois);
-				}
-        }
-
-        $theme->set('URL_Tumble',$conf->urlGelato);
-		$theme->display(Absolute_Path.'themes/'.$conf->template.'/index.htm');
-?>
+<?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
+
+// Received a valid request, better start setting globals we'll need throughout the app in entry.php
+require_once('entry.php');
+global $user, $tumble, $conf;
+
+$theme = new themes;
+        // My approach to MVC
+
+        if(isset($_SERVER['PATH_INFO'])) $param_url = explode("/",$_SERVER['PATH_INFO']);
+
+        if (isset($_GET["post"])) {
+                $id_post = $_GET["post"];
+                if (!is_numeric($id_post) || $id_post < 1 ){
+                	header("Location: index.php");
+                }
+        } else {
+                if (isset($param_url[1]) && $param_url[1]=="post") {
+                        $id_post = (isset($param_url[2])) ? ((is_numeric($param_url[2])) ? $param_url[2] : NULL) : NULL;
+                } else {
+                        $id_post = NULL;
+                }
+        }
+
+        $theme->set('id_post',$id_post);
+	$theme->set('error','');
+
+        if (isset($_GET["page"])) {
+                $page_num = $_GET["page"];
+        } else {
+                if (isset($param_url[1]) && $param_url[1]=="page") {
+                        $page_num = (isset($param_url[2])) ? ((is_numeric($param_url[2])) ? $param_url[2] : NULL) : NULL;
+                } else {
+                        $page_num = NULL;
+                }
+        }
+
+        $gelato_includes = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n";
+        $gelato_includes .= "\t<meta name=\"generator\" content=\"gelato  ".codeName()." (".version().")\" />\n";
+        $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
+        $gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n";
+        $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
+        $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/admin/css/lightbox.css\" />\n";
+        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/jquery.js\"></script>\n";
+        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/lightbox.js\"></script>";
+
+		$page_title = $conf->title;
+		$page_title_divisor = " &raquo; "; // it should be set in configuration
+		$page_title_len = 50; // it should be set in configuration
+		if ($id_post) {
+			$register = $tumble->getPost($id_post);
+			$textile = new Textile();
+			if (empty($register["title"])) {
+				if (!empty($register["description"])) {
+					if (strlen($register["description"]) > $page_title_len) {
+						$page_title_data = substr($register["description"], 0, $page_title_len)."...";
+					}
+				}
+			} else {
+				$page_title_data = $register["title"];
+			}
+			$page_title_data = strip_tags($textile->TextileThis($page_title_data));
+			if (!empty($page_title_data)) {
+				$page_title .= $page_title_divisor.stripslashes($page_title_data);
+			}
+		}
+
+		$theme->set('Gelato_includes',$gelato_includes);
+		$theme->set('Title',$conf->title);
+		$theme->set('Page_Title',$page_title);
+		$theme->set('Description',$conf->description);
+		$theme->set('URL_Tumble',$conf->urlGelato);
+		$theme->set('Template_name',$conf->template);
+
+		$theme->set('isAuthenticated',$user->isAuthenticated());
+        if($user->isAuthenticated()){
+			$theme->set('User',$_SESSION["user_login"]);
+			$theme->set('URL_Tumble',$conf->urlGelato);
+        }
+
+		$rows = array();
+        if(!$id_post){
+                $limit=$conf->postLimit;
+
+                if(isset($page_num) && is_numeric($page_num) && $page_num>0) { // Is defined the page and is numeric?
+                        $from = (($page_num-1) * $limit);
+                } else {
+                        $from = 0;
+                }
+
+                $rs = $tumble->getPosts($limit, $from);
+
+                if ($tumble->contarRegistros()>0) {
+                        $dateTmp = null;
+                        while($register = mysql_fetch_assoc($rs)) {
+								$formatedDate = gmdate("M d", strtotime($register["date"])+transform_offset($conf->offsetTime));
+                                if ( $dateTmp != null && $formatedDate == $dateTmp ) { $formatedDate = ""; } else { $dateTmp = $formatedDate; }
+								$strEnd=($conf->urlFriendly) ? "/" : "";
+								$permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
+
+								$conversation = $register["description"];
+
+								$register["description"] = $register["description"];
+
+                                $register["title"] = stripslashes($register["title"]);
+                                $register["description"] = stripslashes($register["description"]);
+
+								$postType = $tumble->getType($register["id_post"]);
+
+								$row['Date_Added'] = $formatedDate;
+								$row['Permalink'] = $permalink;
+								$row['postType'] = $postType;
+
+                                switch ($postType){
+                                        case "1":
+                                        		$row['Title'] = $register["title"];
+                                        		$row['Body'] = $register["description"];
+                                                break;
+                                        case "2":
+                                                $fileName = "uploads/".getFileName($register["url"]);
+
+                                                $x = @getimagesize($fileName);
+                                                if ($x[0] > 500) {
+													$photoPath = $conf->urlGelato."/classes/imgsize.php?w=500&img=".$register["url"];
+                                                } else {
+													$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
+                                                }
+
+												$effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
+
+												$row['PhotoURL'] = $photoPath;
+												$row['PhotoAlt'] = strip_tags($register["description"]);
+												$row['Caption'] = $register["description"];
+												$row['Effect'] = $effect;
+                                                break;
+                                        case "3":
+                                        		$row['Quote'] = $register["description"];
+                                        		$row['Source'] = $register["title"];
+                                                break;
+                                        case "4":
+                                                if($conf->shorten_links){
+													$register["url"] = _file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]);
+												}
+												$register["title"] = ($register["title"]=="")? $register["url"] : $register["title"];
+
+												$row['URL'] = $register["url"];
+												$row['Name'] = $register["title"];
+												$row['Description'] = $register["description"];
+                                                break;
+                                        case "5":
+                                        		$row['Title'] = $register["title"];
+                                        		$row['Conversation'] = $tumble->formatConversation($conversation);
+                                                break;
+                                        case "6":
+                                        		$row['Video'] = $tumble->getVideoPlayer($register["url"]);
+                                        		$row['Caption'] = $register["description"];
+                                                break;
+                                        case "7":
+                                        		$row['Mp3'] = $tumble->getMp3Player($register["url"]);
+                                        		$row['Caption'] = $register["description"];
+                                                break;
+                                }
+
+								$comment = new comments();
+								$noComments = $comment->countComments($register["id_post"]);
+
+								$user = new user();
+								$username = $user->getUserByID($register["id_user"]);
+
+								$row['User'] = $username["name"];
+								$row['Comments_Number'] = $noComments;
+
+								$rows[] = $row;
+                        }
+
+						$theme->set('rows',$rows);
+
+                        $p = new pagination;
+                        $p->Items($tumble->getPostsNumber());
+                        $p->limit($limit);
+						if($conf->urlFriendly){
+								$p->urlFriendly('[...]');
+								$p->target($conf->urlGelato."/page/[...]");
+							}else
+								$p->target($conf->urlGelato);
+
+                        $p->currentPage(isset($page_num) ? $page_num : 1);
+
+                        $theme->set('pagination',$p->getPagination());
+                } else {
+                        $theme->set('error','No posts in this tumblelog.');
+                }
+        } else {
+                $register = $tumble->getPost($id_post);
+
+				$formatedDate = gmdate("M d", strtotime($register["date"])+transform_offset($conf->offsetTime));
+				$strEnd=($conf->urlFriendly) ? "/" : "";
+				$permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
+
+				$conversation = $register["description"];
+
+				$register["description"] = $register["description"];
+
+				$register["title"] = stripslashes($register["title"]);
+                $register["description"] = stripslashes($register["description"]);
+
+				$row['Date_Added'] = $formatedDate;
+				$row['Permalink'] = $permalink;
+				$postType = $tumble->getType($register["id_post"]);
+				$theme->set('postType',$postType);
+                switch ($postType) {
+                        case "1":
+								$row['Title'] = $register["title"];
+								$row['Body'] = $register["description"];
+                                break;
+                        case "2":
+                                $fileName = "uploads/".getFileName($register["url"]);
+
+                                $x = @getimagesize($fileName);
+                                if ($x[0] > 500) {
+                                        $photoPath = $conf->urlGelato."/classes/imgsize.php?w=500&img=".$register["url"];
+                                } else {
+										$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
+                                }
+
+								$effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
+
+								$row['PhotoURL'] = $photoPath;
+								$row['PhotoAlt'] = strip_tags($register["description"]);
+								$row['Caption'] = $register["description"];
+								$row['Effect'] = $effect;
+                                break;
+                        case "3":
+								$row['Quote'] = $register["description"];
+                                $row['Source'] = $register["title"];
+                                break;
+                        case "4":
+                                if($conf->shorten_links){
+									$register["url"] = _file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]);
+								}
+								$row['URL'] = $register["url"];
+								$row['Name'] = $register["title"];
+								$row['Description'] = $register["description"];
+                                break;
+                        case "5":
+								$row['Title'] = $register["title"];
+								$row['Conversation'] = $tumble->formatConversation($conversation);
+								break;
+						case "6":
+								$row['Video'] = $tumble->getVideoPlayer($register["url"]);
+								$row['Caption'] = $register["description"];
+								break;
+						case "7":
+								$row['Mp3'] = $tumble->getMp3Player($register["url"]);
+								$row['Caption'] = $register["description"];
+								break;
+                }
+
+				if ($conf->allowComments) {
+
+					$comment = new comments();
+					$rsComments = $comment->getComments($register["id_post"]);
+
+					$user = new user();
+					$username = $user->getUserByID($register["id_user"]);
+
+					$row['User'] = $username["name"];
+
+					$textile = new Textile();
+					if (empty($register["title"])) {
+						if (!empty($register["description"])) {
+							if (strlen($register["description"]) > 30) {
+								$postTitle = substr($register["description"], 0, 30)."...";
+							}
+						}
+					} else {
+						$postTitle = $register["title"];
+					}
+					$postTitle = strip_tags($textile->TextileThis($postTitle));
+
+					$row['Post_Title'] = $postTitle;
+					$row['Comments_Number'] = $comment->countComments($register["id_post"]);
+
+					$rows[] = $row;
+					$theme->set('rows',$rows);
+
+					$comments = array();
+					while($rowComment = mysql_fetch_assoc($rsComments)) {
+						$commentAuthor = ($rowComment["web"]=="") ? $rowComment["username"] : "<a href=\"".$rowComment["web"]."\" rel=\"external\">".$rowComment["username"]."</a>";
+
+						$answers['Id_Comment'] = $rowComment["id_comment"];
+						$answers['Comment_Author'] = $commentAuthor;
+						$answers['Date'] = gmdate("d.m.y", strtotime($rowComment["comment_date"])+transform_offset($conf->offsetTime));
+						$answers['Comment'] = $rowComment["content"];
+
+						$comments[] = $answers;
+					}
+					$theme->set('comments',$comments);
+
+					$whois['User_Cookie'] = isset($_COOKIE['cookie_gel_user'])?$_COOKIE['cookie_gel_user']:'';
+					$whois['Email_Cookie'] = isset($_COOKIE['cookie_gel_email'])?$_COOKIE['cookie_gel_email']:'';
+					$whois['Web_Cookie'] = isset($_COOKIE['cookie_gel_web'])?$_COOKIE['cookie_gel_web']:'';
+					$whois['Id_Post'] = $register["id_post"];
+
+					$theme->set('Date_Added',gmmktime());
+					$theme->set('Form_Action',$conf->urlGelato."/admin/comments.php");
+					$theme->set('whois',$whois);
+				}
+        }
+
+        $theme->set('URL_Tumble',$conf->urlGelato);
+		$theme->display(Absolute_Path.'themes/'.$conf->template.'/index.htm');
+?>
\ No newline at end of file
diff --git a/themes/tumblr/index.htm b/themes/tumblr/index.htm
index 146eb11..d1768ae 100644
--- a/themes/tumblr/index.htm
+++ b/themes/tumblr/index.htm
@@ -37,7 +37,7 @@
 				<div class="date">
 					{$row.Date_Added}
 				</div>
-				{if {$postType}==1}
+				{if {$row.postType}==1}
 					<div class="post">
 						<a href="{$row.Permalink}"><img src="{URL_Tumble}/themes/tumblr/img/link.gif" class="permalink" alt="Permalink"/></a>
 
@@ -46,7 +46,7 @@
 							{$row.Body}
 						</div>
 					</div>
-				{elseif {$postType}==2}
+				{elseif {$row.postType}==2}
 					<div class="post">
 						<a href="{$row.Permalink}"><img src="{URL_Tumble}/themes/tumblr/img/link.gif" class="permalink" alt="Permalink"/></a>
 						<div class="photo">
@@ -54,7 +54,7 @@
 							<div class="caption">{$row.Caption}</div>
 						</div>
 					</div>
-				{elseif {$postType}==3}
+				{elseif {$row.postType}==3}
 					<div class="post">
 						<a href="{$row.Permalink}"><img src="{URL_Tumble}/themes/tumblr/img/link.gif" class="permalink" alt="Permalink"/></a>
 						<div class="quote">
@@ -62,7 +62,7 @@
 							<div class="source">&mdash; {$row.Source}</div>
 						</div>
 					</div>
-				{elseif {$postType}==4}
+				{elseif {$row.postType}==4}
 					<div class="post">
 						<a href="{$row.Permalink}"><img src="{URL_Tumble}/themes/tumblr/img/link.gif" class="permalink" alt="Permalink"/></a>
 							<div class="link">
@@ -70,7 +70,7 @@
 							<div class="description">{$row.Description}</div>
 						</div>
 					</div>
-				{elseif {$postType}==5}
+				{elseif {$row.postType}==5}
 					<div class="post">
 						<a href="{$row.Permalink}"><img src="{URL_Tumble}/themes/tumblr/img/link.gif" class="permalink" alt="Permalink"/></a>
 						<div class="conversation">
@@ -78,7 +78,7 @@
 							{$row.Conversation}
 						</div>
 					</div>
-				{elseif {$postType}==6}
+				{elseif {$row.postType}==6}
 					<div class="post">
 						<a href="{$row.Permalink}"><img src="{URL_Tumble}/themes/tumblr/img/link.gif" class="permalink" alt="Permalink"/></a>
 						<div class="video">
@@ -86,7 +86,7 @@
 							<div class="caption">{$row.Caption}</div>
 						</div>
 					</div>
-				{elseif {$postType}==7}
+				{elseif {$row.postType}==7}
 					<div class="post">
 						<a href="{$row.Permalink}"><img src="{URL_Tumble}/themes/tumblr/img/link.gif" class="permalink" alt="Permalink"/></a>
 						<div class="video">