Index: branches/1.2.x/elements/navigation_bar.elm.tpl
===================================================================
diff -u -r14276 -r15272
--- branches/1.2.x/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 14276)
+++ branches/1.2.x/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 15272)
@@ -1,33 +1,55 @@
-<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">
-	<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">
+		<inp2:m_param name="separator"/>
+	</inp2:m_ifnot>
+
+	<inp2:m_param name="title"/>
 </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_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="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_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="module_item">
-	<inp2:m_param name="separator"/>
+<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"/>
-	<inp2:m_param name="title"/>
+<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>
 
 <p id="breadcrumb">
-	<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"/>
-</p>
+	<inp2:c_CategoryPath
+		separator="&gt;"
+		render_as="nb_element"
+		current_render_as="nb_current_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"
+	/>
+</p>
\ No newline at end of file
Index: branches/1.2.x/designs/default_design.des.tpl
===================================================================
diff -u -r14933 -r15272
--- branches/1.2.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14933)
+++ branches/1.2.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 15272)
@@ -8,7 +8,7 @@
 
 <head>
 	<title>
-		<inp2:st_PageInfo type="title"/> (<inp2:m_GetConfig name="Site_Name"/>)
+		<inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_GetConfig name="Site_Name"/>)
 	</title>
 
 
Index: branches/1.2.x/designs/default_design_inner.des.tpl
===================================================================
diff -u -r14276 -r15272
--- branches/1.2.x/designs/default_design_inner.des.tpl	(.../default_design_inner.des.tpl)	(revision 14276)
+++ branches/1.2.x/designs/default_design_inner.des.tpl	(.../default_design_inner.des.tpl)	(revision 15272)
@@ -8,7 +8,7 @@
 
 <head>
 	<title>
-		<inp2:st_PageInfo type="title"/> (<inp2:m_GetConfig name="Site_Name"/>)
+		<inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_GetConfig name="Site_Name"/>)
 	</title>
 
 
