Index: branches/RC/core/admin_templates/themes/themes_edit.tpl
===================================================================
diff -u -N -r10846 -r11538
--- branches/RC/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 10846)
+++ branches/RC/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 11538)
@@ -1,8 +1,8 @@
 <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_general" tab_preset="Default"/>
 
-<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">
 <tbody>
@@ -52,6 +52,7 @@
 
 <inp2:theme_SaveWarning name="grid_save_warning"/>
 <inp2:theme_ErrorWarning name="form_error_warning"/>
+
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
@@ -66,6 +67,7 @@
 			</inp2:m_if>
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="theme" field="PrimaryTheme" title="la_fld_Primary"/>
+			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
-<inp2:m_include t="incs/footer"/>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file