Index: branches/1.0.x/elements/content_boxes.elm.tpl
===================================================================
diff -u -N -r15169 -r15271
--- branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 15169)
+++ branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 15271)
@@ -7,8 +7,6 @@
 
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="default_page_title"><inp2:m_GetConfig name="Site_Name"/> &mdash; <inp2:st_PageInfo type="htmlhead_title"/></inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="default_add_to_footer" no_editing="1">
 </inp2:m_DefineElement>
 
@@ -19,7 +17,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="default_page_title">
-	<inp2:st_PageInfo type="htmlhead_title"/>
+	<inp2:st_PageInfo type="htmlhead_title" html_escape="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="image_element">
Index: branches/1.0.x/products/compare.tpl
===================================================================
diff -u -N -r15169 -r15271
--- branches/1.0.x/products/compare.tpl	(.../compare.tpl)	(revision 15169)
+++ branches/1.0.x/products/compare.tpl	(.../compare.tpl)	(revision 15271)
@@ -3,7 +3,6 @@
 <DESC>Product comparison page</DESC>
 <SECTION>Pages||Compare Products</SECTION>
 ##-->
-<inp2:m_DefineElement name="page_title"><inp2:st_PageInfo type="htmlhead_title" html_escape="1"/></inp2:m_DefineElement>
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
Index: branches/1.0.x/index.tpl
===================================================================
diff -u -N -r14992 -r15271
--- branches/1.0.x/index.tpl	(.../index.tpl)	(revision 14992)
+++ branches/1.0.x/index.tpl	(.../index.tpl)	(revision 15271)
@@ -4,10 +4,6 @@
 <SECTION></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">
 	<inp2:m_Include template="elements/side_boxes/categories.elm" data_exists="1"/>
Index: branches/1.0.x/elements/title_bar.elm.tpl
===================================================================
diff -u -N -r15169 -r15271
--- branches/1.0.x/elements/title_bar.elm.tpl	(.../title_bar.elm.tpl)	(revision 15169)
+++ branches/1.0.x/elements/title_bar.elm.tpl	(.../title_bar.elm.tpl)	(revision 15271)
@@ -1,12 +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_DefineElement name="nb_titlebar_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<inp2:m_param name="separator"/>
+	</inp2:m_ifnot>
+
 	<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
+<inp2:c_CategoryPath separator=" &gt; " render_as="nb_titlebar_element" strip_nl="2"/>
\ No newline at end of file
Index: branches/1.0.x/elements/navigation_bar.elm.tpl
===================================================================
diff -u -N -r15169 -r15271
--- branches/1.0.x/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 15169)
+++ branches/1.0.x/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 15271)
@@ -1,35 +1,60 @@
-<inp2:m_DefaultParam titles="" templates="" show_category="0" navigation_buttons="0"/>
+<inp2:m_DefaultParam titles="" templates="" show_category="0" navigation_buttons="0" category_title="MenuTitle"/>
 
-<inp2:m_DefineElement name="root_category">
-	<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_Phrase name="lu_rootcategory_name"/></a>
+<inp2:m_DefineElement name="nb_current_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<i></i>
+	</inp2:m_ifnot>
+
+	<em><inp2:m_param name="title"/></em>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="module_root">
-	<i></i> <a href="<inp2:c_CategoryLink template="$module_index" cat_id="$cat_id"/>"><inp2:m_param name="title"/></a>
+<inp2:m_DefineElement name="nb_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<i></i>
+	</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="nav_link">
-	<i></i>
-	<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_category_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<i></i>
+	</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="module_item">
-	<i></i> <a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
+<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">
-	<i></i> <em><inp2:m_param name="title"/></em>
+<inp2:m_DefineElement name="nb_custom_element">
+	<inp2:m_ifnot check="m_Param" name="is_first">
+		<i></i>
+	</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>
 
 <h2>
-	<inp2:c_CategoryPath separator="" render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" module_root_render_as="html:" titles="$titles" templates="$templates" show_category="$show_category"/><span></span>
+	<inp2:c_CategoryPath
+		separator=""
+		render_as="nb_element"
+		current_render_as="nb_current_element"
 
-<inp2:m_if check="m_Param" name="navigation_buttons">
-	<inp2:m_RenderElement name="prev_next_element" prefix="p" id_field="ProductId" special="product-navigation" main_list="1"/>
-</inp2:m_if>
+		category_render_as="nb_category_element"
+		custom_render_as="nb_custom_element"
 
+		titles="$titles" templates="$templates"
+		show_category="$show_category" category_title="$category_title"
+	/>
+	<span></span>
+
+	<inp2:m_if check="m_Param" name="navigation_buttons">
+		<inp2:m_RenderElement name="prev_next_element" prefix="p" id_field="ProductId" special="product-navigation" main_list="1"/>
+	</inp2:m_if>
 </h2>
\ No newline at end of file