ALTER TABLE Groups RENAME twig_groups;
ALTER TABLE Members RENAME twig_members;

DROP TABLE twig_timesheet;

ALTER TABLE twig_mail_prefs ADD sortby varchar(10);
ALTER TABLE twig_mail_prefs ADD sortorder int(1);
ALTER TABLE twig_mail_prefs ADD dande tinyint(1);
ALTER TABLE twig_mail_prefs ADD savesent tinyint(4);
ALTER TABLE twig_mail_prefs ADD sentfold varchar(100);
ALTER TABLE twig_mail_prefs ADD cmdline2 tinyint(4);
ALTER TABLE twig_mail_prefs ADD newwindow tinyint(4);

ALTER TABLE twig_contacts ADD email2 varchar(100);
ALTER TABLE twig_contacts ADD email3 varchar(200);
ALTER TABLE twig_contacts ADD title varchar(100);
ALTER TABLE twig_contacts ADD pager varchar(30);
ALTER TABLE twig_contacts ADD ofax varchar(30);
ALTER TABLE twig_contacts ADD department varchar(100);
ALTER TABLE twig_contacts ADD office varchar(100);
ALTER TABLE twig_contacts ADD spouse varchar(100);
ALTER TABLE twig_contacts ADD bday varchar(40);
ALTER TABLE twig_contacts ADD oaddress1 varchar(100);
ALTER TABLE twig_contacts ADD oaddress2 varchar(100);
ALTER TABLE twig_contacts ADD ocity varchar(100);
ALTER TABLE twig_contacts ADD ozip varchar(10);
ALTER TABLE twig_contacts ADD ostate varchar(10);
ALTER TABLE twig_contacts ADD ocountry varchar(100);

CREATE TABLE twig_accounts (
   	id 		int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
   	username 	varchar(20) NOT NULL,
   	password 	varchar(20),
	SID		int(10),
   	onnow		bigint(21),
   	expire		bigint(21),
   	laston		bigint(21),
   	PRIMARY KEY (id),
   	KEY id (id, username),
   	UNIQUE id_2 (id)
);

CREATE TABLE twig_acls (
   	SID 		int(10) unsigned DEFAULT '0' NOT NULL,
   	identity 	varchar(64) NOT NULL,
   	access 		int(10) unsigned DEFAULT '0' NOT NULL,
   	KEY SID (SID)
);

CREATE TABLE twig_acl_groups (
   	SID 		int(10) unsigned DEFAULT '0' NOT NULL,
   	groupname 	varchar(64) NOT NULL,
   	username 	varchar(20) NOT NULL,
   	PRIMARY KEY (groupname)
);

CREATE TABLE twig_bookmarks_prefs (
   	id 		int(11) DEFAULT '0' NOT NULL auto_increment,
   	username 	text,
   	sortby 		varchar(10) NOT NULL,
   	sortorder 	int(1) DEFAULT '0' NOT NULL,
   	dgroup 		int(11) DEFAULT '0' NOT NULL,
   	PRIMARY KEY (id)
);

CREATE TABLE twig_contacts_prefs (
   	id 		int(11) DEFAULT '0' NOT NULL auto_increment,
   	username 	varchar(20),
   	sortby 		varchar(10) NOT NULL,
   	sortorder 	int(1) DEFAULT '0' NOT NULL,
   	dgroup 		int(11) DEFAULT '0' NOT NULL,
   	PRIMARY KEY (id)
);

CREATE TABLE twig_context (
   	id 		varchar(40) NOT NULL,
   	username 	varchar(20) NOT NULL,
   	context 	longtext NOT NULL,
   	sid 		int(11) DEFAULT '0' NOT NULL,
   	KEY 		id (id),
   	KEY 		username (username),
   	KEY 		sid (sid)
);

CREATE TABLE twig_global_prefs (
   	id 		int(11) DEFAULT '0' NOT NULL auto_increment,
   	username 	varchar(20),
   	mstyle1 	tinyint(4) DEFAULT '0' NOT NULL,
   	mstyle2 	tinyint(4) DEFAULT '3' NOT NULL,
   	language 	varchar(20),
   	mailfoot	tinyint(4),
   	prevnext	varchar(20),
   	PRIMARY KEY (id)
);

CREATE TABLE twig_main_prefs (
   	id 		int(11) DEFAULT '0' NOT NULL auto_increment,
   	username 	varchar(20),
   	schedule 	tinyint(1) DEFAULT '1' NOT NULL,
   	recentmail 	tinyint(1) DEFAULT '1' NOT NULL,
   	PRIMARY KEY (id)
);

CREATE TABLE twig_schedule_prefs (
   	id 		int(11) DEFAULT '0' NOT NULL auto_increment,
   	username 	text,
   	dgroup 		int(11) DEFAULT '0' NOT NULL,
   	PRIMARY KEY (id)
);

CREATE TABLE twig_session (
   	id 		varchar(40) NOT NULL,
   	username 	varchar(20) NOT NULL,
   	session 	longtext NOT NULL,
   	sid 		int(11) DEFAULT '0' NOT NULL,
   	KEY 		id (id),
   	KEY 		username (username),
   	KEY 		sid (sid)
);

CREATE TABLE twig_todo_prefs (
   	id 		int(11) DEFAULT '0' NOT NULL auto_increment,
   	username 	varchar(20),
   	sortby 		varchar(10) NOT NULL,
   	sortorder 	int(1) DEFAULT '0' NOT NULL,
   	dgroup 		int(11) DEFAULT '0' NOT NULL,
   	priority 	int(11) DEFAULT '0' NOT NULL,
   	PRIMARY KEY (id)
);