Index: trunk/core/admin_templates/themes/themes_edit.tpl
===================================================================
diff -u -N -r8073 -r8863
--- trunk/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 8073)
+++ trunk/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 8863)
@@ -32,18 +32,18 @@
 
 				a_toolbar.Render();
 
-				<inp2:m_if prefix="theme" function="IsSingle"/>
+				<inp2:m_if check="theme_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if prefix="theme" function="IsLast"/>
+					<inp2:m_if check="theme_IsLast" >
 						a_toolbar.DisableButton('next');
-					<inp2:m_endif/>
-					<inp2:m_if prefix="theme" function="IsFirst"/>
+					</inp2:m_if>
+					<inp2:m_if check="theme_IsFirst" >
 						a_toolbar.DisableButton('prev');
-					<inp2:m_endif/>
-				<inp2:m_endif/>
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
@@ -54,15 +54,15 @@
 <inp2:theme_ErrorWarning name="form_error_warning"/>
 <div id="scroll_container">
 	<table class="edit-form"> 
-		<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
-			<inp2:m_ParseBlock name="inp_id_label" prefix="theme" field="ThemeId" title="la_fld_Id"/>
-			<inp2:m_ParseBlock name="inp_edit_box" prefix="theme" field="Name" title="la_fld_Name"/>
-			<inp2:m_ParseBlock name="inp_edit_textarea" prefix="theme" field="Description" title="la_fld_Description" cols="25" rows="5"/>
-			<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="theme" field="Enabled" title="la_fld_Enabled"/>
+		<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_ParseBlock name="inp_edit_options" prefix="theme" field="StylesheetId" title="la_fld_Stylesheet"/>-->
+			<!--<inp2:m_RenderElement name="inp_edit_options" prefix="theme" field="StylesheetId" title="la_fld_Stylesheet"/>-->
 			
-			<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="theme" field="PrimaryTheme" title="la_fld_Primary"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="theme" field="PrimaryTheme" title="la_fld_Primary"/>
 	</table>
 </div>
 <inp2:m_include t="incs/footer"/>