Index: branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_config.php
===================================================================
diff -u -r5728 -r6219
--- branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 5728)
+++ branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 6219)
@@ -1,43 +1,48 @@
 <?php
-	
+
 $config	=	Array(
 					'Prefix'			=>	'rev',
-					
+
 					'Clones'			=>	Array(
-																
-												'l-rev'	=>	Array('ParentPrefix'	=>	'l'),
-												'n-rev'	=>	Array('ParentPrefix'	=>	'n'),
-												'bb-rev'=>	Array('ParentPrefix'	=>	'bb'),
+												'l-rev'	=>	Array(
+														'ParentPrefix'	=>	'l',
+													),
+												'n-rev'	=>	Array(
+														'ParentPrefix'	=>	'n',
+													),
+												'bb-rev'=>	Array(
+														'ParentPrefix'	=>	'bb',
+													),
 												/*'p-rev'	=>	Array('ParentPrefix'	=>	'p'),*/
 											),
-											
+
 					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
 					'EventHandlerClass'	=>	Array('class'=>'ReviewsEventHandler','file'=>'reviews_event_handler.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'ReviewsTagProcessor','file'=>'reviews_tag_processor.php','build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
-					
+
 					'QueryString'		=>	Array(
 												1	=>	'id',
 												2	=>	'page',
 												3	=>	'event',
 											),
-											
-											
+
+
 					'ParentPrefix' 		=> 'p', // replace all usage of rev to "p-rev" and then remove this param from here and Prefix too
-											
+
 					'IDField'			=>	'ReviewId',
 					'StatusField'		=>	Array('Status'),	// field, that is affected by Approve/Decline events
 					'TableName'			=>	TABLE_PREFIX.'ItemReview',
 					'ParentTableKey'	=>	'ResourceId',	// linked field in master table
 					'ForeignKey'		=>	'ItemId',		// linked field in subtable
-					
+
 					'AutoDelete'		=>	true,
 					'AutoClone'			=>	true,
-					
+
 					'TitlePresets'		=>	Array(
 												'reviews_edit'	=>	Array('format'	=>	"!la_title_Editing_Review!"),
-											),				
+											),
 					'FilterMenu'		=>	Array(
 												'Groups' => Array(
 													Array('mode' => 'AND', 'filters' => Array('show_active','show_pending','show_disabled'), 'type' => WHERE_FILTER),
@@ -48,7 +53,7 @@
 													'show_disabled'	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0'  ),
 												)
 											),
-															
+
 					'CalculatedFields'	=>	Array(
 												''			=>	Array(
 																	'ReviewedBy'	=>	'IF( ISNULL(pu.Login), IF (%1$s.CreatedById = -1, \'root\', IF (%1$s.CreatedById = -2, \'Guest\', \'n/a\')), pu.Login )',
@@ -63,31 +68,31 @@
 																	'ItemName'		=>	'pr.l1_Name',
 																	'ProductId'		=>	'pr.ProductId',
 																),
-					
+
 											),
-														
-					// key - special, value - list select sql						
+
+					// key - special, value - list select sql
 					'ListSQLs'			=>	Array(	''=>'SELECT %1$s.* %2$s FROM %1$s
 														 LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON	pu.PortalUserId = %1$s.CreatedById',
-					
+
 													'products'	=> 	'	SELECT %1$s.* %2$s
 																		FROM %1$s, '.TABLE_PREFIX.'Products pr
 															 			LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON	pu.PortalUserId = %1$s.CreatedById',
-													
+
 													'product'	=> 	'	SELECT %1$s.* %2$s
 																		FROM %1$s, '.TABLE_PREFIX.'Products pr
 																		LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON	pu.PortalUserId = %1$s.CreatedById',
 											),
 
 					'ItemSQLs'			=>	Array(	''=>	'SELECT * FROM %s'),
-					
-					'ListSortings'		=> 	Array( 
+
+					'ListSortings'		=> 	Array(
 																'' => Array(
 																	'ForcedSorting' => Array('Priority' => 'desc'),
 																	'Sorting' => Array('CreatedOn' => 'desc'),
 																)
-															),	
-					
+															),
+
 					'Fields'			=>	Array(
 											    'ReviewId' => Array('type'=>'int'),
 											    'CreatedOn' => Array('formatter'=>'kDateFormatter','not_null'=>1,'default'=>'#NOW#'),
@@ -97,14 +102,14 @@
 											    'CreatedById' => Array('formatter'=>'kLEFTFormatter','options'=>Array(-1=>'root',-2=>'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1),
 											    'ItemType' => Array('type'=>'int','not_null'=>1,'default'=>0),
 											    'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0),
-											    'Status' => Array('formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>0 ),
+											    'Status' => Array('formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>2 ),
 											    'TextFormat' => Array('type'=>'int','not_null'=>1,'default'=>0),
 											    'Module' => Array('type'=>'string','not_null'=>1,'default'=>''),
 											),
 					'VirtualFields'		=>	Array(
 												'ReviewedBy'	=>	Array(),
 											),
-											
+
 					'Grids'	=> Array(
 								'Default'		=>	Array(	'Icons' => Array('default'=>'icon16_custom.gif',1=>'icon16_review.gif',2=>'icon16_review_pending.gif',0=>'icon16_review_disabled.gif'),
 															'Fields' => Array(
@@ -113,17 +118,17 @@
 																				'CreatedOn_formatted' => Array( 'title'=>'la_col_CreatedOn', 'sort_field' => 'CreatedOn'  ),
 																				'Status' => Array( 'title'=>'la_col_Status' ),
 																			),
-																	
+
 													),
-													
+
 								'ReviewsSection'	=>	Array(	'Icons' => Array('default'=>'icon16_custom.gif',1=>'icon16_review.gif',2=>'icon16_review_pending.gif',0=>'icon16_review_disabled.gif'),
 															'Fields' => Array(
 																				'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'data_block' => 'grid_checkbox_namelink_td'),
 																				'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy' ),
 																				'CreatedOn_formatted' => Array( 'title'=>'la_col_CreatedOn', 'sort_field' => 'CreatedOn' ),
 																				'Status' => Array( 'title'=>'la_col_Status' ),
 																			),
-																	
+
 													),
 								),
 	);
Index: branches/unlabeled/unlabeled-1.4.34/core/units/stylesheets/stylesheets_config.php
===================================================================
diff -u -r5725 -r6219
--- branches/unlabeled/unlabeled-1.4.34/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 5725)
+++ branches/unlabeled/unlabeled-1.4.34/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 6219)
@@ -69,7 +69,7 @@
 																								'label'			=>	'la_tab_Stylesheets',
 																								'url'			=>	Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'),
 																								'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
-																								'priority'		=>	3,
+																								'priority'		=>	4,
 																								'type'			=>	stTREE,
 																						),
 					
Index: branches/unlabeled/unlabeled-1.9.4/core/admin_templates/groups/permissions_selector.tpl
===================================================================
diff -u -r5728 -r6219
--- branches/unlabeled/unlabeled-1.9.4/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 5728)
+++ branches/unlabeled/unlabeled-1.9.4/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 6219)
@@ -16,7 +16,7 @@
 	  				a_toolbar = new ToolBar();
 					a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							set_hidden_field('advanced_save', 1);
-							submit_event('g-perm','OnSavePermissions');
+							submit_event('g-perm','OnGroupSavePermissions');
 							}
 						) );
 					a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
Index: branches/unlabeled/unlabeled-1.3.4/core/units/images/image_tag_processor.php
===================================================================
diff -u -r5728 -r6219
--- branches/unlabeled/unlabeled-1.3.4/core/units/images/image_tag_processor.php	(.../image_tag_processor.php)	(revision 5728)
+++ branches/unlabeled/unlabeled-1.3.4/core/units/images/image_tag_processor.php	(.../image_tag_processor.php)	(revision 6219)
@@ -5,6 +5,7 @@
 	function Image($params)
 	{
 		$params['img_path'] = $this->ImageSrc($params);
+		if ($params['img_path'] === false) return ;
 		$params['img_size'] = $this->ImageSize($params);
 		if (!$params['img_size']){
 			$params['img_size'] = ' width="'.getArrayValue($params, 'DefaultWidth').'"';
@@ -114,7 +115,8 @@
 			if ( $object->GetDBField('LocalImage') && !file_exists(FULL_PATH.'/'.$object->GetDBField('LocalPath')) ) $ret = '';
 		}
 
-		return ($ret && $ret != PROTOCOL.SERVER_NAME.BASE_PATH && $ret != PROTOCOL.SERVER_NAME.BASE_PATH.'/') ? $ret : PROTOCOL.SERVER_NAME.BASE_PATH.THEMES_PATH.'/'.$this->SelectParam($params, 'default_image,DefaultImage');
+		$default_image = $this->SelectParam($params, 'default_image,DefaultImage');
+		return ($ret && $ret != PROTOCOL.SERVER_NAME.BASE_PATH && $ret != PROTOCOL.SERVER_NAME.BASE_PATH.'/') ? $ret : ($default_image ? PROTOCOL.SERVER_NAME.BASE_PATH.THEMES_PATH.'/'.$default_image : false);
 	}
 
 	function GetFullPath($path)
@@ -147,6 +149,7 @@
 	{
 		$img_path = $this->GetFullPath( getArrayValue($params, 'img_path') );
 
+		if (!file_exists($img_path)) return false;
 		$image_info = @getimagesize($img_path);
 
 //		if( !($img_path && file_exists($img_path) && isset($image_info) ) )
Index: branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_tag_processor.php
===================================================================
diff -u -r5728 -r6219
--- branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_tag_processor.php	(.../reviews_tag_processor.php)	(revision 5728)
+++ branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_tag_processor.php	(.../reviews_tag_processor.php)	(revision 6219)
@@ -2,8 +2,6 @@
 
 class ReviewsTagProcessor extends kDBTagProcessor
 {
-
-
 	/**
 	 * Returns a link for editing product
 	 *
@@ -24,7 +22,7 @@
 				$item_prefix.'_event'	=>	'OnEdit',
 				$item_prefix.'_id'		=>	$item_id,
 				'pass'					=>	'all,'.$item_prefix
-			), 'index4.php');
+			), 'index.php');
 	}
 
 	/**
Index: branches/unlabeled/unlabeled-1.5.2/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r5725 -r6219
--- branches/unlabeled/unlabeled-1.5.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 5725)
+++ branches/unlabeled/unlabeled-1.5.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6219)
@@ -9,18 +9,18 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_option">
-		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>	
+		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_select">
 	<select name="<inp2:CustomInputName/>">
-		<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
+		<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
 	</select>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_checkbox">
 	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field" db="db"/>">
-	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
+	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_textarea">
@@ -32,23 +32,55 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_radio">
-			<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
+			<inp2:PredefinedOptions field="$field" block="config_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="config_edit_date">
+	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
+		<script type="text/javascript" src="incs/calendar.js"></script>
+		<inp2:m_set calendar_included="1"/>
+	</inp2:m_if>
+	
+	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
+	<script type="text/javascript">
+		initCalendar("<inp2:CustomInputName append="_date"/>", "<inp2:CustomFormat append="_date" input_format="1"/>");
+	</script>
+	<input type="hidden" name="<inp2:CustomInputName append="_time"/>" value="">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="config_edit_datetime">
+	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
+		<script type="text/javascript" src="incs/calendar.js"></script>
+		<inp2:m_set calendar_included="1"/>
+	</inp2:m_if>
+	
+	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
+	<script type="text/javascript">
+		initCalendar("<inp2:CustomInputName append="_date"/>", "<inp2:CustomFormat append="_date" input_format="1"/>");
+	</script>
+	&nbsp;<input type="text" name="<inp2:CustomInputName append="_time"/>" id="<inp2:CustomInputName append="_time"/>" value="<inp2:CustomField append="_time" format="_regional_InputTimeFormat"/>" size="<inp2:CustomFormat append="_time" input_format="1" edit_size="edit_size"/>"><span class="small"> (<inp2:CustomFormat append="_time" input_format="1" human="true"/>)</span>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="cv_row_block">
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
-			<td colspan="5">
+			<td colspan="3">
 				<inp2:Field name="Heading" as_label="1"/>
 			</td>
+			<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
+				<td><inp2:m_phrase name="$original_title"/></td>
+			</inp2:m_if>
 		</tr>
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" >
 		<inp2:m_ParseBlock name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
 		<td valign="top" class="text">
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 		</td>
-		<td class="error">&nbsp;</td>
+		<td class="error"><inp2:CustomError/>&nbsp;</td>
+		<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$SourcePrefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
@@ -58,6 +90,11 @@
 	</td>
 </inp2:m_DefineElement>
 
+
+<inp2:m_block name="grid_original_td" />
+	<td valign="top" class="text"><inp2:Field field="$field" grid="$grid"/></td>
+<inp2:m_blockend />
+
 <!--<inp2:m_DefineElement name="edit_custom_td">
 	<td valign="top" class="text">
 		<input type="hidden" name="<inp2:InputName field="ResourceId"/>" id="<inp2:InputName field="ResourceId"/>" value="<inp2:Field field="ResourceId" grid="$grid"/>">
Index: branches/unlabeled/unlabeled-1.10.2/core/units/config_search/config_search_event_handler.php
===================================================================
diff -u -r5725 -r6219
--- branches/unlabeled/unlabeled-1.10.2/core/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 5725)
+++ branches/unlabeled/unlabeled-1.10.2/core/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 6219)
@@ -60,7 +60,7 @@
 		}
 		
 		/**
-		 * Enter description here...
+		 * [HOOK] Enter description here...
 		 *
 		 * @param kEvent $event
 		 */
@@ -75,12 +75,11 @@
 			$object =& $event->getObject( Array('skip_autoload' => true) );
 			
 			$custom_id = $custom_field->GetID();
-			if ($custom_id) {
+			if ($object->GetDBField('CustomFieldId') != $custom_id) {
 				$object->Load($custom_id, 'CustomFieldId');
-				$object->SetDBField('CustomFieldId', $custom_id);	// for cloning only
 			}
-						
-			$cf_search = Array();			
+			
+			$cf_search = Array();
 			$cf_search['DisplayOrder']	=	$custom_field->GetDBField('DisplayOrder');
 			$cf_search['ElementType']	=	$custom_field->GetDBField('ElementType');
 			$cf_search['DisplayName']	=	$custom_field->GetDBField('FieldLabel');
@@ -96,6 +95,7 @@
 			$cf_search['ModuleName']	=	$this->Conn->GetOne($sql);
 			
 			$object->SetFieldsFromHash($cf_search);
+			$object->SetDBField('CustomFieldId', $custom_id);
 			
 			$result = $object->isLoaded() ? $object->Update() : $object->Create();
 		}
Index: branches/unlabeled/unlabeled-1.5.2/core/units/config_search/config_search_config.php
===================================================================
diff -u -r5725 -r6219
--- branches/unlabeled/unlabeled-1.5.2/core/units/config_search/config_search_config.php	(.../config_search_config.php)	(revision 5725)
+++ branches/unlabeled/unlabeled-1.5.2/core/units/config_search/config_search_config.php	(.../config_search_config.php)	(revision 6219)
@@ -68,25 +68,25 @@
 					
 					
 				  'Fields' 		=>	Array(
-								            'TableName' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''),
-								            'FieldName' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''),
-								            'SimpleSearch' => Array('type' => 'int','not_null' => '1','default' => '1'),
-								            'AdvancedSearch' => Array('type' => 'int','not_null' => '1','default' => '1'),
-								            'Description' => Array('type' => 'string','default' => ''),
-								            'DisplayName' => Array('type' => 'string', 'required' => 1, 'default' => ''),
-								            'ModuleName' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'),
-								            'ConfigHeader' => Array('type' => 'string', 'required' => 1, 'default' => ''),
-								            'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'),
-								            'SearchConfigId' => Array('type' => 'int','not_null' => '1','default' => ''),
-								            'Priority' => Array('type' => 'int','not_null' => '1','default' => '0'),
-								            'FieldType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text' => 'text', 'range' => 'range', 'boolean' => 'boolean', 'date' => 'date'), 'not_null' => '1', 'required' => 1, 'default' => 'text'),
-								            'ForeignField' => Array('type' => 'string','default' => null),
-								            'JoinClause' => Array('type' => 'string','default' => null),
-								            'IsWhere' => Array('type' => 'string','default' => null),
-								            'IsNotWhere' => Array('type' => 'string','default' => null),
-								            'ContainsWhere' => Array('type' => 'string','default' => null),
-								            'NotContainsWhere' => Array('type' => 'string','default' => null),
-								            'CustomFieldId' => Array('type' => 'int', 'default' => null),
+								            'TableName'			=>	Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''),
+								            'FieldName'			=>	Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''),
+								            'SimpleSearch'		=>	Array('type' => 'int','not_null' => '1','default' => '1'),
+								            'AdvancedSearch'	=>	Array('type' => 'int','not_null' => '1','default' => '1'),
+								            'Description'		=>	Array('type' => 'string','default' => ''),
+								            'DisplayName'		=>	Array('type' => 'string', 'required' => 1, 'default' => ''),
+								            'ModuleName'		=>	Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'),
+								            'ConfigHeader'		=>	Array('type' => 'string', 'required' => 1, 'default' => ''),
+								            'DisplayOrder'		=>	Array('type' => 'int','not_null' => '1','default' => '0'),
+								            'SearchConfigId'	=>	Array('type' => 'int','not_null' => '1','default' => ''),
+								            'Priority'			=>	Array('type' => 'int','not_null' => '1','default' => '0'),
+								            'FieldType'			=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text' => 'text', 'range' => 'range', 'boolean' => 'boolean', 'date' => 'date'), 'not_null' => '1', 'required' => 1, 'default' => 'text'),
+								            'ForeignField'		=>	Array('type' => 'string','default' => null),
+								            'JoinClause'		=>	Array('type' => 'string','default' => null),
+								            'IsWhere'			=>	Array('type' => 'string','default' => null),
+								            'IsNotWhere'		=>	Array('type' => 'string','default' => null),
+								            'ContainsWhere'		=>	Array('type' => 'string','default' => null),
+								            'NotContainsWhere'	=>	Array('type' => 'string','default' => null),
+								            'CustomFieldId'		=>	Array('type' => 'int', 'default' => null),
 											),
 
 					'VirtualFields'	=> 	Array(
Index: branches/unlabeled/unlabeled-1.4.4/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -r5728 -r6219
--- branches/unlabeled/unlabeled-1.4.4/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 5728)
+++ branches/unlabeled/unlabeled-1.4.4/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 6219)
@@ -1,6 +1,6 @@
 <inp2:m_XMLTemplate/>
 <inp2:m_DefineElement name="category">
-	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink index_file="browse.php" template="catalog" pass="m"/>" onclick="checkEditMode()" load_url="<inp2:CategoryLink pass="m"/>"></folder>
+	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>)" load_url="<inp2:CategoryLink pass="m"/>"></folder>
 </inp2:m_DefineElement>
 <tree>
 <inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:" per_page="-1"/>
Index: branches/unlabeled/unlabeled-1.4.4/core/units/relationship/relationship_config.php
===================================================================
diff -u -r5728 -r6219
--- branches/unlabeled/unlabeled-1.4.4/core/units/relationship/relationship_config.php	(.../relationship_config.php)	(revision 5728)
+++ branches/unlabeled/unlabeled-1.4.4/core/units/relationship/relationship_config.php	(.../relationship_config.php)	(revision 6219)
@@ -4,12 +4,13 @@
 					'Prefix'			=>	'rel',
 
 					'Clones'			=>	Array(
-
+												'c-rel'	=>	Array('ParentPrefix'	=>	'c'),
 												'l-rel'	=>	Array('ParentPrefix'	=>	'l'),
 												'n-rel'	=>	Array('ParentPrefix'	=>	'n'),
 												'bb-rel'=>	Array('ParentPrefix'	=>	'bb'),
 												'cms-rel'=>	Array('ParentPrefix'	=>	'cms'),
 												/*'p-rel'	=>	Array('ParentPrefix'	=>	'p'),*/
+												'cms-rel'=>	Array('ParentPrefix'	=>	'cms'),
 											),
 
 					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
@@ -77,14 +78,14 @@
 					'ItemSQLs'			=>	Array(	'' => 'SELECT %1$s.* %2$s FROM %1$s #ITEM_JOIN#',),
 
 					'Fields'			=>	Array(
-											    'RelationshipId' => Array(),
-												'SourceId' => Array('type'=>'int'),
-												'TargetId' => Array('type'=>'int'),
-												'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0),
-												'TargetType' => Array('type'=>'int','not_null'=>1,'default'=>0),
-												'Type' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(1=>'la_Reciprocal',0=>'la_OneWay'),'not_null'=>1,'default'=>0,'use_phrases'=>1),
-												'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'),'not_null'=>1,'default'=>1,'use_phrases'=>1),
-												'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0),
+											    'RelationshipId'	=>	Array(),
+												'SourceId'			=>	Array('type'=>'int', 'required' => 1, 'default' => 0),
+												'TargetId'			=>	Array('type'=>'int', 'required' => 1, 'default' => ''),
+												'SourceType'		=>	Array('type'=>'int','not_null'=>1,'default'=>0),
+												'TargetType'		=>	Array('type'=>'int','not_null'=>1,'default'=>0),
+												'Type'				=>	Array('type'=>'int','formatter'=>'kOptionsFormatter', 'required' => 1, 'options'=>Array(1=>'la_Reciprocal',0=>'la_OneWay'),'not_null'=>1,'default'=>0,'use_phrases'=>1),
+												'Enabled'			=>	Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'),'not_null'=>1,'default'=>1,'use_phrases'=>1),
+												'Priority'			=>	Array('type'=>'int','not_null'=>1,'default'=>0),
 											),
 					'VirtualFields'	=> 	Array(	'ItemName' => Array(),
 												'ItemType' => Array(),
Index: branches/unlabeled/unlabeled-1.4.4/core/units/images/images_config.php
===================================================================
diff -u -r5728 -r6219
--- branches/unlabeled/unlabeled-1.4.4/core/units/images/images_config.php	(.../images_config.php)	(revision 5728)
+++ branches/unlabeled/unlabeled-1.4.4/core/units/images/images_config.php	(.../images_config.php)	(revision 6219)
@@ -7,7 +7,7 @@
 											'n-img'	=>	Array('ParentPrefix'	=>	'n'),
 											'bb-img'=>	Array('ParentPrefix'	=>	'bb'),
 											/*'p-img'	=>	Array('ParentPrefix'	=>	'p'),*/
-											'catimg' => Array('ParentPrefix'	=>	'c'),
+											'c-img' => 	Array('ParentPrefix'	=>	'c'),
 									),
 									
 					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),