diff --git a/Sources/Display.php b/Sources/Display.php
index cf18cfb..143dacb 100644
--- a/Sources/Display.php
+++ b/Sources/Display.php
@@ -645,6 +645,25 @@ function Display()
 	// Set the callback.  (do you REALIZE how much memory all the messages would take?!?)
 	$context['get_message'] = 'prepareDisplayContext';
 
+	// Check if the topic is been watched by user
+	if ($user_info['is_guest']) {
+		$context['is_watched'] == false;
+	} else {
+		$result = db_query("
+			SELECT watch FROM {$db_prefix}watch_topics
+			WHERE 
+				ID_MEMBER='{$ID_MEMBER}' AND
+				ID_TOPIC='{$topic}'", 
+			__FILE__, __LINE__);
+		if(mysql_num_rows($result) == 0) {
+			$context['is_watched'] = false;
+		} else {
+			list($w) = mysql_fetch_row($result);
+			$context['is_watched'] = (bool) $w;
+		}
+	}
+	
+
 	// Basic settings.... may be converted over at some point.
 	$context['allow_hide_email'] = !empty($modSettings['allow_hideEmail']) || ($user_info['is_guest'] && !empty($modSettings['guest_hideContacts']));
 
diff --git a/Sources/Load.php b/Sources/Load.php
index ceb5a09..c5ff37e 100644
--- a/Sources/Load.php
+++ b/Sources/Load.php
@@ -526,7 +526,7 @@ function loadMemberContext($user)
 	// Set things up to be used before hand.
 	$gendertxt = $profile['gender'] == 2 ? $txt[239] : ($profile['gender'] == 1 ? $txt[238] : '');
 	$profile['signature'] = str_replace(array("\n", "\r"), array('<br />', ''), $profile['signature']);
-	$profile['signature'] = doUBBC($profile['signature']);
+	$profile['signature'] = doUBBC($profile['signature'], true, 'size,color');
 	if ($profile['warning'] == 1)
 		$warn = 'warn';
 	elseif ($profile['warning'] == 2)
diff --git a/Sources/Recent.php b/Sources/Recent.php
index ead2b99..a4e3fd2 100644
--- a/Sources/Recent.php
+++ b/Sources/Recent.php
@@ -466,10 +466,11 @@ function UnreadTopics()
 	{
 		$request = db_query("
 			SELECT COUNT(DISTINCT t.ID_TOPIC), MIN(t.ID_LAST_MSG)
-			FROM ({$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}messages AS ml, {$db_prefix}messages AS m)
+			FROM ({$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}messages AS ml, {$db_prefix}messages AS m, {$db_prefix}watch_topics as w)
 				LEFT JOIN {$db_prefix}log_topics AS lt ON (lt.ID_TOPIC = t.ID_TOPIC AND lt.ID_MEMBER = $ID_MEMBER)
 				LEFT JOIN {$db_prefix}log_mark_read AS lmr ON (lmr.ID_BOARD = t.ID_BOARD AND lmr.ID_MEMBER = $ID_MEMBER)
 			WHERE m.ID_TOPIC = t.ID_TOPIC
+				AND w.ID_TOPIC=t.ID_TOPIC AND w.ID_MEMBER=$ID_MEMBER AND w.watch=1
 				AND m.ID_MEMBER = $ID_MEMBER
 				AND ml.ID_MSG = t.ID_LAST_MSG
 				AND b.ID_BOARD = t.ID_BOARD
diff --git a/Themes/default/Display.template.php b/Themes/default/Display.template.php
index f0f4cd4..e3f1a10 100644
--- a/Themes/default/Display.template.php
+++ b/Themes/default/Display.template.php
@@ -181,18 +181,16 @@ function template_main()
 					<td align="right" style="font-size: smaller;">';
 
 	$buttonArray = array();
-	if ($context['can_reply'])
-		$buttonArray[] = '<a href="' . $scripturl . '?action=post;topic=' . $context['current_topic'] . '.' . $context['start'] . ';num_replies=' . $context['num_replies'] . '">' . ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/' . $context['user']['language'] . '/reply.gif" alt="' . $txt[146] . '" border="0" />' : $txt[146]) . '</a>';
 	if ($context['can_mark_notify'])
 		$buttonArray[] = '<a href="' . $scripturl . '?action=notify;sa=' . ($context['is_marked_notify'] ? 'off' : 'on') . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';sesc=' . $context['session_id'] . '" onclick="return confirm(\'' . ($context['is_marked_notify'] ? $txt['notification_disable_topic'] : $txt['notification_enable_topic']) . '\');">' . ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/' . $context['user']['language'] . '/notify.gif" alt="' . $txt[131] . '" border="0" />' : $txt[131]) . '</a>';
 
 	// This is a special case; if they can see mark unread, put it at the top... otherwise show add poll.
-	if ($context['user']['is_logged'] && $settings['show_mark_read'])
-		$buttonArray[] = '<a href="' . $scripturl . '?action=markasread;sa=topic;topic=' . $context['current_topic'] . '.' . $context['start'] . '">' . ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/' . $context['user']['language'] . '/markunread.gif" alt="' . $txt['mark_unread'] . '" border="0" />' : $txt['mark_unread']) . '</a>';
-	elseif ($context['can_add_poll'])
+/*	if ($context['user']['is_logged'] && $settings['show_mark_read'])
+		$buttonArray[] = '<a href="' . $scripturl . '?action=markasread;sa=topic;topic=' . $context['current_topic'] . '.' . $context['start'] . '">' . ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/' . $context['user']['language'] . '/markunread.gif" alt="' . $txt['mark_unread'] . '" border="0" />' : $txt['mark_unread']) . '</a>';*/
+	if ($context['can_add_poll'])
 		$buttonArray[] = '<a href="' . $scripturl . '?action=post;poll;msg=' . $context['topic_first_message'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';sesc=' . $context['session_id'] . '">' . ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/' . $context['user']['language'] . '/addpoll.gif" alt="' . $txt['add_poll'] . '" border="0" />' : $txt['add_poll']) . '</a>';
 
-	if ($context['can_send_topic'])
+	if (false && $context['can_send_topic'])
 		$buttonArray[] = '<a href="' . $scripturl . '?action=sendtopic;topic=' . $context['current_topic'] . '.0">' . ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/' . $context['user']['language'] . '/sendtopic.gif" alt="' . $txt[707] . '" border="0" />' : $txt[707]) . '</a>';
 	$buttonArray[] = '<a href="' . $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0" target="_blank">' . ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/' . $context['user']['language'] . '/print.gif" alt="' . $txt[465] . '" border="0" />' : $txt[465]) . '</a>';
 
@@ -238,12 +236,18 @@ function template_main()
 	<tr><td style="padding: 1px 1px 0 1px;">';
 
 		// Show the message anchor and a "new" anchor if this message is new.
-		if ($message['id'] != $context['first_message'])
+		$id = 'msg' . $message['id'];
+		if ($message['first_new'])
+			echo '
+		<a name="new"></a>';
+
+/*		if ($message['id'] != $context['first_message'])
 			echo '
 		<a name="msg', $message['id'], '"></a>', $message['first_new'] ? '<a name="new"></a>' : '';
+*/
 
 		echo '
-		<table width="100%" cellpadding="0" cellspacing="0" border="0" class="message-container">
+		<table width="100%" cellpadding="0" cellspacing="0" border="0" class="message-container" id="',$id,'">
 			<tr><td class="', $message['alternate'] == 0 ? 'windowbg' : 'windowbg2', '">';
 
 		// Show information about the poster of this message.
@@ -471,7 +475,7 @@ function template_main()
 
 		echo '
 								</td>
-								<td align="right" valign="bottom" class="smalltext">';
+								<td align="right" valign="bottom" class="smalltext syslinks">';
 		
 		if (! $ignore) {
 		// put to site
@@ -547,7 +551,7 @@ document.write('<sc'+'ript type="text/javascript" src="http://an.yandex.ru/syste
 </div>
 		<?
 		echo '</td></tr>';
-	} elseif (($context['is_sticky'] || $context['is_first_sticky']) && ($message['id']==$context['topic_first_message'])) {
+	} elseif ($message['id']==$context['topic_first_message']) {
 	    echo '<tr><td class="titlebg" style="padding: 3px 0px;">&nbsp;</td></tr>';
 	}
 	
@@ -592,7 +596,7 @@ document.write('<sc'+'ript type="text/javascript" src="http://an.yandex.ru/syste
 		</td>
 	</tr>
 </table>
-<script language="JavaScript1.2" type="text/javascript"><!--';
+<script type="text/javascript"><!--';
 
 	if (!empty($options['display_quick_reply']))
 		echo '
diff --git a/Themes/default/index.template.php b/Themes/default/index.template.php
index a090e78..510a13d 100644
--- a/Themes/default/index.template.php
+++ b/Themes/default/index.template.php
@@ -35,7 +35,7 @@ function template_main_above()
 	<meta property="og:title" content="Российский Рок-портал"/>
 	<meta property="og:image" content="http://img.rock.ru/images/logo-square.jpg"/>
 	<meta property="og:url" content="http://rock.ru/"/>
-	<script type="text/javascript" src="http://yandex.st/jquery/1.7.1/jquery.js"></script>
+	<script type="text/javascript" src="http://yandex.st/jquery/1.7.1/jquery.min.js"></script>
 	<script language="JavaScript" type="text/javascript" src="http://yandex.st/jquery/cookie/1.0/jquery.cookie.min.js"></script>
 	<script language="JavaScript" type="text/javascript" src="', $settings['default_theme_url'], '/script.js"></script>
 	<script type="text/javascript" src="http://rock.ru/ads/www/delivery/spcjs.php?id=1"></script>
@@ -74,7 +74,7 @@ function template_main_above()
 	}
 
 	echo '
-	<link id="style-width" rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/' . $style_width .'?v4" />';
+	<link id="style-width" rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/' . $style_width .'?v5" />';
 
 	// Show all the relative links, such as help, search, contents, and the like.
 	echo '
@@ -259,7 +259,9 @@ function template_main_above()
 		
 
 	echo '
-						</td></tr></table>
+	
+					</td></tr></table>';
+	echo'
 					</div>
 
 					<form name="search" action="', $scripturl, '" method="get" style="margin: 0; margin-top: 7px;">
@@ -274,7 +276,9 @@ function template_main_above()
 						<input type="hidden" name="brd[', $context['current_board'], ']" value="', $context['current_board'], '" />';
 
 	echo '
-					</form>
+					</form>';
+  
+	echo '
 
 				</td>
 			</tr>
@@ -405,12 +409,12 @@ if (! defined('MOBILE')) {
 
 	if (!empty($context['current_topic'])) 
 		echo '
-		$("td.buttons img").css("opacity", 0);
+		$("td.buttons, td.syslinks").css("opacity", 0);
 		$("table.message-container").mouseenter(function () {
-			$("td.buttons img", this).css("opacity", 1);
+			$("td.buttons, td.syslinks", this).css("opacity", 1);
 		});
 		$("table.message-container").mouseleave(function () {
-			$("td.buttons img", this).css("opacity", 0);
+			$("td.buttons, td.syslinks", this).css("opacity", 0);
 		});';
 	
 	echo '
@@ -477,12 +481,22 @@ if (! defined('MOBILE')) {
 			<li title="Новые сообщения в темах, в которые Вы писали"><a href="http://rock.ru/forum/index.php?action=unreadreplies"><img src="http://img.rock.ru/images/reply.png" alt="" />Новые ответы</a>
 			</li>
         </ul>
+<?
+        if (!empty($context['current_topic']) && $context['is_watched'] == false ) {
+?>
+        <ul class="jx-bar-button">
+			<li title="Следить за темой"><a href="http://rock.ru/forum/index.php?action=watch;id_topic=<?=$context['current_topic']?>;return=<?=urlencode("topic=".$context['current_topic'].'.'.$context['start'])?>"><img src="http://img.rock.ru/images/reply.png" alt="" />Следить за темой</a>
+			</li>
+        </ul>
+<?
+	}
+?>	
 
         <ul class="jx-bar-button-right">
 			<li title="Личные сообщения"><a href="http://rock.ru/forum/index.php?action=pm"><img src="http://img.rock.ru/images/mail.png" alt="" />(<?=$context['user']['unread_messages']?> новых)</a>
 			</li>
         </ul>
-
+	
 	<span class="jx-separator-right"></span>
 <?
 	}
diff --git a/Themes/default/style.fixed.css b/Themes/default/style.fixed.css
index dd28721..dcfdd8e 100644
--- a/Themes/default/style.fixed.css
+++ b/Themes/default/style.fixed.css
@@ -326,6 +326,9 @@ height:expression(this.offsetHeight>70 ? "70px" : "auto");
 	vertical-align: middle;
 }
 
+.message-container:target {
+	border: solid 1px red;
+}
 .message-container img {
 	max-width: 100%;
 }
diff --git a/Themes/default/style.liquid.css b/Themes/default/style.liquid.css
index 87a1361..3b7ba0b 100644
--- a/Themes/default/style.liquid.css
+++ b/Themes/default/style.liquid.css
@@ -317,6 +317,9 @@ height:expression(this.offsetHeight>70 ? "70px" : "auto");
         font-style: italic;
 }
 
+.message-container:target {
+        border: solid 1px red;
+}
 .message-container img {
 	max-width: 100%;
 }