diff --git a/application/frontend/components/auth/auth.login.tpl b/application/frontend/components/auth/auth.login.tpl
index 38c8211c..05bef9fa 100644
--- a/application/frontend/components/auth/auth.login.tpl
+++ b/application/frontend/components/auth/auth.login.tpl
@@ -49,7 +49,7 @@
 </form>
 
 {if $smarty.local.showExtra}
-    <div class="pt-20">
+    <div class="ls-pt-20">
         <a href="{router page='auth/register'}">{$aLang.auth.registration.title}</a><br />
         <a href="{router page='auth/password-reset'}">{$aLang.auth.reset.title}</a>
     </div>
diff --git a/application/frontend/components/comment/comment-form.tpl b/application/frontend/components/comment/comment-form.tpl
index 4d00c3fa..10f4e0ff 100644
--- a/application/frontend/components/comment/comment-form.tpl
+++ b/application/frontend/components/comment/comment-form.tpl
@@ -55,7 +55,7 @@
 
         {* Кнопки редактирования *}
         {component 'button' name='submit_comment' text=$aLang.common.save mods='primary' classes='js-comment-form-update-submit hide'}
-        {component 'button' name='submit_comment' type='button' text=$aLang.common.cancel classes='js-comment-form-update-cancel fl-r'}
+        {component 'button' name='submit_comment' type='button' text=$aLang.common.cancel classes='js-comment-form-update-cancel ls-fl-r'}
 
         {* Кнопка превью текста *}
         {component 'button' text=$aLang.common.preview_text type='button' classes='js-comment-form-preview'}
diff --git a/application/frontend/components/media/panes/pane.preview.tpl b/application/frontend/components/media/panes/pane.preview.tpl
index 31b04a73..b2ae1987 100644
--- a/application/frontend/components/media/panes/pane.preview.tpl
+++ b/application/frontend/components/media/panes/pane.preview.tpl
@@ -7,7 +7,7 @@
 {block 'media_pane_content'}
     {if $aTargetItems}
         {foreach $aTargetItems as $oTarget}
-            <p class="mb-20">
+            <p class="ls-mb-20">
                 <a href="#" class="button" onclick="ls.media.removePreviewFile({$oTarget->getMediaId()}); return false;">Удалить превью</a>
             </p>
 
diff --git a/application/frontend/components/media/panes/pane.url.tpl b/application/frontend/components/media/panes/pane.url.tpl
index ef551119..346d9135 100644
--- a/application/frontend/components/media/panes/pane.url.tpl
+++ b/application/frontend/components/media/panes/pane.url.tpl
@@ -5,7 +5,7 @@
 {/block}
 
 {block 'media_pane_content'}
-    <form method="post" action="" enctype="multipart/form-data" class="mb-20 js-media-url-form">
+    <form method="post" action="" enctype="multipart/form-data" class="ls-mb-20 js-media-url-form">
         {* Типы файлов *}
         {* TODO: Add hook *}
         {*component 'field' template='select'
@@ -24,7 +24,7 @@
                  label   = {lang 'media.url.fields.url.label'}}
     </form>
 
-    <div class="mb-15 js-media-url-image-preview" style="display: none"></div>
+    <div class="ls-mb-15 js-media-url-image-preview" style="display: none"></div>
 
     <div class="js-media-url-settings-blocks">
         {component 'media' template='uploader-block.insert.image' useSizes=false}
diff --git a/application/frontend/components/poll/poll.form.tpl b/application/frontend/components/poll/poll.form.tpl
index 9fe00431..89703940 100644
--- a/application/frontend/components/poll/poll.form.tpl
+++ b/application/frontend/components/poll/poll.form.tpl
@@ -25,7 +25,7 @@
         {$bDisableChangeType = true}
     {/if}
 
-    <p class="mb-10">{$aLang.poll.form.fields.type.label}:</p>
+    <p class="ls-mb-10">{$aLang.poll.form.fields.type.label}:</p>
 
     {component 'field' template='radio'
              name  = 'poll[type]'
diff --git a/application/frontend/components/property/input/property.video_link.tpl b/application/frontend/components/property/input/property.video_link.tpl
index adf054e2..0bf2aca2 100644
--- a/application/frontend/components/property/input/property.video_link.tpl
+++ b/application/frontend/components/property/input/property.video_link.tpl
@@ -8,6 +8,6 @@
 
 {component 'property' template='input.property.video-modal' value=$value}
 
-<p class="mb-20">
+<p class="ls-mb-20">
     <a href="#" class="ls-link-dotted js-modal-toggle-default" data-lsmodaltoggle-modal="modal-property-type-video-{$value->getId()}">Смотреть</a>
 </p>
\ No newline at end of file
diff --git a/application/frontend/components/search/search-form.main.tpl b/application/frontend/components/search/search-form.main.tpl
index 85c71022..313b69b0 100644
--- a/application/frontend/components/search/search-form.main.tpl
+++ b/application/frontend/components/search/search-form.main.tpl
@@ -1,7 +1,5 @@
 {**
  * Форма основного поиска (по топикам и комментариям)
- *
- * @styles css/forms.css
  *}
 
 {component 'search-form' name='main' action="{router page='search'}{$smarty.local.searchType|default:'topics'}" mods=$smarty.local.mods classes=$smarty.local.classes}
diff --git a/application/frontend/components/talk/add.tpl b/application/frontend/components/talk/add.tpl
index c5c59f39..eca332e0 100644
--- a/application/frontend/components/talk/add.tpl
+++ b/application/frontend/components/talk/add.tpl
@@ -37,7 +37,7 @@
             inputClasses     = 'js-editor-default'}
 
     {* Preview *}
-    <div class="ls-text mb-20" id="text_preview" style="display: none;"></div>
+    <div class="ls-text ls-mb-20" id="text_preview" style="display: none;"></div>
 
     {hook run='form_add_talk_end'}
 
diff --git a/application/frontend/components/topic/css/topic.css b/application/frontend/components/topic/css/topic.css
index 194dcb52..f89b442e 100644
--- a/application/frontend/components/topic/css/topic.css
+++ b/application/frontend/components/topic/css/topic.css
@@ -1,9 +1,6 @@
 /**
  * Топики
  *
- * @template topics/*.tpl
- * @scripts <frontend>/common/js/topics.js
- *
  * @license   GNU General Public License, version 2
  * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
  * @author    Denis Shakhov <denis.shakhov@gmail.com>
diff --git a/application/frontend/components/topic/topic-add.tpl b/application/frontend/components/topic/topic-add.tpl
index 8b940c46..b38ad7e9 100644
--- a/application/frontend/components/topic/topic-add.tpl
+++ b/application/frontend/components/topic/topic-add.tpl
@@ -183,7 +183,7 @@
     {component 'button'
         id      = {( $topic ) ? 'submit-edit-topic-publish' : 'submit-add-topic-publish' }
         mods    = 'primary'
-        classes = 'fl-r'
+        classes = 'ls-fl-r'
         text    = $aLang.topic.add.button[ ( !$topic or ( $topic && $topic->getPublish() == 0 ) ) ? 'publish' : 'update' ]}
 
     {* Превью *}
diff --git a/application/frontend/components/user/blocks/block.users-search.tpl b/application/frontend/components/user/blocks/block.users-search.tpl
index 14af8f22..eab1ebae 100644
--- a/application/frontend/components/user/blocks/block.users-search.tpl
+++ b/application/frontend/components/user/blocks/block.users-search.tpl
@@ -11,7 +11,7 @@
         label        = 'Сейчас на сайте'}
 
     {* Пол *}
-    <p class="mb-10">Пол</p>
+    <p class="ls-mb-10">Пол</p>
     <div class="ls-field-checkbox-group">
         {component 'field' template='radio' inputClasses='js-search-ajax-user-sex' name='sex' value='' checked=true label='Любой'}
         {component 'field' template='radio' inputClasses='js-search-ajax-user-sex' name='sex' value='man' label='Мужской'}
diff --git a/application/frontend/components/user/settings/invite.tpl b/application/frontend/components/user/settings/invite.tpl
index 4346aa32..1dc7a77d 100644
--- a/application/frontend/components/user/settings/invite.tpl
+++ b/application/frontend/components/user/settings/invite.tpl
@@ -2,7 +2,7 @@
  * Управление инвайтами
  *}
 
-<div class="note mb-20">
+<div class="note ls-mb-20">
     {lang name='user.settings.invites.note'}
 </div>
 
diff --git a/application/frontend/components/user/settings/profile.tpl b/application/frontend/components/user/settings/profile.tpl
index 90f8cb07..bab17b28 100644
--- a/application/frontend/components/user/settings/profile.tpl
+++ b/application/frontend/components/user/settings/profile.tpl
@@ -10,7 +10,7 @@
 
 {* Шаблон пользовательского поля (userfield) *}
 {function name=userfield}
-    <div class="mb-15 js-user-field-item" {if ! $field}id="user-field-template" style="display:none;"{/if}>
+    <div class="ls-mb-15 js-user-field-item" {if ! $field}id="user-field-template" style="display:none;"{/if}>
         <select name="profile_user_field_type[]">
             {foreach $aUserFieldsContact as $fieldAll}
                 <option value="{$fieldAll->getId()}" {if $field && $fieldAll->getId() == $field->getId()}selected{/if}>
@@ -105,7 +105,7 @@
         {$contacts = $user->getUserFieldValues( true, array('contact', 'social') )}
 
         {* Список пользовательских полей, шаблон определен в начале файла *}
-        <div class="js-user-field-list mb-15">
+        <div class="js-user-field-list ls-mb-15">
             {foreach $contacts as $contact}
                 {call userfield field=$contact}
             {foreachelse}
diff --git a/application/frontend/components/wall/css/wall.css b/application/frontend/components/wall/css/wall.css
index c4267abd..c8b371b8 100644
--- a/application/frontend/components/wall/css/wall.css
+++ b/application/frontend/components/wall/css/wall.css
@@ -1,9 +1,6 @@
 /**
  * Стена
  *
- * @template actions/ActionProfile/wall.*.tpl
- * @scripts <frontend>/common/js/wall.js
- *
  * @license   GNU General Public License, version 2
  * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
  * @author    Denis Shakhov <denis.shakhov@gmail.com>
diff --git a/application/frontend/components/wall/wall.tpl b/application/frontend/components/wall/wall.tpl
index 96000a36..b223e681 100644
--- a/application/frontend/components/wall/wall.tpl
+++ b/application/frontend/components/wall/wall.tpl
@@ -21,7 +21,7 @@
     {if $oUserCurrent}
         {component 'wall' template='form'}
     {else}
-        {component 'alert' text=$aLang.wall.alerts.unregistered mods='info' classes='mt-15'}
+        {component 'alert' text=$aLang.wall.alerts.unregistered mods='info' classes='ls-mt-15'}
     {/if}
 
     {* Список записей *}
@@ -31,7 +31,7 @@
 
     {* Уведомление о пустом списке *}
     {if $oUserCurrent || ( ! $oUserCurrent && ! $loadedCount )}
-        {component 'blankslate' text=$aLang.common.empty classes='mt-15 js-wall-alert-empty' attributes=[ 'id' => 'wall-empty' ] visible=!$loadedCount}
+        {component 'blankslate' text=$aLang.common.empty classes='ls-mt-15 js-wall-alert-empty' attributes=[ 'id' => 'wall-empty' ] visible=!$loadedCount}
     {/if}
 
     {* Кнопка подгрузки записей *}