Index: branches/RC/themes/default2007/platform/site_map.tpl
===================================================================
diff -u -r10006 -r11260
--- branches/RC/themes/default2007/platform/site_map.tpl	(.../site_map.tpl)	(revision 10006)
+++ branches/RC/themes/default2007/platform/site_map.tpl	(.../site_map.tpl)	(revision 11260)
@@ -25,6 +25,12 @@
 
 		<inp2:m_include template="platform/designs/categories"/>
 
+		<!--## INCLUDE SITE MAP ELEMENT DESIGNS IF IN-EDIT INSTALLED ##-->
+		<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
+			<inp2:m_include t="in-edit/designs/pages"/>
+		</inp2:m_if>
+		<!--## //INCLUDE SITE MAP ELEMENT DESIGNS IF IN-EDIT INSTALLED ##-->
+
 		<table class="form-data fullwidth">
 			<inp2:c_ListCategories render_as="sitemap_category_element" per_page="-1" columns="2" direction="H" parent_cat_id="0"/>
 		</table>
Index: branches/RC/themes/default2007/platform/designs/categories.tpl
===================================================================
diff -u -r10386 -r11260
--- branches/RC/themes/default2007/platform/designs/categories.tpl	(.../categories.tpl)	(revision 10386)
+++ branches/RC/themes/default2007/platform/designs/categories.tpl	(.../categories.tpl)	(revision 11260)
@@ -137,51 +137,15 @@
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="sitemap_subpage_element2">
-	<tr>
-		<td class="sub-category-padding">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
-		</td>
-		<td>
-			<a href="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/></inp2:m_if>" class="sub-category">
-				<inp2:m_Param name="title"/>
-			</a>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sitemap_subpage_element1">
-	<tr>
-		<td class="sub-category-padding">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
-		</td>
-		<td>
-			<a href="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/></inp2:m_if>" class="sub-category">
-				<inp2:m_Param name="title"/>
-			</a>
-			<table>
-				<inp2:cms_CachedMenu except="index" menu_id="$page_id" category_id="$cat_id" render_as="sitemap_subpage_element2"/>
-			</table>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sitemap_subpage_element">
-
-		<td valign="top">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-1-level.gif" alt="" width="6" height="5" border="0" />&nbsp;&nbsp;<a href="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/></inp2:m_if>" class="sub-category"><strong><inp2:m_Param name="title"/></strong></a>
-			<table>
-				<inp2:cms_CachedMenu except="index" menu_id="$page_id" category_id="$cat_id" render_as="sitemap_subpage_element1"/>
-			</table>
-		</td>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="sitemap_category_element">
 		<inp2:m_ModuleInfo key="Name" value="In-Edit" return="RootCat" result_to_var="cms_category"/>
 		<inp2:m_if check="FieldEquals" name="CategoryId" value="$cms_category">
-			<inp2:cms_CachedMenu level="0" category_id="0" render_as="sitemap_subpage_element"/>
+			<!--## IF IN-EDIT MODULE IS INSTALLED ##-->
+			<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
+				<inp2:m_include t="in-edit/elements/site_map"/>
+			</inp2:m_if>
+			<!--## //IF IN-EDIT MODULE IS INSTALLED ##-->
 		<inp2:m_else/>
-
 			<td valign="top">
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-1-level.gif" alt="" width="6" height="5" border="0" />&nbsp;&nbsp;<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="top-category"><strong><inp2:Field name="Name"/></strong></a>
 				<table>
Index: branches/RC/themes/default2007/index.tpl
===================================================================
diff -u -r9664 -r11260
--- branches/RC/themes/default2007/index.tpl	(.../index.tpl)	(revision 9664)
+++ branches/RC/themes/default2007/index.tpl	(.../index.tpl)	(revision 11260)
@@ -28,7 +28,7 @@
 
 		<!--## if In-edit (CMS) installed! ##-->
 		<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
-			<inp2:cms_ContentBlock num="1"/>
+			<inp2:m_include template="in-edit/elements/content_boxes/edit_block" block_num="1"/>
 		<inp2:m_else/>
 
 		<!--## Welcome text => In-edit (CMS) NOT installed! ##-->