Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -N -r8929 -r11107
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11107)
@@ -61,7 +61,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
Index: branches/RC/kernel/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r9866 -r11107
--- branches/RC/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 9866)
+++ branches/RC/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11107)
@@ -1,12 +1,12 @@
 <inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
-	<div id="categories_div" prefix="c.showall" view_template="in-portal/catalog_tab" edit_template="in-portal/categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
+	<div id="categories_div" prefix="c.showall" view_template="in-portal/catalog_tab" edit_template="categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
 	<script type="text/javascript">$Catalog.registerTab('categories');</script>
 <inp2:m_else/>
 	<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
 	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 	<inp2:m_include t="incs/blocks"/>
 	<inp2:m_include t="incs/grid_blocks"/>
-	<inp2:m_include t="in-portal/categories/ci_blocks"/>
+	<inp2:m_include t="categories/ci_blocks"/>
 	<inp2:c.showall_InitList parent_cat_id="any" no_special="1"/>
 	$Catalog.setItemCount('c.showall', '<inp2:c.showall_CatalogItemCount no_special="1"/>');
 	$Catalog.setCurrentCategory('c.showall', <inp2:m_get name="m_cat_id"/>);
Index: branches/RC/core/admin_templates/sections_list.tpl
===================================================================
diff -u -N -r11004 -r11107
--- branches/RC/core/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 11004)
+++ branches/RC/core/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 11107)
@@ -1,4 +1,4 @@
-<inp2:adm_CheckPermCache cache_update_t="in-portal/categories/cache_updater"/>
+<inp2:adm_CheckPermCache cache_update_t="categories/cache_updater"/>
 <inp2:m_include t="incs/header"/>
 
 <link rel="stylesheet" rev="stylesheet" href="incs/sections_list.css" type="text/css" />
Index: branches/RC/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r9866 -r11107
--- branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 9866)
+++ branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11107)
@@ -1,12 +1,12 @@
 <inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
-	<div id="categories_div" prefix="c.showall" view_template="in-portal/catalog_tab" edit_template="in-portal/categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
+	<div id="categories_div" prefix="c.showall" view_template="in-portal/catalog_tab" edit_template="categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
 	<script type="text/javascript">$Catalog.registerTab('categories');</script>
 <inp2:m_else/>
 	<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
 	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 	<inp2:m_include t="incs/blocks"/>
 	<inp2:m_include t="incs/grid_blocks"/>
-	<inp2:m_include t="in-portal/categories/ci_blocks"/>
+	<inp2:m_include t="categories/ci_blocks"/>
 	<inp2:c.showall_InitList parent_cat_id="any" no_special="1"/>
 	$Catalog.setItemCount('c.showall', '<inp2:c.showall_CatalogItemCount no_special="1"/>');
 	$Catalog.setCurrentCategory('c.showall', <inp2:m_get name="m_cat_id"/>);
Index: branches/RC/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -N -r10630 -r11107
--- branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 10630)
+++ branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11107)
@@ -48,7 +48,7 @@
 </inp2:m_if>
 #separator#
 <inp2:c_UpdateLastTemplate template="in-portal/catalog"/>
-<inp2:m_include t="in-portal/categories/ci_blocks"/>
+<inp2:m_include t="categories/ci_blocks"/>
 <br />
 <table border="0" width="100%">
 	<inp2:m_DefineElement name="category_td">
Index: branches/RC/kernel/admin_templates/import_redirect.tpl
===================================================================
diff -u -N
--- branches/RC/kernel/admin_templates/import_redirect.tpl	(revision 8929)
+++ branches/RC/kernel/admin_templates/import_redirect.tpl	(revision 0)
@@ -1 +0,0 @@
-<inp2:adm_ImportRedirect />
\ No newline at end of file
Index: branches/RC/core/kernel/nparser/nparser.php
===================================================================
diff -u -N -r11067 -r11107
--- branches/RC/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 11067)
+++ branches/RC/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 11107)
@@ -289,7 +289,7 @@
 		if (!$pre_parsed) {
 			if (!$silent) {
 				if ($this->Application->isDebugMode()) $this->Application->Debugger->appendTrace();
-				trigger_error("Cannot include $t - file does not exist", E_USER_ERROR);
+				trigger_error('Cannot include "<strong>' . $t . '</strong>" - file does not exist', E_USER_ERROR);
 			}
 			return false;
 		}
Index: branches/RC/core/kernel/db/dblist.php
===================================================================
diff -u -N -r11086 -r11107
--- branches/RC/core/kernel/db/dblist.php	(.../dblist.php)	(revision 11086)
+++ branches/RC/core/kernel/db/dblist.php	(.../dblist.php)	(revision 11107)
@@ -708,7 +708,7 @@
 				$this->Application->Debugger->appendTrace();
 			}
 
-			trigger_error('Field <strong>' . $name . '</strong> doesn\'t exist in prefix <strong>' . $this->getPrefixSpecial() . '</strong>', E_USER_WARNING);
+			trigger_error('Field "<strong>' . $name . '</strong>" doesn\'t exist in prefix <strong>' . $this->getPrefixSpecial() . '</strong>', E_USER_WARNING);
 			return 'NO SUCH FIELD';
 		}
 
Index: branches/RC/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -N -r11096 -r11107
--- branches/RC/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 11096)
+++ branches/RC/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 11107)
@@ -46,7 +46,7 @@
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 					a_toolbar.AddButton( new ToolBarButton('in-portal:new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
-								std_precreate_item('c', 'in-portal/categories/categories_edit');
+								std_precreate_item('c', 'categories/categories_edit');
 							}
 					 	) );
 
@@ -55,7 +55,7 @@
 							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
 							var $category_id = get_hidden_field('m_cat_id');
 							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
-							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'in-portal/categories/categories_edit' : 'in-portal/categories/categories_edit_permissions');
+							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'categories/categories_edit' : 'categories/categories_edit_permissions');
 							redirect($redirect_url);
 							}
 						) );
@@ -112,7 +112,7 @@
 				 	) );
 
 				 	a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Rebuild" escape="1"/>', function() {
-				 			redirect('<inp2:m_t t="in-portal/categories/cache_updater" pass="m"/>');
+				 			redirect('<inp2:m_t t="categories/cache_updater" pass="m"/>');
 						}
 				 	) );
 
@@ -218,7 +218,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
Index: branches/RC/core/admin_templates/modules/modules_list.tpl
===================================================================
diff -u -N -r10832 -r11107
--- branches/RC/core/admin_templates/modules/modules_list.tpl	(.../modules_list.tpl)	(revision 10832)
+++ branches/RC/core/admin_templates/modules/modules_list.tpl	(.../modules_list.tpl)	(revision 11107)
@@ -1,4 +1,4 @@
-<inp2:adm_CheckPermCache cache_update_t="in-portal/categories/cache_updater"/>
+<inp2:adm_CheckPermCache cache_update_t="categories/cache_updater"/>
 
 <inp2:m_include t="incs/header" />
 <inp2:m_RenderElement name="combined_header" section="in-portal:mod_status" prefix="mod" pagination="1"/>
Index: branches/RC/kernel/admin_templates/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -N -r8929 -r11107
--- branches/RC/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11107)
@@ -61,7 +61,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
Index: branches/RC/kernel/admin_templates/kernel_form_end.tpl
===================================================================
diff -u -N
--- branches/RC/kernel/admin_templates/kernel_form_end.tpl	(revision 8929)
+++ branches/RC/kernel/admin_templates/kernel_form_end.tpl	(revision 0)
@@ -1 +0,0 @@
-<inp2:m_RenderElement name="kernel_form_end"/>
\ No newline at end of file
Index: branches/RC/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r10870 -r11107
--- branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 10870)
+++ branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 11107)
@@ -1734,7 +1734,7 @@
 		if ($field_values['start_from'] == $field_values['total_records']) {
 			if ($event->Special == 'import') {
 				$this->Application->StoreVar('PermCache_UpdateRequired', 1);
-				$this->Application->Redirect('in-portal/categories/cache_updater', Array('m_opener' => 'r', 'pass' => 'm', 'continue' => 1, 'no_amp' => 1));
+				$this->Application->Redirect('categories/cache_updater', Array('m_opener' => 'r', 'pass' => 'm', 'continue' => 1, 'no_amp' => 1));
 			}
 			elseif ($event->Special == 'export') {
 				$template = $this->Application->getUnitOption($event->Prefix, 'ModuleFolder').'/'.$event->Special.'_finish';
Index: branches/RC/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r11096 -r11107
--- branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11096)
+++ branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11107)
@@ -46,7 +46,7 @@
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 					a_toolbar.AddButton( new ToolBarButton('in-portal:new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
-								std_precreate_item('c', 'in-portal/categories/categories_edit');
+								std_precreate_item('c', 'categories/categories_edit');
 							}
 					 	) );
 
@@ -55,7 +55,7 @@
 							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
 							var $category_id = get_hidden_field('m_cat_id');
 							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
-							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'in-portal/categories/categories_edit' : 'in-portal/categories/categories_edit_permissions');
+							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'categories/categories_edit' : 'categories/categories_edit_permissions');
 							redirect($redirect_url);
 							}
 						) );
@@ -112,7 +112,7 @@
 				 	) );
 
 				 	a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Rebuild" escape="1"/>', function() {
-				 			redirect('<inp2:m_t t="in-portal/categories/cache_updater" pass="m"/>');
+				 			redirect('<inp2:m_t t="categories/cache_updater" pass="m"/>');
 						}
 				 	) );
 
@@ -218,7 +218,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
Index: branches/RC/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r10780 -r11107
--- branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 10780)
+++ branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 11107)
@@ -613,7 +613,7 @@
 				$cat->Update();
 			}
 			$ids = $to_delete;
-			$event->redirect = 'in-portal/categories/cache_updater';
+			$event->redirect = 'categories/cache_updater';
 		}
 
 		$event->setEventParam('ids', $ids);
@@ -706,7 +706,7 @@
 		}
 
 		if ($clipboard_data['cut'] || $clipboard_data['copy']) {
-			$event->redirect = 'in-portal/categories/cache_updater';
+			$event->redirect = 'categories/cache_updater';
 		}
 	}
 
Index: branches/RC/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r11067 -r11107
--- branches/RC/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 11067)
+++ branches/RC/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 11107)
@@ -1990,7 +1990,7 @@
 		{
 			if ($this->Special == 'import') {
 				$this->Application->StoreVar('PermCache_UpdateRequired', 1);
-				$this->Application->Redirect('in-portal/categories/cache_updater', Array('m_opener' => 'r', 'pass' => 'm', 'continue' => 1, 'no_amp' => 1));
+				$this->Application->Redirect('categories/cache_updater', Array('m_opener' => 'r', 'pass' => 'm', 'continue' => 1, 'no_amp' => 1));
 			}
 			elseif ($this->Special == 'export') {
 				$finish_t = $this->Application->RecallVar('export_finish_t');
Index: branches/RC/kernel/admin_templates/xml/categories_list.tpl
===================================================================
diff -u -N -r10630 -r11107
--- branches/RC/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 10630)
+++ branches/RC/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11107)
@@ -48,7 +48,7 @@
 </inp2:m_if>
 #separator#
 <inp2:c_UpdateLastTemplate template="in-portal/catalog"/>
-<inp2:m_include t="in-portal/categories/ci_blocks"/>
+<inp2:m_include t="categories/ci_blocks"/>
 <br />
 <table border="0" width="100%">
 	<inp2:m_DefineElement name="category_td">
Index: branches/RC/kernel/admin_templates/kernel_form_start.tpl
===================================================================
diff -u -N
--- branches/RC/kernel/admin_templates/kernel_form_start.tpl	(revision 8929)
+++ branches/RC/kernel/admin_templates/kernel_form_start.tpl	(revision 0)
@@ -1 +0,0 @@
-
Index: branches/RC/core/units/general/helpers/helpers_config.php
===================================================================
diff -u -N -r10974 -r11107
--- branches/RC/core/units/general/helpers/helpers_config.php	(.../helpers_config.php)	(revision 10974)
+++ branches/RC/core/units/general/helpers/helpers_config.php	(.../helpers_config.php)	(revision 11107)
@@ -28,5 +28,6 @@
 						Array('pseudo'=>'ChartHelper','class'=>'kChartHelper','file'=>'chart_helper.php','build_event'=>'','require_classes'=>'kHelper'),
 						Array('pseudo'=>'RatingHelper','class'=>'RatingHelper','file'=>'rating_helper.php','build_event'=>'','require_classes'=>'kHelper'),
 						Array('pseudo'=>'FCKHelper','class'=>'fckFCKHelper','file'=>'fck_helper.php','build_event'=>'','require_classes'=>'kHelper'),
+						Array('pseudo' => 'SpamHelper', 'class' => 'SpamHelper','file' => 'spam_helper.php', 'build_event' => '', 'require_classes' => Array('kHelper')),
 					),
 	);
\ No newline at end of file