diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 1c01ae908..18692fcd3 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -21,6 +21,7 @@ CREATE TABLE `tblACLs` (
 CREATE TABLE `tblCategory` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` text NOT NULL,
+  `color` char(8) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -234,7 +235,7 @@ CREATE TABLE `tblDocuments` (
   `keywords` text NOT NULL,
   `sequence` double NOT NULL DEFAULT '0',
   `startdate` datetime DEFAULT NULL,
-	`enddate` datetime DEFAULT NULL,
+  `enddate` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `tblDocuments_folder` (`folder`),
   KEY `tblDocuments_owner` (`owner`),
@@ -654,6 +655,7 @@ CREATE TABLE `tblNotify` (
   `targetType` int(11) NOT NULL DEFAULT '0',
   `userID` int(11) NOT NULL DEFAULT '-1',
   `groupID` int(11) NOT NULL DEFAULT '-1',
+  `inherit` smallint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`target`,`targetType`,`userID`,`groupID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index b8291872b..a5bfb0efc 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -19,7 +19,8 @@ CREATE TABLE "tblACLs" (
 
 CREATE TABLE "tblCategory" (
   "id" SERIAL UNIQUE,
-  "name" text NOT NULL
+  "name" text NOT NULL,
+  "color" char(8) DEFAULT NULL,
 ) ;
 
 -- --------------------------------------------------------
@@ -204,7 +205,7 @@ CREATE TABLE "tblDocuments" (
   "keywords" text NOT NULL,
   "sequence" REAL NOT NULL default '0',
   "startdate" TIMESTAMP default NULL,
-	"enddate" TIMESTAMP default NULL
+  "enddate" TIMESTAMP default NULL
 ) ;
 
 -- --------------------------------------------------------
@@ -540,6 +541,7 @@ CREATE TABLE "tblNotify" (
   "targetType" INTEGER NOT NULL default '0',
   "userID" INTEGER NOT NULL default '-1',
   "groupID" INTEGER NOT NULL default '-1',
+  "inherit" INTEGER NOT NULL default '0',
   UNIQUE  ("target","targetType","userID","groupID")
 ) ;
 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 035ba62eb..51e9e3b65 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -19,7 +19,8 @@ CREATE TABLE `tblACLs` (
 
 CREATE TABLE `tblCategory` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` text NOT NULL
+  `name` text NOT NULL,
+  `color` char(8) DEFAULT NULL,
 ) ;
 
 -- --------------------------------------------------------
@@ -204,7 +205,7 @@ CREATE TABLE `tblDocuments` (
   `keywords` text NOT NULL,
   `sequence` double NOT NULL default '0',
   `startdate` TEXT default NULL,
-	`enddate` TEXT default NULL
+  `enddate` TEXT default NULL
 ) ;
 
 -- --------------------------------------------------------
@@ -549,6 +550,7 @@ CREATE TABLE `tblNotify` (
   `targetType` INTEGER NOT NULL default '0',
   `userID` INTEGER NOT NULL default '-1',
   `groupID` INTEGER NOT NULL default '-1',
+  `inherit` INTEGER NOT NULL default '0',
   UNIQUE  (`target`,`targetType`,`userID`,`groupID`)
 ) ;
 
@@ -839,7 +841,7 @@ CREATE TABLE `tblVersion` (
   `major` INTEGER,
   `minor` INTEGER,
   `subminor` INTEGER,
-	`module` varchar(255)
+  `module` varchar(255)
 ) ;
 
 -- --------------------------------------------------------
diff --git a/install/update-6.1.0/update-postgres.sql b/install/update-6.1.0/update-postgres.sql
index 923b42027..26669ff8e 100644
--- a/install/update-6.1.0/update-postgres.sql
+++ b/install/update-6.1.0/update-postgres.sql
@@ -18,6 +18,10 @@ ALTER TABLE "tblDocuments" ADD COLUMN "enddate" TIMESTAMP default NULL;
 
 ALTER TABLE "tblDocumentContent" ADD COLUMN "lastrevisiondate" TIMESTAMP default NULL;
 
+ALTER TABLE "tblCategory" ADD COLUMN "color" char(8) default NULL;
+
+ALTER TABLE "tblNotify" ADD COLUMN "inherit" INTEGER NOT NULL default '0';
+
 CREATE TABLE "tblAttributeDefinitionGroups" (
   "id" SERIAL UNIQUE,
   "name" varchar(100) default NULL,
@@ -29,7 +33,7 @@ CREATE TABLE "tblAttributeDefinitionGroupAttributeDefinition" (
   "attrdef" INTEGER REFERENCES "tblAttributeDefinitions" ("id") ON DELETE CASCADE,
   "attrgrp" INTEGER REFERENCES "tblAttributeDefinitionGroups" ("id") ON DELETE CASCADE,
   "sequence" REAL NOT NULL default '0',
-	"show" INTEGER,
+  "show" INTEGER,
   UNIQUE ("attrdef", "attrgrp")
 );
 
diff --git a/install/update-6.1.0/update-sqlite3.sql b/install/update-6.1.0/update-sqlite3.sql
index 1de84ef17..bce5ee7d7 100644
--- a/install/update-6.1.0/update-sqlite3.sql
+++ b/install/update-6.1.0/update-sqlite3.sql
@@ -5,7 +5,7 @@ CREATE TABLE `new_tblVersion` (
   `major` INTEGER,
   `minor` INTEGER,
   `subminor` INTEGER,
-	`module` varchar(255)
+  `module` varchar(255)
 ) ;
 
 INSERT INTO `new_tblVersion` SELECT * FROM `tblVersion`;
@@ -29,7 +29,7 @@ CREATE TABLE `new_tblDocuments` (
   `keywords` text NOT NULL,
   `sequence` double NOT NULL default '0',
   `startdate` TEXT default NULL,
-	`enddate` TEXT default NULL
+  `enddate` TEXT default NULL
 ) ;
 
 INSERT INTO `new_tblDocuments` SELECT * FROM `tblDocuments`;
@@ -116,6 +116,33 @@ DROP TABLE `tblUserPasswordHistory`;
 
 ALTER TABLE `new_tblUserPasswordHistory` RENAME TO `tblUserPasswordHistory`;
 
+CREATE TABLE `new_tblCategory` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` text NOT NULL,
+  `color` char(8) DEFAULT NULL,
+) ;
+
+INSERT INTO `new_tblCategory` SELECT * FROM `tblCategory`;
+
+DROP TABLE `tblCategory`;
+
+ALTER TABLE `new_tblCategory` RENAME TO `tblCategory`;
+
+CREATE TABLE `new_tblNotify` (
+  `target` INTEGER NOT NULL default '0',
+  `targetType` INTEGER NOT NULL default '0',
+  `userID` INTEGER NOT NULL default '-1',
+  `groupID` INTEGER NOT NULL default '-1',
+  `inherit` INTEGER NOT NULL default '0',
+  UNIQUE  (`target`,`targetType`,`userID`,`groupID`)
+) ;
+
+INSERT INTO `new_tblNotify` SELECT * FROM `tblNotify`;
+
+DROP TABLE `tblNotify`;
+
+ALTER TABLE `new_tblNotify` RENAME TO `tblNotify`;
+
 CREATE TABLE `tblAttributeDefinitionGroups` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` varchar(100) default NULL,
@@ -127,7 +154,7 @@ CREATE TABLE `tblAttributeDefinitionGroupAttributeDefinition` (
   `attrdef` INTEGER REFERENCES `tblAttributeDefinitions` (`id`) ON DELETE CASCADE,
   `attrgrp` INTEGER REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE,
   `sequence` double NOT NULL default '0',
-	`show` INTEGER,
+  `show` INTEGER,
   UNIQUE(`attrdef`, `attrgrp`)
 );
 
diff --git a/install/update-6.1.0/update.sql b/install/update-6.1.0/update.sql
index 1785330d8..88c65155d 100644
--- a/install/update-6.1.0/update.sql
+++ b/install/update-6.1.0/update.sql
@@ -18,6 +18,10 @@ ALTER TABLE `tblDocuments` ADD COLUMN `startdate` datetime DEFAULT NULL AFTER `s
 
 ALTER TABLE `tblDocumentContent` ADD COLUMN `lastrevisiondate` datetime DEFAULT NULL AFTER `revisiondate`;
   
+ALTER TABLE `tblCategory` ADD COLUMN `color` char(8) DEFAULT NULL AFTER `name`;
+
+ALTER TABLE `tblNotify` ADD COLUMN `inherit` smallint(1) NOT NULL DEFAULT '0';
+
 CREATE TABLE `tblAttributeDefinitionGroups` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(100) DEFAULT NULL,
@@ -30,10 +34,10 @@ CREATE TABLE `tblAttributeDefinitionGroupAttributeDefinition` (
   `attrdef` int(11),
   `attrgrp` int(11),
   `sequence` double NOT NULL DEFAULT '0',
-	`show` int(11),
+  `show` int(11),
   UNIQUE KEY `attrdef` (`attrdef`,`attrgrp`),
-	CONSTRAINT `tblAttributeDefinitionGroupAttributeDefinition_attrdef` FOREIGN KEY (`attrdef`) REFERENCES `tblAttributeDefinitions` (`id`) ON DELETE CASCADE,
-	CONSTRAINT `tblAttributeDefinitionGroupAttributeDefinition_attrgrp` FOREIGN KEY (`attrgrp`) REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE
+  CONSTRAINT `tblAttributeDefinitionGroupAttributeDefinition_attrdef` FOREIGN KEY (`attrdef`) REFERENCES `tblAttributeDefinitions` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblAttributeDefinitionGroupAttributeDefinition_attrgrp` FOREIGN KEY (`attrgrp`) REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblFolderAttributeDefinitionGroup` (
@@ -41,8 +45,8 @@ CREATE TABLE `tblFolderAttributeDefinitionGroup` (
   `attrgrp` int(11),
   `sequence` double NOT NULL DEFAULT '0',
   UNIQUE KEY `folder` (`folder`,`attrgrp`),
-	CONSTRAINT `tblFolderAttributeDefinitionGroup_folder` FOREIGN KEY (`folder`) REFERENCES `tblFolders` (`id`) ON DELETE CASCADE,
-	CONSTRAINT `tblFolderAttributeDefinitionGroup_attrgrp` FOREIGN KEY (`attrgrp`) REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE
+  CONSTRAINT `tblFolderAttributeDefinitionGroup_folder` FOREIGN KEY (`folder`) REFERENCES `tblFolders` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblFolderAttributeDefinitionGroup_attrgrp` FOREIGN KEY (`attrgrp`) REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 UPDATE `tblVersion` set `major`=6, `minor`=1, `subminor`=0, `module`='core';