Index: branches/RC/themes/default2009/index.tpl
===================================================================
diff -u -N -r11538 -r11572
--- branches/RC/themes/default2009/index.tpl	(.../index.tpl)	(revision 11538)
+++ branches/RC/themes/default2009/index.tpl	(.../index.tpl)	(revision 11572)
@@ -36,31 +36,15 @@
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
-			<inp2:m_phrase name="lu_title_WelcomeTitle"/>
+			<inp2:m_phrase name="lu_title_WelcomeTitle"/><inp2:st_EditPage/>
 		</inp2:m_Capture>
 
 		<div class="movable-element">
-			<!--## if In-edit (CMS) installed! ##-->
-			<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
-				<inp2:m_include template="in-edit/elements/content_boxes/edit_block.elm" block_num="1"/>
-			<inp2:m_else/>
-				<!--## Welcome text => In-edit (CMS) NOT installed! ##-->
-				In-portal is a revolutionary web site management system that allows you to automate and
-				facilitate management of large portal and community web sites. Regardless of whether you
-				are running a directory site or a content news portal, a community site or an online mall,
-				In-portal will enhance your web site management experience with innovative.
-				<!--## /Welcome text => In-edit (CMS) NOT installed! ##-->
-			</inp2:m_if>
+			<inp2:st_ContentBlock num="1"/>
 		</div>
 	</inp2:m_RenderElement>
 
 	<div class="movable-element">
-		<!--## SUB-CATEGORIES ##-->
-		<inp2:m_include template="platform/elements/content_boxes/sub_categories.elm"/>
-		<!--## /SUB-CATEGORIES ##-->
-	</div>
-
-	<div class="movable-element">
 		<!--## INCLUDE HOME PAGE ELEMENTS FOR EACH MODULE ##-->
 		<inp2:m_ModuleInclude template="elements/content_boxes/home_page_items.elm" data_exists="1"/>
 		<!--## /HOME PAGE ELEMENTS ##-->
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11562 -r11572
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11562)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11572)
@@ -1093,5 +1093,11 @@
   PRIMARY KEY  (FormId)
 );
 
+UPDATE Events SET Module = 'Core:Category' WHERE Event = 'FORM.SUBMITTED';
+
 DELETE FROM PersistantSessionData WHERE VariableName LIKE '%img%';
-UPDATE Modules SET TemplatePath = Path WHERE TemplatePath <> '';
\ No newline at end of file
+UPDATE Modules SET TemplatePath = Path WHERE TemplatePath <> '';
+
+UPDATE ConfigurationValues SET VariableValue = '/platform/designs/default_design.des' WHERE VariableName = 'cms_DefaultDesign';
+UPDATE ConfigurationValues SET ModuleOwner = 'In-Portal', Section = 'in-portal:configure_categories' WHERE VariableName = 'cms_DefaultDesign';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.29 WHERE VariableName = 'cms_DefaultDesign';
\ No newline at end of file
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -N -r11532 -r11572
--- branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11532)
+++ branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11572)
@@ -309,7 +309,13 @@
 INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core:Users', 'la_event_user.membership_expiration_notice', '0');
 INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core:Users', 'la_event_user.membership_expiration_notice', '1');
 INSERT INTO Events VALUES (DEFAULT, 'COMMON.FOOTER', NULL, 1, 0, 'Core', 'la_event_common.footer', 1);
+INSERT INTO Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_CMS_FormSubmitted', 1);
+INSERT INTO Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_CMS_FormSubmitted', 0);
 
+INSERT INTO ConfigurationAdmin VALUES ('cms_DefaultDesign', 'la_Text_General', 'la_prompt_DefaultDesignTemplate', 'text', NULL, NULL, 10.29, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'cms_DefaultDesign', '/platform/designs/default_design.des', 'In-Portal', 'in-portal:configure_categories');
+
+
 INSERT INTO IdGenerator VALUES ('100');
 
 INSERT INTO PortalGroup VALUES (15, 'Everyone', 'Everyone', 0, 1, 0, 1, 15, 0);
Index: branches/RC/core/install/upgrades.php
===================================================================
diff -u -N -r11523 -r11572
--- branches/RC/core/install/upgrades.php	(.../upgrades.php)	(revision 11523)
+++ branches/RC/core/install/upgrades.php	(.../upgrades.php)	(revision 11572)
@@ -822,6 +822,41 @@
 					$this->Conn->Query($sql);
 				}
 			}
+
+			// 5. add missing event
+			$sql = 'SELECT EventId
+					FROM ' . TABLE_PREFIX . 'Events
+					WHERE (Event = "FORM.SUBMITTED") AND (Type = 1)';
+			$event_id = $this->Conn->GetOne($sql);
+
+			if (!$event_id) {
+				$sql = "INSERT INTO " . TABLE_PREFIX . "Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_CMS_FormSubmitted', 1)";
+				$this->Conn->Query($sql);
+			}
+
+			$sql = 'SELECT EventId
+					FROM ' . TABLE_PREFIX . 'Events
+					WHERE (Event = "FORM.SUBMITTED") AND (Type = 0)';
+			$event_id = $this->Conn->GetOne($sql);
+
+			if (!$event_id) {
+				$sql = "INSERT INTO " . TABLE_PREFIX . "Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_CMS_FormSubmitted', 0)";
+				$this->Conn->Query($sql);
+			}
+
+			// 6. add missing variable
+			$sql = 'SELECT VariableId
+					FROM ' . TABLE_PREFIX . 'ConfigurationValues
+					WHERE VariableName = "cms_DefaultDesign"';
+			$variable_id = $this->Conn->GetOne($sql);
+
+			if (!$variable_id) {
+				$sql = "INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('cms_DefaultDesign', 'la_Text_General', 'la_prompt_DefaultDesignTemplate', 'text', NULL, NULL, 10.29, 0, 0)";
+				$this->Conn->Query($sql);
+
+				$sql = "INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'cms_DefaultDesign', '/platform/designs/default_design.des', 'In-Portal', 'in-portal:configure_categories')";
+				$this->Conn->Query($sql);
+			}
 		}
 
 	}
\ No newline at end of file