Index: trunk/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r6797 -r8074
--- trunk/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 6797)
+++ trunk/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 8074)
@@ -140,7 +140,7 @@
 		$new_name = $filename.$ext;
 		while ( file_exists($path.'/'.$new_name) )
 		{
-	   		if ( preg_match("/({$filename}_)([0-9]*)($ext)/", $new_name, $regs) ) {
+	   		if ( preg_match('/('.preg_quote($filename, '/').'_)([0-9]*)('.preg_quote($ext, '/').')/', $new_name, $regs) ) {
 					$new_name = $regs[1].($regs[2]+1).$regs[3];
 				}
 				else {
Index: trunk/core/units/theme_files/theme_files_config.php
===================================================================
diff -u -N
--- trunk/core/units/theme_files/theme_files_config.php	(revision 0)
+++ trunk/core/units/theme_files/theme_files_config.php	(revision 8074)
@@ -0,0 +1,62 @@
+<?php
+
+$config	=	Array(
+					'Prefix'			=>	'theme-file',
+					'ItemClass'			=>	Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+					'ListClass'			=>	Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+					'EventHandlerClass'	=>	Array('class' => 'kDBEventHandler', 'file' => '', 'build_event'=>'OnBuild'),
+					'TagProcessorClass' =>	Array('class' => 'kDBTagProcessor', 'file' => '', 'build_event'=>'OnBuild'),
+					'AutoLoad'			=>	true,
+					
+					'QueryString'		=>	Array(
+												1	=>	'id',
+												2	=>	'page',
+												3	=>	'event',
+											),
+											
+					'IDField'			=>	'FileId',
+
+					'TitleField'		=>	'FileName',
+											
+					'TableName'			=>	TABLE_PREFIX.'ThemeFiles',
+
+					'ForeignKey'		=>	'ThemeId',
+					'ParentTableKey' 	=> 	'ThemeId',
+					'ParentPrefix' 		=> 	'theme',
+					'AutoDelete'		=>	true,
+					'AutoClone'			=> 	true,
+					
+					'ListSQLs'			=>	Array(	'' => 'SELECT %1$s.* %2$s FROM %s'),
+					'ItemSQLs'			=>	Array(	'' => 'SELECT %1$s.* %2$s FROM %s'),
+					
+					'ListSortings' => Array (
+						'' => Array(
+							'Sorting' => Array('FileName' => 'asc'),
+						)
+					),
+					
+					'Fields' => Array(
+						'FileId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+						'ThemeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+						'FileName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+						'FilePath' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+						'Description' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
+						'FileType' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+						'FileFound' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+					),
+
+					'Grids' => Array (
+						'Default' => Array (
+							'Icons' => Array('default' => 'icon16_custom.gif'),
+							'Fields' => Array (
+								'FileId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+								'FilePath' => Array( 'title'=>'la_col_FilePath',),
+								'FileName' 	=> Array( 'title'=>'la_col_FileName',),
+								'Description' 	=> Array( 'title'=>'la_col_Description',),
+							),
+
+						),
+					),
+	);
+
+?>
\ No newline at end of file
Index: trunk/core/admin_templates/themes/themes_edit_files.tpl
===================================================================
diff -u -N
--- trunk/core/admin_templates/themes/themes_edit_files.tpl	(revision 0)
+++ trunk/core/admin_templates/themes/themes_edit_files.tpl	(revision 8074)
@@ -0,0 +1,77 @@
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="themes_edit_files" tabs="themes/themes_edit_tabs"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  				function edit()
+	  			{
+	  				
+	  			}
+
+  				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('theme','<inp2:theme_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('theme','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('theme', '<inp2:theme_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('theme', '<inp2:theme_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('theme-file')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if prefix="theme" function="IsSingle"/>
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if prefix="theme" function="IsLast"/>
+						a_toolbar.DisableButton('next');
+					<inp2:m_endif/>
+					<inp2:m_if prefix="theme" function="IsFirst"/>
+						a_toolbar.DisableButton('prev');
+					<inp2:m_endif/>
+				<inp2:m_endif/>
+			</script>
+		</td>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="theme-file" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_ParseBlock name="grid" PrefixSpecial="theme-file" IdField="FileId" grid="Default"/>
+<script type="text/javascript">
+//	Grids['theme-file'].SetDependantToolbarButtons( new Array('edit','delete') );
+</script>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: trunk/core/units/themes/themes_config.php
===================================================================
diff -u -N -r8071 -r8074
--- trunk/core/units/themes/themes_config.php	(.../themes_config.php)	(revision 8071)
+++ trunk/core/units/themes/themes_config.php	(.../themes_config.php)	(revision 8074)
@@ -29,11 +29,11 @@
 
 						'themes_list' => Array('prefixes' => Array('theme_List'), 'format' => "!la_title_Configuration! - !la_title_Themes! (#theme_recordcount#)"),
 						'themes_edit_general' => Array('prefixes' => Array('theme'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_General!"),
-						'theme_files_list' => Array('prefixes' => Array('theme', 'theme-files_List'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_ThemeFiles! (#theme-files_recordcount#)"),
+						'themes_edit_files' => Array('prefixes' => Array('theme', 'theme-file_List'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_ThemeFiles! (#theme-file_recordcount#)"),
 					),
 											
 					'TableName'			=>	TABLE_PREFIX.'Theme',
-//					'SubItems' => Array('themefiles'),
+					'SubItems' => Array('theme-file'),
 
 					'FilterMenu'		=>	Array(
 												'Groups' => Array(