Index: branches/1.2.x/platform/designs/default_design.des.tpl
===================================================================
diff -u -N -r15256 -r15269
--- branches/1.2.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 15256)
+++ branches/1.2.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 15269)
@@ -14,7 +14,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<inp2:m_DefineElement name="cms_page_title">
-			<inp2:st_PageInfo type="htmlhead_title"/>
+			<inp2:st_PageInfo type="htmlhead_title" html_escape="1"/>
 		</inp2:m_DefineElement>
 
 		<title><inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" default_element="cms_page_title" no_editing="1"/></title>
@@ -39,7 +39,7 @@
 		</script>
 
 		<inp2:m_DefineElement name="default_add_to_head"></inp2:m_DefineElement>
-		<inp2:m_RenderElement name="add_to_head" default_element="default_add_to_head"/>
+		<inp2:m_RenderElement name="add_to_head" default_element="default_add_to_head" no_editing="1"/>
 
 		<inp2:st_EditingScripts/>
 		<!--## /Include module specific HEADER template ##-->
Index: branches/1.2.x/platform/elements/title_bar.elm.tpl
===================================================================
diff -u -N -r14274 -r15269
--- branches/1.2.x/platform/elements/title_bar.elm.tpl	(.../title_bar.elm.tpl)	(revision 14274)
+++ branches/1.2.x/platform/elements/title_bar.elm.tpl	(.../title_bar.elm.tpl)	(revision 15269)
@@ -1,17 +1,9 @@
-<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="nb_titlebar_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<inp2:m_param name="separator"/>
+	</inp2:m_ifnot>
 
-<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
+<inp2:c_CategoryPath separator=" &gt; " render_as="nb_titlebar_element" strip_nl="2"/>
\ No newline at end of file
Index: branches/1.2.x/platform/designs/form.tpl
===================================================================
diff -u -N -r14612 -r15269
--- branches/1.2.x/platform/designs/form.tpl	(.../form.tpl)	(revision 14612)
+++ branches/1.2.x/platform/designs/form.tpl	(.../form.tpl)	(revision 15269)
@@ -10,12 +10,6 @@
 
 <inp2:m_include template="platform/elements/dynamic_forms.elm"/>
 
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:st_PageInfo type="title"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<div class="movable-area">
Index: branches/1.2.x/platform/elements/forms.elm.tpl
===================================================================
diff -u -N -r14993 -r15269
--- branches/1.2.x/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14993)
+++ branches/1.2.x/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15269)
@@ -580,23 +580,23 @@
 	<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="ci_category_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<inp2:m_param name="separator"/>
+	</inp2:m_ifnot>
 
-<inp2:m_DefineElement name="primary_root_category">
-	<inp2:m_Phrase name="lu_rootcategory_name"/>
+	<inp2:m_param name="title"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_pr_category_label" no_editing="1" 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>
+			<inp2:m_if check="m_Param" name="editing">
+				<inp2:{$prefix}_CategoryName />
+			<inp2:m_else />
+				<inp2:c_CategoryPath separator="&gt;" render_as="ci_category_element"/>
+			</inp2:m_if>
 		</td>
 	</tr>
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
Index: branches/1.2.x/platform/elements/navigation_bar.elm.tpl
===================================================================
diff -u -N -r14274 -r15269
--- branches/1.2.x/platform/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 14274)
+++ branches/1.2.x/platform/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 15269)
@@ -1,38 +1,70 @@
-<inp2:m_DefaultParam titles="" templates="" show_category="0"/>
+<inp2:m_DefaultParam titles="" templates="" show_category="0" category_title="MenuTitle"/>
 
-<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_Phrase name="lu_rootcategory_name"/></a>
+<inp2:m_DefineElement name="nb_root_category_element">
+	<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/icon_home.gif" width="9" height="9" alt=""/>
+
+	<inp2:m_if check="m_Param" name="current">
+		<inp2:m_Param name="cat_name"/>
+	<inp2:m_else/>
+		<a href="<inp2:c_CategoryLink template='__default__'/>"><inp2:m_Param name="title"/></a>
+	</inp2:m_if>
 </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 name="nb_current_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<inp2:m_param name="separator"/>
+	</inp2:m_ifnot>
+
+	<span><inp2:m_param name="title"/></span>
 </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 name="nb_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<inp2:m_param name="separator"/>
+	</inp2:m_ifnot>
+
+	<a href="<inp2:m_Link template='$template' m_cat_id='0" m_cat_page='1'/>"><inp2:m_param name="title"/></a>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="module_item">
-	<inp2:m_param name="separator"/>
+<inp2:m_DefineElement name="nb_category_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<inp2:m_param name="separator"/>
+	</inp2:m_ifnot>
+
+	<a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>"><inp2:m_param name="title"/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="nb_module_item_element">
 	<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 name="nb_custom_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<inp2:m_param name="separator"/>
+	</inp2:m_ifnot>
+
+	<inp2:m_if check="m_Param" name="title" equals_to="__page__">
+		<a href="<inp2:m_Link template='$template' m_cat_id='0' m_cat_page='1'/>"><inp2:st_PageInfo type="title"/></a>
+	<inp2:m_elseif check="m_Param" name="title" equals_to="__item__"/>
+		<inp2:c_CategoryItemElement render_as="nb_module_item_element" pass_params="1"/>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <table class="fullwidth groupItem">
 	<tr class="movable-header">
 		<td class="navigation-bar">
-			<!-- 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"/>
+			<inp2:c_CategoryPath
+				separator="&gt;"
+				render_as="nb_element"
+				current_render_as="nb_current_element"
+
+				root_cat_render_as="nb_root_category_element"
+				category_render_as="nb_category_element"
+				custom_render_as="nb_custom_element"
+
+				titles="$titles" templates="$templates"
+				show_category="$show_category" category_title="$category_title"
+			/>
 		</td>
 	</tr>
 </table>
\ No newline at end of file
Index: branches/1.2.x/platform/my_account/verify_email.tpl
===================================================================
diff -u -N -r15167 -r15269
--- branches/1.2.x/platform/my_account/verify_email.tpl	(.../verify_email.tpl)	(revision 15167)
+++ branches/1.2.x/platform/my_account/verify_email.tpl	(.../verify_email.tpl)	(revision 15269)
@@ -4,12 +4,6 @@
 <SECTION>My Account</SECTION>
 ##-->
 
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:st_PageInfo type="htmlhead_title"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<div class="movable-area">
Index: branches/1.2.x/platform/designs/general.tpl
===================================================================
diff -u -N -r14274 -r15269
--- branches/1.2.x/platform/designs/general.tpl	(.../general.tpl)	(revision 14274)
+++ branches/1.2.x/platform/designs/general.tpl	(.../general.tpl)	(revision 15269)
@@ -3,11 +3,6 @@
 <DESC>General</DESC>
 <SECTION>Platform</SECTION>
 ##-->
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:st_PageInfo type="title"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
Index: branches/1.2.x/platform/my_account/restore_email.tpl
===================================================================
diff -u -N -r14972 -r15269
--- branches/1.2.x/platform/my_account/restore_email.tpl	(.../restore_email.tpl)	(revision 14972)
+++ branches/1.2.x/platform/my_account/restore_email.tpl	(.../restore_email.tpl)	(revision 15269)
@@ -4,12 +4,6 @@
 <SECTION>My Account</SECTION>
 ##-->
 
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:st_PageInfo type="htmlhead_title"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<div class="movable-area">
