Index: branches/RC/core/units/themes/themes_eh.php
===================================================================
diff -u -r9836 -r10745
--- branches/RC/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 9836)
+++ branches/RC/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 10745)
@@ -98,6 +98,10 @@
 		{
 			parent::SetCustomQuery($event);
 
+			if ($this->Application->IsAdmin()) {
+				return ;
+			}
+
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
Index: branches/RC/core/admin_templates/themes/themes_edit.tpl
===================================================================
diff -u -r8929 -r10745
--- branches/RC/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 10745)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="850" height="600"/>
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="themes_edit" tabs="themes/themes_edit_tabs"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="themes_edit_general" tabs="themes/themes_edit_tabs"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -53,15 +53,15 @@
 <inp2:theme_SaveWarning name="grid_save_warning"/>
 <inp2:theme_ErrorWarning name="form_error_warning"/>
 <div id="scroll_container">
-	<table class="edit-form"> 
+	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="theme" field="ThemeId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="theme" field="Name" title="la_fld_Name"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="theme" field="Description" title="la_fld_Description" cols="25" rows="5"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="theme" field="Enabled" title="la_fld_Enabled"/>
-			
+
 			<!--<inp2:m_RenderElement name="inp_edit_options" prefix="theme" field="StylesheetId" title="la_fld_Stylesheet"/>-->
-			
+
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="theme" field="PrimaryTheme" title="la_fld_Primary"/>
 	</table>
 </div>