Index: branches/RC/core/install.php
===================================================================
diff -u -r11527 -r11610
--- branches/RC/core/install.php	(.../install.php)	(revision 11527)
+++ branches/RC/core/install.php	(.../install.php)	(revision 11610)
@@ -304,6 +304,8 @@
 								LIMIT 1';
 						$this->Conn->Query($sql);
 
+						$this->toolkit->rebuildThemes(); // rescan theme to create structure after theme is enabled !!!
+
 						$this->currentStep = $this->GetNextStep();
 					}
 					break;
@@ -517,6 +519,16 @@
 						$this->toolkit->RunSQL('/core/install/install_schema.sql');
 						$this->toolkit->RunSQL('/core/install/install_data.sql');
 
+						// create category using sql, because Application is not available here
+						$fields_hash = Array (
+							'l1_Name' => 'Content', 'Filename' => 'Content', 'AutomaticFilename' => 0,
+							'l1_Description' => 'Content', 'Status' => 4,
+						);
+
+						$this->Conn->doInsert($fields_hash, $this->toolkit->getSystemConfig('Database', 'TablePrefix') . 'Category');
+
+						$this->toolkit->SetModuleRootCategory('Core', $this->Conn->getInsertID());
+
 						// set module "Core" version after install (based on upgrade scripts)
 						$this->toolkit->SetModuleVersion('Core');
 					}
@@ -741,6 +753,8 @@
 							WHERE ' . $theme_idfield . ' = ' . $theme_id;
 					$this->Conn->Query($sql);
 
+					$this->toolkit->rebuildThemes(); // rescan theme to create structure after theme is enabled !!!
+
 					if ($this->Application->isModuleEnabled('In-Portal')) {
 						// 2. compile theme stylesheets (only In-Portal uses them)
 						$css_table = $this->Application->getUnitOption('css', 'TableName');
@@ -1090,6 +1104,11 @@
 			$ret = Array ();
 
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
+				if ($module_name == 'In-Portal') {
+					// don't show In-Portal, because it shares upgrade scripts with Core module
+					continue;
+				}
+
 				$upgrades_file = sprintf(UPGRADES_FILE, $module_info['Path'], 'sql');
 				if (!file_exists($upgrades_file)) {
 					// no upgrade file