Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11411 -r11495
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11411)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11495)
@@ -1008,4 +1008,75 @@
 INSERT INTO ConfigurationAdmin VALUES ('ResizableFrames', 'la_Text_Website', 'la_config_ResizableFrames', 'checkbox', '', '', 10.30, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ResizableFrames', '0', 'In-Portal', 'in-portal:configure_general');
 
-ALTER TABLE Language ADD UserDocsUrl VARCHAR(255) NOT NULL;
\ No newline at end of file
+INSERT INTO ConfigurationAdmin VALUES ('QuickCategoryPermissionRebuild', 'la_Text_General', 'la_config_QuickCategoryPermissionRebuild', 'checkbox', NULL , NULL , 10.12, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'QuickCategoryPermissionRebuild', '1', 'In-Portal', 'in-portal:configure_categories');
+
+ALTER TABLE Language ADD UserDocsUrl VARCHAR(255) NOT NULL;
+
+ALTER TABLE Category
+	ADD ThemeId INT UNSIGNED NOT NULL,
+	ADD INDEX (ThemeId),
+	ADD COLUMN UseExternalUrl tinyint(3) unsigned NOT NULL default '0' AFTER Path,
+	ADD COLUMN ExternalUrl varchar(255) NOT NULL default '' AFTER UseExternalUrl,
+	ADD COLUMN UseMenuIconUrl tinyint(3) unsigned NOT NULL default '0' AFTER ExternalUrl,
+	ADD COLUMN MenuIconUrl varchar(255) NOT NULL default '' AFTER UseMenuIconUrl,
+	CHANGE MetaKeywords MetaKeywords TEXT,
+	CHANGE MetaDescription MetaDescription TEXT;
+
+CREATE TABLE PageContent (
+  PageContentId int(11) NOT NULL auto_increment,
+  ContentNum int(11) NOT NULL default '0',
+  PageId int(11) NOT NULL default '0',
+  l1_Content text,
+  l2_Content text,
+  l3_Content text,
+  l4_Content text,
+  l5_Content text,
+  l1_Translated tinyint(4) NOT NULL default '0',
+  l2_Translated tinyint(4) NOT NULL default '0',
+  l3_Translated tinyint(4) NOT NULL default '0',
+  l4_Translated tinyint(4) NOT NULL default '0',
+  l5_Translated tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (PageContentId),
+  KEY ContentNum (ContentNum,PageId)
+);
+
+CREATE TABLE FormFields (
+  FormFieldId int(11) NOT NULL auto_increment,
+  FormId int(11) NOT NULL default '0',
+  Type int(11) NOT NULL default '0',
+  FieldName varchar(255) NOT NULL default '',
+  FieldLabel varchar(255) default NULL,
+  Heading varchar(255) default NULL,
+  Prompt varchar(255) default NULL,
+  ElementType varchar(50) NOT NULL default '',
+  ValueList varchar(255) default NULL,
+  Priority int(11) NOT NULL default '0',
+  IsSystem tinyint(3) unsigned NOT NULL default '0',
+  Required tinyint(1) NOT NULL default '0',
+  DisplayInGrid tinyint(1) NOT NULL default '1',
+  DefaultValue text NOT NULL,
+  Validation TINYINT NOT NULL DEFAULT '0',
+  PRIMARY KEY  (FormFieldId),
+  KEY `Type` (`Type`),
+  KEY FormId (FormId),
+  KEY Priority (Priority),
+  KEY IsSystem (IsSystem),
+  KEY DisplayInGrid (DisplayInGrid)
+);
+
+CREATE TABLE FormSubmissions (
+  FormSubmissionId int(11) NOT NULL auto_increment,
+  FormId int(11) NOT NULL default '0',
+  SubmissionTime int(11) NOT NULL default '0',
+  PRIMARY KEY  (FormSubmissionId),
+  KEY FormId (FormId),
+  KEY SubmissionTime (SubmissionTime)
+);
+
+CREATE TABLE Forms (
+  FormId int(11) NOT NULL auto_increment,
+  Title VARCHAR(255) NOT NULL DEFAULT '',
+  Description text,
+  PRIMARY KEY  (FormId)
+);
\ No newline at end of file