diff --git a/index.php b/index.php
index c72e614..cb07328 100644
--- a/index.php
+++ b/index.php
@@ -48,16 +48,13 @@ $theme = new themes;
                 }
         }
 
-        $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>";
-		
-		
+		$feed_url = $conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php");
+		$trigger->call('feed_url');
+		$theme->set('rssFeed',"\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$feed_url."\"/>\n");
+
+        $gelato_includes = "<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\n";
+        $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />";
+
 		$page_title = $conf->title;
 		$page_title_divisor = " &raquo; "; // it should be set in configuration
 		$page_title_len = 50; // it should be set in configuration
@@ -76,7 +73,7 @@ $theme = new themes;
 				$page_title .= $page_title_divisor.stripslashes($page_title_data);
 			}
 		}
-		
+
 		$trigger->call('gelato_includes');
 		$theme->set('Gelato_includes',$gelato_includes);
 		$theme->set('Title',$conf->title);
diff --git a/themes/tumblr/index.htm b/themes/tumblr/index.htm
index 1773d56..2be014e 100644
--- a/themes/tumblr/index.htm
+++ b/themes/tumblr/index.htm
@@ -1,8 +1,13 @@
 <!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" xml:lang="en" lang="en">
-<head>
-	{Gelato_includes}
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	{Gelato_includes}
+	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/themes/{Template_name}/style.css"/>
+	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/jquery.js"></script>
+	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/lightbox.js"></script>
+	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/admin/css/lightbox.css" />
     <title>{Page_Title}</title>
     <!--[if IE]>
         <style type="text/css">
@@ -81,7 +86,7 @@
 					<h3>{__("Posted by")} {$row.User} {if {$allowComments}}- <a href="{$row.Permalink}#comments">( {$row.Comments_Number} ) {__("comments")}{/if}</a></h3>
 				</div>
 			{/if}
-			
+
 		{/block}
 
 		{if {$id_post}}