Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 1011)
+++ trunk/CHANGELOG	(revision 1012)
@@ -12,6 +12,7 @@
 
 ------------------------------------- 2.8.0 -------------------------------------
 25-June-2009 Matthias Gallas
+#	Major fixes on backend to get XHTML valid output (Thanks to Luisehahne)
 +	Added option to use also MYSQL_ASSOC and MYSQL_NUM with mysql_fetch_array
 	(Thanks to Luisehahne)
 #	Bugfix for Error-Level settings (Thanks to Luisehahne)
Index: trunk/wb/admin/groups/groups.php
===================================================================
--- trunk/wb/admin/groups/groups.php	(revision 1011)
+++ trunk/wb/admin/groups/groups.php	(revision 1012)
@@ -66,19 +66,19 @@
 		$template->set_var('DISPLAY_ADVANCED', '');
 		$template->set_var('DISPLAY_BASIC', 'none');
 		$template->set_var('ADVANCED', 'yes');
-		$template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']);
+		$template->set_var('ADVANCED_BUTTON', '&lt;&lt; '.$TEXT['HIDE_ADVANCED']);
 	} else {
 		$template->set_var('DISPLAY_ADVANCED', 'none');
 		$template->set_var('DISPLAY_BASIC', '');
 		$template->set_var('ADVANCED', 'no');
-		$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>');
+		$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].'  &gt;&gt;');
 	}
-	
+
 	// Explode system permissions
 	$system_permissions = explode(',', $group['system_permissions']);
 	// Check system permissions boxes
 	foreach($system_permissions AS $name) {
-			$template->set_var($name.'_checked', 'checked');
+			$template->set_var($name.'_checked', ' checked="checked"');
 	}
 	// Explode module permissions
 	$module_permissions = explode(',', $group['module_permissions']);
@@ -93,7 +93,7 @@
 			$template->set_var('VALUE', $addon['directory']);
 			$template->set_var('NAME', $addon['name']);
 			if(!is_numeric(array_search($addon['directory'], $module_permissions))) {
-				$template->set_var('CHECKED', 'checked');
+				$template->set_var('CHECKED', ' checked="checked"');
 			} else {
 				$template->set_var('CHECKED', '');
 			}
@@ -109,7 +109,7 @@
 			$template->set_var('VALUE', $addon['directory']);
 			$template->set_var('NAME', $addon['name']);
 			if(!is_numeric(array_search($addon['directory'], $template_permissions))) {
-				$template->set_var('CHECKED', 'checked');
+				$template->set_var('CHECKED', ' checked="checked"');
 			} else {
 				$template->set_var('CHECKED', '');
 			}
Index: trunk/wb/admin/groups/index.php
===================================================================
--- trunk/wb/admin/groups/index.php	(revision 1011)
+++ trunk/wb/admin/groups/index.php	(revision 1012)
@@ -179,7 +179,7 @@
 								'TEXT_BASIC' => $TEXT['BASIC'],
 								'TEXT_ADVANCED' => $TEXT['ADVANCED'],
 								'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
-								'CHECKED' => 'checked'
+								'CHECKED' => ' checked="checked"',
 								)
 						);
 
Index: trunk/wb/admin/pages/settings.php
===================================================================
--- trunk/wb/admin/pages/settings.php	(revision 1011)
+++ trunk/wb/admin/pages/settings.php	(revision 1012)
@@ -314,7 +314,7 @@
 $template->set_block('main_block', 'page_list_block2', 'page_list2');
 if($admin->get_permission('pages_add_l0') == true OR $results_array['level'] == 0) {
 	if($results_array['parent'] == 0) {
-		$selected = ' selected';
+		$selected = ' selected="selected"';
 	} else { 
 		$selected = '';
 	}
Index: trunk/wb/admin/settings/index.php
===================================================================
--- trunk/wb/admin/settings/index.php	(revision 1011)
+++ trunk/wb/admin/settings/index.php	(revision 1012)
@@ -106,14 +106,14 @@
 if(isset($_GET['advanced']) AND $_GET['advanced'] == 'yes') {
 	$template->set_var('DISPLAY_ADVANCED', '');
 	$template->set_var('ADVANCED', 'yes');
-	$template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']);
+	$template->set_var('ADVANCED_BUTTON', '&lt;&lt; '.$TEXT['HIDE_ADVANCED']);
 	$template->set_var('ADVANCED_LINK', 'index.php?advanced=no');
 	$template->set_var('BASIC_FILE_PERMS_ID', 'hide');
 	$template->set_var('ADVANCED_FILE_PERMS_ID', 'file_perms_box');
 } else {
-	$template->set_var('DISPLAY_ADVANCED', 'none');
+	$template->set_var('DISPLAY_ADVANCED', ' style="display: none;"');
 	$template->set_var('ADVANCED', 'no');
-	$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>');
+	$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' &gt;&gt;');
 	$template->set_var('ADVANCED_LINK', 'index.php?advanced=yes');
 	$template->set_var('BASIC_FILE_PERMS_ID', 'file_perms_box');
 	$template->set_var('ADVANCED_FILE_PERMS_ID', 'hide');
@@ -150,11 +150,12 @@
 		// Insert code and name
 		$template->set_var(array(
 								'CODE' => $l_codes[$l_name],
-								'NAME' => $l_name
+								'NAME' => $l_name,
+								'FLAG' => THEME_URL.'/images/flags/'.strtolower($l_codes[$l_name]),
 								));
 		// Check if it is selected
 		if(DEFAULT_LANGUAGE == $l_codes[$l_name]) {
-			$template->set_var('SELECTED', ' selected');
+			$template->set_var('SELECTED', ' selected="selected"');
 		} else {
 			$template->set_var('SELECTED', '');
 		}
@@ -171,7 +172,7 @@
 		$template->set_var('VALUE', $hour_offset);
 		$template->set_var('NAME', $title);
 		if(DEFAULT_TIMEZONE == $hour_offset*60*60) {
-			$template->set_var('SELECTED', 'selected');
+			$template->set_var('SELECTED', ' selected="selected"');
 		} else {
 			$template->set_var('SELECTED', '');
 		}
@@ -186,7 +187,7 @@
 	$template->set_var('VALUE', $code);
 	$template->set_var('NAME', $title);
 	if(DEFAULT_CHARSET == $code) {
-		$template->set_var('SELECTED', 'selected');
+		$template->set_var('SELECTED', ' selected="selected"');
 	} else {
 		$template->set_var('SELECTED', '');
 	}
@@ -205,7 +206,7 @@
 	}
 	$template->set_var('NAME', $title);
 	if(DEFAULT_DATE_FORMAT == $format) {
-		$template->set_var('SELECTED', 'selected');
+		$template->set_var('SELECTED', ' selected="selected"');
 	} else {
 		$template->set_var('SELECTED', '');
 	}
@@ -224,7 +225,7 @@
 	}
 	$template->set_var('NAME', $title);
 	if(DEFAULT_TIME_FORMAT == $format) {
-		$template->set_var('SELECTED', 'selected');
+		$template->set_var('SELECTED', ' selected="selected"');
 	} else {
 		$template->set_var('SELECTED', '');
 	}
@@ -238,7 +239,7 @@
 	while($addon = $result->fetchRow()) {
 		$template->set_var('FILE', $addon['directory']);
 		$template->set_var('NAME', $addon['name']);
-		if(($addon['directory'] == DEFAULT_TEMPLATE) ? $selected = ' selected' : $selected = '');
+		if(($addon['directory'] == DEFAULT_TEMPLATE) ? $selected = ' selected="selected"' : $selected = '');
 		$template->set_var('SELECTED', $selected);
 		$template->parse('template_list', 'template_list_block', true);
 	}
@@ -251,7 +252,7 @@
 	while($addon = $result->fetchRow()) {
 		$template->set_var('FILE', $addon['directory']);
 		$template->set_var('NAME', $addon['name']);
-		if(($addon['directory'] == DEFAULT_THEME) ? $selected = ' selected' : $selected = '');
+		if(($addon['directory'] == DEFAULT_THEME) ? $selected = ' selected="selected"' : $selected = '');
 		$template->set_var('SELECTED', $selected);
 		$template->parse('theme_list', 'theme_list_block', true);
 	}
@@ -263,8 +264,8 @@
 $module_name=$TEXT['NONE'];  
 $template->set_var('FILE', $file);  
 $template->set_var('NAME', $module_name);  
-if((!defined('WYSIWYG_EDITOR') OR $file == WYSIWYG_EDITOR) ? $selected = ' selected' : $selected = '');  
-$template->set_var('SELECTED', $selected);  
+if((!defined('WYSIWYG_EDITOR') OR $file == WYSIWYG_EDITOR) ? $selected = ' selected="selected"' : $selected = '');
+$template->set_var('SELECTED', $selected);
 $template->parse('editor_list', 'editor_list_block', true);  
 $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'wysiwyg'");
 if($result->numRows() > 0) {
@@ -271,7 +272,7 @@
 	while($addon = $result->fetchRow()) {
 		$template->set_var('FILE', $addon['directory']);
 		$template->set_var('NAME', $addon['name']);
-		if((defined('WYSIWYG_EDITOR') AND $addon['directory'] == WYSIWYG_EDITOR) ? $selected = ' selected' : $selected = '');
+		if((defined('WYSIWYG_EDITOR') AND $addon['directory'] == WYSIWYG_EDITOR) ? $selected = ' selected="selected"' : $selected = '');
 		$template->set_var('SELECTED', $selected);
 		$template->parse('editor_list', 'editor_list_block', true);
 	}
@@ -279,7 +280,7 @@
 
 // Insert templates for search settings
 $template->set_block('main_block', 'search_template_list_block', 'search_template_list');
-if($search_template == '') { $selected = ' selected'; } else { $selected = ''; }
+if($search_template == '') { $selected = ' selected="selected"'; } else { $selected = ''; }
 $template->set_var(array('FILE' => '', 'NAME' => $TEXT['SYSTEM_DEFAULT'], 'SELECTED' => $selected));
 $template->parse('search_template_list', 'search_template_list_block', true);
 $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' order by name");
@@ -287,7 +288,7 @@
 	while($addon = $result->fetchRow()) {
 		$template->set_var('FILE', $addon['directory']);
 		$template->set_var('NAME', $addon['name']);
-		if($addon['directory'] == $search_template ? $selected = ' selected' : $selected = '');
+		if($addon['directory'] == $search_template ? $selected = ' selected="selected"' : $selected = '');
 		$template->set_var('SELECTED', $selected);
 		$template->parse('search_template_list', 'search_template_list_block', true);
 	}
@@ -300,7 +301,7 @@
 	$template->set_var('VALUE', $value);
 	$template->set_var('NAME', $title);
 	if(ER_LEVEL == $value) {
-		$template->set_var('SELECTED', 'selected');
+		$template->set_var('SELECTED', ' selected="selected"');
 	} else {
 		$template->set_var('SELECTED', '');
 	}
@@ -317,7 +318,7 @@
 for($i = 1; $i <= 10; $i++) {
 	$template->set_var('NUMBER', $i);
 	if(PAGE_LEVEL_LIMIT == $i) {
-		$template->set_var('SELECTED', 'selected');
+		$template->set_var('SELECTED', ' selected="selected"');
 	} else {
 		$template->set_var('SELECTED', '');
 	}
@@ -326,23 +327,23 @@
 
 // Work-out if multiple menus feature is enabled
 if(defined('MULTIPLE_MENUS') AND MULTIPLE_MENUS == true) {
-	$template->set_var('MULTIPLE_MENUS_ENABLED', ' checked');
+	$template->set_var('MULTIPLE_MENUS_ENABLED', ' checked="checked"');
 } else {
-	$template->set_var('MULTIPLE_MENUS_DISABLED', ' checked');
+	$template->set_var('MULTIPLE_MENUS_DISABLED', ' checked="checked"');
 }
 
 // Work-out if page languages feature is enabled
 if(defined('PAGE_LANGUAGES') AND PAGE_LANGUAGES == true) {
-        $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked');
+        $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked="checked"');
 } else {
-        $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked');
+        $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"');
 }
 
 // Work-out if smart login feature is enabled
 if(defined('SMART_LOGIN') AND SMART_LOGIN == true) {
-	$template->set_var('SMART_LOGIN_ENABLED', ' checked');
+	$template->set_var('SMART_LOGIN_ENABLED', ' checked="checked"');
 } else {
-	$template->set_var('SMART_LOGIN_DISABLED', ' checked');
+	$template->set_var('SMART_LOGIN_DISABLED', ' checked="checked"');
 }
 
 if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */
@@ -353,45 +354,45 @@
 
 // Work-out if section blocks feature is enabled
 if(defined('SECTION_BLOCKS') AND SECTION_BLOCKS == true) {
-	$template->set_var('SECTION_BLOCKS_ENABLED', ' checked');
+	$template->set_var('SECTION_BLOCKS_ENABLED', ' checked="checked"');
 } else {
-	$template->set_var('SECTION_BLOCKS_DISABLED', ' checked');
+	$template->set_var('SECTION_BLOCKS_DISABLED', ' checked="checked"');
 }
 
 // Work-out if homepage redirection feature is enabled
 if(defined('HOMEPAGE_REDIRECTION') AND HOMEPAGE_REDIRECTION == true) {
-	$template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked');
+	$template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked="checked"');
 } else {
-	$template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked');
+	$template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked="checked"');
 }
 
 // Work-out which server os should be checked
 if(OPERATING_SYSTEM == 'linux') {
-	$template->set_var('LINUX_SELECTED', ' checked');
+	$template->set_var('LINUX_SELECTED', ' checked="checked"');
 } elseif(OPERATING_SYSTEM == 'windows') {
-	$template->set_var('WINDOWS_SELECTED', ' checked');
+	$template->set_var('WINDOWS_SELECTED', ' checked="checked"');
 }
 
 // Work-out if manage sections feature is enabled
 if(MANAGE_SECTIONS) {
-	$template->set_var('MANAGE_SECTIONS_ENABLED', ' checked');
+	$template->set_var('MANAGE_SECTIONS_ENABLED', ' checked="checked"');
 } else {
-	$template->set_var('MANAGE_SECTIONS_DISABLED', ' checked');
+	$template->set_var('MANAGE_SECTIONS_DISABLED', ' checked="checked"');
 }
 
 // Work-out which wbmailer routine should be checked
 if(WBMAILER_ROUTINE == 'phpmail') {
-	$template->set_var('PHPMAIL_SELECTED', ' checked');
+	$template->set_var('PHPMAIL_SELECTED', ' checked="checked"');
 	$template->set_var('SMTP_VISIBILITY', 'none');
 	$template->set_var('SMTP_VISIBILITY_AUTH', 'none');
 } elseif(WBMAILER_ROUTINE == 'smtp') {
-	$template->set_var('SMTPMAIL_SELECTED', ' checked');
+	$template->set_var('SMTPMAIL_SELECTED', ' checked="checked"');
 	$template->set_var('SMTP_VISIBILITY', '');
 }
 
 // Work-out if SMTP authentification should be checked
 if(WBMAILER_SMTP_AUTH) {
-	$template->set_var('SMTP_AUTH_SELECTED', ' checked');
+	$template->set_var('SMTP_AUTH_SELECTED', ' checked="checked"');
 	if(WBMAILER_ROUTINE == 'smtp') {
 		$template->set_var('SMTP_VISIBILITY_AUTH', '');
 	} else {
@@ -403,106 +404,106 @@
 
 // Work-out if intro feature is enabled
 if(INTRO_PAGE) {
-	$template->set_var('INTRO_PAGE_ENABLED', ' checked');
+	$template->set_var('INTRO_PAGE_ENABLED', ' checked="checked"');
 } else {
-	$template->set_var('INTRO_PAGE_DISABLED', ' checked');
+	$template->set_var('INTRO_PAGE_DISABLED', ' checked="checked"');
 }
 
 // Work-out if frontend login feature is enabled
 if(FRONTEND_LOGIN) {
-	$template->set_var('PRIVATE_ENABLED', ' checked');
+	$template->set_var('PRIVATE_ENABLED', ' checked="checked"');
 } else {
-	$template->set_var('PRIVATE_DISABLED', ' checked');
+	$template->set_var('PRIVATE_DISABLED', ' checked="checked"');
 }
 
 // Work-out if page trash feature is disabled, in-line, or separate
 if(PAGE_TRASH == 'disabled') {
-	$template->set_var('PAGE_TRASH_DISABLED', ' checked');
+	$template->set_var('PAGE_TRASH_DISABLED', ' checked="checked"');
 	$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', ' display: none;');
 } elseif(PAGE_TRASH == 'inline') {
-	$template->set_var('PAGE_TRASH_INLINE', ' checked');
+	$template->set_var('PAGE_TRASH_INLINE', ' checked="checked"');
 	$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', ' display: none;');
 } elseif(PAGE_TRASH == 'separate') {
-	$template->set_var('PAGE_TRASH_SEPARATE', ' checked');
+	$template->set_var('PAGE_TRASH_SEPARATE', ' checked="checked"');
 	$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', ' display: inline;');
 }
 
 // Work-out if media home folde feature is enabled
 if(HOME_FOLDERS) {
-	$template->set_var('HOME_FOLDERS_ENABLED', ' checked');
+	$template->set_var('HOME_FOLDERS_ENABLED', ' checked="checked"');
 } else {
-	$template->set_var('HOME_FOLDERS_DISABLED', ' checked');
+	$template->set_var('HOME_FOLDERS_DISABLED', ' checked="checked"');
 }
 
 // Insert search select
 if(SEARCH == 'private') {
-	$template->set_var('PRIVATE_SEARCH', 'selected');
+	$template->set_var('PRIVATE_SEARCH', ' selected="selected"');
 } elseif(SEARCH == 'registered') {
-	$template->set_var('REGISTERED_SEARCH', 'selected');
+	$template->set_var('REGISTERED_SEARCH', ' selected="selected"');
 } elseif(SEARCH == 'none') {
-	$template->set_var('NONE_SEARCH', 'selected');
+	$template->set_var('NONE_SEARCH', ' selected="selected"');
 }
 
 // Work-out if 777 permissions are set
 if(STRING_FILE_MODE == '0777' AND STRING_DIR_MODE == '0777') {
-	$template->set_var('WORLD_WRITEABLE_SELECTED', ' checked');
+	$template->set_var('WORLD_WRITEABLE_SELECTED', ' checked="checked"');
 }
 
 // Work-out which file mode boxes are checked
 if(extract_permission(STRING_FILE_MODE, 'u', 'r')) {
-	$template->set_var('FILE_U_R_CHECKED', 'checked');
+	$template->set_var('FILE_U_R_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_FILE_MODE, 'u', 'w')) {
-	$template->set_var('FILE_U_W_CHECKED', 'checked');
+	$template->set_var('FILE_U_W_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_FILE_MODE, 'u', 'e')) {
-	$template->set_var('FILE_U_E_CHECKED', 'checked');
+	$template->set_var('FILE_U_E_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_FILE_MODE, 'g', 'r')) {
-	$template->set_var('FILE_G_R_CHECKED', 'checked');
+	$template->set_var('FILE_G_R_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_FILE_MODE, 'g', 'w')) {
-	$template->set_var('FILE_G_W_CHECKED', 'checked');
+	$template->set_var('FILE_G_W_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_FILE_MODE, 'g', 'e')) {
-	$template->set_var('FILE_G_E_CHECKED', 'checked');
+	$template->set_var('FILE_G_E_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_FILE_MODE, 'o', 'r')) {
-	$template->set_var('FILE_O_R_CHECKED', 'checked');
+	$template->set_var('FILE_O_R_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_FILE_MODE, 'o', 'w')) {
-	$template->set_var('FILE_O_W_CHECKED', 'checked');
+	$template->set_var('FILE_O_W_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_FILE_MODE, 'o', 'e')) {
-	$template->set_var('FILE_O_E_CHECKED', 'checked');
+	$template->set_var('FILE_O_E_CHECKED', ' checked="checked"');
 }
 // Work-out which dir mode boxes are checked
 if(extract_permission(STRING_DIR_MODE, 'u', 'r')) {
-	$template->set_var('DIR_U_R_CHECKED', 'checked');
+	$template->set_var('DIR_U_R_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_DIR_MODE, 'u', 'w')) {
-	$template->set_var('DIR_U_W_CHECKED', 'checked');
+	$template->set_var('DIR_U_W_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_DIR_MODE, 'u', 'e')) {
-	$template->set_var('DIR_U_E_CHECKED', 'checked');
+	$template->set_var('DIR_U_E_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_DIR_MODE, 'g', 'r')) {
-	$template->set_var('DIR_G_R_CHECKED', 'checked');
+	$template->set_var('DIR_G_R_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_DIR_MODE, 'g', 'w')) {
-	$template->set_var('DIR_G_W_CHECKED', 'checked');
+	$template->set_var('DIR_G_W_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_DIR_MODE, 'g', 'e')) {
-	$template->set_var('DIR_G_E_CHECKED', 'checked');
+	$template->set_var('DIR_G_E_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_DIR_MODE, 'o', 'r')) {
-	$template->set_var('DIR_O_R_CHECKED', 'checked');
+	$template->set_var('DIR_O_R_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_DIR_MODE, 'o', 'w')) {
-	$template->set_var('DIR_O_W_CHECKED', 'checked');
+	$template->set_var('DIR_O_W_CHECKED', ' checked="checked"');
 }
 if(extract_permission(STRING_DIR_MODE, 'o', 'e')) {
-	$template->set_var('DIR_O_E_CHECKED', 'checked');
+	$template->set_var('DIR_O_E_CHECKED', ' checked="checked"');
 }
 
 // Insert Server Email value into template
@@ -516,7 +517,7 @@
 		$template->set_var('ID', $group['group_id']);
 		$template->set_var('NAME', $group['name']);
 		if(FRONTEND_SIGNUP == $group['group_id']) {
-			$template->set_var('SELECTED', 'selected');
+			$template->set_var('SELECTED', ' selected="selected"');
 		} else {
 			$template->set_var('SELECTED', '');
 		}
Index: trunk/wb/admin/users/users.php
===================================================================
--- trunk/wb/admin/users/users.php	(revision 1011)
+++ trunk/wb/admin/users/users.php	(revision 1012)
@@ -62,9 +62,9 @@
 										)
 							);
 	if($user['active'] == 1) {
-		$template->set_var('ACTIVE_CHECKED', ' checked');
+		$template->set_var('ACTIVE_CHECKED', ' checked="checked"');
 	} else {
-		$template->set_var('DISABLED_CHECKED', ' checked');
+		$template->set_var('DISABLED_CHECKED', ' checked="checked"');
 	}
 	// Add groups to list
 	$template->set_block('main_block', 'group_list_block', 'group_list');
@@ -78,7 +78,7 @@
 			$template->set_var('ID', $group['group_id']);
 			$template->set_var('NAME', $group['name']);
 			if(in_array($group['group_id'], split(",",$user['groups_id']))) {
-				$template->set_var('SELECTED', 'selected');
+				$template->set_var('SELECTED', ' selected="selected"');
 			} else {
 				$template->set_var('SELECTED', '');
 			}
@@ -99,7 +99,7 @@
 		}
 
 		if($in_group) {
-			$template->set_var('SELECTED', 'selected');
+			$template->set_var('SELECTED', ' selected="selected"');
 		} else {
 			$template->set_var('SELECTED', '');
 		}
@@ -108,10 +108,10 @@
 		if($results->numRows() == 0) {
 			$template->set_var('ID', '');
 			$template->set_var('NAME', $TEXT['NONE_FOUND']);
-			$template->set_var('SELECTED', 'selected');
+			$template->set_var('SELECTED', ' selected="selected"');
 			$template->parse('group_list', 'group_list_block', true);
 		}
-	}	
+	}
 	
 	// Generate username field name
 	$username_fieldname = 'username_';
@@ -139,7 +139,7 @@
 		$template->set_var('NAME', str_replace(WB_PATH, '', $name));
 		$template->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name));
 		if($user['home_folder'] == str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)) {
-			$template->set_var('SELECTED', ' selected');
+			$template->set_var('SELECTED', ' selected="selected"');
 		} else {
 			$template->set_var('SELECTED', ' ');
 		}
Index: trunk/wb/admin/users/index.php
===================================================================
--- trunk/wb/admin/users/index.php	(revision 1011)
+++ trunk/wb/admin/users/index.php	(revision 1012)
@@ -95,7 +95,7 @@
 $template->set_file('page', 'users_form.htt');
 $template->set_block('page', 'main_block', 'main');
 $template->set_var('DISPLAY_EXTRA', 'none');
-$template->set_var('ACTIVE_CHECKED', 'checked');
+$template->set_var('ACTIVE_CHECKED', ' checked="checked"');
 $template->set_var('ACTION_URL', ADMIN_URL.'/users/add.php');
 $template->set_var('SUBMIT_TITLE', $TEXT['ADD']);
 
@@ -105,7 +105,7 @@
 if($results->numRows() > 0) {
 	$template->set_var('ID', '');
 	$template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
-	$template->set_var('SELECTED', 'selected');
+	$template->set_var('SELECTED', ' selected="selected"');
 	$template->parse('group_list', 'group_list_block', true);
 	while($group = $results->fetchRow()) {
 		$template->set_var('ID', $group['group_id']);
Index: trunk/wb/admin/preferences/index.php
===================================================================
--- trunk/wb/admin/preferences/index.php	(revision 1011)
+++ trunk/wb/admin/preferences/index.php	(revision 1012)
@@ -60,11 +60,12 @@
 		// Insert code and name
 		$template->set_var(array(
 								'CODE' => $l_codes[$l_name],
-								'NAME' => $l_name
+								'NAME' => $l_name,
+								'FLAG' => THEME_URL.'/images/flags/'.strtolower($l_codes[$l_name]),
 								));
 		// Check if it is selected
 		if(LANGUAGE == $l_codes[$l_name]) {
-			$template->set_var('SELECTED', ' selected');
+			$template->set_var('SELECTED', ' selected="selected"');
 		} else {
 			$template->set_var('SELECTED', '');
 		}
@@ -79,7 +80,7 @@
 	$template->set_var('VALUE', $hour_offset);
 	$template->set_var('NAME', $title);
 	if($admin->get_timezone() == $hour_offset*60*60) {
-		$template->set_var('SELECTED', 'selected');
+		$template->set_var('SELECTED', ' selected="selected"');
 	} else {
 		$template->set_var('SELECTED', '');
 	}
@@ -99,9 +100,9 @@
 	}
 	$template->set_var('NAME', $title);
 	if(DATE_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
-		$template->set_var('SELECTED', 'selected');
+		$template->set_var('SELECTED', ' selected="selected"');
 	} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
-		$template->set_var('SELECTED', 'selected');
+		$template->set_var('SELECTED', ' selected="selected"');
 	} else {
 		$template->set_var('SELECTED', '');
 	}
@@ -120,7 +121,7 @@
 	}
 	$template->set_var('NAME', $title);
 	if(TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
-		$template->set_var('SELECTED', 'selected');
+		$template->set_var('SELECTED', ' selected="selected"');
 	} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
 		$template->set_var('SELECTED', 'selected');
 	} else {
Index: trunk/wb/templates/classic/templates/users_form.htt
===================================================================
--- trunk/wb/templates/classic/templates/users_form.htt	(revision 1011)
+++ trunk/wb/templates/classic/templates/users_form.htt	(revision 1012)
@@ -64,7 +64,7 @@
 <tr>
 	<td>{TEXT_GROUP}:</td>
 	<td class="value_input">
-		<select name="groups[]" multiple size=5>
+		<select name="groups[]" multiple="multiple" size="5">
 		<!-- BEGIN group_list_block -->
 			<option value="{ID}" {SELECTED}>{NAME}</option>
 		<!-- END group_list_block -->
Index: trunk/wb/templates/classic/templates/header.htt
===================================================================
--- trunk/wb/templates/classic/templates/header.htt	(revision 1011)
+++ trunk/wb/templates/classic/templates/header.htt	(revision 1012)
@@ -5,13 +5,13 @@
 <title>{WEBSITE_TITLE} >> {TEXT_ADMINISTRATION} - {SECTION_NAME}</title>
 <meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
 <link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
-<link href="{WB_URL}/include/jquery//jquery-ui.css" rel="stylesheet" type="text/css" />
+<link href="{WB_URL}/include/jquery/jquery-ui.css" rel="stylesheet" type="text/css" />
 {BACKEND_MODULE_CSS}
-<script src="{WB_URL}/include/editarea/edit_area_full.js" type="text/javascript"></script>
+<script type="text/javascript" src="{WB_URL}/include/editarea/edit_area_full.js"></script>
 <script language="javascript" type="text/javascript">
-   function confirm_link(message, url) {
-	  if(confirm(message)) location.href = url;
-	    }
+function confirm_link(message, url) {
+	if(confirm(message)) location.href = url;
+}
 </script>
 </head>
 <body>
Index: trunk/wb/templates/classic/templates/footer.htt
===================================================================
--- trunk/wb/templates/classic/templates/footer.htt	(revision 1011)
+++ trunk/wb/templates/classic/templates/footer.htt	(revision 1012)
@@ -14,15 +14,12 @@
 	</td>
 </tr>
 </table>
+
 <script src="{WB_URL}/include/jquery/jquery-min.js" type="text/javascript"></script>
 <script src="{WB_URL}/include/jquery/jquery-insert.js" type="text/javascript"></script>
 <!--[if lt IE 7]><script type="text/javascript" src="{WB_URL}/include/unitpngfix/unitpngfix.js"></script><![endif]-->
 <script language="javascript" type="text/javascript">
 
-        if($("a[rel^='lightbox']").length) {
-            $.insert("{THEME_URL}/css/jquery-slimbox2.css");
-            $.insert("{WB_URL}/include/jquery/plugins/jquery-slimbox2-min.js");
-          }
 
         if($(".jcalendar").length) {
             $.insert("{WB_URL}/include/jscalendar/calendar-system.css");
@@ -32,10 +29,13 @@
             $.insert("{WB_URL}/modules/jsadmin/backend.css");
           }
 
+        if($("a[rel^='lightbox']").length) {
+            $.insert("{THEME_URL}/css/jquery-slimbox2.css");
+            $.insert("{WB_URL}/include/jquery/plugins/jquery-slimbox2-min.js");
+          }
 
 </script>
 {JS_THEME_INC_PHP}
-
 </body>
 </html>
 <!-- END footer_block -->
\ No newline at end of file
Index: trunk/wb/templates/classic/templates/settings.htt
===================================================================
--- trunk/wb/templates/classic/templates/settings.htt	(revision 1011)
+++ trunk/wb/templates/classic/templates/settings.htt	(revision 1012)
@@ -1,57 +1,5 @@
-</div><!-- BEGIN main_block -->
+<!-- BEGIN main_block -->
 
-<script language="javascript" type="text/javascript">
-function change_os(type) {
-	if(type == 'linux') {
-		document.getElementById('file_perms_box1').style.display = 'block';
-		document.getElementById('file_perms_box2').style.display = 'block';
-		document.getElementById('file_perms_box3').style.display = 'block';
-	} else if(type == 'windows') {
-		document.getElementById('file_perms_box1').style.display = 'none';
-		document.getElementById('file_perms_box2').style.display = 'none';
-		document.getElementById('file_perms_box3').style.display = 'none';
-	}
-}
-
-function change_wbmailer(type) {
-	if(type == 'smtp') {
-		document.getElementById('row_wbmailer_smtp_settings').style.display = '';
-		document.getElementById('row_wbmailer_smtp_host').style.display = '';
-		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = '';
-		document.getElementById('row_wbmailer_smtp_username').style.display = '';
-		document.getElementById('row_wbmailer_smtp_password').style.display = '';
-		if( document.settings.wbmailer_smtp_auth.checked == true ) {
-			document.getElementById('row_wbmailer_smtp_username').style.display = '';
-			document.getElementById('row_wbmailer_smtp_password').style.display = '';
-		} else {
-			document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
-			document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
-		}
-	} else if(type == 'phpmail') {
-		document.getElementById('row_wbmailer_smtp_settings').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_host').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
-	}
-}
-
-function toggle_wbmailer_auth() {
-	if( document.settings.wbmailer_smtp_auth.checked == true ) {
-		document.getElementById('row_wbmailer_smtp_username').style.display = '';
-		document.getElementById('row_wbmailer_smtp_password').style.display = '';
-	} else {
-		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
-	}
-}
-</script>
-
-<style>
-.advanced {
-	display: {DISPLAY_ADVANCED};
-</style>
-
 <form name="settings" action="save.php" method="post">
 <input type="hidden" name="advanced" value="{ADVANCED}" />
 
@@ -66,35 +14,32 @@
 	<td class="setting_value" colspan="2">
 		<input type="text" name="website_title" value="{WEBSITE_TITLE}" />
 	</td>
-	<script language="javascript" type="text/javascript">
-	document.settings.website_title.focus();
-	</script>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_DESCRIPTION}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="website_description">{WEBSITE_DESCRIPTION}</textarea>
+		<textarea name="website_description" cols="50" rows="3">{WEBSITE_DESCRIPTION}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_KEYWORDS}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="website_keywords">{WEBSITE_KEYWORDS}</textarea>
+		<textarea name="website_keywords" cols="50" rows="3" >{WEBSITE_KEYWORDS}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_HEADER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="website_header">{WEBSITE_HEADER}</textarea>
+		<textarea name="website_header" cols="50" rows="3">{WEBSITE_HEADER}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="website_footer">{WEBSITE_FOOTER}</textarea>
+		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="page_level_limit">
@@ -117,7 +62,7 @@
 		</div>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
         <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
         <td class="setting_value" colspan="2">
                 <input type="radio" name="page_languages" id="page_languages_true" style="width: 14px; height: 14px;" value="true"{PAGE_LANGUAGES_ENABLED} />
@@ -126,7 +71,7 @@
                 <label for="page_languages_false">{TEXT_DISABLED}</label>
 		</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MULTIPLE_MENUS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="multiple_menus" id="multiple_menus_true" style="width: 14px; height: 14px;" value="true"{MULTIPLE_MENUS_ENABLED} />
@@ -144,7 +89,7 @@
 		<label for="home_folders_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="manage_sections" id="manage_sections_true" style="width: 14px; height: 14px;" value="true"{MANAGE_SECTIONS_ENABLED} />
@@ -153,7 +98,7 @@
 		<label for="manage_sections_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SECTION_BLOCKS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="section_blocks" id="section_blocks_true" style="width: 14px; height: 14px;" value="true"{SECTION_BLOCKS_ENABLED} />
@@ -171,7 +116,7 @@
 		<label for="intro_page_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="homepage_redirection" id="homepage_redirection_true" style="width: 14px; height: 14px;" value="true"{HOMEPAGE_REDIRECTION_ENABLED} />
@@ -180,7 +125,7 @@
 		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SMART_LOGIN}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} />
@@ -198,7 +143,7 @@
 		<label for="frontend_login_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" />
@@ -215,7 +160,7 @@
 		</select>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="er_level">
@@ -226,13 +171,13 @@
 		</select>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="wysiwyg_editor">
@@ -249,7 +194,7 @@
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
 	<td style="text-align: right;">
-		<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
 <tr>
@@ -262,12 +207,12 @@
 	<td class="setting_value" colspan="2">
 		<select name="default_language">
 			<!-- BEGIN language_list_block -->
-			<option value="{CODE}"{SELECTED}>{NAME} ({CODE})</option>
+			<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
 			<!-- END language_list_block -->
 		</select>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_CHARSET}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="default_charset">
@@ -338,7 +283,7 @@
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
 	<td style="text-align: right;">
-		<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
 <tr>
@@ -367,55 +312,55 @@
 		</select>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HEADER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_header" style="height: 100px;">{SEARCH_HEADER}</textarea>
+		<textarea name="search_header" style="height: 100px;" cols="50" rows="3">{SEARCH_HEADER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_HEADER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_results_header">{SEARCH_RESULTS_HEADER}</textarea>
+		<textarea name="search_results_header" cols="50" rows="3">{SEARCH_RESULTS_HEADER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_LOOP}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_results_loop">{SEARCH_RESULTS_LOOP}</textarea>
+		<textarea name="search_results_loop" cols="50" rows="3">{SEARCH_RESULTS_LOOP}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_results_footer">{SEARCH_RESULTS_FOOTER}</textarea>
+		<textarea name="search_results_footer" cols="50" rows="3">{SEARCH_RESULTS_FOOTER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_NO_RESULTS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_no_results" value="{SEARCH_NO_RESULTS}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_footer">{SEARCH_FOOTER}</textarea>
+		<textarea name="search_footer" cols="50" rows="3">{SEARCH_FOOTER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MODULE_ORDER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_module_order" value="{SEARCH_MODULE_ORDER}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MAX_EXCERPT}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
@@ -428,7 +373,7 @@
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
 	<td style="text-align: right;">
-		<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
 <tr>
@@ -441,7 +386,7 @@
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="operating_system" id="operating_system_linux" onclick="javascript: change_os('linux');" style="width: 14px; height: 14px;" value="linux"{LINUX_SELECTED} />
 		<label for="operating_system_linux" onclick="javascript: change_os('linux');">{TEXT_LINUX_UNIX_BASED}</label>
-		<input type="radio" name="operating_system" id="operating_system_windows" onclick="javascript: change_os('windows');"" style="width: 14px; height: 14px;" value="windows"{WINDOWS_SELECTED} />
+		<input type="radio" name="operating_system" id="operating_system_windows" onclick="javascript: change_os('windows');" style="width: 14px; height: 14px;" value="windows"{WINDOWS_SELECTED} />
 		<label for="operating_system_windows" onclick="javascript: change_os('windows');">{TEXT_WINDOWS}</label>
 	</td>
 </tr>
@@ -459,7 +404,7 @@
 		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name"><div id="{ADVANCED_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">{TEXT_FILESYSTEM_PERMISSIONS}:</div></td>
 	<td class="setting_value" id="file_mode" align="left">
 		<table cellpadding="2" cellspacing="0" border="0" width="100%" style="border-right: 1px solid #DDDDDD;" id="{ADVANCED_FILE_PERMS_ID}2">
@@ -554,43 +499,43 @@
 		</table>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGES_DIRECTORY}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MEDIA_DIRECTORY}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="page_extension" value="{PAGE_EXTENSION}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="page_spacer" value="{PAGE_SPACER}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RENAME_FILES_ON_UPLOAD}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SESSION_IDENTIFIER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="app_name" value="{APP_NAME}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="sec_anchor" value="{SEC_ANCHOR}" />
@@ -620,7 +565,7 @@
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');" style="width: 14px; height: 14px;" value="phpmail"{PHPMAIL_SELECTED} />
 		<label for="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');">{TEXT_WBMAILER_PHP}</label>
-		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');"" style="width: 14px; height: 14px;" value="smtp"{SMTPMAIL_SELECTED} />
+		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');" style="width: 14px; height: 14px;" value="smtp"{SMTPMAIL_SELECTED} />
 		<label for="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');">{TEXT_WBMAILER_SMTP}</label>
 	</td>
 </tr>
@@ -662,7 +607,7 @@
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
 	<td style="text-align: right;">
-		<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
 </table>
@@ -669,12 +614,12 @@
 
 </form>
 
-<hr />
+<hr size="1" />
 
-<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-
+<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+<br />
 <font class="{DISPLAY_ADVANCED_BUTTON}">
-&nbsp; {MODE_SWITCH_WARNING}
+{MODE_SWITCH_WARNING}
 </font>
-
+<script src="{ADMIN_URL}/settings/setting.js" language="javascript" type="text/javascript"></script>
 <!-- END main_block -->
Index: trunk/wb/templates/classic/templates/access.htt
===================================================================
--- trunk/wb/templates/classic/templates/access.htt	(revision 1011)
+++ trunk/wb/templates/classic/templates/access.htt	(revision 1012)
@@ -8,7 +8,7 @@
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
 				<a href="{ADMIN_URL}/users/index.php">
-					<img src="{THEME_URL}/icons/users.png" border="0" />
+					<img src="{THEME_URL}/icons/users.png" alt="{USERS}" />
 				</a>
 			</td>
 			<td class="title">
@@ -27,7 +27,7 @@
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
 				<a href="{ADMIN_URL}/groups/index.php">
-					<img src="{THEME_URL}/icons/groups.png" border="0" />
+					<img src="{THEME_URL}/icons/groups.png" alt="{GROUPS}" />
 				</a>
 			</td>
 			<td class="title">
Index: trunk/wb/templates/classic/templates/groups_form.htt
===================================================================
--- trunk/wb/templates/classic/templates/groups_form.htt	(revision 1011)
+++ trunk/wb/templates/classic/templates/groups_form.htt	(revision 1012)
@@ -81,26 +81,26 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked}></td>
+	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
 	<td><label for="pages_view">{TEXT_VIEW}</label></td>
-	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked}></td>
+	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
 	<td>
 		<label for="pages_add">{TEXT_ADD}</label>
 		&nbsp;
-		(<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked}>
+		<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
 		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
 	</td>
 </tr>
 <tr>
-	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked}></td>
+	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
 	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked}></td>
+	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
 	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
 </tr>
 <tr>
-	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked}></td>
+	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
 	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
-	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked}></td>
+	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
 	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
@@ -109,19 +109,19 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked}></td>
+	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
 	<td><label for="media_view">{TEXT_VIEW}</label></td>
-	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked}></td>
+	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
 	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
 </tr>
 <tr>
-	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked}></td>
+	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
 	<td><label for="media_rename">{TEXT_RENAME}</label></td>
-	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked}></td>
+	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
 	<td><label for="media_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
-	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked}></td>
+	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
 	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -132,13 +132,13 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked}></td>
+	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
 	<td><label for="modules_view">{TEXT_VIEW}</label></td>
-	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked}></td>
+	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
 	<td><label for="modules_install">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked}></td>
+	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
 	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -149,13 +149,13 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked}></td>
+	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
 	<td><label for="templates_view">{TEXT_VIEW}</label></td>
-	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked}></td>
+	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
 	<td><label for="templates_install">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked}></td>
+	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
 	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -166,13 +166,13 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked}></td>
+	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
 	<td><label for="languages_view">{TEXT_VIEW}</label></td>
-	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked}></td>
+	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
 	<td><label for="languages_install">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked}></td>
+	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
 	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -183,9 +183,9 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked}></td>
+	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
 	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
-	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked}></td>
+	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
 	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
 </tr>
 <tr>
@@ -194,15 +194,15 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked}></td>
+	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
 	<td><label for="users_view">{TEXT_VIEW}</label></td>
-	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked}></td>
+	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
 	<td><label for="users_add">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked}></td>
+	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
 	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked}></td>
+	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
 	<td><label for="users_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
@@ -211,15 +211,15 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked}></td>
+	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
 	<td><label for="groups_view">{TEXT_VIEW}</label></td>
-	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked}></td>
+	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
 	<td><label for="groups_add">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked}></td>
+	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
 	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked}></td>
+	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
 	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
@@ -228,7 +228,7 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked}></td>
+	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
 	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -269,24 +269,25 @@
 		</ul>
 	</td>
 </tr>
+
+<tr>
+	<td colspan="2"><input type="submit" name="submit" value="{SUBMIT_TITLE}" /></td>
+    <td colspan="2" align="right"><input type="reset" name="reset" value="{TEXT_RESET}" /></td>
+</tr>
 </table>
+</form>
 
 <table cellpadding="5" cellspacing="0" border="0" width="100%">
 <tr>
-	<td width="150">&nbsp;</td>
-	<td>
-		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
-		<input type="reset" name="reset" value="{TEXT_RESET}" />
-		</form>
-	</td>
+	<td align="center">
 	<form name="advanced" action="{ADVANCED_ACTION}" method="post">
-	<input type="hidden" name="group_id" value="{GROUP_ID}" />
-	<input type="hidden" name="action" value="modify" />
-	<td width="200" align="right">
-		<input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
+        <input type="hidden" name="group_id" value="{GROUP_ID}" />
+        <input type="hidden" name="action" value="modify" />
+        <input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
+    </form>
 	</td>
-	</form>
 </tr>
 </table>
 
+
 <!-- END main_block -->
\ No newline at end of file
Index: trunk/wb/templates/classic/templates/addons.htt
===================================================================
--- trunk/wb/templates/classic/templates/addons.htt	(revision 1011)
+++ trunk/wb/templates/classic/templates/addons.htt	(revision 1012)
@@ -1,101 +1,93 @@
-<!-- BEGIN main_block -->
-
-
-<div class="box">
-	{URL_ADVANCED}
-</div>
-
-<table cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-<tr>
-	<td align="center" valign="top">
-		
-		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_MODULES};">
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{ADMIN_URL}/modules/index.php">
-					<img src="{THEME_URL}/icons/modules.png" border="0" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/modules/index.php">{MODULES}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{MODULES_OVERVIEW}
-			</td>
-		</tr>
-		</table>
-				
-		
-		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_TEMPLATES};">
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{ADMIN_URL}/templates/index.php">
-					<img src="{THEME_URL}/icons/templates.png" border="0" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/templates/index.php">{TEMPLATES}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{TEMPLATES_OVERVIEW}
-			</td>
-		</tr>
-		</table>
-				
-		
-		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_LANGUAGES};">
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{ADMIN_URL}/languages/index.php">
-					<img src="{THEME_URL}/icons/languages.png" border="0" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/languages/index.php">{LANGUAGES}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{LANGUAGES_OVERVIEW}
-			</td>
-		</tr>
-		</table>
-
-		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display:{DISPLAY_RELOAD};">
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<img src="{THEME_URL}/icons/admintools.png" border="0" />
-			</td>
-			<td class="title">
-				{TXT_ADMIN_SETTINGS}
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				<form action="{RELOAD_URL}" method="post">
-				{MESSAGE_RELOAD_ADDONS}<br style="margin-bottom: 0.5em" />
-				
-				<input style="display:{DISPLAY_MODULES};" type="checkbox" name="reload_modules" id="reload_modules" value="true" />
-				<label style="display:{DISPLAY_MODULES};" for="reload_modules">{MODULES}</label>
-		
-				<input style="display:{DISPLAY_TEMPLATES};" type="checkbox" name="reload_templates" id="reload_templates" value="true" />
-				<label style="display:{DISPLAY_TEMPLATES};" for="reload_templates">{TEMPLATES}</label>
-				
-				<input style="display:{DISPLAY_LANGUAGES};" type="checkbox" name="reload_languages" id="reload_languages" value="true" />
-				<label style="display:{DISPLAY_LANGUAGES};" for="reload_languages">{LANGUAGES}</label>
-
-				<input type="submit" name="submit" value="{TEXT_RELOAD}" />
-				</form>
-			</td>
-		</tr>
-		</table>
-
-	</td>
-</tr>
-</table>
-
+<!-- BEGIN main_block -->
+
+
+<div class="box">
+	{URL_ADVANCED}
+</div>
+
+<table cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+<tr>
+	<td align="center" valign="top">
+		
+		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_MODULES};">
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2">
+				<a href="{ADMIN_URL}/modules/index.php">
+					<img src="{THEME_URL}/icons/modules.png" alt="0" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/modules/index.php">{MODULES}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">{MODULES_OVERVIEW}</td>
+		</tr>
+		</table>
+				
+		
+		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_TEMPLATES};">
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2">
+				<a href="{ADMIN_URL}/templates/index.php">
+					<img src="{THEME_URL}/icons/templates.png" alt="{TEMPLATES}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/templates/index.php">{TEMPLATES}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">{TEMPLATES_OVERVIEW}</td>
+		</tr>
+		</table>
+				
+		
+		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_LANGUAGES};">
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2">
+				<a href="{ADMIN_URL}/languages/index.php">
+					<img src="{THEME_URL}/icons/languages.png" alt="{LANGUAGES}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/languages/index.php">{LANGUAGES}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">{LANGUAGES_OVERVIEW}</td>
+		</tr>
+		</table>
+
+		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display:{DISPLAY_RELOAD};">
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2">
+				<img src="{THEME_URL}/icons/admintools.png" alt="{TXT_ADMIN_SETTINGS}" />
+			</td>
+			<td class="title">{TXT_ADMIN_SETTINGS}</td>
+		</tr>
+		<tr>
+			<td class="description">
+				<form action="{RELOAD_URL}" method="post">
+				{MESSAGE_RELOAD_ADDONS}<br style="margin-bottom: 0.5em" />
+				
+				<input style="display:{DISPLAY_MODULES};" type="checkbox" name="reload_modules" id="reload_modules" value="true" />
+				<label style="display:{DISPLAY_MODULES};" for="reload_modules">{MODULES}</label>
+		
+				<input style="display:{DISPLAY_TEMPLATES};" type="checkbox" name="reload_templates" id="reload_templates" value="true" />
+				<label style="display:{DISPLAY_TEMPLATES};" for="reload_templates">{TEMPLATES}</label>
+				
+				<input style="display:{DISPLAY_LANGUAGES};" type="checkbox" name="reload_languages" id="reload_languages" value="true" />
+				<label style="display:{DISPLAY_LANGUAGES};" for="reload_languages">{LANGUAGES}</label>
+
+				<input type="submit" name="submit" value="{TEXT_RELOAD}" />
+				</form>
+			</td>
+		</tr>
+		</table>
+
+	</td>
+</tr>
+</table>
+
 <!-- END main_block -->
\ No newline at end of file
Index: trunk/wb/templates/classic/templates/admintools.htt
===================================================================
--- trunk/wb/templates/classic/templates/admintools.htt	(revision 1011)
+++ trunk/wb/templates/classic/templates/admintools.htt	(revision 1012)
@@ -1,4 +1,4 @@
-</div><!-- BEGIN main_block -->
+<!-- BEGIN main_block -->
 
 <table cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="tool_table">
 
Index: trunk/wb/templates/classic/templates/media.htt
===================================================================
--- trunk/wb/templates/classic/templates/media.htt	(revision 1011)
+++ trunk/wb/templates/classic/templates/media.htt	(revision 1012)
@@ -2,7 +2,7 @@
 
 <h2>{HEADING_BROWSE_MEDIA}</h2>
 
-<iframe width="100%" height="320px" align="center" src="browse.php"></iframe>
+<iframe width="100%" height="320px" align="middle" src="browse.php"></iframe>
 
 <br />
 
@@ -19,7 +19,7 @@
 	<td width="100">{TEXT_TARGET_FOLDER}:</td>
 	<td>
 		<select name="target" style="width: 100%;">
-			<option value="{MEDIA_DIRECTORY}" selected>{MEDIA_DIRECTORY}</option>
+			<option value="{MEDIA_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}</option>
 			<!-- BEGIN dir_list_block -->
 				<option value="{NAME}">{NAME}</option>
 			<!-- END dir_list_block -->
@@ -26,6 +26,7 @@
 		</select>
 	</td>
 </tr>
+
 </table>
 <table cellpadding="3" cellspacing="0" border="0" width="100%">
 <tr>
@@ -52,7 +53,7 @@
 	<td width="100">{TEXT_TARGET_FOLDER}:</td>
 	<td>
 		<select name="target" style="width: 100%;">
-			<option value="{MEDIA_DIRECTORY}" selected>{MEDIA_DIRECTORY}</option>
+			<option value="{MEDIA_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}</option>
 			<!-- BEGIN dir_list_block -->
 				<option value="{NAME}">{NAME}</option>
 			<!-- END dir_list_block -->
@@ -59,6 +60,7 @@
 		</select>
 	</td>
 </tr>
+</table>
 <table cellpadding="3" cellspacing="0" border="0" align="center" width="100%">
 <tr>
 	<td>
Index: trunk/wb/templates/wb_theme/templates/users_form.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/users_form.htt	(revision 1011)
+++ trunk/wb/templates/wb_theme/templates/users_form.htt	(revision 1012)
@@ -64,7 +64,7 @@
 <tr>
 	<td>{TEXT_GROUP}:</td>
 	<td class="value_input">
-		<select name="groups[]" multiple size=5>
+		<select name="groups[]" multiple="multiple" size="5">
 		<!-- BEGIN group_list_block -->
 			<option value="{ID}" {SELECTED}>{NAME}</option>
 		<!-- END group_list_block -->
Index: trunk/wb/templates/wb_theme/templates/pages.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/pages.htt	(revision 1011)
+++ trunk/wb/templates/wb_theme/templates/pages.htt	(revision 1012)
@@ -1,10 +1,4 @@
 <!-- BEGIN main_block -->
-
-
-
-
-
-
 <div class="{DISPLAY_ADD}">
     <h2>{HEADING_ADD_PAGE}</h2>
     <form name="add" action="add.php" method="post">
Index: trunk/wb/templates/wb_theme/templates/settings.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/settings.htt	(revision 1011)
+++ trunk/wb/templates/wb_theme/templates/settings.htt	(revision 1012)
@@ -1,57 +1,5 @@
-</div><!-- BEGIN main_block -->
+<!-- BEGIN main_block -->
 
-<script language="javascript" type="text/javascript">
-function change_os(type) {
-	if(type == 'linux') {
-		document.getElementById('file_perms_box1').style.display = 'block';
-		document.getElementById('file_perms_box2').style.display = 'block';
-		document.getElementById('file_perms_box3').style.display = 'block';
-	} else if(type == 'windows') {
-		document.getElementById('file_perms_box1').style.display = 'none';
-		document.getElementById('file_perms_box2').style.display = 'none';
-		document.getElementById('file_perms_box3').style.display = 'none';
-	}
-}
-
-function change_wbmailer(type) {
-	if(type == 'smtp') {
-		document.getElementById('row_wbmailer_smtp_settings').style.display = '';
-		document.getElementById('row_wbmailer_smtp_host').style.display = '';
-		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = '';
-		document.getElementById('row_wbmailer_smtp_username').style.display = '';
-		document.getElementById('row_wbmailer_smtp_password').style.display = '';
-		if( document.settings.wbmailer_smtp_auth.checked == true ) {
-			document.getElementById('row_wbmailer_smtp_username').style.display = '';
-			document.getElementById('row_wbmailer_smtp_password').style.display = '';
-		} else {
-			document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
-			document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
-		}
-	} else if(type == 'phpmail') {
-		document.getElementById('row_wbmailer_smtp_settings').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_host').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
-	}
-}
-
-function toggle_wbmailer_auth() {
-	if( document.settings.wbmailer_smtp_auth.checked == true ) {
-		document.getElementById('row_wbmailer_smtp_username').style.display = '';
-		document.getElementById('row_wbmailer_smtp_password').style.display = '';
-	} else {
-		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
-	}
-}
-</script>
-
-<style>
-.advanced {
-	display: {DISPLAY_ADVANCED};
-</style>
-
 <form name="settings" action="save.php" method="post">
 <input type="hidden" name="advanced" value="{ADVANCED}" />
 
@@ -66,35 +14,32 @@
 	<td class="setting_value" colspan="2">
 		<input type="text" name="website_title" value="{WEBSITE_TITLE}" />
 	</td>
-	<script language="javascript" type="text/javascript">
-	document.settings.website_title.focus();
-	</script>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_DESCRIPTION}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="website_description">{WEBSITE_DESCRIPTION}</textarea>
+		<textarea name="website_description" cols="50" rows="3">{WEBSITE_DESCRIPTION}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_KEYWORDS}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="website_keywords">{WEBSITE_KEYWORDS}</textarea>
+		<textarea name="website_keywords" cols="50" rows="3" >{WEBSITE_KEYWORDS}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_HEADER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="website_header">{WEBSITE_HEADER}</textarea>
+		<textarea name="website_header" cols="50" rows="3">{WEBSITE_HEADER}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="website_footer">{WEBSITE_FOOTER}</textarea>
+		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="page_level_limit">
@@ -117,7 +62,7 @@
 		</div>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
         <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
         <td class="setting_value" colspan="2">
                 <input type="radio" name="page_languages" id="page_languages_true" style="width: 14px; height: 14px;" value="true"{PAGE_LANGUAGES_ENABLED} />
@@ -126,7 +71,7 @@
                 <label for="page_languages_false">{TEXT_DISABLED}</label>
 		</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MULTIPLE_MENUS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="multiple_menus" id="multiple_menus_true" style="width: 14px; height: 14px;" value="true"{MULTIPLE_MENUS_ENABLED} />
@@ -144,7 +89,7 @@
 		<label for="home_folders_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="manage_sections" id="manage_sections_true" style="width: 14px; height: 14px;" value="true"{MANAGE_SECTIONS_ENABLED} />
@@ -153,7 +98,7 @@
 		<label for="manage_sections_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SECTION_BLOCKS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="section_blocks" id="section_blocks_true" style="width: 14px; height: 14px;" value="true"{SECTION_BLOCKS_ENABLED} />
@@ -171,7 +116,7 @@
 		<label for="intro_page_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="homepage_redirection" id="homepage_redirection_true" style="width: 14px; height: 14px;" value="true"{HOMEPAGE_REDIRECTION_ENABLED} />
@@ -180,7 +125,7 @@
 		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SMART_LOGIN}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} />
@@ -198,7 +143,7 @@
 		<label for="frontend_login_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" />
@@ -215,7 +160,7 @@
 		</select>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="er_level">
@@ -226,13 +171,13 @@
 		</select>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="wysiwyg_editor">
@@ -249,7 +194,7 @@
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
 	<td style="text-align: right;">
-		<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
 <tr>
@@ -262,12 +207,12 @@
 	<td class="setting_value" colspan="2">
 		<select name="default_language">
 			<!-- BEGIN language_list_block -->
-			<option value="{CODE}"{SELECTED}>{NAME} ({CODE})</option>
+			<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
 			<!-- END language_list_block -->
 		</select>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_CHARSET}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="default_charset">
@@ -338,7 +283,7 @@
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
 	<td style="text-align: right;">
-		<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
 <tr>
@@ -367,55 +312,55 @@
 		</select>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HEADER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_header" style="height: 100px;">{SEARCH_HEADER}</textarea>
+		<textarea name="search_header" style="height: 100px;" cols="50" rows="3">{SEARCH_HEADER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_HEADER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_results_header">{SEARCH_RESULTS_HEADER}</textarea>
+		<textarea name="search_results_header" cols="50" rows="3">{SEARCH_RESULTS_HEADER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_LOOP}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_results_loop">{SEARCH_RESULTS_LOOP}</textarea>
+		<textarea name="search_results_loop" cols="50" rows="3">{SEARCH_RESULTS_LOOP}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_results_footer">{SEARCH_RESULTS_FOOTER}</textarea>
+		<textarea name="search_results_footer" cols="50" rows="3">{SEARCH_RESULTS_FOOTER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_NO_RESULTS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_no_results" value="{SEARCH_NO_RESULTS}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="search_footer">{SEARCH_FOOTER}</textarea>
+		<textarea name="search_footer" cols="50" rows="3">{SEARCH_FOOTER}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MODULE_ORDER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_module_order" value="{SEARCH_MODULE_ORDER}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MAX_EXCERPT}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
@@ -428,7 +373,7 @@
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
 	<td style="text-align: right;">
-		<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
 <tr>
@@ -441,7 +386,7 @@
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="operating_system" id="operating_system_linux" onclick="javascript: change_os('linux');" style="width: 14px; height: 14px;" value="linux"{LINUX_SELECTED} />
 		<label for="operating_system_linux" onclick="javascript: change_os('linux');">{TEXT_LINUX_UNIX_BASED}</label>
-		<input type="radio" name="operating_system" id="operating_system_windows" onclick="javascript: change_os('windows');"" style="width: 14px; height: 14px;" value="windows"{WINDOWS_SELECTED} />
+		<input type="radio" name="operating_system" id="operating_system_windows" onclick="javascript: change_os('windows');" style="width: 14px; height: 14px;" value="windows"{WINDOWS_SELECTED} />
 		<label for="operating_system_windows" onclick="javascript: change_os('windows');">{TEXT_WINDOWS}</label>
 	</td>
 </tr>
@@ -459,7 +404,7 @@
 		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name"><div id="{ADVANCED_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">{TEXT_FILESYSTEM_PERMISSIONS}:</div></td>
 	<td class="setting_value" id="file_mode" align="left">
 		<table cellpadding="2" cellspacing="0" border="0" width="100%" style="border-right: 1px solid #DDDDDD;" id="{ADVANCED_FILE_PERMS_ID}2">
@@ -554,43 +499,43 @@
 		</table>
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGES_DIRECTORY}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MEDIA_DIRECTORY}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="page_extension" value="{PAGE_EXTENSION}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="page_spacer" value="{PAGE_SPACER}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RENAME_FILES_ON_UPLOAD}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SESSION_IDENTIFIER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="app_name" value="{APP_NAME}" />
 	</td>
 </tr>
-<tr class="advanced">
+<tr {DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="sec_anchor" value="{SEC_ANCHOR}" />
@@ -620,7 +565,7 @@
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');" style="width: 14px; height: 14px;" value="phpmail"{PHPMAIL_SELECTED} />
 		<label for="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');">{TEXT_WBMAILER_PHP}</label>
-		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');"" style="width: 14px; height: 14px;" value="smtp"{SMTPMAIL_SELECTED} />
+		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');" style="width: 14px; height: 14px;" value="smtp"{SMTPMAIL_SELECTED} />
 		<label for="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');">{TEXT_WBMAILER_SMTP}</label>
 	</td>
 </tr>
@@ -662,7 +607,7 @@
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
 	<td style="text-align: right;">
-		<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
 </table>
@@ -669,12 +614,12 @@
 
 </form>
 
-<hr />
+<hr size="1" />
 
-<button onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-
+<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+<br />
 <font class="{DISPLAY_ADVANCED_BUTTON}">
-&nbsp; {MODE_SWITCH_WARNING}
+{MODE_SWITCH_WARNING}
 </font>
-
+<script src="{ADMIN_URL}/settings/setting.js" language="javascript" type="text/javascript"></script>
 <!-- END main_block -->
Index: trunk/wb/templates/wb_theme/templates/preferences.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/preferences.htt	(revision 1011)
+++ trunk/wb/templates/wb_theme/templates/preferences.htt	(revision 1012)
@@ -19,7 +19,7 @@
 	<td>
 		<select name="language" style="width: 98%;">
 			<!-- BEGIN language_list_block -->
-			<option value="{CODE}"{SELECTED}>{NAME} ({CODE})</option>
+			<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
 			<!-- END language_list_block -->
 		</select>
 	</td>
@@ -119,7 +119,7 @@
 		<input type="password" name="new_password2" style="width: 98%;" />
 	</td>
 </tr>
-</tr>
+
 <tr>
 	<td>&nbsp;</td>
 	<td>
Index: trunk/wb/templates/wb_theme/templates/access.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/access.htt	(revision 1011)
+++ trunk/wb/templates/wb_theme/templates/access.htt	(revision 1012)
@@ -8,7 +8,7 @@
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
 				<a href="{ADMIN_URL}/users/index.php">
-					<img src="{THEME_URL}/icons/users.png" border="0" />
+					<img src="{THEME_URL}/icons/users.png" alt="{USERS}" />
 				</a>
 			</td>
 			<td class="title">
@@ -27,7 +27,7 @@
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
 				<a href="{ADMIN_URL}/groups/index.php">
-					<img src="{THEME_URL}/icons/groups.png" border="0" />
+					<img src="{THEME_URL}/icons/groups.png" alt="{GROUPS}" />
 				</a>
 			</td>
 			<td class="title">
Index: trunk/wb/templates/wb_theme/templates/groups_form.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/groups_form.htt	(revision 1011)
+++ trunk/wb/templates/wb_theme/templates/groups_form.htt	(revision 1012)
@@ -81,26 +81,26 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked}></td>
+	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
 	<td><label for="pages_view">{TEXT_VIEW}</label></td>
-	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked}></td>
+	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
 	<td>
 		<label for="pages_add">{TEXT_ADD}</label>
 		&nbsp;
-		(<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked}>
+		<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
 		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
 	</td>
 </tr>
 <tr>
-	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked}></td>
+	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
 	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked}></td>
+	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
 	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
 </tr>
 <tr>
-	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked}></td>
+	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
 	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
-	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked}></td>
+	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
 	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
@@ -109,19 +109,19 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked}></td>
+	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
 	<td><label for="media_view">{TEXT_VIEW}</label></td>
-	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked}></td>
+	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
 	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
 </tr>
 <tr>
-	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked}></td>
+	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
 	<td><label for="media_rename">{TEXT_RENAME}</label></td>
-	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked}></td>
+	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
 	<td><label for="media_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
-	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked}></td>
+	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
 	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -132,13 +132,13 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked}></td>
+	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
 	<td><label for="modules_view">{TEXT_VIEW}</label></td>
-	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked}></td>
+	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
 	<td><label for="modules_install">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked}></td>
+	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
 	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -149,13 +149,13 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked}></td>
+	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
 	<td><label for="templates_view">{TEXT_VIEW}</label></td>
-	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked}></td>
+	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
 	<td><label for="templates_install">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked}></td>
+	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
 	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -166,13 +166,13 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked}></td>
+	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
 	<td><label for="languages_view">{TEXT_VIEW}</label></td>
-	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked}></td>
+	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
 	<td><label for="languages_install">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked}></td>
+	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
 	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -183,9 +183,9 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked}></td>
+	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
 	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
-	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked}></td>
+	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
 	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
 </tr>
 <tr>
@@ -194,15 +194,15 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked}></td>
+	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
 	<td><label for="users_view">{TEXT_VIEW}</label></td>
-	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked}></td>
+	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
 	<td><label for="users_add">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked}></td>
+	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
 	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked}></td>
+	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
 	<td><label for="users_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
@@ -211,15 +211,15 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked}></td>
+	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
 	<td><label for="groups_view">{TEXT_VIEW}</label></td>
-	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked}></td>
+	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
 	<td><label for="groups_add">{TEXT_ADD}</label></td>
 </tr>
 <tr>
-	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked}></td>
+	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
 	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked}></td>
+	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
 	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
@@ -228,7 +228,7 @@
 	</td>
 </tr>
 <tr>
-	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked}></td>
+	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
 	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
@@ -269,24 +269,25 @@
 		</ul>
 	</td>
 </tr>
+
+<tr>
+	<td colspan="2"><input type="submit" name="submit" value="{SUBMIT_TITLE}" /></td>
+    <td colspan="2" align="right"><input type="reset" name="reset" value="{TEXT_RESET}" /></td>
+</tr>
 </table>
+</form>
 
 <table cellpadding="5" cellspacing="0" border="0" width="100%">
 <tr>
-	<td width="150">&nbsp;</td>
-	<td>
-		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
-		<input type="reset" name="reset" value="{TEXT_RESET}" />
-		</form>
-	</td>
+	<td align="center">
 	<form name="advanced" action="{ADVANCED_ACTION}" method="post">
-	<input type="hidden" name="group_id" value="{GROUP_ID}" />
-	<input type="hidden" name="action" value="modify" />
-	<td width="200" align="right">
-		<input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
+        <input type="hidden" name="group_id" value="{GROUP_ID}" />
+        <input type="hidden" name="action" value="modify" />
+        <input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
+    </form>
 	</td>
-	</form>
 </tr>
 </table>
 
+
 <!-- END main_block -->
\ No newline at end of file
Index: trunk/wb/templates/wb_theme/templates/media.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/media.htt	(revision 1011)
+++ trunk/wb/templates/wb_theme/templates/media.htt	(revision 1012)
@@ -2,7 +2,7 @@
 
 <h2>{HEADING_BROWSE_MEDIA}</h2>
 
-<iframe width="100%" height="320px" align="center" src="browse.php"></iframe>
+<iframe width="100%" height="320px" align="middle" src="browse.php"></iframe>
 
 <br />
 
@@ -19,7 +19,7 @@
 	<td width="100">{TEXT_TARGET_FOLDER}:</td>
 	<td>
 		<select name="target" style="width: 100%;">
-			<option value="{MEDIA_DIRECTORY}" selected>{MEDIA_DIRECTORY}</option>
+			<option value="{MEDIA_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}</option>
 			<!-- BEGIN dir_list_block -->
 				<option value="{NAME}">{NAME}</option>
 			<!-- END dir_list_block -->
@@ -26,6 +26,7 @@
 		</select>
 	</td>
 </tr>
+
 </table>
 <table cellpadding="3" cellspacing="0" border="0" width="100%">
 <tr>
@@ -52,7 +53,7 @@
 	<td width="100">{TEXT_TARGET_FOLDER}:</td>
 	<td>
 		<select name="target" style="width: 100%;">
-			<option value="{MEDIA_DIRECTORY}" selected>{MEDIA_DIRECTORY}</option>
+			<option value="{MEDIA_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}</option>
 			<!-- BEGIN dir_list_block -->
 				<option value="{NAME}">{NAME}</option>
 			<!-- END dir_list_block -->
@@ -59,6 +60,7 @@
 		</select>
 	</td>
 </tr>
+</table>
 <table cellpadding="3" cellspacing="0" border="0" align="center" width="100%">
 <tr>
 	<td>