diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index dab49627..c1f400a7 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -821,7 +821,7 @@ class accountContainer {
 		echo "<table border=0 width=\"100%\">\n<tr><td valign=\"top\" width=\"15%\" >";
 		echo "<table><tr>";
 		
-		echo "<td><fieldset class=\"".$this->type."edit-dark\"><legend class=\"".$this->type."edit-bright\"><b>";
+		echo "<td><fieldset class=\"".$this->type."edit\"><legend><b>";
 			echo _('Please select page:');
 			echo "</b></legend>\n";
 		$x=0;
@@ -843,12 +843,12 @@ class accountContainer {
 		echo "</fieldset></td></tr>\n";
 		echo "</table></td>\n<td>";
 		if ($this->current_page==0) {
-			echo "<td><fieldset class=\"".$this->type."edit-dark\"><legend class=\"".$this->type."edit-bright\"><b>";
+			echo "<td><fieldset class=\"".$this->type."edit\"><legend><b>";
 			echo _('Main');
 			echo "</b></legend>\n";
 			}
 		else {
-			echo "<td><fieldset class=\"".$this->type."edit-dark\"><legend class=\"".$this->type."edit-bright\"><b>";
+			echo "<td><fieldset class=\"".$this->type."edit\"><legend><b>";
 				echo $this->module[$this->order[$this->current_page]]->get_alias($type);
 				echo "</b></legend>\n";
 			}
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index 167cbda9..36310475 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -442,82 +442,81 @@ p.statusError {
  *
  */
 
-fieldset.groupedit-bright {
+fieldset.groupedit {
   background-color:#d6e3ff;
 }
 
-fieldset.groupedit-middle {
-  background-color:#C7E7C7;
-}
-
-legend.groupedit-bright {
+fieldset.groupedit legend {
   color:blue;
 }
 
-fieldset.groupedit-dark {
-  background-color:#7167bf;
-}
-
-legend.groupedit-dark {
-  color:blue;
-}
-
-select.groupedit-bright {
+fieldset.groupedit fieldset {
   background-color:#d6e3ff;
 }
 
+fieldset.groupedit fieldset fieldset {
+  background-color:#d6e3ff;
+}
+
+fieldset.groupedit select {
+  background-color:#a8c3ff;
+}
+
 
 /**
  * table style for hostedit.php
  *
  */
 
-fieldset.hostedit-bright {
+fieldset.hostedit {
   background-color:#ffe2dd;
 }
 
-legend.hostedit-bright {
+fieldset.hostedit legend {
   color:blue;
 }
 
-fieldset.hostedit-dark {
+fieldset.hostedit fieldset {
+  background-color:#ffe2dd;
+}
+
+fieldset.hostedit fieldset fieldset {
+  background-color:#ffe2dd;
+}
+
+fieldset.hostedit select {
   background-color:#ffc4ba;
 }
 
-legend.hostedit-dark {
-  color:blue;
-}
-
-select.hostedit-bright {
-  background-color:#ffc4ba;
-}
 
 /**
  * table style for useredit.php
  *
  */
 
-fieldset.useredit-bright {
+fieldset.useredit {
   background-color:#fff2a3;
 }
 
-legend.useredit-bright {
+fieldset.useredit legend {
   color:blue;
 }
 
-fieldset.useredit-dark {
-  background-color:#CCCCFF;
+fieldset.useredit fieldset {
+  background-color:#fff2a3;
 }
 
-legend.useredit-dark {
-  color:blue;
+fieldset.useredit fieldset fieldset {
+  background-color:#fff2a3;
 }
 
-select.useredit-bright {
-  background-color:#CCCCFF;
+fieldset.useredit select {
+  background-color:#fffde2;
 }
 
 
+/* schema browser */
+
 table.schema_oclasses {
 	border-left: 1px solid black;
 	border-right: 1px solid black;
diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php
index 289a7095..7940adf5 100644
--- a/lam/templates/config/confmodules.php
+++ b/lam/templates/config/confmodules.php
@@ -155,15 +155,15 @@ function config_showAccountModules($scope, $title) {
 	}
 	
 	// show account modules
-	echo "<fieldset class=\"" . $scope . "edit-bright\"><legend class=\"" . $scope . "edit-bright\"><b>" . $title . "</b></legend>\n";
+	echo "<fieldset class=\"" . $scope . "edit\"><legend><b>" . $title . "</b></legend>\n";
 	echo "<table border=0 width=\"100%\">\n";
 		// select boxes
 		echo "<tr>\n";
 			echo "<td width=\"5%\"></td>\n";
 			echo "<td width=\"40%\">\n";
-				echo "<fieldset class=\"" . $scope . "edit-bright\">\n";
-					echo "<legend class=\"" . $scope . "edit-bright\">" . _("Selected modules") . "</legend>\n";
-					echo "<select class=\"" . $scope . "edit-bright\" name=\"" . $scope . "_selected[]\" size=5 multiple>\n";
+				echo "<fieldset class=\"" . $scope . "edit\">\n";
+					echo "<legend>" . _("Selected modules") . "</legend>\n";
+					echo "<select class=\"" . $scope . "edit\" name=\"" . $scope . "_selected[]\" size=5 multiple>\n";
 						for ($i = 0; $i < sizeof($selected); $i++) {
 							if (in_array($selected[$i], $available)) {  // selected modules must be available
 								if (is_base_module($selected[$i], $scope)) {  // mark base modules
@@ -189,9 +189,9 @@ function config_showAccountModules($scope, $title) {
 				echo "</p>\n";
 			echo "</td>\n";
 			echo "<td width=\"40%\">\n";
-				echo "<fieldset class=\"" . $scope . "edit-bright\">\n";
-					echo "<legend class=\"" . $scope . "edit-bright\">" . _("Available modules") . "</legend>\n";
-					echo "<select class=\"" . $scope . "edit-bright\" name=\"" . $scope . "_available[]\" size=5 multiple>\n";
+				echo "<fieldset class=\"" . $scope . "edit\">\n";
+					echo "<legend>" . _("Available modules") . "</legend>\n";
+					echo "<select class=\"" . $scope . "edit\" name=\"" . $scope . "_available[]\" size=5 multiple>\n";
 						for ($i = 0; $i < sizeof($available); $i++) {
 							if (! in_array($available[$i], $selected)) {  // display non-selected modules
 								if (is_base_module($available[$i], $scope)) {  // mark base modules
diff --git a/lam/templates/delete.php b/lam/templates/delete.php
index 7d32917d..3d283338 100644
--- a/lam/templates/delete.php
+++ b/lam/templates/delete.php
@@ -73,7 +73,7 @@ if ($_GET['type']) {
 	echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../style/layout.css\">\n";
 	echo "</head><body>\n";
 	echo "<form action=\"delete.php\" method=\"post\">\n";
-	echo "<fieldset class=\"".$_GET['type']."edit-dark\"><legend class=\"".$_GET['type']."edit-bright\"><b>";
+	echo "<fieldset class=\"".$_GET['type']."edit\"><legend><b>";
 	echo _('Please confirm:');
 	echo "</b></legend>\n";
 	echo "<input name=\"type\" type=\"hidden\" value=\"" . $_GET['type'] . "\">\n";
@@ -123,7 +123,7 @@ if ($_POST['delete']) {
 	echo "</head><body>\n";
 	echo "<form action=\"delete.php\" method=\"post\">\n";
 	echo "<input name=\"type\" type=\"hidden\" value=\"" . $_POST['type'] . "\">\n";
-	echo "<fieldset class=\"".$_POST['type']."edit-dark\"><legend class=\"".$_POST['type']."edit-bright\"><b>";
+	echo "<fieldset class=\"".$_POST['type']."edit\"><legend><b>";
 	echo _('Deleting. Please stand by ...');
 	echo "</b></legend>\n";