diff --git a/upload/styles/cb_2013/layout/blocks/comments/add_comment.html b/upload/styles/cb_2013/layout/blocks/comments/add_comment.html
new file mode 100644
index 00000000..c661d8cf
--- /dev/null
+++ b/upload/styles/cb_2013/layout/blocks/comments/add_comment.html
@@ -0,0 +1,80 @@
+{if $userquery->login_check('',true) || $Cbucket->configs.anonym_comments == 'yes'}
+<div class="col-lg-12 col-sm-12 col-md-12 col-xs-12 cb-item-add-comment">
+    <form class="form-inline"  id="comment_form" >
+
+        <input type="hidden" name="reply_to" id="reply_to" value="0">
+        <input type="hidden" name="obj_id" id="obj_id" value="{$id}">
+        {if !$userquery->login_check('',true) && $Cbucket->configs.anonym_comments == 'yes'}
+
+        <div class="col-lg-10 col-md-10 col-sm-12 col-xs-12 form-group">
+            <label for="comment_name">
+                {lang code='name'}
+            </label>
+            <input type="text" name="name" id="comment_name" class="form-control">
+        </div>
+
+        <div class="col-lg-10 col-md-10 col-sm-12 col-xs-12 form-group">
+            <label for="comment_email">
+                {lang code='email_wont_display'}
+            </label>
+            <input type="email" name="email" id="comment_email" class="form-control">
+        </div>
+
+
+
+        {else}
+            <strong>{sprintf(lang('Comment as %s'),$userquery->username)}</strong>
+        {/if}
+
+        {ANCHOR place='before_compose_box'}
+
+
+        {if config('comments_captcha')=='all' || ( config('comments_captcha')=='guests' && !$userquery->login_check('',true) )}
+
+            <div class="col-lg-10 col-md-10 col-sm-12 col-xs-12 form-group">
+
+            {assign var=captcha value=get_captcha()}
+            {if $captcha}
+            {if $captcha.show_field}
+            <label class="label" for="captcha">Verification Code</label>
+            {load_captcha captcha=$captcha load=field field_params = ' id="captcha" class="input" '}
+
+            {/if}
+             {load_captcha captcha=$captcha load=function}
+
+
+            {/if}
+            </div>
+        {/if}
+
+
+        <div class="col-lg-10 col-md-10 col-sm-12 col-xs-12 form-group">
+            {if !$userquery->login_check('',true) && $Cbucket->configs.anonym_comments == 'yes'}
+            <label for="comment_text">
+                {lang code='Your comment'}
+            </label>
+            {/if}
+            <input type="text" name="comment" id="comment_text" class="form-control" />
+        </div>
+        <button type="submit" class="hidden-xs hidden-sm  btn btn-primary" onclick="add_comment_js('comment_form','{$type}'){ANCHOR place='onClickAddComment'}">{lang('Comment')}</button>
+
+        <div class="hidden-lg hidden-md pl15 pr15">
+            <button type="submit" class="btn btn-block btn-primary" onclick="add_comment_js('comment_form','{$type}'){ANCHOR place='onClickAddComment'}">{lang('Comment')}</button>
+        </div>
+    </form>
+
+<div id="add_comment_result" class="add_comment_result mtm mbm" style="display:none"></div>
+
+{else}
+    {lang code='please_login_to_comment'}
+{/if}
+</div>
+
+<script>
+    $(document).ready(function(){
+        $('body').on('submit','#comment_form',function(e){
+            e.preventDefault();
+            add_comment_js('comment_form','{$type}');
+        })
+    })
+</script>
\ No newline at end of file
diff --git a/upload/styles/cb_2013/layout/blocks/comments/comment.html b/upload/styles/cb_2013/layout/blocks/comments/comment.html
new file mode 100644
index 00000000..52cb2a78
--- /dev/null
+++ b/upload/styles/cb_2013/layout/blocks/comments/comment.html
@@ -0,0 +1,67 @@
+{if marked_spammed($comment)}
+	{assign var='comment_attr' value='style="display:none"'}
+    {assign var='spam_attr' value='style="display:block"'}
+{else}
+{assign var='comment_attr' value=''}
+    {assign var='spam_attr' value='style="display:none"'}
+{/if}
+
+<div id="comment_{$comment.comment_id}" class="cb-item-comment" {$comment_attr}>
+    <img src="{$userquery->getuserthumb($comment)}" class="img-circle cb-comment-author-img" />
+    <div class="cb-comment-author">
+        {$user_link=''}
+        {if $comment.username}{$user_link=$userquery->profile_link($comment)}{/if}
+
+        <a href="{$user_link}">{name($comment)}</a> <span class="cb-comment-date"> &ndash; {nicetime($comment.date_added)}</span>
+
+
+        {if $type=='video' && $comments_voting=='yes' && $Cbucket->configs.comment_rating}
+        <div class="cb-comment-rating-cont">
+            <span class="comment-rating" id="comment_rating_{$comment.comment_id}" >{$comment.vote|comment_rating}</span>
+            <span class="comment-like" onclick="rate_comment('{$comment.comment_id}','up','{$type}','{$type_id}')">{lang('Like')}</span>
+            <span class="comment-dislike" onclick="rate_comment('{$comment.comment_id}','down','{$type}','{$type_id}')">{lang('Unlike')}</span>
+        </div>
+        {/if}
+
+
+    </div>
+    <div class="cb-comment-text">
+
+        {if $comment.parent_id}
+        {assign var=parentid value=$comment.parent_id}
+        {assign var=thisParent value=$parents.$parentid}
+
+        {if $thisParent}
+        <blockquote>
+            {$thisParent.comment|comment}
+            {if $thisParent.username}<small>{name($thisParent)}</small>{/if}
+        </blockquote>
+        {/if}
+        {/if}
+
+
+
+        {$comment.comment|comment}
+    </div>
+    <div class="cb-comment-actions">
+        {if has_access('admin_del_access') || $comment.userid==userid() || $comment.type_owner_id==userid()}
+            <a href="javascript:void(0)" onclick="delete_comment('{$comment.comment_id}','{$type}','{$type_id}')">{lang('Delete')}</a>
+             |
+        {/if}
+        <a href="javascript:void(0)" onclick="to_reply('{$comment.comment_id}')">{lang code='reply'}</a> | <a href="javascript:void(0)" onclick="spam_comment('{$comment.comment_id}','{$type}','{$type_id}')">{lang code='spam'}</a>
+    </div>
+
+</div>
+
+<div id="spam_comment_{$comment.comment_id}" class="spam mtm mbm" {$spam_attr} >
+    {$marked_as_spam_comment_by_user=lang('marked_as_spam_comment_by_user')}
+
+    {if $comment.username}
+        {$marked_as_spam_comment_by_user|sprintf:$comment.username}
+    {else}
+        {$marked_as_spam_comment_by_user|sprintf:$comment.anonym_name}
+    {/if}
+    {if has_access('admin_del_access') || $comment.userid==userid() || $comment.type_owner_id==userid()}
+        | <a href="javascript:void(0)" onclick="delete_comment('{$comment.comment_id}')">{lang code='delete'}</a>
+    {/if}
+</div>
\ No newline at end of file
diff --git a/upload/styles/cb_2013/layout/blocks/comments/comments.html b/upload/styles/cb_2013/layout/blocks/comments/comments.html
new file mode 100644
index 00000000..5150171c
--- /dev/null
+++ b/upload/styles/cb_2013/layout/blocks/comments/comments.html
@@ -0,0 +1,14 @@
+<div class="cb-item-comments-container">
+    <div id="latest_comment_container"></div>
+{if $comments}
+    {foreach from=$comments.comments item=comment}
+        {include file="$style_dir/blocks/comments/comment.html" comment=$comment type=$type parents=$comments.parents}
+    {/foreach}
+{else}
+	<div align="center" class="no_comments" id="no_comments">
+    	{lang code='no_comments' assign=no_comments} {$no_comments|sprintf:$object_type}
+    </div>
+
+{/if}
+
+</div>
\ No newline at end of file
diff --git a/upload/styles/cb_2013/layout/blocks/common/pagination.html b/upload/styles/cb_2013/layout/blocks/common/pagination.html
new file mode 100644
index 00000000..e69de29b