Index: branches/5.2.x/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -N -r13840 -r14092
--- branches/5.2.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 13840)
+++ branches/5.2.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 14092)
@@ -59,41 +59,28 @@
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="replacement_item" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
-	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$Description" is_last="$is_last"/>
-			<td class="control-cell">
-				<input style="<inp2:m_Param name='style'/>" type="text"
-					name="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>][Value]" id="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>]" value="<inp2:m_Param name='Value'/>">
-			</td>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="inp_edit_serialized" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
 	<inp2:PrintSerializedFields pass_params="1" field="$field" render_as="$item_render_as"/>
 </inp2:m_DefineElement>
 
 <inp2:skin_SaveWarning name="grid_save_warning"/>
 <inp2:skin_ErrorWarning name="form_error_warning"/>
 
+<style type="text/css">
+	.skin-table td {width: 90px};
+</style>
+
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="skin" field="SkinId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="skin" field="SkinId" title="la_fld_Id"/>
 
-		<inp2:m_RenderElement name="inp_edit_box" prefix="skin" field="Name" title="!la_fld_SkinName!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="skin" field="Name" title="la_fld_SkinName" style="width: 100px"/>
 
-		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="Logo" title="!la_fld_Logo!"/>
+		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="Logo" title="la_fld_Logo"/>
 		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoBottom" title="la_fld_LogoBottom"/>
 		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoLogin" title="la_fld_LogoLogin"/>
 
-		<style type="text/css">
-			.skin-table td {width: 90px};
-		</style>
-
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_HeadFrame">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -126,10 +113,9 @@
 					</tr>
 				</table>
 			</td>
-		</tr>
+		</inp2:m_RenderElement>
 
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_GeneralSections"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_GeneralSections">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -162,10 +148,9 @@
 					</tr>
 				</table>
 			</td>
-		</tr>
+		</inp2:m_RenderElement>
 
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid1"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_DataGrid1">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -198,10 +183,9 @@
 					</tr>
 				</table>
 			</td>
-		</tr>
+		</inp2:m_RenderElement>
 
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid2"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_DataGrid2">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -234,10 +218,9 @@
 					</tr>
 				</table>
 			</td>
-		</tr>
+		</inp2:m_RenderElement>
 
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_Trees"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_Trees">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -282,10 +265,9 @@
 					</tr>
 				</table>
 			</td>
-		</tr>
+		</inp2:m_RenderElement>
 
-	<!--	<inp2:m_RenderElement name="inp_edit_serialized" prefix="skin" field="Options" title="!la_fld_Options!" style="width: 100px" item_render_as="replacement_item"/>-->
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="skin" field="CSS" title="!la_fld_CSS!" control_options="{min_height: 300}"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="skin" field="CSS" title="la_fld_CSS" control_options="{min_height: 300}"/>
 
 	</table>
 </div>