11 vuotta sitten · a751985604
--- a/Sources/Groups.php
+++ b/Sources/Groups.php
@@ -790,7 +790,7 @@ function GroupRequests()
 
 			'date' => array(
 
 				'header' => array(
 
 					'value' => $txt['date'],
 
-					'style' => 'width: 18%;white-space:nowrap;',
 
+					'style' => 'width: 18%; white-space:nowrap;',
 
 				),
 
 				'data' => array(
 
 					'db' => 'time_submitted',
@@ -800,6 +800,7 @@ function GroupRequests()
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" class="input_check" onclick="invertAll(this, this.form);" />',
 
 					'style' => 'width: 4%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -808,7 +809,7 @@ function GroupRequests()
 
 							'id' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -832,8 +833,8 @@ function GroupRequests()
 
 						<option value="reject">' . $txt['mc_groupr_reject'] . '</option>
 
 						<option value="reason">' . $txt['mc_groupr_reject_w_reason'] . '</option>
 
 					</select>
 
-					<input type="submit" name="go" value="' . $txt['go'] . '" onclick="var sel = document.getElementById(\'req_action\'); if (sel.value != 0 &amp;&amp; sel.value != \'reason\' &amp;&amp; !confirm(\'' . $txt['mc_groupr_warning'] . '\')) return false;" class="button_submit" style="float: none"/>',
 
-				'align' => 'right',
 
+					<input type="submit" name="go" value="' . $txt['go'] . '" onclick="var sel = document.getElementById(\'req_action\'); if (sel.value != 0 &amp;&amp; sel.value != \'reason\' &amp;&amp; !confirm(\'' . $txt['mc_groupr_warning'] . '\')) return false;" class="button_submit" />',
 
+				'class' => 'floatright',
 
 			),
 
 		),
 
 	);
--- a/Sources/ManageAttachments.php
+++ b/Sources/ManageAttachments.php
@@ -496,6 +496,7 @@ function BrowseFiles()
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -504,7 +505,7 @@ function BrowseFiles()
 
 							'id_attach' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -520,7 +521,6 @@ function BrowseFiles()
 
 			array(
 
 				'position' => 'below_table_data',
 
 				'value' => '<input type="submit" name="remove_submit" class="button_submit" value="' . $txt['quickmod_delete_selected'] . '" onclick="return confirm(\'' . $txt['confirm_delete_attachments'] . '\');" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
@@ -2115,12 +2115,14 @@ function ManageAttachmentPaths()
 
 			'current_dir' => array(
 
 				'header' => array(
 
 					'value' => $txt['attach_current'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
 
 						return \'<input type="radio" name="current_dir" value="\' . $rowData[\'id\'] . \'" \' . ($rowData[\'current\'] ? \' checked="checked"\' : \'\') . (!empty($rowData[\'disable_current\']) ? \' disabled="disabled"\' : \'\') . \' class="input_radio" />\';
 
 					'),
 
-					'style' => 'text-align: center; width: 10%;',
 
+					'style' => 'width: 10%;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'path' => array(
@@ -2131,7 +2133,7 @@ function ManageAttachmentPaths()
 
 					'function' => create_function('$rowData', '
 
 						return \'<input type="hidden" name="dirs[\' . $rowData[\'id\'] . \']" value="\' . $rowData[\'path\'] . \'" /><input type="text" size="40" name="dirs[\' . $rowData[\'id\'] . \']" value="\' . $rowData[\'path\'] . \'"\' . (!empty($rowData[\'disable_base_dir\']) ? \' disabled="disabled"\' : \'\') . \' class="input_text" style="width: 100%" />\';
 
 					'),
 
-					'style' => 'text-align: center; width: 40%;',
 
+					'style' => 'width: 40%;',
 
 				),
 
 			),
 
 			'current_size' => array(
@@ -2140,7 +2142,7 @@ function ManageAttachmentPaths()
 
 				),
 
 				'data' => array(
 
 					'db' => 'current_size',
 
-					'style' => 'text-align: center; width: 15%;',
 
+					'style' => 'width: 15%;',
 
 				),
 
 			),
 
 			'num_files' => array(
@@ -2149,16 +2151,18 @@ function ManageAttachmentPaths()
 
 				),
 
 				'data' => array(
 
 					'db' => 'num_files',
 
-					'style' => 'text-align: center; width: 15%;',
 
+					'style' => 'width: 15%;',
 
 				),
 
 			),
 
 			'status' => array(
 
 				'header' => array(
 
 					'value' => $txt['attach_dir_status'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'db' => 'status',
 
-					'style' => 'text-align: center; width: 25%;',
 
+					'style' => 'width: 25%;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -2168,18 +2172,20 @@ function ManageAttachmentPaths()
 
 		'additional_rows' => array(
 
 			array(
 
 				'position' => 'below_table_data',
 
-				'value' => '<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '" /><input type="submit" name="new_path" value="' . $txt['attach_add_path'] . '" class="button_submit" />&nbsp;<input type="submit" name="save" value="' . $txt['save'] . '" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
+				'value' => '
 
+				<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '" />
 
+				<input type="submit" name="save" value="' . $txt['save'] . '" class="button_submit" />
 
+				<input type="submit" name="new_path" value="' . $txt['attach_add_path'] . '" class="button_submit" />',
 
 			),
 
 			empty($errors['dir']) ? array(
 
 				'position' => 'top_of_list',
 
 				'value' => $txt['attach_dir_desc'],
 
-				'style' => 'text-align: left; padding: 5px 10px',
 
+				'style' => 'padding: 5px 10px;',
 
 				'class' => 'windowbg2 smalltext'
 
 			) : array(
 
 				'position' => 'top_of_list',
 
 				'value' => $txt['attach_dir_save_problem'] . '<br />' . implode('<br />', $errors['dir']),
 
-				'style' => 'text-align: left;',
 
+				'style' => 'padding-left: 35px;',
 
 				'class' => 'noticebox',
 
 			),
 
 		),
@@ -2200,12 +2206,14 @@ function ManageAttachmentPaths()
 
 				'current_dir' => array(
 
 					'header' => array(
 
 						'value' => $txt['attach_current'],
 
+						'class' => 'centercol',
 
 					),
 
 					'data' => array(
 
 						'function' => create_function('$rowData', '
 
 							return \'<input type="radio" name="current_base_dir" value="\' . $rowData[\'id\'] . \'" \' . ($rowData[\'current\'] ? \' checked="checked"\' : \'\') . \' class="input_radio" />\';
 
 						'),
 
-						'style' => 'text-align: center; width: 10%;',
 
+						'style' => 'width: 10%;',
 
+						'class' => 'centercol',
 
 					),
 
 				),
 
 				'path' => array(
@@ -2223,7 +2231,7 @@ function ManageAttachmentPaths()
 
 					),
 
 					'data' => array(
 
 						'db' => 'num_dirs',
 
-						'style' => 'text-align: center; width: 15%;',
 
+						'style' => 'width: 15%;',
 
 					),
 
 				),
 
 				'status' => array(
@@ -2232,7 +2240,8 @@ function ManageAttachmentPaths()
 
 					),
 
 					'data' => array(
 
 						'db' => 'status',
 
-						'style' => 'text-align: center; width: 15%;',
 
+						'style' => 'width: 15%;',
 
+						'class' => 'centercol',
 
 					),
 
 				),
 
 			),
@@ -2242,18 +2251,18 @@ function ManageAttachmentPaths()
 
 			'additional_rows' => array(
 
 				array(
 
 					'position' => 'below_table_data',
 
-					'value' => '<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '" /><input type="submit" name="new_base_path" value="' . $txt['attach_add_path'] . '" class="button_submit" />&nbsp;<input type="submit" name="save2" value="' . $txt['save'] . '" class="button_submit" />',
 
-					'style' => 'text-align: right;',
 
+					'value' => '<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '" /><input type="submit" name="save2" value="' . $txt['save'] . '" class="button_submit" />
 
+					<input type="submit" name="new_base_path" value="' . $txt['attach_add_path'] . '" class="button_submit" />',
 
 				),
 
 				empty($errors['base']) ? array(
 
 					'position' => 'top_of_list',
 
 					'value' => $txt['attach_dir_base_desc'],
 
-					'style' => 'text-align: left; padding: 5px 10px',
 
+					'style' => 'padding: 5px 10px;',
 
 					'class' => 'windowbg2 smalltext'
 
 				) : array(
 
 					'position' => 'top_of_list',
 
 					'value' => $txt['attach_dir_save_problem'] . '<br />' . implode('<br />', $errors['base']),
 
-					'style' => 'text-align: left;',
 
+					'style' => 'padding-left: 35px',
 
 					'class' => 'noticebox',
 
 				),
 
 			),
--- a/Sources/ManageBans.php
+++ b/Sources/ManageBans.php
@@ -239,7 +239,6 @@ function BanList()
 
 				),
 
 				'data' => array(
 
 					'db' => 'num_triggers',
 
-					'style' => 'text-align: center;',
 
 				),
 
 				'sort' => array(
 
 					'default' => 'num_triggers DESC',
@@ -249,6 +248,7 @@ function BanList()
 
 			'actions' => array(
 
 				'header' => array(
 
 					'value' => $txt['ban_actions'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -257,12 +257,13 @@ function BanList()
 
 							'id_ban_group' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -271,7 +272,7 @@ function BanList()
 
 							'id_ban_group' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -280,9 +281,8 @@ function BanList()
 
 		),
 
 		'additional_rows' => array(
 
 			array(
 
-				'position' => 'below_table_data',
 
+				'position' => 'bottom_of_list',
 
 				'value' => '<input type="submit" name="removeBans" value="' . $txt['ban_remove_selected'] . '" onclick="return confirm(\'' . $txt['ban_remove_selected_confirm'] . '\');" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
@@ -1212,7 +1212,6 @@ function BanBrowseTriggers()
 
 				),
 
 				'data' => array(
 
 					'db' => 'hits',
 
-					'style' => 'text-align: center;',
 
 				),
 
 				'sort' => array(
 
 					'default' => 'bi.hits DESC',
@@ -1222,6 +1221,7 @@ function BanBrowseTriggers()
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -1230,7 +1230,7 @@ function BanBrowseTriggers()
 
 							'id_ban' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -1245,9 +1245,8 @@ function BanBrowseTriggers()
 
 				'value' => '<a href="' . $scripturl . '?action=admin;area=ban;sa=browse;entity=ip">' . ($context['selected_entity'] == 'ip' ? '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;" /> ' : '') . $txt['ip'] . '</a>&nbsp;|&nbsp;<a href="' . $scripturl . '?action=admin;area=ban;sa=browse;entity=hostname">' . ($context['selected_entity'] == 'hostname' ? '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;" /> ' : '') . $txt['hostname'] . '</a>&nbsp;|&nbsp;<a href="' . $scripturl . '?action=admin;area=ban;sa=browse;entity=email">' . ($context['selected_entity'] == 'email' ? '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;" /> ' : '') . $txt['email'] . '</a>&nbsp;|&nbsp;<a href="' . $scripturl . '?action=admin;area=ban;sa=browse;entity=member">' . ($context['selected_entity'] == 'member' ? '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;" /> ' : '') . $txt['username'] . '</a>',
 
 			),
 
 			array(
 
-				'position' => 'below_table_data',
 
+				'position' => 'bottom_of_list',
 
 				'value' => '<input type="submit" name="remove_triggers" value="' . $txt['ban_remove_selected_triggers'] . '" onclick="return confirm(\'' . $txt['ban_remove_selected_triggers_confirm'] . '\');" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
@@ -1530,6 +1529,7 @@ function BanLog()
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -1538,7 +1538,7 @@ function BanLog()
 
 							'id_ban_log' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -1550,11 +1550,10 @@ function BanLog()
 
 		),
 
 		'additional_rows' => array(
 
 			array(
 
-				'position' => 'below_table_data',
 
+				'position' => 'bottom_of_list',
 
 				'value' => '
 
 					<input type="submit" name="removeSelected" value="' . $txt['ban_log_remove_selected'] . '" onclick="return confirm(\'' . $txt['ban_log_remove_selected_confirm'] . '\');" class="button_submit" />
 
 					<input type="submit" name="removeAll" value="' . $txt['ban_log_remove_all'] . '" onclick="return confirm(\'' . $txt['ban_log_remove_all_confirm'] . '\');" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
--- a/Sources/ManageCalendar.php
+++ b/Sources/ManageCalendar.php
@@ -142,6 +142,7 @@ function ModifyHolidays()
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -150,7 +151,7 @@ function ModifyHolidays()
 
 							'id_holiday' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -161,11 +162,8 @@ function ModifyHolidays()
 
 		'additional_rows' => array(
 
 			array(
 
 				'position' => 'below_table_data',
 
-				'value' => '
 
-
 
-					<input type="submit" name="delete" value="' . $txt['quickmod_delete_selected'] . '" class="button_submit" />
 
+				'value' => '<input type="submit" name="delete" value="' . $txt['quickmod_delete_selected'] . '" class="button_submit" />
 
 					<a class="button_link" href="' . $scripturl . '?action=admin;area=managecalendar;sa=editholiday" style="margin: 0 1em">' . $txt['holidays_add'] . '</a>',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
--- a/Sources/ManageLanguages.php
+++ b/Sources/ManageLanguages.php
@@ -113,15 +113,16 @@ function AddLanguage()
 
 					),
 
 					'data' => array(
 
 						'db' => 'utf8',
 
-						'style' => 'text-align: center',
 
 					),
 
 				),
 
 				'install_link' => array(
 
 					'header' => array(
 
 						'value' => $txt['add_language_smf_install'],
 
+						'class' => 'centercol',
 
 					),
 
 					'data' => array(
 
 						'db' => 'install_link',
 
+						'class' => 'centercol',
 
 					),
 
 				),
 
 			),
@@ -213,6 +214,7 @@ function DownloadLanguage()
 
 
 
 		$chmod_files = array();
 
 		$install_files = array();
 
+		
 
 		// Check writable status.
 
 		foreach ($_POST['copy_file'] as $file)
 
 		{
@@ -497,7 +499,6 @@ function DownloadLanguage()
 
 
 
 						return \'<span style="color: \' . ($rowData[\'writable\'] ? \'green\' : \'red\') . \';">\' . ($rowData[\'writable\'] ? $txt[\'yes\'] : $txt[\'no\']) . \'</span>\';
 
 					'),
 
-					'style' => 'text-align: center',
 
 				),
 
 			),
 
 			'version' => array(
@@ -527,12 +528,14 @@ function DownloadLanguage()
 
 			'copy' => array(
 
 				'header' => array(
 
 					'value' => $txt['languages_download_copy'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
 
 						return \'<input type="checkbox" name="copy_file[]" value="\' . $rowData[\'generaldest\'] . \'" \' . ($rowData[\'default_copy\'] ? \'checked="checked"\' : \'\') . \' class="input_check" />\';
 
 					'),
 
-					'style' => 'text-align: center; width: 4%;',
 
+					'style' => 'width: 4%;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -592,12 +595,14 @@ function ModifyLanguages()
 
 			'default' => array(
 
 				'header' => array(
 
 					'value' => $txt['languages_default'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
 
 						return \'<input type="radio" name="def_language" value="\' . $rowData[\'id\'] . \'" \' . ($rowData[\'default\'] ? \'checked="checked"\' : \'\') . \' onclick="highlightSelected(\\\'list_language_list_\' . $rowData[\'id\'] . \'\\\');" class="input_radio" />\';
 
 					'),
 
-					'style' => 'text-align: center; width: 8%;',
 
+					'style' => 'width: 8%;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'name' => array(
@@ -626,7 +631,6 @@ function ModifyLanguages()
 
 				),
 
 				'data' => array(
 
 					'db_htmlsafe' => 'count',
 
-					'style' => 'text-align: center',
 
 				),
 
 			),
 
 			'locale' => array(
@@ -644,9 +648,8 @@ function ModifyLanguages()
 
 		),
 
 		'additional_rows' => array(
 
 			array(
 
-				'position' => 'below_table_data',
 
+				'position' => 'bottom_of_list',
 
 				'value' => '<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '" /><input type="submit" name="set_default" value="' . $txt['save'] . '"' . (is_writable($boarddir . '/Settings.php') ? '' : ' disabled="disabled"') . ' class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 		// For highlighting the default.
--- a/Sources/ManageMail.php
+++ b/Sources/ManageMail.php
@@ -198,7 +198,7 @@ function BrowseMailQueue()
 
 		),
 
 		'additional_rows' => array(
 
 			array(
 
-				'position' => 'below_table_data',
 
+				'position' => 'bottom_of_list',
 
 				'value' => '<input type="submit" name="delete_redirects" value="' . $txt['quickmod_delete_selected'] . '" onclick="return confirm(\'' . $txt['quickmod_confirm'] . '\');" class="button_submit" /><a class="button_link" href="' . $scripturl . '?action=admin;area=mailqueue;sa=clear;' . $context['session_var'] . '=' . $context['session_id'] . '" onclick="return confirm(\'' . $txt['mailqueue_clear_list_warning'] . '\');">' . $txt['mailqueue_clear_list'] . '</a> ',
 
 			),
 
 		),
--- a/Sources/ManageMembergroups.php
+++ b/Sources/ManageMembergroups.php
@@ -158,6 +158,7 @@ function MembergroupIndex()
 
 			'members' => array(
 
 				'header' => array(
 
 					'value' => $txt['membergroups_members_top'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -166,7 +167,7 @@ function MembergroupIndex()
 
 						// No explicit members for the moderator group.
 
 						return $rowData[\'id_group\'] == 3 ? $txt[\'membergroups_guests_na\'] : $rowData[\'num_members\'];
 
 					'),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 				'sort' => array(
 
 					'default' => 'CASE WHEN id_group < 4 THEN id_group ELSE 4 END, 1',
@@ -176,6 +177,7 @@ function MembergroupIndex()
 
 			'modify' => array(
 
 				'header' => array(
 
 					'value' => $txt['modify'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -184,7 +186,7 @@ function MembergroupIndex()
 
 							'id_group' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -261,10 +263,11 @@ function MembergroupIndex()
 
 			'members' => array(
 
 				'header' => array(
 
 					'value' => $txt['membergroups_members_top'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'db' => 'num_members',
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 				'sort' => array(
 
 					'default' => '1 DESC',
@@ -274,10 +277,11 @@ function MembergroupIndex()
 
 			'required_posts' => array(
 
 				'header' => array(
 
 					'value' => $txt['membergroups_min_posts'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'db' => 'min_posts',
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 				'sort' => array(
 
 					'default' => 'min_posts',
@@ -287,6 +291,7 @@ function MembergroupIndex()
 
 			'modify' => array(
 
 				'header' => array(
 
 					'value' => $txt['modify'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -295,7 +300,7 @@ function MembergroupIndex()
 
 							'id_group' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
--- a/Sources/ManageMembers.php
+++ b/Sources/ManageMembers.php
@@ -448,7 +448,6 @@ function ViewMemberlist()
 
 				),
 
 				'data' => array(
 
 					'db' => 'id_member',
 
-					'style' => 'text-align: center;',
 
 				),
 
 				'sort' => array(
 
 					'default' => 'id_member',
@@ -580,6 +579,7 @@ function ViewMemberlist()
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -587,7 +587,7 @@ function ViewMemberlist()
 
 
 
 						return \'<input type="checkbox" name="delete[]" value="\' . $rowData[\'id_member\'] . \'" class="input_check" \' . ($rowData[\'id_member\'] == $user_info[\'id\'] || $rowData[\'id_group\'] == 1 || in_array(1, explode(\',\', $rowData[\'additional_groups\'])) ? \'disabled="disabled"\' : \'\') . \' />\';
 
 					'),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -600,7 +600,6 @@ function ViewMemberlist()
 
 			array(
 
 				'position' => 'below_table_data',
 
 				'value' => '<input type="submit" name="delete_members" value="' . $txt['admin_delete_members'] . '" onclick="return confirm(\'' . $txt['confirm_delete_members'] . '\');" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
@@ -826,7 +825,6 @@ function MembersAwaitingActivation()
 
 				),
 
 				'data' => array(
 
 					'db' => 'id_member',
 
-					'style' => 'text-align: center;',
 
 				),
 
 				'sort' => array(
 
 					'default' => 'id_member',
@@ -916,7 +914,7 @@ function MembersAwaitingActivation()
 
 				'header' => array(
 
 					'value' => $txt['duplicates'],
 
 					// Make sure it doesn't go too wide.
 
-					'style' => 'width: 20%',
 
+					'style' => 'width: 20%;',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -938,6 +936,7 @@ function MembersAwaitingActivation()
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -946,7 +945,7 @@ function MembersAwaitingActivation()
 
 							'id_member' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
--- a/Sources/ManageNews.php
+++ b/Sources/ManageNews.php
@@ -175,6 +175,7 @@ function EditNews()
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$news', '
@@ -184,7 +185,7 @@ function EditNews()
 
 						else
 
 							return \'\';
 
 					'),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
--- a/Sources/ManagePaid.php
+++ b/Sources/ManagePaid.php
@@ -222,7 +222,7 @@ function ViewSubscriptions()
 
 			'name' => array(
 
 				'header' => array(
 
 					'value' => $txt['paid_name'],
 
-					'style' => 'text-align: left; width: 35%;',
 
+					'style' => 'width: 35%;',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -235,7 +235,6 @@ function ViewSubscriptions()
 
 			'cost' => array(
 
 				'header' => array(
 
 					'value' => $txt['paid_cost'],
 
-					'style' => 'text-align: left;',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -249,33 +248,37 @@ function ViewSubscriptions()
 
 				'header' => array(
 
 					'value' => $txt['paid_pending'],
 
 					'style' => 'width: 18%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'db_htmlsafe' => 'pending',
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'finished' => array(
 
 				'header' => array(
 
 					'value' => $txt['paid_finished'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'db_htmlsafe' => 'finished',
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'total' => array(
 
 				'header' => array(
 
 					'value' => $txt['paid_active'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'db_htmlsafe' => 'total',
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'is_active' => array(
 
 				'header' => array(
 
 					'value' => $txt['paid_is_active'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -283,7 +286,7 @@ function ViewSubscriptions()
 
 
 
 						return \'<span style="color: \' . ($rowData[\'active\'] ? \'green\' : \'red\') . \'">\' . ($rowData[\'active\'] ? $txt[\'yes\'] : $txt[\'no\']) . \'</span>\';
 
 					'),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'modify' => array(
@@ -293,7 +296,7 @@ function ViewSubscriptions()
 
 
 
 						return \'<a href="\' . $scripturl . \'?action=admin;area=paidsubscribe;sa=modify;sid=\' . $rowData[\'id\'] . \'">\' . $txt[\'modify\'] . \'</a>\';
 
 					'),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'delete' => array(
@@ -303,7 +306,7 @@ function ViewSubscriptions()
 
 
 
 						return \'<a href="\' . $scripturl . \'?action=admin;area=paidsubscribe;sa=modify;delete;sid=\' . $rowData[\'id\'] . \'">\' . $txt[\'delete\'] . \'</a>\';
 
 					'),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -313,10 +316,7 @@ function ViewSubscriptions()
 
 		'additional_rows' => array(
 
 			array(
 
 				'position' => 'below_table_data',
 
-				'value' => '
 
-					<input type="submit" name="add" value="' . $txt['paid_add_subscription'] . '" class="button_submit" />
 
-				',
 
-				'style' => 'text-align: right;',
 
+				'value' => '<input type="submit" name="add" value="' . $txt['paid_add_subscription'] . '" class="button_submit" />',
 
 			),
 
 		),
 
 	);
@@ -656,7 +656,7 @@ function ViewSubscribedUsers()
 
 			'name' => array(
 
 				'header' => array(
 
 					'value' => $txt['who_member'],
 
-					'style' => 'text-align: left; width: 20%;',
 
+					'style' => 'width: 20%;',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -673,7 +673,7 @@ function ViewSubscribedUsers()
 
 			'status' => array(
 
 				'header' => array(
 
 					'value' => $txt['paid_status'],
 
-					'style' => 'text-align: left; width: 10%;',
 
+					'style' => 'width: 10%;',
 
 				),
 
 				'data' => array(
 
 					'db_htmlsafe' => 'status_text',
@@ -686,7 +686,7 @@ function ViewSubscribedUsers()
 
 			'payments_pending' => array(
 
 				'header' => array(
 
 					'value' => $txt['paid_payments_pending'],
 
-					'style' => 'text-align: left; width: 15%;',
 
+					'style' => 'width: 15%;',
 
 				),
 
 				'data' => array(
 
 					'db_htmlsafe' => 'pending',
@@ -699,7 +699,7 @@ function ViewSubscribedUsers()
 
 			'start_time' => array(
 
 				'header' => array(
 
 					'value' => $txt['start_date'],
 
-					'style' => 'text-align: left; width: 20%;',
 
+					'style' => 'width: 20%;',
 
 				),
 
 				'data' => array(
 
 					'db_htmlsafe' => 'start_date',
@@ -713,7 +713,7 @@ function ViewSubscribedUsers()
 
 			'end_time' => array(
 
 				'header' => array(
 
 					'value' => $txt['end_date'],
 
-					'style' => 'text-align: left; width: 20%;',
 
+					'style' => 'width: 20%;',
 
 				),
 
 				'data' => array(
 
 					'db_htmlsafe' => 'end_date',
@@ -727,6 +727,7 @@ function ViewSubscribedUsers()
 
 			'modify' => array(
 
 				'header' => array(
 
 					'style' => 'width: 10%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -734,12 +735,13 @@ function ViewSubscribedUsers()
 
 
 
 						return \'<a href="\' . $scripturl . \'?action=admin;area=paidsubscribe;sa=modifyuser;lid=\' . $rowData[\'id\'] . \'">\' . $txt[\'modify\'] . \'</a>\';
 
 					'),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'delete' => array(
 
 				'header' => array(
 
 					'style' => 'width: 4%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -747,7 +749,7 @@ function ViewSubscribedUsers()
 
 
 
 						return \'<input type="checkbox" name="delsub[\' . $rowData[\'id\'] . \']" class="input_check" />\';
 
 					'),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
--- a/Sources/ManageScheduledTasks.php
+++ b/Sources/ManageScheduledTasks.php
@@ -207,6 +207,7 @@ function ScheduledTasks()
 
 				'header' => array(
 
 					'value' => $txt['scheduled_tasks_enabled'],
 
 					'style' => 'width: 6%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -217,13 +218,14 @@ function ScheduledTasks()
 
 							'checked_state' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'run_now' => array(
 
 				'header' => array(
 
 					'value' => $txt['scheduled_tasks_run_now'],
 
 					'style' => 'width: 12%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -233,7 +235,7 @@ function ScheduledTasks()
 
 							'id' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -246,8 +248,6 @@ function ScheduledTasks()
 
 				'value' => '
 
 					<input type="submit" name="save" value="' . $txt['scheduled_tasks_save_changes'] . '" class="button_submit" />
 
 					<input type="submit" name="run" value="' . $txt['scheduled_tasks_run_now'] . '" class="button_submit" />',
 
-				'class' => 'floatright',
 
-				'style' => 'text-align: right;',
 
 			),
 
 			array(
 
 				'position' => 'after_title',
@@ -502,7 +502,6 @@ function TaskLog()
 
 				'position' => 'below_table_data',
 
 				'value' => '
 
 					<input type="submit" name="removeAll" value="' . $txt['scheduled_log_empty_log'] . '" onclick="return confirm(\'' . $txt['scheduled_log_empty_log_confirm'] . '\');" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 			array(
 
 				'position' => 'after_title',
--- a/Sources/ManageSearchEngines.php
+++ b/Sources/ManageSearchEngines.php
@@ -280,6 +280,7 @@ function ViewSpiders()
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -288,7 +289,7 @@ function ViewSpiders()
 
 							'id_spider' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -298,12 +299,11 @@ function ViewSpiders()
 
 		),
 
 		'additional_rows' => array(
 
 			array(
 
-				'position' => 'below_table_data',
 
+				'position' => 'bottom_of_list',
 
 				'value' => '
 
 					<input type="submit" name="removeSpiders" value="' . $txt['spiders_remove_selected'] . '" onclick="return confirm(\'' . $txt['spider_remove_selected_confirm'] . '\');" class="button_submit" />
 
 					<input type="submit" name="addSpider" value="' . $txt['spiders_add'] . '" class="button_submit" />
 
 				',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
@@ -758,7 +758,6 @@ function SpiderLogs()
 
 			array(
 
 				'position' => 'below_table_data',
 
 				'value' => '<input type="submit" name="removeAll" value="' . $txt['spider_log_empty_log'] . '" onclick="return confirm(\'' . $txt['spider_log_empty_log_confirm'] . '\');" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
--- a/Sources/ManageSettings.php
+++ b/Sources/ManageSettings.php
@@ -1424,7 +1424,6 @@ function ShowCustomProfiles()
 
 			'field' => array(
 
 				'header' => array(
 
 					'value' => $txt['standard_profile_field'],
 
-					'style' => 'text-align: left;',
 
 				),
 
 				'data' => array(
 
 					'db' => 'label',
@@ -1434,6 +1433,7 @@ function ShowCustomProfiles()
 
 			'active' => array(
 
 				'header' => array(
 
 					'value' => $txt['custom_edit_active'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -1441,12 +1441,14 @@ function ShowCustomProfiles()
 
 						$onClickHandler = $rowData[\'can_show_register\'] ? sprintf(\'onclick="document.getElementById(\\\'reg_%1$s\\\').disabled = !this.checked;"\', $rowData[\'id\']) : \'\';
 
 						return sprintf(\'<input type="checkbox" name="active[]" id="active_%1$s" value="%1$s" class="input_check"%2$s%3$s />\', $rowData[\'id\'], $isChecked, $onClickHandler);
 
 					'),
 
-					'style' => 'width: 20%; text-align: center;',
 
+					'style' => 'width: 20%;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'show_on_registration' => array(
 
 				'header' => array(
 
 					'value' => $txt['custom_edit_registration'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -1454,7 +1456,8 @@ function ShowCustomProfiles()
 
 						$isDisabled = $rowData[\'can_show_register\'] ? \'\' : \' disabled="disabled"\';
 
 						return sprintf(\'<input type="checkbox" name="reg[]" id="reg_%1$s" value="%1$s" class="input_check"%2$s%3$s />\', $rowData[\'id\'], $isChecked, $isDisabled);
 
 					'),
 
-					'style' => 'width: 20%; text-align: center;',
 
+					'style' => 'width: 20%;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -1467,7 +1470,6 @@ function ShowCustomProfiles()
 
 			array(
 
 				'position' => 'below_table_data',
 
 				'value' => '<input type="submit" name="save" value="' . $txt['save'] . '" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
@@ -1493,7 +1495,6 @@ function ShowCustomProfiles()
 
 			'field_name' => array(
 
 				'header' => array(
 
 					'value' => $txt['custom_profile_fieldname'],
 
-					'style' => 'text-align: left;',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -1511,7 +1512,6 @@ function ShowCustomProfiles()
 
 			'field_type' => array(
 
 				'header' => array(
 
 					'value' => $txt['custom_profile_fieldtype'],
 
-					'style' => 'text-align: left;',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -1537,7 +1537,7 @@ function ShowCustomProfiles()
 
 
 
 						return $rowData[\'active\'] ? $txt[\'yes\'] : $txt[\'no\'];
 
 					'),
 
-					'style' => 'width: 8%; text-align: center;',
 
+					'style' => 'width: 8%;',
 
 				),
 
 				'sort' => array(
 
 					'default' => 'active DESC',
@@ -1554,7 +1554,7 @@ function ShowCustomProfiles()
 
 
 
 						return $txt[\'custom_profile_placement_\' . (empty($rowData[\'placement\']) ? \'standard\' : ($rowData[\'placement\'] == 1 ? \'withicons\' : \'abovesignature\'))];
 
 					'),
 
-					'style' => 'width: 8%; text-align: center;',
 
+					'style' => 'width: 8%;',
 
 				),
 
 				'sort' => array(
 
 					'default' => 'placement DESC',
@@ -1562,9 +1562,6 @@ function ShowCustomProfiles()
 
 				),
 
 			),
 
 			'show_on_registration' => array(
 
-				'header' => array(
 
-					'value' => $txt['modify'],
 
-				),
 
 				'data' => array(
 
 					'sprintf' => array(
 
 						'format' => '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=%1$s">' . $txt['modify'] . '</a>',
@@ -1572,7 +1569,7 @@ function ShowCustomProfiles()
 
 							'id_field' => false,
 
 						),
 
 					),
 
-					'style' => 'width: 15%; text-align: center;',
 
+					'style' => 'width: 15%;',
 
 				),
 
 			),
 
 		),
@@ -1584,7 +1581,6 @@ function ShowCustomProfiles()
 
 			array(
 
 				'position' => 'below_table_data',
 
 				'value' => '<input type="submit" name="new" value="' . $txt['custom_profile_make_new'] . '" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 		),
 
 	);
@@ -2300,7 +2296,7 @@ function list_integration_hooks()
 
 			'status' => array(
 
 				'header' => array(
 
 					'value' => $txt['hooks_field_hook_exists'],
 
-					'style' => 'width:3%',
 
+					'style' => 'width:3%;',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$data', '
--- a/Sources/ManageSmileys.php
+++ b/Sources/ManageSmileys.php
@@ -384,13 +384,14 @@ function EditSmileySets()
 
 			'default' => array(
 
 				'header' => array(
 
 					'value' => $txt['smiley_sets_default'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
 
 						global $settings;
 
 						return $rowData[\'selected\'] ? \'<img src="\' . $settings[\'images_url\'] . \'/icons/field_valid.png" alt="*" class="icon" />\' : \'\';
 
 					'),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 				'sort' => array(
 
 					'default' => 'selected DESC',
@@ -428,6 +429,7 @@ function EditSmileySets()
 
 			'modify' => array(
 
 				'header' => array(
 
 					'value' => $txt['smiley_set_modify'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -436,18 +438,19 @@ function EditSmileySets()
 
 							'id' => true,
 
 						),
 
 					),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
 
 						return $rowData[\'id\'] == 0 ? \'\' : sprintf(\'<input type="checkbox" name="smiley_set[%1$d]" class="input_check" />\', $rowData[\'id\']);
 
 					'),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -952,7 +955,7 @@ function EditSmileys()
 
 								'description' => true,
 
 							),
 
 						),
 
-						'style' => 'text-align: center;',
 
+						'class' => 'centercol',
 
 					),
 
 				),
 
 				'code' => array(
@@ -1032,6 +1035,7 @@ function EditSmileys()
 
 				'modify' => array(
 
 					'header' => array(
 
 						'value' => $txt['smileys_modify'],
 
+						'class' => 'centercol',
 
 					),
 
 					'data' => array(
 
 						'sprintf' => array(
@@ -1040,12 +1044,13 @@ function EditSmileys()
 
 								'id_smiley' => false,
 
 							),
 
 						),
 
-						'style' => 'text-align: center;',
 
+						'class' => 'centercol',
 
 					),
 
 				),
 
 				'check' => array(
 
 					'header' => array(
 
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+						'class' => 'centercol',
 
 					),
 
 					'data' => array(
 
 						'sprintf' => array(
@@ -1054,7 +1059,7 @@ function EditSmileys()
 
 								'id_smiley' => false,
 
 							),
 
 						),
 
-						'style' => 'text-align: center',
 
+						'class' => 'centercol',
 
 					),
 
 				),
 
 			),
@@ -1066,7 +1071,7 @@ function EditSmileys()
 
 				array(
 
 					'position' => 'above_column_headers',
 
 					'value' => $smileyset_option_list,
 
-					'style' => 'text-align: right;',
 
+					'class' => 'righttext',
 
 				),
 
 				array(
 
 					'position' => 'below_table_data',
@@ -1079,8 +1084,10 @@ function EditSmileys()
 
 							<option value="popup">' . $txt['smileys_show_on_popup'] . '</option>
 
 							<option value="delete">' . $txt['smileys_remove'] . '</option>
 
 						</select>
 
-						<noscript><input type="submit" name="perform_action" value="' . $txt['go'] . '" class="button_submit" /></noscript>',
 
-					'style' => 'text-align: right;',
 
+						<noscript>
 
+							<input type="submit" name="perform_action" value="' . $txt['go'] . '" class="button_submit" />
 
+						</noscript>',
 
+					'class' => 'righttext',
 
 				),
 
 			),
 
 			'javascript' => '
@@ -1673,8 +1680,8 @@ function EditMessageIcons()
 
 						$images_url = $settings[file_exists(sprintf(\'%1$s/images/post/%2$s.png\', $settings[\'theme_dir\'], $rowData[\'filename\'])) ? \'actual_images_url\' : \'default_images_url\'];
 
 						return sprintf(\'<img src="%1$s/post/%2$s.png" alt="%3$s" />\', $images_url, $rowData[\'filename\'], htmlspecialchars($rowData[\'title\']));
 
 					'),
 
+					'class' => 'centercol',
 
 				),
 
-				'style' => 'text-align: center;',
 
 			),
 
 			'filename' => array(
 
 				'header' => array(
@@ -1712,6 +1719,7 @@ function EditMessageIcons()
 
 			'modify' => array(
 
 				'header' => array(
 
 					'value' => $txt['smileys_modify'],
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -1720,12 +1728,13 @@ function EditMessageIcons()
 
 							'id_icon' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 			'check' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -1734,7 +1743,7 @@ function EditMessageIcons()
 
 							'id_icon' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
--- a/Sources/ModerationCenter.php
+++ b/Sources/ModerationCenter.php
@@ -1789,6 +1789,7 @@ function ViewWarningTemplates()
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" class="input_check" onclick="invertAll(this, this.form);" />',
 
 					'style' => 'width: 4%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$rowData', '
@@ -1796,7 +1797,7 @@ function ViewWarningTemplates()
 
 
 
 						return \'<input type="checkbox" name="deltpl[]" value="\' . $rowData[\'id_comment\'] . \'" class="input_check" />\';
 
 					'),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -1808,13 +1809,10 @@ function ViewWarningTemplates()
 
 			array(
 
 				'position' => 'below_table_data',
 
 				'value' => '&nbsp;<input type="submit" name="delete" value="' . $txt['mc_warning_template_delete'] . '" onclick="return confirm(\'' . $txt['mc_warning_template_delete_confirm'] . '\');" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
 			),
 
 			array(
 
 				'position' => 'bottom_of_list',
 
-				'value' => '
 
-					<input type="submit" name="add" value="' . $txt['mc_warning_template_add'] . '" class="button_submit" />',
 
-				'style' => 'text-align: right;',
 
+				'value' => '<input type="submit" name="add" value="' . $txt['mc_warning_template_add'] . '" class="button_submit" />',
 
 			),
 
 		),
 
 	);
--- a/Sources/Modlog.php
+++ b/Sources/Modlog.php
@@ -253,12 +253,13 @@ function ViewModlog()
 
 			'delete' => array(
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" name="all" class="input_check" onclick="invertAll(this, this.form);" />',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'function' => create_function('$entry', '
 
 						return \'<input type="checkbox" class="input_check" name="delete[]" value="\' . $entry[\'id\'] . \'"\' . ($entry[\'editable\'] ? \'\' : \' disabled="disabled"\') . \' />\';
 
 					'),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -285,9 +286,10 @@ function ViewModlog()
 
 					' . $txt['modlog_search'] . ' (' . $txt['modlog_by'] . ': ' . $context['search']['label'] . '):
 
 					<input type="text" name="search" size="18" value="' . $context['search']['string'] . '" class="input_text" />
 
 					<input type="submit" name="is_search" value="' . $txt['modlog_go'] . '" class="button_submit" style="float:none" />
 
-					' . ($context['can_delete'] ? ' |
 
-						<input type="submit" name="remove" value="' . $txt['modlog_remove'] . '" onclick="return confirm(\'' . $txt['modlog_remove_selected_confirm'] . '\');" class="button_submit" />
 
-						<input type="submit" name="removeall" value="' . $txt['modlog_removeall'] . '" onclick="return confirm(\'' . $txt['modlog_remove_all_confirm'] . '\');" class="button_submit" />' : ''),
 
+					' . ($context['can_delete'] ? '&nbsp;|
 
+					<input type="submit" name="remove" value="' . $txt['modlog_remove'] . '" onclick="return confirm(\'' . $txt['modlog_remove_selected_confirm'] . '\');" class="button_submit" />
 
+					<input type="submit" name="removeall" value="' . $txt['modlog_removeall'] . '" onclick="return confirm(\'' . $txt['modlog_remove_all_confirm'] . '\');" class="button_submit" />' : ''),
 
+				'class' => 'floatright',
 
 			),
 
 		),
 
 	);
--- a/Sources/Packages.php
+++ b/Sources/Packages.php
@@ -1474,7 +1474,7 @@ function PackageBrowse()
 
 									<a href="\' . $scripturl . \'?action=admin;area=packages;sa=list;package=\' . $package[\'filename\'] . \'">[ \' . $txt[\'list_files\'] . \' ]</a>
 
 									<a href="\' . $scripturl . \'?action=admin;area=packages;sa=remove;package=\' . $package[\'filename\'] . \';\' . $context[\'session_var\'] . \'=\' . $context[\'session_id\'] . \'"\' . ($package[\'is_installed\'] && $package[\'is_current\'] ? \' onclick="return confirm(\\\'\' . $txt[\'package_delete_bad\'] . \'\\\');"\' : \'\') . \'>[ \' . $txt[\'package_delete\'] . \' ]</a>\';
 
 						'),
 
-						'style' => 'text-align: right;',
 
+						'class' => 'righttext',
 
 					),
 
 				),
 
 			),
--- a/Sources/PostModeration.php
+++ b/Sources/PostModeration.php
@@ -475,6 +475,7 @@ function UnapprovedAttachments()
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" class="input_check" onclick="invertAll(this, this.form);" checked="checked" />',
 
 					'style' => 'width: 4%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -483,7 +484,7 @@ function UnapprovedAttachments()
 
 							'id' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
--- a/Sources/Profile-Modify.php
+++ b/Sources/Profile-Modify.php
@@ -1329,7 +1329,7 @@ function editBuddyIgnoreLists($memID)
 
 	$context[$context['profile_menu_name']]['tab_data'] = array(
 
 		'title' => $txt['editBuddyIgnoreLists'],
 
 		'description' => $txt['buddy_ignore_desc'],
 
-		'icon' => 'profile_sm.png',
 
+		'icon' => 'profile_hd.png',
 
 		'tabs' => array(
 
 			'buddies' => array(),
 
 			'ignore' => array(),
@@ -1896,6 +1896,7 @@ function notification($memID)
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" class="input_check" onclick="invertAll(this, this.form);" />',
 
 					'style' => 'width: 4%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -1904,7 +1905,7 @@ function notification($memID)
 
 							'id' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
@@ -2013,6 +2014,7 @@ function notification($memID)
 
 				'header' => array(
 
 					'value' => '<input type="checkbox" class="input_check" onclick="invertAll(this, this.form);" />',
 
 					'style' => 'width: 4%;',
 
+					'class' => 'centercol',
 
 				),
 
 				'data' => array(
 
 					'sprintf' => array(
@@ -2021,7 +2023,7 @@ function notification($memID)
 
 							'id' => false,
 
 						),
 
 					),
 
-					'style' => 'text-align: center;',
 
+					'class' => 'centercol',
 
 				),
 
 			),
 
 		),
--- a/Sources/Profile-View.php
+++ b/Sources/Profile-View.php
@@ -200,7 +200,7 @@ function showPosts($memID)
 
 	$context[$context['profile_menu_name']]['tab_data'] = array(
 
 		'title' => $txt['showPosts'],
 
 		'description' => $txt['showPosts_help'],
 
-		'icon' => 'profile_sm.png',
 
+		'icon' => 'profile_hd.png',
 
 		'tabs' => array(
 
 			'messages' => array(
 
 			),
@@ -559,7 +559,7 @@ function showAttachments($memID)
 
 				'header' => array(
 
 					'value' => $txt['show_attach_downloads'],
 
 					'class' => 'lefttext',
 
-					'style' => 'width: 25%',
 
+					'style' => 'width: 25%;',
 
 				),
 
 				'data' => array(
 
 					'db' => 'filename',
@@ -572,7 +572,7 @@ function showAttachments($memID)
 
 			'downloads' => array(
 
 				'header' => array(
 
 					'value' => $txt['show_attach_downloads'],
 
-					'style' => 'width: 12%',
 
+					'style' => 'width: 12%;',
 
 				),
 
 				'data' => array(
 
 					'db' => 'downloads',
@@ -587,7 +587,7 @@ function showAttachments($memID)
 
 				'header' => array(
 
 					'value' => $txt['message'],
 
 					'class' => 'lefttext',
 
-					'style' => 'width: 30%',
 
+					'style' => 'width: 30%;',
 
 				),
 
 				'data' => array(
 
 					'db' => 'subject',
@@ -919,7 +919,7 @@ function tracking($memID)
 
 	$context[$context['profile_menu_name']]['tab_data'] = array(
 
 		'title' => $txt['tracking'],
 
 		'description' => $txt['tracking_description'],
 
-		'icon' => 'profile_sm.png',
 
+		'icon' => 'profile_hd.png',
 
 		'tabs' => array(
 
 			'activity' => array(),
 
 			'ip' => array(),
@@ -2179,7 +2179,7 @@ function viewWarning($memID)
 
 			'reason' => array(
 
 				'header' => array(
 
 					'value' => $txt['profile_warning_previous_reason'],
 
-					'style' => 'width: 50%',
 
+					'style' => 'width: 50%;',
 
 				),
 
 				'data' => array(
 
 					'db' => 'reason',
--- a/Sources/Subs-Package.php
+++ b/Sources/Subs-Package.php
@@ -594,6 +594,7 @@ function create_chmod_control($chmodFiles = array(), $chmodOptions = array(), $r
 
 				'check' => array(
 
 					'header' => array(
 
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check" />',
 
+						'class' => 'centercol',
 
 					),
 
 					'data' => array(
 
 						'sprintf' => array(
@@ -602,7 +603,7 @@ function create_chmod_control($chmodFiles = array(), $chmodOptions = array(), $r
 
 								'path' => false,
 
 							),
 
 						),
 
-						'style' => 'text-align: center',
 
+						'class' => 'centercol',
 
 					),
 
 				),
 
 				'result' => array(
@@ -627,7 +628,6 @@ function create_chmod_control($chmodFiles = array(), $chmodOptions = array(), $r
 
 					'position' => 'below_table_data',
 
 					'value' => '<input type="submit" name="restore_perms" value="' . $txt['package_restore_permissions_restore'] . '" class="button_submit" />',
 
 					'class' => 'titlebg',
 
-					'style' => 'text-align: right;',
 
 				),
 
 				array(
 
 					'position' => 'after_title',
--- a/Themes/default/Admin.template.php
+++ b/Themes/default/Admin.template.php
@@ -60,7 +60,7 @@ function template_admin()
 
 			<div id="live_news" class="floatleft">
 
 				<div class="cat_bar">
 
 					<h3 class="catbg">
 
-						<a href="', $scripturl, '?action=helpadmin;help=live_news" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['live'], '
 
+						<a href="', $scripturl, '?action=helpadmin;help=live_news" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['live'], '
 
 					</h3>
 
 				</div>
 
 				<div class="windowbg nopadding">
@@ -175,7 +175,6 @@ function template_admin()
 
 								%message%
 
 							</div>
 
 						</div>
 
-						<span class="botslice"><span></span></span>
 
 					</div>
 
 				'), ',
 
 				sUpdateNotificationLink: smf_scripturl + ', JavaScriptEscape('?action=admin;area=packages;pgdownload;auto;package=%package%;' . $context['session_var'] . '=' . $context['session_id']), '
@@ -251,7 +250,7 @@ function template_credits()
 
 	echo '
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<a href="', $scripturl, '?action=helpadmin;help=latest_support" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['support_latest'], '
 
+					<a href="', $scripturl, '?action=helpadmin;help=latest_support" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['support_latest'], '
 
 				</h3>
 
 			</div>
 
 			<div class="windowbg">
@@ -586,7 +585,7 @@ function template_edit_censored()
 
 	// First section is for adding/removing words from the censored list.
 
 	echo '
 
 	<div id="admincenter">
 
-		<form action="', $scripturl, '?action=admin;area=postsettings;sa=censor" method="post" accept-charset="', $context['character_set'], '">
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=postsettings;sa=censor" method="post" accept-charset="', $context['character_set'], '">
 
 			<div id="section_header" class="cat_bar">
 
 				<h3 class="catbg">
 
 					', $txt['admin_censored_words'], '
@@ -766,7 +765,7 @@ function template_show_settings()
 
 				echo '
 
 					<div class="cat_bar">
 
 						<h3 class="', !empty($config_var['class']) ? $config_var['class'] : 'catbg', '"', !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '', '>
 
-							', ($config_var['help'] ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $config_var['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help"><img src="' . $settings['images_url'] . '/helptopics.png" class="icon" alt="' . $txt['help'] . '" /></a>' : ''), '
 
+							', ($config_var['help'] ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $config_var['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help"><img src="' . $settings['images_url'] . '/helptopics_hd.png" class="icon" alt="' . $txt['help'] . '" /></a>' : ''), '
 
 							', $config_var['label'], '
 
 						</h3>
 
 					</div>';
@@ -1381,8 +1380,10 @@ function template_core_features()
 
 				<h3 class="catbg">
 
 					', $txt['core_settings_title'], '
 
 				</h3>
 
+				
 
 			</div>
 
-		<form id="core_features" action="', $scripturl, '?action=admin;area=corefeatures" method="post" accept-charset="', $context['character_set'], '">
 
+			<p class="description">', $txt['core_settings_desc'], '</p>
 
+			<form id="core_features" action="', $scripturl, '?action=admin;area=corefeatures" method="post" accept-charset="', $context['character_set'], '">
 
 			<div style="display:none" id="activation_message" class="errorbox"></div>';
 
 
 
 	$alternate = true;
@@ -1567,21 +1568,27 @@ function template_php_info()
 
 	global $context, $txt;
 
 
 
 	echo '
 
-	<div class="generic_list_wrapper" id="phpinfo">';
 
-
 
+	<div id="admin_form_wrapper">
 
+		<div id="section_header" class="cat_bar">
 
+			<h3 class="catbg">',
 
+				$txt['phpinfo_settings'], '
 
+			</h3>
 
+		</div>
 
+		<br />';
 
+	
 
 	// for each php info area
 
 	foreach ($context['pinfo'] as $area => $php_area)
 
 	{
 
 		echo '
 
-	<table id="', str_replace(' ', '_', $area), '" width="100%" class="table_grid">
 
-		<thead>
 
-		<tr class="catbg" align="center">
 
-			<th class="first_th" scope="col" width="33%"></th>
 
-			<th scope="col" width="33%"><strong>', $area, '</strong></th>
 
-			<th class="last_th" scope="col" width="33%"></th>
 
-		</tr>
 
-		</thead>
 
-		<tbody>';
 
+		<table id="', str_replace(' ', '_', $area), '" width="100%" class="table_grid">
 
+			<thead>
 
+			<tr class="catbg">
 
+				<th class="first_th" scope="col" width="33%"></th>
 
+				<th scope="col" width="33%" class="centercol"><strong>', $area, '</strong></th>
 
+				<th class="last_th" scope="col" width="33%"></th>
 
+			</tr>
 
+			</thead>
 
+			<tbody>';
 
 
 
 		$alternate = true;
 
 		$localmaster = true;
@@ -1596,42 +1603,42 @@ function template_php_info()
 
 				{
 
 					// heading row for the settings section of this categorys settings
 
 					echo '
 
-		<tr class="titlebg">
 
-			<td align="center" width="33%"><strong>', $txt['phpinfo_itemsettings'], '</strong></td>
 
-			<td align="center" width="33%"><strong>', $txt['phpinfo_localsettings'], '</strong></td>
 
-			<td align="center" width="33%"><strong>', $txt['phpinfo_defaultsettings'], '</strong></td>
 
-		</tr>';
 
+			<tr class="titlebg">
 
+				<td align="center" width="33%"><strong>', $txt['phpinfo_itemsettings'], '</strong></td>
 
+				<td align="center" width="33%"><strong>', $txt['phpinfo_localsettings'], '</strong></td>
 
+				<td align="center" width="33%"><strong>', $txt['phpinfo_defaultsettings'], '</strong></td>
 
+			</tr>';
 
 					$localmaster = false;
 
 				}
 
 
 
 				echo '
 
-		<tr>
 
-			<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $key, '</td>';
 
+			<tr>
 
+				<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $key, '</td>';
 
 
 
 				foreach ($setting as $key_lm => $value)
 
 				{
 
 					echo '
 
-			<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $value, '</td>';
 
+				<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $value, '</td>';
 
 				}
 
 				echo '
 
-		</tr>';
 
+			</tr>';
 
 			}
 
 			// just a single setting (2 col)
 
 			else
 
 			{
 
 				echo '
 
-		<tr>
 
-			<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $key,  '</td>
 
-			<td align="left" class="windowbg', $alternate ? '2' : '', '" colspan="2">', $setting, '</td>
 
-		</tr>';
 
+			<tr>
 
+				<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $key,  '</td>
 
+				<td align="left" class="windowbg', $alternate ? '2' : '', '" colspan="2">', $setting, '</td>
 
+			</tr>';
 
 			}
 
 
 
 			$alternate = !$alternate;
 
 		}
 
 		echo '
 
-		</tbody>
 
-	</table>
 
-	<br />';
 
+			</tbody>
 
+		</table>
 
+		<br />';
 
 	}
 
 
 
 	echo '
--- a/Themes/default/Errors.template.php
+++ b/Themes/default/Errors.template.php
@@ -56,7 +56,7 @@ function template_error_log()
 
 			</div>
 
 			<div class="pagesection">
 
 				<div class="floatleft">
 
-					', $txt['pages'], ': ', $context['page_index'], '
 
+					', $context['page_index'], '
 
 				</div>
 
 			</div>
 
 			<table border="0" cellspacing="1" class="table_grid" id="error_log">
@@ -158,7 +158,7 @@ function template_error_log()
 
 				</tr>
 
 			</table>
 
 			<div class="pagesection floatleft">
 
-				&nbsp;&nbsp;', $txt['pages'], ': ', $context['page_index'], '
 
+				&nbsp;&nbsp;', $context['page_index'], '
 
 			</div>';
 
 
 
 	echo '
--- a/Themes/default/GenericList.template.php
+++ b/Themes/default/GenericList.template.php
@@ -91,10 +91,10 @@ function template_show_list($list_id = null)
 
 		foreach ($cur_list['headers'] as $col_header)
 
 		{
 
 			$i ++;
 
-			if (empty($col_header['class']) && $i == 1)
 
-				$col_header['class'] = 'first_th';
 
-			elseif (empty($col_header['class']) && $i == $header_count)
 
-				$col_header['class'] = 'last_th';
 
+			if ($i === 1)
 
+				$col_header['class'] = empty($col_header['class']) ? 'first_th' : 'first_th ' . $col_header['class'];
 
+			elseif ($i === $header_count)
 
+				$col_header['class'] = empty($col_header['class']) ? 'last_th' : 'last_th ' . $col_header['class'];
 
 
 
 			echo '
 
 					<th scope="col" id="header_', $list_id, '_', $col_header['id'], '"', empty($col_header['class']) ? '' : ' class="' . $col_header['class'] . '"', empty($col_header['style']) ? '' : ' style="' . $col_header['style'] . '"', empty($col_header['colspan']) ? '' : ' colspan="' . $col_header['colspan'] . '"', '>', empty($col_header['href']) ? '' : '<a href="' . $col_header['href'] . '" rel="nofollow">', empty($col_header['label']) ? '&nbsp;' : $col_header['label'], empty($col_header['href']) ? '' : (empty($col_header['sort_image']) ? '</a>' : ' <img class="sort" src="' . $settings['images_url'] . '/sort_' . $col_header['sort_image'] . '.png" alt="" /></a>'), '</th>';
--- a/Themes/default/GenericMenu.template.php
+++ b/Themes/default/GenericMenu.template.php
@@ -251,7 +251,7 @@ function template_generic_menu_tabs(&$menu_context)
 
 			echo '<img src="', $settings['images_url'], '/icons/', !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'], '" alt="" class="icon" />';
 
 
 
 		if (!empty($selected_tab['help']) || !empty($tab_context['help']))
 
-			echo '<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" class="icon" /></a>';
 
+			echo '<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" class="icon" /></a>';
 
 
 
 		echo $tab_context['title'];
 
 	}
--- a/Themes/default/Help.template.php
+++ b/Themes/default/Help.template.php
@@ -120,7 +120,7 @@ function template_find_members()
 
 		echo '
 
 				</ul>
 
 				<div class="pagesection">
 
-					', $txt['pages'], ': ', $context['page_index'], '
 
+					', $context['page_index'], '
 
 				</div>';
 
 	}
 
 
--- a/Themes/default/Login.template.php
+++ b/Themes/default/Login.template.php
@@ -22,7 +22,7 @@ function template_login()
 
 		<div class="tborder login">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img src="', $settings['images_url'], '/icons/login_sm.png" alt="" class="icon" /> ', $txt['login'], '
 
+					<img src="', $settings['images_url'], '/icons/login_hd.png" alt="" class="icon" /> ', $txt['login'], '
 
 				</h3>
 
 			</div>
 
 			<div class="roundframe">';
@@ -112,7 +112,7 @@ function template_kick_guest()
 
 	echo '
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img src="', $settings['images_url'], '/icons/login_sm.png" alt="" class="icon" /> ', $txt['login'], '
 
+					<img src="', $settings['images_url'], '/icons/login_hd.png" alt="" class="icon" /> ', $txt['login'], '
 
 				</h3>
 
 			</div>
 
 			<div class="roundframe">
@@ -209,7 +209,7 @@ function template_admin_login()
 
 	<div class="tborder login" id="admin_login">
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">
 
-				<img src="', $settings['images_url'], '/icons/login_sm.png" alt="" class="icon" /> ', $txt['login'], '
 
+				<img src="', $settings['images_url'], '/icons/login_hd.png" alt="" class="icon" /> ', $txt['login'], '
 
 			</h3>
 
 		</div>
 
 		<div class="roundframe centertext">';
--- a/Themes/default/ManageAttachments.template.php
+++ b/Themes/default/ManageAttachments.template.php
@@ -168,7 +168,7 @@ function template_attachment_repair()
 
 	{
 
 		echo '
 
 	<div id="manage_attachments">
 
-		<form action="', $scripturl, '?action=admin;area=manageattachments;sa=repair;fixErrors=1;step=0;substep=0;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=manageattachments;sa=repair;fixErrors=1;step=0;substep=0;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">', $txt['repair_attachments'], '</h3>
 
 			</div>
--- a/Themes/default/ManageBans.template.php
+++ b/Themes/default/ManageBans.template.php
@@ -16,150 +16,148 @@ function template_ban_edit()
 
 
 
 	echo '
 
 	<div id="manage_bans">
 
-
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">
 
-				', $context['ban']['is_new'] ? $txt['ban_add_new'] : $txt['ban_edit'] . ' \'' . $context['ban']['name'] . '\'', '
 
-			</h3>
 
-		</div>';
 
-
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=ban;sa=edit" method="post" accept-charset="', $context['character_set'], '" onsubmit="if (this.ban_name.value == \'\') {alert(\'', $txt['ban_name_empty'], '\'); return false;} if (this.partial_ban.checked &amp;&amp; !(this.cannot_post.checked || this.cannot_register.checked || this.cannot_login.checked)) {alert(\'', $txt['ban_restriction_empty'], '\'); return false;}">
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">
 
+					', $context['ban']['is_new'] ? $txt['ban_add_new'] : $txt['ban_edit'] . ' \'' . $context['ban']['name'] . '\'', '
 
+				</h3>
 
+			</div>';
 
+			
 
 	if ($context['ban']['is_new'])
 
 		echo '
 
-		<div class="information">', $txt['ban_add_notes'], '</div>';
 
-
 
+			<div class="information">', $txt['ban_add_notes'], '</div>';
 
+		
 
 	echo '
 
-		<div class="windowbg">
 
 			<div class="content">
 
-				<form action="', $scripturl, '?action=admin;area=ban;sa=edit" method="post" accept-charset="', $context['character_set'], '" onsubmit="if (this.ban_name.value == \'\') {alert(\'', $txt['ban_name_empty'], '\'); return false;} if (this.partial_ban.checked &amp;&amp; !(this.cannot_post.checked || this.cannot_register.checked || this.cannot_login.checked)) {alert(\'', $txt['ban_restriction_empty'], '\'); return false;}">
 
+				<dl class="settings">
 
+					<dt>
 
+						<strong><label for="ban_name">', $txt['ban_name'], ':</label></strong>
 
+					</dt>
 
+					<dd>
 
+						<input type="text" name="ban_name" id="ban_name" value="', $context['ban']['name'], '" size="47" maxlength="60" class="input_text" />
 
+					</dd>
 
+					<dt>
 
+						<strong><label for="reason">', $txt['ban_reason'], ':</label></strong><br />
 
+						<span class="smalltext">', $txt['ban_reason_desc'], '</span>
 
+					</dt>
 
+					<dd>
 
+						<textarea name="reason" id="reason" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['reason'], '</textarea>
 
+					</dd>
 
+					<dt>
 
+						<strong><label for="ban_notes">', $txt['ban_notes'], ':</label></strong><br />
 
+						<span class="smalltext">', $txt['ban_notes_desc'], '</span>
 
+					</dt>
 
+					<dd>
 
+						<textarea name="notes" id="ban_notes" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['notes'], '</textarea>
 
+					</dd>
 
+				</dl>
 
+				<fieldset class="ban_settings floatleft">
 
+					<legend>
 
+						', $txt['ban_expiration'], '
 
+					</legend>
 
+					<input type="radio" name="expiration" value="never" id="never_expires" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'never' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="never_expires">', $txt['never'], '</label><br />
 
+					<input type="radio" name="expiration" value="one_day" id="expires_one_day" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'still_active_but_we_re_counting_the_days' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="expires_one_day">', $txt['ban_will_expire_within'], '</label>: <input type="text" name="expire_date" id="expire_date" size="3" value="', $context['ban']['expiration']['days'], '" class="input_text" /> ', $txt['ban_days'], '<br />
 
+					<input type="radio" name="expiration" value="expired" id="already_expired" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'expired' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="already_expired">', $txt['ban_expired'], '</label>
 
+				</fieldset>
 
+				<fieldset class="ban_settings floatright">
 
+					<legend>
 
+						', $txt['ban_restriction'], '
 
+					</legend>
 
+					<input type="radio" name="full_ban" id="full_ban" value="1" onclick="fUpdateStatus();"', $context['ban']['cannot']['access'] ? ' checked="checked"' : '', ' class="input_radio" /> <label for="full_ban">', $txt['ban_full_ban'], '</label><br />
 
+					<input type="radio" name="full_ban" id="partial_ban" value="0" onclick="fUpdateStatus();"', !$context['ban']['cannot']['access'] ? ' checked="checked"' : '', ' class="input_radio" /> <label for="partial_ban">', $txt['ban_partial_ban'], '</label><br />
 
+					<input type="checkbox" name="cannot_post" id="cannot_post" value="1"', $context['ban']['cannot']['post'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_post">', $txt['ban_cannot_post'], '</label> (<a href="', $scripturl, '?action=helpadmin;help=ban_cannot_post" onclick="return reqOverlayDiv(this.href);">?</a>)<br />
 
+					<input type="checkbox" name="cannot_register" id="cannot_register" value="1"', $context['ban']['cannot']['register'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_register">', $txt['ban_cannot_register'], '</label><br />
 
+					<input type="checkbox" name="cannot_login" id="cannot_login" value="1"', $context['ban']['cannot']['login'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_login">', $txt['ban_cannot_login'], '</label><br />
 
+				</fieldset>
 
+				<br class="clear_right" />';
 
+
 
+	if (!empty($context['ban_suggestions']))
 
+	{
 
+		echo '
 
+				<fieldset>
 
+					<legend>
 
+						', $txt['ban_triggers'], '
 
+					</legend>
 
 					<dl class="settings">
 
 						<dt>
 
-							<strong><label for="ban_name">', $txt['ban_name'], ':</label></strong>
 
+							<input type="checkbox" name="ban_suggestion[]" id="main_ip_check" value="main_ip" class="input_check" />
 
+							<label for="main_ip_check">', $txt['ban_on_ip'], '</label>
 
 						</dt>
 
 						<dd>
 
-							<input type="text" name="ban_name" id="ban_name" value="', $context['ban']['name'], '" size="47" maxlength="60" class="input_text" />
 
-						</dd>
 
+							<input type="text" name="main_ip" value="', $context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;" class="input_text" />
 
+						</dd>';
 
+
 
+		if (empty($modSettings['disableHostnameLookup']))
 
+			echo '
 
 						<dt>
 
-							<strong><label for="reason">', $txt['ban_reason'], ':</label></strong><br />
 
-							<span class="smalltext">', $txt['ban_reason_desc'], '</span>
 
+							<input type="checkbox" name="ban_suggestion[]" id="hostname_check" value="hostname" class="input_check" />
 
+							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
 
 						</dt>
 
 						<dd>
 
-							<textarea name="reason" id="reason" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['reason'], '</textarea>
 
-						</dd>
 
+							<input type="text" name="hostname" value="', $context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;" class="input_text" />
 
+						</dd>';
 
+
 
+		echo '
 
 						<dt>
 
-							<strong><label for="ban_notes">', $txt['ban_notes'], ':</label></strong><br />
 
-							<span class="smalltext">', $txt['ban_notes_desc'], '</span>
 
+							<input type="checkbox" name="ban_suggestion[]" id="email_check" value="email" class="input_check" checked="checked" />
 
+							<label for="email_check">', $txt['ban_on_email'], '</label>
 
 						</dt>
 
 						<dd>
 
-							<textarea name="notes" id="ban_notes" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['notes'], '</textarea>
 
+							<input type="text" name="email" value="', $context['ban_suggestions']['email'], '" size="44" onfocus="document.getElementById(\'email_check\').checked = true;" class="input_text" />
 
 						</dd>
 
-					</dl>
 
-					<fieldset class="ban_settings floatleft">
 
-						<legend>
 
-							', $txt['ban_expiration'], '
 
-						</legend>
 
-						<input type="radio" name="expiration" value="never" id="never_expires" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'never' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="never_expires">', $txt['never'], '</label><br />
 
-						<input type="radio" name="expiration" value="one_day" id="expires_one_day" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'still_active_but_we_re_counting_the_days' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="expires_one_day">', $txt['ban_will_expire_within'], '</label>: <input type="text" name="expire_date" id="expire_date" size="3" value="', $context['ban']['expiration']['days'], '" class="input_text" /> ', $txt['ban_days'], '<br />
 
-						<input type="radio" name="expiration" value="expired" id="already_expired" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'expired' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="already_expired">', $txt['ban_expired'], '</label>
 
-					</fieldset>
 
-					<fieldset class="ban_settings floatright">
 
-						<legend>
 
-							', $txt['ban_restriction'], '
 
-						</legend>
 
-						<input type="radio" name="full_ban" id="full_ban" value="1" onclick="fUpdateStatus();"', $context['ban']['cannot']['access'] ? ' checked="checked"' : '', ' class="input_radio" /> <label for="full_ban">', $txt['ban_full_ban'], '</label><br />
 
-						<input type="radio" name="full_ban" id="partial_ban" value="0" onclick="fUpdateStatus();"', !$context['ban']['cannot']['access'] ? ' checked="checked"' : '', ' class="input_radio" /> <label for="partial_ban">', $txt['ban_partial_ban'], '</label><br />
 
-						<input type="checkbox" name="cannot_post" id="cannot_post" value="1"', $context['ban']['cannot']['post'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_post">', $txt['ban_cannot_post'], '</label> (<a href="', $scripturl, '?action=helpadmin;help=ban_cannot_post" onclick="return reqOverlayDiv(this.href);">?</a>)<br />
 
-						<input type="checkbox" name="cannot_register" id="cannot_register" value="1"', $context['ban']['cannot']['register'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_register">', $txt['ban_cannot_register'], '</label><br />
 
-						<input type="checkbox" name="cannot_login" id="cannot_login" value="1"', $context['ban']['cannot']['login'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_login">', $txt['ban_cannot_login'], '</label><br />
 
-					</fieldset>
 
-					<br class="clear_right" />';
 
-
 
-	if (!empty($context['ban_suggestions']))
 
-	{
 
-		echo '
 
-					<fieldset>
 
-						<legend>
 
-							', $txt['ban_triggers'], '
 
-						</legend>
 
-						<dl class="settings">
 
-							<dt>
 
-								<input type="checkbox" name="ban_suggestion[]" id="main_ip_check" value="main_ip" class="input_check" />
 
-								<label for="main_ip_check">', $txt['ban_on_ip'], '</label>
 
-							</dt>
 
-							<dd>
 
-								<input type="text" name="main_ip" value="', $context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;" class="input_text" />
 
-							</dd>';
 
-
 
-		if (empty($modSettings['disableHostnameLookup']))
 
-			echo '
 
-							<dt>
 
-								<input type="checkbox" name="ban_suggestion[]" id="hostname_check" value="hostname" class="input_check" />
 
-								<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
 
-							</dt>
 
-							<dd>
 
-								<input type="text" name="hostname" value="', $context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;" class="input_text" />
 
-							</dd>';
 
-
 
-		echo '
 
-							<dt>
 
-								<input type="checkbox" name="ban_suggestion[]" id="email_check" value="email" class="input_check" checked="checked" />
 
-								<label for="email_check">', $txt['ban_on_email'], '</label>
 
-							</dt>
 
-							<dd>
 
-								<input type="text" name="email" value="', $context['ban_suggestions']['email'], '" size="44" onfocus="document.getElementById(\'email_check\').checked = true;" class="input_text" />
 
-							</dd>
 
-							<dt>
 
-								<input type="checkbox" name="ban_suggestion[]" id="user_check" value="user" class="input_check" checked="checked" />
 
-								<label for="user_check">', $txt['ban_on_username'], '</label>:
 
-							</dt>
 
-							<dd>';
 
+						<dt>
 
+							<input type="checkbox" name="ban_suggestion[]" id="user_check" value="user" class="input_check" checked="checked" />
 
+							<label for="user_check">', $txt['ban_on_username'], '</label>:
 
+						</dt>
 
+						<dd>';
 
 
 
 		if (empty($context['ban_suggestions']['member']['id']))
 
 			echo '
 
-								<input type="text" name="user" id="user" value="" size="44" class="input_text" />';
 
+							<input type="text" name="user" id="user" value="" size="44" class="input_text" />';
 
 		else
 
 			echo '
 
-								', $context['ban_suggestions']['member']['link'], '
 
-								<input type="hidden" name="bannedUser" value="', $context['ban_suggestions']['member']['id'], '" />';
 
+							', $context['ban_suggestions']['member']['link'], '
 
+							<input type="hidden" name="bannedUser" value="', $context['ban_suggestions']['member']['id'], '" />';
 
 		echo '
 
-							</dd>';
 
+						</dd>';
 
 
 
 		if (!empty($context['ban_suggestions']['message_ips']))
 
 		{
 
 			echo '
 
-						</dl>
 
-						<div>', $txt['ips_in_messages'], ':</div>
 
-						<dl class="settings">';
 
+					</dl>
 
+					<div>', $txt['ips_in_messages'], ':</div>
 
+					<dl class="settings">';
 
 
 
 			foreach ($context['ban_suggestions']['message_ips'] as $ip)
 
 				echo '
 
-							<dt>
 
-								<input type="checkbox" name="ban_suggestion[ips][]" value="', $ip, '" class="input_check" />
 
-							</dt>
 
-							<dd>
 
-								', $ip, '
 
-							</dd>';
 
+						<dt>
 
+							<input type="checkbox" name="ban_suggestion[ips][]" value="', $ip, '" class="input_check" />
 
+						</dt>
 
+						<dd>
 
+							', $ip, '
 
+						</dd>';
 
 		}
 
 
 
 		if (!empty($context['ban_suggestions']['error_ips']))
 
 		{
 
 			echo '
 
-						</dl>
 
-						<div>', $txt['ips_in_errors'], '</div>
 
-						<dl class="settings">';
 
+					</dl>
 
+					<div>', $txt['ips_in_errors'], '</div>
 
+					<dl class="settings">';
 
 
 
 			foreach ($context['ban_suggestions']['error_ips'] as $ip)
 
 				echo '
 
-							<dt>
 
-								<input type="checkbox" name="ban_suggestion[ips][]" value="', $ip, '" class="input_check" />
 
-							</dt>
 
-							<dd>
 
-								', $ip, '
 
-							</dd>';
 
+						<dt>
 
+							<input type="checkbox" name="ban_suggestion[ips][]" value="', $ip, '" class="input_check" />
 
+						</dt>
 
+						<dd>
 
+							', $ip, '
 
+						</dd>';
 
 		}
 
 
 
 		echo '
 
-							</dl>
 
-						</fieldset>';
 
+					</dl>
 
+				</fieldset>';
 
 	}
 
 
 
 	echo '
@@ -169,9 +167,8 @@ function template_ban_edit()
 
 						<input type="hidden" name="bg" value="', $context['ban']['id'], '" />
 
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 						<input type="hidden" name="', $context['admin-bet_token_var'], '" value="', $context['admin-bet_token'], '" />
 
-					</form>
 
 				</div>
 
-			</div>';
 
+			</form>';
 
 
 
 	if (!$context['ban']['is_new'] && empty($context['ban_suggestions']))
 
 	{
@@ -188,6 +185,7 @@ function template_ban_edit()
 
 						</tr>
 
 					</thead>
 
 					<tbody>';
 
+		
 
 		if (empty($context['ban_items']))
 
 			echo '
 
 						<tr class="windowbg2">
@@ -222,17 +220,15 @@ function template_ban_edit()
 
 		echo '
 
 					</tbody>
 
 				</table>
 
+				
 
 				<div class="flow_auto">
 
-					<div class="floatright">
 
-						<div class="additional_row">
 
-							<input type="submit" name="remove_selection" value="', $txt['ban_remove_selected_triggers'], '" class="button_submit" />
 
-							<a class="button_link" href="', $scripturl, '?action=admin;area=ban;sa=edittrigger;bg=', $context['ban']['id'], '">', $txt['ban_add_trigger'], '</a>
 
-						</div>
 
-					</div>
 
+					<br />
 
+					<input type="submit" name="remove_selection" value="', $txt['ban_remove_selected_triggers'], '" class="button_submit" />
 
+					<a class="button_link" href="', $scripturl, '?action=admin;area=ban;sa=edittrigger;bg=', $context['ban']['id'], '">', $txt['ban_add_trigger'], '</a>
 
+					<input type="hidden" name="bg" value="', $context['ban']['id'], '" />
 
+					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+					<input type="hidden" name="', $context['admin-bet_token_var'], '" value="', $context['admin-bet_token'], '" />
 
 				</div>
 
-				<input type="hidden" name="bg" value="', $context['ban']['id'], '" />
 
-				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-				<input type="hidden" name="', $context['admin-bet_token_var'], '" value="', $context['admin-bet_token'], '" />
 
 			</form>';
 
 
 
 	}
--- a/Themes/default/ManageBoards.template.php
+++ b/Themes/default/ManageBoards.template.php
@@ -66,7 +66,8 @@ function template_main()
 
 		{
 
 
 
 			echo '
 
-						<li', !empty($modSettings['recycle_board']) && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $board['id'] ? ' id="recycle_board"' : ' ', ' class="windowbg', $alternate ? '' : '2', '" style="padding-' . ($context['right_to_left'] ? 'right' : 'left') . ': ', 5 + 30 * $board['child_level'], 'px;', $board['move'] ? 'color: red;' : '', '"><span class="floatleft"><a href="', $scripturl, '?board=', $board['id'], '">', $board['name'], '</a>', !empty($modSettings['recycle_board']) && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $board['id'] ? '<a href="' . $scripturl . '?action=admin;area=manageboards;sa=settings"> <img src="' . $settings['images_url'] . '/post/recycled.png" alt="' . $txt['recycle_board'] . '" /></a></span>' : '</span>', '
 
+						<li', !empty($modSettings['recycle_board']) && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $board['id'] ? ' id="recycle_board"' : ' ', ' class="windowbg', $alternate ? '' : '2', '" style="padding-' . ($context['right_to_left'] ? 'right' : 'left') . ': ', 5 + 30 * $board['child_level'], 'px;', $board['move'] ? 'color: red;' : '', '">
 
+							<span class="floatleft"><a href="', $scripturl, '?board=', $board['id'], '">', $board['name'], '</a>', !empty($modSettings['recycle_board']) && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $board['id'] ? '<a href="' . $scripturl . '?action=admin;area=manageboards;sa=settings"> <img src="' . $settings['images_url'] . '/post/recycled.png" alt="' . $txt['recycle_board'] . '" /></a></span>' : '</span>', '
 
 							<span class="floatright">', $context['can_manage_permissions'] ? '<span class="modify_boards"><a href="' . $scripturl . '?action=admin;area=permissions;sa=index;pid=' . $board['permission_profile'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['mboards_permissions'] . '</a></span>' : '', '
 
 							<span class="modify_boards"><a href="', $scripturl, '?action=admin;area=manageboards;move=', $board['id'], '">', $txt['mboards_move'], '</a></span>
 
 							<span class="modify_boards"><a href="', $scripturl, '?action=admin;area=manageboards;sa=board;boardid=', $board['id'], '">', $txt['mboards_modify'], '</a></span></span><br style="clear: right;" />
@@ -98,6 +99,7 @@ function template_main()
 
 			</div>
 
 		</form>';
 
 	}
 
+	
 
 	echo '
 
 	</div>';
 
 }
@@ -120,6 +122,7 @@ function template_modify_category()
 
 				<div class="windowbg">
 
 					<div class="content">
 
 						<dl class="settings">';
 
+	
 
 	// If this isn't the only category, let the user choose where this category should be positioned down the board index.
 
 	if (count($context['category_order']) > 1)
 
 	{
@@ -127,6 +130,7 @@ function template_modify_category()
 
 						<dt><strong>', $txt['order'], ':</strong></dt>
 
 						<dd>
 
 							<select name="cat_order">';
 
+	
 
 		// Print every existing category into a select box.
 
 		foreach ($context['category_order'] as $order)
 
 			echo '
@@ -135,6 +139,7 @@ function template_modify_category()
 
 							</select>
 
 						</dd>';
 
 	}
 
+	
 
 	// Allow the user to edit the category name and/or choose whether you can collapse the category.
 
 	echo '
 
 						<dt>
--- a/Themes/default/ManageLanguages.template.php
+++ b/Themes/default/ManageLanguages.template.php
@@ -87,7 +87,7 @@ function template_download_language()
 
 						<th scope="col" width="100">
 
 							', $txt['languages_download_exists'], '
 
 						</th>
 
-						<th class="last_th" scope="col" width="50">
 
+						<th class="last_th centercol" scope="col" width="4%">
 
 							', $txt['languages_download_copy'], '
 
 						</th>
 
 					</tr>
@@ -119,7 +119,7 @@ function template_download_language()
 
 					<td>
 
 						', $file['exists'] ? ($file['exists'] == 'same' ? $txt['languages_download_exists_same'] : $txt['languages_download_exists_different']) : $txt['no'], '
 
 					</td>
 
-					<td>
 
+					<td class="centercol">
 
 						<input type="checkbox" name="copy_file[]" value="', $file['generaldest'], '"', ($file['default_copy'] ? ' checked="checked"' : ''), ' class="input_check" />
 
 					</td>
 
 				</tr>';
@@ -429,7 +429,7 @@ function template_add_language()
 
 
 
 	echo '
 
 	<div id="admincenter">
 
-		<form action="', $scripturl, '?action=admin;area=languages;sa=add;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
 
+		<form id="admin_form_wrapper"action="', $scripturl, '?action=admin;area=languages;sa=add;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
 					', $txt['add_language'], '
--- a/Themes/default/ManageMaintenance.template.php
+++ b/Themes/default/ManageMaintenance.template.php
@@ -113,7 +113,7 @@ function template_maintain_database()
 
 			<div class="content">
 
 				<form action="', $scripturl, '?action=admin;area=maintain;sa=database;activity=convertutf8" method="post" accept-charset="', $context['character_set'], '">
 
 					<p>', $txt['utf8_introduction'], '</p>
 
-					', !empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext' ? '<p class="errorbox">' . $txt['utf8_cannot_convert_fulltext'] . '</p>' : '', '
 
+					', !empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext' ? '<div class="errorbox">' . $txt['utf8_cannot_convert_fulltext'] . '</div>' : '', '
 
 					<input type="submit" value="', $txt['maintain_run_now'], '" class="button_submit" ', !empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext' ? 'disabled="disabled"' : '', '/><br class="clear_right" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '" />
--- a/Themes/default/ManageMembergroups.template.php
+++ b/Themes/default/ManageMembergroups.template.php
@@ -89,8 +89,8 @@ function template_new_group()
 
 			echo '
 
 									<option value="', $group['id'], '">', $group['name'], '</option>';
 
 		echo '
 
-								</select><br />
 
-
 
+								</select>
 
+								<br />
 
 								<input type="radio" name="perm_type" id="perm_type_copy" value="copy" class="input_radio" />
 
 								<label for="perm_type_copy">', $txt['membergroups_new_as_copy'], ':</label>
 
 								<select name="copyperm" id="copyperm_select" onclick="document.getElementById(\'perm_type_copy\').checked = true;">
@@ -100,8 +100,8 @@ function template_new_group()
 
 			echo '
 
 									<option value="', $group['id'], '">', $group['name'], '</option>';
 
 		echo '
 
-								</select><br />
 
-
 
+								</select>
 
+								<br />
 
 								<input type="radio" name="perm_type" id="perm_type_predefined" value="predefined" class="input_radio" />
 
 								<label for="perm_type_predefined">', $txt['membergroups_new_as_type'], ':</label>
 
 								<select name="level" id="level_select" onclick="document.getElementById(\'perm_type_predefined\').checked = true;">
@@ -423,7 +423,7 @@ function template_add_edit_group_boards_list($collapse = true)
 
 							</fieldset>';
 
 	else
 
 		echo '
 
-								<br />
 
+								<br class="clear" />
 
 								<span class="select_all_box">
 
 									<em>', $txt['all'], ': </em>
 
 									<input type="radio" name="select_all" id="allow_all" class="input_radio" onclick="selectAllRadio(this, this.form, \'boardaccess\', \'allow\');" /> <label for="allow_all">', $txt['board_perms_allow'], '</label>
@@ -511,7 +511,7 @@ function template_group_members()
 
 				<h4 class="titlebg">', $txt['membergroups_members_group_members'], '</h4>
 
 			</div>
 
 			<br />
 
-			<div class="pagesection">', $txt['pages'], ': ', $context['page_index'], '</div>
 
+			<div class="pagesection">', $context['page_index'], '</div>
 
 			<table width="100%" class="table_grid">
 
 				<thead>
 
 					<tr class="catbg">
@@ -594,7 +594,7 @@ function template_group_members()
 
 
 
 	echo '
 
 			<div class="pagesection flow_hidden">
 
-				<div class="floatleft">', $txt['pages'], ': ', $context['page_index'], '</div>
 
+				<div class="floatleft">', $context['page_index'], '</div>
 
 			</div>
 
 			<br />';
 
 
--- a/Themes/default/ManageMembers.template.php
+++ b/Themes/default/ManageMembers.template.php
@@ -164,8 +164,8 @@ function template_search_members()
 
 					<thead>
 
 						<tr class="catbg">
 
 							<th scope="col" class="first_th">', $txt['membergroups'], '</th>
 
-							<th scope="col">', $txt['primary'], '</th>
 
-							<th scope="col" class="last_th">', $txt['additional'], '</th>
 
+							<th scope="col" class="centercol">', $txt['primary'], '</th>
 
+							<th scope="col" class="last_th centercol">', $txt['additional'], '</th>
 
 						</tr>
 
 					</thead>
 
 					<tbody>';
@@ -174,10 +174,10 @@ function template_search_members()
 
 				echo '
 
 						<tr class="windowbg2">
 
 							<td>', $membergroup['name'], '</td>
 
-							<td align="center">
 
+							<td class="centercol">
 
 								<input type="checkbox" name="membergroups[1][]" value="', $membergroup['id'], '" checked="checked" class="input_check" />
 
 							</td>
 
-							<td align="center">
 
+							<td class="centercol">
 
 								', $membergroup['can_be_additional'] ? '<input type="checkbox" name="membergroups[2][]" value="' . $membergroup['id'] . '" checked="checked" class="input_check" />' : '', '
 
 							</td>
 
 						</tr>';
@@ -187,10 +187,10 @@ function template_search_members()
 
 							<td>
 
 								<em>', $txt['check_all'], '</em>
 
 							</td>
 
-							<td align="center">
 
+							<td class="centercol">
 
 								<input type="checkbox" onclick="invertAll(this, this.form, \'membergroups[1]\');" checked="checked" class="input_check" />
 
 							</td>
 
-							<td align="center">
 
+							<td class="centercol">
 
 								<input type="checkbox" onclick="invertAll(this, this.form, \'membergroups[2]\');" checked="checked" class="input_check" />
 
 							</td>
 
 						</tr>
@@ -214,7 +214,7 @@ function template_search_members()
 
 							<td>
 
 								', $postgroup['name'], '
 
 							</td>
 
-							<td width="40" align="center">
 
+							<td width="40" class="centercol">
 
 								<input type="checkbox" name="postgroups[]" value="', $postgroup['id'], '" checked="checked" class="input_check" />
 
 							</td>
 
 						</tr>';
@@ -224,13 +224,14 @@ function template_search_members()
 
 							<td>
 
 								<em>', $txt['check_all'], '</em>
 
 							</td>
 
-							<td align="center">
 
+							<td class="centercol">
 
 								<input type="checkbox" onclick="invertAll(this, this.form, \'postgroups[]\');" checked="checked" class="input_check" />
 
 							</td>
 
 						</tr>
 
 					</tbody>
 
 				</table>
 
-			</div><br />
 
+			</div>
 
+			<br />
 
 			<input type="submit" value="', $txt['search'], '" class="button_submit" />
 
 		</form>
 
 	</div>';
--- a/Themes/default/ManageNews.template.php
+++ b/Themes/default/ManageNews.template.php
@@ -210,7 +210,7 @@ function template_email_members_compose()
 
 		<form name="newsmodify" action="', $scripturl, '?action=admin;area=news;sa=mailingsend" method="post" accept-charset="', $context['character_set'], '">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<a href="', $scripturl, '?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" class="icon" /></a> ', $txt['admin_newsletters'], '
 
+					<a href="', $scripturl, '?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" class="icon" /></a> ', $txt['admin_newsletters'], '
 
 				</h3>
 
 			</div>
 
 			<div class="information">
@@ -407,7 +407,7 @@ function template_email_members_send()
 
 		<form action="', $scripturl, '?action=admin;area=news;sa=mailingsend" method="post" accept-charset="', $context['character_set'], '" name="autoSubmit" id="autoSubmit">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<a href="', $scripturl, '?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a> ', $txt['admin_newsletters'], '
 
+					<a href="', $scripturl, '?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" /></a> ', $txt['admin_newsletters'], '
 
 				</h3>
 
 			</div>
 
 			<div class="windowbg">
--- a/Themes/default/ManagePermissions.template.php
+++ b/Themes/default/ManagePermissions.template.php
@@ -22,7 +22,7 @@ function template_permission_index()
 
 	</div>';
 
 
 
 	echo '
 
-	<div id="admincenter">
 
+	<div id="admin_form_wrapper">
 
 		<form action="', $scripturl, '?action=admin;area=permissions;sa=quick" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" id="permissionForm">';
 
 
 
 		if (!empty($context['profile']))
@@ -30,25 +30,30 @@ function template_permission_index()
 
 			<div class="title_bar">
 
 				<h3 class="titlebg">', $txt['permissions_for_profile'], ': &quot;', $context['profile']['name'], '&quot;</h3>
 
 			</div>';
 
+		else
 
+			echo '
 
+			<div class="title_bar">
 
+				<h3 class="titlebg">', $txt['permissions_title'], '</h3>
 
+			</div>';
 
 
 
 		echo '
 
 			<table width="100%" class="table_grid">
 
 				<thead>
 
 					<tr class="catbg">
 
 						<th class="first_th">', $txt['membergroups_name'], '</th>
 
-						<th width="10%" align="center" valign="middle">', $txt['membergroups_members_top'], '</th>';
 
+						<th width="10%" style="text-align:center" valign="middle">', $txt['membergroups_members_top'], '</th>';
 
 
 
 			if (empty($modSettings['permission_enable_deny']))
 
 				echo '
 
-						<th width="16%" align="center">', $txt['membergroups_permissions'], '</th>';
 
+						<th width="16%" style="text-align:center">', $txt['membergroups_permissions'], '</th>';
 
 			else
 
 				echo '
 
-						<th width="8%" align="center">', $txt['permissions_allowed'], '</th>
 
-						<th width="8%" align="center">', $txt['permissions_denied'], '</th>';
 
+						<th width="8%" style="text-align:center">', $txt['permissions_allowed'], '</th>
 
+						<th width="8%" style="text-align:center">', $txt['permissions_denied'], '</th>';
 
 
 
 			echo '
 
-						<th width="10%" align="center" valign="middle">', $context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view'], '</th>
 
-						<th class="last_th" width="4%" align="center" valign="middle">
 
+						<th width="10%" style="text-align:center" valign="middle">', $context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view'], '</th>
 
+						<th class="last_th" width="4%" style="text-align: center" valign="middle">
 
 							', $context['can_modify'] ? '<input type="checkbox" class="input_check" onclick="invertAll(this, this.form, \'group\');" />' : '', '
 
 						</th>
 
 					</tr>
@@ -62,11 +67,12 @@ function template_permission_index()
 
 		echo '
 
 					<tr class="windowbg', $alternate ? '2' : '', '">
 
 						<td>
 
-							', $group['name'], $group['id'] == -1 ? ' (<a href="' . $scripturl . '?action=helpadmin;help=membergroup_guests" onclick="return reqOverlayDiv(this.href);">?</a>)' : ($group['id'] == 0 ? ' (<a href="' . $scripturl . '?action=helpadmin;help=membergroup_regular_members" onclick="return reqOverlayDiv(this.href);">?</a>)' : ($group['id'] == 1 ? ' (<a href="' . $scripturl . '?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)' : ($group['id'] == 3 ? ' (<a href="' . $scripturl . '?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)' : '')));
 
+							', $group['id'] == -1 ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=membergroup_guests" onclick="return reqOverlayDiv(this.href);"><img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>' : ($group['id'] == 0 ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=membergroup_regular_members" onclick="return reqOverlayDiv(this.href);"><img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>' : ($group['id'] == 1 ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);"><img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>' : ($group['id'] == 3 ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);"><img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>' : '<img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/blank.png" width="16px" alt="' . $txt['help'] . '" />'))), '&nbsp;<span>', $group['name'], '</span>';
 
 
 
 		if (!empty($group['children']))
 
 			echo '
 
-							<br /><span class="smalltext">', $txt['permissions_includes_inherited'], ': &quot;', implode('&quot;, &quot;', $group['children']), '&quot;</span>';
 
+							<br />
 
+							<span class="smalltext">', $txt['permissions_includes_inherited'], ': &quot;', implode('&quot;, &quot;', $group['children']), '&quot;</span>';
 
 
 
 		echo '
 
 						</td>
@@ -107,7 +113,7 @@ function template_permission_index()
 
 						<legend>', $txt['permissions_with_selection'], '</legend>
 
 						<dl class="settings admin_permissions">
 
 							<dt>
 
-								', $txt['permissions_apply_pre_defined'], ' <a href="', $scripturl, '?action=helpadmin;help=permissions_quickgroups" onclick="return reqOverlayDiv(this.href);">(?)</a>:
 
+								<a class="help" href="', $scripturl, '?action=helpadmin;help=permissions_quickgroups" onclick="return reqOverlayDiv(this.href);"><img class="icon" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>', $txt['permissions_apply_pre_defined'], ':
 
 							</dt>
 
 							<dd>
 
 								<select name="predefined">
@@ -207,8 +213,8 @@ function template_permission_index()
 
 			aSwapLinks: [
 
 				{
 
 					sId: \'permissions_panel_link\',
 
-					msgExpanded: ', JavaScriptEscape($txt['advanced']), ',
 
-					msgCollapsed: ', JavaScriptEscape($txt['advanced']), '
 
+					msgExpanded: ', JavaScriptEscape($txt['permissions_advanced_options']), ',
 
+					msgCollapsed: ', JavaScriptEscape($txt['permissions_advanced_options']), '
 
 				}
 
 			],
 
 			oThemeOptions: {
@@ -264,38 +270,40 @@ function template_by_board()
 
 	global $context, $settings, $options, $scripturl, $txt, $modSettings;
 
 
 
 	echo '
 
-	<form id="admincenter" action="', $scripturl, '?action=admin;area=permissions;sa=board" method="post" accept-charset="', $context['character_set'], '">
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">', $txt['permissions_boards'], '</h3>
 
-		</div>
 
-		<div class="information">
 
-			', $txt['permissions_boards_desc'], '
 
-		</div>
 
-		<div class="title_bar">
 
-			<h3 id="board_permissions" class="titlebg flow_hidden">
 
-				<span class="perm_name floatleft">', $txt['board_name'], '</span>
 
-				<span class="perm_profile floatleft">', $txt['permission_profile'], '</span>
 
-			</h3>
 
-		</div>';
 
+	<div id="admincenter">
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=permissions;sa=board" method="post" accept-charset="', $context['character_set'], '">
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">', $txt['permissions_boards'], '</h3>
 
+			</div>
 
+			<div class="information">
 
+				', $txt['permissions_boards_desc'], '
 
+			</div>
 
+			
 
+			<div class="title_bar">
 
+				<h3 id="board_permissions" class="titlebg flow_hidden">
 
+					<span class="perm_name floatleft">', $txt['board_name'], '</span>
 
+					<span class="perm_profile floatleft">', $txt['permission_profile'], '</span>';
 
 
 
 	if (!$context['edit_all'])
 
 		echo '
 
-			<div class="content flow_auto">
 
-			<a class="button_link" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a>
 
+					<span class="floatright"><a class="button_link" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a></span>';
 
+	
 
+	echo '
 
+				</h3>
 
 			</div>';
 
-
 
+		
 
 	foreach ($context['categories'] as $category)
 
 	{
 
 		echo '
 
-		<div class="cat_bar">
 
-			<h3 class="catbg"><strong>', $category['name'], '</strong></h3>
 
-		</div>';
 
+			<div class="title_bar">
 
+				<h3 class="titlebg"><strong>', $category['name'], '</strong></h3>
 
+			</div>';
 
 
 
 		if (!empty($category['boards']))
 
 			echo '
 
-		<div class="windowbg">
 
-			<div class="content">
 
-				<ul class="perm_boards flow_hidden">';
 
+			<div class="windowbg">
 
+				<div class="content">
 
+					<ul class="perm_boards flow_hidden">';
 
 
 
 		$alternate = false;
 
 
@@ -305,54 +313,56 @@ function template_by_board()
 
 
 
 			echo '
 
 
 
-					<li class="flow_hidden' ,' windowbg', $alternate ? '' : '2','">
 
-						<span class="perm_board floatleft">
 
-							<a href="', $scripturl, '?action=admin;area=manageboards;sa=board;boardid=', $board['id'], ';rid=permissions;', $context['session_var'], '=', $context['session_id'], '">', str_repeat('-', $board['child_level']), ' ', $board['name'], '</a>
 
-						</span>
 
-						<span class="perm_boardprofile floatleft">';
 
+						<li class="flow_hidden' ,' windowbg', $alternate ? '' : '2','">
 
+							<span class="perm_board floatleft">
 
+								<a href="', $scripturl, '?action=admin;area=manageboards;sa=board;boardid=', $board['id'], ';rid=permissions;', $context['session_var'], '=', $context['session_id'], '">', str_repeat('-', $board['child_level']), ' ', $board['name'], '</a>
 
+							</span>
 
+							<span class="perm_boardprofile floatleft">';
 
+			
 
 			if ($context['edit_all'])
 
 			{
 
 				echo '
 
-							<select name="boardprofile[', $board['id'], ']">';
 
+								<select name="boardprofile[', $board['id'], ']">';
 
 
 
 				foreach ($context['profiles'] as $id => $profile)
 
 					echo '
 
-								<option value="', $id, '" ', $id == $board['profile'] ? 'selected="selected"' : '', '>', $profile['name'], '</option>';
 
+									<option value="', $id, '" ', $id == $board['profile'] ? 'selected="selected"' : '', '>', $profile['name'], '</option>';
 
 
 
 				echo '
 
-							</select>';
 
+								</select>';
 
 			}
 
 			else
 
 				echo '
 
-							<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $board['profile'], ';', $context['session_var'], '=', $context['session_id'], '"> [', $board['profile_name'], ']</a>';
 
+								<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $board['profile'], ';', $context['session_var'], '=', $context['session_id'], '"> [', $board['profile_name'], ']</a>';
 
 
 
 			echo '
 
-						</span>
 
-					</li>';
 
+							</span>
 
+						</li>';
 
 		}
 
 
 
 		if (!empty($category['boards']))
 
 			echo '
 
-				</ul>
 
-			</div>
 
-		</div>';
 
+					</ul>
 
+				</div>
 
+			</div>';
 
 	}
 
 
 
 	echo '
 
-		<div class="content">';
 
+			<div class="content">';
 
 
 
 	if ($context['edit_all'])
 
 		echo '
 
-			<input type="submit" name="save_changes" value="', $txt['save'], '" class="button_submit" />';
 
+				<input type="submit" name="save_changes" value="', $txt['save'], '" class="button_submit" />';
 
 	else
 
 		echo '
 
-			<a class="button_link" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a>';
 
+				<a class="button_link" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a>';
 
 	
 
 	echo '
 
-			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-			<input type="hidden" name="', $context['admin-mpb_token_var'], '" value="', $context['admin-mpb_token'], '" />
 
-		</div>
 
-	</form>';
 
+				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+				<input type="hidden" name="', $context['admin-mpb_token_var'], '" value="', $context['admin-mpb_token'], '" />
 
+			</div>
 
+		</form>
 
+	</div>';
 
 }
 
 
 
 // Edit permission profiles (predefined).
@@ -361,10 +371,10 @@ function template_edit_profiles()
 
 	global $context, $settings, $options, $scripturl, $txt, $modSettings;
 
 
 
 	echo '
 
-	<div id="admincenter">
 
+	<div id="admin_form_wrapper">
 
 		<form action="', $scripturl, '?action=admin;area=permissions;sa=profiles" method="post" accept-charset="', $context['character_set'], '">
 
-			<div class="title_bar">
 
-				<h3 class="titlebg">', $txt['permissions_profile_edit'], '</h3>
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">', $txt['permissions_profile_edit'], '</h3>
 
 			</div>
 
 
 
 			<table width="100%" class="table_grid">
@@ -485,7 +495,7 @@ function template_modify_group()
 
 
 
 	echo '
 
 	<div id="admincenter">
 
-		<form action="', $scripturl, '?action=admin;area=permissions;sa=modify2;group=', $context['group']['id'], ';pid=', $context['profile']['id'], '" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" id="permissionForm" onsubmit="return warnAboutDeny();">';
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=permissions;sa=modify2;group=', $context['group']['id'], ';pid=', $context['profile']['id'], '" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" " onsubmit="return warnAboutDeny();">';
 
 
 
 	if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1)
 
 		echo '
@@ -1059,10 +1069,10 @@ function template_postmod_permissions()
 
 	global $context, $settings, $options, $scripturl, $txt, $modSettings;
 
 
 
 	echo '
 
-	<div id="admincenter">
 
+	<div id="admin_form_wrapper">
 
 		<form action="', $scripturl, '?action=admin;area=permissions;sa=postmod;', $context['session_var'], '=', $context['session_id'], '" method="post" name="postmodForm" id="postmodForm" accept-charset="', $context['character_set'], '">
 
-			<div class="title_bar">
 
-				<h3 class="titlebg">', $txt['permissions_post_moderation'], '</h3>
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">', $txt['permissions_post_moderation'], '</h3>
 
 			</div>';
 
 
 
 	// Got advanced permissions - if so warn!
@@ -1082,22 +1092,22 @@ function template_postmod_permissions()
 
 
 
 	echo '
 
 					</select>
 
-					<input type="submit" value="', $txt['go'], '" class="button_submit" style="margin-top: 5px;" />
 
+					<input type="submit" value="', $txt['go'], '" class="button_submit" />
 
 			</div>
 
 			<table width="100%" class="table_grid">
 
 				<thead>
 
 					<tr class="catbg">
 
 						<th class="first_th"></th>
 
-						<th align="center" colspan="3">
 
+						<th class="centercol" colspan="3">
 
 							', $txt['permissions_post_moderation_new_topics'], '
 
 						</th>
 
-						<th align="center" colspan="3">
 
+						<th class="centercol" colspan="3">
 
 							', $txt['permissions_post_moderation_replies_own'], '
 
 						</th>
 
-						<th align="center" colspan="3">
 
+						<th class="centercol" colspan="3">
 
 							', $txt['permissions_post_moderation_replies_any'], '
 
 						</th>
 
-						<th class="last_th" align="center" colspan="3">
 
+						<th class="last_th centercol" colspan="3">
 
 							', $txt['permissions_post_moderation_attachments'], '
 
 						</th>
 
 					</tr>
--- a/Themes/default/ManageSearch.template.php
+++ b/Themes/default/ManageSearch.template.php
@@ -16,7 +16,7 @@ function template_modify_weights()
 
 
 
 	echo '
 
 	<div id="admincenter">
 
-		<form action="', $scripturl, '?action=admin;area=managesearch;sa=weights" method="post" accept-charset="', $context['character_set'], '">
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=managesearch;sa=weights" method="post" accept-charset="', $context['character_set'], '">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">', $txt['search_weights'], '</h3>
 
 			</div>
@@ -79,7 +79,6 @@ function template_modify_weights()
 
 							<span class="search_weight"><strong>100%</strong></span>
 
 						</dd>
 
 					</dl>
 
-					<hr class="hrcolor" />
 
 					<input type="submit" name="save" value="', $txt['search_weights_save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-msw_token_var'], '" value="', $context['admin-msw_token'], '" />
@@ -95,13 +94,17 @@ function template_select_search_method()
 
 
 
 	echo '
 
 	<div id="admincenter">
 
-		<form action="', $scripturl, '?action=admin;area=managesearch;sa=method" method="post" accept-charset="', $context['character_set'], '">
 
+		<div class="cat_bar">
 
+			<h3 class="catbg">', $txt['search_method'], '</h3>
 
+		</div>
 
+		<div class="information">
 
+			<div class="smalltext" style="font-weight: normal;"><a href="', $scripturl, '?action=helpadmin;help=search_why_use_index" onclick="return reqOverlayDiv(this.href);">', $txt['search_create_index_why'], '</a></div>
 
+		</div>
 
+			
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=managesearch;sa=method" method="post" accept-charset="', $context['character_set'], '">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">', $txt['search_method'], '</h3>
 
 			</div>
 
-			<div class="information">
 
-				<div class="smalltext" style="font-weight: normal;"><a href="', $scripturl, '?action=helpadmin;help=search_why_use_index" onclick="return reqOverlayDiv(this.href);">', $txt['search_create_index_why'], '</a></div>
 
-			</div>
 
 			<div class="windowbg">
 
 				<div class="content">
 
 					<dl class="settings">
@@ -205,7 +208,7 @@ function template_select_search_method()
 
 						<input type="checkbox" name="search_force_index" id="search_force_index_check" value="1"', empty($modSettings['search_force_index']) ? '' : ' checked="checked"', ' class="input_check" /><label for="search_force_index_check">', $txt['search_force_index'], '</label><br />
 
 						<input type="checkbox" name="search_match_words" id="search_match_words_check" value="1"', empty($modSettings['search_match_words']) ? '' : ' checked="checked"', ' class="input_check" /><label for="search_match_words_check">', $txt['search_match_words'], '</label>
 
 					</fieldset>
 
-					<hr class="hrcolor clear" />
 
+					<br class="clear"/>
 
 					<input type="submit" name="save" value="', $txt['search_method_save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-msmpost_token_var'], '" value="', $context['admin-msmpost_token'], '" />
@@ -321,7 +324,7 @@ function template_spider_edit()
 
 	global $context, $settings, $options, $scripturl, $txt;
 
 	echo '
 
 	<div id="admincenter">
 
-		<form action="', $scripturl, '?action=admin;area=sengines;sa=editspiders;sid=', $context['spider']['id'], '" method="post" accept-charset="', $context['character_set'], '">
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=sengines;sa=editspiders;sid=', $context['spider']['id'], '" method="post" accept-charset="', $context['character_set'], '">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">', $context['page_title'], '</h3>
 
 			</div>
@@ -408,11 +411,10 @@ function template_show_spider_stats()
 
 	template_show_list('spider_stat_list');
 
 
 
 	echo '
 
-		<br />
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">', $txt['spider_logs_delete'], '</h3>
 
-		</div>
 
-		<form action="', $scripturl, '?action=admin;area=sengines;sa=stats" method="post" accept-charset="', $context['character_set'], '">
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=sengines;sa=stats" method="post" accept-charset="', $context['character_set'], '">
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">', $txt['spider_logs_delete'], '</h3>
 
+			</div>
 
 			<div class="windowbg">
 
 				<div class="content">
 
 					<p>
--- a/Themes/default/ManageSmileys.template.php
+++ b/Themes/default/ManageSmileys.template.php
@@ -33,9 +33,9 @@ function template_editsets()
 
 	</div>
 
 	
 
 	<script type="text/javascript"><!-- // --><![CDATA[
 
-		window.smfForum_scripturl = "', $scripturl, '";
 
-		window.smfForum_sessionid = "', $context['session_id'], '";
 
-		window.smfForum_sessionvar = "', $context['session_var'], '";
 
+		window.smfForum_scripturl = smf_scripturl;
 
+		window.smfForum_sessionid = smf_session_id;
 
+		window.smfForum_sessionvar = smf_session_var;
 
 	// ]]></script>';
 
 
 
 	if (empty($modSettings['disable_smf_js']))
--- a/Themes/default/Memberlist.template.php
+++ b/Themes/default/Memberlist.template.php
@@ -19,7 +19,7 @@ function template_main()
 
 	<div class="main_section" id="memberlist">
 
 		<div class="pagesection">
 
 			', template_button_strip($context['memberlist_buttons'], 'right'), '
 
-			<div class="pagelinks floatleft">', $txt['pages'], ': ', $context['page_index'], '</div>
 
+			<div class="pagelinks floatleft">', $context['page_index'], '</div>
 
 		</div>
 
 		<div class="cat_bar">
 
 			<h4 class="catbg">
@@ -142,7 +142,7 @@ function template_main()
 
 	// Show the page numbers again. (makes 'em easier to find!)
 
 	echo '
 
 		<div class="pagesection">
 
-			<div class="pagelinks floatleft">', $txt['pages'], ': ', $context['page_index'], '</div>';
 
+			<div class="pagelinks floatleft">', $context['page_index'], '</div>';
 
 
 
 	// If it is displaying the result of a search show a "search again" link to edit their criteria.
 
 	if (isset($context['old_search']))
@@ -168,7 +168,7 @@ function template_search()
 
 			</div>
 
 			<div class="cat_bar">
 
 				<h3 class="catbg mlist">
 
-					', !empty($settings['use_buttons']) ? '<img src="' . $settings['images_url'] . '/buttons/search.png" alt="" class="icon" />' : '', $txt['mlist_search'], '
 
+					', !empty($settings['use_buttons']) ? '<img src="' . $settings['images_url'] . '/buttons/search_hd.png" alt="" class="icon" />' : '', $txt['mlist_search'], '
 
 				</h3>
 
 			</div>
 
 			<div id="memberlist_search" class="clear">
@@ -191,9 +191,9 @@ function template_search()
 
 							<label for="fields-', $id, '"><input type="checkbox" name="fields[]" id="fields-', $id, '" value="', $id, '" ', in_array($id, $context['search_defaults']) ? 'checked="checked"' : '', ' class="input_check floatright" />', $title, '</label>
 
 						</dd>';
 
 	}
 
+	
 
 	echo '
 
 					</dl>
 
-					<hr class="hrcolor" />
 
 					<div class="flow_auto">
 
 						<input type="submit" name="submit" value="' . $txt['search'] . '" class="button_submit" />
 
 					</div>
--- a/Themes/default/ModerationCenter.template.php
+++ b/Themes/default/ModerationCenter.template.php
@@ -55,7 +55,7 @@ function template_latest_news()
 
 	echo '
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">
 
-				<a href="', $scripturl, '?action=helpadmin;help=live_news" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" class="icon" /></a> ', $txt['mc_latest_news'], '
 
+				<a href="', $scripturl, '?action=helpadmin;help=live_news" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" class="icon" /></a> ', $txt['mc_latest_news'], '
 
 			</h3>
 
 		</div>
 
 		<div class="windowbg">
@@ -218,7 +218,7 @@ function template_notes()
 
 			echo '
 
 					</ul>
 
 					<div class="pagesection notes">
 
-						<span class="smalltext">', $txt['pages'], ': ', $context['page_index'], '</span>
 
+						<span class="smalltext">', $context['page_index'], '</span>
 
 					</div>';
 
 		}
 
 
@@ -334,7 +334,7 @@ function template_unapproved_posts()
 
 	else
 
 		echo '
 
 			<div class="pagesection floatleft">
 
-				', $txt['pages'], ': ', $context['page_index'], '
 
+				', $context['page_index'], '
 
 			</div>';
 
 
 
 	foreach ($context['unapproved_items'] as $item)
@@ -388,7 +388,7 @@ function template_unapproved_posts()
 
 	if (!empty($context['unapproved_items']))
 
 		echo '
 
 			<div class="floatleft">
 
-				<div class="pagelinks">', $txt['pages'], ': ', $context['page_index'], '</div>
 
+				<div class="pagelinks">', $context['page_index'], '</div>
 
 			</div>';
 
 
 
 	echo '
--- a/Themes/default/Packages.template.php
+++ b/Themes/default/Packages.template.php
@@ -530,42 +530,39 @@ function template_browse()
 
 	if ($context['sub_action'] == 'browse')
 
 	{
 
 		echo '
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">
 
-				<a href="', $scripturl, '?action=helpadmin;help=latest_packages" onclick="return reqOverlayDiv(this.href);" class="help"><img class="icon" src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a> ', $txt['packages_latest'], '
 
-			</h3>
 
-		</div>
 
-		<div class="windowbg2">
 
-			<div class="content">
 
-				<div id="packagesLatest">', $txt['packages_latest_fetch'], '</div>
 
+		<div id="admin_form_wrapper">
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">
 
+					<a href="', $scripturl, '?action=helpadmin;help=latest_packages" onclick="return reqOverlayDiv(this.href);" class="help"><img class="icon" src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" /></a> ', $txt['packages_latest'], '
 
+				</h3>
 
+			</div>
 
+			<div class="windowbg2">
 
+				<div class="content">
 
+					<div id="packagesLatest">', $txt['packages_latest_fetch'], '</div>
 
+				</div>
 
 			</div>
 
-		</div>
 
 
 
-		<script type="text/javascript"><!-- // --><![CDATA[
 
-			window.smfForum_scripturl = "', $scripturl, '";
 
-			window.smfForum_sessionid = "', $context['session_id'], '";
 
-			window.smfForum_sessionvar = "', $context['session_var'], '";';
 
+			<script type="text/javascript"><!-- // --><![CDATA[
 
+				window.smfForum_scripturl = smf_scripturl;
 
+				window.smfForum_sessionid = smf_session_id;
 
+				window.smfForum_sessionvar = smf_session_var;';
 
 
 
 		// Make a list of already installed mods so nothing is listed twice ;).
 
 		echo '
 
-			window.smfInstalledPackages = ["', implode('", "', $context['installed_mods']), '"];
 
-			window.smfVersion = "', $context['forum_version'], '";
 
-		// ]]></script>';
 
+				window.smfInstalledPackages = ["', implode('", "', $context['installed_mods']), '"];
 
+				window.smfVersion = "', $context['forum_version'], '";
 
+			// ]]></script>';
 
 
 
 		if (empty($modSettings['disable_smf_js']))
 
 			echo '
 
-		<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=latest-packages.js"></script>';
 
+			<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=latest-packages.js"></script>';
 
 
 
 		echo '
 
-		<script type="text/javascript"><!-- // --><![CDATA[
 
-			var tempOldOnload;
 
-			smfSetLatestPackages();
 
-		// ]]></script>';
 
+			<script type="text/javascript"><!-- // --><![CDATA[
 
+				var tempOldOnload;
 
+				smfSetLatestPackages();
 
+			// ]]></script>
 
 
 
-		echo '
 
-		<br class="clear" />
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">', $txt['browse_packages'], '</h3>
 
 		</div>';
 
 	}
 
 
@@ -581,7 +578,7 @@ function template_browse()
 
 
 
 	if (!$mods_available)
 
 		echo '
 
-		<div class="information">', $context['sub_action'] == 'browse' ? $txt['no_packages'] : $txt['no_mods_installed'], '</div>';
 
+		<div class="descbox">', $context['sub_action'] == 'browse' ? $txt['no_packages'] : $txt['no_mods_installed'], '</div>';
 
 
 
 	// the advanced (emulation) box, collapsed by default
 
 	echo '
@@ -679,7 +676,7 @@ function template_servers()
 
 					</div>';
 
 
 
 	echo '
 
-	<div id="admincenter">
 
+	<div id="admin_form_wrapper">
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">', $txt['download_new_package'], '</h3>
 
 		</div>';
@@ -1088,7 +1085,7 @@ function template_install_options()
 
 							<input type="checkbox" name="package_make_full_backups" id="package_make_full_backups" value="1" class="input_check"', $context['package_make_full_backups'] ? ' checked="checked"' : '', ' />
 
 						</dd>
 
 					</dl>
 
-					<hr class="hrcolor" />
 
+
 
 					<input type="submit" name="save" value="', $txt['save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 				</form>
@@ -1497,7 +1494,7 @@ function template_file_permissions()
 
 	// ]]></script>';
 
 
 
 		echo '
 
-	<div class="information">
 
+	<div class="noticebox">
 
 		<div>
 
 			<strong>', $txt['package_file_perms_warning'], ':</strong>
 
 			<div class="smalltext">
@@ -1597,11 +1594,10 @@ function template_file_permissions()
 
 					', $txt['package_file_perms_ftp_details'], ':
 
 				</p>
 
 				', template_control_chmod(), '
 
-				<div class="information">', $txt['package_file_perms_ftp_retain'], '</div>';
 
+				<div class="descbox">', $txt['package_file_perms_ftp_retain'], '</div>';
 
 
 
 	echo '
 
 				<span id="test_ftp_placeholder_full"></span>
 
-				<hr class="hrcolor" />
 
 				<input type="hidden" name="action_changes" value="1" />
 
 				<input type="submit" value="', $txt['package_file_perms_go'], '" name="go" class="button_submit" />
 
 			</div>
--- a/Themes/default/PersonalMessage.template.php
+++ b/Themes/default/PersonalMessage.template.php
@@ -535,7 +535,7 @@ function template_folder()
 
 			echo '
 
 
 
 	<div class="pagesection">
 
-		<div class="floatleft">', $txt['pages'], ': ', $context['page_index'], '</div>
 
+		<div class="floatleft">', $context['page_index'], '</div>
 
 		<div class="floatright"><input type="submit" name="del_selected" value="', $txt['quickmod_delete_selected'], '" style="font-weight: normal;" onclick="if (!confirm(\'', $txt['delete_selected_confirm'], '\')) return false;" class="button_submit" /></div>
 
 	</div>';
 
 
@@ -637,7 +637,7 @@ function template_subject_list()
 
 	</tbody>
 
 	</table>
 
 	<div class="pagesection">
 
-		<div class="floatleft">', $txt['pages'], ': ', $context['page_index'], '</div>
 
+		<div class="floatleft">', $context['page_index'], '</div>
 
 		<div class="floatright">&nbsp;';
 
 
 
 	if ($context['show_delete'])
@@ -846,7 +846,7 @@ function template_search_results()
 
 			<h3 class="catbg">', $txt['pm_search_results'], '</h3>
 
 		</div>
 
 		<div class="pagesection">
 
-			<strong>', $txt['pages'], ':</strong> ', $context['page_index'], '
 
+			', $context['page_index'], '
 
 		</div>';
 
 
 
 	// complete results ?
@@ -947,7 +947,7 @@ function template_search_results()
 
 
 
 	echo '
 
 		<div class="pagesection">
 
-			<strong>', $txt['pages'], ':</strong> ', $context['page_index'], '
 
+			', $context['page_index'], '
 
 		</div>';
 
 
 
 }
@@ -992,7 +992,7 @@ function template_send()
 
 					</div>
 
 				</div>
 
 			</div>
 
-		</div><br />';
 
+		</div>';
 
 
 
 	// Main message editing box.
 
 	echo '
@@ -1936,7 +1936,7 @@ function template_showPMDrafts()
 
 			</h3>
 
 		</div>
 
 		<div class="pagesection">
 
-			<span>', $txt['pages'], ': ', $context['page_index'], '</span>
 
+			<span>', $context['page_index'], '</span>
 
 		</div>';
 
 
 
 	// Button shortcuts
@@ -1985,7 +1985,7 @@ function template_showPMDrafts()
 
 	// Show page numbers.
 
 	echo '
 
 		<div class="pagesection" style="margin-bottom: 0;">
 
-			<span>', $txt['pages'], ': ', $context['page_index'], '</span>
 
+			<span>', $context['page_index'], '</span>
 
 		</div>';
 
 }
 
 ?>
--- a/Themes/default/Profile.template.php
+++ b/Themes/default/Profile.template.php
@@ -51,7 +51,7 @@ function template_summary()
 
 	echo '
 
 <div class="cat_bar">
 
 	<h3 class="catbg">
 
-		<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />', $txt['summary'], '
 
+		<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />', $txt['summary'], '
 
 	</h3>
 
 </div>
 
 <div id="profileview" class="flow_auto">
@@ -65,12 +65,12 @@ function template_summary()
 
 	// What about if we allow email only via the forum??
 
 	if ($context['member']['show_email'] === 'yes' || $context['member']['show_email'] === 'no_through_forum' || $context['member']['show_email'] === 'yes_permission_override' && $context['can_send_email'])
 
 		echo '
 
-					<li><a href="', $scripturl, '?action=emailuser;sa=email;uid=', $context['member']['id'], '" title="', $context['member']['show_email'] == 'yes' || $context['member']['show_email'] == 'yes_permission_override' ? $context['member']['email'] : '', '" rel="nofollow"><img src="', $settings['images_url'], '/email_sm.png" alt="', $txt['email'], '" /></a></li>';
 
+					<li><a href="', $scripturl, '?action=emailuser;sa=email;uid=', $context['member']['id'], '" title="', $context['member']['show_email'] == 'yes' || $context['member']['show_email'] == 'yes_permission_override' ? $context['member']['email'] : '', '" rel="nofollow"><img src="', $settings['images_url'], '/email_sm.png" alt="', $txt['email'], '" class="centericon" /></a></li>';
 
 
 
 	// Don't show an icon if they haven't specified a website.
 
 	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website']))
 
 		echo '
 
-					<li><a href="', $context['member']['website']['url'], '" title="' . $context['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/www_sm.png" alt="' . $context['member']['website']['title'] . '" />' : $txt['www']), '</a></li>';
 
+					<li><a href="', $context['member']['website']['url'], '" title="' . $context['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/www_sm.png" alt="' . $context['member']['website']['title'] . '" class="centericon" />' : $txt['www']), '</a></li>';
 
 
 
 	// Are there any custom profile fields for the summary?
 
 	if (!empty($context['custom_fields']))
@@ -103,6 +103,7 @@ function template_summary()
 
 	if (!$context['user']['is_owner'] && $context['can_send_pm'])
 
 		echo '
 
 					<a href="', $scripturl, '?action=pm;sa=send;u=', $context['id_member'], '">', $txt['profile_sendpm_short'], '</a><br />';
 
+	
 
 	echo '
 
 					<a href="', $scripturl, '?action=profile;area=showposts;u=', $context['id_member'], '">', $txt['showPosts'], '</a><br />';
 
 
@@ -633,7 +634,7 @@ function template_editIgnoreList()
 
 	<div class="generic_list_wrapper" id="edit_buddies">
 
 		<div class="title_bar">
 
 			<h3 class="titlebg">
 
-				<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />', $txt['editIgnoreList'], '
 
+				<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />', $txt['editIgnoreList'], '
 
 			</h3>
 
 		</div>
 
 		<table border="0" width="100%" cellspacing="1" cellpadding="4" class="table_grid" align="center">
@@ -778,7 +779,8 @@ function template_trackActivity()
 
 					</dl>
 
 				</div>
 
 			</div>
 
-		</div>';
 
+		</div>
 
+		<br />';
 
 
 
 	// Show the track user list.
 
 	template_show_list('track_user_list');
@@ -810,6 +812,7 @@ function template_trackIP()
 
 			</form>
 
 		</div>
 
 	</div>
 
+	<br />
 
 	<div class="generic_list_wrapper">';
 
 
 
 	// The table inbetween the first and second table shows links to the whois server for every region.
@@ -863,7 +866,8 @@ function template_trackIP()
 
 	}
 
 
 
 	echo '
 
-	</div>';
 
+	</div>
 
+	<br />';
 
 
 
 	template_show_list('track_message_list');
 
 
@@ -879,7 +883,7 @@ function template_showPermissions()
 
 	echo '
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">
 
-				<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />', $txt['showPermissions'], '
 
+				<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />', $txt['showPermissions'], '
 
 			</h3>
 
 		</div>';
 
 
@@ -1036,7 +1040,7 @@ function template_statPanel()
 
 	echo '
 
 	<div class="cat_bar">
 
 		<h3 class="catbg">
 
-			<img src="', $settings['images_url'], '/stats_info.png" alt="" class="icon" />
 
+			<img src="', $settings['images_url'], '/stats_info_hd.png" alt="" class="icon" />
 
 			', $txt['statPanel_generalStats'], ' - ', $context['member']['name'], '
 
 		</h3>
 
 	</div>
@@ -1201,7 +1205,7 @@ function template_edit_options()
 
 		<form action="', (!empty($context['profile_custom_submit_url']) ? $context['profile_custom_submit_url'] : $scripturl . '?action=profile;area=' . $context['menu_item_selected'] . ';u=' . $context['id_member']), '" method="post" accept-charset="', $context['character_set'], '" name="creator" id="creator" enctype="multipart/form-data" onsubmit="return checkProfileSubmit();">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />';
 
+					<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />';
 
 
 
 		// Don't say "Profile" if this isn't the profile...
 
 		if (!empty($context['profile_header_text']))
@@ -1374,9 +1378,6 @@ function template_edit_options()
 
 						</dd>
 
 					</dl>';
 
 
 
-	echo '
 
-					<hr class="hrcolor" />';
 
-
 
 	// The button shouldn't say "Change profile" unless we're changing the profile...
 
 	if (!empty($context['submit_button_text']))
 
 		echo '
@@ -1717,7 +1718,7 @@ function template_notification()
 
 		<form action="', $scripturl, '?action=profile;area=notification;save" method="post" accept-charset="', $context['character_set'], '" id="notify_options" class="flow_hidden">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />', $txt['profile'], '
 
+					<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />', $txt['profile'], '
 
 				</h3>
 
 			</div>
 
 			<p class="description">', $txt['notification_info'], '</p>
@@ -1811,7 +1812,7 @@ function template_groupMembership()
 
 		<form action="', $scripturl, '?action=profile;area=groupmembership;save" method="post" accept-charset="', $context['character_set'], '" name="creator" id="creator">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />', $txt['profile'], '
 
+					<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />', $txt['profile'], '
 
 				</h3>
 
 			</div>
 
 			<p class="description">', $txt['groupMembership_info'], '</p>';
@@ -1980,7 +1981,7 @@ function template_ignoreboards()
 
 	<form action="', $scripturl, '?action=profile;area=ignoreboards;save" method="post" accept-charset="', $context['character_set'], '" name="creator" id="creator">
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">
 
-				<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />', $txt['profile'], '
 
+				<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />', $txt['profile'], '
 
 			</h3>
 
 		</div>
 
 		<p class="description">', $txt['ignoreboards_info'], '</p>
@@ -2074,7 +2075,7 @@ function template_viewWarning()
 
 	echo '
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">
 
-				<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />
 
+				<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />
 
 				', sprintf($txt['profile_viewwarning_for_user'], $context['member']['name']), '
 
 			</h3>
 
 		</div>
@@ -2260,7 +2261,7 @@ function template_issueWarning()
 
 	<form action="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=issuewarning" method="post" class="flow_hidden" accept-charset="', $context['character_set'], '">
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">
 
-				<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />
 
+				<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />
 
 				', $context['user']['is_owner'] ? $txt['profile_warning_level'] : $txt['profile_issue_warning'], '
 
 			</h3>
 
 		</div>';
@@ -2456,7 +2457,7 @@ function template_deleteAccount()
 
 		<form action="', $scripturl, '?action=profile;area=deleteaccount;save" method="post" accept-charset="', $context['character_set'], '" name="creator" id="creator">
 
 			<div class="title_bar">
 
 				<h3 class="titlebg">
 
-					<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />', $txt['deleteAccount'], '
 
+					<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />', $txt['deleteAccount'], '
 
 				</h3>
 
 			</div>';
 
 
@@ -2932,7 +2933,7 @@ function template_authentication_method()
 
 		<form action="', $scripturl, '?action=profile;area=authentication;save" method="post" accept-charset="', $context['character_set'], '" name="creator" id="creator" enctype="multipart/form-data">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img src="', $settings['images_url'], '/icons/profile_sm.png" alt="" class="icon" />', $txt['authentication'], '
 
+					<img src="', $settings['images_url'], '/icons/profile_hd.png" alt="" class="icon" />', $txt['authentication'], '
 
 				</h3>
 
 			</div>
 
 			<p class="description">', $txt['change_authentication'], '</p>
--- a/Themes/default/Recent.template.php
+++ b/Themes/default/Recent.template.php
@@ -22,7 +22,7 @@ function template_main()
 
 			</h3>
 
 		</div>
 
 		<div class="pagesection">
 
-			<span>', $txt['pages'], ': ', $context['page_index'], '</span>
 
+			<span>', $context['page_index'], '</span>
 
 		</div>';
 
 
 
 	foreach ($context['posts'] as $post)
@@ -73,7 +73,7 @@ function template_main()
 
 
 
 	echo '
 
 		<div class="pagesection">
 
-			<span>', $txt['pages'], ': ', $context['page_index'], '</span>
 
+			<span>', $context['page_index'], '</span>
 
 		</div>
 
 	</div>';
 
 }
@@ -101,7 +101,7 @@ function template_unread()
 
 			template_button_strip($context['recent_buttons'], 'right');
 
 
 
 		echo '
 
-				<div class="pagelinks floatleft">', $txt['pages'], ': ', $context['page_index'], !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . ' &nbsp;&nbsp;<a href="#bot"><strong>' . $txt['go_down'] . '</strong></a>' : '', '</div>
 
+				<div class="pagelinks floatleft">', $context['page_index'], !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . ' &nbsp;&nbsp;<a href="#bot"><strong>' . $txt['go_down'] . '</strong></a>' : '', '</div>
 
 			</div>';
 
 
 
 		// [WIP] There is trial code here to hide the topic icon column. Colspan can be cleaned up later.
@@ -216,7 +216,7 @@ function template_unread()
 
 			template_button_strip($context['recent_buttons'], 'right');
 
 
 
 		echo '
 
-				<div class="pagelinks floatleft">', $txt['pages'], ': ', $context['page_index'], !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . ' &nbsp;&nbsp;<a href="#top"><strong>' . $txt['go_up'] . '</strong></a>' : '', '</div>
 
+				<div class="pagelinks floatleft">', $context['page_index'], !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . ' &nbsp;&nbsp;<a href="#top"><strong>' . $txt['go_up'] . '</strong></a>' : '', '</div>
 
 			</div>';
 
 	}
 
 	else
@@ -272,7 +272,7 @@ function template_replies()
 
 			template_button_strip($context['recent_buttons'], 'right');
 
 
 
 		echo '
 
-				<div class="pagelinks floatleft">', $txt['pages'], ': ', $context['page_index'], !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . ' &nbsp;&nbsp;<a href="#bot"><strong>' . $txt['go_down'] . '</strong></a>' : '', '</div>
 
+				<div class="pagelinks floatleft">', $context['page_index'], !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . ' &nbsp;&nbsp;<a href="#bot"><strong>' . $txt['go_down'] . '</strong></a>' : '', '</div>
 
 			</div>';
 
 
 
 		// [WIP] There is trial code here to hide the topic icon column. Colspan can be cleaned up later.
@@ -383,7 +383,7 @@ function template_replies()
 
 			template_button_strip($context['recent_buttons'], 'right');
 
 
 
 		echo '
 
-				<div class="pagelinks floatleft">', $txt['pages'], ': ', $context['page_index'], !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . ' &nbsp;&nbsp;<a href="#top"><strong>' . $txt['go_up'] . '</strong></a>' : '', '</div>
 
+				<div class="pagelinks floatleft">', $context['page_index'], !empty($modSettings['topbottomEnable']) ? $context['menu_separator'] . ' &nbsp;&nbsp;<a href="#top"><strong>' . $txt['go_up'] . '</strong></a>' : '', '</div>
 
  			</div>';
 
 	}
 
 	else
--- a/Themes/default/Register.template.php
+++ b/Themes/default/Register.template.php
@@ -507,10 +507,10 @@ function template_admin_register()
 
 
 
 	echo '
 
 	<div id="admincenter">
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">', $txt['admin_browse_register_new'], '</h3>
 
-		</div>
 
-		<form class="windowbg2" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '" name="postForm" id="postForm">
 
+		<form id="admin_form_wrapper" class="windowbg2" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '" name="postForm" id="postForm">
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">', $txt['admin_browse_register_new'], '</h3>
 
+			</div>
 
 			<div class="content" id="register_screen">';
 
 
 
 	if (!empty($context['registration_done']))
@@ -577,7 +577,6 @@ function template_admin_register()
 
 						<input type="checkbox" name="emailActivate" id="emailActivate_check" tabindex="', $context['tabindex']++, '"', !empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1 ? ' checked="checked"' : '', ' onclick="onCheckChange();" class="input_check" />
 
 					</dd>
 
 				</dl>
 
-				<hr class="hrcolor" />
 
 				<div class="flow_auto">
 
 					<input type="submit" name="regSubmit" value="', $txt['register'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
 
 					<input type="hidden" name="sa" value="register" />
@@ -597,46 +596,49 @@ function template_edit_agreement()
 
 	global $context, $settings, $options, $scripturl, $txt;
 
 
 
 	// Just a big box to edit the text file ;).
 
-	echo '
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">', $txt['registration_agreement'], '</h3>
 
-		</div>';
 
+echo '
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">', $txt['registration_agreement'], '</h3>
 
+			</div>';
 
 
 
 	// Warning for if the file isn't writable.
 
 	if (!empty($context['warning']))
 
 		echo '
 
-		<p class="error">', $context['warning'], '</p>';
 
+			<p class="error">', $context['warning'], '</p>';
 
 
 
 	echo '
 
-		<div class="windowbg2" id="registration_agreement">
 
-			<div class="content">';
 
+			<div class="windowbg2" id="registration_agreement">
 
+				<div class="content">';
 
 
 
 	// Is there more than one language to choose from?
 
 	if (count($context['editable_agreements']) > 1)
 
 	{
 
 		echo '
 
-				<div class="information">
 
-					<form action="', $scripturl, '?action=admin;area=regcenter" id="change_reg" method="post" accept-charset="', $context['character_set'], '" style="display: inline;">
 
-						<strong>', $txt['admin_agreement_select_language'], ':</strong>&nbsp;
 
-						<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', $context['tabindex']++, '">';
 
+					<div class="cat_bar">
 
+						<h3 class="catbg">', $txt['language_configuration'], '</h3>
 
+					</div>
 
+					<div class="information">
 
+						<form action="', $scripturl, '?action=admin;area=regcenter" id="change_reg" method="post" accept-charset="', $context['character_set'], '" style="display: inline;">
 
+							<strong>', $txt['admin_agreement_select_language'], ':</strong>&nbsp;
 
+							<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', $context['tabindex']++, '">';
 
 
 
 		foreach ($context['editable_agreements'] as $file => $name)
 
 			echo '
 
-							<option value="', $file, '" ', $context['current_agreement'] == $file ? 'selected="selected"' : '', '>', $name, '</option>';
 
+								<option value="', $file, '" ', $context['current_agreement'] == $file ? 'selected="selected"' : '', '>', $name, '</option>';
 
 
 
 		echo '
 
-						</select>
 
-						<div class="righttext">
 
-							<input type="hidden" name="sa" value="agreement" />
 
-							<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-							<input type="submit" name="change" value="', $txt['admin_agreement_select_language_change'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
 
-						</div>
 
-					</form>
 
-				</div>';
 
+							</select>
 
+							<div class="righttext">
 
+								<input type="hidden" name="sa" value="agreement" />
 
+								<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+								<input type="submit" name="change" value="', $txt['admin_agreement_select_language_change'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
 
+							</div>
 
+						</form>
 
+					</div>';
 
 	}
 
 
 
-	echo '
 
-				<form action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">';
 
+
 
 
 
 	// Show the actual agreement in an oversized text box.
 
 	echo '
@@ -654,9 +656,9 @@ function template_edit_agreement()
 
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 						<input type="hidden" name="', $context['admin-rega_token_var'], '" value="', $context['admin-rega_token'], '" />
 
 					</div>
 
-				</form>
 
+				</div>
 
 			</div>
 
-		</div>';
 
+		</form>';
 
 }
 
 
 
 function template_edit_reserved_words()
@@ -664,10 +666,10 @@ function template_edit_reserved_words()
 
 	global $context, $settings, $options, $scripturl, $txt;
 
 
 
 	echo '
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">', $txt['admin_reserved_set'], '</h3>
 
-		</div>
 
-		<form id="registration_agreement" class="windowbg2" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">
 
+		<form id="admin_form_wrapper" class="windowbg2" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">', $txt['admin_reserved_set'], '</h3>
 
+			</div>
 
 			<div class="content">
 
 				<h4>', $txt['admin_reserved_line'], '</h4>
 
 				<p class="reserved_names">
--- a/Themes/default/Search.template.php
+++ b/Themes/default/Search.template.php
@@ -18,7 +18,7 @@ function template_main()
 
 	<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '" name="searchform" id="searchform">
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">
 
-				', !empty($settings['use_buttons']) ? '<img src="' . $settings['images_url'] . '/buttons/search.png" alt="" class="icon" />' : ' ', $txt['set_parameters'], '
 
+				', !empty($settings['use_buttons']) ? '<img src="' . $settings['images_url'] . '/buttons/search_hd.png" alt="" class="icon" />' : ' ', $txt['set_parameters'], '
 
 			</h3>
 
 		</div>';
 
 
@@ -308,7 +308,7 @@ function template_results()
 
 		if (!empty($context['topics']))
 
 		echo'
 
 		<div class="pagesection">
 
-			<span>', $txt['pages'], ': ', $context['page_index'], '</span>
 
+			<span>', $context['page_index'], '</span>
 
 		</div>';
 
 		else
 
 			echo '
@@ -389,7 +389,7 @@ function template_results()
 
 		if (!empty($context['topics']))
 
 		echo '
 
 		<div class="pagesection">
 
-			<span>', $txt['pages'], ': ', $context['page_index'], '</span>
 
+			<span>', $context['page_index'], '</span>
 
 		</div>';
 
 
 
 		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
@@ -431,11 +431,11 @@ function template_results()
 
 		echo '
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">
 
-				<img class="centericon" src="' . $settings['images_url'] . '/buttons/search.png" alt="?" />&nbsp;', $txt['mlist_search_results'],':&nbsp;',$context['search_params']['search'],'
 
+				<img class="centericon" src="' . $settings['images_url'] . '/buttons/search_hd.png" alt="?" />&nbsp;', $txt['mlist_search_results'],':&nbsp;',$context['search_params']['search'],'
 
 			</h3>
 
 		</div>
 
 		<div class="pagesection">
 
-			<span>', $txt['pages'], ': ', $context['page_index'], '</span>
 
+			<span>', $context['page_index'], '</span>
 
 		</div>';
 
 
 
 		if (empty($context['topics']))
@@ -491,7 +491,7 @@ function template_results()
 
 
 
 		echo '
 
 		<div class="pagesection">
 
-			<span>', $txt['pages'], ': ', $context['page_index'], '</span>
 
+			<span>', $context['page_index'], '</span>
 
 		</div>';
 
 	}
 
 
--- a/Themes/default/SplitTopics.template.php
+++ b/Themes/default/SplitTopics.template.php
@@ -92,7 +92,7 @@ function template_select()
 
 					', $txt['please_select_split'], '
 
 				</div>
 
 				<div class="pagesection">
 
-					<strong>', $txt['pages'], ':</strong> <span id="pageindex_not_selected">', $context['not_selected']['page_index'], '</span>
 
+					<span id="pageindex_not_selected">', $context['not_selected']['page_index'], '</span>
 
 				</div>
 
 				<ul id="messages_not_selected" class="split_messages smalltext reset">';
 
 
@@ -123,7 +123,7 @@ function template_select()
 
 					', $txt['split_selected_posts_desc'], '
 
 				</div>
 
 				<div class="pagesection">
 
-					<strong>', $txt['pages'], ':</strong> <span id="pageindex_selected">', $context['selected']['page_index'], '</span>
 
+					<span id="pageindex_selected">', $context['selected']['page_index'], '</span>
 
 				</div>
 
 				<ul id="messages_selected" class="split_messages smalltext reset">';
 
 
@@ -321,7 +321,7 @@ function template_merge()
 
 				<h3 class="catbg">', $txt['target_topic'], '</h3>
 
 			</div>
 
 			<div class="pagesection">
 
-				<strong>', $txt['pages'], ':</strong> ', $context['page_index'], '
 
+				', $context['page_index'], '
 
 			</div>
 
 			<div class="windowbg2">
 
 				<div class="content">
@@ -341,7 +341,7 @@ function template_merge()
 
 				</div>
 
 			</div>
 
 			<div class="pagesection">
 
-				<strong>', $txt['pages'], ':</strong> ', $context['page_index'], '
 
+				', $context['page_index'], '
 
 			</div>
 
 		</div>';
 
 }
--- a/Themes/default/Themes.template.php
+++ b/Themes/default/Themes.template.php
@@ -17,160 +17,165 @@ function template_main()
 
 
 
 	echo '
 
 	<div id="admincenter">
 
-		<form action="', $scripturl, '?action=admin;area=theme;sa=admin" method="post" accept-charset="', $context['character_set'], '">
 
-			<input type="hidden" value="0" name="options[theme_allow]" />
 
-			<div class="cat_bar">
 
-				<h3 class="catbg">
 
-					<a href="', $scripturl, '?action=helpadmin;help=themes" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" /></a>
 
-					', $txt['themeadmin_title'], '
 
-				</h3>
 
-			</div>
 
-			<div class="information">
 
-				', $txt['themeadmin_explain'], '
 
-			</div>
 
-			<div class="windowbg2">
 
-				<div class="content">
 
-					<dl class="settings">
 
-						<dt>
 
-							<label for="options-theme_allow"> ', $txt['theme_allow'], '</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="checkbox" name="options[theme_allow]" id="options-theme_allow" value="1"', !empty($modSettings['theme_allow']) ? ' checked="checked"' : '', ' class="input_check" />
 
-						</dd>
 
-						<dt>
 
-							<label for="known_themes_list">', $txt['themeadmin_selectable'], '</label>:
 
-						</dt>
 
-						<dd>
 
-							<div id="known_themes_list">';
 
+		<div class="cat_bar">
 
+			<h3 class="catbg">
 
+				<a href="', $scripturl, '?action=helpadmin;help=themes" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a>
 
+				', $txt['themeadmin_title'], '
 
+			</h3>
 
+		</div>
 
+		<div class="information">
 
+			', $txt['themeadmin_explain'], '
 
+		</div>
 
+		<div id="admin_form_wrapper">
 
+			<form action="', $scripturl, '?action=admin;area=theme;sa=admin" method="post" accept-charset="', $context['character_set'], '">
 
+				<div class="cat_bar">
 
+					<h3 class="catbg">',
 
+						$txt['settings'], '
 
+					</h3>
 
+				</div>
 
+				<div class="windowbg2">
 
+					<div class="content">
 
+						<dl class="settings">
 
+							<dt>
 
+								<label for="options-theme_allow"> ', $txt['theme_allow'], '</label>
 
+							</dt>
 
+							<dd>
 
+								<input type="checkbox" name="options[theme_allow]" id="options-theme_allow" value="1"', !empty($modSettings['theme_allow']) ? ' checked="checked"' : '', ' class="input_check" />
 
+							</dd>
 
+							<dt>
 
+								<label for="known_themes_list">', $txt['themeadmin_selectable'], '</label>:
 
+							</dt>
 
+							<dd>
 
+								<div id="known_themes_list">';
 
 	foreach ($context['themes'] as $theme)
 
 		echo '
 
-								<label for="options-known_themes_', $theme['id'], '"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_', $theme['id'], '" value="', $theme['id'], '"', $theme['known'] ? ' checked="checked"' : '', ' class="input_check" /> ', $theme['name'], '</label><br />';
 
+									<label for="options-known_themes_', $theme['id'], '"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_', $theme['id'], '" value="', $theme['id'], '"', $theme['known'] ? ' checked="checked"' : '', ' class="input_check" /> ', $theme['name'], '</label><br />';
 
 
 
 		echo '
 
-							</div>
 
-							<a href="javascript:void(0);" onclick="document.getElementById(\'known_themes_list\').style.display=\'block\'; document.getElementById(\'known_themes_link\').style.display = \'none\'; return false; " id="known_themes_link" style="display: none;">[ ', $txt['themeadmin_themelist_link'], ' ]</a>
 
-							<script type="text/javascript"><!-- // --><![CDATA[
 
-								document.getElementById("known_themes_list").style.display = "none";
 
-								document.getElementById("known_themes_link").style.display = "";
 
-							// ]]></script>
 
-						</dd>
 
-						<dt>
 
-							<label for="theme_guests">', $txt['theme_guests'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<select name="options[theme_guests]" id="theme_guests">';
 
+								</div>
 
+								<a href="javascript:void(0);" onclick="document.getElementById(\'known_themes_list\').style.display=\'block\'; document.getElementById(\'known_themes_link\').style.display = \'none\'; return false; " id="known_themes_link" style="display: none;">[ ', $txt['themeadmin_themelist_link'], ' ]</a>
 
+								<script type="text/javascript"><!-- // --><![CDATA[
 
+									document.getElementById("known_themes_list").style.display = "none";
 
+									document.getElementById("known_themes_link").style.display = "";
 
+								// ]]></script>
 
+							</dd>
 
+							<dt>
 
+								<label for="theme_guests">', $txt['theme_guests'], ':</label>
 
+							</dt>
 
+							<dd>
 
+								<select name="options[theme_guests]" id="theme_guests">';
 
 
 
 	// Put an option for each theme in the select box.
 
 	foreach ($context['themes'] as $theme)
 
 		echo '
 
-								<option value="', $theme['id'], '"', $modSettings['theme_guests'] == $theme['id'] ? ' selected="selected"' : '', '>', $theme['name'], '</option>';
 
+									<option value="', $theme['id'], '"', $modSettings['theme_guests'] == $theme['id'] ? ' selected="selected"' : '', '>', $theme['name'], '</option>';
 
 
 
 	echo '
 
-							</select>
 
-							<span class="smalltext pick_theme"><a href="', $scripturl, '?action=theme;sa=pick;u=-1;', $context['session_var'], '=', $context['session_id'], '">', $txt['theme_select'], '</a></span>
 
-						</dd>
 
-						<dt>
 
-							<label for="theme_reset">', $txt['theme_reset'], '</label>:
 
-						</dt>
 
-						<dd>
 
-							<select name="theme_reset" id="theme_reset">
 
-								<option value="-1" selected="selected">', $txt['theme_nochange'], '</option>
 
-								<option value="0">', $txt['theme_forum_default'], '</option>';
 
+								</select>
 
+								<span class="smalltext pick_theme"><a href="', $scripturl, '?action=theme;sa=pick;u=-1;', $context['session_var'], '=', $context['session_id'], '">', $txt['theme_select'], '</a></span>
 
+							</dd>
 
+							<dt>
 
+								<label for="theme_reset">', $txt['theme_reset'], '</label>:
 
+							</dt>
 
+							<dd>
 
+								<select name="theme_reset" id="theme_reset">
 
+									<option value="-1" selected="selected">', $txt['theme_nochange'], '</option>
 
+									<option value="0">', $txt['theme_forum_default'], '</option>';
 
 
 
 	// Same thing, this time for changing the theme of everyone.
 
 	foreach ($context['themes'] as $theme)
 
 		echo '
 
-								<option value="', $theme['id'], '">', $theme['name'], '</option>';
 
+									<option value="', $theme['id'], '">', $theme['name'], '</option>';
 
 
 
 	echo '
 
-							</select>
 
-							<span class="smalltext pick_theme"><a href="', $scripturl, '?action=theme;sa=pick;u=0;', $context['session_var'], '=', $context['session_id'], '">', $txt['theme_select'], '</a></span>
 
-						</dd>
 
-					</dl>
 
-					<hr class="hrcolor" />
 
-					<input type="submit" name="save" value="' . $txt['save'] . '" class="button_submit" />
 
-					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-					<input type="hidden" name="', $context['admin-tm_token_var'], '" value="', $context['admin-tm_token'], '" />
 
+								</select>
 
+								<span class="smalltext pick_theme"><a href="', $scripturl, '?action=theme;sa=pick;u=0;', $context['session_var'], '=', $context['session_id'], '">', $txt['theme_select'], '</a></span>
 
+							</dd>
 
+						</dl>
 
+						<input type="submit" name="save" value="' . $txt['save'] . '" class="button_submit" />
 
+						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+						<input type="hidden" name="', $context['admin-tm_token_var'], '" value="', $context['admin-tm_token'], '" />
 
+						<input type="hidden" value="0" name="options[theme_allow]" />
 
+					</div>
 
 				</div>
 
-			</div>
 
-		</form>';
 
+			</form>';
 
 
 
 	// Link to simplemachines.org for latest themes and info!
 
 	echo '
 
-		<br />
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">
 
-				<a href="', $scripturl, '?action=helpadmin;help=latest_themes" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['theme_latest'], '
 
-			</h3>
 
-		</div>
 
-		<div class="windowbg">
 
-			<div class="content">
 
-				<div id="themeLatest">
 
-					', $txt['theme_latest_fetch'], '
 
+			<br />
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">
 
+					<a href="', $scripturl, '?action=helpadmin;help=latest_themes" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['theme_latest'], '
 
+				</h3>
 
+			</div>
 
+			<div class="windowbg">
 
+				<div class="content">
 
+					<div id="themeLatest">
 
+						', $txt['theme_latest_fetch'], '
 
+					</div>
 
 				</div>
 
 			</div>
 
-		</div>
 
-		<br />';
 
+			<br />';
 
 
 
 	// Warn them if theme creation isn't possible!
 
 	if (!$context['can_create_new'])
 
 		echo '
 
-		<div class="errorbox">', $txt['theme_install_writable'], '</div>';
 
+			<div class="errorbox">', $txt['theme_install_writable'], '</div>';
 
 
 
 		echo '
 
-		<form action="', $scripturl, '?action=admin;area=theme;sa=install" method="post" accept-charset="', $context['character_set'], '" enctype="multipart/form-data" onsubmit="return confirm(\'', $txt['theme_install_new_confirm'], '\');">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<a href="', $scripturl, '?action=helpadmin;help=theme_install" onclick="return reqOverlayDiv(this.href);" class="help" id="theme_install"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['theme_install'], '
 
+					<a href="', $scripturl, '?action=helpadmin;help=theme_install" onclick="return reqOverlayDiv(this.href);" class="help" id="theme_install"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['theme_install'], '
 
 				</h3>
 
 			</div>
 
-			<div class="windowbg">
 
-				<div class="content">
 
-					<dl class="settings">';
 
+			<form action="', $scripturl, '?action=admin;area=theme;sa=install" method="post" accept-charset="', $context['character_set'], '" enctype="multipart/form-data" onsubmit="return confirm(\'', $txt['theme_install_new_confirm'], '\');">
 
+				<div class="windowbg">
 
+					<div class="content">
 
+						<dl class="settings">';
 
 
 
 	// Here's a little box for installing a new theme.
 
 	// @todo Should the value="theme_gz" be there?!
 
 	if ($context['can_create_new'])
 
 		echo '
 
-						<dt>
 
-							<label for="theme_gz">', $txt['theme_install_file'], '</label>:
 
-						</dt>
 
-						<dd>
 
-							<input type="file" name="theme_gz" id="theme_gz" value="theme_gz" size="40" onchange="this.form.copy.disabled = this.value != \'\'; this.form.theme_dir.disabled = this.value != \'\';" class="input_file" />
 
-						</dd>';
 
+							<dt>
 
+								<label for="theme_gz">', $txt['theme_install_file'], '</label>:
 
+							</dt>
 
+							<dd>
 
+								<input type="file" name="theme_gz" id="theme_gz" value="theme_gz" size="40" onchange="this.form.copy.disabled = this.value != \'\'; this.form.theme_dir.disabled = this.value != \'\';" class="input_file" />
 
+							</dd>';
 
 
 
 	echo '
 
-						<dt>
 
-							<label for="theme_dir">', $txt['theme_install_dir'], '</label>:
 
-						</dt>
 
-						<dd>
 
-							<input type="text" name="theme_dir" id="theme_dir" value="', $context['new_theme_dir'], '" size="40" style="width: 70%;" class="input_text" />
 
-						</dd>';
 
+							<dt>
 
+								<label for="theme_dir">', $txt['theme_install_dir'], '</label>:
 
+							</dt>
 
+							<dd>
 
+								<input type="text" name="theme_dir" id="theme_dir" value="', $context['new_theme_dir'], '" size="40" style="width: 70%;" class="input_text" />
 
+							</dd>';
 
 
 
 	if ($context['can_create_new'])
 
 		echo '
 
-						<dt>
 
-							<label for="copy">', $txt['theme_install_new'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="text" name="copy" id="copy" value="', $context['new_theme_name'], '" size="40" class="input_text" />
 
-						</dd>';
 
+							<dt>
 
+								<label for="copy">', $txt['theme_install_new'], ':</label>
 
+							</dt>
 
+							<dd>
 
+								<input type="text" name="copy" id="copy" value="', $context['new_theme_name'], '" size="40" class="input_text" />
 
+							</dd>';
 
 
 
 	echo '
 
-					</dl>
 
-					<hr class="hrcolor" />
 
-					<input type="submit" name="save" value="', $txt['theme_install_go'], '" class="button_submit" />
 
-					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-					<input type="hidden" name="', $context['admin-tm_token_var'], '" value="', $context['admin-tm_token'], '" />
 
+						</dl>
 
+						<input type="submit" name="save" value="', $txt['theme_install_go'], '" class="button_submit" />
 
+						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+						<input type="hidden" name="', $context['admin-tm_token_var'], '" value="', $context['admin-tm_token'], '" />
 
+					</div>
 
 				</div>
 
-			</div>
 
-		</form>
 
+			</form>
 
+		</div>
 
 	</div>
 
 
 
 	<script type="text/javascript"><!-- // --><![CDATA[
 
-		window.smfForum_scripturl = "', $scripturl, '";
 
-		window.smfForum_sessionid = "', $context['session_id'], '";
 
-		window.smfForum_sessionvar = "', $context['session_var'], '";
 
+		window.smfForum_scripturl = smf_scripturl;
 
+		window.smfForum_sessionid = smf_session_id;
 
+		window.smfForum_sessionvar = smf_session_var;
 
 		window.smfThemes_writable = ', $context['can_create_new'] ? 'true' : 'false', ';
 
 	// ]]></script>';
 
 
@@ -196,7 +201,13 @@ function template_list_themes()
 
 		</div>
 
 		<div class="information">
 
 			', $txt['themeadmin_list_tip'], '
 
-		</div>';
 
+		</div>
 
+		
 
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=theme;', $context['session_var'], '=', $context['session_id'], ';sa=list" method="post" accept-charset="', $context['character_set'], '">
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">', $txt['theme_settings'], '</h3>
 
+			</div>
 
+			<br />';
 
 
 
 	// Show each theme.... with X for delete and a link to settings.
 
 	foreach ($context['themes'] as $theme)
@@ -229,8 +240,6 @@ function template_list_themes()
 
 	}
 
 
 
 	echo '
 
-
 
-		<form action="', $scripturl, '?action=admin;area=theme;', $context['session_var'], '=', $context['session_id'], ';sa=list" method="post" accept-charset="', $context['character_set'], '">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">', $txt['themeadmin_list_reset'], '</h3>
 
 			</div>
@@ -271,7 +280,8 @@ function template_reset_list()
 
 		</div>
 
 		<div class="information">
 
 			', $txt['themeadmin_reset_tip'], '
 
-		</div>';
 
+		</div>
 
+		<div id="admin_form_wrapper">';
 
 
 
 	// Show each theme.... with X for delete and a link to settings.
 
 	$alternate = false;
@@ -281,27 +291,28 @@ function template_reset_list()
 
 		$alternate = !$alternate;
 
 
 
 		echo '
 
-		<div class="title_bar">
 
-			<h3 class="titlebg">', $theme['name'], '</h3>
 
-		</div>
 
-		<div class="windowbg', $alternate ? '' : '2','">
 
-			<div class="content">
 
-				<ul class="reset">
 
-					<li>
 
-						<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset">', $txt['themeadmin_reset_defaults'], '</a> <em class="smalltext">(', $theme['num_default_options'], ' ', $txt['themeadmin_reset_defaults_current'], ')</em>
 
-					</li>
 
-					<li>
 
-						<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset;who=1">', $txt['themeadmin_reset_members'], '</a>
 
-					</li>
 
-					<li>
 
-						<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset;who=2;', $context['admin-stor_token_var'], '=', $context['admin-stor_token'], '" onclick="return confirm(\'', $txt['themeadmin_reset_remove_confirm'], '\');">', $txt['themeadmin_reset_remove'], '</a> <em class="smalltext">(', $theme['num_members'], ' ', $txt['themeadmin_reset_remove_current'], ')</em>
 
-					</li>
 
-				</ul>
 
+			<div class="title_bar">
 
+				<h3 class="titlebg">', $theme['name'], '</h3>
 
 			</div>
 
-		</div>';
 
+			<div class="windowbg', $alternate ? '' : '2','">
 
+				<div class="content">
 
+					<ul class="reset">
 
+						<li>
 
+							<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset">', $txt['themeadmin_reset_defaults'], '</a> <em class="smalltext">(', $theme['num_default_options'], ' ', $txt['themeadmin_reset_defaults_current'], ')</em>
 
+						</li>
 
+						<li>
 
+							<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset;who=1">', $txt['themeadmin_reset_members'], '</a>
 
+						</li>
 
+						<li>
 
+							<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset;who=2;', $context['admin-stor_token_var'], '=', $context['admin-stor_token'], '" onclick="return confirm(\'', $txt['themeadmin_reset_remove_confirm'], '\');">', $txt['themeadmin_reset_remove'], '</a> <em class="smalltext">(', $theme['num_members'], ' ', $txt['themeadmin_reset_remove_current'], ')</em>
 
+						</li>
 
+					</ul>
 
+				</div>
 
+			</div>';
 
 	}
 
 
 
 	echo '
 
+		</div>
 
 	</div>';
 
 }
 
 
@@ -410,20 +421,21 @@ function template_set_settings()
 
 	global $context, $settings, $options, $scripturl, $txt;
 
 
 
 	echo '
 
-	<div id="admincenter">
 
+	<div id="admin_form_wrapper">
 
 		<form action="', $scripturl, '?action=admin;area=theme;sa=list;th=', $context['theme_settings']['theme_id'], '" method="post" accept-charset="', $context['character_set'], '">
 
-			<div class="title_bar">
 
-				<h3 class="titlebg">
 
-					<a href="', $scripturl, '?action=helpadmin;help=theme_settings" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" class="icon" /></a> ', $txt['theme_settings'], ' - ', $context['theme_settings']['name'], '
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">
 
+					<a href="', $scripturl, '?action=helpadmin;help=theme_settings" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" class="icon" /></a> ', $txt['theme_settings'], ' - ', $context['theme_settings']['name'], '
 
 				</h3>
 
-			</div>';
 
+			</div>
 
+			<br />';
 
 
 
 	// @todo Why can't I edit the default theme popup.
 
 	if ($context['theme_settings']['theme_id'] != 1)
 
 		echo '
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img src="', $settings['images_url'], '/icons/config_sm.png" alt="" class="icon" /> ', $txt['theme_edit'], '
 
+					<img src="', $settings['images_url'], '/icons/config_hd.png" alt="" class="icon" /> ', $txt['theme_edit'], '
 
 				</h3>
 
 			</div>
 
 			<div class="windowbg">
@@ -442,7 +454,7 @@ function template_set_settings()
 
 	echo '
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img src="', $settings['images_url'], '/icons/config_sm.png" alt="" class="icon" /> ', $txt['theme_url_config'], '
 
+					<img src="', $settings['images_url'], '/icons/config_hd.png" alt="" class="icon" /> ', $txt['theme_url_config'], '
 
 				</h3>
 
 			</div>
 
 			<div class="windowbg2">
@@ -482,7 +494,7 @@ function template_set_settings()
 
 		echo '
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img class="icon" src="', $settings['images_url'], '/icons/config_sm.png" alt="" /> ', $txt['theme_variants'], '
 
+					<img class="icon" src="', $settings['images_url'], '/icons/config_hd.png" alt="" /> ', $txt['theme_variants'], '
 
 				</h3>
 
 			</div>
 
 			<div class="windowbg2">
@@ -517,7 +529,7 @@ function template_set_settings()
 
 	echo '
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
-					<img src="', $settings['images_url'], '/icons/config_sm.png" alt="" class="icon" /> ', $txt['theme_options'], '
 
+					<img src="', $settings['images_url'], '/icons/config_hd.png" alt="" class="icon" /> ', $txt['theme_options'], '
 
 				</h3>
 
 			</div>
 
 			<div class="windowbg">
@@ -597,7 +609,6 @@ function template_set_settings()
 
 
 
 	echo '
 
 					</dl>
 
-					<hr class="hrcolor" />
 
 					<input type="submit" name="save" value="', $txt['save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-sts_token_var'], '" value="', $context['admin-sts_token'], '" />
@@ -750,10 +761,11 @@ function template_edit_list()
 
 	global $context, $settings, $options, $scripturl, $txt;
 
 
 
 	echo '
 
-	<div id="admincenter">
 
+	<div id="admin_form_wrapper">
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">', $txt['themeadmin_edit_title'], '</h3>
 
-		</div>';
 
+		</div>
 
+		<br />';
 
 
 
 	$alternate = false;
 
 
--- a/Themes/default/Who.template.php
+++ b/Themes/default/Who.template.php
@@ -24,7 +24,7 @@ function template_main()
 
 			</div>
 
 			<div class="topic_table" id="mlist">
 
 				<div class="pagesection">
 
-					<div class="pagelinks floatleft">', $txt['pages'], ': ', $context['page_index'], '</div>';
 
+					<div class="pagelinks floatleft">', $context['page_index'], '</div>';
 
 		echo '
 
 					<div class="selectbox floatright">', $txt['who_show1'], '
 
 						<select name="show_top" onchange="document.forms.whoFilter.show.value = this.value; document.forms.whoFilter.submit();">';
@@ -104,7 +104,7 @@ function template_main()
 
 				</table>
 
 			</div>
 
 			<div class="pagesection">
 
-				<div class="pagelinks floatleft">', $txt['pages'], ': ', $context['page_index'], '</div>';
 
+				<div class="pagelinks floatleft">', $context['page_index'], '</div>';
 
 
 
 	echo '
 
 				<div class="selectbox floatright">', $txt['who_show1'], '
--- a/Themes/default/css/admin.css
+++ b/Themes/default/css/admin.css
@@ -38,7 +38,7 @@ body.action_admin .navigate_section ul li a {
 
 
 
 /* Common admin center classes.
 
 ------------------------------------------------------- */
 
-/* [WIP]
 
+/* @todo
 
 /* The CSS targeting for all this gets a bit convoluted and requires a good clean up.
 
 /* It's left over from when I started theming admin independently over a Curve forum.
 
 /* Can be simplified quite a lot before production builds. */
@@ -78,7 +78,7 @@ body.action_admin .navigate_section ul li a {
 
 	border: 1px solid #ddd;
 
 	border-top: none;
 
 	border-radius: 0 0 7px 7px;
 
-	margin: 0 0 0 0;
 
+	margin: -1px 0 12px 0;
 
 	padding: 12px 9px 8px 9px;
 
 }
 
 .action_admin p.description a {
@@ -228,7 +228,6 @@ div.quick_tasks {
 
 .action_admin .table_grid tr:nth-child(odd) td {
 
 	background: #f8f8f8;
 
 }
 
-/*-------------------------------------------*/
 
 
 
 /* Newsletters screen.
 
 ---------------------------------------------*/
@@ -566,11 +565,12 @@ div.quick_tasks {
 
 	margin: 0 12px 0 0;
 
 }
 
 .features_switch {
 
+	margin: -20px 0 6px 6px;
 
 	float: right;
 
 }
 
 .features h4 {
 
 	padding: 0;
 
-	margin-top: 6px;
 
+	margin: 0 6px 0 105px;
 
 	font-size: 1.1em;
 
 	overflow: hidden;
 
 	white-space: pre;
@@ -729,6 +729,10 @@ pre.file_content {
 
 	padding: 8px 16px 4px 16px;
 
 	color: #444;
 
 }
 
+#manage_boards .cat_bar .catbg {
 
+	border: none;
 
+	border-bottom: 1px solid #bbb;
 
+}
 
 #manage_boards .catbg a {
 
 	color: #346;
 
 }
@@ -873,7 +877,6 @@ dl.right dt {
 
 	padding: 6px 30px;
 
 	margin: 0 0 6px 0;
 
 }
 
-/* Didn't get any further last night. */
 
 
 
 /* Styles for the manage calendar section.
 
 ------------------------------------------------- */
@@ -1032,9 +1035,8 @@ dl.themes_list dd {
 
 	float: right;
 
 	margin: 0 0 1em 0;
 
 }
 
-
 
-.modbox {
 
-	height: 14em;
 
+.modblock_left #smfAnnouncements {
 
+	height: 15em;
 
 	overflow: auto;
 
 }
 
 /* Moderation Notes */
--- a/Themes/default/css/index.css
+++ b/Themes/default/css/index.css
@@ -1,4 +1,4 @@
 
-/* Styles for the general looks for the Curve theme.
 
+/* Styles for the general looks for the Curve II theme.
 
 ------------------------------------------------------- */
 
 
 
 /* Normal, standard links. */
@@ -62,7 +62,7 @@ p, ul, ol, li, dl, dd ,dt, fieldset, form {
 
 }
 
 
 
 /* Set list-style to none by default. Best in most places.*/
 
-ul, ol, li {
 
+ul, ol {
 
 	list-style: none;
 
 }
 
 
@@ -87,6 +87,7 @@ ul.reset, ul.reset li {
 
 /* Thought it made sense to declare box-sizing here too. */
 
 input, button, select, textarea, textarea.editor {
 
 	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 
+	font: 83.33%/150% "Segoe UI", "Helvetica Neue", "Liberation Sans", "Nimbus Sans L", Arial, sans-serif;
 
 	background: #fff;
 
 	outline: none !important;
 
 	border: 1px solid #bbb;
@@ -135,9 +136,7 @@ input:focus, textarea:focus, button:focus, select:focus, textarea.editor:focus {
 
 	border-bottom: 1px solid #aaa;
 
 	border-radius: 1px;
 
 	box-shadow: 1px 1px 1px rgba(0,0,0,0.1);
 
-/*	font-weight: bold;*/
 
-/*	color: #444;*/
 
-	/* [WIP]*/
 
+	/* @todo */
 
 	-moz-transition: all 0.05s linear 0.05s;
 
 }
 
 .button_submit:hover, .button_reset:hover, .button_link:hover {
@@ -147,18 +146,14 @@ input:focus, textarea:focus, button:focus, select:focus, textarea.editor:focus {
 
 	border-left: 1px solid #bbb;
 
 	border-top: 1px solid #aaa;
 
 	box-shadow: -1px -1px 2px rgba(0,0,0,0.07), -1px -2px 4px rgba(255,255,255,0.33) inset;
 
-	/* [WIP]*/
 
+	/* @todo */
 
 	-moz-transition: all 0.05s linear 0.05s;
 
 }
 
-/*.button_link {
 
-	padding: 4px 5px 4px 4px;
 
-	font: 95%/115% verdana, Helvetica, sans-serif;
 
-	float: right;
 
-	border-radius: 3px;
 
-}*/
 
 a.button_link {
 
-	color: #333;
 
+	color: #000;
 
+	padding: 1px 5px;
 
 	margin: 0 !important;
 
+	font-size: 0.9em;
 
 }
 
 .button_link:hover {
 
 	text-decoration: none;
@@ -178,7 +173,7 @@ span.new_posts {
 
 	margin: 0 5px 0 -2px;
 
 	padding: 0 4px 1px 4px;
 
 	font-size: 9px;
 
-	font-family: verdana, sans-serif; /*[WIP] Might add extra fallbacks. Possibly monospace. */
 
+	font-family: verdana, sans-serif; /* @todo Might add extra fallbacks. Possibly monospace. */
 
 	box-shadow: 1px 2px 2px rgba(0,0,0,0.1), 0 -2px 4px rgba(0,0,0,0.1) inset;
 
 }
 
 a span.new_posts:hover {
@@ -408,9 +403,7 @@ em {
 
 }
 
 .bbc_list {
 
 	text-align: left;
 
-}
 
-.bbc_list li {
 
-	list-style: inside;
 
+	padding: 0 0 0 35px;
 
 	list-style-type: inherit;
 
 }
 
 .bbc_tt {
@@ -551,7 +544,7 @@ div.pagesection div.floatright input, div.pagesection div.floatright select {
 
 	padding: 2px 7px 1px 7px;
 
 	margin: 5px 8px 0 0;
 
 	color: #222;
 
-	/* [WIP]*/
 
+	/* @todo*/
 
 	-moz-transition: all 0.05s linear 0.05s;
 
 }
 
 .topbottom:hover {
@@ -563,29 +556,11 @@ div.pagesection div.floatright input, div.pagesection div.floatright select {
 
 	border-left: 1px solid #bbb;
 
 	border-top: 1px solid #aaa;
 
 	box-shadow: -1px -1px 2px rgba(0,0,0,0.07), -1px -2px 4px rgba(255,255,255,0.33) inset;
 
-	/* [WIP]*/
 
+	/* @todo*/
 
 	-moz-transition: all 0.05s linear 0.05s;
 
 }
 
 
 
-/* Colors for background of posts requiring approval */
 
-.approvebg {
 
-	color: #222;
 
-	background: #ffeaea;
 
-}
 
-.approvebg2 {
 
-	color: #222;
 
-	background: #fff2f2;
 
-}
 
 
 
-/* Color for background of *topics* requiring approval */
 
-.approvetbg {
 
-	color: #222;
 
-	background: #e4a17c;
 
-}
 
-.approvetbg2 {
 
-	color: #222;
 
-	background: #f3bd9f;
 
-}
 
 
 
 /* Sticky topics get a different background */
 
 .stickybg {
@@ -779,7 +754,7 @@ dl.settings dt a img {
 
 h3.catbg, h3.catbg2, h3.titlebg, h4.titlebg, h4.catbg {
 
 	overflow: hidden;
 
 	font-size: 1.1em;
 
-	font-family: tahoma;/*[WIP]*/
 
+	font-family: tahoma;/* @todo */
 
 	font-weight: bold;
 
 	line-height: 1.5em;
 
 	padding: 8px;
@@ -792,7 +767,7 @@ h3.catbg2 a, h3.catbg2 {
 
 }
 
 h3.catbg a:hover, h4.catbg a:hover, .table_list tbody.header td a:hover {
 
 	color: #ffc178;
 
-	text-shadow: -1px -1px 0 rgba(0,0,0,0.5);
 
+	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.4);
 
 	text-decoration: none;
 
 }
 
 h3.catbg2 a:hover {
@@ -837,7 +812,7 @@ div.cat_bar {
 
 	padding: 0;
 
 	border-radius: 6px 6px 0 0;
 
 	box-shadow: 0 16px 20px rgba(255,255,255,0.15) inset;
 
-	text-shadow: -1px -1px 1px rgba(0,0,0,0.4)
 
+	text-shadow: -1px -1px 1px rgba(0,0,0,0.2)
 
 }
 
 /* Message index board descriptions*/
 
 .description_header {
@@ -850,7 +825,7 @@ div.title_bar {
 
 	background: #c5cfd9 url(../images/theme/bars.png) 0 -340px repeat-x;
 
 }
 
 
 
-/* Info center title bars are a bit different. *//* [WIP] */
 
+/* Info center title bars are a bit different. */ /* @todo */
 
 /*div.title_barIC {
 
 	background: #dde3e9 url(../images/theme/bars.png) 0 0 repeat-x;
 
 }*/
@@ -921,7 +896,7 @@ img.sort {
 
 }
 
 
 
 /* Used for sections that need somewhat larger corners.
 
------------------------------------------------------------ *//* [WIP] */
 
+----------------------------------------------------------- */ /* @todo */
 
 .roundframe {
 
 	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 
 	margin: 2px 0 0 0;
@@ -983,7 +958,7 @@ img.sort {
 
 	float: left;
 
 	width: 100%;
 
 	position: relative; /* WTF is this relative for? Hmmmm.*/
 
-	-moz-box-sizing: border-box;
 
+	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 
 }
 
 /* Level 1 button background. */
 
 .dropmenu li {
@@ -1054,7 +1029,7 @@ img.sort {
 
 	position: absolute;
 
 	top: 2.25em;
 
 	left: -9999px;
 
-	width: 16em;
 
+	width: 17em;
 
 	padding: 5px 0 7px 0;
 
 	font-weight: normal;
 
 	background: #fff url(../images/theme/bars.png) 0 -580px repeat-x;
@@ -1244,13 +1219,13 @@ li#collapse_button {
 
 /*	font-weight: bold;*/
 
 	color: #444;
 
 	font-size: 0.8em;
 
-	/* [WIP]*/
 
+	/* @todo*/
 
 	-moz-transition: all 0.05s linear 0.05s;
 
 }
 
 /* Keep a consistent size when wrapped in pagesection. */
 
 .pagesection .buttonlist ul li a {
 
 	font-size: 0.889em;
 
-	/* [WIP]*/
 
+	/* @todo*/
 
 	-moz-transition: all 0.05s linear 0.05s;
 
 }
 
 .buttonlist ul li a:hover {
@@ -1261,7 +1236,7 @@ li#collapse_button {
 
 	border-left: 1px solid #bbb;
 
 	border-top: 1px solid #aaa;
 
 	box-shadow: -1px -1px 2px rgba(0,0,0,0.07), -1px -2px 4px rgba(255,255,255,0.33) inset;
 
-	/* [WIP]*/
 
+	/* @todo*/
 
 	-moz-transition: all 0.05s linear 0.05s;
 
 }
 
 .buttonlist ul li a span {
@@ -1280,12 +1255,12 @@ li#collapse_button {
 
 	border-left: 1px solid #bbb;
 
 	border-top: 1px solid #354f64;
 
 	box-shadow: -1px -1px 2px rgba(0,0,0,0.1), -1px -2px 3px rgba(255,255,255,0.3) inset, 1px 2px 3px rgba(0,0,0,0.1) inset;
 
-	/* [WIP]*/
 
+	/* @todo*/
 
 	-moz-transition: all 0.05s linear 0.05s;
 
 }
 
 .buttonlist ul li a.active:hover {
 
 	color: #ffc187;
 
-	/* [WIP]*/
 
+	/* @todo*/
 
 	-moz-transition: all 0.05s linear 0.05s;
 
 }
 
 .align_top ul li a, .align_bottom ul li a {
@@ -1366,7 +1341,7 @@ li#collapse_button {
 
 	background: #fff url(../images/theme/lower_section.png) 0 45% repeat-x;
 
 	color: #333;
 
 }
 
-/* [WIP] In practice it may be better to set a different value for Firefox and Opera only, */
 
+/* @todo In practice it may be better to set a different value for Firefox and Opera only, */
 
 /*	just to save a little bit of code. Will wait for Opera detection on body tag. */
 
 #ie #search_form .button_submit, #chrome #search_form .button_submit {
 
 	padding: 3px 5px;
@@ -1515,6 +1490,7 @@ img#upshrink {
 
 }
 
 .navigate_section ul li .dividers {
 
 	color: #3f6b8c;
 
+	font: 83.33%/150% Arial,sans-serif;
 
 	text-shadow: -2px -1px 0 rgba(0,0,0,0.4), -1px -1px 0 rgba(0,0,0,0.4), -2px 1px 0 rgba(0,0,0,0.4);
 
 }
 
 
@@ -1962,7 +1938,7 @@ p#whoisviewing {
 
 }
 
 /* poster and postarea + moderation area underneath */
 
 /* Need to sort the overflow on the post backgrounds. */
 
-#forumposts .windowbg, #forumposts .windowbg2, #personal_messages div.windowbg, #personal_messages div.windowbg2 {
 
+#forumposts .windowbg, #forumposts .windowbg2, #forumposts .approvebg, #forumposts .approvebg2, #personal_messages div.windowbg, #personal_messages div.windowbg2 {
 
 	overflow: visible;
 
 	float: left;
 
 	width: 100%;
@@ -1991,7 +1967,7 @@ p#whoisviewing {
 
 	display: block;
 
 }
 
 /* Nifty new flyout menu for the poster info. */
 
-/* [WIP] Can probably clean up the CSS here a bit. */
 
+/* @todo Can probably clean up the CSS here a bit. */
 
 /* Check inheritance with font size in the dropdown. */
 
 .poster .dropmenu {
 
 	padding: 0 0 0 0;
@@ -2251,7 +2227,7 @@ ul.quickbuttons li.inline_mod_check {
 
 	color: /*#492700*/ #222;
 
 	margin: 3px 19px;
 
 	overflow: visible;
 
-	/* [WIP] */
 
+	/* @todo */
 
 	-moz-transition: all 0.1s linear 0.05s;
 
 }
 
 .quickbuttons li:first-child {
@@ -2264,7 +2240,7 @@ ul.quickbuttons li.inline_mod_check {
 
 	border: 1px solid #ccc;
 
 	border-left: 1px solid #bbb;
 
 	border-top: 1px solid #aaa;
 
-	/* [WIP] */
 
+	/* @todo */
 
 	-moz-transition: all 0.1s linear 0.05s;
 
 }
 
 .quickbuttons li.quick_edit, .quickbuttons li.post_options {
@@ -2338,7 +2314,7 @@ ul.quickbuttons li.inline_mod_check {
 
 /*-------------------------------------*/
 
 /* The new little droppy off the "More.." button. */
 
 /* This should probably be Superfished for production, but transitions were fun to play with in testing. */
 
-	/* [WIP] */
 
+	/* @todo */
 
 .quickbuttons li.post_options ul {
 
 	opacity: 0;
 
 	z-index: -1;
@@ -2463,7 +2439,12 @@ ul.post_options li {
 
 	padding: 0;
 
 	padding: 6px;
 
 }
 
-#postAttachment dd, #postAttachment2 dd {
 
+#postAttachment dd {
 
+	margin: 4px 0 4px 12px;
 
+	width: 45%;
 
+	float: left;
 
+}
 
+#postAttachment2 dd {
 
 	margin: 4px 0 4px 12px;
 
 }
 
 #postAttachment dt, #postAttachment2 dt {
@@ -2580,7 +2561,7 @@ ul.post_options li {
 
 	width: 65%;
 
 }
 
 #edit_poll dl.poll_options dd input {
 
-	margin-left: 0; 
 
+	margin-left: 0;
 
 }
 
 
 
 /* Styles for the recent messages section.
@@ -2920,6 +2901,13 @@ tr.windowbg td, tr.windowbg2 td, tr.approvebg td, tr.highlight2 td {
 
 	padding: 7px 10px 7px 35px;
 
 	margin-bottom: 12px;
 
 }
 
+.descbox  {
 
+	text-align: left;
 
+	padding: 7px 10px 7px 35px;
 
+	border: 1px solid #c5c5c5;
 
+	border-radius: 7px;
 
+	margin: 6px 0;
 
+}
 
 
 
 /* Styles for the profile section.
 
 ------------------------------------------------- */
@@ -3783,7 +3771,7 @@ span.hidelink {
 
 	margin: -4px 4px 0 0;
 
 }
 
 
 
-/* Styles for the progress bar 
 
+/* Styles for the progress bar
 
 -------------------------------------------------- */
 
 .progress_bar {
 
 	height: 15pt;
@@ -3850,7 +3838,7 @@ span.hidelink {
 
 /* Forum posts may require some special treatment for dealing with clearing floated content. */
 
 /* Suspect it will be necessary to use float: left; width: 100%; on the windowbg and windowbg2 divs. */
 
 
 
-#forumposts .windowbg, #forumposts .windowbg2, #statistics .flow_hidden, #personal_messages .windowbg, #personal_messages .windowbg2 {
 
+#forumposts .windowbg, #forumposts .windowbg2, #statistics .flow_hidden, #forumposts .approvebg, #forumposts .approvebg2, #personal_messages .windowbg, #personal_messages .windowbg2 {
 
 	background: /*#e8eff5;*/#f0f4f7;
 
 	margin: 12px 0 0 0;
 
 	padding: 8px 8px 16px 8px;
@@ -3897,6 +3885,9 @@ span.hidelink {
 
 	overflow: auto;
 
 	-moz-box-sizing: border-box; box-sizing: border-box; -webkit-box-sizing: border-box;
 
 }
 
+.generic_list_wrapper {
 
+	margin-top: -5px;
 
+}
 
 .generic_list_wrapper .title_bar{
 
 	background: none;
 
 	border-bottom: 1px solid #fff;
@@ -3909,10 +3900,16 @@ span.hidelink {
 
 }
 
 .generic_list_wrapper .additional_row {
 
 	margin: 0;
 
-	padding: 0;
 
-	border-bottom: 1px solid #aaa;
 
+	padding: 5px 0;
 
+	/*border-top: 1px solid #aaa;*/
 
 	border-radius: 0;
 
 }
 
+.generic_list_wrapper table.table_grid {
 
+	border-bottom: 1px solid #aaa;
 
+}
 
+.generic_list_wrapper .information .additional_row{
 
+	border: none;
 
+}
 
 .generic_list_wrapper .information {
 
 	margin: 0;
 
 	padding: 0;
@@ -3956,7 +3953,7 @@ span.hidelink {
 
 .action_recent #recent .quickbuttons {
 
 	margin-top: 8px;
 
 }
 
-/* [WIP] Some odd inheritance glitch here with font-size. Check it out. */
 
+/* @todo Some odd inheritance glitch here with font-size. Check it out. */
 
 .topic_details .smalltext {
 
 	font-size: 0.9em;
 
 }
@@ -3983,10 +3980,13 @@ span.hidelink {
 
 	border-top: 2px solid #ff9400;
 
 	border-bottom: 2px solid #bf6900;
 
 	background: #fff;
 
-	color: #444;
 
+	color: #666;
 
 	border-radius: 2px 2px 0 0;
 
 	text-align: left;
 
 }
 
+.table_grid tr.catbg th.centercol, .table_grid tr.windowbg2 td.centercol, .table_grid tr.windowbg td.centercol, .table_grid tr.highlight2 td.centercol {
 
+	text-align: center;
 
+}
 
 #show_attachments th {
 
 	text-align: left;
 
 }
@@ -4050,7 +4050,7 @@ tr.catbg th:last-child, #show_attachments th:last-child {
 
 }
 
 
 
 /* Subtle zebra striping to make tables easier to follow. Will make a solution for IE8. */
 
-/* CSS for locked, sticky, etc has not been applied yet. Don't panic. She'll be right, mate. :P */ 
 
+/* CSS for locked, sticky, etc has not been applied yet. Don't panic. She'll be right, mate. :P */
 
 .table_grid td.statsbar div{display: none;}
 
 .table_grid  tr td:first-child, .table_grid td.icon2 {
 
 	border-left: 1px solid #ccc;
@@ -4058,9 +4058,9 @@ tr.catbg th:last-child, #show_attachments th:last-child {
 
 .table_grid td.lastpost, .table_grid td.whos_viewing, .table_grid td.moderation, .table_grid td.qaction_cell {
 
 	border-right: 1px solid #ccc;
 
 }
 
-.table_grid td.windowbg, .table_grid td.windowbg2,.table_grid td.lockedbg, .table_grid td.lockedbg2,
 
-.table_grid td.stickybg, .table_grid td.stickybg2,.table_grid td.locked_sticky, .table_grid td.locked_sticky2,
 
-.table_grid td.whos_viewing, .table_grid td.moderation, .table_grid td.qaction_cell {
 
+.table_grid td.windowbg, .table_grid td.windowbg2, .table_grid td.lockedbg, .table_grid td.lockedbg2,
 
+.table_grid td.stickybg, .table_grid td.stickybg2, .table_grid td.locked_sticky, .table_grid td.locked_sticky2,
 
+.table_grid td.whos_viewing, .table_grid td.moderation, .table_grid td.qaction_cell, .table_grid tbody {
 
 	border-bottom: 1px solid #ccc;
 
 }
 
 .table_grid tr:nth-child(even) td {
@@ -4072,3 +4072,21 @@ tr.catbg th:last-child, #show_attachments th:last-child {
 
 .table_grid td.whos_viewing {
 
 	font-size: 0.9em;
 
 }
 
+/* Colors for background of posts requiring approval */
 
+#forumposts .approvebg {
 
+	color: #222;
 
+	background: #ffeaea;
 
+}
 
+#forumposts .approvebg2 {
 
+	color: #222;
 
+	background: #fff2f2;
 
+}
 
+/* Color for background of *topics* requiring approval */
 
+.approvetbg {
 
+	color: #222;
 
+	background: #e4a17c;
 
+}
 
+.approvetbg2 {
 
+	color: #222;
 
+	background: #f3bd9f;
 
+}
--- a/Themes/default/images/admin/current_theme.png
+++ b/Themes/default/images/admin/current_theme.png
--- a/Themes/default/images/admin/exit.png
+++ b/Themes/default/images/admin/exit.png
--- a/Themes/default/images/admin/feature_cd.png
+++ b/Themes/default/images/admin/feature_cd.png
--- a/Themes/default/images/admin/feature_cp.png
+++ b/Themes/default/images/admin/feature_cp.png
--- a/Themes/default/images/admin/feature_ih.png
+++ b/Themes/default/images/admin/feature_ih.png
--- a/Themes/default/images/admin/feature_k.png
+++ b/Themes/default/images/admin/feature_k.png
--- a/Themes/default/images/admin/feature_ml.png
+++ b/Themes/default/images/admin/feature_ml.png
--- a/Themes/default/images/admin/feature_pm.png
+++ b/Themes/default/images/admin/feature_pm.png
--- a/Themes/default/images/admin/feature_ps.png
+++ b/Themes/default/images/admin/feature_ps.png
--- a/Themes/default/images/admin/feature_rg.png
+++ b/Themes/default/images/admin/feature_rg.png
--- a/Themes/default/images/admin/feature_sp.png
+++ b/Themes/default/images/admin/feature_sp.png
--- a/Themes/default/images/admin/feature_w.png
+++ b/Themes/default/images/admin/feature_w.png
--- a/Themes/default/images/admin/features.png
+++ b/Themes/default/images/admin/features.png
--- a/Themes/default/images/admin/features_and_options.png
+++ b/Themes/default/images/admin/features_and_options.png
--- a/Themes/default/images/admin/forum_maintenance.png
+++ b/Themes/default/images/admin/forum_maintenance.png
--- a/Themes/default/images/admin/members_lg.png
+++ b/Themes/default/images/admin/members_lg.png
--- a/Themes/default/images/admin/modifications.png
+++ b/Themes/default/images/admin/modifications.png
--- a/Themes/default/images/admin/packages.png
+++ b/Themes/default/images/admin/packages.png
--- a/Themes/default/images/admin/packages_lg.png
+++ b/Themes/default/images/admin/packages_lg.png
--- a/Themes/default/images/admin/permissions_lg.png
+++ b/Themes/default/images/admin/permissions_lg.png
--- a/Themes/default/images/admin/smilies_and_messageicons.png
+++ b/Themes/default/images/admin/smilies_and_messageicons.png
--- a/Themes/default/images/admin/support_and_credits.png
+++ b/Themes/default/images/admin/support_and_credits.png
--- a/Themes/default/images/admin/support~.png
+++ b/Themes/default/images/admin/support~.png
--- a/Themes/default/images/admin/themes_and_layout.png
+++ b/Themes/default/images/admin/themes_and_layout.png
--- a/Themes/default/images/aim.png
+++ b/Themes/default/images/aim.png
--- a/Themes/default/images/buttons/search_hd.png
+++ b/Themes/default/images/buttons/search_hd.png
--- a/Themes/default/images/construction.png
+++ b/Themes/default/images/construction.png
--- a/Themes/default/images/helptopics_hd.png
+++ b/Themes/default/images/helptopics_hd.png
--- a/Themes/default/images/icons/config_hd.png
+++ b/Themes/default/images/icons/config_hd.png
--- a/Themes/default/images/icons/login_hd.png
+++ b/Themes/default/images/icons/login_hd.png
--- a/Themes/default/images/icons/profile_hd.png
+++ b/Themes/default/images/icons/profile_hd.png
--- a/Themes/default/images/icons/profile_sm~.png
+++ b/Themes/default/images/icons/profile_sm~.png
--- a/Themes/default/images/loading_sm.gif
+++ b/Themes/default/images/loading_sm.gif
--- a/Themes/default/images/msntalk.png
+++ b/Themes/default/images/msntalk.png
--- a/Themes/default/images/stats_info_hd.png
+++ b/Themes/default/images/stats_info_hd.png
--- a/Themes/default/index.template.php
+++ b/Themes/default/index.template.php
@@ -433,7 +433,7 @@ function theme_linktree($force_show = false)
 
 		// Picked a better looking HTML entity, and added support for RTL plus a span for styling.
 
 		if ($link_num != 0)
 
 			echo '
 
-				<span class="dividers">',$context['right_to_left'] ? ' &#9668; ' : ' &#9658; ', '</span>';
 
+				<span class="dividers">', $context['right_to_left'] ? ' &#9668; ' : ' &#9658; ', '</span>';
 
 
 
 		// Show the link, including a URL if it should have one.
 
 		echo $settings['linktree_link'] && isset($tree['url']) ? '
--- a/Themes/default/languages/Admin.english.php
+++ b/Themes/default/languages/Admin.english.php
@@ -637,6 +637,7 @@ $txt['admin_search_section_sections'] = 'Section';
 
 $txt['admin_search_section_settings'] = 'Setting';
 
 
 
 $txt['core_settings_title'] = 'Core Features';
 
+$txt['core_settings_desc'] = 'This page allows you to turn on or off optional features of your forum.';
 
 $txt['mods_cat_features'] = 'General';
 
 $txt['mods_cat_security_general'] = 'General';
 
 $txt['antispam_title'] = 'Anti-Spam';