diff --git a/lam/docs/devel/type_index.htm b/lam/docs/devel/type_index.htm
index efe3d204..293cf33b 100644
--- a/lam/docs/devel/type_index.htm
+++ b/lam/docs/devel/type_index.htm
@@ -1,11 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>LAM type HowTo</title>
+<html><head><title>LAM type HowTo</title>
+
+
+  
   <link rel="stylesheet" type="text/css" href="style/layout.css">
-	<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
-</head>
-<body>
+	<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico"></head><body>
 <div style="text-align: center;">
 <h1>Type HowTo</h1>
 <br>
@@ -26,12 +25,11 @@ module which handles Samba domains is used as example.<br>
 <h3><a href="type_list.htm">3. Custom list view</a></h3>
 <br>
 <br>
-<h2><a href="type_profile.htm">2. The default profile</a></h2>
+<h2><a href="type_profile.htm">2. The default profiles</a></h2>
 <br>
 <h2><a href="type_icon.htm">3. List icon</a></h2>
 <br>
 <h2><a href="type_css.htm">4. Type specific CSS file</a></h2>
 </div>
 </div>
-</body>
-</html>
+</body></html>
\ No newline at end of file
diff --git a/lam/docs/devel/type_profile.htm b/lam/docs/devel/type_profile.htm
index a0daf8a5..333754fe 100644
--- a/lam/docs/devel/type_profile.htm
+++ b/lam/docs/devel/type_profile.htm
@@ -1,28 +1,64 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
+<html><head>
   <title>Type HowTo - Default profile</title>
+
+  
+  
   <link rel="stylesheet" type="text/css" href="style/layout.css">
-	<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
-</head>
-<body>
+
+  
+  <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
+
+</head><body>
 <div style="text-align: center;">
-<h1>Type HowTo - Default profile</h1>
+<h1>Type HowTo - Default profiles</h1>
+</div>
+
+<h2>Account profile
+</h2>
+
 <br>
-<div style="text-align: left;"><br>
+
 You have to provide a default profile for your account type. If you do
 not want to specify default values then just provide an empty file.<br>
+
 Save your profile as <span style="font-weight: bold;">default.&lt;your
-type&gt;</span> in <span style="font-weight: bold;">config/profiles</span>.<br>
+type&gt;</span> in <span style="font-weight: bold;">config/templates/profiles</span>.<br>
+
 <br>
+
 <br>
-<span style="font-weight: bold; text-decoration: underline;">Example:</span><br
- style="font-weight: bold; text-decoration: underline;">
+
+<span style="font-weight: bold; text-decoration: underline;">Example:</span><br style="font-weight: bold; text-decoration: underline;">
+
 <br>
+
 The <span style="font-style: italic;">smbDomain</span> type has only
-an empty default profile. It is saved as <span
- style="font-weight: bold;">config/profiles/default.smbDomain</span>.<br>
-</div>
-</div>
-</body>
-</html>
+an empty default profile. It is saved as <span style="font-weight: bold;">config/templates/profiles/default.smbDomain</span>.<br>
+
+<br>
+
+<br>
+
+<br>
+
+<h2>PDF structure<br>
+</h2>
+
+Please provide a default PDF structure for your new account type. It is
+named <span style="font-weight: bold;">default.&lt;your type&gt;.xml</span>
+and stored in <span style="font-weight: bold;">config/templates/pdf</span>.<br>
+
+<br>
+
+<br>
+
+<span style="font-weight: bold; text-decoration: underline;">Example:</span><br>
+
+<br>
+
+The <span style="font-style: italic;">smbDomain</span> type has the
+default PDF structure in <span style="font-weight: bold;">config/templates/pdf/default.smbDomain.xml</span>.<br>
+
+<br>
+</body></html>
\ No newline at end of file
diff --git a/lam/docs/devel/upgrade.htm b/lam/docs/devel/upgrade.htm
index 26ac307e..db668716 100644
--- a/lam/docs/devel/upgrade.htm
+++ b/lam/docs/devel/upgrade.htm
@@ -15,6 +15,8 @@
 
 
 
+
+
   
   <meta http-equiv="content-type" content="text/html; charset=ISO-8859-15"><title>Upgrade notes</title>
   
@@ -32,7 +34,27 @@ This is a list of API changes for all LAM releases.
 
 <br>
 
-<h2>3.9 -&gt; 4.0</h2>Module interface:<br>
+<h2>4.0 -&gt; 4.1</h2>CSS changes:<br>
+<ul>
+  <li>type specific "td.{TYPE}nav-activepage" was replaced by common "td.activepage" in layout.css</li>
+  <li>renamed ".{TYPE}list-bright" to ".{TYPE}-bright" and ".{TYPE}list-dark" to ".{TYPE}-dark"</li>
+  <li>removed "table.{TYPE}list input", "table.{TYPE}list select",
+"table.{TYPE}list button", "fieldset.{TYPE}edit input",
+"fieldset.{TYPE}edit select", "fieldset.{TYPE}edit button"</li>
+  <li>removed "input.{TYPE}" and "select.{TYPE}"</li>
+  <li>removed "table.{TYPE}nav" and "table.{TYPE}nav input"</li>
+  <li>removed "table.{TYPE}list td,th"</li>
+  <li>new ".{TYPE}-border"</li>
+  <li>replaced "table.{TYPE}list" by ".{TYPE}-border" and "table.accountlist"<br>
+  </li>
+  <li>replaced "fieldset.{TYPE}edit" by ".{TYPE}-border" and ".{TYPE}-bright"</li>
+  <li>moved type styles from 600_type_{TYPE}.css to 500_layout.css<br>
+  </li>
+
+</ul>
+<br>
+<h2>3.9 -&gt; 4.0</h2>
+Module interface:<br>
 <ul>
   <li>new function: <span style="font-weight: bold;">doUploadPreActions()</span></li>
   <li>function <span style="font-weight: bold;">doUploadPostActions() </span>contains attributes by reference<span style="font-weight: bold;"><br>
diff --git a/lam/lib/html.inc b/lam/lib/html.inc
index a1866ffc..a363e9fd 100644
--- a/lam/lib/html.inc
+++ b/lam/lib/html.inc
@@ -2228,7 +2228,7 @@ class htmlFieldset extends htmlElement {
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
 		$class = 'ui-corner-all';
 		if ($scope != null) {
-			$class .= ' ' . $scope . 'edit';
+			$class .= ' ' . $scope . '-border ' . $scope . '-bright';
 		}
 		echo "<fieldset class=\"$class\">\n";
 		// generate legend
diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index 9a1e00f8..4f89e6f5 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2012  Roland Gruber
+  Copyright (C) 2003 - 2013  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -280,7 +280,7 @@ class lamList {
 		echo("</td>");
 
 		if ($count > $this->maxPageEntries) {
-			echo("<td class=\"" . $this->type . "nav-activepage\" align=\"right\">");
+			echo("<td class=\"activepage\" align=\"right\">");
 			if ($this->page != 1) {
 				echo("<a title=\"" . _('Jump to first page') . "\" href=\"list.php?type=" . $this->type . "&amp;norefresh=true&amp;page=1" .
 					"&amp;sort=" . $this->sortColumn . "&amp;sortdirection=" . $this->sortDirection . $this->filterText . "\">" .
@@ -326,8 +326,8 @@ class lamList {
 	*/
 	protected function listPrintTableHeader() {
 		// print table header
-		echo "<table id=\"accountTable\" frame=\"box\" rules=\"none\" class=\"" . $this->type . "list\" width=\"100%\"><thead>\n";
-		echo "<tr class=\"" . $this->type . "list-dark\">\n<th width=22 height=34></th>\n<th></th>\n";
+		echo "<table id=\"accountTable\" frame=\"box\" rules=\"none\" class=\"" . $this->type . "-border accountlist ui-corner-all\" width=\"100%\"><thead>\n";
+		echo "<tr class=\"" . $this->type . "-dark\">\n<th width=22 height=34></th>\n<th></th>\n";
 		// table header
 		for ($k = 0; $k < sizeof($this->descArray); $k++) {
 			if (strtolower($this->attrArray[$k]) == $this->sortColumn) {
@@ -345,7 +345,7 @@ class lamList {
 		echo "</tr>\n";
 
 		// print filter row
-		echo "<tr align=\"center\" class=\"" . $this->type . "list-bright\">\n";
+		echo "<tr align=\"center\" class=\"" . $this->type . "-bright\">\n";
 		echo "<td width=22 height=34>";
 			printHelpLink(getHelp('', '250'), '250');
 		echo "</td>\n";
@@ -376,6 +376,7 @@ class lamList {
 					}
 				}
 				$filterInput = new htmlInputField('filter' . strtolower($this->attrArray[$k]), $value);
+				$filterInput->setCSSClasses(array($this->type . '-dark'));
 				$filterInput->setFieldSize('15');
 				$filterInput->setOnKeyPress("SubmitForm('apply_filter', event);");
 				parseHtml(null, $filterInput, array(), false, $this->tabindex, $this->type);
@@ -412,10 +413,10 @@ class lamList {
 		for ($i = $table_begin; $i < $table_end; $i++) {
 			$rowID = base64_encode($info[$i]['dn']);
 			if ((($i - $table_begin) % 2) == 1) {
-				$classes = ' ' . $this->type . 'list-bright';
+				$classes = ' ' . $this->type . '-bright';
 			}
 			else {
-				$classes = ' ' . $this->type . 'list-dark';
+				$classes = ' ' . $this->type . '-dark';
 			}
 			echo("<tr class=\"$classes\"" .
 				" onClick=\"list_click('" . $rowID . "')\"\n" .
@@ -433,7 +434,7 @@ class lamList {
 		}
 		// display select all link
 		$colspan = sizeof($this->attrArray) + 1;
-		echo "<tr class=\"" . $this->type . "list-bright\">\n";
+		echo "<tr class=\"" . $this->type . "-bright\">\n";
 		echo "<td align=\"center\"><a href=\"#\" onClick=\"list_switchAccountSelection();\"><img height=16 width=16 src=\"../../graphics/select.png\" alt=\"select all\"></a></td>\n";
 		echo "<td colspan=$colspan>&nbsp;<a href=\"#\" onClick=\"list_switchAccountSelection();\">" .
 			"<font color=\"black\">" . _("Select all") . "</font></a></td>\n";
@@ -641,7 +642,7 @@ class lamList {
 		
 		$this->listPrintHeader();
 
-		echo "<div class=\"ui-tabs-nav " . $this->type . "list-bright\">";
+		echo "<div class=\"ui-tabs-nav " . $this->type . "-bright\">";
 		echo "<div class=\"smallPaddingContent\">\n";
 		echo "<form action=\"list.php?type=" . $this->type . "&amp;norefresh=true\" method=\"post\">\n";
 		
diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 860142c6..a57aad73 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -936,13 +936,13 @@ class accountContainer {
 			}
 		}
 		echo '<div id="passwordMessageArea"></div>';
-		echo "<table class=\"".$this->type."list-bright\" border=0 width=\"100%\" style=\"border-collapse: collapse;\">\n";
+		echo "<table class=\"".$this->type."-bright\" border=0 width=\"100%\" style=\"border-collapse: collapse;\">\n";
 		if (checkIfWriteAccessIsAllowed()) {
-			echo "<tr class=\"".$this->type."list-bright\"><td style=\"padding: 15px 15px 0px 15px;\">\n";
+			echo "<tr class=\"".$this->type."-bright\"><td style=\"padding: 15px 15px 0px 15px;\">\n";
 			$this->printCommonControls($tabindex);
 			echo "</td></tr>\n";
 		}
-		echo "<tr class=\"".$this->type."list-bright\" valign=\"top\"><td style=\"padding: 15px;\">";
+		echo "<tr class=\"".$this->type."-bright\" valign=\"top\"><td style=\"padding: 15px;\">";
 		// print title bar
 		echo '<div class="titleBar ui-corner-top">';
 		echo '<table width="100%"><tr>';
@@ -1255,7 +1255,7 @@ class accountContainer {
 		else {
 			$text = _("Account was modified successfully.");
 		}
-		echo "<div class=\"".$this->type."list-bright smallPaddingContent\">";
+		echo "<div class=\"".$this->type."-bright smallPaddingContent\">";
 		
 		$container = new htmlTable();
 		// show messages
@@ -1340,7 +1340,7 @@ class accountContainer {
 			$buttonImage = $this->module[$this->order[$i]]->getIcon();
 			$activatedClass = '';
 			if ($this->order[$this->current_page] == $this->order[$i]) {
-				$activatedClass = ' ui-tabs-selected ui-state-active ' . $this->type . 'list-bright';
+				$activatedClass = ' ui-tabs-selected ui-state-active ' . $this->type . '-bright';
 			}
 			// print button
 			echo '<li class="ui-state-default ui-corner-left' . $activatedClass . '">';
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index c985a6b6..99fa97b3 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -95,6 +95,11 @@ legend {
 color:black;
 }
 
+/* color for active page digit */
+td.activepage {
+ color:red;
+}
+
 select {
 	background:#F5F5F5 none repeat-x scroll 50% 50%;
 	border:1px solid #AAAAAA;
@@ -117,6 +122,13 @@ table.lamHeader {
   height: 35px;
 }
 
+/* table preferences */
+table.accountlist {
+  border-width:1px;
+  border-style:solid;
+  border-collapse:collapse;
+}
+
 .rightToLeftText {
 	text-align: right;
 }
@@ -463,3 +475,72 @@ h4.schema_oclass_sub {
 	font-size: 80%;
 }
 
+
+/** colors for account types */
+
+.alias-border { border-color:#af8800; }
+.alias-bright { background-color:#fff3c8 !important; }
+.alias-dark { background-color:#ffe27f !important; }
+
+.asteriskExt-border { border-color:#af8800; }
+.asteriskExt-bright { background-color:#fff3c8 !important; }
+.asteriskExt-dark { background-color:#ffe27f !important; }
+
+.automountType-border { border-color:#7167bf; }
+.automountType-bright { background-color:#d6e3ff !important; }
+.automountType-dark { background-color:#a8c3ff !important; }
+
+.dhcp-border { border-color:#527510; }
+.dhcp-bright { background-color:#d4f19b !important; }
+.dhcp-dark { background-color:#9fc653 !important; }
+
+.gon-border { border-color:#7167bf; }
+.gon-bright { background-color:#d6e3ff !important; }
+.gon-dark { background-color:#a8c3ff !important; }
+
+.group-border { border-color:#7167bf; }
+.group-bright { background-color:#d6e3ff !important; }
+.group-dark { background-color:#a8c3ff !important; }
+
+.host-border { border-color:#911a1a; }
+.host-bright { background-color:#ffe2dd !important; }
+.host-dark { background-color:#ffc4ba !important; }
+
+.mailAlias-border { border-color:#af8800; }
+.mailAlias-bright { background-color:#fff3c8 !important; }
+.mailAlias-dark { background-color:#ffe27f !important; }
+
+.netgroup-border { border-color:#7167bf; }
+.netgroup-bright { background-color:#d6e3ff !important; }
+.netgroup-dark { background-color:#a8c3ff !important; }
+
+.nisObjectType-border { border-color:#7167bf; }
+.nisObjectType-bright { background-color:#d6e3ff !important; }
+.nisObjectType-dark { background-color:#a8c3ff !important; }
+
+.ppolicyType-border { border-color:#af8800; }
+.ppolicyType-bright { background-color:#fff3c8 !important; }
+.ppolicyType-dark { background-color:#ffe27f !important; }
+
+.smbDomain-border { border-color:#1d993e; }
+.smbDomain-bright { background-color:#c9ddd2 !important; }
+.smbDomain-dark { background-color:#a8ddbf !important; }
+
+.sudo-border { border-color:#9b8523; }
+.sudo-bright { background-color:#fffde2 !important; }
+.sudo-dark { background-color:#fff2a3 !important; }
+
+.user-border { border-color:#9b8523; }
+.user-bright { background: #fffde2 !important; }
+.user-dark { background-color:#fff2a3 !important; }
+
+.zarafaAddressListType-border { border-color:#7167bf; }
+.zarafaAddressListType-bright { background-color:#d6e3ff !important; }
+.zarafaAddressListType-dark { background-color:#a8c3ff !important; }
+
+.zarafaDynamicGroupType-border { border-color:#7167bf; }
+.zarafaDynamicGroupType-bright { background-color:#d6e3ff !important; }
+.zarafaDynamicGroupType-dark { background-color:#a8c3ff !important; }
+
+
+
diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index 0d03dd42..dc7ce27c 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -224,11 +224,11 @@ echo '</ul>';
 jQuery(document).ready(function() {
 	jQuery('#generalSettingsButton').addClass('ui-tabs-selected');
 	jQuery('#generalSettingsButton').addClass('ui-state-active');
-	jQuery('#generalSettingsButton').addClass('userlist-bright');
+	jQuery('#generalSettingsButton').addClass('user-bright');
 });
 </script>
 
-<div class="ui-tabs-panel ui-widget-content ui-corner-bottom userlist-bright">
+<div class="ui-tabs-panel ui-widget-content ui-corner-bottom user-bright">
 <?php
 
 $container = new htmlTable();
diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php
index ce2e7d63..5763bdf5 100644
--- a/lam/templates/config/confmodules.php
+++ b/lam/templates/config/confmodules.php
@@ -183,7 +183,7 @@ echo '</ul>';
 jQuery(document).ready(function() {
 	jQuery('#editmodules').addClass('ui-tabs-selected');
 	jQuery('#editmodules').addClass('ui-state-active');
-	jQuery('#editmodules').addClass('userlist-bright');
+	jQuery('#editmodules').addClass('user-bright');
 	// set common width for select boxes
 	var maxWidth = 0;
 	jQuery("select").each(function(){
@@ -194,7 +194,7 @@ jQuery(document).ready(function() {
 });
 </script>
 
-<div class="ui-tabs-panel ui-widget-content ui-corner-bottom userlist-bright">
+<div class="ui-tabs-panel ui-widget-content ui-corner-bottom user-bright">
 <?php
 
 
diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php
index 27e75cdf..d7c52be6 100644
--- a/lam/templates/config/conftypes.php
+++ b/lam/templates/config/conftypes.php
@@ -201,11 +201,11 @@ echo '</ul>';
 jQuery(document).ready(function() {
 	jQuery('#edittypes').addClass('ui-tabs-selected');
 	jQuery('#edittypes').addClass('ui-state-active');
-	jQuery('#edittypes').addClass('userlist-bright');
+	jQuery('#edittypes').addClass('user-bright');
 });
 </script>
 
-<div class="ui-tabs-panel ui-widget-content ui-corner-bottom userlist-bright">
+<div class="ui-tabs-panel ui-widget-content ui-corner-bottom user-bright">
 <?php
 
 $container = new htmlTable();
diff --git a/lam/templates/config/moduleSettings.php b/lam/templates/config/moduleSettings.php
index 733049b5..bfd35b80 100644
--- a/lam/templates/config/moduleSettings.php
+++ b/lam/templates/config/moduleSettings.php
@@ -182,11 +182,11 @@ echo '</ul>';
 jQuery(document).ready(function() {
 	jQuery('#moduleSettings').addClass('ui-tabs-selected');
 	jQuery('#moduleSettings').addClass('ui-state-active');
-	jQuery('#moduleSettings').addClass('userlist-bright');
+	jQuery('#moduleSettings').addClass('user-bright');
 });
 </script>
 
-<div class="ui-tabs-panel ui-widget-content ui-corner-bottom userlist-bright">
+<div class="ui-tabs-panel ui-widget-content ui-corner-bottom user-bright">
 <?php
 
 
@@ -212,7 +212,7 @@ $modules = array_keys($options);
 $_SESSION['conf_types'] = array();
 for ($i = 0; $i < sizeof($modules); $i++) {
 	if (sizeof($options[$modules[$i]]) < 1) continue;
-	echo "<fieldset class=\"ui-corner-all useredit\">\n";
+	echo "<fieldset class=\"ui-corner-all user-border user-bright\">\n";
 	$icon = '';
 	$module = new $modules[$i]('none');
 	$iconImage = $module->getIcon();
diff --git a/lam/templates/delete.php b/lam/templates/delete.php
index 82606feb..3d936577 100644
--- a/lam/templates/delete.php
+++ b/lam/templates/delete.php
@@ -83,7 +83,7 @@ if (isset($_GET['type']) && isset($_SESSION['delete_dn'])) {
 	$_SESSION['account'] = new accountContainer($_GET['type'], 'account');
 	// Show HTML Page
 	include 'main_header.php';
-	echo "<div class=\"".$_GET['type']."list-bright smallPaddingContent\">";
+	echo "<div class=\"".$_GET['type']."-bright smallPaddingContent\">";
 	echo "<br>\n";
 	echo "<form action=\"delete.php\" method=\"post\">\n";
 	echo "<input name=\"type\" type=\"hidden\" value=\"" . $_GET['type'] . "\">\n";
@@ -142,7 +142,7 @@ if (isset($_POST['delete'])) {
 	include 'main_header.php';
 	echo "<form action=\"delete.php\" method=\"post\">\n";
 	echo "<input name=\"type\" type=\"hidden\" value=\"" . $_POST['type'] . "\">\n";
-	echo "<div class=\"".$_POST['type']."list-bright smallPaddingContent\"><br>\n";
+	echo "<div class=\"".$_POST['type']."-bright smallPaddingContent\"><br>\n";
 	echo "<br>\n";
 	
 	// Delete dns
diff --git a/lam/templates/initsuff.php b/lam/templates/initsuff.php
index a043b2dd..fc2ede4e 100644
--- a/lam/templates/initsuff.php
+++ b/lam/templates/initsuff.php
@@ -173,7 +173,7 @@ $new_suff = str_replace("'", "", $new_suff);
 $new_suff = explode(";", $new_suff);
 
 include 'main_header.php';
-	echo '<div class="userlist-bright smallPaddingContent">';
+	echo '<div class="user-bright smallPaddingContent">';
 	echo "<form action=\"initsuff.php\" method=\"post\">\n";
 	$container = new htmlTable();
 	$container->addElement(new htmlOutputText(_("The following suffixes are missing in LDAP. LAM can create them for you.")), true);
diff --git a/lam/templates/massBuildAccounts.php b/lam/templates/massBuildAccounts.php
index df1bdd29..63ec5526 100644
--- a/lam/templates/massBuildAccounts.php
+++ b/lam/templates/massBuildAccounts.php
@@ -98,7 +98,7 @@ if (isAccountTypeHidden($scope)) {
 	die();
 }
 
-echo '<div class="' . $scope . 'list-bright smallPaddingContent">';
+echo '<div class="' . $scope . '-bright smallPaddingContent">';
 
 $selectedModules = explode(',', $_POST['selectedModules']);
 if ($_FILES['inputfile'] && ($_FILES['inputfile']['size'] > 0)) {
diff --git a/lam/templates/massDoUpload.php b/lam/templates/massDoUpload.php
index c466525c..a3711c57 100644
--- a/lam/templates/massDoUpload.php
+++ b/lam/templates/massDoUpload.php
@@ -69,7 +69,7 @@ if (isAccountTypeHidden($scope)) {
 	die();
 }
 
-echo '<div class="' . $scope . 'list-bright smallPaddingContent">';
+echo '<div class="' . $scope . '-bright smallPaddingContent">';
 
 // create accounts
 $accounts = unserialize($_SESSION['ldap']->decrypt($_SESSION['mass_accounts']));
diff --git a/lam/templates/masscreate.php b/lam/templates/masscreate.php
index 18d2d67d..a9c6e232 100644
--- a/lam/templates/masscreate.php
+++ b/lam/templates/masscreate.php
@@ -118,7 +118,7 @@ $divClass = 'user';
 if (isset($_REQUEST['type'])) {
 	$divClass = $_REQUEST['type'];
 }
-echo '<div class="' . $divClass . 'list-bright smallPaddingContent">';
+echo '<div class="' . $divClass . '-bright smallPaddingContent">';
 echo "<div class=\"title\">\n";
 echo "<h2 class=\"titleText\">" . _("Account creation via file upload") . "</h2>\n";
 echo "</div>";
@@ -225,7 +225,7 @@ include 'main_footer.php';
 * @param array $selectedModules list of selected account modules
 */
 function showMainPage($scope, $selectedModules) {
-	echo '<div class="' . $scope . 'list-bright smallPaddingContent">';
+	echo '<div class="' . $scope . '-bright smallPaddingContent">';
 	// get input fields from modules
 	$columns = getUploadColumns($scope, $selectedModules);
 	$modules = array_keys($columns);
@@ -318,7 +318,7 @@ function showMainPage($scope, $selectedModules) {
 	$dnSuffixRowCells[] = new htmlOutputText('');
 	$dnSuffixRowCells[] = new htmlSpacer(null, '25px');
 	$dnSuffixRow = new htmlTableRow($dnSuffixRowCells);
-	$dnSuffixRow->setCSSClasses(array($scope . 'list-dark'));
+	$dnSuffixRow->setCSSClasses(array($scope . '-dark'));
 	$columnContainer->addElement($dnSuffixRow);
 	$dnRDNRowCells = array();
 	$dnRDNRowCells[] = $columnSpacer;
@@ -338,7 +338,7 @@ function showMainPage($scope, $selectedModules) {
 	$dnRDNRowCells[] = new htmlOutputText(implode(", ", $rdnAttributes));
 	$dnRDNRowCells[] = new htmlSpacer(null, '25px');
 	$dnRDNRow = new htmlTableRow($dnRDNRowCells);
-	$dnRDNRow->setCSSClasses(array($scope . 'list-bright'));
+	$dnRDNRow->setCSSClasses(array($scope . '-bright'));
 	$columnContainer->addElement($dnRDNRow);
 	// module options
 	for ($m = 0; $m < sizeof($modules); $m++) {
@@ -417,10 +417,10 @@ function showMainPage($scope, $selectedModules) {
 			$rowCells[] = new htmlSpacer(null, '25px');
 			$row = new htmlTableRow($rowCells);
 			if ($odd) {
-				$row->setCSSClasses(array($scope . 'list-dark'));
+				$row->setCSSClasses(array($scope . '-dark'));
 			}
 			else {
-				$row->setCSSClasses(array($scope . 'list-bright'));
+				$row->setCSSClasses(array($scope . '-bright'));
 			}
 			$odd = !$odd;
 			$columnContainer->addElement($row);
diff --git a/lam/templates/ou_edit.php b/lam/templates/ou_edit.php
index 593a7a28..5a23ca6a 100644
--- a/lam/templates/ou_edit.php
+++ b/lam/templates/ou_edit.php
@@ -105,7 +105,7 @@ if (isset($_POST['createOU']) || isset($_POST['deleteOU'])) {
 		if ($sr && $info['count'] == 0) {
 			// print header
 			include 'main_header.php';
-			echo '<div class="userlist-bright smallPaddingContent">';
+			echo '<div class="user-bright smallPaddingContent">';
 			echo "<form action=\"ou_edit.php\" method=\"post\">\n";
 			$tabindex = 1;
 			$container = new htmlTable();
@@ -144,7 +144,7 @@ display_main($message, $error);
 function display_main($message, $error) {
 	// display main page
 	include 'main_header.php';
-	echo '<div class="userlist-bright smallPaddingContent">';
+	echo '<div class="user-bright smallPaddingContent">';
 	echo ("<form action=\"ou_edit.php\" method=\"post\">\n");
 
 	$tabindex = 1;
diff --git a/lam/templates/pdfedit/pdfmain.php b/lam/templates/pdfedit/pdfmain.php
index 7190346d..735d5431 100644
--- a/lam/templates/pdfedit/pdfmain.php
+++ b/lam/templates/pdfedit/pdfmain.php
@@ -148,7 +148,7 @@ for ($i = 0; $i < sizeof($templateClasses); $i++) {
 
 include '../main_header.php';
 ?>
-<div class="userlist-bright smallPaddingContent">
+<div class="user-bright smallPaddingContent">
 <form action="pdfmain.php" method="post" name="pdfmainForm" >
 	<?php
 		if (isset($_GET['savedSuccessfully'])) {
diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php
index fa296dfb..a0141a5c4 100644
--- a/lam/templates/profedit/profilemain.php
+++ b/lam/templates/profedit/profilemain.php
@@ -87,7 +87,7 @@ for ($i = 0; $i < sizeof($profileClasses); $i++) {
 }
 
 include '../main_header.php';
-echo "<div class=\"userlist-bright smallPaddingContent\">\n";
+echo "<div class=\"user-bright smallPaddingContent\">\n";
 echo "<form name=\"profilemainForm\" action=\"profilemain.php\" method=\"post\">\n";
 
 $container = new htmlTable();
diff --git a/lam/templates/serverInfo.php b/lam/templates/serverInfo.php
index fe0d49a6..77eecebe 100644
--- a/lam/templates/serverInfo.php
+++ b/lam/templates/serverInfo.php
@@ -95,7 +95,7 @@ for ($i = 0; $i < sizeof($monitorResult); $i++) {
 $monitorEntries = array_change_key_case($monitorEntries, CASE_LOWER);
 
 include 'main_header.php';
-echo '<div class="userlist-bright smallPaddingContent">';
+echo '<div class="user-bright smallPaddingContent">';
 $tabindex = 1;
 $container = new htmlTable();
 $spacer = new htmlSpacer('20px', null);
diff --git a/lam/templates/tests/index.php b/lam/templates/tests/index.php
index a5dbbc7c..3d6dba52 100644
--- a/lam/templates/tests/index.php
+++ b/lam/templates/tests/index.php
@@ -44,7 +44,7 @@ checkIfToolIsActive('toolTests');
 setlanguage();
 
 include '../main_header.php';
-echo "<div class=\"userlist-bright smallPaddingContent\">\n";
+echo "<div class=\"user-bright smallPaddingContent\">\n";
 
 $container = new htmlTable();
 $container->addElement(new htmlSubTitle(_("LAM tests")), true);
diff --git a/lam/templates/tests/lamdaemonTest.php b/lam/templates/tests/lamdaemonTest.php
index 04c25dac..cbfa6fdd 100644
--- a/lam/templates/tests/lamdaemonTest.php
+++ b/lam/templates/tests/lamdaemonTest.php
@@ -45,7 +45,7 @@ checkIfToolIsActive('toolTests');
 setlanguage();
 
 include '../main_header.php';
-echo "<div class=\"userlist-bright smallPaddingContent\">\n";
+echo "<div class=\"user-bright smallPaddingContent\">\n";
 echo "<form action=\"lamdaemonTest.php\" method=\"post\">\n";
 
 $container = new htmlTable();
diff --git a/lam/templates/tests/schemaTest.php b/lam/templates/tests/schemaTest.php
index 44995db7..b2fba27d 100644
--- a/lam/templates/tests/schemaTest.php
+++ b/lam/templates/tests/schemaTest.php
@@ -48,7 +48,7 @@ checkIfToolIsActive('toolTests');
 setlanguage();
 
 include '../main_header.php';
-echo "<div class=\"userlist-bright smallPaddingContent\">\n";
+echo "<div class=\"user-bright smallPaddingContent\">\n";
 
 $container = new htmlTable();
 
diff --git a/lam/templates/tools.php b/lam/templates/tools.php
index c7f19544..e51223cf 100644
--- a/lam/templates/tools.php
+++ b/lam/templates/tools.php
@@ -56,7 +56,7 @@ foreach ($toSort as $key => $value) {
 	$tools[] = new $key();
 }
 
-echo "<div class=\"userlist-bright smallPaddingContent\">\n";
+echo "<div class=\"user-bright smallPaddingContent\">\n";
 
 // print tools table
 $container = new htmlTable();


"; printHelpLink(getHelp('', '250'), '250'); echo "
$\"select$	" . "" . _("Select all") . "