Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/users/root_edit_password.tpl
===================================================================
diff -u -r7856 -r8202
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 7856)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 8202)
@@ -27,7 +27,7 @@
 </table>
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table-collapsed">
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="RootPassword" title="la_fld_Password"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyRootPassword" title="la_fld_VerifyPassword"/>
 </table>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/popups/translator.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 8202)
@@ -75,7 +75,7 @@
 <input type="hidden" name="trans_prefix" value="<inp2:m_get var="trans_prefix"/>">
 <input type="hidden" name="trans_field" value="<inp2:m_get var="trans_field"/>">
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="inp_edit_hidden" prefix="trans" field="Language"/>
 
 	<inp2:m_ParseBlock name="subsection" title="!la_section_Translation!"/>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/uploader.js
===================================================================
diff -u -r8190 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/uploader.js	(.../uploader.js)	(revision 8190)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/uploader.js	(.../uploader.js)	(revision 8202)
@@ -48,7 +48,6 @@
   this.swf.addVariable("uploadFileCancelCallback",  escape('UploadsManager.FileCancelled'));
   this.swf.addVariable("uploadQueueCompleteCallback",  escape('UploadsManager.UploadQueueComplete'));
   this.swf.addVariable("uploadFileErrorCallback",  escape('UploadsManager.UploadError'));
-  this.swf.addVariable("uploadCancelCallback",  escape('uploadCancel'));
   this.swf.addVariable("autoUpload",  escape('false'));
 //  this.swf.addVariable("flashLoadedCallback",  'flashLoadedCallback');
 
@@ -337,8 +336,18 @@
 
 UploadsManager.UploadError = function(errno, file, msg)
 {
-	alert('error '+errno)
-	alert('Error: '+msg+' on file '+file.name);
+	this.Uploaders[file.uploader_id].RemoveFile(file);
+	if (errno == -10) {
+		switch (msg.toString()) {
+			case '403':
+				msg = 'You don\'t have permission to upload';
+				break;
+			case '500':
+				msg = 'Write permissions not set on the server, please contact server administrator';
+				break;
+		}
+	}
+	alert('Error: '+msg+'\nOccured on file '+file.name);
 }
 
 UploadsManager.DeleteFile = function(mov, fname)
Index: branches/unlabeled/unlabeled-1.5.2/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -r8180 -r8202
--- branches/unlabeled/unlabeled-1.5.2/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 8180)
+++ branches/unlabeled/unlabeled-1.5.2/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 8202)
@@ -168,7 +168,12 @@
 			$names = array();
 			if ($value) { // if value string was not empty
 				foreach ($files as $a_file) {
-					$urls[] = rtrim($this->Application->BaseURL(), '/').$upload_dir.$a_file;
+					if (isset($options['direct_links']) && $options['direct_links']) {
+						$urls[] = rtrim($this->Application->BaseURL(), '/').$upload_dir.$a_file;
+					}
+					else {
+						$urls[] = $this->Application->HREF('', '', array('no_amp'=>1, 'pass'=>'m,'.$object->Prefix, $object->Prefix.'_event'=>'OnViewFile', 'file'=>$a_file, 'field'=>$field_name));
+					}
 					$names[] = $a_file;
 					$sizes[] = filesize(FULL_PATH.$upload_dir.$a_file);
 				}
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 8202)
@@ -27,11 +27,11 @@
 </tbody>
 </table>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>
 		<td class="control-cell">
 			<inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field="LangFile"/>" id="<inp2:phrases.export_InputName field="LangFile"/>" value="<inp2:phrases.export_Field field="LangFile"/>" />
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/login.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/login.tpl	(.../login.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/login.tpl	(.../login.tpl)	(revision 8202)
@@ -11,7 +11,7 @@
 		        <img title="In-portal" src="img/logo.gif" width="150" height="82" border="0"><br />
 
 
-		        <table border="0" cellpadding="2" cellspacing="0" class="tableborder" style="border-width: 1px;" width="222" height="30">
+		        <table border="0" cellpadding="2" cellspacing="0" class="bordered" style="border-width: 1px;" width="222" height="30">
 			        <tr>
 						<td align="right" valign="top" class="tablenav" width ="220" nowrap height="30" style="background: url(img/tabnav_left.gif);">
 							<span style="float: left;">
Index: branches/unlabeled/unlabeled-1.6.2/core/admin_templates/tools/system_tools.tpl
===================================================================
diff -u -r8118 -r8202
--- branches/unlabeled/unlabeled-1.6.2/core/admin_templates/tools/system_tools.tpl	(.../system_tools.tpl)	(revision 8118)
+++ branches/unlabeled/unlabeled-1.6.2/core/admin_templates/tools/system_tools.tpl	(.../system_tools.tpl)	(revision 8202)
@@ -15,7 +15,7 @@
 </script>
 
 <inp2:m_DefineElement name="service_elem">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="text" style="width: 300px;">
 			<inp2:m_phrase label="$title"/>:
@@ -27,15 +27,15 @@
 	</tr>
 </inp2:m_DefineElement>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" id="config_table">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
 	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 		<inp2:m_RenderElement name="service_elem" title="la_Service_ResetModRwCache" event_name="OnResetModRwCache"/>
 		<inp2:m_RenderElement name="service_elem" title="la_Service_ResetCMSMenuCache" event_name="OnResetCMSMenuCache"/>
 		<inp2:m_RenderElement name="service_elem" title="la_Service_ResetSections" event_name="OnResetSections"/>
 		<inp2:m_RenderElement name="service_elem" title="la_Service_ConfigCache" event_name="OnResetConfigsCache"/>
 		<inp2:m_RenderElement name="service_elem" title="la_Service_RebuildThemes" event_name="OnRebuildThemes"/>
 	<inp2:m_RenderElement name="subsection" title="la_section_Configs"/>
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" style="width: 300px;">
 				Table Structure:
Index: branches/unlabeled/unlabeled-1.85.2/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r8180 -r8202
--- branches/unlabeled/unlabeled-1.85.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 8180)
+++ branches/unlabeled/unlabeled-1.85.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 8202)
@@ -2065,6 +2065,8 @@
 			$section = $event->getSection();
 			if (!$perm_helper->CheckUserPermission($user, $section.'.add') && !$perm_helper->CheckUserPermission($user, $section.'.edit')) {
 				$event->status = erPERM_FAIL;
+				header('HTTP/1.0 403 You don\'t have permissions to upload');
+				exit;
 				return;
 			}
 
@@ -2077,6 +2079,11 @@
 			$id = $this->Application->GetVar('id');
 			if ($id) $fname = $id.'_'.$fname;
 
+			if (!is_writable($tmp_path)) {
+				header('HTTP/1.0 500 Write permissions not set on the server');
+				exit;
+			}
+
 			move_uploaded_file($value['tmp_name'], $tmp_path.$fname);
 			exit;
 		}
@@ -2118,6 +2125,8 @@
 			header('Content-Length: '.filesize($path));
 			header('Content-Type: '.$type);
 
+			safeDefine('DBG_SKIP_REPORTING',1);
+
 			readfile($path);
 			exit();
 		}
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -r7856 -r8202
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 7856)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 8202)
@@ -26,7 +26,7 @@
 </table>
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table-collapsed">
 		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
 		<inp2:m_ParseBlock name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/no_permission.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 8202)
@@ -30,8 +30,8 @@
 </tbody>
 </table>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td height="400" valign="middle" align="left">
 			<center><b>No Permission</b></center><br />
 			<inp2:m_if check="m_IsDebugMode">
Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/sections_list.tpl
===================================================================
diff -u -r7859 -r8202
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 7859)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 8202)
@@ -25,9 +25,9 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td valign="top" width="100%">
-			<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+			<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 				<inp2:m_DefineElement name="section_element" icon_module="">
-					<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+					<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 						<td class="subitem_icon">
 							<img src="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon46_list_<inp2:m_param name="icon"/>.gif" border="0" alt="<inp2:m_phrase name="$label"/>" align="absmiddle"/>
 						</td>
@@ -42,7 +42,7 @@
 					</tr>
 				</inp2:m_DefineElement>
 
-				<inp2:m_set odd_even="table_color1"/>
+				<inp2:m_set odd_even="table-color1"/>
 				<inp2:adm_PrintSections block="section_element" section_name="#session#"/>
 			</table>
 		</td>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -r8062 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 8062)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 8202)
@@ -9,7 +9,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_option">
-		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>	
+		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_select">
@@ -54,18 +54,18 @@
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
 				<br><small>[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
-			</inp2:m_if>	
+			</inp2:m_if>
 		</td>
-		
+
 		<td>
 			<inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="element_type" value_list_field="ValueList"/>
 		</td>
-		
+
 		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>
@@ -82,21 +82,21 @@
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
 				<br><small>[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
-			</inp2:m_if>	
+			</inp2:m_if>
 		</td>
-		
+
 		<td>
 			<nobr><inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="element_type" value_list_field="ValueList"/>&nbsp;&nbsp;
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_block2">
 			<inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="element_type" value_list_field="ValueList"/></nobr>
 		</td>
-		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>	
+		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>
Index: branches/unlabeled/unlabeled-1.11.2/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r8107 -r8202
--- branches/unlabeled/unlabeled-1.11.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 8107)
+++ branches/unlabeled/unlabeled-1.11.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 8202)
@@ -18,7 +18,7 @@
 	<table cellpadding="0" cellspacing="0" width="100%">
 		<tr>
 			<td class="tablenav">
-				<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
+				<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
 					<tr>
 						<td class="header_left_bg" nowrap valign="middle">
 							<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
@@ -46,7 +46,7 @@
 			</td>
 		</tr>
 	</table>
-	
+
 </inp2:m_DefineElement>
 
 <inp2:m_block name="section_header"/>
@@ -74,7 +74,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="blue_bar" module="" icon="" pagination="0"/>
-	<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
+	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
 		<tr>
 			<td class="header_left_bg" nowrap width="80%" valign="middle">
 				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/></span>
@@ -124,7 +124,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_label" is_last="" as_label="" currency="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td valign="top"><span class="text"><inp2:$prefix_Field field="$field" as_label="$as_label" currency="$currency"/></span></td>
     	<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
@@ -142,7 +142,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_box" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
 		<td>
 			<input type="text" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" value="<inp2:$prefix_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
@@ -156,7 +156,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_DefineElement name="inp_edit_password" class="" size="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td>
 			<input type="password" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" />
@@ -170,7 +170,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="inp_edit_upload" class="" size="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<input type="file" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>">
@@ -187,7 +187,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_box_ml" class="" size="" maxlength=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span></inp2:m_if>:</span><br>
@@ -208,7 +208,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_date" class="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
@@ -230,7 +230,7 @@
 		<td class="control-cell">
 			<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>">&nbsp;
 			<span class="small">(<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-			
+
 			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date" input_format="1"/>" value="">
 		</td>
 		<td class="error"><inp2:$prefix_Error field="{$field}_time"/>&nbsp;</td>
@@ -241,7 +241,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="inp_edit_date_time" class="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<!-- <input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>"> -->
@@ -260,7 +260,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_textarea" class="" allow_html="allow_html"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
@@ -279,7 +279,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_textarea_ml" class=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
@@ -297,7 +297,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_user" class="" size="" is_last="" old_style="0" onkeyup=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<input type="text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
@@ -326,7 +326,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_options" is_last="" has_empty="0" empty_value=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" onchange="<inp2:m_Param name="onchange"/>">
@@ -353,7 +353,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="" use_phrases="1"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
@@ -370,7 +370,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_checkbox" is_last="" field_class="" onchange="" onclick=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last" NamePrefix="_cb_"/>
 		<td>
 			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>">
@@ -395,7 +395,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_checkboxes" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
@@ -413,7 +413,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_checkbox_allow_html"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="2">
 			<label for="_cb_<inp2:m_param name="field"/>"><inp2:m_phrase label="la_enable_html"/></label>
 			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>">
@@ -427,7 +427,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_weight" subfield="" class="" is_last="" maxlength=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
@@ -450,8 +450,8 @@
 
 
 <inp2:m_DefineElement name="ajax_progress_bar">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-		<tr class="table_color1">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
+		<tr class="table-color1">
 			<td colspan="2">
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 				<!-- progress bar paddings: begin -->
@@ -489,19 +489,19 @@
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 			</td>
 		</tr>
-		<tr class="table_color2">
+		<tr class="table-color2">
 			<td width="50%" align="right"><inp2:m_phrase name="la_fld_PercentsCompleted"/>:</td>
 			<td id="progress_display[percents_completed]">0%</td>
 		</tr>
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="right"><inp2:m_phrase name="la_fld_ElapsedTime"/>:</td>
 			<td id="progress_display[elapsed_time]">00:00</td>
 		</tr>
-		<tr class="table_color2">
+		<tr class="table-color2">
 			<td align="right"><inp2:m_phrase name="la_fld_EstimatedTime"/>:</td>
 			<td id="progress_display[Estimated_time]">00:00</td>
 		</tr>
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="center" colspan="2">
 				<input type="button" class="button" onclick="<inp2:m_param name="cancel_action"/>" value="<inp2:m_phrase name="la_Cancel"/>" />
 			</td>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_export_step2.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 8202)
@@ -6,11 +6,11 @@
 
 <!-- ToolBar --->
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td>
 			<inp2:m_phrase label="la_DownloadLanguageExport"/>
 		<td>
@@ -19,7 +19,7 @@
 		<td class="error">&nbsp;</td>
 	</tr>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="3" align="left">
 			<a href="javascript:submit_event('lang','OnGoBack');"><inp2:m_phrase label="la_Continue"/></a>
 		</td>
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_search_edit.tpl
===================================================================
diff -u -r7856 -r8202
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 7856)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 8202)
@@ -54,7 +54,7 @@
 </table>
 
 <inp2:confs_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 		<inp2:m_ParseBlock name="inp_id_label" prefix="confs" field="SearchConfigId" title="la_fld_SearchConfigId"/>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 8202)
@@ -56,7 +56,7 @@
 
 <inp2:m_ParseBlock name="inp_edit_hidden" prefix="cf" field="Type" db="db"/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 8202)
@@ -31,7 +31,7 @@
 </table>
 
 <inp2:lang_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="emailmessages" field="LanguageId"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="emailmessages" field="EventId"/>
Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r8120 -r8202
--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 8120)
+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 8202)
@@ -27,7 +27,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="grid_pagination" SearchPrefixSpecial="" ajax="0"/>
-<table cellspacing="0" cellpadding="0" width="100%" bgcolor="#E0E0DA" border="0" class="<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>tableborder_full_kernel<inp2:m_else/>pagination_bar<inp2:m_endif/>">
+<table cellspacing="0" cellpadding="0" width="100%" bgcolor="#E0E0DA" border="0" class="<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>bordered<inp2:m_else/>pagination_bar<inp2:m_endif/>">
 	<tbody>
 		<tr id="MY_ID">
 	  	<td>
@@ -49,7 +49,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_DefineElement name="grid_pagination_elem" ajax="0">
-	
+
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_search" ajax="0">
@@ -95,7 +95,7 @@
 
 <inp2:m_block name="grid_column_title" use_phrases="1" ajax="0"/>
 	<td nowrap="nowrap">
-		<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);" class="columntitle_small"><IMG alt="" src="img/list_arrow_<inp2:$PrefixSpecial_order field="$sort_field"/>.gif" border="0" align="absmiddle"><inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if></a>
+		<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"><IMG alt="" src="img/list_arrow_<inp2:$PrefixSpecial_order field="$sort_field"/>.gif" border="0" align="absmiddle"><inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if></a>
 	</td>
 <inp2:m_blockend/>
 
@@ -352,7 +352,7 @@
 	<inp2:m_if check="m_ParamEquals" name="per_page" value="-1" inverse="1">
 		<inp2:m_ParseBlock name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" no_toolbar="$no_toolbar" ajax="$ajax"/>
 	</inp2:m_if>
-	<table width="100%" cellspacing="0" cellpadding="4" class="tableborder">
+	<table width="100%" cellspacing="0" cellpadding="4" class="bordered">
 
 		<inp2:m_if check="m_ParamEquals" name="grid_filters" value="1">
 			<tr class="pagination_bar">
@@ -365,11 +365,11 @@
 		</tr>
 
 		<inp2:m_DefineElement name="_row" td_style="">
-			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
+			<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
 				<inp2:IterateGridFields grid="$grid" mode="data" block="$data_block"/>
 			</tr>
 		</inp2:m_DefineElement>
-		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 		<inp2:$PrefixSpecial_PrintList block="$row_block" per_page="$per_page" main_special="$main_special" />
 
 		<inp2:m_DefineElement name="grid_total_td">
@@ -452,7 +452,7 @@
 	</inp2:m_DefineElement>
 
 	<table width="100%" border="0" cellspacing="2" cellpadding="4">
-		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 		<inp2:$PrefixSpecial_PrintList2 pass_params="true"/>
 	</table>
 
Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/style.css
===================================================================
diff -u -r8120 -r8202
--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/style.css	(.../style.css)	(revision 8120)
+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/style.css	(.../style.css)	(revision 8202)
@@ -332,16 +332,16 @@
 	color: #666666;
 }
 
-.table_color1, .table_color2 {
+.table-color1, .table-color2 {
 	font-family: verdana, arial;
 	font-size: 14px;
 	font-weight: normal;
 	color: #000000;
 	text-decoration: none;
 }
 
-.table_color1 {	background-color: #F6F6F6; }
-.table_color2 {	background-color: #EBEBEB; }
+.table-color1 {	background-color: #F6F6F6; }
+.table-color2 {	background-color: #EBEBEB; }
 
 
 .table_white, .table_white_selected {
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_general.tpl
===================================================================
diff -u -r7856 -r8202
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 7856)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 8202)
@@ -88,7 +88,7 @@
 <inp2:m_include t="incs/config_blocks"/>
 
 <inp2:conf_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" id="config_table">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
 	<!-- module root category selector: begin -->
 	<tr class="subsectiontitle">
 		<td colspan="2">
@@ -99,7 +99,7 @@
    		</td>
 	</tr>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" header_label="la_Text_RootCategory">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" header_label="la_Text_RootCategory">
 		<td>
 			<span class="text"><inp2:m_phrase name="la_prompt_RootCategory" /></span>
 		</td>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_import.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 8202)
@@ -27,7 +27,7 @@
 </tbody>
 </table>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 	<inp2:m_ParseBlock name="inp_edit_upload" prefix="phrases.import" field="LangFile" title="!la_fld_LanguageFile!"/>
Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -r7859 -r8202
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 7859)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 8202)
@@ -85,7 +85,7 @@
 <inp2:m_include t="incs/config_blocks"/>
 
 <inp2:conf_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" id="config_table">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
 	<inp2:conf_PrintList list_name="default" block="config_block" full_block="config_block" half_block1="config_block1" half_block2="config_block2"/>
 </table>
 
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 8202)
@@ -58,7 +58,7 @@
 
 <inp2:lang_SaveWarning name="grid_save_warning"/>
 <div id="scroll_container">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_id_label" prefix="lang" field="LanguageId" title="!la_fld_LanguageId!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="PackName" title="!la_fld_PackName!"/>
@@ -77,7 +77,7 @@
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!" use_phrases="1"/>
 	<inp2:m_if check="lang_IsNewMode">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="label-cell">
 			<inp2:m_phrase name="la_fld_CopyLabels"/>:
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_search.tpl
===================================================================
diff -u -r7856 -r8202
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 7856)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 8202)
@@ -67,7 +67,7 @@
 		</tr>
 	</inp2:m_if>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:Field field="DisplayName" as_label="true" />
 			<inp2:m_if check="m_IsDebugMode">
@@ -87,14 +87,14 @@
    		</td>
 	</tr>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="4">
 			<inp2:m_phrase name="la_prompt_required_field_increase"/>
 			<input type="text" size="3" name="conf[SearchRel_Increase_<inp2:m_param name="module_key" />][VariableValue]" VALUE="<inp2:Field field="SearchRel_Increase_{$module_key}" />">%
 		</td>
 	</tr>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="4">
 			<inp2:m_phrase name="la_prompt_relevence_percent"/>
 			<input type="text" size="3" name="conf[SearchRel_Keyword_<inp2:m_param name="module_key" />][VariableValue]" value="<inp2:Field field="SearchRel_Keyword_{$module_key}" />">% <inp2:Field field="SearchRel_Keyword_{$module_key}_prompt" as_label="1" /> &nbsp;&nbsp;&nbsp;
@@ -110,7 +110,7 @@
 	   		</td>
 		</tr>
 
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<td class="text" width="120"><inp2:Field field="Search_ShowMultiple_{$module_key}_prompt" as_label="1"/></td>
 			<td class="text" colspan="3">
 				<input type="checkbox" name="_cb_conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]" <inp2:Field field="Search_ShowMultiple_{$module_key}" checked="checked" db="db"/> id="_cb_conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]" onclick="update_checkbox(this, document.getElementById('conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]'))" >
@@ -120,12 +120,12 @@
 		</inp2:m_if>
 </inp2:m_DefineElement>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder"<inp2:m_if check="conf_ShowRelevance"> style="border-bottom-width: 0px;"</inp2:m_if>>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered"<inp2:m_if check="conf_ShowRelevance"> style="border-bottom-width: 0px;"</inp2:m_if>>
 	<inp2:confs_PrintList render_as="confs_detail_row" />
 </table>
 
 <inp2:m_if check="conf_ShowRelevance">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:conf_PrintConfList block="config_values" />
 </table>
 </inp2:m_if>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_import_step2.tpl
===================================================================
diff -u -r7698 -r8202
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_import_step2.tpl	(.../languages_import_step2.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/regional/languages_import_step2.tpl	(.../languages_import_step2.tpl)	(revision 8202)
@@ -4,13 +4,13 @@
 
 <inp2:m_ParseBlock name="blue_bar" prefix="lang" title_preset="import_language_step2" module="in-portal" icon="icon46_conf_regional"/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="$title"/>
 
 	<tr>
 		<td align="middle">
 			<br />
-			<table class="tableborder_full" width="75%">
+			<table class="bordered-no-bottom" width="75%">
 				<tr border="1">
 					<td width="<inp2:m_param name="percent_done"/>%" class="progress_bar">&nbsp;</td>
 					<td bgcolor=#FFFFFF width="<inp2:m_param name="percent_left"/>%"></td>