Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r3527 -r3620
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 3527)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 3620)
@@ -867,7 +867,7 @@
         while($rs && !$rs->EOF)
         {
             $data = $rs->fields;
-			$this->DeliverMail($data["toaddr"],$data["fromaddr"],$data["Subject"],$data["headers"],$data["message"],1);
+						$this->DeliverMail($data["toaddr"],$data["fromaddr"],$data["Subject"],$data["message"],$data["headers"],1);
 
             $del_sql[] = "DELETE FROM ".$this->SourceTable." WHERE queued='".$data["queued"]."'";
             $rs->MoveNext();
Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r3330 -r3620
--- trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 3330)
+++ trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 3620)
@@ -34,7 +34,7 @@
 		{
 			$module_found = false;
 			if (!$this->Application->ModuleInfo) return false;
-			
+
 			foreach($this->Application->ModuleInfo as $module_name => $module_info)
 			{
 				$module_path = '/'.$module_info['Path'];
@@ -97,7 +97,7 @@
 						else {
 							include_once($file);
 						}
-						
+
 						if ( !isset($config) || !$config ) continue;
 						$prefix = $config['Prefix'];
 						$config['BasePath'] = $full_path;
@@ -119,16 +119,16 @@
 			{
 				$clone_config['Prefix'] = $clone_prefix;
 				$this->configData[$clone_prefix] = array_merge_recursive2($this->configData[$prefix], $clone_config);
-				
+
 				foreach($clone_config as $cloned_property => $cloned_value)
 				{
 					if(!$cloned_value) unset($this->configData[$clone_prefix][$cloned_property]);
 				}
-				
+
 				$this->ParseConfigClones($clone_prefix);
 			}
 		}
-		
+
 		function ParseConfigs()
 		{
 			foreach ($this->configData as $prefix => $config)
@@ -188,7 +188,7 @@
 				if($config_found && isset($config) && $config)
 				{
 					$prefix = $config['Prefix'];
-					
+
 					preg_match('/\/(.*)\//U', $filename, $rets);
 					$config['ModuleFolder'] = $rets[1];
 					$config['BasePath'] = dirname(FULL_PATH.$filename);
@@ -205,7 +205,8 @@
 			if (defined('CACHE_CONFIGS_FILES')) {
 				$conn =& $this->Application->GetADODBConnection();
 				$data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files"');
-				if ($data && $data['Cached'] > (adodb_mktime() - 3600) ) {
+//				if ($data && $data['Cached'] > (adodb_mktime() - 3600) ) {
+				if ($data && $data['Cached'] > 0 ) {
 					$this->configFiles = unserialize($data['Data']);
 					$files_cached = $data['Cached'];
 				}
@@ -450,9 +451,9 @@
 		 */
 		function isDir($folderPath)
 		{
-			$base_name=basename($folderPath);
-			$ret=!($base_name=='.'||$base_name=='..');
-			return $ret&&is_dir($folderPath);
+			$base_name = basename($folderPath);
+			$ret = !( $base_name == '.' || $base_name == '..' );
+			return $ret && is_dir($folderPath);
 		}
 
 
Index: trunk/kernel/admin_templates/incs/style.css
===================================================================
diff -u -r3344 -r3620
--- trunk/kernel/admin_templates/incs/style.css	(.../style.css)	(revision 3344)
+++ trunk/kernel/admin_templates/incs/style.css	(.../style.css)	(revision 3620)
@@ -11,15 +11,15 @@
 }
 
 body {
-   	font-family: Verdana, Arial, Helvetica, Sans-serif; 
-	font-size: 12px; 
-   	color: #000000; 
-	scrollbar-3dlight-color: #333333; 
-	scrollbar-arrow-color: #ffffff; 
-	scrollbar-track-color: #88d2f8; 
+   	font-family: Verdana, Arial, Helvetica, Sans-serif;
+	font-size: 12px;
+   	color: #000000;
+	scrollbar-3dlight-color: #333333;
+	scrollbar-arrow-color: #ffffff;
+	scrollbar-track-color: #88d2f8;
 	scrollbar-darkshadow-color: #333333;
-	scrollbar-highlight-color: #009ffd; 
-	scrollbar-shadow-color: #009ffd; 
+	scrollbar-highlight-color: #009ffd;
+	scrollbar-shadow-color: #009ffd;
 	scrollbar-face-color: #009ffd;
 	overflow-x: auto; overflow-y: auto;
 }
@@ -52,11 +52,11 @@
 }
 
 .tablenav {
-	font-family: verdana, arial;   
+	font-family: verdana, arial;
 	font-size: 14px;
 	font-weight: bold;
 	color: #FFFFFF;
-	
+
 	text-decoration: none;
 	background-color: #73C4F5;
 	background: url(../img/tabnav_back.gif) repeat-x;
@@ -84,9 +84,10 @@
 
 .tableborder {
 	font-family: arial, helvetica, sans-serif;
-   	font-size: 10pt;
+  font-size: 10pt;
 	border: 1px solid #000000;
 	border-top-width: 0px;
+	border-collapse: collapse;
 }
 
 .tableborder_full, .tableborder_full_kernel {
@@ -139,8 +140,8 @@
 }
 
 .table_border_notop, .table_border_nobottom {
-   background-color: #F0F1EB; 
-   border: 1px solid #000000; 
+   background-color: #F0F1EB;
+   border: 1px solid #000000;
 }
 
 .table_border_notop {
@@ -152,7 +153,7 @@
 }
 
 .pagination_bar {
-   background-color: #D7D7D7; 
+   background-color: #D7D7D7;
    border: 1px solid #000000;
    border-top-width: 0px;
 }
@@ -195,7 +196,7 @@
 .cats_stats {
 	font-size: 11px;
 	color: #707070;
-} 
+}
 
 /* Links */
 
@@ -253,8 +254,8 @@
 }
 
 .toolbar {
-	font-family: Arial, Helvetica, sans-serif; 
-	font-size: 10pt; 
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10pt;
 	border: 1px solid #000000;
 	border-width: 0 1 1 1;
 	background-color: #F0F1EB;
@@ -307,7 +308,7 @@
 	font-weight: normal;
 	color: #000000;
 	text-decoration: none;
-}	
+}
 
 .table_color1 {	background-color: #F6F6F6; }
 .table_color2 {	background-color: #EBEBEB; }
@@ -328,18 +329,19 @@
 }
 
 .table_white_selected {
-	background-color: #C6D6EF; 
+	background-color: #C6D6EF;
 }
 
 .subsectiontitle {
 	font-family: verdana, arial;
-	font-size: 14px; 
-	font-weight: bold; 
-	color: #FFFFFF; 
-	background-color: #999999; 
-	text-decoration: none; 
+	font-size: 14px;
+	font-weight: bold;
+	color: #FFFFFF;
+	background-color: #999999;
+	text-decoration: none;
 	height: 24px;
 }
+
 .subsectiontitle:hover {
 	font-family: verdana, arial;
 	font-size: 14px;
@@ -390,11 +392,11 @@
 
 
 .itemtab_active {
-	background: url("../img/itemtabs/tab_active.gif") #eee repeat-x; 
+	background: url("../img/itemtabs/tab_active.gif") #eee repeat-x;
 }
 
 .itemtab_inactive {
-	background: url("../img/itemtabs/tab_inactive.gif") #F9EEAE repeat-x; 
+	background: url("../img/itemtabs/tab_inactive.gif") #F9EEAE repeat-x;
 }
 
 
@@ -437,7 +439,7 @@
 
 .order_print_defaults TD,
 .order_preview_header,
-.order_preview_header TD, 
+.order_preview_header TD,
 .order_print_preview_header TD,
 .order_preview_field_name,
 .order-totals-name,
@@ -458,13 +460,14 @@
 
 .order_preview_field_name {
 	font-weight: bold;
+	padding: 2px 4px 2px 4px;
 }
 
 .order-totals-name {
-	font-style: italic;
+	font-style: normal;
 }
 
-.border1 { 
+.border1 {
 	border: 1px solid #111111;
 }
 
@@ -475,12 +478,12 @@
 
 .orders_flat_table, .orders_print_flat_table {
 	border-collapse: collapse;
+	margin: 5px;
 }
 
 .orders_flat_table TD {
-	border: 1px solid #000000;
-	padding-left: 2px;
-	padding-right: 2px;
+	padding: 2px 5px 2px 5px;
+	border: 1px solid #444444;
 }
 
 .orders_print_flat_table TD {