diff --git a/upload/config.php b/upload/config.php
index 0137e0ddf..e631a7ef9 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -141,8 +141,8 @@ if (isset($_SERVER['HTTP_CF_CONNECTING_IP']))
 }
 
 // Increase number after changing js or css
-$bb_cfg['js_ver']             = 1;
-$bb_cfg['css_ver']            = 1;
+$bb_cfg['js_ver']             = 2;
+$bb_cfg['css_ver']            = 2;
 
 // Backup
 $bb_cfg['db_backup_shell_cmd']     = '';           // '/path/to/db_backup.sh 2>&1'
@@ -600,7 +600,7 @@ $bb_cfg['captcha'] = array(
 // Atom feed
 $bb_cfg['atom'] = array(
 	'path' => BB_PATH .'/atom/',
-	'url'  => "http://{$domain_name}/atom",
+	'url'  => './atom',
 );
 
 define('BB_CFG_LOADED', true);
\ No newline at end of file
diff --git a/upload/language/en/main.php b/upload/language/en/main.php
index 5d1cb75db..13b9af5ad 100644
--- a/upload/language/en/main.php
+++ b/upload/language/en/main.php
@@ -135,7 +135,8 @@ $lang['SEARCH_SELF_BY_LAST'] = 'last post time';
 $lang['SEARCH_SELF_BY_MY'] = 'my post time';
 $lang['SEARCH_UNANSWERED'] = 'View unanswered posts';
 $lang['SEARCH_UNANSWERED_SHORT'] = 'unanswered';
-$lang['SEARCH_LATEST'] = 'latest';
+$lang['SEARCH_LATEST'] = 'Latest topics';
+$lang['LATEST_RELEASES'] = 'Latest releases';
 
 $lang['REGISTER'] = 'Register';
 $lang['PROFILE'] = 'Profile';
@@ -1227,7 +1228,7 @@ $lang['SEL_CHAPTERS'] = 'Link to the selected partitions';
 $lang['NOT_SEL_CHAPTERS'] = 'You have not selected topics';
 $lang['SEL_CHAPTERS_HELP'] = 'You can select a maximum %s partition';
 $lang['HIDE_CONTENTS'] = 'Hide the contents of {...}';
-$lang['FILTER_BY_NAME'] = '<i>filter by name </i>';
+$lang['FILTER_BY_NAME'] = '<i>Filter by name </i>';
 
 $lang['BT_ONLY_ACTIVE'] = 'Active';
 $lang['BT_ONLY_MY'] = 'My releases';
diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php
index 0a19d4f7f..0799e78f0 100644
--- a/upload/language/ru/main.php
+++ b/upload/language/ru/main.php
@@ -135,7 +135,8 @@ $lang['SEARCH_SELF_BY_LAST'] = 'времени последнего сообще
 $lang['SEARCH_SELF_BY_MY'] = 'времени моего сообщения';
 $lang['SEARCH_UNANSWERED'] = 'Сообщения без ответов';
 $lang['SEARCH_UNANSWERED_SHORT'] = 'без ответов';
-$lang['SEARCH_LATEST'] = 'Последние';
+$lang['SEARCH_LATEST'] = 'Последние темы';
+$lang['LATEST_RELEASES'] = 'Последние раздачи';
 
 $lang['REGISTER'] = 'Регистрация';
 $lang['PROFILE'] = 'Профиль';
@@ -1227,7 +1228,7 @@ $lang['SEL_CHAPTERS'] = 'Ссылка на выбранные разделы';
 $lang['NOT_SEL_CHAPTERS'] = 'Вы не выбрали разделы';
 $lang['SEL_CHAPTERS_HELP'] = 'Вы можете выбрать максимум %s разделов';
 $lang['HIDE_CONTENTS'] = 'Скрыть содержимое {...}';
-$lang['FILTER_BY_NAME'] = '<i>фильтр по названию</i>';
+$lang['FILTER_BY_NAME'] = '<i>Фильтр по названию</i>';
 
 $lang['BT_ONLY_ACTIVE'] = 'Активные (есть сидер или личер)';
 $lang['BT_ONLY_MY'] = 'Мои раздачи';
diff --git a/upload/language/ua/main.php b/upload/language/ua/main.php
index 966e2cfcb..57370431b 100644
--- a/upload/language/ua/main.php
+++ b/upload/language/ua/main.php
@@ -135,7 +135,8 @@ $lang['SEARCH_SELF_BY_LAST'] = 'з часу останнього повідом
 $lang['SEARCH_SELF_BY_MY'] = 'з часу мого повідомлення';
 $lang['SEARCH_UNANSWERED'] = 'Повідомлення без відповідей';
 $lang['SEARCH_UNANSWERED_SHORT'] = 'без відповідей';
-$lang['SEARCH_LATEST'] = 'Останні';
+$lang['SEARCH_LATEST'] = 'Останні теми';
+$lang['LATEST_RELEASES'] = 'Останні роздачі';
 
 $lang['REGISTER'] = 'Реєстрація';
 $lang['PROFILE'] = 'Профіль';
@@ -1227,7 +1228,7 @@ $lang['SEL_CHAPTERS'] = 'Посилання на вибрані розділи';
 $lang['NOT_SEL_CHAPTERS'] = 'Ви не вибрали розділи';
 $lang['SEL_CHAPTERS_HELP'] = 'Ви можете вибрати максимум %s розділів';
 $lang['HIDE_CONTENTS'] = 'Приховати вміст {...}';
-$lang['FILTER_BY_NAME'] = '<i>фільтрувати за назвою</i>';
+$lang['FILTER_BY_NAME'] = '<i>Фільтрувати за назвою</i>';
 
 $lang['BT_ONLY_ACTIVE'] = 'Активні (є сидер або лічер)';
 $lang['BT_ONLY_MY'] = 'Мої роздачі';
diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css
index 88d219763..f09322839 100644
--- a/upload/templates/default/css/main.css
+++ b/upload/templates/default/css/main.css
@@ -732,6 +732,8 @@ td.last_td      { border-right-width: 0 !important; }
 #online_explain { float: right; }
 #online_userlist a { white-space: nowrap; }
 #forums_top_nav { display: none; }
+
+.f-map-wrap { margin-top: -1px; border: 1px solid #DEDEDE; }
 /* ---------------------------------- *
      Forums on viewforum page
  * ---------------------------------- */
diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl
index de6de384c..2f3d3a12b 100644
--- a/upload/templates/default/index.tpl
+++ b/upload/templates/default/index.tpl
@@ -12,10 +12,10 @@
 <!-- IF LOGGED_IN -->
 <div id="forums_top_links">
 	<div class="floatL">
-		<a href="{U_SEARCH_NEW}" class="med">{L_SEARCH_NEW}</a> &#0183;
-		<a href="{U_SEARCH_SELF_BY_LAST}" class="med">{L_SEARCH_SELF}</a> <a href="#search-my-posts" class="menu-root menu-alt1">{OPEN_MENU_IMG_ALT}</a> &#0183;
 		<a href="{U_SEARCH_LATEST}" class="med">{L_SEARCH_LATEST}</a> &#0183;
-		<a href="{U_INDEX}?map=1" class="med bold">{FEED_IMG_ALT} {L_FORUM_MAP}</a>
+		<a href="{U_SEARCH_SELF_BY_LAST}" class="med">{L_SEARCH_SELF}</a> <a href="#search-my-posts" class="menu-root menu-alt1">{OPEN_MENU_IMG_ALT}</a> &#0183;
+		<a href="{SITE_URL}atom/f/0.atom" class="med">{FEED_IMG} {L_LATEST_RELEASES}</a> &#0183;
+		<a href="{U_INDEX}?map=1" class="med bold">{FEED_IMG} {L_FORUM_MAP}</a>
 	</div>
 	<div class="floatR med bold">
 		<a class="menu-root" href="#only-new-options">{L_DISPLAYING_OPTIONS}</a>
@@ -154,6 +154,7 @@
 
 <!-- IF LOGGED_IN and SHOW_FORUMS -->
 <div id="mark_all_forums_read">
+	<a href="{U_SEARCH_NEW}" class="med">{L_SEARCH_NEW}</a> &#0183;
 	<a href="{U_INDEX}" class="med" onclick="setCookie('{COOKIE_MARK}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a>
 </div>
 <!-- ENDIF -->
diff --git a/upload/templates/default/index_map.tpl b/upload/templates/default/index_map.tpl
index b5fdd5a19..d78f82101 100644
--- a/upload/templates/default/index_map.tpl
+++ b/upload/templates/default/index_map.tpl
@@ -1,15 +1,16 @@
 <style type="text/css">
-#f-map a  { font-size: 12px; text-decoration: none; }
+#f-map a  { font-size: 12px; text-decoration: none; padding-left: 8px; }
 #f-map li { margin: 4px 0 0 6px; }
 #f-map .b { font-weight: bold; }
 ul.tree-root { margin-left: 0; }
-ul.tree-root ul > li { list-style: disc; }
-ul.tree-root ul ul > li { list-style: circle; }
-ul.tree-root > li { list-style: none !important; padding: 0; margin-left: 0 !important; }
+ul.tree-root > li > ul { margin-left: 0; }
+ul.tree-root li { list-style: none; }
+ul.tree-root > li { padding: 0; margin-left: 0 !important; }
 .c_title {
-	display: block; margin: 9px 0; padding: 0 0 5px 3px; border-bottom: 1px solid #B7C0C5;
+	display: block; margin: 9px 0; padding: 0 0 5px 5px; border-bottom: 1px solid #B7C0C5;
 	color: #800000; font-size: 13px; font-weight: bold; letter-spacing: 1px;
 }
+ul.tree-root img   { cursor: pointer; }
 a.hl, a.hl:visited { color: #1515FF; }
 </style>
 
@@ -26,6 +27,11 @@ function qs_highlight_found ()
 		a.className = '';
 	}
 }
+function open_feed (f_id)
+{
+	$('#feed-id').val(f_id);
+	$('#feed-form').submit();
+}
 $(function(){
 	$('#q-search').focus().quicksearch('#f-map li', {
 		delay     : 300,
@@ -33,17 +39,27 @@ $(function(){
 		show      : qs_highlight_found,
 		onAfter   : function(){ $('#f-load').hide(); $('#f-map').show(); }
 	});
-	$.each($('#f-map a'), function(i,a){
-		$(a).attr('href', 'viewforum.php?f='+ $(a).attr('href'));
+	$.each($('#f-map a'), function(i,a) {
+		var f_id = $(a).attr('href');
+		$(a)
+			.attr('href', 'viewforum.php?f='+ f_id)
+			.before('<img class="feed-small" src="{IMG}feed.png" alt="feed" onclick="open_feed('+ f_id +')">')
+		;
 	});
-	$.each($('span.c_title'), function(i,el){
+	$.each($('span.c_title'), function(i,el) {
 		$(el).text( this.title );
 		this.title = '';
 	});
 });
 </script>
 
-<div class="row1 pad_8 border bw_TRBL" style="margin-top: 4px;">
+<form id="feed-form" method="post" action="feed.php" target="_blank" style="display: none;">
+	<input type="hidden" name="mode" value="get_feed_url">
+	<input type="hidden" name="type" value="f">
+	<input id="feed-id" type="hidden" name="id" value="">
+</form>
+
+<div class="f-map-wrap row1 pad_8">
 	<div style="margin: 20px 56px;">
 		<div style="padding: 0 0 12px 3px;">
 			<form autocomplete="off">
@@ -55,20 +71,29 @@ $(function(){
 		<div id="f-map" style="display: none;">
 			<!-- BEGIN c -->
 			<ul class="tree-root">
-				<li><span class="b"><span class="c_title" title="{c.CAT_TITLE}" name="{c.CAT_TITLE}"></span></span>
-				<!-- BEGIN f -->
-				<ul>
-					<li><span class="b"><a href="{c.f.FORUM_ID}">{c.f.FORUM_NAME}</a></span>
-						<!-- IF c.f.LAST_SF_ID -->
-						<ul>
-							<!-- BEGIN sf -->
-							<li><span><a href="{c.f.sf.SF_ID}">{c.f.sf.SF_NAME}</a></span></li>
-							<!-- END sf -->
-						</ul>
-						<!-- ENDIF -->
-					</li>
-				</ul>
-				<!-- END f -->
+				<li>
+					<span class="b">
+						<span class="c_title" title="{c.CAT_TITLE}"></span>
+					</span>
+					<!-- BEGIN f -->
+					<ul>
+						<li>
+							<span class="b">
+								<a href="{c.f.FORUM_ID}">{c.f.FORUM_NAME}</a>
+							</span>
+							<!-- IF c.f.LAST_SF_ID -->
+							<ul>
+								<!-- BEGIN sf -->
+								<li>
+									<span><a href="{c.f.sf.SF_ID}">{c.f.sf.SF_NAME}</a></span>
+								</li>
+								<!-- END sf -->
+							</ul>
+							<!-- ENDIF -->
+						</li>
+					</ul>
+					<!-- END f -->
+				</li>
 			</ul>
 			<!-- END c -->
 		</div>
diff --git a/upload/templates/default/tpl_config.php b/upload/templates/default/tpl_config.php
index 4788f60a8..96b4f72ec 100644
--- a/upload/templates/default/tpl_config.php
+++ b/upload/templates/default/tpl_config.php
@@ -123,13 +123,13 @@ $template->assign_vars(array(
 	'IMG'                         => $_main,
 	'TEXT_BUTTONS'                => $bb_cfg['text_buttons'],
 	'POST_BTN_SPACER'             => ($bb_cfg['text_buttons']) ? '&nbsp;' : '',
-	'FEED_IMG_ALT'                => '<img src="'. $_main .'feed.png" class="feed-small" alt="a" />',
 	'TOPIC_ATTACH_ICON'           => '<img src="images/icon_clip.gif" alt="" />',
 	'OPEN_MENU_IMG_ALT'           => '<img src="'. $_main .'menu_open_1.gif" class="menu-alt1" alt="" />',
 	'TOPIC_LEFT_COL_SPACER_WITDH' => $bb_cfg['topic_left_column_witdh'] - 8, // 8px padding
 	'POST_IMG_WIDTH_DECR_JS'      => $bb_cfg['topic_left_column_witdh'] + $bb_cfg['post_img_width_decr'],
 	'ATTACH_IMG_WIDTH_DECR_JS'    => $bb_cfg['topic_left_column_witdh'] + $bb_cfg['attach_img_width_decr'],
 	'MAGNET_LINKS'                => $bb_cfg['magnet_links_enabled'],
+	'FEED_IMG'                    => '<img src="'. $_main .'feed.png" class="feed-small" alt="feed" />',
 ));
 
 // post_buttons