Index: branches/RC/themes/default2009/platform/img/menu_inedit.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/themes/default2009/platform/elements/categories.elm.tpl
===================================================================
diff -u -r11511 -r11530
--- branches/RC/themes/default2009/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 11511)
+++ branches/RC/themes/default2009/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 11530)
@@ -138,20 +138,11 @@
 </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">
-			<!--## IF IN-EDIT MODULE IS INSTALLED ##-->
-			<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
-				<inp2:m_include t="in-edit/elements/site_map.elm"/>
-			</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>
-					<inp2:ListCategories requery="1" render_as="sitemap_subcategory_element" per_page="-1" no_table="1"/>
-				</table><br />
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
-			</td>
-		</inp2:m_if>
+		<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>
+				<inp2:ListCategories requery="1" render_as="sitemap_subcategory_element" per_page="-1" no_table="1"/>
+			</table><br />
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
+		</td>
 </inp2:m_DefineElement>
Index: branches/RC/themes/default2009/platform/designs/general.tpl
===================================================================
diff -u -r11518 -r11530
--- branches/RC/themes/default2009/platform/designs/general.tpl	(.../general.tpl)	(revision 11518)
+++ branches/RC/themes/default2009/platform/designs/general.tpl	(.../general.tpl)	(revision 11530)
@@ -1,2 +1,49 @@
-<!-- TO REMOVE -->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
+<!--## PAGE TITLE ELEMENT ##-->
+<inp2:m_DefineElement name="page_title">
+	<inp2:st_PageInfo type="title"/>
+</inp2:m_DefineElement>
+<!--## //PAGE TITLE ELEMENT ##-->
+
+<!--## SIDE-BAR ELEMENT ##-->
+<inp2:m_DefineElement name="sidebar">
+	<div class="movable-element">
+		<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+	</div>
+	<div class="movable-element">
+		<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+	</div>
+</inp2:m_DefineElement>
+<!--## //SIDE-BAR ELEMENT ##-->
+
+<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
+	<inp2:m_include template="platform/elements/navigation_bar.elm"/>
+</div>
+
+<div class="movable-element">
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
+			<inp2:st_PageInfo type="title"/><inp2:st_EditPage/>
+		</inp2:m_Capture>
+
+		<inp2:cms_ContentBlock num="1"/>
+	</inp2:m_RenderElement>
+</div>
+
+	<!--## RELATED TO PAGE ITEMS ##-->
+	<!--##
+<div class="movable-element">
+	<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
+		<inp2:m_Capture to_var="header">
+			<inp2:m_Phrase label="lu_title_RelatedItems"/>
+		</inp2:m_Capture>
+
+		<inp2:m_ModuleInclude template="elements/content_boxes/related_items" related_to="$related_to" />
+	</inp2:m_RenderElement>
+</div>
+	##-->
+	<!--## // RELATED TO PAGE ITEMS ##-->
+</inp2:m_DefineElement>
+
+<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/designs/form.tpl
===================================================================
diff -u -r11518 -r11530
--- branches/RC/themes/default2009/platform/designs/form.tpl	(.../form.tpl)	(revision 11518)
+++ branches/RC/themes/default2009/platform/designs/form.tpl	(.../form.tpl)	(revision 11530)
@@ -1,4 +1,4 @@
-<inp2:m_include template="in-edit/elements/forms.elm"/>
+<inp2:m_include template="platform/elements/dynamic_forms.elm"/>
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
Index: branches/RC/themes/default2009/platform/elements/dynamic_forms.elm.tpl
===================================================================
diff -u
--- branches/RC/themes/default2009/platform/elements/dynamic_forms.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/elements/dynamic_forms.elm.tpl	(revision 11530)
@@ -0,0 +1,58 @@
+<inp2:m_DefineElement name="form_field_text">
+	<input type="text" class="input-text" name="<inp2:CustomInputName/>" value="<inp2:SubmissionTag tag="Field"/>" <inp2:m_param name="field_params" />/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="form_field_password">
+	<input type="password" class="input-text" primarytype="password" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" value="" />
+	<input type="password" class="input-text" name="<inp2:CustomInputName verify="1"/>" id="verify_<inp2:CustomInputName verify="1"/>" value="" />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="form_field_option">
+		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="form_field_select">
+	<select name="<inp2:CustomInputName/>" class="input-select">
+		<inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_field_option" selected="selected"/>
+	</select>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="form_field_checkbox">
+	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:SubmissionTag tag="Field" field="$field" db="db"/>">
+	<input type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:SubmissionTag tag="Field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="document.getElementById('<inp2:CustomInputName/>').value = this.checked ? 1:0">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="form_field_textarea">
+	<textarea name="<inp2:CustomInputName/>" class="input-textarea" <inp2:m_param name="field_params" />><inp2:SubmissionTag tag="Field" field="$field" /></textarea>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="form_radio_item">
+	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:m_param name="field_name"/>" id="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="form_field_radio">
+	<inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_radio_item" selected="checked"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="form_field">
+	<tr>
+		<td class="field-name">
+			<strong><inp2:Field name="FieldLabel" plus_or_as_label="1"/><inp2:m_if check="FieldEquals" field="Required" value="1"><span class="field-required">*</span></inp2:m_if>:</strong>&nbsp;&nbsp;
+		</td>
+		<td class="field-value">
+			<inp2:m_if check="SubmissionTag" tag="HasError">
+				<span class="field-error"><inp2:SubmissionTag tag="Error"/></span><br />
+			</inp2:m_if>
+
+			<inp2:ConfigFormElement field="Value" blocks_prefix="form_field_" element_type_field="ElementType" value_list_field="ValueList" /><br/>
+		</td>
+	</tr>
+
+	<inp2:m_if check="m_Param" name="not_last">
+		<tr>
+			<td colspan="2">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+			</td>
+		</tr>
+	</inp2:m_if>
+</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/img/page_icon.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/themes/default2009/platform/elements/html_head.elm.tpl
===================================================================
diff -u -r11456 -r11530
--- branches/RC/themes/default2009/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 11456)
+++ branches/RC/themes/default2009/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 11530)
@@ -2,17 +2,10 @@
 <!--## Meta Info (Keywords and Description) ##-->
 <meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
 
-<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
-<!--## if In-edit purchase! ##-->
-	<inp2:m_Include t="in-edit/elements/header.elm"/>
-<!--## /if In-edit purchase! ##-->
-<inp2:m_else/>
-<!--## Standard Category Meta information ##-->
-	<meta name="description" content="<inp2:c_Meta name="Description"/>" />
-	<meta name="keywords" content="<inp2:c_Meta name="Keywords"/>" />
-	<!--## /Standard Category Meta information ##-->
-</inp2:m_if>
+<meta name="Description" content="<inp2:st_PageInfo type="meta_description"/>" />
+<meta name="Keywords" content="<inp2:st_PageInfo type="meta_keywords"/>" />
 <!--## /Meta Keywords and Description ##-->
+
 <inp2:theme.current_StylesheetFile/>
 <link rel="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.css" type="text/css" media="screen" />
 
Index: branches/RC/themes/default2009/platform/site_map.tpl
===================================================================
diff -u -r11511 -r11530
--- branches/RC/themes/default2009/platform/site_map.tpl	(.../site_map.tpl)	(revision 11511)
+++ branches/RC/themes/default2009/platform/site_map.tpl	(.../site_map.tpl)	(revision 11530)
@@ -1,6 +1,6 @@
 <!--##
 <NAME>Site Map</NAME>
-<DESC></DESC>
+<DESC>This is a map of the website</DESC>
 <SECTION>Platform</SECTION>
 ##-->
 
@@ -42,12 +42,6 @@
 
 		<inp2:m_include template="platform/elements/categories.elm"/>
 
-		<!--## 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.elm"/>
-		</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>