diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 45fbf741386..91b78e870d4 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1180,11 +1180,16 @@ function main_upgrade($oldversion=0) {
         }
     }
 
-    if ($oldversion < 2005020800) {
-        // Expand module column to max 20 chars
+    if ($oldversion < 2005020800) {     // Expand module column to max 20 chars
         table_column('log','module','module','varchar','20','','','not null');
     }
 
+    if ($oldversion < 2005021000) {     // New fields for theme choices
+        table_column('course', '', 'theme', 'varchar', '50', '', '', '', 'lang');
+        table_column('groups', '', 'theme', 'varchar', '50', '', '', '', 'lang');
+        table_column('user',   '', 'theme', 'varchar', '50', '', '', '', 'lang');
+    }
+
     return $result;
 }
 
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 76b610dae05..87f06b4e879 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -56,6 +56,7 @@ CREATE TABLE `prefix_course` (
   `groupmode` int(4) unsigned NOT NULL default '0',
   `groupmodeforce` int(4) unsigned NOT NULL default '0',
   `lang` varchar(10) NOT NULL default '',
+  `theme` varchar(50) NOT NULL default '',
   `cost` varchar(10) NOT NULL default '',
   `timecreated` int(10) unsigned NOT NULL default '0',
   `timemodified` int(10) unsigned NOT NULL default '0',
@@ -240,6 +241,7 @@ CREATE TABLE `prefix_groups` (
   `description` text NOT NULL,
   `password` varchar(50) NOT NULL default '',
   `lang` varchar(10) NOT NULL default 'en',
+  `theme` varchar(50) NOT NULL default '',
   `picture` int(10) unsigned NOT NULL default '0',
   `hidepicture` int(2) unsigned NOT NULL default '0',
   `timecreated` int(10) unsigned NOT NULL default '0',
@@ -430,6 +432,7 @@ CREATE TABLE `prefix_user` (
   `city` varchar(20) default NULL,
   `country` char(2) default NULL,
   `lang` varchar(10) default 'en',
+  `theme` varchar(50) NOT NULL default '',
   `timezone` float NOT NULL default '99',
   `firstaccess` int(10) unsigned NOT NULL default '0',
   `lastaccess` int(10) unsigned NOT NULL default '0',
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index e01ace42da3..a76dffcd839 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -911,6 +911,12 @@ function main_upgrade($oldversion=0) {
         fix_course_sortorder(0, 1, 1);
     } 
 
+    if ($oldversion < 2005021000) {     // New fields for theme choices
+        table_column('course', '', 'theme', 'varchar', '50', '', '', '', 'lang');
+        table_column('groups', '', 'theme', 'varchar', '50', '', '', '', 'lang');
+        table_column('user',   '', 'theme', 'varchar', '50', '', '', '', 'lang');
+    }
+
     return $result;
 }
 
diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index e2707caa419..b5ba7ee193f 100644
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -34,6 +34,7 @@ CREATE TABLE prefix_course (
    groupmode integer NOT NULL default '0',
    groupmodeforce integer NOT NULL default '0',
    lang varchar(10) NOT NULL default '',
+   theme varchar(50) NOT NULL default '',
    cost varchar(10) NOT NULL default '',
    timecreated integer NOT NULL default '0',
    timemodified integer NOT NULL default '0',
@@ -141,6 +142,7 @@ CREATE TABLE prefix_groups (
    description text,
    password varchar(50) NOT NULL default '',
    lang varchar(10) NOT NULL default '',
+   theme varchar(50) NOT NULL default '',
    picture integer NOT NULL default '0',
    hidepicture integer NOT NULL default '0',
    timecreated integer NOT NULL default '0',
@@ -297,6 +299,7 @@ CREATE TABLE prefix_user (
    city varchar(20) default NULL,
    country char(2) default NULL,
    lang varchar(10) NOT NULL default '',
+   theme varchar(50) NOT NULL default '',
    timezone float NOT NULL default '99',
    firstaccess integer NOT NULL default '0',
    lastaccess integer NOT NULL default '0',
diff --git a/version.php b/version.php
index f6328f97515..894fd8dc1ba 100644
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine 
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2005020800;  // YYYYMMDD = date of first major branch release 1.4
+   $version = 2005021000;  // YYYYMMDD = date of first major branch release 1.4
                            //       XY = increments within a single day
 
    $release = '1.5 UNSTABLE DEVELOPMENT';    // Human-friendly version name