Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/image_blocks.tpl
===================================================================
diff -u -r1275 -r1308
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 1275)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 1308)
@@ -1,5 +1,5 @@
-<inp:m_block name="preview_td"/>
+<inp2:m_block name="preview_td"/>
 	<td>
-		<inp:$PrefixSpecial_ImagePreview type="$type" DefaultImage="kernel/images/noimage.gif" max_width="$max_width" max_height="$max_height"/>
+		<inp2:$PrefixSpecial_ImagePreview type="$type" DefaultImage="kernel/images/noimage.gif" max_width="$max_width" max_height="$max_height"/>
 	</td>
-<inp:m_blockend/>
\ No newline at end of file
+<inp2:m_blockend/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r1288 -r1308
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 1288)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 1308)
@@ -1,45 +1,45 @@
-<inp:m_block name="config_edit_text" />
-	<input type="text" name="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="<inp:$PrefixSpecial_Field field="$field" />" />
-<inp:m_blockend />
+<inp2:m_block name="config_edit_text" />
+	<input type="text" name="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="<inp2:$PrefixSpecial_Field field="$field" />" />
+<inp2:m_blockend />
 
-<inp:m_block name="config_edit_password" />
-	<input type="password" primarytype="password" name="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" id="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="" />
-	<input type="password" name="verify_<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" id="verify_<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="" />
-	&nbsp;<span class="error" id="error_<inp:$PrefixSpecial_InputName field="$field"/>"></span>
-<inp:m_blockend />
+<inp2:m_block name="config_edit_password" />
+	<input type="password" primarytype="password" name="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="" />
+	<input type="password" name="verify_<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" id="verify_<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="" />
+	&nbsp;<span class="error" id="error_<inp2:$PrefixSpecial_InputName field="$field"/>"></span>
+<inp2:m_blockend />
 
-<inp:m_block name="config_edit_option" />
-		<option value="<inp:m_param name="key"/>"<inp:m_param name="selected"/>><inp:m_param name="option"/></option>	
-<inp:m_blockend />
+<inp2:m_block name="config_edit_option" />
+		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>	
+<inp2:m_blockend />
 
-<inp:m_block name="config_edit_select" />
-	<select name="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>">
-		<inp:$PrefixSpecial_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
+<inp2:m_block name="config_edit_select" />
+	<select name="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>">
+		<inp2:$PrefixSpecial_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
 	</select>
-<inp:m_blockend />
+<inp2:m_blockend />
 
-<inp:m_block name="config_edit_checkbox"/>
-	<input type="hidden" id="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" name="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="<inp:$PrefixSpecial_Field field="$field" db="db"/>">
-	<input tabindex="<inp:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp:m_param name="field"/>" name="_cb_<inp:m_param name="field"/>" <inp:$PrefixSpecial_Field field="$field" checked="checked" db="db"/> class="<inp:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>'))">
-<inp:m_blockend/>
+<inp2:m_block name="config_edit_checkbox"/>
+	<input type="hidden" id="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" name="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="<inp2:$PrefixSpecial_Field field="$field" db="db"/>">
+	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:$PrefixSpecial_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>'))">
+<inp2:m_blockend/>
 
-<inp:m_block name="config_edit_textarea" />
-	<textarea name="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" <inp:m_param name="field_params" />><inp:$PrefixSpecial_Field field="$field" /></textarea>
-<inp:m_blockend />
+<inp2:m_block name="config_edit_textarea" />
+	<textarea name="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" <inp2:m_param name="field_params" />><inp2:$PrefixSpecial_Field field="$field" /></textarea>
+<inp2:m_blockend />
 
-<inp:m_block name="config_radio_item"/>
-	<input type="radio" <inp:m_param name="checked"/> name="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" id="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>_<inp:m_param name="key"/>" value="<inp:m_param name="key"/>"><label for="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>_<inp:m_param name="key"/>"><inp:m_param name="option"/></label>&nbsp;
-<inp:m_blockend/>
+<inp2:m_block name="config_radio_item"/>
+	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
+<inp2:m_blockend/>
 
-<inp:m_block name="config_edit_radio"/>
-			<inp:$PrefixSpecial_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
-<inp:m_blockend/>
+<inp2:m_block name="config_edit_radio"/>
+			<inp2:$PrefixSpecial_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
+<inp2:m_blockend/>
 
-<inp:m_block name="edit_custom_td" />
+<inp2:m_block name="edit_custom_td" />
 	<td valign="top" class="text">
-		<input type="hidden" name="<inp:$PrefixSpecial_InputName field="ResourceId" idfield="$IdField"/>" id="<inp:$PrefixSpecial_InputName field="ResourceId" idfield="$IdField"/>" value="<inp:$PrefixSpecial_field field="ResourceId" grid="$grid"/>">
-		<input type="hidden" name="<inp:$PrefixSpecial_InputName field="CustomDataId" idfield="$IdField"/>" id="<inp:$PrefixSpecial_InputName field="CustomDataId" idfield="$IdField"/>" value="<inp:$PrefixSpecial_field field="CustomDataId" grid="$grid"/>">
-		<!--<input size="40" type="text" name="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" id="<inp:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="<inp:$PrefixSpecial_field field="$field" grid="$grid"/>">-->
-		<inp:$PrefixSpecial_ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
+		<input type="hidden" name="<inp2:$PrefixSpecial_InputName field="ResourceId" idfield="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="ResourceId" idfield="$IdField"/>" value="<inp2:$PrefixSpecial_field field="ResourceId" grid="$grid"/>">
+		<input type="hidden" name="<inp2:$PrefixSpecial_InputName field="CustomDataId" idfield="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="CustomDataId" idfield="$IdField"/>" value="<inp2:$PrefixSpecial_field field="CustomDataId" grid="$grid"/>">
+		<!--<input size="40" type="text" name="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$field" idfield="$IdField"/>" value="<inp2:$PrefixSpecial_field field="$field" grid="$grid"/>">-->
+		<inp2:$PrefixSpecial_ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 	</td>
-<inp:m_blockend />
\ No newline at end of file
+<inp2:m_blockend />
\ No newline at end of file