Index: branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -r11623 -r11698
--- branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 11698)
@@ -74,7 +74,7 @@
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 				<inp2:m_inc param="tab_index" by="1"/>
 				<td class="label-cell">
 					<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: branches/RC/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r11623 -r11698
--- branches/RC/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 11698)
@@ -81,23 +81,25 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="UserDocsUrl" title="la_fld_UserDocsUrl"/>
 
 			<inp2:m_if check="lang_IsNewMode">
-				<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-					<inp2:m_inc param="tab_index" by="1"/>
-					<td class="label-cell">
-						<inp2:m_phrase name="la_fld_CopyLabels"/>:
-					</td>
-					<td class="control-mid">&nbsp;</td>
-					<td class="control-cell">
-						<input type="hidden" id="<inp2:lang_InputName field="CopyLabels"/>" name="<inp2:lang_InputName field="CopyLabels"/>" value="<inp2:lang_Field field="CopyLabels" db="db"/>">
-						<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_CopyLabels" name="_cb_CopyLabels" <inp2:lang_Field field="CopyLabels" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:lang_InputName field="CopyLabels"/>'))">
-
+				<inp2:m_if check="lang_FieldVisible" field="CopyLabels">
+					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 						<inp2:m_inc param="tab_index" by="1"/>
-						<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lang_InputName field="CopyFromLanguage"/>" id="<inp2:lang_InputName field="CopyFromLanguage"/>">
-							<option value="0">--<inp2:m_phrase name="la_prompt_Select_Source"/></option>
-							<inp2:lang_PredefinedOptions field="CopyFromLanguage" block="inp_option_item" selected="selected"/>
-						</select>
-					</td>
-				</tr>
+						<td class="label-cell">
+							<inp2:m_phrase name="la_fld_CopyLabels"/>:
+						</td>
+						<td class="control-mid">&nbsp;</td>
+						<td class="control-cell">
+							<input type="hidden" id="<inp2:lang_InputName field="CopyLabels"/>" name="<inp2:lang_InputName field="CopyLabels"/>" value="<inp2:lang_Field field="CopyLabels" db="db"/>">
+							<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_CopyLabels" name="_cb_CopyLabels" <inp2:lang_Field field="CopyLabels" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:lang_InputName field="CopyLabels"/>'))">
+
+							<inp2:m_inc param="tab_index" by="1"/>
+							<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lang_InputName field="CopyFromLanguage"/>" id="<inp2:lang_InputName field="CopyFromLanguage"/>">
+								<option value="0">--<inp2:m_phrase name="la_prompt_Select_Source"/></option>
+								<inp2:lang_PredefinedOptions field="CopyFromLanguage" block="inp_option_item" selected="selected"/>
+							</select>
+						</td>
+					</tr>
+				</inp2:m_if>
 			</inp2:m_if>
 	</table>
 </div>
Index: branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r11623 -r11698
--- branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11698)
@@ -84,7 +84,7 @@
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 				<inp2:m_inc param="tab_index" by="1"/>
 				<td class="label-cell">
 					<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: branches/RC/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r11623 -r11698
--- branches/RC/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 11698)
@@ -47,7 +47,7 @@
 </table>
 
 <inp2:m_DefineElement name="inp_edit_color">
-	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+	<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" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td class="control-cell">
 			<input	type="text"
@@ -70,7 +70,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_options_style">
-	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+	<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" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td class="control-cell">
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" onchange="<inp2:m_Param name="onchange"/>">
Index: branches/RC/core/admin_templates/regional/languages_export_step2.tpl
===================================================================
diff -u -r11623 -r11698
--- branches/RC/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 11698)
@@ -26,7 +26,7 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
 
-		<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 			<td class="label-cell">
 				<inp2:m_phrase label="la_DownloadLanguageExport"/>:
 			</td>
Index: branches/RC/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -r11668 -r11698
--- branches/RC/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 11668)
+++ branches/RC/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 11698)
@@ -97,7 +97,7 @@
 		<inp2:m_RenderElement name="subsection" title="!la_section_Data!"/>
 
 			<inp2:m_DefineElement name="form_field">
-				<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 					<inp2:m_inc param="tab_index" by="1"/>
 					<td class="label-cell">
 						<inp2:Field field="Prompt" plus_or_as_label="1" no_special="no_special"/>:
Index: branches/RC/core/admin_templates/emails/send_complete.tpl
===================================================================
diff -u -r11538 -r11698
--- branches/RC/core/admin_templates/emails/send_complete.tpl	(.../send_complete.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/emails/send_complete.tpl	(.../send_complete.tpl)	(revision 11698)
@@ -17,7 +17,7 @@
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_prompt_EmailCompleteMessage"/>
-		<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 			<td colspan="3" align="center">
 				<input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="close_window();"/>
 			</td>
Index: branches/RC/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -r11650 -r11698
--- branches/RC/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 11650)
+++ branches/RC/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 11698)
@@ -60,13 +60,15 @@
 </table>
 
 <inp2:m_DefineElement name="replacement_item" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
-	<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 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%">
@@ -90,186 +92,184 @@
 			.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"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Font Color (HeadColor)</td>
-							<td>Background (HeadBgColor)</td>
-							<td>Bar Text Color (HeadBarColor)</td>
-							<td>Bar Background (HeadBarBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[HeadColor][Value]"
-									value="<inp2:skin_Field name="Options" format="HeadColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[HeadBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="HeadBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[HeadBarColor][Value]"
-									value="<inp2:skin_Field name="Options" format="HeadBarColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[HeadBarBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="HeadBarBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+		<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"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Font Color (HeadColor)</td>
+						<td>Background (HeadBgColor)</td>
+						<td>Bar Text Color (HeadBarColor)</td>
+						<td>Bar Background (HeadBarBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[HeadColor][Value]"
+								value="<inp2:skin_Field name="Options" format="HeadColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[HeadBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="HeadBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[HeadBarColor][Value]"
+								value="<inp2:skin_Field name="Options" format="HeadBarColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[HeadBarBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="HeadBarBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
-			<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"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Section Title Color (SectionColor)</td>
-							<td>Section Background (SectionBgColor)</td>
-							<td>Titlebar Font Color (TitleBarColor)</td>
-							<td>Titlebar Background (TitleBarBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[SectionColor][Value]"
-									value="<inp2:skin_Field name="Options" format="SectionColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[SectionBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="SectionBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TitleBarColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TitleBarColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TitleBarBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TitleBarBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+
+		<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"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Section Title Color (SectionColor)</td>
+						<td>Section Background (SectionBgColor)</td>
+						<td>Titlebar Font Color (TitleBarColor)</td>
+						<td>Titlebar Background (TitleBarBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[SectionColor][Value]"
+								value="<inp2:skin_Field name="Options" format="SectionColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[SectionBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="SectionBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TitleBarColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TitleBarColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TitleBarBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TitleBarBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
-			<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"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Toolbar Backgroun (ToolbarBgColor)</td>
-							<td>Filter Row Background (FiltersBgColor)</td>
-							<td>Column Titles Color (ColumnTitlesColor)</td>
-							<td>Column Titles Background (ColumnTitlesBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[ToolbarBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="ToolbarBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[FiltersBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="FiltersBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[ColumnTitlesColor][Value]"
-									value="<inp2:skin_Field name="Options" format="ColumnTitlesColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[ColumnTitlesBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="ColumnTitlesBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+
+		<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"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Toolbar Backgroun (ToolbarBgColor)</td>
+						<td>Filter Row Background (FiltersBgColor)</td>
+						<td>Column Titles Color (ColumnTitlesColor)</td>
+						<td>Column Titles Background (ColumnTitlesBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[ToolbarBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="ToolbarBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[FiltersBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="FiltersBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[ColumnTitlesColor][Value]"
+								value="<inp2:skin_Field name="Options" format="ColumnTitlesColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[ColumnTitlesBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="ColumnTitlesBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
-		<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"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Grid Odd Row Color (OddColor)</td>
-							<td>Grid Odd Row Background Color (OddBgColor)</td>
-							<td>Grid Even Row Color (EvenColor)</td>
-							<td>Grid Even Row Background Color (EvenBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[OddColor][Value]"
-									value="<inp2:skin_Field name="Options" format="OddColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[OddBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="OddBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[EvenColor][Value]"
-									value="<inp2:skin_Field name="Options" format="EvenColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[EvenBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="EvenBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+
+		<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"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Grid Odd Row Color (OddColor)</td>
+						<td>Grid Odd Row Background Color (OddBgColor)</td>
+						<td>Grid Even Row Color (EvenColor)</td>
+						<td>Grid Even Row Background Color (EvenBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[OddColor][Value]"
+								value="<inp2:skin_Field name="Options" format="OddColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[OddBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="OddBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[EvenColor][Value]"
+								value="<inp2:skin_Field name="Options" format="EvenColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[EvenBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="EvenBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
 
-		<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"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Tree Color (TreeColor)</td>
-							<td>Tree Background Color (TreeBgColor)</td>
-							<td>Tree Highlighted Color (TreeHighColor)</td>
-							<td>Tree Highlighted Background Color (TreeHighBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TreeColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TreeColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TreeBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TreeBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TreeHighColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TreeHighColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TreeHighBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TreeHighBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+		<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"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Tree Color (TreeColor)</td>
+						<td>Tree Background Color (TreeBgColor)</td>
+						<td>Tree Highlighted Color (TreeHighColor)</td>
+						<td>Tree Highlighted Background Color (TreeHighBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeHighColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeHighColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeHighBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeHighBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
 
 	<!--	<inp2:m_RenderElement name="inp_edit_serialized" prefix="skin" field="Options" title="!la_fld_Options!" style="width: 100px" item_render_as="replacement_item"/>-->
Index: branches/RC/core/admin_templates/emails/mass_mail.tpl
===================================================================
diff -u -r11623 -r11698
--- branches/RC/core/admin_templates/emails/mass_mail.tpl	(.../mass_mail.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/emails/mass_mail.tpl	(.../mass_mail.tpl)	(revision 11698)
@@ -34,7 +34,7 @@
 		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
 			<!-- recipients list -->
-			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 				<inp2:m_inc param="tab_index" by="1"/>
 				<td class="label-cell">
 					<inp2:m_phrase label="la_fld_To"/>:
Index: branches/RC/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r11685 -r11698
--- branches/RC/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 11685)
+++ branches/RC/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 11698)
@@ -107,7 +107,7 @@
 		</tr>
 	</inp2:m_if>
 
-	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>', '<inp2:m_Param name="virtual_field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>')">
 			<inp2:m_RenderElement name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
Index: branches/RC/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -r11682 -r11698
--- branches/RC/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 11682)
+++ branches/RC/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 11698)
@@ -49,14 +49,16 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_relation">
-	<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" title="$title"/>
-		<td class="control-cell">
-			<inp2:m_if check="{$prefix}_Field" field="$field">
-				<img src="<inp2:{$prefix}_ModulePath />img/itemicons/<inp2:{$prefix}_ItemIcon grid="Default"/>" align="absmiddle"/>
-				<inp2:{$prefix}_Field field="ItemName" no_special="1"/> (<inp2:{$prefix}_Field field="ItemType"/>)
-			</inp2:m_if>
-		</td>
-    	<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
+	<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" title="$title"/>
+			<td class="control-cell">
+				<inp2:m_if check="{$prefix}_Field" field="$field">
+					<img src="<inp2:{$prefix}_ModulePath />img/itemicons/<inp2:{$prefix}_ItemIcon grid="Default"/>" align="absmiddle"/>
+					<inp2:{$prefix}_Field field="ItemName" no_special="1"/> (<inp2:{$prefix}_Field field="ItemType"/>)
+				</inp2:m_if>
+			</td>
+	    	<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/RC/core/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -r11623 -r11698
--- branches/RC/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 11698)
@@ -33,13 +33,15 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
 
-		<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>
-			<td class="control-cell">
-				<inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field="LangFile"/>" id="<inp2:phrases.export_InputName field="LangFile"/>" value="<inp2:phrases.export_Field field="LangFile"/>" />
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" prefix="phrases.export" field="LangFile"/>
-		</tr>
+		<inp2:m_if check="phrases.export_FieldVisible" field="LangFile">
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>
+				<td class="control-cell">
+					<inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field='LangFile'/>" id="<inp2:phrases.export_InputName field='LangFile'/>" value="<inp2:phrases.export_Field field='LangFile'/>" />
+				</td>
+				<inp2:m_RenderElement name="inp_edit_error" prefix="phrases.export" field="LangFile"/>
+			</tr>
+		</inp2:m_if>
 
 		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.export" field="PhraseType" title="!la_fld_ExportPhraseTypes!"/>
 		<inp2:m_RenderElement name="inp_edit_checkboxes" no_empty="no_empty" prefix="phrases.export" field="Module" title="!la_fld_ExportModules!"/>
Index: branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
diff -u -r11623 -r11698
--- branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 11698)
@@ -87,20 +87,22 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_recipient_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" style="width: 100%">
-	<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" title="$title" is_last="$is_last"/>
-		<td class="control-cell">
-			<inp2:m_if check="{$prefix}_IsManualRecipient">
-				<input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="$format"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>">
-			<inp2:m_else/>
-				<inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
-				<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
-			</inp2:m_if>
+	<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" title="$title" is_last="$is_last"/>
+			<td class="control-cell">
+				<inp2:m_if check="{$prefix}_IsManualRecipient">
+					<input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="$format"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>">
+				<inp2:m_else/>
+					<inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
+					<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
+				</inp2:m_if>
 
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
+				<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <div id="scroll_container">