diff --git a/phpgwapi/doc/CHANGELOG b/phpgwapi/doc/CHANGELOG
index 670913c1f7..3a2ae6ddc3 100644
--- a/phpgwapi/doc/CHANGELOG
+++ b/phpgwapi/doc/CHANGELOG
@@ -1,5 +1,7 @@
 [0.9.12]
 	- Created a config option to force users to use a certian theme.
+	- Fixed nextmatchs on the categories preferences screen
+	- Added new config class so developers can centralize there configs
 
 [0.9.10]
 	- Fixed the cron programs, they where out of date in the table structures
diff --git a/phpgwapi/inc/class.config.inc.php b/phpgwapi/inc/class.config.inc.php
new file mode 100755
index 0000000000..19512231c9
--- /dev/null
+++ b/phpgwapi/inc/class.config.inc.php
@@ -0,0 +1,78 @@
+<?php
+	/**************************************************************************\
+	* phpGroupWare API - Application configuration in a centralized location   *
+	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
+	* Copyright (C) 2000, 2001 Joseph Engo                                     *
+	* -------------------------------------------------------------------------*
+	* This library is part of the phpGroupWare API                             *
+	* http://www.phpgroupware.org/api                                          * 
+	* ------------------------------------------------------------------------ *
+	* This library is free software; you can redistribute it and/or modify it  *
+	* under the terms of the GNU Lesser General Public License as published by *
+	* the Free Software Foundation; either version 2.1 of the License,         *
+	* or any later version.                                                    *
+	* This library is distributed in the hope that it will be useful, but      *
+	* WITHOUT ANY WARRANTY; without even the implied warranty of               *
+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
+	* See the GNU Lesser General Public License for more details.              *
+	* You should have received a copy of the GNU Lesser General Public License *
+	* along with this library; if not, write to the Free Software Foundation,  *
+	* Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
+	\**************************************************************************/
+
+	/* $Id$ */
+
+	class config
+	{
+		var $db;
+		var $appname;
+		var $config_data;
+
+		function config($appname = '')
+		{
+			global $phpgw, $phpgw_info;
+			if (! $appname)
+			{
+				$appname = $phpgw_info['flags']['currentapp'];
+			}
+
+			$this->db       = $phpgw->db;
+			$this->appname = $appname;
+		}
+
+		function read_repository()
+		{
+			$this->db->query("select * from phpgw_config where config_appname='" . $this->appname . "'",__LINE__,__FILE__);
+			while ($this->db->next_record())
+			{
+				$this->config_data[$this->db->f('config_name')] = $this->db->f('config_value');
+			}
+		}
+
+		function save_repository()
+		{
+			$config_data = $this->config_data;
+
+			$this->db->lock('phpgw_config');
+			$this->db->query("delete from phpgw_config where config_appname='" . $this->appname . "'",__LINE__,__FILE__);
+			while (list($name,$value) = each($config_data))
+			{
+				$name  = addslashes($name);
+				$value = addslashes($value);
+				$this->db->query("insert into phpgw_config (config_appname,config_name,config_value) "
+					. "values ('" . $this->appname . "','" . $name . "','" . $value . "')",__LINE__,__FILE__);
+			}
+			$this->db->unlock();
+		}
+
+		function delete_repository()
+		{
+			$this->db->query("delete from phpgw_config where config_appname='" . $this->appname . "'",__LINE__,__FILE__);
+		}
+
+		function value($variable_name,$variable_data)
+		{
+			$this->config_data[$variable_name] = $variable_data;
+		}
+
+	}
\ No newline at end of file