Index: branches/1.0.x/elements/content_boxes.elm.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14733)
@@ -1,3 +1,30 @@
+<!--## DEFAULT CONTENT-TOP ELEMENT ##-->
+<inp2:m_DefineElement name="default_content_banner" no_editing="1">
+		
+	<!-- default banners -->
+	<inp2:st_ContentBlock num="101" page="index"/>
+	<!-- //default banners -->
+		
+</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>
+
+<inp2:m_DefineElement name="default_add_to_head" no_editing="1">		
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="default_sidebar" no_editing="1">		
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="image_element">
+	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> align="<inp2:m_param name="align"/>" />
+</inp2:m_DefineElement>
+
+
+
+<!--## Unused for now
 <inp2:m_DefineElement name="content_box" type="text">
 	<h2 class="movable-header"><inp2:m_param name="header"/></h2>
 	<div class="<inp2:m_Param name="type"/>">
@@ -12,31 +39,17 @@
 	</div>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="custom_box" add_class="">
+<inp2:m_DefineElement name="side_box_custom" add_class="">
 	<div class="<inp2:m_Param name='add_class'/>">
 		<h4><inp2:m_param name="header"/></h4>	
 		<inp2:m_param name="content"/>
 	</div>
 </inp2:m_DefineElement>
 
-<!--## DEFAULT CONTENT-TOP ELEMENT ##-->
-<inp2:m_DefineElement name="default_content_banner" no_editing="1">
-		
-	<!-- default banners -->
-	<inp2:st_ContentBlock num="101" page="index"/>
-	<!-- //default banners -->
-		
+<inp2:m_DefineElement name="content_box_scrollable" add_class="">
+	<div class="block no-border-bottom<inp2:m_Param name='add_class'/>">
+		<h2><inp2:m_param name="header"/></h2>	
+		<inp2:m_param name="content"/>
+	</div>
 </inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="default_add_to_footer" no_editing="1">		
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="default_add_to_head" no_editing="1">		
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="default_sidebar" no_editing="1">		
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="image_element">
-	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> align="<inp2:m_param name="align"/>" />
-</inp2:m_DefineElement>
\ No newline at end of file
+##-->
\ No newline at end of file
Index: branches/1.0.x/elements/side_boxes/filter_range.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/side_boxes/filter_range.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/side_boxes/filter_range.elm.tpl	(revision 14733)
@@ -0,0 +1,34 @@
+<div class="block alt-block">
+	<h2 class="active"><a href="#">Filter by Price</a></h2>
+	<div class="block-content">
+		<div class="range-block">
+			<ul class="range">
+				<li>$0</li>
+				<li>$100</li>
+				<li>$200</li>
+				<li>$300</li>
+				<li>$400</li>
+				<li>$500</li>
+				<li>$600</li>
+				<li>$700</li>
+				<li>$800</li>
+				<li>$900</li>
+				<li>> $900</li>
+			</ul>
+			<div id="slider-vertical" style="height:260px;"></div>
+			<ul class="range2">
+				<li>(123)</li>
+				<li>(34)</li>
+				<li>(34)</li>
+				<li>(34)</li>
+				<li>(34)</li>
+				<li>(34)</li>
+				<li>(34)</li>
+				<li>(34)</li>
+				<li>(34)</li>
+				<li>(34)</li>
+			</ul>
+			<div class="clear"></div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: branches/1.0.x/elements/side_boxes/filter_dropdown.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/side_boxes/filter_dropdown.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/side_boxes/filter_dropdown.elm.tpl	(revision 14733)
@@ -0,0 +1,7 @@
+<div class="block alt-block">
+	<h2 class=""><a href="#">Filter by Resolution</a></h2>
+	<div class="block-content noactive">
+
+		<div class="clear"></div>
+	</div>
+</div>
\ No newline at end of file
Index: branches/1.0.x/elements/side_boxes/filter_checkboxes.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/side_boxes/filter_checkboxes.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/side_boxes/filter_checkboxes.elm.tpl	(revision 14733)
@@ -0,0 +1,18 @@
+<div class="block alt-block">
+	<h2 class="active"><a href="#">Filter by Manufacturer</a></h2>
+	<div class="block-content">
+		<dl class="manufacturer">
+			<dt><input type="checkbox" id="fil" name="fil" value="1" />&nbsp;<label for="fil">All</label></dt>
+			<dd>(234)</dd>
+			<dt class="active"><input type="checkbox" id="fil" name="fil" value="1" checked="true" />&nbsp;<label for="fil">Apple</label></dt>
+			<dd class="active">(34)</dd>
+			<dt><input type="checkbox" id="fil" name="fil" value="1" />&nbsp;<label for="fil">HTC</label></dt>
+			<dd>(23)</dd>
+			<dt><input type="checkbox" id="fil" name="fil" value="1" />&nbsp;<label for="fil">Samsung</label></dt>
+			<dd>(20)</dd>
+			<dt><input type="checkbox" id="fil" name="fil" value="1" />&nbsp;<label for="fil">Nokia</label></dt>
+			<dd>(10)</dd>
+		</dl>
+		<div class="clear"></div>
+	</div>
+</div>
\ No newline at end of file
Index: branches/1.0.x/designs/section.tpl
===================================================================
diff -u -N
--- branches/1.0.x/designs/section.tpl	(revision 0)
+++ branches/1.0.x/designs/section.tpl	(revision 14733)
@@ -0,0 +1,41 @@
+<!--##
+<NAME>Products - Section Template</NAME>
+<DESC>Products</DESC>
+<SECTION></SECTION>
+##-->
+
+<inp2:m_DefineElement name="page_title"><inp2:m_include template="elements/title_bar.elm"/></inp2:m_DefineElement>
+
+<!--## SIDE-BAR ELEMENT ##-->
+<inp2:m_DefineElement name="sidebar">
+	<inp2:m_Include template="elements/side_boxes/categories.elm" data_exists="1"/>	
+	<inp2:m_Include template="elements/side_boxes/filter_range.elm"/>	
+	<inp2:m_Include template="elements/side_boxes/filter_dropdown.elm"/>	
+	<inp2:m_Include template="elements/side_boxes/filter_checkboxes.elm"/>	
+	<inp2:m_Include template="elements/side_boxes/subscribe.elm"/>	
+</inp2:m_DefineElement>
+<!--## /SIDE-BAR ELEMENT ##-->
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+	
+		<div class="block no-border-bottom">
+		
+			<inp2:m_Include template="elements/navigation_bar.elm"/>
+			
+			<inp2:m_Include template="elements/content_boxes/categories.elm"/>
+			
+		</div>
+		
+		<inp2:m_Cache key="prefix:p;currency;guest_only">
+		
+			<inp2:m_Include template="elements/products.elm" list_name="products_in_category"/>
+		
+		</div>
+			
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
+<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.0.x/elements/content_boxes/new_products.elm.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/elements/content_boxes/new_products.elm.tpl	(.../new_products.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/content_boxes/new_products.elm.tpl	(.../content_boxes/new_products.elm.tpl)	(revision 14733)
@@ -1,44 +1,26 @@
-<div class="block no-border-bottom">
-				<h2><em>New Arrivals</em><span class="new"></span></h2>
-				<div class="good-item good-item-narrow good-item-float border-radius">
-					<dl>
-						<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-						<dd>
-							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-							<p class="price">$2,549.<span>95</span></p>
-							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-						</dd>
-					</dl>
-				</div>
-				<div class="good-item good-item-narrow good-item-float border-radius">
-					<dl>
-						<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
-						<dd>
-							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
-							<p class="price">$549.<span>95</span></p>
-							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-						</dd>
-					</dl>
-				</div>
-				<div class="good-item good-item-narrow good-item-float border-radius">
-					<dl>
-						<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
-						<dd>
-							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
-							<p class="price">$999.<span>95</span></p>
-							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-						</dd>
-					</dl>
-				</div>
-				<div class="good-item good-item-narrow good-item-narrow-last good-item-float border-radius">
-					<dl>
-						<dt><a href="#">Apple IPod Classic 160GB White</a></dt>
-						<dd>
-							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good4.jpg" width="77" height="134" alt="" /></a></p>
-							<p class="price">$1,749.<span>95</span></p>
-							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-						</dd>
-					</dl>
-				</div>
-				<div class="clear"></div>
-			</div>
\ No newline at end of file
+<inp2:m_Cache key="prefix:p;currency;guest_only">
+
+	<inp2:p_InitList list_name="new_products" types="featured" parent_cat_id="0" recursive="1" per_page="12" sort_by="random"/>
+	
+	<inp2:m_DefineElement name="new_product_element">
+		<div class="good-item good-item-narrow <inp2:m_if check='m_Param' name='is_last'>good-item-narrow-last </inp2:m_if>good-item-float border-radius">			
+			<dl>
+				<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1"/></a></dt>
+				<dd>
+					<p class="img"><a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
+					<p class="price"><inp2:Field name="Price" currency="selected"/>$2,549.<span>95</span></p>				
+					<p><a href="<inp2:AddToCartLink template='checkout/shop_cart' product_template='__default__'/>" class="addtocart"><span>Add to Cart</span></a></p>
+				</dd>
+			</dl>
+		</div>
+	</inp2:m_DefineElement>
+	
+	<div class="block no-border-bottom">
+		<h2><em>New Arrivals</em><span class="new"></span></h2>
+		
+		<inp2:p_ListProducts list_name="new_products" render_as="new_product_element" no_table="1"/>
+		
+		<div class="clear"></div>	
+	</div>
+	
+</inp2:m_Cache>
\ No newline at end of file
Index: branches/1.0.x/designs/default_design.des.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14708)
+++ branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14733)
@@ -1,14 +1,16 @@
 <inp2:m_CheckSSL/>
+<inp2:m_Include template="elements/html_head.elm" strip_nl="2"/>
+<inp2:m_Include template="elements/content_boxes.elm" strip_nl="2"/>  <!--## includes system elements ##-->
 
+<inp2:m_DefaultParam columns="2"/>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="<inp2:lang.current_Field name='Locale' db='1'/>">
 
 <head>
-	<title><inp2:m_GetConfig name="Site_Name"/> &mdash; <inp2:st_PageInfo type="title"/></title>
-	<inp2:m_Include template="elements/html_head.elm" strip_nl="2"/>
-	<inp2:m_Include template="elements/content_boxes.elm" strip_nl="2"/>  <!--## includes system elements ##-->
+	<title><inp2:m_RenderElement name="page_title" default_element="default_cms_page_title" no_editing="1"/></title>
 
 	<link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress from='all_css'/>" type="text/css" />
 	
@@ -24,27 +26,36 @@
 	<!--## System tag please do not remove ##-->
 	<inp2:st_EditPage mode="start"/>
 
-	<inp2:m_Include template="elements/header.elm" />	
-	<inp2:m_Include template="elements/menu.elm" />
-
-	<div id="content">
-		<div class="padding">
-		
-			<div class="leftcol">
-				<inp2:m_RenderElement name="sidebar" default_element="default_sidebar"/>
-			</div>
-		
-			<div class="contentcol">
-				<inp2:m_RenderElement name="content"/>
-			</div>
-			<div class="clear"></div>
+		<inp2:m_Include template="elements/header.elm" />	
+		<inp2:m_Include template="elements/menu.elm" />
+	
+		<div id="content">		
+			<div class="padding">
 			
+				<inp2:m_if check="m_Param" equals_to="2">
+			
+					<div class="leftcol">
+						<inp2:m_RenderElement name="sidebar" default_element="default_sidebar"/>
+					</div>
+				
+					<div class="contentcol">
+						<inp2:m_RenderElement name="content"/>
+					</div>
+					
+				<inp2:m_else/>
+				
+					<inp2:m_RenderElement name="content"/>
+					
+				</inp2:m_if>
+				
+				<div class="clear"></div>
+				
+			</div>
 		</div>
-	</div>
-
-	<inp2:m_Include template="elements/footer_menu.elm" />
 	
-	<inp2:m_Include template="elements/footer.elm" />
+		<inp2:m_Include template="elements/footer_menu.elm" />
+		
+		<inp2:m_Include template="elements/footer.elm" />
 
 	<inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
 
Index: branches/1.0.x/elements/side_boxes/categories.elm.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/elements/side_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/side_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 14733)
@@ -1,30 +1,30 @@
-<inp2:m_Capture to_var="header">
-	<em><inp2:m_Phrase label="lu_title_Categories"/></em><span></span>
-</inp2:m_Capture>
-
-<inp2:m_DefineElement name="more_link_elem">
-	<li>
-		<a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>"><inp2:m_Phrase label="lu_more_Products"/>...</a>
-	</li>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="subcategory_elem">
-	<li>
-		<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="<inp2:m_if check='IsCurrent'>active</inp2:m_if>"><inp2:Field name="Name" html_escape="1"/></a>
-	</li>	
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="category_elem">
-	<h3><a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>"><inp2:Field name="Name" html_escape="1"/></a></h3>
-	<div>
-		<ul>
-			<inp2:ListCategories requery="1" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="20" no_table="1"/>
-		</ul>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_Cache key="prefix:c;skip_var:t,page,per_page,sort_by">
+<div class="block">
+	<h2><em><inp2:m_Phrase label="lu_title_Categories"/></em><span></span></h2>	
+	
+	<inp2:m_DefineElement name="more_link_elem">
+		<li>
+			<a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>"><inp2:m_Phrase label="lu_more_Products"/>...</a>
+		</li>
+	</inp2:m_DefineElement>
+	
+	<inp2:m_DefineElement name="subcategory_elem">
+		<li>
+			<a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>" <inp2:m_if check='IsCurrent'>class="active"</inp2:m_if>><inp2:Field name="Name" html_escape="1"/></a>
+		</li>	
+	</inp2:m_DefineElement>
+	
+	<inp2:m_DefineElement name="category_elem">
+		<h3><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Field name="Name" html_escape="1"/></a></h3>
+		<div>
+			<ul>
+				<inp2:ListCategories requery="1" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="20" no_table="1"/>
+			</ul>
+		</div>
+	</inp2:m_DefineElement>
+	
 	<div id="accordion-menu">
-		<inp2:c_ListCategories render_as="category_elem" sort_by="Priority,Desc" per_page="-1" no_table="1" parent_cat_id="Root" module="In-Commerce"/>
+		<inp2:m_Cache key="prefix:c;skip_var:t,page,per_page,sort_by">	
+			<inp2:c_ListCategories render_as="category_elem" sort_by="Priority,Desc" per_page="-1" no_table="1" parent_cat_id="Root" module="In-Commerce"/>
+		</inp2:m_Cache>
 	</div>
-</inp2:m_Cache>
\ No newline at end of file
+</div>
Index: branches/1.0.x/elements/content_boxes/products.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/content_boxes/products.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/content_boxes/products.elm.tpl	(revision 14733)
@@ -0,0 +1,53 @@
+<inp2:p_InitList list_name="products_in_category" main_list="1"/>
+		
+<inp2:m_Include template="elements/sorting.elm" list_name="products_in_category"/>
+
+<inp2:m_DefineElement name="product_element">
+<li>
+	<div class="item">
+		<div class="ribbon new"></div>
+		<div class="img">
+			<a href="#"><img src="/i/samples/good6.jpg" width="69" height="69" alt="" /></a>
+		</div>
+		<div class="descr">
+			<h3><a href="#">Apple iMac Desktop Customizable</a></h3>
+			<p>Suspendisse potenti. Aliquam id nisl nisi. Vivamus imperdiet, turpis ornare commodo elementum, lectus tellus fermentum eros, a tincidunt est odio eu lorem...</p>
+			<div class="optional">
+				<span class="stars"><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /></span>
+				<span class="reviews">
+					<a href="#">Reviews</a> (<a href="#">12</a>)&nbsp;&nbsp;&nbsp;
+				</span>
+				<span class="comp">
+					<label><input type="checkbox" name="compare-1" value="1" /><em>Compare</em></label>
+				</span>
+			</div>
+		</div>
+		<div class="price-block">
+			<p><s class="under">$2,549.<span>95</span></s></p>
+			<p class="redprice"><em class="price">$2,549.<span>95</span></em></p>
+			<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+		</div>
+	</div>
+</li>
+</inp2:m_DefineElement>
+
+
+<div class="items border-radius">
+	<ul class="display">			
+	
+		<inp2:p_ListProducts list_name="products_in_category" render_as="product_element"/>
+				
+	</ul>	
+	<div class="clear"></div>
+	
+	<div class="pagination">
+		<span class="prev">&nbsp;</span>
+		<a href="#" class="active">1</a>
+		<a href="#">2</a>
+		<a href="#">3</a>
+		<a href="#" class="next">&nbsp;</a>
+	</div>
+	
+	
+</div>
+		
\ No newline at end of file
Index: branches/1.0.x/index.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/index.tpl	(.../index.tpl)	(revision 14708)
+++ branches/1.0.x/index.tpl	(.../index.tpl)	(revision 14733)
@@ -5,25 +5,25 @@
 ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title"><inp2:m_phrase name="lu_title_WelcomeTitle" no_editing="1"/></inp2:m_DefineElement>
+<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_RenderElement name="elements/side_boxes/categories.elm" design="side_box"/>	
-	<inp2:m_RenderElement name="elements/side_boxes/picks.elm" design="side_box" add_class="no-border-bottom"/>	
-	<inp2:m_RenderElement name="elements/side_boxes/subscribe.elm" design="custom_box" add_class="subscribe-block"/>	
+	<inp2:m_Include template="elements/side_boxes/categories.elm" data_exists="1"/>	
+	<inp2:m_Include template="elements/side_boxes/picks.elm" data_exists="1"/>	
+	<inp2:m_Include template="elements/side_boxes/subscribe.elm"/>	
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
-	
+
 	<inp2:m_Include template="elements/promo.elm" strip_nl="2"/>
 	
-	<inp2:m_Include template="elements/special_deals.elm" strip_nl="2"/>
+	<inp2:m_Include template="elements/content_boxes/special_deals.elm" data_exists="1" strip_nl="2"/>
 	
-	<inp2:m_Include template="elements/new_products.elm" strip_nl="2"/>
+	<inp2:m_Include template="elements/content_boxes/new_products.elm" data_exists="1" strip_nl="2"/>
 	
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
@@ -95,5 +95,5 @@
 </inp2:m_DefineElement>
 
 <!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="designs/default_design.des" pass_params="1"/>
+<inp2:m_include template="designs/default_design.des" pass_params="1" columns="2"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.0.x/elements/new_products.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/new_products.elm.tpl	(revision 14708)
+++ branches/1.0.x/elements/new_products.elm.tpl	(revision 0)
@@ -1,44 +0,0 @@
-<div class="block no-border-bottom">
-				<h2><em>New Arrivals</em><span class="new"></span></h2>
-				<div class="good-item good-item-narrow good-item-float border-radius">
-					<dl>
-						<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-						<dd>
-							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-							<p class="price">$2,549.<span>95</span></p>
-							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-						</dd>
-					</dl>
-				</div>
-				<div class="good-item good-item-narrow good-item-float border-radius">
-					<dl>
-						<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
-						<dd>
-							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
-							<p class="price">$549.<span>95</span></p>
-							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-						</dd>
-					</dl>
-				</div>
-				<div class="good-item good-item-narrow good-item-float border-radius">
-					<dl>
-						<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
-						<dd>
-							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
-							<p class="price">$999.<span>95</span></p>
-							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-						</dd>
-					</dl>
-				</div>
-				<div class="good-item good-item-narrow good-item-narrow-last good-item-float border-radius">
-					<dl>
-						<dt><a href="#">Apple IPod Classic 160GB White</a></dt>
-						<dd>
-							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good4.jpg" width="77" height="134" alt="" /></a></p>
-							<p class="price">$1,749.<span>95</span></p>
-							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-						</dd>
-					</dl>
-				</div>
-				<div class="clear"></div>
-			</div>
\ No newline at end of file
Index: branches/1.0.x/elements/special_deals.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/special_deals.elm.tpl	(revision 14708)
+++ branches/1.0.x/elements/special_deals.elm.tpl	(revision 0)
@@ -1,98 +0,0 @@
-<div class="block block-margin no-border-bottom">
-	<h2><em>Special Deals</em><span class="sale"></span></h2>
-	<div id="scrollable">
-		<div class="items">
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-						<p class="price">$2,549.<span>95</span></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
-						<p class="price">$549.<span>95</span></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
-						<p class="price">$999.<span>95</span></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="clear"></div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
Index: branches/1.0.x/elements/side_boxes/compare.elm.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 14733)
@@ -1 +1,32 @@
+<inp2:p_InitList list_name="compare_products" types="compare" parent_cat_id="0" recursive="1" max="4"/>
+
+<div class="block no-border-bottom">
+	<h2><em>Comparing Products (3)</em><span class="bullet"></span></h2>
+	<div class="good-item border-radius-bottom comparing-items">
+		<dl>
+			<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+			<dd>
+				<p class="img"><a href="#"><img src="/i/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+				<p class="button-delete"><a href="#"><img src="/i/icon-delete.png" width="13" height="13" alt="" /></a></p>
+			</dd>
+		</dl>
+		<dl>
+			<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+			<dd>
+				<p class="img"><a href="#"><img src="/i/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+				<p class="button-delete"><a href="#"><img src="/i/icon-delete.png" width="13" height="13" alt="" /></a></p>
+			</dd>
+		</dl>
+		<dl>
+			<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+			<dd>
+				<p class="img"><a href="#"><img src="/i/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+				<p class="button-delete"><a href="#"><img src="/i/icon-delete.png" width="13" height="13" alt="" /></a></p>
+			</dd>
+		</dl>
+		<p class="form buttons">
+			<input type="submit" value="Compare" id="submit" class="green-button" />&nbsp;&nbsp;&nbsp;
+			<input type="reset" value="Clear" id="cancel" class="grey-button" />
+		</p>
+	</div>
+</div>
\ No newline at end of file
Index: branches/1.0.x/elements/navigation_bar.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/navigation_bar.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/navigation_bar.elm.tpl	(revision 14733)
@@ -0,0 +1,30 @@
+<inp2:m_DefaultParam titles="" templates="" show_category="0"/>
+
+<inp2:m_DefineElement name="root_category">
+	<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_Phrase name="lu_rootcategory_name"/></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"/> <inp2:m_param name="title"/>
+</inp2:m_DefineElement>
+
+<h2><inp2:c_CategoryPath separator=" <i></i> " 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"/><span></span></h2>
+	
\ No newline at end of file
Index: branches/1.0.x/elements/sorting.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/sorting.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/sorting.elm.tpl	(revision 14733)
@@ -0,0 +1,32 @@
+<div class="filter-block">
+	<div class="paginate">
+		<a href=""><img src="<inp2:m_TemplatesBase/>img/arrow-left.png" width="7" height="13" alt="" /></a>&nbsp;
+		Products
+		<select id="paginate">
+			<option value="" selected="selected">1-10</option>
+			<option value="">11-20</option>
+			<option value="">21-30</option>
+		</select>
+		out of 120&nbsp;
+		<a href=""><img src="<inp2:m_TemplatesBase/>img/arrow-right.png" width="7" height="13" alt="" /></a>
+	</div>
+	<div class="sortby">
+		Sort by:
+		<select>
+			<option value="" selected="selected">Price</option>
+			<option value="">Rating</option>
+			<option value="">Populate</option>
+		</select>&nbsp;&nbsp;
+		Per Page:
+		<select>
+			<option value="" selected="selected">10</option>
+			<option value="">20</option>
+			<option value="">30</option>
+		</select>&nbsp;&nbsp;
+		<a href="#">Show All</a>
+	</div>
+	<div class="display_switch">
+		<a href="#" class="switch_thumb"></a>
+	</div>
+</div>
+<div class="clear"></div>
\ No newline at end of file
Index: branches/1.0.x/elements/content_boxes/special_deals.elm.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/elements/content_boxes/special_deals.elm.tpl	(.../special_deals.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/content_boxes/special_deals.elm.tpl	(.../content_boxes/special_deals.elm.tpl)	(revision 14733)
@@ -1,98 +1,30 @@
-<div class="block block-margin no-border-bottom">
-	<h2><em>Special Deals</em><span class="sale"></span></h2>
-	<div id="scrollable">
-		<div class="items">
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
+<inp2:m_Cache key="prefix:p;currency;guest_only">
+
+	<inp2:p_InitList list_name="featured_products" types="featured" parent_cat_id="0" recursive="1" per_page="10" sort_by="random"/>
+	
+	<inp2:m_DefineElement name="featured_product_element">
+		<div class="good-item good-item-float">			
+			<dl>
+				<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1"/></a></dt>
+				<dd>
+					<p class="img"><a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
+					<p class="price-deal"><s class="under"><inp2:Field name="MSRP" currency="selected"/>$2,549.<span>95</span></s><em class="price"><inp2:Field name="Price" currency="selected"/>$2,549.<span>95</span></em></p>
+					<p><a href="<inp2:AddToCartLink template='checkout/shop_cart' product_template='__default__'/>" class="addtocart"><span>Add to Cart</span></a></p>
+				</dd>
+			</dl>
+		</div>
+	</inp2:m_DefineElement>
+	
+	<div class="block block-margin no-border-bottom">
+		<h2><em>Special Deals</em><span class="sale"></span></h2>
+		<div id="scrollable">
+			<div class="items">
+			
+				<inp2:p_ListProducts list_name="featured_products" render_as="featured_product_element" no_table="1"/>
+				
+				<div class="clear"></div>
 			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
-						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-						<p class="price">$2,549.<span>95</span></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
-						<p class="price">$549.<span>95</span></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="good-item good-item-float">
-				<dl>
-					<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
-					<dd>
-						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
-						<p class="price">$999.<span>95</span></p>
-						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-					</dd>
-				</dl>
-			</div>
-			<div class="clear"></div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+	
+</inp2:m_Cache>
\ No newline at end of file
Index: branches/1.0.x/elements/side_boxes/subscribe.elm.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/elements/side_boxes/subscribe.elm.tpl	(.../subscribe.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/side_boxes/subscribe.elm.tpl	(.../subscribe.elm.tpl)	(revision 14733)
@@ -1,22 +1,24 @@
-<inp2:m_Capture to_var="header">Get Promotions & Discounts:</inp2:m_Capture>
-
 <inp2:u.subscribe-sidebox_FormName name="subscription"/>
-<form method="post" action="<inp2:m_FormAction />" class="form" name="mailing_list_form">	
-	<fieldset>
-		<inp2:if check="u.subscribe-sidebox_Field" name="SubscriberEmail">
-			<input type="text" class="field subsfield" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="<inp2:u.subscribe-sidebox_Field name='SubscriberEmail'/>" onblur="if (this.value == '') this.value='Your Email'" onclick="if (this.value == 'Your Email') this.value=''"/>
-		<inp2:m_else/>
-			<input type="text" class="field subsfield" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="Your Email" onblur="if (this.value == '') this.value='Your Email'" onclick="if (this.value == 'Your Email') this.value=''"  />
-		</inp2:if>
-		
-		<inp2:m_if check="u.subscribe-sidebox_HasError" field="any">
-			<span class="field-error"><inp2:u.subscribe-sidebox_Error field="SubscriberEmail"/></span><br />
-		</inp2:m_if>
-		
-		<a href="#" class="grey-but"><span><inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/></span></a>
-		
-		<input type="hidden" name="events[u.subscribe-sidebox][OnSubscribeQuery]" value="1"/>
-		<input type="hidden" name="subscribe_template" value="mailing/subscribe"/>
-		<input type="hidden" name="unsubscribe_template" value="mailing/unsubscribe"/>
-	</fieldset>
-</form>
\ No newline at end of file
+
+<div class="subscribe-block">
+	<h4>Get Promotions & Discounts:</h4>
+	<form method="post" action="<inp2:m_FormAction />" class="form" name="mailing_list_form">	
+		<fieldset>
+			<inp2:if check="u.subscribe-sidebox_Field" name="SubscriberEmail">
+				<input type="text" class="field subsfield" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="<inp2:u.subscribe-sidebox_Field name='SubscriberEmail'/>" onblur="if (this.value == '') this.value='Your Email'" onclick="if (this.value == 'Your Email') this.value=''"/>
+			<inp2:m_else/>
+				<input type="text" class="field subsfield" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="Your Email" onblur="if (this.value == '') this.value='Your Email'" onclick="if (this.value == 'Your Email') this.value=''"  />
+			</inp2:if>
+			
+			<inp2:m_if check="u.subscribe-sidebox_HasError" field="any">
+				<span class="field-error"><inp2:u.subscribe-sidebox_Error field="SubscriberEmail"/></span><br />
+			</inp2:m_if>
+			
+			<a href="#" class="grey-but"><span><inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/></span></a>
+			
+			<input type="hidden" name="events[u.subscribe-sidebox][OnSubscribeQuery]" value="1"/>
+			<input type="hidden" name="subscribe_template" value="mailing/subscribe"/>
+			<input type="hidden" name="unsubscribe_template" value="mailing/unsubscribe"/>
+		</fieldset>
+	</form>
+</div>
\ No newline at end of file
Index: branches/1.0.x/elements/title_bar.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/title_bar.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/title_bar.elm.tpl	(revision 14733)
@@ -0,0 +1,12 @@
+<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/1.0.x/elements/side_boxes/picks.elm.tpl
===================================================================
diff -u -N -r14708 -r14733
--- branches/1.0.x/elements/side_boxes/picks.elm.tpl	(.../picks.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/side_boxes/picks.elm.tpl	(.../picks.elm.tpl)	(revision 14733)
@@ -1,18 +1,23 @@
-<inp2:p_InitList list_name="pick_products" types="pick" parent_cat_id="0" recursive="1" per_page="short_list"/>
+<inp2:m_Cache key="prefix:p;currency;guest_only">
 
-<inp2:m_Capture to_var="header"><em>Our Favorites</em><span class="pick"></span></inp2:m_Capture>
-
-<inp2:m_DefineElement name="pick_product_element">
-	<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" /></a></dt>
-	<dd>
-		<p class="img"><a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
-		<p class="price"><inp2:Field name="Price" currency="selected"/>$759.<span>95</span></p>
-		<p><a href="<inp2:AddToCartLink template="checkout/shop_cart" product_template="__default__"/>" class="addtocart"><span>Add to Cart</span></a></p>
-	</dd>
-</inp2:m_DefineElement>
-
-<div class="good-item border-radius-bottom">
-	<dl>
-		<inp2:p_ListProducts list_name="pick_products" render_as="pick_product_element" no_table="1"/>
-	</dl>
-</div>
\ No newline at end of file
+	<inp2:p_InitList list_name="pick_products" types="pick" parent_cat_id="0" recursive="1" per_page="short_list"/>
+	
+	<div class="block no-border-bottom">
+		<h2><em>Our Favorites</em><span class="pick"></span></h2>
+		<inp2:m_DefineElement name="pick_product_element">
+			<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1"/></a></dt>
+			<dd>
+				<p class="img"><a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
+				<p class="price"><inp2:Field name="Price" currency="selected"/>$759.<span>95</span></p>
+				<p><a href="<inp2:AddToCartLink template='checkout/shop_cart' product_template='__default__'/>" class="addtocart"><span>Add to Cart</span></a></p>
+			</dd>
+		</inp2:m_DefineElement>
+	
+		<div class="good-item border-radius-bottom">
+			<dl>
+				<inp2:p_ListProducts list_name="pick_products" render_as="pick_product_element" no_table="1"/>
+			</dl>
+		</div>
+	</div>
+	
+</inp2:m_Cache>
\ No newline at end of file
Index: branches/1.0.x/elements/content_boxes/categories.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/content_boxes/categories.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/content_boxes/categories.elm.tpl	(revision 14733)
@@ -0,0 +1,20 @@
+<inp2:c_InitList list_name="sub_categories" page_var="m_cat_page"/>
+
+<inp2:m_DefineElement name="category_element">
+	<div class="good-item borbottom">
+		<dl>
+			<dt><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Field name="Name" html_escape="1"/></a></dt>
+			<dd>
+				<p class="img"><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
+			</dd>
+		</dl>
+	</div>
+</inp2:m_DefineElement>
+
+<div class="goods border-radius">
+
+	<inp2:c_ListCategories list_name="sub_categories" render_as="category_element" no_table="1"/>
+		
+	<div class="clear"></div>
+</div>
+