Index: branches/RC/themes/default2009/platform/designs/content_boxes.tpl
===================================================================
diff -u -N -r11427 -r11456
--- branches/RC/themes/default2009/platform/designs/content_boxes.tpl	(.../content_boxes.tpl)	(revision 11427)
+++ branches/RC/themes/default2009/platform/designs/content_boxes.tpl	(.../content_boxes.tpl)	(revision 11456)
@@ -172,4 +172,4 @@
 			<a href="<inp2:DownloadFileLink />"><inp2:Field name="FileName"/></a>
 		</td>
 	<tr>
-</inp2:m_DefineElement>
\ No newline at end of file
+</inp2:m_DefineElement>elements/html_head
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/my_account/my_favorites.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 11456)
@@ -15,7 +15,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MyAccount,lu_title_MyFavorites" templates="platform/my_account/my_account,platform/my_account/my_favorites"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyFavorites" templates="platform/my_account/my_account,platform/my_account/my_favorites"/>
 
 	<!-- my favorites -->
 	<inp2:m_Set favorites_found="0"/>
Index: branches/RC/themes/default2009/platform/elements/banners/banner_top.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/banners/banner_top.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/banners/banner_top.elm.tpl	(revision 11456)
@@ -0,0 +1,2 @@
+<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/top_baner_1.gif" width="500" height="70" alt="" /><br />
+<!--## <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/top_baner_1.gif" width="500" height="70" alt="" /><br /> ##-->
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/login/register.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/login/register.tpl	(.../register.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/login/register.tpl	(.../register.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UserRegistration" templates="platform/login/register"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration" templates="platform/login/register"/>
 
 	<!-- user registration -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/login/register_confirm.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 11456)
@@ -13,7 +13,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UserRegistration,lu_title_RegistrationConfirmation" templates="platform/login/register,platform/login/register_confirm"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration,lu_title_RegistrationConfirmation" templates="platform/login/register,platform/login/register_confirm"/>
 
 	<!-- registration confirmation -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/elements/header.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/header.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/header.elm.tpl	(revision 11456)
@@ -0,0 +1,54 @@
+<table class="top-background fullwidth">
+	<tr>
+		<td width="240" nowrap>
+			<a href="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/globe.gif" alt="<inp2:m_GetConfig name="Site_Name"/>" /><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/logo.gif" alt="<inp2:m_GetConfig name="Site_Name"/>" /></a><br />
+		</td>
+
+		<!-- TOP-BANNER -->
+		<td class="top-baner-cell">
+			<inp2:m_include template="platform/elements/banners/banner_top.elm"/>
+		</td>
+		<!-- /TOP-BANNER -->
+
+		<td width="400" align="right">
+			<table style="width:auto">
+				<tr>
+					<td class="top-select-padding">
+						<form method="post" name="lang_form" id="lang_form" action="<inp2:m_FormAction />">
+							<input type="hidden" name="events[lang][OnChangeLanguage]" value="" />
+							<inp2:m_Phrase label="lu_YourLanguage"/>:
+							<select name="language" class="input-select" onchange="document.getElementById('lang_form').submit()">
+								<inp2:m_DefineElement name="lang_elem">
+									<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
+								</inp2:m_DefineElement>
+								<inp2:lang_ListLanguages render_as="lang_elem" no_table="1" no_editing="1"/>
+							</select>
+						</form>
+					</td>
+
+					<!--## THEME DROP-DOWN ##-->
+					<!--##
+					<td class="top-select-padding">
+						<form method="post" name="theme_form" id="theme_form" action="<inp2:m_FormAction />">
+							<input type="hidden" name="events[theme][OnChangeTheme]" value="" />
+							<inp2:m_Phrase label="lu_CurrentTheme"/>:
+							<select name="theme" class="input-select" onchange="document.getElementById('theme_form').submit()">
+								<inp2:m_DefineElement name="theme_elem">
+									<option value="<inp2:Field name="ThemeId"/>" <inp2:m_if check="SelectedTheme">selected="selected"</inp2:m_if> ><inp2:Field name="Name"/></option>
+								</inp2:m_DefineElement>
+								<inp2:theme_PrintList render_as="theme_elem" no_table="1"/>
+							</select>
+						</form>
+					</td>
+					##-->
+					<!--## /THEME DROP-DOWN ##-->
+
+					<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
+						<inp2:m_Include t="in-commerce/elements/currency_picker"/>
+					</inp2:m_if>
+				</tr>
+			</table>
+
+		</td>
+	</tr>
+</table>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/elements/title_bar.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/title_bar.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/title_bar.elm.tpl	(revision 11456)
@@ -0,0 +1,17 @@
+<inp2:m_DefineElement name="pagetitle_category_caption">
+	<inp2:m_if check="m_ParamEquals" name="cat_id" value="0" inverse="inverse">
+		<inp2:m_if check="m_ParamEquals" name="is_module_root" value="0">
+			<inp2:m_param name="separator"/>
+		</inp2:m_if>
+	</inp2:m_if>
+	<inp2:m_param name="cat_name"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="pagetitle_root_category">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="pagetitle_module_root">
+	<inp2:m_param name="cat_name"/>
+</inp2:m_DefineElement>
+
+<inp2:c_CategoryPath separator=" &gt; " render_as="pagetitle_category_caption" root_cat_render_as="pagetitle_root_category" module_root_render_as="pagetitle_module_root" />
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/mailing_list/subscribe.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 11456)
@@ -14,7 +14,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SubscribeConfirm" templates="platform/mailing_list/subscribe"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SubscribeConfirm" templates="platform/mailing_list/subscribe"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
Index: branches/RC/themes/default2009/platform/elements/banners/banner_right.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/banners/banner_right.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/banners/banner_right.elm.tpl	(revision 11456)
@@ -0,0 +1,14 @@
+<table style="width: 100%;">
+	<tr>
+		<td class="side-box-header">
+			<span class="side-box-title"><inp2:m_Phrase label="lu_title_Advertisements"/></span>
+		</td>
+	</tr>
+	<tr>
+		<td class="content-box-content">
+		<!-- Right side Banner code goes here	-->
+		Right-side Banner
+		<!-- /Right side Banner code goes here	-->
+		</td>
+	</tr>
+</table>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/login/forgot_password_reset.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/login/forgot_password_reset.tpl	(.../forgot_password_reset.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/login/forgot_password_reset.tpl	(.../forgot_password_reset.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_PasswordRequestConfirm" templates="platform/login/forgot_password_reset"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_PasswordRequestConfirm" templates="platform/login/forgot_password_reset"/>
 
 	<!-- forgot password reset -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/elements/forms.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/forms.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/forms.elm.tpl	(revision 11456)
@@ -0,0 +1,439 @@
+<inp2:m_DefineElement name="error_message">
+	<table class="warning-message fullwidth">
+		<tr>
+			<td width="30">
+				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
+			</td>
+			<td>
+				<inp2:m_phrase name="lu_Warning"/>
+			</td>
+		</tr>
+	</table>
+	<br />
+	<inp2:m_phrase name="lu_AProblemInForm"/><br />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="subsection" break="1">
+	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+	<div class="sub-section-header"><inp2:m_Phrase label="$title"/></div>
+	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+	<inp2:m_if check="m_Param" name="break">
+		<br/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_buttons" width="default">
+	<tr>
+		<td colspan="2">
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
+		</td>
+	</tr>
+	<tr>
+		<td style="width: <inp2:m_if check="m_ParamEquals" name="width" value="default">140<inp2:m_else/><inp2:m_Param name="width"/></inp2:m_if>px">&nbsp;
+		</td>
+		<td>
+			<br />
+			<inp2:m_Param name="content"/>
+			<br /><br />
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_field_separator" is_last="0">
+	<inp2:m_if check="m_ParamEquals" name="is_last" value="0">
+	<tr>
+		<td colspan="2">
+			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+		</td>
+	</tr>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_field_caption" title="">
+	<inp2:m_inc param="tab_index" by="1"/>
+	<td class="field-name" nowrap>
+		<inp2:m_if check="m_Param" name="title">
+			<label for="<inp2:{$prefix}_InputName field="$field"/>">
+				<span <inp2:m_if check="{$prefix}_HasError" field="$field">class="field-required"</inp2:m_if>>
+				<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:
+			</label>
+		<inp2:m_else/>
+			&nbsp;
+		</inp2:m_if>
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_label" as_label="" currency="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td valign="top" class="field-value">
+			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_label" as_label="" currency="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td valign="top" class="field-value">
+			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>" />
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_box" style="" maxlength="" is_last="0" title="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" maxlength="<inp2:m_param name="maxlength"/>" style="<inp2:m_param name="style"/>">
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_box_ml">
+	<inp2:Field name="LanguageId" result_to_var="language_id"/>
+	<inp2:m_if check="SelectedLanguage">
+		<inp2:m_RenderElement name="inp_edit_box" field="l{$language_id}_{$field}" title="{$title}" prefix="{$prefix}" style="{$style}" />
+	<inp2:m_else/>
+		<inp2:Field name="PackName" result_to_var="language_name"/>
+		<inp2:m_RenderElement name="inp_edit_box" field="l{$language_id}_{$field}" title="{$title}_{$language_name}" prefix="{$prefix}" style="{$style}" />
+		<inp2:m_if check="IsPrimaryLanguageInList">
+			<inp2:m_if check="{$prefix}_IsRequired" field="$field">
+				<input type="hidden" name="<inp2:{$prefix}_FieldModifier name="l{$language_id}_{$field}" type="required"/>" value="1"/>
+			</inp2:m_if>
+		</inp2:m_if>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_password" style="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<input type="password" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_upload" style="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
+			<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
+				(<inp2:{$prefix}_Field field="$field"/>)
+			</inp2:m_if>
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_image_upload" style="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<inp2:m_if check="{$prefix}_Field" name="$field">
+				<a href="<inp2:{$prefix}_ImageSrc field="$field" MaxWidth="fullsize"/>" target="_blank">
+					<inp2:{$prefix}_Image field="$field" render_as="image_element" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" align="absmiddle"/>
+				</a>
+				<br />
+				<table cellpadding="0" cellspacing="0">
+					<tr>
+						<td>
+							<input type="hidden" id="<inp2:{$prefix}_InputName field="Delete{$field}"/>" name="<inp2:{$prefix}_InputName field="Delete{$field}"/>" value="0" />
+							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="Delete{$field}"/>'));">
+						</td>
+						<td>
+							<label for="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>"><inp2:m_phrase name="lu_btn_DeleteImage"/></label>
+						</td>
+					</tr>
+				</table>
+			</inp2:m_if>
+			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_file_upload" style="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<inp2:m_if check="{$prefix}_Field" name="$field">
+				<a href="<inp2:{$prefix}_DownloadFileLink field="$field"/>">
+					<inp2:{$prefix}_Field name="$field"/>
+				</a>
+				<br />
+				<table cellpadding="0" cellspacing="0">
+					<tr>
+						<td>
+							<input type="hidden" id="<inp2:{$prefix}_InputName field="Delete{$field}"/>" name="<inp2:{$prefix}_InputName field="Delete{$field}"/>" value="0" />
+							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="Delete{$field}"/>'));">
+						</td>
+						<td>
+							<label for="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>"><inp2:m_phrase name="lu_btn_DeleteFile"/></label>
+						</td>
+					</tr>
+				</table>
+			</inp2:m_if>
+			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_hidden" db="">
+	<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="$db"/>" />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_date" style="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="{$field}_date"/></span><br />
+			</inp2:m_if>
+			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_TemplatesBase module="In-Portal"/>img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+			<script type="text/javascript">
+			initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
+			</script>
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time" input_format="1"/>" value="" />
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_time" style="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>">&nbsp;
+			<span class="small">(<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
+
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date" input_format="1"/>" value="" />
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_date_time" style="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
+				<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+			<script type="text/javascript">
+			initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
+			</script>
+			&nbsp;<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>"><span class="small"> (<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_textarea" style="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:{$prefix}_Field field="$field"/></textarea>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_textarea_ml">
+	<inp2:Field name="LanguageId" result_to_var="language_id"/>
+	<inp2:m_if check="SelectedLanguage">
+		<inp2:m_RenderElement name="inp_edit_textarea" field="l{$language_id}_{$field}" title="{$title}" prefix="{$prefix}" is_last="{$is_last}" style="{$style}" cols="{$cols}" rows="{$rows}"/>
+	<inp2:m_else/>
+		<inp2:Field name="PackName" result_to_var="language_name"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" field="l{$language_id}_{$field}" title="{$title}_{$language_name}" prefix="{$prefix}" is_last="{$is_last}" style="{$style}" cols="{$cols}" rows="{$rows}"/>
+		<inp2:m_if check="IsPrimaryLanguageInList">
+			<inp2:m_if check="{$prefix}_IsRequired" field="$field">
+				<input type="hidden" name="<inp2:{$prefix}_FieldModifier name="l{$language_id}_{$field}" type="required"/>" value="1"/>
+			</inp2:m_if>
+		</inp2:m_if>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_option_item">
+	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_option_phrase">
+	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
+				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
+					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				<inp2:m_else/>
+					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				</inp2:m_if>
+			</select>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_radio_item" onclick="">
+	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_radio_phrase" onclick="">
+	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
+				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_phrase" selected="checked"/>
+			<inp2:m_else />
+				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_item" selected="checked"/>
+			</inp2:m_if>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_captcha" style="" title="lu_fld_Captcha" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="Captcha" title="$title"/>
+		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="Captcha">
+				<span class="field-error"><inp2:{$prefix}_Error field="Captcha"/></span><br />
+			</inp2:m_if>
+			<img src="<inp2:m_Link template="platform/inc/captcha_image" var="{$prefix}_captcha_code" w="150" h="30"/>" alt="<inp2:m_Phrase name="$title"/>"/><br />
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
+			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="Captcha"/>" value="<inp2:{$prefix}_Field field="Captcha"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_Param name="style"/>">
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_checkbox" style="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td>
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>" />
+			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> style="<inp2:m_param name="style"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));">
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_categories" style="" is_last="0">
+	<inp2:m_include template="platform/designs/categories"/>
+
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td class="field-value">
+
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+
+			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>_select" style="<inp2:m_param name="style"/>">
+				<option value="0"><inp2:m_Phrase name="lu_opt_SelectCategory"/></option>
+				<inp2:{$prefix}_CategorySelector render_as="selector_category_element" separator="&raquo;&nbsp;"/>
+			</select>
+
+			<input type="button" class="button" value="<inp2:m_Phrase name="lu_Add"/>" onclick="$ItemCategories.AddCategory('&raquo;&amp;nbsp;', $delete_button, <inp2:m_GetConfig name="{$prefix}_MaxCategories"/>);"/><br />
+
+			<br />
+			<table class="item-categories" id="item_categories">
+				<tbody>
+
+					<tr>
+						<td colspan="2">
+							<strong><inp2:m_Phrase name="lu_subsection_Categories"/>:</strong>
+						</td>
+					</tr>
+
+					<inp2:{$prefix}_PrintMoreCategories render_as="more_category_element" field="$field"/>
+				</tbody>
+			</table>
+			<br/>
+
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
+
+			<script type="text/javascript">
+				var $delete_button = '&nbsp;&nbsp;<input type="button" class="delete-button" value="<inp2:m_Phrase name="lu_btn_Delete"/>" onclick="$ItemCategories.DeleteCategory(#CATEGORY_ID#);"/>';
+				var $phrases = ['<inp2:m_Phrase name="lu_error_CategoryLimitReached" escape="1"/>', '<inp2:m_Phrase name="lu_error_AlreadyAdded"/>'];
+				var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id"/>, $phrases);
+			</script>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="primary_category">
+	<inp2:m_param name="separator"/> <inp2:m_param name="title"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="primary_root_category">
+	<inp2:m_RootCategoryName/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_pr_category_label" is_last="0" editing="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td valign="top" class="field-value">
+		<inp2:m_if check="m_Param" name="editing">
+			<inp2:{$prefix}_CategoryName />
+		<inp2:m_else />
+			<inp2:c_CategoryPath separator="&gt;" render_as="primary_category" root_cat_render_as="primary_root_category" titles="$titles" />
+		</inp2:m_if>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/elements/banners/banner_top.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/banners/banner_top.tpl	(revision 11337)
+++ branches/RC/themes/default2009/platform/elements/banners/banner_top.tpl	(revision 0)
@@ -1,2 +0,0 @@
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/top_baner_1.gif" width="500" height="70" alt="" /><br />
-<!--## <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/top_baner_1.gif" width="500" height="70" alt="" /><br /> ##-->
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/login/forgot_password_reset_confirm.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/login/forgot_password_reset_confirm.tpl	(.../forgot_password_reset_confirm.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/login/forgot_password_reset_confirm.tpl	(.../forgot_password_reset_confirm.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_ForgotPasswordConfirm" templates="platform/login/forgot_password_reset_confirm"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordConfirm" templates="platform/login/forgot_password_reset_confirm"/>
 
 	<!-- forgot password reset confirm -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/categories/suggest_confirm.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/categories/suggest_confirm.tpl	(.../suggest_confirm.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/categories/suggest_confirm.tpl	(.../suggest_confirm.tpl)	(revision 11456)
@@ -14,7 +14,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SuggestCategoryConfirm" templates="platform/categories/suggest_confirm" show_category="1"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestCategoryConfirm" templates="platform/categories/suggest_confirm" show_category="1"/>
 
 	<!-- suggest category confirm -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/elements/header.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/header.tpl	(revision 11427)
+++ branches/RC/themes/default2009/platform/elements/header.tpl	(revision 0)
@@ -1,54 +0,0 @@
-<table class="top-background fullwidth">
-	<tr>
-		<td width="240" nowrap>
-			<a href="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/globe.gif" alt="<inp2:m_GetConfig name="Site_Name"/>" /><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/logo.gif" alt="<inp2:m_GetConfig name="Site_Name"/>" /></a><br />
-		</td>
-
-		<!-- TOP-BANNER -->
-		<td class="top-baner-cell">
-			<inp2:m_include template="platform/elements/banners/banner_top"/>
-		</td>
-		<!-- /TOP-BANNER -->
-
-		<td width="400" align="right">
-			<table style="width:auto">
-				<tr>
-					<td class="top-select-padding">
-						<form method="post" name="lang_form" id="lang_form" action="<inp2:m_FormAction />">
-							<input type="hidden" name="events[lang][OnChangeLanguage]" value="" />
-							<inp2:m_Phrase label="lu_YourLanguage"/>:
-							<select name="language" class="input-select" onchange="document.getElementById('lang_form').submit()">
-								<inp2:m_DefineElement name="lang_elem">
-									<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
-								</inp2:m_DefineElement>
-								<inp2:lang_ListLanguages render_as="lang_elem" no_table="1" no_editing="1"/>
-							</select>
-						</form>
-					</td>
-
-					<!--## THEME DROP-DOWN ##-->
-					<!--##
-					<td class="top-select-padding">
-						<form method="post" name="theme_form" id="theme_form" action="<inp2:m_FormAction />">
-							<input type="hidden" name="events[theme][OnChangeTheme]" value="" />
-							<inp2:m_Phrase label="lu_CurrentTheme"/>:
-							<select name="theme" class="input-select" onchange="document.getElementById('theme_form').submit()">
-								<inp2:m_DefineElement name="theme_elem">
-									<option value="<inp2:Field name="ThemeId"/>" <inp2:m_if check="SelectedTheme">selected="selected"</inp2:m_if> ><inp2:Field name="Name"/></option>
-								</inp2:m_DefineElement>
-								<inp2:theme_PrintList render_as="theme_elem" no_table="1"/>
-							</select>
-						</form>
-					</td>
-					##-->
-					<!--## /THEME DROP-DOWN ##-->
-
-					<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
-						<inp2:m_Include t="in-commerce/elements/currency_picker"/>
-					</inp2:m_if>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/elements/html_head.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/html_head.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/html_head.elm.tpl	(revision 11456)
@@ -0,0 +1,30 @@
+
+<!--## Meta Info (Keywords and Description) ##-->
+<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
+
+<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
+<!--## if In-edit purchase! ##-->
+	<inp2:m_Include t="in-edit/elements/header.elm"/>
+<!--## /if In-edit purchase! ##-->
+<inp2:m_else/>
+<!--## Standard Category Meta information ##-->
+	<meta name="description" content="<inp2:c_Meta name="Description"/>" />
+	<meta name="keywords" content="<inp2:c_Meta name="Keywords"/>" />
+	<!--## /Standard Category Meta information ##-->
+</inp2:m_if>
+<!--## /Meta Keywords and Description ##-->
+<inp2:theme.current_StylesheetFile/>
+<link rel="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-Portal"/>inc/styles.css" type="text/css" />
+
+<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/script.js"></script>
+<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/ajax.js"></script>
+<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/calendar.js"></script>
+
+<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery.pack.js"></script>
+<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.js"></script>
+
+<script type="text/javascript">
+	var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
+</script>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/search/search_results.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/search/search_results.tpl	(.../search_results.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/search/search_results.tpl	(.../search_results.tpl)	(revision 11456)
@@ -14,7 +14,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SearchResults" templates="platform/search/search_results"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SearchResults" templates="platform/search/search_results"/>
 
 	<inp2:m_Set items_found="0"/>
 	<inp2:m_ModuleInclude template="elements/content_boxes/search_results"/>
Index: branches/RC/themes/default2009/platform/mailing_list/unsubscribe.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 11456)
@@ -14,7 +14,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UnsubscribeConfirm" templates="platform/mailing_list/unsubscribe"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UnsubscribeConfirm" templates="platform/mailing_list/unsubscribe"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
Index: branches/RC/themes/default2009/platform/elements/title_bar.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/title_bar.tpl	(revision 11337)
+++ branches/RC/themes/default2009/platform/elements/title_bar.tpl	(revision 0)
@@ -1,17 +0,0 @@
-<inp2:m_DefineElement name="pagetitle_category_caption">
-	<inp2:m_if check="m_ParamEquals" name="cat_id" value="0" inverse="inverse">
-		<inp2:m_if check="m_ParamEquals" name="is_module_root" value="0">
-			<inp2:m_param name="separator"/>
-		</inp2:m_if>
-	</inp2:m_if>
-	<inp2:m_param name="cat_name"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="pagetitle_root_category">
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="pagetitle_module_root">
-	<inp2:m_param name="cat_name"/>
-</inp2:m_DefineElement>
-
-<inp2:c_CategoryPath separator=" &gt; " render_as="pagetitle_category_caption" root_cat_render_as="pagetitle_root_category" module_root_render_as="pagetitle_module_root" />
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/mailing_list/unsubscribe_ok.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/mailing_list/unsubscribe_ok.tpl	(.../unsubscribe_ok.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/mailing_list/unsubscribe_ok.tpl	(.../unsubscribe_ok.tpl)	(revision 11456)
@@ -14,7 +14,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UnsubscribeConfirm,lu_title_UnsubscribeOk" templates="platform/mailing_list/unsubscribe,platform/mailing_list/unsubscribe_ok"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UnsubscribeConfirm,lu_title_UnsubscribeOk" templates="platform/mailing_list/unsubscribe,platform/mailing_list/unsubscribe_ok"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
Index: branches/RC/themes/default2009/platform/designs/popup_design.dsg.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/designs/popup_design.dsg.tpl	(.../popup_design.dsg.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/designs/popup_design.dsg.tpl	(.../popup_design.dsg.tpl)	(revision 11456)
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <inp2:m_include template="platform/designs/side_boxes"/>
 <inp2:m_include template="platform/designs/content_boxes"/>
-<inp2:m_include template="platform/elements/forms"/>
+<inp2:m_include template="platform/elements/forms.elm"/>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>
 			<inp2:m_GetConfig name="Site_Name"/>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
-		<inp2:m_ModuleInclude template="elements/html_head" in-portal_template="platform/elements/html_head"/>
+		<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
 	</head>
 	<body>
 		<inp2:m_RenderElement name="content"/>
Index: branches/RC/themes/default2009/platform/my_account/public_profile.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/my_account/public_profile.tpl	(.../public_profile.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/my_account/public_profile.tpl	(.../public_profile.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UserProfile" templates="platform/my_account/public_profile"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserProfile" templates="platform/my_account/public_profile"/>
 
 	<!-- public profile -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/elements/forms.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/forms.tpl	(revision 11337)
+++ branches/RC/themes/default2009/platform/elements/forms.tpl	(revision 0)
@@ -1,439 +0,0 @@
-<inp2:m_DefineElement name="error_message">
-	<table class="warning-message fullwidth">
-		<tr>
-			<td width="30">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
-			</td>
-			<td>
-				<inp2:m_phrase name="lu_Warning"/>
-			</td>
-		</tr>
-	</table>
-	<br />
-	<inp2:m_phrase name="lu_AProblemInForm"/><br />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="subsection" break="1">
-	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-	<div class="sub-section-header"><inp2:m_Phrase label="$title"/></div>
-	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-	<inp2:m_if check="m_Param" name="break">
-		<br/>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_buttons" width="default">
-	<tr>
-		<td colspan="2">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
-		</td>
-	</tr>
-	<tr>
-		<td style="width: <inp2:m_if check="m_ParamEquals" name="width" value="default">140<inp2:m_else/><inp2:m_Param name="width"/></inp2:m_if>px">&nbsp;
-		</td>
-		<td>
-			<br />
-			<inp2:m_Param name="content"/>
-			<br /><br />
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_field_separator" is_last="0">
-	<inp2:m_if check="m_ParamEquals" name="is_last" value="0">
-	<tr>
-		<td colspan="2">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_field_caption" title="">
-	<inp2:m_inc param="tab_index" by="1"/>
-	<td class="field-name" nowrap>
-		<inp2:m_if check="m_Param" name="title">
-			<label for="<inp2:{$prefix}_InputName field="$field"/>">
-				<span <inp2:m_if check="{$prefix}_HasError" field="$field">class="field-required"</inp2:m_if>>
-				<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:
-			</label>
-		<inp2:m_else/>
-			&nbsp;
-		</inp2:m_if>
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_label" as_label="" currency="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_label" as_label="" currency="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_box" style="" maxlength="" is_last="0" title="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" maxlength="<inp2:m_param name="maxlength"/>" style="<inp2:m_param name="style"/>">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_box_ml">
-	<inp2:Field name="LanguageId" result_to_var="language_id"/>
-	<inp2:m_if check="SelectedLanguage">
-		<inp2:m_RenderElement name="inp_edit_box" field="l{$language_id}_{$field}" title="{$title}" prefix="{$prefix}" style="{$style}" />
-	<inp2:m_else/>
-		<inp2:Field name="PackName" result_to_var="language_name"/>
-		<inp2:m_RenderElement name="inp_edit_box" field="l{$language_id}_{$field}" title="{$title}_{$language_name}" prefix="{$prefix}" style="{$style}" />
-		<inp2:m_if check="IsPrimaryLanguageInList">
-			<inp2:m_if check="{$prefix}_IsRequired" field="$field">
-				<input type="hidden" name="<inp2:{$prefix}_FieldModifier name="l{$language_id}_{$field}" type="required"/>" value="1"/>
-			</inp2:m_if>
-		</inp2:m_if>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_password" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="password" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_upload" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
-				(<inp2:{$prefix}_Field field="$field"/>)
-			</inp2:m_if>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_image_upload" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<inp2:m_if check="{$prefix}_Field" name="$field">
-				<a href="<inp2:{$prefix}_ImageSrc field="$field" MaxWidth="fullsize"/>" target="_blank">
-					<inp2:{$prefix}_Image field="$field" render_as="image_element" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" align="absmiddle"/>
-				</a>
-				<br />
-				<table cellpadding="0" cellspacing="0">
-					<tr>
-						<td>
-							<input type="hidden" id="<inp2:{$prefix}_InputName field="Delete{$field}"/>" name="<inp2:{$prefix}_InputName field="Delete{$field}"/>" value="0" />
-							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="Delete{$field}"/>'));">
-						</td>
-						<td>
-							<label for="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>"><inp2:m_phrase name="lu_btn_DeleteImage"/></label>
-						</td>
-					</tr>
-				</table>
-			</inp2:m_if>
-			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_file_upload" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<inp2:m_if check="{$prefix}_Field" name="$field">
-				<a href="<inp2:{$prefix}_DownloadFileLink field="$field"/>">
-					<inp2:{$prefix}_Field name="$field"/>
-				</a>
-				<br />
-				<table cellpadding="0" cellspacing="0">
-					<tr>
-						<td>
-							<input type="hidden" id="<inp2:{$prefix}_InputName field="Delete{$field}"/>" name="<inp2:{$prefix}_InputName field="Delete{$field}"/>" value="0" />
-							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="Delete{$field}"/>'));">
-						</td>
-						<td>
-							<label for="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>"><inp2:m_phrase name="lu_btn_DeleteFile"/></label>
-						</td>
-					</tr>
-				</table>
-			</inp2:m_if>
-			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_hidden" db="">
-	<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="$db"/>" />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_date" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="{$field}_date"/></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_TemplatesBase module="In-Portal"/>img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-			initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
-			</script>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time" input_format="1"/>" value="" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_time" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>">&nbsp;
-			<span class="small">(<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date" input_format="1"/>" value="" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_date_time" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
-				<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-			initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
-			</script>
-			&nbsp;<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>"><span class="small"> (<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_textarea" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:{$prefix}_Field field="$field"/></textarea>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_textarea_ml">
-	<inp2:Field name="LanguageId" result_to_var="language_id"/>
-	<inp2:m_if check="SelectedLanguage">
-		<inp2:m_RenderElement name="inp_edit_textarea" field="l{$language_id}_{$field}" title="{$title}" prefix="{$prefix}" is_last="{$is_last}" style="{$style}" cols="{$cols}" rows="{$rows}"/>
-	<inp2:m_else/>
-		<inp2:Field name="PackName" result_to_var="language_name"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" field="l{$language_id}_{$field}" title="{$title}_{$language_name}" prefix="{$prefix}" is_last="{$is_last}" style="{$style}" cols="{$cols}" rows="{$rows}"/>
-		<inp2:m_if check="IsPrimaryLanguageInList">
-			<inp2:m_if check="{$prefix}_IsRequired" field="$field">
-				<input type="hidden" name="<inp2:{$prefix}_FieldModifier name="l{$language_id}_{$field}" type="required"/>" value="1"/>
-			</inp2:m_if>
-		</inp2:m_if>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_option_item">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_option_phrase">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
-				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				<inp2:m_else/>
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				</inp2:m_if>
-			</select>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_radio_item" onclick="">
-	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_radio_phrase" onclick="">
-	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
-				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_phrase" selected="checked"/>
-			<inp2:m_else />
-				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_item" selected="checked"/>
-			</inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_captcha" style="" title="lu_fld_Captcha" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="Captcha" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="Captcha">
-				<span class="field-error"><inp2:{$prefix}_Error field="Captcha"/></span><br />
-			</inp2:m_if>
-			<img src="<inp2:m_Link template="platform/inc/captcha_image" var="{$prefix}_captcha_code" w="150" h="30"/>" alt="<inp2:m_Phrase name="$title"/>"/><br />
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="Captcha"/>" value="<inp2:{$prefix}_Field field="Captcha"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_Param name="style"/>">
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_checkbox" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td>
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>" />
-			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> style="<inp2:m_param name="style"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_categories" style="" is_last="0">
-	<inp2:m_include template="platform/designs/categories"/>
-
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-
-			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>_select" style="<inp2:m_param name="style"/>">
-				<option value="0"><inp2:m_Phrase name="lu_opt_SelectCategory"/></option>
-				<inp2:{$prefix}_CategorySelector render_as="selector_category_element" separator="&raquo;&nbsp;"/>
-			</select>
-
-			<input type="button" class="button" value="<inp2:m_Phrase name="lu_Add"/>" onclick="$ItemCategories.AddCategory('&raquo;&amp;nbsp;', $delete_button, <inp2:m_GetConfig name="{$prefix}_MaxCategories"/>);"/><br />
-
-			<br />
-			<table class="item-categories" id="item_categories">
-				<tbody>
-
-					<tr>
-						<td colspan="2">
-							<strong><inp2:m_Phrase name="lu_subsection_Categories"/>:</strong>
-						</td>
-					</tr>
-
-					<inp2:{$prefix}_PrintMoreCategories render_as="more_category_element" field="$field"/>
-				</tbody>
-			</table>
-			<br/>
-
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
-
-			<script type="text/javascript">
-				var $delete_button = '&nbsp;&nbsp;<input type="button" class="delete-button" value="<inp2:m_Phrase name="lu_btn_Delete"/>" onclick="$ItemCategories.DeleteCategory(#CATEGORY_ID#);"/>';
-				var $phrases = ['<inp2:m_Phrase name="lu_error_CategoryLimitReached" escape="1"/>', '<inp2:m_Phrase name="lu_error_AlreadyAdded"/>'];
-				var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id"/>, $phrases);
-			</script>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="primary_category">
-	<inp2:m_param name="separator"/> <inp2:m_param name="title"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="primary_root_category">
-	<inp2:m_RootCategoryName/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_pr_category_label" is_last="0" editing="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-		<inp2:m_if check="m_Param" name="editing">
-			<inp2:{$prefix}_CategoryName />
-		<inp2:m_else />
-			<inp2:c_CategoryPath separator="&gt;" render_as="primary_category" root_cat_render_as="primary_root_category" titles="$titles" />
-		</inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/elements/banners/banner_right.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/banners/banner_right.tpl	(revision 11337)
+++ branches/RC/themes/default2009/platform/elements/banners/banner_right.tpl	(revision 0)
@@ -1,14 +0,0 @@
-<table style="width: 100%;">
-	<tr>
-		<td class="side-box-header">
-			<span class="side-box-title"><inp2:m_Phrase label="lu_title_Advertisements"/></span>
-		</td>
-	</tr>
-	<tr>
-		<td class="content-box-content">
-		<!-- Right side Banner code goes here	-->
-		Right-side Banner
-		<!-- /Right side Banner code goes here	-->
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/recommend/recommend.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/recommend/recommend.tpl	(.../recommend.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/recommend/recommend.tpl	(.../recommend.tpl)	(revision 11456)
@@ -15,7 +15,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_RecommendConfirm" templates="platform/recommend/recommend"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_RecommendConfirm" templates="platform/recommend/recommend"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
Index: branches/RC/themes/default2009/platform/elements/pagination.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/pagination.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/pagination.elm.tpl	(revision 11456)
@@ -0,0 +1,52 @@
+<inp2:m_DefineElement name="prev_page">
+	<a href="<inp2:PageLink/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/pagenation_left.gif" width="5" height="5" alt="" /></a>&nbsp;&nbsp;
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="next_page">
+	&nbsp;<a href="<inp2:PageLink/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/pagenation_right.gif" width="5" height="5" alt="" /></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="page_current">
+	<span class="current-page"><inp2:m_param name="page"/></span>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="page_separator">
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="page_link">
+	<a href="<inp2:PageLink/>" class="page-link"><inp2:m_param name="page"/></a>
+</inp2:m_DefineElement>
+
+<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
+<br />
+
+<table style="width: 100%; text-align: left;">
+	<tr>
+		<inp2:m_if check="{$prefix}_GridInfo" type="needs_pagination">
+		<td>
+			<inp2:m_Phrase label="lu_comm_Page"/>:&nbsp;
+
+
+			<inp2:{$prefix}_PaginationBar
+					current_render_as="page_current" separator_render_as="page_separator" link_render_as="page_link"
+					prev_page_render_as="prev_page"
+					next_page_render_as="next_page" />
+		</td>
+		</inp2:m_if>
+
+		<td align="right">
+			<inp2:m_phrase name="lu_ItemsPerPage"/>:
+			<form method="post" action="<inp2:m_FormAction />">
+
+				<select class="input-select" name="<inp2:{$prefix}_VarName type="PerPage"/>">
+					<option value="10" <inp2:{$prefix}_PerPageSelected per_page="10" selected='selected="selected"'/>>10</option>
+					<option value="20" <inp2:{$prefix}_PerPageSelected per_page="20" selected='selected="selected"'/>>20</option>
+					<option value="50" <inp2:{$prefix}_PerPageSelected per_page="50" selected='selected="selected"'/>>50</option>
+				</select>
+				<input type="submit" class="button" name="<inp2:{$prefix}_SubmitName event="OnSetPerPage"/>" value="<inp2:m_Phrase label="lu_btn_Set"/>" />
+			</form>
+		</td>
+	</tr>
+</table>
+
Index: branches/RC/themes/default2009/platform/my_account/my_profile.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 11456)
@@ -15,7 +15,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MyAccount,lu_title_MyProfile" templates="platform/my_account/my_account,platform/my_account/my_profile"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyProfile" templates="platform/my_account/my_account,platform/my_account/my_profile"/>
 
 	<!-- my profile -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/phrases_edit.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 11456)
@@ -14,7 +14,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MissingPhraseAdding" templates="phrases_edit"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MissingPhraseAdding" templates="phrases_edit"/>
 
 	<!-- phrases -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/elements/footer.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/footer.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/footer.elm.tpl	(revision 11456)
@@ -0,0 +1,15 @@
+
+
+	<table class="fullwidth footer-table">
+		<tr>
+			<td>
+				Powered by In-portal &#174; 1997-<inp2:lang.current_CurrentDate format="Y"/>, <a href="http://www.intechnic.com" target="_blank">Intechnic Corporation</a>. <inp2:m_Phrase label="lu_AllRightsReserved"/>
+			</td>
+		</tr>
+	</table>
+
+	<div class="footer-links">
+		<a href="<inp2:m_Link template="platform/site_map"/>"><inp2:m_Phrase label="lu_SiteMap"/></a> | <a href="<inp2:m_Link template="platform/terms"/>"><inp2:m_Phrase label="lu_TermAndCondition"/></a> | <a href="<inp2:m_Link template="platform/privacy"/>"><inp2:m_Phrase label="lu_PrivacyPolicy"/></a>
+	</div>
+
+	<inp2:m_RegisterPageHit/>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/categories/suggest_category.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 11456)
@@ -14,7 +14,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SuggestCategory" templates="platform/categories/suggest_category" show_category="1"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestCategory" templates="platform/categories/suggest_category" show_category="1"/>
 
 	<!-- suggest category -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/elements/html_head.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/html_head.tpl	(revision 11337)
+++ branches/RC/themes/default2009/platform/elements/html_head.tpl	(revision 0)
@@ -1,30 +0,0 @@
-
-<!--## Meta Info (Keywords and Description) ##-->
-<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
-
-<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
-<!--## if In-edit purchase! ##-->
-	<inp2:m_Include t="in-edit/elements/header"/>
-<!--## /if In-edit purchase! ##-->
-<inp2:m_else/>
-<!--## Standard Category Meta information ##-->
-	<meta name="description" content="<inp2:c_Meta name="Description"/>" />
-	<meta name="keywords" content="<inp2:c_Meta name="Keywords"/>" />
-	<!--## /Standard Category Meta information ##-->
-</inp2:m_if>
-<!--## /Meta Keywords and Description ##-->
-<inp2:theme.current_StylesheetFile/>
-<link rel="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-Portal"/>inc/styles.css" type="text/css" />
-
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/script.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/ajax.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/calendar.js"></script>
-
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery.pack.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.js"></script>
-
-<script type="text/javascript">
-	var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
-</script>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/elements/menu.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/menu.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/menu.elm.tpl	(revision 11456)
@@ -0,0 +1,117 @@
+<table class="menu-background fullwidth">
+	<tr>
+		<td align="left">
+			<table style="width: auto;">
+				<tr>
+					<td>
+						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenu.js"></script>
+						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenueffect.js"></script>
+						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_dyn.js"></script>
+						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_xml.js"></script>
+
+						<link rel="StyleSheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/dmenu.css" type="text/css" />
+						<div id="xmlMenuDiv"></div>
+
+				        <script type="text/javascript">
+				        	<inp2:m_DefineElement name="dmenu_element">
+										<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
+										<inp2:m_Random result_to_var="rand"/>
+										<inp2:m_Set m_cat_id="$root_cat"/>
+										<inp2:conf_ConfigValue name="CategoriesRebuildSerial" result_to_var="serial"/>
+										<item id="sub-elem<inp2:m_Param name="root_cat"/>"
+											url="<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root"/>"
+											ico="['<inp2:m_TemplatesBase module="$module"/>img/<inp2:m_Param name="icon"/>']"
+											enb="true" title=""
+											subid="sub<inp2:m_Param name="root_cat"/>"
+											suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/subcats.xml"
+											 m_cat_id="$root_cat"
+											 m_cat_page="1"
+											 c_menu_Page="1" pass="m,c.menu"
+											 level="0" max_level="4" serial="$serial"
+											/>" ><![CDATA[<inp2:c_Field requery="1" name="Name"/>]]></item>
+									</inp2:m_DefineElement>
+
+				        	<inp2:m_DefineElement name="menu_xml">
+										<menumgr id="mgr" flowoverformelement="false" defaulteffect="aoslide" icpath="">
+										<!--## USE droponclick="false" TO OPEN MENU ONMOUSE-OVER ##-->
+										  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_" droponclick="true" >
+										    <items>
+										    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_RootCategoryName/>]]></item>
+										    	<inp2:m_ModuleInclude template="elements/menu.xml" />
+										    </items>
+										  </menubar>
+										</menumgr>
+				        	</inp2:m_DefineElement>
+
+				        	<inp2:m_get name="m_cat_id" result_to_var="current_category"/>
+
+				        	addLoadEvent(
+				        		function() {
+					        	 	var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" no_editing="1" js_escape="1"/>');
+
+//						        	menu_mgr.renderMenus();
+						        	menu_mgr.renderMenubar('xmlMenuDiv');
+					        	}
+					        );
+				        </script>
+				        <noscript>
+				        	<inp2:m_DefineElement name="static_menu_element">
+				        		<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
+								<inp2:m_Random result_to_var="rand"/>
+								<inp2:m_Set m_cat_id="$root_cat"/>
+								<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root" result_to_var="link"/>
+								<inp2:m_TemplatesBase module="$module" result_to_var="module_path"/>
+								<inp2:c_Field requery="1" name="Name" result_to_var="title"/>
+								<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/{$icon}" no_editing="1"/>
+							</inp2:m_DefineElement>
+
+							<table>
+								<tr>
+									<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1" result_to_var="link"/>
+									<inp2:m_RootCategoryName result_to_var="title"/>
+									<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
+									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif" no_editing="1"/>
+				        			<inp2:m_ModuleInclude template="elements/static_menu.elm" />
+								</tr>
+							</table>
+				        </noscript>
+
+				        <inp2:m_Set m_cat_id="$current_category"/>
+						<inp2:c_Field requery="1" name="Name" result_to_var="category_name"/>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td align="right">
+			<table style="width: auto;">
+				<tr>
+					<!-- menu: My Account -->
+					<inp2:m_RenderElement design="menu_element" no_editing="1">
+						<inp2:m_Capture to_var="menu_href">
+							<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0" m_cat_page="1"/>
+						</inp2:m_Capture>
+
+						<inp2:m_Capture to_var="menu_icon">
+							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
+						</inp2:m_Capture>
+
+						<inp2:m_Capture to_var="menu_title">
+							<inp2:m_Phrase name="lu_title_MyAccount"/>
+						</inp2:m_Capture>
+
+						<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
+					</inp2:m_RenderElement>
+					<!-- // menu: My Account -->
+
+
+					<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
+					<!-- menu: ShoppingCart -->
+						<inp2:m_Include t="in-commerce/elements/menu_element"/>
+					<!-- // menu: ShoppingCart -->
+					</inp2:m_if>
+
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/my_account/my_account.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 11456)
@@ -28,7 +28,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MyAccount" templates="platform/my_account/my_account"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount" templates="platform/my_account/my_account"/>
 
 	<!-- my account -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/elements/content_boxes/sub_categories.tpl
===================================================================
diff -u -N -r11337 -r11456
--- branches/RC/themes/default2009/platform/elements/content_boxes/sub_categories.tpl	(.../sub_categories.tpl)	(revision 11337)
+++ branches/RC/themes/default2009/platform/elements/content_boxes/sub_categories.tpl	(.../sub_categories.tpl)	(revision 11456)
@@ -45,6 +45,6 @@
 	<table class="fullwidth">
 		<inp2:c_ListCategories list_name="sub_categories" render_as="category_element" columns="2" direction="H"/>
 	</table>
-	<br /><inp2:m_include template="platform/elements/pagination" prefix="c" list_name="sub_categories"/>
+	<br /><inp2:m_include template="platform/elements/pagination.elm" prefix="c" list_name="sub_categories"/>
 </inp2:m_RenderElement>
 <!-- // categories -->
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/login/login_pending_disabled.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/login/login_pending_disabled.tpl	(.../login_pending_disabled.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/login/login_pending_disabled.tpl	(.../login_pending_disabled.tpl)	(revision 11456)
@@ -13,7 +13,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_DisabledAccountWarning" templates="platform/login/login_pending_disabled"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_DisabledAccountWarning" templates="platform/login/login_pending_disabled"/>
 
 	<!-- login pending/disabled -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/elements/pagination.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/pagination.tpl	(revision 11337)
+++ branches/RC/themes/default2009/platform/elements/pagination.tpl	(revision 0)
@@ -1,52 +0,0 @@
-<inp2:m_DefineElement name="prev_page">
-	<a href="<inp2:PageLink/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/pagenation_left.gif" width="5" height="5" alt="" /></a>&nbsp;&nbsp;
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="next_page">
-	&nbsp;<a href="<inp2:PageLink/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/pagenation_right.gif" width="5" height="5" alt="" /></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="page_current">
-	<span class="current-page"><inp2:m_param name="page"/></span>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="page_separator">
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="page_link">
-	<a href="<inp2:PageLink/>" class="page-link"><inp2:m_param name="page"/></a>
-</inp2:m_DefineElement>
-
-<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-<br />
-
-<table style="width: 100%; text-align: left;">
-	<tr>
-		<inp2:m_if check="{$prefix}_GridInfo" type="needs_pagination">
-		<td>
-			<inp2:m_Phrase label="lu_comm_Page"/>:&nbsp;
-
-
-			<inp2:{$prefix}_PaginationBar
-					current_render_as="page_current" separator_render_as="page_separator" link_render_as="page_link"
-					prev_page_render_as="prev_page"
-					next_page_render_as="next_page" />
-		</td>
-		</inp2:m_if>
-
-		<td align="right">
-			<inp2:m_phrase name="lu_ItemsPerPage"/>:
-			<form method="post" action="<inp2:m_FormAction />">
-
-				<select class="input-select" name="<inp2:{$prefix}_VarName type="PerPage"/>">
-					<option value="10" <inp2:{$prefix}_PerPageSelected per_page="10" selected='selected="selected"'/>>10</option>
-					<option value="20" <inp2:{$prefix}_PerPageSelected per_page="20" selected='selected="selected"'/>>20</option>
-					<option value="50" <inp2:{$prefix}_PerPageSelected per_page="50" selected='selected="selected"'/>>50</option>
-				</select>
-				<input type="submit" class="button" name="<inp2:{$prefix}_SubmitName event="OnSetPerPage"/>" value="<inp2:m_Phrase label="lu_btn_Set"/>" />
-			</form>
-		</td>
-	</tr>
-</table>
-
Index: branches/RC/themes/default2009/platform/designs/default_design.dsg.tpl
===================================================================
diff -u -N -r11437 -r11456
--- branches/RC/themes/default2009/platform/designs/default_design.dsg.tpl	(.../default_design.dsg.tpl)	(revision 11437)
+++ branches/RC/themes/default2009/platform/designs/default_design.dsg.tpl	(.../default_design.dsg.tpl)	(revision 11456)
@@ -2,14 +2,14 @@
 <inp2:m_CheckSSL/>
 <inp2:m_include template="platform/designs/side_boxes" strip_nl="1"/>
 <inp2:m_include template="platform/designs/content_boxes" strip_nl="1"/>
-<inp2:m_include template="platform/elements/forms" strip_nl="1"/>
+<inp2:m_include template="platform/elements/forms.elm" strip_nl="1"/>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title><inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" no_editing="1"/></title>
 
 		<!--## Include module specific HEADER (META INFORMATION inside) template ##-->
-		<inp2:m_ModuleInclude template="elements/html_head" in-portal_template="platform/elements/html_head"/>
+		<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
 
 		<inp2:m_Include template="platform/template_manager/html_head"/>
 		<!--## /Include module specific HEADER template ##-->
@@ -20,12 +20,12 @@
 					<table class="fullwidth">
 						<tr>
 							<td>
-								<inp2:m_include template="platform/elements/header"/>
+								<inp2:m_include template="platform/elements/header.elm"/>
 							</td>
 						</tr>
 						<tr>
 							<td>
-								<inp2:m_include template="platform/elements/menu"/>
+								<inp2:m_include template="platform/elements/menu.elm"/>
 							</td>
 						</tr>
 					</table>
@@ -68,7 +68,7 @@
 
 							<!-- RIGHT-SIDEBAR WITH BANNER -->
 							<td style="width: 200px;" valign="top">
-								<inp2:m_include template="platform/elements/banners/banner_right"/>
+								<inp2:m_include template="platform/elements/banners/banner_right.elm"/>
 							</td>
 							<!-- /RIGHT-SIDEBAR WITH BANNER -->
 							REMOVE THIS LINE TO UNCOMMENT ##-->
@@ -78,7 +78,7 @@
 					<table class="fullwidth">
 						<tr>
 							<td >
-								<inp2:m_include template="platform/elements/footer"/>
+								<inp2:m_include template="platform/elements/footer.elm"/>
 							</td>
 						</tr>
 					</table>
Index: branches/RC/themes/default2009/platform/elements/footer.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/footer.tpl	(revision 11337)
+++ branches/RC/themes/default2009/platform/elements/footer.tpl	(revision 0)
@@ -1,15 +0,0 @@
-
-
-	<table class="fullwidth footer-table">
-		<tr>
-			<td>
-				Powered by In-portal &#174; 1997-<inp2:lang.current_CurrentDate format="Y"/>, <a href="http://www.intechnic.com" target="_blank">Intechnic Corporation</a>. <inp2:m_Phrase label="lu_AllRightsReserved"/>
-			</td>
-		</tr>
-	</table>
-
-	<div class="footer-links">
-		<a href="<inp2:m_Link template="platform/site_map"/>"><inp2:m_Phrase label="lu_SiteMap"/></a> | <a href="<inp2:m_Link template="platform/terms"/>"><inp2:m_Phrase label="lu_TermAndCondition"/></a> | <a href="<inp2:m_Link template="platform/privacy"/>"><inp2:m_Phrase label="lu_PrivacyPolicy"/></a>
-	</div>
-
-	<inp2:m_RegisterPageHit/>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/designs/default_design_ajax.dsg.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/designs/default_design_ajax.dsg.tpl	(.../default_design_ajax.dsg.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/designs/default_design_ajax.dsg.tpl	(.../default_design_ajax.dsg.tpl)	(revision 11456)
@@ -1,4 +1,4 @@
 <inp2:m_include template="platform/designs/content_boxes" strip_nl="1"/>
-<inp2:m_include template="platform/elements/forms" strip_nl="1"/>
+<inp2:m_include template="platform/elements/forms.elm" strip_nl="1"/>
 
 <inp2:m_RenderElement name="content"/>
Index: branches/RC/themes/default2009/platform/login/register_confirm_pending.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/login/register_confirm_pending.tpl	(.../register_confirm_pending.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/login/register_confirm_pending.tpl	(.../register_confirm_pending.tpl)	(revision 11456)
@@ -13,7 +13,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UserRegistration,lu_title_RegistrationPendingConfirmation" templates="platform/login/register,platform/login/register_confirm_pending"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration,lu_title_RegistrationPendingConfirmation" templates="platform/login/register,platform/login/register_confirm_pending"/>
 
 	<!-- registration pending confirmation -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/site_map.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/site_map.tpl	(.../site_map.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/site_map.tpl	(.../site_map.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SiteMap" templates="platform/site_map"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SiteMap" templates="platform/site_map"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
Index: branches/RC/themes/default2009/platform/elements/menu.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/menu.tpl	(revision 11448)
+++ branches/RC/themes/default2009/platform/elements/menu.tpl	(revision 0)
@@ -1,117 +0,0 @@
-<table class="menu-background fullwidth">
-	<tr>
-		<td align="left">
-			<table style="width: auto;">
-				<tr>
-					<td>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenu.js"></script>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenueffect.js"></script>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_dyn.js"></script>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_xml.js"></script>
-
-						<link rel="StyleSheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/dmenu.css" type="text/css" />
-						<div id="xmlMenuDiv"></div>
-
-				        <script type="text/javascript">
-				        	<inp2:m_DefineElement name="dmenu_element">
-										<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
-										<inp2:m_Random result_to_var="rand"/>
-										<inp2:m_Set m_cat_id="$root_cat"/>
-										<inp2:conf_ConfigValue name="CategoriesRebuildSerial" result_to_var="serial"/>
-										<item id="sub-elem<inp2:m_Param name="root_cat"/>"
-											url="<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root"/>"
-											ico="['<inp2:m_TemplatesBase module="$module"/>img/<inp2:m_Param name="icon"/>']"
-											enb="true" title=""
-											subid="sub<inp2:m_Param name="root_cat"/>"
-											suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/subcats.xml"
-											 m_cat_id="$root_cat"
-											 m_cat_page="1"
-											 c_menu_Page="1" pass="m,c.menu"
-											 level="0" max_level="4" serial="$serial"
-											/>" ><![CDATA[<inp2:c_Field requery="1" name="Name"/>]]></item>
-									</inp2:m_DefineElement>
-
-				        	<inp2:m_DefineElement name="menu_xml">
-										<menumgr id="mgr" flowoverformelement="false" defaulteffect="aoslide" icpath="">
-										<!--## USE droponclick="false" TO OPEN MENU ONMOUSE-OVER ##-->
-										  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_" droponclick="true" >
-										    <items>
-										    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_RootCategoryName/>]]></item>
-										    	<inp2:m_ModuleInclude template="elements/menu.xml" />
-										    </items>
-										  </menubar>
-										</menumgr>
-				        	</inp2:m_DefineElement>
-
-				        	<inp2:m_get name="m_cat_id" result_to_var="current_category"/>
-
-				        	addLoadEvent(
-				        		function() {
-					        	 	var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" no_editing="1" js_escape="1"/>');
-
-//						        	menu_mgr.renderMenus();
-						        	menu_mgr.renderMenubar('xmlMenuDiv');
-					        	}
-					        );
-				        </script>
-				        <noscript>
-				        	<inp2:m_DefineElement name="static_menu_element">
-				        		<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
-								<inp2:m_Random result_to_var="rand"/>
-								<inp2:m_Set m_cat_id="$root_cat"/>
-								<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root" result_to_var="link"/>
-								<inp2:m_TemplatesBase module="$module" result_to_var="module_path"/>
-								<inp2:c_Field requery="1" name="Name" result_to_var="title"/>
-								<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/{$icon}" no_editing="1"/>
-							</inp2:m_DefineElement>
-
-							<table>
-								<tr>
-									<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1" result_to_var="link"/>
-									<inp2:m_RootCategoryName result_to_var="title"/>
-									<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
-									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif" no_editing="1"/>
-				        			<inp2:m_ModuleInclude template="elements/static_menu.elm" />
-								</tr>
-							</table>
-				        </noscript>
-
-				        <inp2:m_Set m_cat_id="$current_category"/>
-						<inp2:c_Field requery="1" name="Name" result_to_var="category_name"/>
-					</td>
-				</tr>
-			</table>
-		</td>
-		<td align="right">
-			<table style="width: auto;">
-				<tr>
-					<!-- menu: My Account -->
-					<inp2:m_RenderElement design="menu_element" no_editing="1">
-						<inp2:m_Capture to_var="menu_href">
-							<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0" m_cat_page="1"/>
-						</inp2:m_Capture>
-
-						<inp2:m_Capture to_var="menu_icon">
-							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
-						</inp2:m_Capture>
-
-						<inp2:m_Capture to_var="menu_title">
-							<inp2:m_Phrase name="lu_title_MyAccount"/>
-						</inp2:m_Capture>
-
-						<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
-					</inp2:m_RenderElement>
-					<!-- // menu: My Account -->
-
-
-					<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
-					<!-- menu: ShoppingCart -->
-						<inp2:m_Include t="in-commerce/elements/menu_element"/>
-					<!-- // menu: ShoppingCart -->
-					</inp2:m_if>
-
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/elements/navigation_bar.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/navigation_bar.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/navigation_bar.elm.tpl	(revision 11456)
@@ -0,0 +1,38 @@
+<inp2:m_DefaultParam titles="" templates="" show_category="0"/>
+
+<inp2:m_DefineElement name="root_category">
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_home.gif" width="9" height="9" alt=""/> <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="module_root">
+	<inp2:m_param name="separator"/>
+	<a href="<inp2:c_CategoryLink template="$module_index" cat_id="$cat_id"/>"><inp2:m_param name="title"/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="nav_link">
+	<inp2:m_param name="separator"/>
+	<inp2:m_if check="m_Param" name="category">
+		<a href="<inp2:c_CategoryLink template="__default__" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
+	<inp2:m_else/>
+		<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="module_item">
+	<inp2:m_param name="separator"/>
+	<a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="current_item">
+	<inp2:m_param name="separator"/>
+	<span> <inp2:m_param name="title"/></span>
+</inp2:m_DefineElement>
+
+<table class="fullwidth groupItem">
+	<tr>
+		<td class="navigation-bar itemHeader">
+			<!-- module_root_render_as="module_root" -->
+			<inp2:c_CategoryPath separator="&gt;" render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" titles="$titles" templates="$templates" show_category="$show_category"/>
+		</td>
+	</tr>
+</table>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/my_account/my_preferences.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/my_account/my_preferences.tpl	(.../my_preferences.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/my_account/my_preferences.tpl	(.../my_preferences.tpl)	(revision 11456)
@@ -15,7 +15,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MyAccount,lu_title_MyPreferences" templates="platform/my_account/my_account,platform/my_account/my_preferences"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyPreferences" templates="platform/my_account/my_account,platform/my_account/my_preferences"/>
 
 	<!-- my preferences -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/categories/suggest_pending_confirm.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/categories/suggest_pending_confirm.tpl	(.../suggest_pending_confirm.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/categories/suggest_pending_confirm.tpl	(.../suggest_pending_confirm.tpl)	(revision 11456)
@@ -15,7 +15,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SuggestCategoryPendingConfirm" templates="platform/categories/suggest_pending_confirm" show_category="1"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestCategoryPendingConfirm" templates="platform/categories/suggest_pending_confirm" show_category="1"/>
 
 	<!-- suggest category pending confirm -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/elements/navigation_bar.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/elements/navigation_bar.tpl	(revision 11427)
+++ branches/RC/themes/default2009/platform/elements/navigation_bar.tpl	(revision 0)
@@ -1,38 +0,0 @@
-<inp2:m_DefaultParam titles="" templates="" show_category="0"/>
-
-<inp2:m_DefineElement name="root_category">
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_home.gif" width="9" height="9" alt=""/> <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="module_root">
-	<inp2:m_param name="separator"/>
-	<a href="<inp2:c_CategoryLink template="$module_index" cat_id="$cat_id"/>"><inp2:m_param name="title"/></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="nav_link">
-	<inp2:m_param name="separator"/>
-	<inp2:m_if check="m_Param" name="category">
-		<a href="<inp2:c_CategoryLink template="__default__" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
-	<inp2:m_else/>
-		<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="module_item">
-	<inp2:m_param name="separator"/>
-	<a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="current_item">
-	<inp2:m_param name="separator"/>
-	<span> <inp2:m_param name="title"/></span>
-</inp2:m_DefineElement>
-
-<table class="fullwidth groupItem">
-	<tr>
-		<td class="navigation-bar itemHeader">
-			<!-- module_root_render_as="module_root" -->
-			<inp2:c_CategoryPath separator="&gt;" render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" titles="$titles" templates="$templates" show_category="$show_category"/>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: branches/RC/themes/default2009/no_permission.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/no_permission.tpl	(.../no_permission.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/no_permission.tpl	(.../no_permission.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 <!--## //SIDE-BAR ELEMENT ##-->
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_NoPermission" templates="no_permission"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_NoPermission" templates="no_permission"/>
 
 	<!-- no permission -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/terms.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/terms.tpl	(.../terms.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/terms.tpl	(.../terms.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm"/>
 
 
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/thankyou.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/thankyou.tpl	(.../thankyou.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/thankyou.tpl	(.../thankyou.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
Index: branches/RC/themes/default2009/platform/privacy.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/privacy.tpl	(.../privacy.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/privacy.tpl	(.../privacy.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm"/>
 
 
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/login/forgot_password_reset_notice.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/login/forgot_password_reset_notice.tpl	(.../forgot_password_reset_notice.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/login/forgot_password_reset_notice.tpl	(.../forgot_password_reset_notice.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_ForgotPasswordNotification" templates="platform/login/forgot_password_reset_notice"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordNotification" templates="platform/login/forgot_password_reset_notice"/>
 
 	<!-- forgot password reset confirm -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/index.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/index.tpl	(.../index.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/index.tpl	(.../index.tpl)	(revision 11456)
@@ -23,7 +23,7 @@
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
Index: branches/RC/themes/default2009/platform/mailing_list/subscribe_ok.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/mailing_list/subscribe_ok.tpl	(.../subscribe_ok.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/mailing_list/subscribe_ok.tpl	(.../subscribe_ok.tpl)	(revision 11456)
@@ -14,7 +14,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SubscribeConfirm,lu_title_SubscribeOk" templates="platform/mailing_list/subscribe,platform/mailing_list/subscribe_ok"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SubscribeConfirm,lu_title_SubscribeOk" templates="platform/mailing_list/subscribe,platform/mailing_list/subscribe_ok"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
Index: branches/RC/themes/default2009/platform/login/forgot_password.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 11456)
@@ -16,7 +16,7 @@
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_ForgotPassword" templates="platform/login/forgot_password"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPassword" templates="platform/login/forgot_password"/>
 
 	<!-- forgot password -->
 	<inp2:m_RenderElement design="content_box">
Index: branches/RC/themes/default2009/platform/members_list.tpl
===================================================================
diff -u -N -r11443 -r11456
--- branches/RC/themes/default2009/platform/members_list.tpl	(.../members_list.tpl)	(revision 11443)
+++ branches/RC/themes/default2009/platform/members_list.tpl	(.../members_list.tpl)	(revision 11456)
@@ -20,7 +20,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_Members" templates="platform/members_list"/>
+	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_Members" templates="platform/members_list"/>
 
 	<!--## links in category ##-->
 	<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_users">
@@ -47,7 +47,7 @@
 			<inp2:u.all_PrintList list_name="all_members" render_as="user_element" direction="H"/>
 		</table>
 
-		<inp2:m_include template="platform/elements/pagination" prefix="u.all" list_name="all_members"/>
+		<inp2:m_include template="platform/elements/pagination.elm" prefix="u.all" list_name="all_members"/>
 	</inp2:m_RenderElement>
 
 </inp2:m_DefineElement>