diff --git a/templates/skin/new/topic.tpl b/templates/skin/new/topic.tpl
index 49fad867..38923fd1 100644
--- a/templates/skin/new/topic.tpl
+++ b/templates/skin/new/topic.tpl
@@ -1,72 +1,2 @@
-			
-			{assign var="oBlog" value=$oTopic->getBlog()} 
-			{assign var="oUser" value=$oTopic->getUser()}
-			{assign var="oVote" value=$oTopic->getVote()} 
-			<!-- Topic -->			
-			<div class="topic">
-				<div class="favorite {if $oUserCurrent}{if $oTopic->getIsFavourite()}active{/if}{else}fav-guest{/if}"><a href="#" onclick="lsFavourite.toggle({$oTopic->getId()},this,'topic'); return false;"></a></div>
-				<h1 class="title">
-					{if $oTopic->getPublish()==0}	
-						<img src="{cfg name='path.static.skin'}/images/topic_unpublish.gif" border="0" title="{$aLang.topic_unpublish}" width="16" height="16" alt="{$aLang.topic_unpublish}">
-					{/if}
-					{$oTopic->getTitle()|escape:'html'}
-					{if $oTopic->getType()=='link'}
-  						<img src="{cfg name='path.static.skin'}/images/link_url_big.gif" border="0" title="{$aLang.topic_link}" width="16" height="16" alt="{$aLang.topic_link}">
-  					{/if}
-				</h1>
-				<ul class="action">					
-					<li><a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>&nbsp;&nbsp;</li>						
-					{if $oUserCurrent and ($oUserCurrent->getId()==$oTopic->getUserId() or $oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getUserIsModerator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
-  						<li class="edit"><a href="{cfg name='path.root.web'}/{$oTopic->getType()}/edit/{$oTopic->getId()}/" title="{$aLang.topic_edit}">{$aLang.topic_edit}</a></li>
-  					{/if}
-					{if $oUserCurrent and ($oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
-  						<li class="delete"><a href="{router page='topic'}delete/{$oTopic->getId()}/?security_ls_key={$LIVESTREET_SECURITY_KEY}" title="{$aLang.topic_delete}" onclick="return confirm('{$aLang.topic_delete_confirm}');">{$aLang.topic_delete}</a></li>
-  					{/if}
-				</ul>				
-				<div class="content">
-				
-				
-			{if $oTopic->getType()=='question'}   
-    		
-    		<div id="topic_question_area_{$oTopic->getId()}">
-    		{if !$oTopic->getUserQuestionIsVote()} 		
-    			<ul class="poll-new">	
-				{foreach from=$oTopic->getQuestionAnswers() key=key item=aAnswer}				
-					<li><label for="topic_answer_{$oTopic->getId()}_{$key}"><input type="radio" id="topic_answer_{$oTopic->getId()}_{$key}" name="topic_answer_{$oTopic->getId()}"  value="{$key}" onchange="$('topic_answer_{$oTopic->getId()}_value').setProperty('value',this.value);"/> {$aAnswer.text|escape:'html'}</label></li>				
-				{/foreach}
-					<li>
-					<input type="submit"  value="{$aLang.topic_question_vote}" onclick="ajaxQuestionVote({$oTopic->getId()},$('topic_answer_{$oTopic->getId()}_value').getProperty('value'));">
-					<input type="submit"  value="{$aLang.topic_question_abstain}"  onclick="ajaxQuestionVote({$oTopic->getId()},-1)">
-					</li>				
-					<input type="hidden" id="topic_answer_{$oTopic->getId()}_value" value="-1">				
-				</ul>				
-				<span>{$aLang.topic_question_vote_result}: {$oTopic->getQuestionCountVote()}. {$aLang.topic_question_abstain_result}: {$oTopic->getQuestionCountVoteAbstain()}</span><br>			
-			{else}			
-				{include file='topic_question.tpl'}
-			{/if}
-			</div>
-			<br>	
-						
-    		{/if}
-				
-					{$oTopic->getText()}
-				</div>				
-				<ul class="tags">
-					{foreach from=$oTopic->getTagsArray() item=sTag name=tags_list}
-						<li><a href="{router page='tag'}{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
-					{/foreach}									
-				</ul>				
-				<ul class="voting {if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId())|| strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}{if $oTopic->getRating()>0}positive{elseif $oTopic->getRating()<0}negative{/if}{/if} {if !$oUserCurrent || $oTopic->getUserId()==$oUserCurrent->getId() || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}guest{/if} {if $oVote} voted {if $oVote->getDirection()>0}plus{elseif $oVote->getDirection()<0}minus{/if}{/if}">
-					<li class="plus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,1,'topic'); return false;"></a></li>
-					<li class="total" title="{$aLang.topic_vote_count}: {$oTopic->getCountVote()}">{if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId()) || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')} {if $oTopic->getRating()>0}+{/if}{$oTopic->getRating()} {else} <a href="#" onclick="lsVote.vote({$oTopic->getId()},this,0,'topic'); return false;">&mdash;</a> {/if}</li>
-					<li class="minus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,-1,'topic'); return false;"></a></li>
-					<li class="date">{date_format date=$oTopic->getDateAdd()}</li>
-					{if $oTopic->getType()=='link'}
-						<li class="link"><a href="{router page='link'}go/{$oTopic->getId()}/" title="{$aLang.topic_link_count_jump}: {$oTopic->getLinkCountJump()}">{$oTopic->getLinkUrl(true)}</a></li>						
-					{/if}
-					<li class="author"><a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>
-					{hook run='topic_show_info' topic=$oTopic}
-				</ul>
-			{hook run='topic_show_end' topic=$oTopic}
-			</div>
-			<!-- /Topic -->
\ No newline at end of file
+{assign var="sTopicTemplateName" value="topic_`$oTopic->getType()`.tpl"}
+{include file=$sTopicTemplateName}			
\ No newline at end of file
diff --git a/templates/skin/new/topic_link.tpl b/templates/skin/new/topic_link.tpl
new file mode 100644
index 00000000..f8484a45
--- /dev/null
+++ b/templates/skin/new/topic_link.tpl
@@ -0,0 +1,66 @@
+			
+			{assign var="oBlog" value=$oTopic->getBlog()} 
+			{assign var="oUser" value=$oTopic->getUser()}
+			{assign var="oVote" value=$oTopic->getVote()} 
+			<!-- Topic -->			
+			<div class="topic">
+				<div class="favorite {if $oUserCurrent}{if $oTopic->getIsFavourite()}active{/if}{else}fav-guest{/if}"><a href="#" onclick="lsFavourite.toggle({$oTopic->getId()},this,'topic'); return false;"></a></div>
+				<h1 class="title">
+					{if $oTopic->getPublish()==0}	
+						<img src="{cfg name='path.static.skin'}/images/topic_unpublish.gif" border="0" title="{$aLang.topic_unpublish}" width="16" height="16" alt="{$aLang.topic_unpublish}">
+					{/if}
+					<a href="{router page='link'}go/{$oTopic->getId()}/">{$oTopic->getTitle()|escape:'html'}</a>
+  						<img src="{cfg name='path.static.skin'}/images/link_url_big.gif" border="0" title="{$aLang.topic_link}" width="16" height="16" alt="{$aLang.topic_link}">
+				</h1>
+				<ul class="action">					
+					<li><a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>&nbsp;&nbsp;</li>						
+					{if $oUserCurrent and ($oUserCurrent->getId()==$oTopic->getUserId() or $oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getUserIsModerator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
+  						<li class="edit"><a href="{cfg name='path.root.web'}/{$oTopic->getType()}/edit/{$oTopic->getId()}/" title="{$aLang.topic_edit}">{$aLang.topic_edit}</a></li>
+  					{/if}
+					{if $oUserCurrent and ($oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
+  						<li class="delete"><a href="{router page='topic'}delete/{$oTopic->getId()}/?security_ls_key={$LIVESTREET_SECURITY_KEY}" title="{$aLang.topic_delete}" onclick="return confirm('{$aLang.topic_delete_confirm}');">{$aLang.topic_delete}</a></li>
+  					{/if}
+				</ul>				
+				<div class="content">
+				
+					{if $bTopicList}
+                                                    {$oTopic->getTextShort()}
+                                                    {if $oTopic->getTextShort()!=$oTopic->getText()}
+                                                        <br><br>( <a href="{$oTopic->getUrl()}#cut" title="{$aLang.topic_read_more}">
+                                                        {if $oTopic->getCutText()}
+                                                            {$oTopic->getCutText()}
+                                                        {else}
+                                                            {$aLang.topic_read_more}
+                                                        {/if}      			
+                                                        </a> )
+                                                    {/if}
+                                             {else}
+                                                    {$oTopic->getText()}
+                                                {/if}
+				</div>				
+				<ul class="tags">
+					{foreach from=$oTopic->getTagsArray() item=sTag name=tags_list}
+						<li><a href="{router page='tag'}{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
+					{/foreach}									
+				</ul>				
+				<ul class="voting {if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId())|| strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}{if $oTopic->getRating()>0}positive{elseif $oTopic->getRating()<0}negative{/if}{/if} {if !$oUserCurrent || $oTopic->getUserId()==$oUserCurrent->getId() || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}guest{/if} {if $oVote} voted {if $oVote->getDirection()>0}plus{elseif $oVote->getDirection()<0}minus{/if}{/if}">
+					<li class="plus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,1,'topic'); return false;"></a></li>
+					<li class="total" title="{$aLang.topic_vote_count}: {$oTopic->getCountVote()}">{if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId()) || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')} {if $oTopic->getRating()>0}+{/if}{$oTopic->getRating()} {else} <a href="#" onclick="lsVote.vote({$oTopic->getId()},this,0,'topic'); return false;">&mdash;</a> {/if}</li>
+					<li class="minus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,-1,'topic'); return false;"></a></li>
+					<li class="date">{date_format date=$oTopic->getDateAdd()}</li>
+						<li class="link"><a href="{router page='link'}go/{$oTopic->getId()}/" title="{$aLang.topic_link_count_jump}: {$oTopic->getLinkCountJump()}">{$oTopic->getLinkUrl(true)}</a></li>						
+					<li class="author"><a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>
+                                              {if $bTopicList}
+                                                    <li class="comments-total">
+                                                        {if $oTopic->getCountComment()>0}
+                                                            <a href="{$oTopic->getUrl()}#comments" title="{$aLang.topic_comment_read}"><span class="red">{$oTopic->getCountComment()}</span>{if $oTopic->getCountCommentNew()}<span class="green">+{$oTopic->getCountCommentNew()}</span>{/if}</a>
+                                                        {else}
+                                                            <a href="{$oTopic->getUrl()}#comments" title="{$aLang.topic_comment_add}"><span class="red">{$aLang.topic_comment_add}</span></a>
+                                                        {/if}
+                                                    </li>
+                                              {/if}
+					{hook run='topic_show_info' topic=$oTopic}
+				</ul>
+			{hook run='topic_show_end' topic=$oTopic}
+			</div>
+			<!-- /Topic -->
\ No newline at end of file
diff --git a/templates/skin/new/topic_list.tpl b/templates/skin/new/topic_list.tpl
index 9cf0bdf4..c7ab6ff2 100644
--- a/templates/skin/new/topic_list.tpl
+++ b/templates/skin/new/topic_list.tpl
@@ -3,89 +3,9 @@
 			{assign var="oBlog" value=$oTopic->getBlog()} 
 			{assign var="oUser" value=$oTopic->getUser()} 
 			{assign var="oVote" value=$oTopic->getVote()} 
-			<!-- Topic -->			
-			<div class="topic">
-				
-				<div class="favorite {if $oUserCurrent}{if $oTopic->getIsFavourite()}active{/if}{else}fav-guest{/if}"><a href="#" onclick="lsFavourite.toggle({$oTopic->getId()},this,'topic'); return false;"></a></div>
-				
-				<h1 class="title">		
-					{if $oTopic->getPublish()==0}	
-						<img src="{cfg name='path.static.skin'}/images/topic_unpublish.gif" border="0" title="{$aLang.topic_unpublish}" width="16" height="16" alt="{$aLang.topic_unpublish}">
-					{/if}			
-					<a href="{if $oTopic->getType()=='link'}{router page='link'}go/{$oTopic->getId()}/{else}{$oTopic->getUrl()}{/if}">{$oTopic->getTitle()|escape:'html'}</a>
-					{if $oTopic->getType()=='link'}
-  						<img src="{cfg name='path.static.skin'}/images/link_url_big.gif" border="0" title="{$aLang.topic_link}" width="16" height="16" alt="{$aLang.topic_link}">
-  					{/if}
-				</h1>
-				<ul class="action">
-					<li><a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>&nbsp;&nbsp;</li>										
-					{if $oUserCurrent and ($oUserCurrent->getId()==$oTopic->getUserId() or $oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getUserIsModerator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
-  						<li class="edit"><a href="{cfg name='path.root.web'}/{$oTopic->getType()}/edit/{$oTopic->getId()}/" title="{$aLang.topic_edit}">{$aLang.topic_edit}</a></li>
-  					{/if}
-					{if $oUserCurrent and ($oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
-							<li class="delete"><a href="{router page='topic'}delete/{$oTopic->getId()}/?security_ls_key={$LIVESTREET_SECURITY_KEY}" title="{$aLang.topic_delete}" onclick="return confirm('{$aLang.topic_delete_confirm}');">{$aLang.topic_delete}</a></li>
-					{/if}
-				</ul>				
-				<div class="content">
-				
-			{if $oTopic->getType()=='question'}   
-    		
-    		<div id="topic_question_area_{$oTopic->getId()}">
-    		{if !$oTopic->getUserQuestionIsVote()} 		
-    			<ul class="poll-new">	
-				{foreach from=$oTopic->getQuestionAnswers() key=key item=aAnswer}				
-					<li><label for="topic_answer_{$oTopic->getId()}_{$key}"><input type="radio" id="topic_answer_{$oTopic->getId()}_{$key}" name="topic_answer_{$oTopic->getId()}"  value="{$key}" onchange="$('topic_answer_{$oTopic->getId()}_value').setProperty('value',this.value);"/> {$aAnswer.text|escape:'html'}</label></li>				
-				{/foreach}
-					<li>
-					<input type="submit"  value="{$aLang.topic_question_vote}" onclick="ajaxQuestionVote({$oTopic->getId()},$('topic_answer_{$oTopic->getId()}_value').getProperty('value'));">
-					<input type="submit"  value="{$aLang.topic_question_abstain}"  onclick="ajaxQuestionVote({$oTopic->getId()},-1)">
-					</li>				
-					<input type="hidden" id="topic_answer_{$oTopic->getId()}_value" value="-1">				
-				</ul>				
-				<span>{$aLang.topic_question_vote_result}: {$oTopic->getQuestionCountVote()}. {$aLang.topic_question_abstain_result}: {$oTopic->getQuestionCountVoteAbstain()}</span><br>			
-			{else}			
-				{include file='topic_question.tpl'}
-			{/if}
-			</div>
-			<br>	
-						
-    		{/if}
-				
-					{$oTopic->getTextShort()}
-					{if $oTopic->getTextShort()!=$oTopic->getText()}
-      					<br><br>( <a href="{$oTopic->getUrl()}#cut" title="{$aLang.topic_read_more}">
-      					{if $oTopic->getCutText()}
-      						{$oTopic->getCutText()}
-      					{else}
-      						{$aLang.topic_read_more}
-      					{/if}      			
-      					</a> )
-      				{/if}
-				</div>				
-				<ul class="tags">
-					{foreach from=$oTopic->getTagsArray() item=sTag name=tags_list}
-						<li><a href="{router page='tag'}{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
-					{/foreach}								
-				</ul>				
-				<ul class="voting {if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId()) || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}{if $oTopic->getRating()>0}positive{elseif $oTopic->getRating()<0}negative{/if}{/if} {if !$oUserCurrent || $oTopic->getUserId()==$oUserCurrent->getId() || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}guest{/if} {if $oVote} voted {if $oVote->getDirection()>0}plus{elseif $oVote->getDirection()<0}minus{/if}{/if}">
-					<li class="plus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,1,'topic'); return false;"></a></li>
-					<li class="total" title="{$aLang.topic_vote_count}: {$oTopic->getCountVote()}">{if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId()) || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')} {if $oTopic->getRating()>0}+{/if}{$oTopic->getRating()} {else} <a href="#" onclick="lsVote.vote({$oTopic->getId()},this,0,'topic'); return false;">&mdash;</a> {/if}</li>
-					<li class="minus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,-1,'topic'); return false;"></a></li>
-					<li class="date">{date_format date=$oTopic->getDateAdd()}</li>
-					{if $oTopic->getType()=='link'}
-						<li class="link"><a href="{router page='link'}go/{$oTopic->getId()}/" title="{$aLang.topic_link_count_jump}: {$oTopic->getLinkCountJump()}">{$oTopic->getLinkUrl(true)}</a></li>
-					{/if}
-					<li class="author"><a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>		
-					<li class="comments-total">
-						{if $oTopic->getCountComment()>0}
-							<a href="{$oTopic->getUrl()}#comments" title="{$aLang.topic_comment_read}"><span class="red">{$oTopic->getCountComment()}</span>{if $oTopic->getCountCommentNew()}<span class="green">+{$oTopic->getCountCommentNew()}</span>{/if}</a>
-						{else}
-							<a href="{$oTopic->getUrl()}#comments" title="{$aLang.topic_comment_add}"><span class="red">{$aLang.topic_comment_add}</span></a>
-						{/if}
-					</li>
-					{hook run='topic_show_info' topic=$oTopic}
-				</ul>
-			</div>
+			<!-- Topic -->	
+                           {assign var="sTopicTemplateName" value="topic_`$oTopic->getType()`.tpl"}
+                           {include file=$sTopicTemplateName bTopicList=true}
 			<!-- /Topic -->
 	{/foreach}	
 		
diff --git a/templates/skin/new/topic_question.tpl b/templates/skin/new/topic_question.tpl
index 53f43eee..6c49ed9e 100644
--- a/templates/skin/new/topic_question.tpl
+++ b/templates/skin/new/topic_question.tpl
@@ -1,3 +1,48 @@
+			
+			{assign var="oBlog" value=$oTopic->getBlog()} 
+			{assign var="oUser" value=$oTopic->getUser()}
+			{assign var="oVote" value=$oTopic->getVote()} 
+			<!-- Topic -->			
+			<div class="topic">
+				<div class="favorite {if $oUserCurrent}{if $oTopic->getIsFavourite()}active{/if}{else}fav-guest{/if}"><a href="#" onclick="lsFavourite.toggle({$oTopic->getId()},this,'topic'); return false;"></a></div>
+				<h1 class="title">
+					{if $oTopic->getPublish()==0}	
+						<img src="{cfg name='path.static.skin'}/images/topic_unpublish.gif" border="0" title="{$aLang.topic_unpublish}" width="16" height="16" alt="{$aLang.topic_unpublish}">
+					{/if}
+					{if $bTopicList}
+                                                    <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a>
+                                                    
+                                             {else}
+                                                 {$oTopic->getTitle()|escape:'html'}
+                                             {/if}
+				</h1>
+				<ul class="action">					
+					<li><a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>&nbsp;&nbsp;</li>						
+					{if $oUserCurrent and ($oUserCurrent->getId()==$oTopic->getUserId() or $oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getUserIsModerator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
+  						<li class="edit"><a href="{cfg name='path.root.web'}/{$oTopic->getType()}/edit/{$oTopic->getId()}/" title="{$aLang.topic_edit}">{$aLang.topic_edit}</a></li>
+  					{/if}
+					{if $oUserCurrent and ($oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
+  						<li class="delete"><a href="{router page='topic'}delete/{$oTopic->getId()}/?security_ls_key={$LIVESTREET_SECURITY_KEY}" title="{$aLang.topic_delete}" onclick="return confirm('{$aLang.topic_delete_confirm}');">{$aLang.topic_delete}</a></li>
+  					{/if}
+				</ul>				
+				<div class="content">
+				
+				
+    		
+    		<div id="topic_question_area_{$oTopic->getId()}">
+    		{if !$oTopic->getUserQuestionIsVote()} 		
+    			<ul class="poll-new">	
+				{foreach from=$oTopic->getQuestionAnswers() key=key item=aAnswer}				
+					<li><label for="topic_answer_{$oTopic->getId()}_{$key}"><input type="radio" id="topic_answer_{$oTopic->getId()}_{$key}" name="topic_answer_{$oTopic->getId()}"  value="{$key}" onchange="$('topic_answer_{$oTopic->getId()}_value').setProperty('value',this.value);"/> {$aAnswer.text|escape:'html'}</label></li>				
+				{/foreach}
+					<li>
+					<input type="submit"  value="{$aLang.topic_question_vote}" onclick="ajaxQuestionVote({$oTopic->getId()},$('topic_answer_{$oTopic->getId()}_value').getProperty('value'));">
+					<input type="submit"  value="{$aLang.topic_question_abstain}"  onclick="ajaxQuestionVote({$oTopic->getId()},-1)">
+					</li>				
+					<input type="hidden" id="topic_answer_{$oTopic->getId()}_value" value="-1">				
+				</ul>				
+				<span>{$aLang.topic_question_vote_result}: {$oTopic->getQuestionCountVote()}. {$aLang.topic_question_abstain_result}: {$oTopic->getQuestionCountVoteAbstain()}</span><br>			
+			{else}			
 				<ul class="poll">				
 				{foreach from=$oTopic->getQuestionAnswers() key=key item=aAnswer}	
 				<li {if $oTopic->getQuestionAnswerMax()==$aAnswer.count}class="most"{/if}>		
@@ -9,4 +54,48 @@
 				{/foreach}	
 				</ul>						
 				<span>{$aLang.topic_question_vote_result}: {$oTopic->getQuestionCountVote()}. {$aLang.topic_question_abstain_result}: {$oTopic->getQuestionCountVoteAbstain()}</span><br>
-			
\ No newline at end of file
+			{/if}
+			</div>
+			<br>	
+						
+				{if $bTopicList}
+                                            {$oTopic->getTextShort()}
+                                                    {if $oTopic->getTextShort()!=$oTopic->getText()}
+                                                        <br><br>( <a href="{$oTopic->getUrl()}#cut" title="{$aLang.topic_read_more}">
+                                                        {if $oTopic->getCutText()}
+                                                            {$oTopic->getCutText()}
+                                                        {else}
+                                                            {$aLang.topic_read_more}
+                                                        {/if}      			
+                                                        </a> )
+                                                    {/if}
+
+                                             {else}
+                                                {$oTopic->getText()}
+                                             {/if}
+				</div>				
+				<ul class="tags">
+					{foreach from=$oTopic->getTagsArray() item=sTag name=tags_list}
+						<li><a href="{router page='tag'}{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
+					{/foreach}									
+				</ul>				
+				<ul class="voting {if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId())|| strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}{if $oTopic->getRating()>0}positive{elseif $oTopic->getRating()<0}negative{/if}{/if} {if !$oUserCurrent || $oTopic->getUserId()==$oUserCurrent->getId() || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}guest{/if} {if $oVote} voted {if $oVote->getDirection()>0}plus{elseif $oVote->getDirection()<0}minus{/if}{/if}">
+					<li class="plus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,1,'topic'); return false;"></a></li>
+					<li class="total" title="{$aLang.topic_vote_count}: {$oTopic->getCountVote()}">{if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId()) || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')} {if $oTopic->getRating()>0}+{/if}{$oTopic->getRating()} {else} <a href="#" onclick="lsVote.vote({$oTopic->getId()},this,0,'topic'); return false;">&mdash;</a> {/if}</li>
+					<li class="minus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,-1,'topic'); return false;"></a></li>
+					<li class="date">{date_format date=$oTopic->getDateAdd()}</li>
+					<li class="author"><a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>
+                                {if $bTopicList}
+                                                    <li class="comments-total">
+                                                        {if $oTopic->getCountComment()>0}
+                                                            <a href="{$oTopic->getUrl()}#comments" title="{$aLang.topic_comment_read}"><span class="red">{$oTopic->getCountComment()}</span>{if $oTopic->getCountCommentNew()}<span class="green">+{$oTopic->getCountCommentNew()}</span>{/if}</a>
+                                                        {else}
+                                                            <a href="{$oTopic->getUrl()}#comments" title="{$aLang.topic_comment_add}"><span class="red">{$aLang.topic_comment_add}</span></a>
+                                                        {/if}
+                                                    </li>
+                                              {/if}
+					{hook run='topic_show_info' topic=$oTopic}
+				</ul>
+			{hook run='topic_show_end' topic=$oTopic}
+			</div>
+			<!-- /Topic -->
\ No newline at end of file
diff --git a/templates/skin/new/topic_topic.tpl b/templates/skin/new/topic_topic.tpl
new file mode 100644
index 00000000..2e6d02ec
--- /dev/null
+++ b/templates/skin/new/topic_topic.tpl
@@ -0,0 +1,69 @@
+			
+			{assign var="oBlog" value=$oTopic->getBlog()} 
+			{assign var="oUser" value=$oTopic->getUser()}
+			{assign var="oVote" value=$oTopic->getVote()} 
+			<!-- Topic -->			
+			<div class="topic">
+				<div class="favorite {if $oUserCurrent}{if $oTopic->getIsFavourite()}active{/if}{else}fav-guest{/if}"><a href="#" onclick="lsFavourite.toggle({$oTopic->getId()},this,'topic'); return false;"></a></div>
+				<h1 class="title">
+					{if $oTopic->getPublish()==0}	
+						<img src="{cfg name='path.static.skin'}/images/topic_unpublish.gif" border="0" title="{$aLang.topic_unpublish}" width="16" height="16" alt="{$aLang.topic_unpublish}">
+					{/if}
+                                             {if $bTopicList}
+                                                    <a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a>
+                                             {else}
+                                                 {$oTopic->getTitle()|escape:'html'}
+                                             {/if}
+				</h1>
+				<ul class="action">					
+					<li><a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>&nbsp;&nbsp;</li>						
+					{if $oUserCurrent and ($oUserCurrent->getId()==$oTopic->getUserId() or $oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getUserIsModerator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
+  						<li class="edit"><a href="{cfg name='path.root.web'}/{$oTopic->getType()}/edit/{$oTopic->getId()}/" title="{$aLang.topic_edit}">{$aLang.topic_edit}</a></li>
+  					{/if}
+					{if $oUserCurrent and ($oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}
+  						<li class="delete"><a href="{router page='topic'}delete/{$oTopic->getId()}/?security_ls_key={$LIVESTREET_SECURITY_KEY}" title="{$aLang.topic_delete}" onclick="return confirm('{$aLang.topic_delete_confirm}');">{$aLang.topic_delete}</a></li>
+  					{/if}
+				</ul>				
+				<div class="content">
+                                             {if $bTopicList}
+                                                    {$oTopic->getTextShort()}
+                                                    {if $oTopic->getTextShort()!=$oTopic->getText()}
+                                                        <br><br>( <a href="{$oTopic->getUrl()}#cut" title="{$aLang.topic_read_more}">
+                                                        {if $oTopic->getCutText()}
+                                                            {$oTopic->getCutText()}
+                                                        {else}
+                                                            {$aLang.topic_read_more}
+                                                        {/if}      			
+                                                        </a> )
+                                                    {/if}
+                                             {else}
+                                                    
+                                                    {$oTopic->getText()}
+                                                {/if}
+					
+				</div>				
+				<ul class="tags">
+					{foreach from=$oTopic->getTagsArray() item=sTag name=tags_list}
+						<li><a href="{router page='tag'}{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a>{if !$smarty.foreach.tags_list.last}, {/if}</li>
+					{/foreach}									
+				</ul>				
+				<ul class="voting {if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId())|| strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}{if $oTopic->getRating()>0}positive{elseif $oTopic->getRating()<0}negative{/if}{/if} {if !$oUserCurrent || $oTopic->getUserId()==$oUserCurrent->getId() || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}guest{/if} {if $oVote} voted {if $oVote->getDirection()>0}plus{elseif $oVote->getDirection()<0}minus{/if}{/if}">
+					<li class="plus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,1,'topic'); return false;"></a></li>
+					<li class="total" title="{$aLang.topic_vote_count}: {$oTopic->getCountVote()}">{if $oVote || ($oUserCurrent && $oTopic->getUserId()==$oUserCurrent->getId()) || strtotime($oTopic->getDateAdd())<$smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')} {if $oTopic->getRating()>0}+{/if}{$oTopic->getRating()} {else} <a href="#" onclick="lsVote.vote({$oTopic->getId()},this,0,'topic'); return false;">&mdash;</a> {/if}</li>
+					<li class="minus"><a href="#" onclick="lsVote.vote({$oTopic->getId()},this,-1,'topic'); return false;"></a></li>
+					<li class="date">{date_format date=$oTopic->getDateAdd()}</li>
+					<li class="author"><a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>
+                                            {if $bTopicList}
+                                                    <li class="comments-total">
+                                                        {if $oTopic->getCountComment()>0}
+                                                            <a href="{$oTopic->getUrl()}#comments" title="{$aLang.topic_comment_read}"><span class="red">{$oTopic->getCountComment()}</span>{if $oTopic->getCountCommentNew()}<span class="green">+{$oTopic->getCountCommentNew()}</span>{/if}</a>
+                                                        {else}
+                                                            <a href="{$oTopic->getUrl()}#comments" title="{$aLang.topic_comment_add}"><span class="red">{$aLang.topic_comment_add}</span></a>
+                                                        {/if}
+                                                    </li>
+                                              {/if}
+					{hook run='topic_show_info' topic=$oTopic}
+				</ul>
+			{hook run='topic_show_end' topic=$oTopic}
+			</div>
+			<!-- /Topic -->
\ No newline at end of file