Index: trunk/themes/default2007/platform/elements/side_boxes/search.tpl
===================================================================
diff -u -N -r8514 -r8599
--- trunk/themes/default2007/platform/elements/side_boxes/search.tpl	(.../search.tpl)	(revision 8514)
+++ trunk/themes/default2007/platform/elements/side_boxes/search.tpl	(.../search.tpl)	(revision 8599)
@@ -1,23 +1,22 @@
-<inp2:m_DefineElement name="header">
+<inp2:m_Capture to_var="header">
 	<inp2:m_phrase name="lu_title_SearchBox"/>
-</inp2:m_DefineElement>
-<inp2:m_RenderElement name="header" result_to_var="header"/>
+</inp2:m_Capture>
 
 <form method="get" action="<inp2:m_Link template="in-commerce/search_results" />">
 	<inp2:m_GetFormHiddens template="in-commerce/search_results"/>
 	<input type="text" name="keywords" id="keywords" style="width: 155px" class="input-text" value="" /><br />
 
 	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
-	
-	<table>	
+
+	<table>
 		<tr>
 			<td class="paddnig-right" width="10">
 				<input class="button" type="submit" style="width: 40px;" value="<inp2:m_Phrase label="lu_comm_Go"/>!" />
 			</td>
 			<td align="left">
 				<a href="<inp2:m_Link template="in-commerce/store/advanced_search" />" class="blue-small-link"><inp2:m_Phrase label="lu_AdvancedSearch"/></a>  <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" /><br />
-			</td>				
+			</td>
 		</tr>
-	</table>	
-	
+	</table>
+
 </form>
Index: trunk/themes/default2007/no_permission.tpl
===================================================================
diff -u -N -r8521 -r8599
--- trunk/themes/default2007/no_permission.tpl	(.../no_permission.tpl)	(revision 8521)
+++ trunk/themes/default2007/no_permission.tpl	(.../no_permission.tpl)	(revision 8599)
@@ -11,17 +11,14 @@
 	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_NoPermission" templates="no_permission"/>
 
 	<!-- no permission -->
-	<inp2:m_DefineElement name="permission_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_NoPermission"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+		</inp2:m_Capture>
 		<br /><br />
 		<inp2:m_phrase name="lu_text_NoPermission"/>
 		<br /><br />
-	</inp2:m_DefineElement>
-
-	<inp2:m_RenderElement name="permission_content" design="content_box"/>
+	</inp2:m_RenderElement>
 	<!-- // no permission -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -N -r8539 -r8599
--- trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8539)
+++ trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8599)
@@ -5,25 +5,18 @@
 			<table style="width:auto">
 				<tr>
 					<!-- menu: Home -->
-					<inp2:m_DefineElement name="menu_href1">
+					<inp2:m_Capture to_var="menu_href">
 						<inp2:m_Link template="index" m_cat_id="0"/>
-					</inp2:m_DefineElement>
+					</inp2:m_Capture>
 
-					<inp2:m_RenderElement name="menu_href1" strip_nl="2" result_to_var="menu_href"/>
-
-
-					<inp2:m_DefineElement name="menu_icon1">
+					<inp2:m_Capture to_var="menu_icon">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_home.gif" width="23" height="20" alt="" /><br />
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_icon1" strip_nl="2" result_to_var="menu_icon"/>
+					</inp2:m_Capture>
 
-				<!--	<inp2:m_DefineElement name="menu_title1">
+				<!--	<inp2:m_Capture to_var="menu_title">
 						Home
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_title1" strip_nl="2" result_to_var="menu_title"/>
+					</inp2:m_Capture>
 
-
-
 					<inp2:m_IsActive template="index" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>
 
@@ -51,40 +44,34 @@
 			<table style="width:auto">
 				<tr>
 					<!-- menu: My Account -->
-					<inp2:m_DefineElement name="menu_href10">
+					<inp2:m_Capture to_var="menu_href">
 						<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_href10" strip_nl="2" result_to_var="menu_href"/>
+					</inp2:m_Capture>
 
-					<inp2:m_DefineElement name="menu_icon10">
+					<inp2:m_Capture to_var="menu_icon">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_icon10" strip_nl="2" result_to_var="menu_icon"/>
+					</inp2:m_Capture>
 
-					<inp2:m_DefineElement name="menu_title10">
+					<inp2:m_Capture to_var="menu_title">
 						My Account
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_title10" strip_nl="2" result_to_var="menu_title"/>
+					</inp2:m_Capture>
 
 					<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>
 					<!-- // menu: My Account -->
 
 					<!-- menu: ShoppingCart -->
-					<inp2:m_DefineElement name="menu_href11">
+					<inp2:m_Capture to_var="menu_href">
 						<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_href11" strip_nl="2" result_to_var="menu_href"/>
+					</inp2:m_Capture>
 
-					<inp2:m_DefineElement name="menu_icon11">
+					<inp2:m_Capture to_var="menu_icon">
 						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_shopping_cart.gif" alt="" />
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_icon11" strip_nl="2" result_to_var="menu_icon"/>
+					</inp2:m_Capture>
 
-					<inp2:m_DefineElement name="menu_title11">
+					<inp2:m_Capture to_var="menu_title">
 						Shopping Cart
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_title11" strip_nl="2" result_to_var="menu_title"/>
+					</inp2:m_Capture>
 
 					<inp2:m_IsActive template="in-commerce/checkout/shopping_cart" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>
Index: trunk/themes/default2007/platform/categories/suggest_confirm.tpl
===================================================================
diff -u -N -r8451 -r8599
--- trunk/themes/default2007/platform/categories/suggest_confirm.tpl	(.../suggest_confirm.tpl)	(revision 8451)
+++ trunk/themes/default2007/platform/categories/suggest_confirm.tpl	(.../suggest_confirm.tpl)	(revision 8599)
@@ -10,17 +10,15 @@
 
 <inp2:m_DefineElement name="content">
 	<!-- phrases -->
-	<inp2:m_DefineElement name="suggest_category_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_SuggestCategoryConfirm"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+		</inp2:m_Capture>
 
 		<inp2:m_phrase name="lu_text_SuggestCategoryConfirm"/><br /><br />
 		<a href="<inp2:m_Link template="__default__"/>"><inp2:c_Field name="Name"/></a>
-	</inp2:m_DefineElement>
+	</inp2:m_RenderElement>
 
-	<inp2:m_RenderElement name="suggest_category_content" design="content_box"/>
 	<!-- // phrases -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/my_account/my_favorites.tpl
===================================================================
diff -u -N -r8594 -r8599
--- trunk/themes/default2007/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 8594)
+++ trunk/themes/default2007/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 8599)
@@ -18,16 +18,14 @@
 	<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"/>
 
 	<!-- my favorites -->
-	<inp2:m_DefineElement name="users_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_MyFavorites"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+		<inp2:m_Capture/>
 
 		<inp2:m_ModuleInclude template="elements/content_boxes/my_favorites"/>
-	</inp2:m_DefineElement>
+	</inp2:m_RenderElement>
 
-	<inp2:m_RenderElement name="users_content" design="content_box"/>
 	<!-- // my favorites -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/designs/default_design.tpl
===================================================================
diff -u -N -r8546 -r8599
--- trunk/themes/default2007/platform/designs/default_design.tpl	(.../default_design.tpl)	(revision 8546)
+++ trunk/themes/default2007/platform/designs/default_design.tpl	(.../default_design.tpl)	(revision 8599)
@@ -3,8 +3,6 @@
 <inp2:m_include template="platform/designs/content_boxes"/>
 <inp2:m_include template="platform/elements/forms"/>
 
-<inp2:m_RenderElement name="content" result_to_var="content"/>
-<inp2:m_RenderElement name="sidebar" result_to_var="sidebar"/>
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title><inp2:m_GetConfig name="Site_Name"/></title>
@@ -33,13 +31,13 @@
 		<table class="markup_table fullwidth">
 			<tr>
 				<td style="width: 200px;" valign="top">
-					<inp2:m_param name="sidebar"/>
+					<inp2:m_RenderElement name="sidebar"/>
 				</td>
 				<td width="3" class="vertical-dashed-line">
 					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br />
 				</td>
 				<td style="width: auto;" valign="top">
-					<inp2:m_param name="content"/>
+					<inp2:m_RenderElement name="content"/>
 				</td>
 			</tr>
 		</table>
Index: trunk/themes/default2007/error_notfound.tpl
===================================================================
diff -u -N -r8428 -r8599
--- trunk/themes/default2007/error_notfound.tpl	(.../error_notfound.tpl)	(revision 8428)
+++ trunk/themes/default2007/error_notfound.tpl	(.../error_notfound.tpl)	(revision 8599)
@@ -9,17 +9,14 @@
 
 <inp2:m_DefineElement name="content">
 	<!-- page not found -->
-	<inp2:m_DefineElement name="permission_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_PageNotFound"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+		</inp2:m_Capture>
 		<br /><br />
 		<inp2:m_phrase name="lu_text_PageNotFound"/>
 		<br /><br />
-	</inp2:m_DefineElement>
-
-	<inp2:m_RenderElement name="permission_content" design="content_box"/>
+	</inp2:m_RenderElement>
 	<!-- // page not found -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/elements/side_boxes/login.tpl
===================================================================
diff -u -N -r8514 -r8599
--- trunk/themes/default2007/platform/elements/side_boxes/login.tpl	(.../login.tpl)	(revision 8514)
+++ trunk/themes/default2007/platform/elements/side_boxes/login.tpl	(.../login.tpl)	(revision 8599)
@@ -1,5 +1,5 @@
-<inp2:m_DefineElement name="header">
-	
+<inp2:m_Capture to_var="header">
+
 	<table class="fullwidth">
 		<tr>
 			<td class="side-title" align="left">
@@ -16,25 +16,21 @@
 								</td>
 								<td class="login-text">
 									&nbsp;<inp2:m_Phrase label="lu_NotLoggedIn"/>
-								</td>								
+								</td>
 							</tr>
 						</table>
 					</inp2:m_if>
-			</td>			
+			</td>
 		</tr>
 	</table>
-	
-	
-	
-</inp2:m_DefineElement>
-<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+</inp2:m_Capture>
 
 <inp2:m_if check="m_LoggedIn">
 	<table width="100%" style="border-width: 0px;">
 		<tr>
 			<td colspan="2">
 				<!--<inp2:m_Phrase label="lu_comm_Welcome"/>,<br />-->
-				
+
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="5" height="5" border="0" /><br />
 			</td>
 		</tr>
@@ -73,20 +69,20 @@
 
 		<inp2:m_Phrase label="lu_Password"/><br />
 		<input type="password" class="input-text" name="password" style="width:155px" /><br />
-		
+
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
-		
-		<table>	
+
+		<table>
 			<tr>
 				<td class="paddnig-right" width="10">
 					<input class="button" name="events[u][OnLogin]" type="submit" value="<inp2:m_Phrase label="lu_comm_Login"/>" /><br />
 				</td>
 				<td align="left">
 					<input type="checkbox" /> <span class="remember-login">Remember login</span>
-				</td>				
+				</td>
 			</tr>
 		</table>
-		
+
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="5" height="5" border="0" /><br />
 		<inp2:m_if check="u_HasError" field="any">
 			<span class="error"><inp2:u_Error field="ValidateLogin"/></span><br />
Index: trunk/themes/default2007/platform/login/register_confirm_pending.tpl
===================================================================
diff -u -N -r8368 -r8599
--- trunk/themes/default2007/platform/login/register_confirm_pending.tpl	(.../register_confirm_pending.tpl)	(revision 8368)
+++ trunk/themes/default2007/platform/login/register_confirm_pending.tpl	(.../register_confirm_pending.tpl)	(revision 8599)
@@ -1,5 +1,5 @@
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElements 
+	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login,
 		"
@@ -8,16 +8,14 @@
 
 <inp2:m_DefineElement name="content">
 	<!-- phrases -->
-	<inp2:m_DefineElement name="users_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_RegistrationPendingConfirmation"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
-		
+		</inp2:m_Capture>
+
 		<inp2:m_phrase name="lu_user_pending_aproval_text"/>
-	</inp2:m_DefineElement>
-	
-	<inp2:m_RenderElement name="users_content" design="content_box"/>
+	</inp2:m_RenderElement>
+
 	<!-- // phrases -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/elements/side_boxes/credit_cards.tpl
===================================================================
diff -u -N -r8590 -r8599
--- trunk/themes/default2007/platform/elements/side_boxes/credit_cards.tpl	(.../credit_cards.tpl)	(revision 8590)
+++ trunk/themes/default2007/platform/elements/side_boxes/credit_cards.tpl	(.../credit_cards.tpl)	(revision 8599)
@@ -1,7 +1,6 @@
-<inp2:m_DefineElement name="header">
+<inp2:m_Capture to_var="header">
 	<inp2:m_phrase name="lu_title_CreditCards"/>
-</inp2:m_DefineElement>
-<inp2:m_RenderElement name="header" result_to_var="header"/>
+</inp2:m_Capture>
 
 <table border="0" cellspacing="0" cellpadding="0" class="block">
 	<tr>
Index: trunk/themes/default2007/phrases_edit.tpl
===================================================================
diff -u -N -r8521 -r8599
--- trunk/themes/default2007/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8521)
+++ trunk/themes/default2007/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8599)
@@ -11,11 +11,10 @@
 	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MissingPhraseAdding" templates="phrases_edit"/>
 
 	<!-- phrases -->
-	<inp2:m_DefineElement name="pharses_content">
-		<inp2:m_DefineElement name="header1">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_MissingPhraseAdding"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header1" strip_nl="2" result_to_var="header"/>
+		</inp2:m_Capture>
 
 		<inp2:m_if check="phrases_HasError" field="any">
 			<span class="error"><inp2:m_phrase name="lu_AProblemInForm"/></span><br />
@@ -40,9 +39,7 @@
 				</tr>
 			</table>
 		</form>
-	</inp2:m_DefineElement>
-
-	<inp2:m_RenderElement name="pharses_content" design="content_box"/>
+	</inp2:m_RenderElement>
 	<!-- // phrases -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/my_account/my_profile.tpl
===================================================================
diff -u -N -r8594 -r8599
--- trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8594)
+++ trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8599)
@@ -11,13 +11,11 @@
 	<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"/>
 
 	<!-- my profile -->
-	<inp2:m_DefineElement name="users_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_MyProfile"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+		</inp2:m_Capture>
 
-
 		<span class="error">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
 		<inp2:m_if check="u_HasError" field="any">
@@ -69,9 +67,8 @@
 
 			</table>
 		</form>
-	</inp2:m_DefineElement>
+	</inp2:m_RenderElement>
 
-	<inp2:m_RenderElement name="users_content" design="content_box"/>
 	<!-- // my profile -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/categories/suggest_category.tpl
===================================================================
diff -u -N -r8526 -r8599
--- trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8526)
+++ trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8599)
@@ -11,11 +11,10 @@
 	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SuggestCategory" templates="platform/categories/suggest_category"/>
 
 	<!-- phrases -->
-	<inp2:m_DefineElement name="suggest_category_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_SuggestCategory"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+		</inp2:m_Capture>
 
 		<inp2:m_if check="c_HasPermission" permissions="CATEGORY.ADD|CATEGORY.ADD.PENDING">
 			<inp2:c_PresetFormFields/>
@@ -41,9 +40,8 @@
 		<inp2:m_else/>
 			<inp2:m_phrase name="lu_text_NoSuggestCategoryPermission"/>
 		</inp2:m_if>
-	</inp2:m_DefineElement>
+	</inp2:m_RenderElement>
 
-	<inp2:m_RenderElement name="suggest_category_content" design="content_box"/>
 	<!-- // phrases -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/login/register.tpl
===================================================================
diff -u -N -r8514 -r8599
--- trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8514)
+++ trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8599)
@@ -8,21 +8,20 @@
 
 <inp2:m_DefineElement name="content">
 	<!-- phrases -->
-	<inp2:m_DefineElement name="users_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_UserRegistration"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+		</inp2:m_Capture>
 
 		<span class="error">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-		
+
 		<inp2:m_if check="u_HasError" field="any">
 			<inp2:m_RenderElement name="error_message" />
 		</inp2:m_if>
-		
+
 		<inp2:u_PresetFormFields/>
 		<form method="post" action="<inp2:m_FormAction/>">
-		
+
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 			<table class="form-data fullwidth">
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
@@ -64,14 +63,13 @@
 
 						<input class="button" type="submit" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create"/>"/>
 						<br /><br />
-						
-					</td>					
+
+					</td>
 				</tr>
 			</table>
 		</form>
-	</inp2:m_DefineElement>
+	</inp2:m_RenderElement>
 
-	<inp2:m_RenderElement name="users_content" design="content_box"/>
 	<!-- // phrases -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/my_account/my_account.tpl
===================================================================
diff -u -N -r8594 -r8599
--- trunk/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 8594)
+++ trunk/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 8599)
@@ -11,16 +11,14 @@
 	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MyAccount" templates="platform/my_account/my_account"/>
 
 	<!-- my account -->
-	<inp2:m_DefineElement name="my_account_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_MyAccount"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+		<inp2:m_Capture/>
 
 		my account big
-	</inp2:m_DefineElement>
+	</inp2:m_RenderElement>
 
-	<inp2:m_RenderElement name="my_account_content" design="content_box"/>
 	<!-- // my account -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/categories/suggest_pending_confirm.tpl
===================================================================
diff -u -N -r8451 -r8599
--- trunk/themes/default2007/platform/categories/suggest_pending_confirm.tpl	(.../suggest_pending_confirm.tpl)	(revision 8451)
+++ trunk/themes/default2007/platform/categories/suggest_pending_confirm.tpl	(.../suggest_pending_confirm.tpl)	(revision 8599)
@@ -10,17 +10,15 @@
 
 <inp2:m_DefineElement name="content">
 	<!-- phrases -->
-	<inp2:m_DefineElement name="suggest_category_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_SuggestCategoryPendingConfirm"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
+		</inp2:m_Capture>
 
 		<inp2:m_phrase name="lu_text_SuggestCategoryPendingConfirm"/><br /><br />
 		<a href="<inp2:m_Link template="__default__"/>"><inp2:c_Field name="Name"/></a>
-	</inp2:m_DefineElement>
+	</inp2:m_RenderElement>
 
-	<inp2:m_RenderElement name="suggest_category_content" design="content_box"/>
 	<!-- // phrases -->
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/login/register_confirm.tpl
===================================================================
diff -u -N -r8368 -r8599
--- trunk/themes/default2007/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 8368)
+++ trunk/themes/default2007/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 8599)
@@ -1,5 +1,5 @@
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElements 
+	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login,
 		"
@@ -8,16 +8,14 @@
 
 <inp2:m_DefineElement name="content">
 	<!-- phrases -->
-	<inp2:m_DefineElement name="users_content">
-		<inp2:m_DefineElement name="header">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_RegistrationConfirmation"/>
-		</inp2:m_DefineElement>
-		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
-		
+		</inp2:m_Capture>
+
 		<inp2:m_phrase name="lu_RegistrationCompleted"/>
-	</inp2:m_DefineElement>
-	
-	<inp2:m_RenderElement name="users_content" design="content_box"/>
+	</inp2:m_RenderElement>
+
 	<!-- // phrases -->
 </inp2:m_DefineElement>