diff --git a/templates/skin/developer/modals/modal.userfields.tpl b/templates/skin/developer/actions/ActionAdmin/modal.userfields.tpl
similarity index 91%
rename from templates/skin/developer/modals/modal.userfields.tpl
rename to templates/skin/developer/actions/ActionAdmin/modal.userfields.tpl
index a4802e46..17b1ff45 100644
--- a/templates/skin/developer/modals/modal.userfields.tpl
+++ b/templates/skin/developer/actions/ActionAdmin/modal.userfields.tpl
@@ -1,3 +1,9 @@
+{**
+ * Настройка пользовательских полей в админке
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_id'}userfield_form{/block}
diff --git a/templates/skin/developer/actions/ActionAdmin/user_fields.tpl b/templates/skin/developer/actions/ActionAdmin/user_fields.tpl
index c8c77443..6e761b80 100644
--- a/templates/skin/developer/actions/ActionAdmin/user_fields.tpl
+++ b/templates/skin/developer/actions/ActionAdmin/user_fields.tpl
@@ -1,5 +1,5 @@
{include file='header.tpl'}
-{include file='modals/modal.userfields.tpl'}
+{include file='actions/ActionAdmin/modal.userfields.tpl'}
diff --git a/templates/skin/developer/modals/modal.add_friend.tpl b/templates/skin/developer/modals/modal.add_friend.tpl
index 21b96982..37e8806b 100644
--- a/templates/skin/developer/modals/modal.add_friend.tpl
+++ b/templates/skin/developer/modals/modal.add_friend.tpl
@@ -1,3 +1,9 @@
+{**
+ * Добавление в друзья
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_id'}modal-add-friend{/block}
diff --git a/templates/skin/developer/modals/modal.blog_delete.tpl b/templates/skin/developer/modals/modal.blog_delete.tpl
index 40a4cac6..29ee1d2c 100644
--- a/templates/skin/developer/modals/modal.blog_delete.tpl
+++ b/templates/skin/developer/modals/modal.blog_delete.tpl
@@ -1,3 +1,9 @@
+{**
+ * Удаление блога
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_id'}modal-blog-delete{/block}
diff --git a/templates/skin/developer/modals/modal.favourite_form_tags.tpl b/templates/skin/developer/modals/modal.favourite_form_tags.tpl
index 0a494063..265c26d3 100644
--- a/templates/skin/developer/modals/modal.favourite_form_tags.tpl
+++ b/templates/skin/developer/modals/modal.favourite_form_tags.tpl
@@ -1,3 +1,9 @@
+{**
+ * Добавление пользовательских тегов к топику
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_id'}favourite-form-tags{/block}
diff --git a/templates/skin/developer/modals/modal.load_img.tpl b/templates/skin/developer/modals/modal.load_img.tpl
index 424667d0..a1e6239b 100644
--- a/templates/skin/developer/modals/modal.load_img.tpl
+++ b/templates/skin/developer/modals/modal.load_img.tpl
@@ -1,3 +1,9 @@
+{**
+ * Загрузка изображения
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/developer/modals/modal.login.tpl b/templates/skin/developer/modals/modal.login.tpl
index 10f1f7e0..192ddc56 100644
--- a/templates/skin/developer/modals/modal.login.tpl
+++ b/templates/skin/developer/modals/modal.login.tpl
@@ -1,3 +1,9 @@
+{**
+ * Модальное окно с формами входа, регистрации и напоминанием пароля
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/developer/modals/modal.photoset_add_photo.tpl b/templates/skin/developer/modals/modal.photoset_add_photo.tpl
index 6eeb89db..28567500 100644
--- a/templates/skin/developer/modals/modal.photoset_add_photo.tpl
+++ b/templates/skin/developer/modals/modal.photoset_add_photo.tpl
@@ -1,3 +1,9 @@
+{**
+ * Добавление изображения в фотосет при отключенном флеше
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_id'}modal-photoset-upload{/block}
diff --git a/templates/skin/developer/modals/modal.profile_avatar_upload.tpl b/templates/skin/developer/modals/modal.profile_avatar_upload.tpl
index c5233c2a..88a4b4c0 100644
--- a/templates/skin/developer/modals/modal.profile_avatar_upload.tpl
+++ b/templates/skin/developer/modals/modal.profile_avatar_upload.tpl
@@ -1,3 +1,9 @@
+{**
+ * Загрузка аватара пользователя
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/developer/modals/modal.profile_photo_upload.tpl b/templates/skin/developer/modals/modal.profile_photo_upload.tpl
index 91831743..7da5142a 100644
--- a/templates/skin/developer/modals/modal.profile_photo_upload.tpl
+++ b/templates/skin/developer/modals/modal.profile_photo_upload.tpl
@@ -1,3 +1,9 @@
+{**
+ * Загрузка фото пользователя
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/developer/modals/modal.write.tpl b/templates/skin/developer/modals/modal.write.tpl
index 24dd0a2a..12c1c58f 100644
--- a/templates/skin/developer/modals/modal.write.tpl
+++ b/templates/skin/developer/modals/modal.write.tpl
@@ -1,3 +1,9 @@
+{**
+ * Модальное с меню "Создать"
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/developer/topic.tpl b/templates/skin/developer/topic.tpl
index 2fa8d9bb..b807f4ba 100644
--- a/templates/skin/developer/topic.tpl
+++ b/templates/skin/developer/topic.tpl
@@ -1,3 +1,7 @@
+{**
+ * Топик
+ *}
+
{if $LS->Topic_IsAllowTopicType($oTopic->getType())}
{assign var="sTopicTemplateName" value="topic_`$oTopic->getType()`.tpl"}
{include file=$sTopicTemplateName}
diff --git a/templates/skin/developer/topic_link.tpl b/templates/skin/developer/topic_link.tpl
index 5719ef99..42aebdc2 100644
--- a/templates/skin/developer/topic_link.tpl
+++ b/templates/skin/developer/topic_link.tpl
@@ -1,3 +1,9 @@
+{**
+ * Топик ссылка
+ *
+ * @styles css/topic.css
+ *}
+
{extends file='topics/topic_base.tpl'}
diff --git a/templates/skin/developer/topic_list.tpl b/templates/skin/developer/topic_list.tpl
index a52ddd90..dbf2725b 100644
--- a/templates/skin/developer/topic_list.tpl
+++ b/templates/skin/developer/topic_list.tpl
@@ -1,4 +1,8 @@
-{if count($aTopics)>0}
+{**
+ * Список топиков
+ *}
+
+{if count($aTopics) > 0}
{add_block group='toolbar' name='toolbar_topic.tpl' iCountTopic=count($aTopics)}
{foreach from=$aTopics item=oTopic}
diff --git a/templates/skin/developer/topic_photoset.tpl b/templates/skin/developer/topic_photoset.tpl
index 16c60927..b08af42a 100644
--- a/templates/skin/developer/topic_photoset.tpl
+++ b/templates/skin/developer/topic_photoset.tpl
@@ -1,3 +1,9 @@
+{**
+ * Топик фотосет
+ *
+ * @styles css/topic.css
+ *}
+
{extends file='topics/topic_base.tpl'}
diff --git a/templates/skin/developer/topic_preview_topic.tpl b/templates/skin/developer/topic_preview_topic.tpl
index 8dd5d63c..dd27c6c5 100644
--- a/templates/skin/developer/topic_preview_topic.tpl
+++ b/templates/skin/developer/topic_preview_topic.tpl
@@ -1,3 +1,9 @@
+{**
+ * Предпросмотр топика
+ *
+ * @styles css/topic.css
+ *}
+
{assign var="oUser" value=$oTopic->getUser()}
diff --git a/templates/skin/developer/topic_question.tpl b/templates/skin/developer/topic_question.tpl
index b6b333ee..2ed97d23 100644
--- a/templates/skin/developer/topic_question.tpl
+++ b/templates/skin/developer/topic_question.tpl
@@ -1,3 +1,9 @@
+{**
+ * Топик опрос
+ *
+ * @styles css/topic.css
+ *}
+
{extends file='topics/topic_base.tpl'}
diff --git a/templates/skin/developer/topic_topic.tpl b/templates/skin/developer/topic_topic.tpl
index 15d7517b..dbf5bfc0 100644
--- a/templates/skin/developer/topic_topic.tpl
+++ b/templates/skin/developer/topic_topic.tpl
@@ -1,3 +1,9 @@
+{**
+ * Обычный топик
+ *
+ * @styles css/topic.css
+ *}
+
{extends file='topics/topic_base.tpl'}
diff --git a/templates/skin/synio/modals/modal.userfields.tpl b/templates/skin/synio/actions/ActionAdmin/modal.userfields.tpl
similarity index 100%
rename from templates/skin/synio/modals/modal.userfields.tpl
rename to templates/skin/synio/actions/ActionAdmin/modal.userfields.tpl
diff --git a/templates/skin/synio/actions/ActionAdmin/user_fields.tpl b/templates/skin/synio/actions/ActionAdmin/user_fields.tpl
index db0cdabf..f36dd382 100644
--- a/templates/skin/synio/actions/ActionAdmin/user_fields.tpl
+++ b/templates/skin/synio/actions/ActionAdmin/user_fields.tpl
@@ -1,5 +1,5 @@
{include file='header.tpl'}
-{include file='modals/modal.userfields.tpl'}
+{include file='actions/ActionAdmin/modal.userfields.tpl'}
diff --git a/templates/skin/synio/modals/modal.add_friend.tpl b/templates/skin/synio/modals/modal.add_friend.tpl
index 02939a61..183c9665 100644
--- a/templates/skin/synio/modals/modal.add_friend.tpl
+++ b/templates/skin/synio/modals/modal.add_friend.tpl
@@ -1,3 +1,9 @@
+{**
+ * Добавление в друзья
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_id'}modal-add-friend{/block}
diff --git a/templates/skin/synio/modals/modal.blog_delete.tpl b/templates/skin/synio/modals/modal.blog_delete.tpl
index 3b0c69f8..a86d0961 100644
--- a/templates/skin/synio/modals/modal.blog_delete.tpl
+++ b/templates/skin/synio/modals/modal.blog_delete.tpl
@@ -1,3 +1,9 @@
+{**
+ * Удаление блога
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_id'}modal-blog-delete{/block}
diff --git a/templates/skin/synio/modals/modal.favourite_form_tags.tpl b/templates/skin/synio/modals/modal.favourite_form_tags.tpl
index a01c978a..a4445017 100644
--- a/templates/skin/synio/modals/modal.favourite_form_tags.tpl
+++ b/templates/skin/synio/modals/modal.favourite_form_tags.tpl
@@ -1,3 +1,9 @@
+{**
+ * Добавление пользовательских тегов к топику
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_id'}favourite-form-tags{/block}
diff --git a/templates/skin/synio/modals/modal.load_img.tpl b/templates/skin/synio/modals/modal.load_img.tpl
index 31d3cfc6..54956c08 100644
--- a/templates/skin/synio/modals/modal.load_img.tpl
+++ b/templates/skin/synio/modals/modal.load_img.tpl
@@ -1,3 +1,9 @@
+{**
+ * Загрузка изображения
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/synio/modals/modal.login.tpl b/templates/skin/synio/modals/modal.login.tpl
index 025924cb..537a9e71 100644
--- a/templates/skin/synio/modals/modal.login.tpl
+++ b/templates/skin/synio/modals/modal.login.tpl
@@ -1,3 +1,9 @@
+{**
+ * Модальное окно с формами входа, регистрации и напоминанием пароля
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/synio/modals/modal.photoset_add_photo.tpl b/templates/skin/synio/modals/modal.photoset_add_photo.tpl
index 43dda12f..ed5b3755 100644
--- a/templates/skin/synio/modals/modal.photoset_add_photo.tpl
+++ b/templates/skin/synio/modals/modal.photoset_add_photo.tpl
@@ -1,3 +1,9 @@
+{**
+ * Добавление изображения в фотосет при отключенном флеше
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_id'}modal-photoset-upload{/block}
diff --git a/templates/skin/synio/modals/modal.profile_avatar_upload.tpl b/templates/skin/synio/modals/modal.profile_avatar_upload.tpl
index 54043c9a..8e3d3fc0 100644
--- a/templates/skin/synio/modals/modal.profile_avatar_upload.tpl
+++ b/templates/skin/synio/modals/modal.profile_avatar_upload.tpl
@@ -1,3 +1,9 @@
+{**
+ * Загрузка аватара пользователя
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/synio/modals/modal.profile_photo_upload.tpl b/templates/skin/synio/modals/modal.profile_photo_upload.tpl
index cae5765a..2b9cbd4a 100644
--- a/templates/skin/synio/modals/modal.profile_photo_upload.tpl
+++ b/templates/skin/synio/modals/modal.profile_photo_upload.tpl
@@ -1,3 +1,9 @@
+{**
+ * Загрузка фото пользователя
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/synio/modals/modal.write.tpl b/templates/skin/synio/modals/modal.write.tpl
index a90de778..9a47a07f 100644
--- a/templates/skin/synio/modals/modal.write.tpl
+++ b/templates/skin/synio/modals/modal.write.tpl
@@ -1,3 +1,9 @@
+{**
+ * Модальное с меню "Создать"
+ *
+ * @styles css/modals.css
+ *}
+
{extends file='modals/modal_base.tpl'}
{block name='modal_options'}
diff --git a/templates/skin/synio/modals/modal_base.tpl b/templates/skin/synio/modals/modal_base.tpl
index 6e231ee1..c759ca6f 100644
--- a/templates/skin/synio/modals/modal_base.tpl
+++ b/templates/skin/synio/modals/modal_base.tpl
@@ -1,13 +1,13 @@
-{*
- MODAL BASE TEMPLATE
-
- Available options:
- ------------------
- noTitle (bool) - Hide content
- noContent (bool) - Hide content
- noFooter (bool) - Hide footer
- noCancel (bool) - Hide cancel button
-*}
+{**
+ * Базовый шаблон модальных окон
+ *
+ * Доступные опции:
+ * noModalHeader (bool) - Не выводить шапку
+ * noModalTitle (bool) - Не выводить заголовок
+ * noModalContent (bool) - Не выводить контент
+ * noModalFooter (bool) - Не выводить подвал
+ * noModalCancel (bool) - Не выводить кнопку "Отмена"
+ *}
{block name='modal_options'}{/block}
diff --git a/templates/skin/synio/topic.tpl b/templates/skin/synio/topic.tpl
index 2fa8d9bb..b807f4ba 100644
--- a/templates/skin/synio/topic.tpl
+++ b/templates/skin/synio/topic.tpl
@@ -1,3 +1,7 @@
+{**
+ * Топик
+ *}
+
{if $LS->Topic_IsAllowTopicType($oTopic->getType())}
{assign var="sTopicTemplateName" value="topic_`$oTopic->getType()`.tpl"}
{include file=$sTopicTemplateName}
diff --git a/templates/skin/synio/topic_link.tpl b/templates/skin/synio/topic_link.tpl
index 46364790..5f3f5762 100644
--- a/templates/skin/synio/topic_link.tpl
+++ b/templates/skin/synio/topic_link.tpl
@@ -1,3 +1,9 @@
+{**
+ * Топик ссылка
+ *
+ * @styles css/topic.css
+ *}
+
{extends file='topics/topic_base.tpl'}
diff --git a/templates/skin/synio/topic_list.tpl b/templates/skin/synio/topic_list.tpl
index a52ddd90..2ff94d2f 100644
--- a/templates/skin/synio/topic_list.tpl
+++ b/templates/skin/synio/topic_list.tpl
@@ -1,3 +1,7 @@
+{**
+ * Список топиков
+ *}
+
{if count($aTopics)>0}
{add_block group='toolbar' name='toolbar_topic.tpl' iCountTopic=count($aTopics)}
diff --git a/templates/skin/synio/topic_photoset.tpl b/templates/skin/synio/topic_photoset.tpl
index 7e811ebf..aa194b9f 100644
--- a/templates/skin/synio/topic_photoset.tpl
+++ b/templates/skin/synio/topic_photoset.tpl
@@ -1,3 +1,9 @@
+{**
+ * Топик фотосет
+ *
+ * @styles css/topic.css
+ *}
+
{extends file='topics/topic_base.tpl'}
diff --git a/templates/skin/synio/topic_preview_topic.tpl b/templates/skin/synio/topic_preview_topic.tpl
index f5c1ea95..e87487f6 100644
--- a/templates/skin/synio/topic_preview_topic.tpl
+++ b/templates/skin/synio/topic_preview_topic.tpl
@@ -1,3 +1,9 @@
+{**
+ * Предпросмотр топика
+ *
+ * @styles css/topic.css
+ *}
+
{assign var="oUser" value=$oTopic->getUser()}
diff --git a/templates/skin/synio/topic_question.tpl b/templates/skin/synio/topic_question.tpl
index 87da67da..e63badfb 100644
--- a/templates/skin/synio/topic_question.tpl
+++ b/templates/skin/synio/topic_question.tpl
@@ -1,3 +1,9 @@
+{**
+ * Топик опрос
+ *
+ * @styles css/topic.css
+ *}
+
{extends file='topics/topic_base.tpl'}
diff --git a/templates/skin/synio/topic_topic.tpl b/templates/skin/synio/topic_topic.tpl
index 1c0bc32e..b9b2d81a 100644
--- a/templates/skin/synio/topic_topic.tpl
+++ b/templates/skin/synio/topic_topic.tpl
@@ -1,3 +1,9 @@
+{**
+ * Обычный топик
+ *
+ * @styles css/topic.css
+ *}
+
{extends file='topics/topic_base.tpl'}