diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index b08a1a3020..a6d2cd5dba 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -617,7 +617,7 @@
 			$dh = opendir($tpl_dir . SEP . 'css');
 			while ($file = readdir($dh))
 			{
-				if (eregi("\.css$", $file))
+				if (eregi("\.css$", $file) && $file != 'phpgw.css')
 				{
 					$list[] = substr($file,0,strpos($file,'.'));
 				}
@@ -1291,7 +1291,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			{
 				$css_file =  $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 'templates' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP . 'css' . SEP . 'submarine.css';
 			}
-
 			else
 			{
 				/* Hope we don't get to this point.  Better then the user seeing a */
@@ -1299,7 +1298,11 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 				$GLOBALS['phpgw_info']['theme']['bg_color'] = 'FFFFFF';
 				$GLOBALS['phpgw']->log->write(array('text'=>'F-Abort, No themes found'));
 			}
-			$GLOBALS['phpgw']->template->set_var('phpgw_css','<link rel="stylesheet" type="text/css" href="' . $css_file . '">');
+			$phpgw_css_file = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 'templates' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']
+							. SEP . 'css' . SEP . 'phpgw.css';
+
+			$GLOBALS['phpgw']->template->set_var('phpgw_css','<link rel="stylesheet" type="text/css" href="' . $phpgw_css_file . '">' . "\n"
+															. '<link rel="stylesheet" type="text/css" href="' . $css_file . '">');
 		}
 
 		function load_preload_images_data()
diff --git a/phpgwapi/templates/default/css/phpgw.css b/phpgwapi/templates/default/css/phpgw.css
new file mode 100644
index 0000000000..8258c0bc2e
--- /dev/null
+++ b/phpgwapi/templates/default/css/phpgw.css
@@ -0,0 +1,74 @@
+body,p,td,th,table,input,form,option
+{
+	font-family: Verdana,Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	font-style: normal;
+	font-weight: normal;
+	line-height: normal;
+	text-decoration: none;
+	letter-spacing: 0em;
+	word-spacing: 0em;
+}
+
+body
+{
+	margin-right: 0em;
+	margin-left: 0em;
+	margin-top: 0em;
+	margin-bottom: 0em;
+}
+
+table
+{
+	border-width: 0;
+}
+
+a:link,a:visited,a:active,a:hover
+{
+	text-decoration: none;
+}
+
+table.portal
+{
+	width: 100%;
+}
+
+table.login
+{
+	margin-top: 130px;
+	width: 40%;
+	text-align: center;
+}
+
+.login,.portal
+{
+	border-width: 1px;
+	border-style: ridge;
+}
+
+.portal_text
+{
+	font-weight: bold;
+	background: url(../images/bg_filler.png);
+}
+
+.small_text
+{
+	font-size: 80%;
+}
+
+.headertext
+{
+	font-size: 110%;
+	font-weight: bold;
+}
+
+.th_text.app_header_text
+{
+	font-weight: bold;
+}
+
+.app_header
+{
+	font-weight: bold;
+}
diff --git a/phpgwapi/templates/default/css/submarine.css b/phpgwapi/templates/default/css/submarine.css
index fb64932446..24a160bdf9 100644
--- a/phpgwapi/templates/default/css/submarine.css
+++ b/phpgwapi/templates/default/css/submarine.css
@@ -1,40 +1,21 @@
 body,p,td,th,table,input,form,option
 {
-	font-family: Verdana,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
 	color: #000000;
-	font-style: normal;
-	font-weight: normal;
-	line-height: normal;
-	text-decoration: none;
-	letter-spacing: 0em;
-	word-spacing: 0em;
 }
 
 body
 {
-	margin-right: 0em;
-	margin-left: 0em;
-	margin-top: 0em;
-	margin-bottom: 0em;
 	background-color: #FFFFFF;
 }
 
-table
-{
-	border-width: 0;
-}
-
 a:link,a:visited,a:active
 {
 	color: mediumblue;
-	text-decoration: none;
 }
 
 a:hover
 {
 	color: #cc0000;
-	text-decoration: none;
 }
 
 .navbar,.th
@@ -42,35 +23,15 @@ a:hover
 	background-color: #80BBFF;
 }
 
-.portal
+.login,.portal
 {
 	background-color: #80BBFF;
-	border-width: 1px;
 	border-color: #000000;
-	border-style: ridge;
-	width: 100%;
-}
-
-table.login
-{
-	margin-top: 150px;
-	width: 40%;
-	text-align: center;
-}
-
-.login
-{
-	background-color: #80BBFF;
-	border-width: 1px;
-	border-color: #000000;
-	border-style: ridge;
 }
 
 .portal_text
 {
 	color: #FFFFFF;
-	font-weight: bold;
-	background: url(../images/bg_filler.png);
 }
 
 .bodytext
@@ -83,15 +44,8 @@ table.login
 	color: #FFFFFF;
 }
 
-.small_text
-{
-	font-size: 80%;
-}
-
 .headertext
 {
-	font-size: 110%;
-	font-weight: bold;
 	color: #FFFFFF;
 }
 
@@ -115,14 +69,8 @@ table.login
 	background-color: #DDF0FF;
 }
 
-.th_text.app_header_text
-{
-	font-weight: bold;
-}
-
 .app_header
 {
-	font-weight: bold;
 	background-color: #CCEEFF;
 }
 
diff --git a/phpgwapi/templates/default/login.xsl b/phpgwapi/templates/default/login.xsl
index 7a12245114..f891e17003 100644
--- a/phpgwapi/templates/default/login.xsl
+++ b/phpgwapi/templates/default/login.xsl
@@ -3,6 +3,7 @@
 	<xsl:template match="login">
 	<xsl:variable name="phpgw_head_charset"><xsl:value-of select="phpgw_head_charset"/></xsl:variable>
 	<xsl:variable name="login_theme"><xsl:value-of select="login_theme"/></xsl:variable>
+	<xsl:variable name="phpgw_theme"><xsl:value-of select="phpgw_theme"/></xsl:variable>
 		<html>
 			<head>
 				<meta http-equiv="content-type" content="text/html; charset={$phpgw_head_charset}"/>
@@ -14,6 +15,7 @@
 				<link rel="icon" href="favicon.ico" type="image/x-ico"/>
 				<link rel="shortcut icon" href="favicon.ico"/>
 				<title><xsl:value-of select="phpgw_head_website_title"/></title>
+				<link rel="stylesheet" type="text/css" href="{$phpgw_theme}"/>
 				<link rel="stylesheet" type="text/css" href="{$login_theme}"/>
 			</head>
 			<body>
diff --git a/phpgwapi/templates/idsociety/css/dove.css b/phpgwapi/templates/idsociety/css/dove.css
new file mode 100644
index 0000000000..3f391f393b
--- /dev/null
+++ b/phpgwapi/templates/idsociety/css/dove.css
@@ -0,0 +1,86 @@
+body,p,td,th,table,input,form,option
+{
+	color: #000000;
+}
+
+a:link,a:active,a:visited
+{
+	color: #336699;
+}
+
+a:hover
+{
+	color: #cc0000;
+}
+
+.bodytext
+{
+	color: #000000;
+}
+
+.whitetext
+{
+	color: #FFFFFF;
+}
+
+.headertext
+{
+	color: #FFFFFF;
+}
+
+.inputtext
+{
+	background-color: #FFFFFF;
+}
+
+.buttontext,.linktext,.cal_dayview
+{
+	background-color: #C0C0C0;
+}
+
+.login,.portal
+{
+	background-color: #486591;
+	border-color: #000000;
+}
+
+.portal_text
+{
+	color: #FFFFFF;
+}
+
+.row_on,.th_bright
+{
+	background-color: #fefefe;
+}
+
+.row_off
+{
+	background-color: #e6e6e6;
+}
+
+.th
+{
+	background-color: #486591;
+}
+
+.th_text,.app_header_text
+{
+	color: #000000;
+}
+
+.app_header
+{
+	background-color: #fefefe;
+}
+
+.cal_today
+{
+	background-color: #ffffcc;
+}
+
+.email_folder
+{
+	background-color: #486591;
+	color: #ffffff;
+}
diff --git a/phpgwapi/templates/idsociety/css/idsociety.css b/phpgwapi/templates/idsociety/css/idsociety.css
index b472618e75..6cff919bed 100644
--- a/phpgwapi/templates/idsociety/css/idsociety.css
+++ b/phpgwapi/templates/idsociety/css/idsociety.css
@@ -1,46 +1,21 @@
 body,p,td,th,table,input,form,option
 {
-	font-family: Verdana,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
 	color: #000000;
-	font-style: normal;
-	font-weight: normal;
-	line-height: normal;
-	text-decoration: none;
-	letter-spacing: 0em;
-	word-spacing: 0em;
-}
-
-body
-{
-	margin-right: 0em;
-	margin-left: 0em;
-	margin-top: 0em;
-	margin-bottom: 0em;
-	background: url(../images/content_spacer_middle.png);
-}
-
-table
-{
-	border-width: 0;
 }
 
 a:link,a:active
 {
 	color: #336699;
-	text-decoration: none;
 }
 
 a:visited
 {
 	color: #333366;
-	text-decoration: none;
 }
 
 a:hover
 {
 	color: #cc0000;
-	text-decoration: none;
 }
 
 .bodytext
@@ -53,15 +28,8 @@ a:hover
 	color: #FFFFFF;
 }
 
-.small_text
-{
-	font-size: 80%;
-}
-
 .headertext
 {
-	font-size: 110%;
-	font-weight: bold;
 	color: #FFFFFF;
 }
 
@@ -75,19 +43,15 @@ a:hover
 	background-color: #C0C0C0;
 }
 
-.portal
+.login,.portal
 {
 	background-color: #ADADAD;
-	border-width: 1px;
 	border-color: #000000;
-	border-style: ridge;
 }
 
 .portal_text
 {
 	color: #FFFFFF;
-	font-weight: bold;
-	background: url(../../default/images/bg_filler.png);
 }
 
 .row_on
@@ -107,13 +71,11 @@ a:hover
 
 .th_text,.app_header_text
 {
-	font-weight: bold;
 	color: #000000;
 }
 
 .app_header
 {
-	font-weight: bold;
 	background-color: #DDDDDD;
 }
 
diff --git a/phpgwapi/templates/idsociety/css/phpgw.css b/phpgwapi/templates/idsociety/css/phpgw.css
new file mode 100644
index 0000000000..53affd2e15
--- /dev/null
+++ b/phpgwapi/templates/idsociety/css/phpgw.css
@@ -0,0 +1,75 @@
+body,p,td,th,table,input,form,option
+{
+	font-family: Verdana,Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	font-style: normal;
+	font-weight: normal;
+	line-height: normal;
+	text-decoration: none;
+	letter-spacing: 0em;
+	word-spacing: 0em;
+}
+
+body
+{
+	margin-right: 0em;
+	margin-left: 0em;
+	margin-top: 0em;
+	margin-bottom: 0em;
+	background: url(../images/content_spacer_middle.png);
+}
+
+table
+{
+	border-width: 0;
+}
+
+a:link,a:visited,a:active,a:hover
+{
+	text-decoration: none;
+}
+
+table.portal
+{
+	width: 100%;
+}
+
+table.login
+{
+	margin-top: 130px;
+	width: 40%;
+	text-align: center;
+}
+
+.login,.portal
+{
+	border-width: 1px;
+	border-style: ridge;
+}
+.portal_text
+{
+	font-weight: bold;
+	background: url(../../default/images/bg_filler.png);
+}
+
+.small_text
+{
+	font-size: 80%;
+}
+
+.headertext
+{
+	font-size: 110%;
+	font-weight: bold;
+}
+
+.th_text,.app_header_text
+{
+	font-weight: bold;
+}
+
+.app_header
+{
+	font-weight: bold;
+}
+
diff --git a/phpgwapi/templates/idsociety/css/submarine.css b/phpgwapi/templates/idsociety/css/submarine.css
index dca0afb3ce..909d38eaed 100644
--- a/phpgwapi/templates/idsociety/css/submarine.css
+++ b/phpgwapi/templates/idsociety/css/submarine.css
@@ -1,56 +1,27 @@
 body,p,td,th,table,input,form,option
 {
-	font-family: Verdana,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
 	color: #000000;
-	font-style: normal;
-	font-weight: normal;
-	line-height: normal;
-	text-decoration: none;
-	letter-spacing: 0em;
-	word-spacing: 0em;
-}
-
-body
-{
-	margin-right: 0em;
-	margin-left: 0em;
-	margin-top: 0em;
-	margin-bottom: 0em;
-	background: url(../images/content_spacer_middle.png);
-}
-
-table
-{
-	border-width: 0;
 }
 
 a:link,a:visited,a:active
 {
 	color: mediumblue;
-	text-decoration: none;
 }
 
 a:hover
 {
 	color: #cc0000;
-	text-decoration: none;
 }
 
-.portal
+.login,.portal
 {
 	background-color: #80BBFF;
-	border-width: 1px;
 	border-color: #000000;
-	border-style: ridge;
-	width: 100%;
 }
 
 .portal_text
 {
 	color: #FFFFFF;
-	font-weight: bold;
-	background: url(../../default/images/bg_filler.png);
 }
 
 .whitetext
@@ -58,15 +29,8 @@ a:hover
 	color: #FFFFFF;
 }
 
-.small_text
-{
-	font-size: 80%;
-}
-
 .headertext
 {
-	font-size: 110%;
-	font-weight: bold;
 	color: #FFFFFF;
 }
 
@@ -95,14 +59,9 @@ a:hover
 	background-color: #80BBFF;
 }
 
-.th_text,.app_header_text
-{
-	font-weight: bold;
-}
 
 .app_header
 {
-	font-weight: bold;
 	background-color: #CCEEFF;
 }