! some more template cleanup, remove depreciated align tags, add some classes where needed

! a little css cleanup (combining test markup back in place)

Sources/ManageAttachments.php

@@ -354,7 +354,6 @@ function BrowseFiles()
 
 						return sprintf(\'%1$s%2$s\', round($rowData[\'size\'] / 1024, 2), $txt[\'kilobyte\']);
 					'),
-					'class' => 'windowbg',
 				),
 				'sort' => array(
 					'default' => 'a.size',
@@ -400,7 +399,6 @@ function BrowseFiles()
 
 						return $date;
 						'),
-					'class' => 'windowbg',
 				),
 				'sort' => array(
 					'default' => $context['browse_type'] === 'avatars' ? 'mem.last_login' : 'm.id_msg',
@@ -417,7 +415,6 @@ function BrowseFiles()
 
 						return comma_format($rowData[\'downloads\']);
 					'),
-					'class' => 'windowbg',
 				),
 				'sort' => array(
 					'default' => 'a.downloads',

Sources/ManageSettings.php

@@ -774,7 +774,7 @@ function ModifySpamSettings($return_config = false)
 				array('check', 'guests_report_require_captcha'),
 			'',
 			// PM Settings
-				'pm1' => array('int', 'max_pm_recipients', 'subtext' => $txt['pm_posts_recipients_note']),
+				'pm1' => array('int', 'max_pm_recipients', 'subtext' => $txt['max_pm_recipients_note']),
 				'pm2' => array('int', 'pm_posts_verification', 'subtext' => $txt['pm_posts_verification_note']),
 				'pm3' => array('int', 'pm_posts_per_hour', 'subtext' => $txt['pm_posts_per_hour_note']),
 			// Visual verification.

Sources/ManageSmileys.php

@@ -136,8 +136,8 @@ function EditSmileySettings($return_config = false)
 			array('select', 'smiley_sets_default', $smiley_context),
 			array('check', 'smiley_sets_enable'),
 			array('check', 'smiley_enable', 'subtext' => $txt['smileys_enable_note']),
-			array('text', 'smileys_url'),
-			array('text', 'smileys_dir', 'invalid' => !$context['smileys_dir_found']),
+			array('text', 'smileys_url', 40),
+			array('text', 'smileys_dir', 'invalid' => !$context['smileys_dir_found'], 40),
 		'',
 			// Message icons.
 			array('check', 'messageIcons_enable', 'subtext' => $txt['setting_messageIcons_enable_note']),

Sources/Modlog.php

@@ -156,7 +156,7 @@ function ViewModlog()
 	// This is all the information required for a watched user listing.
 	$listOptions = array(
 		'id' => 'moderation_log_list',
-		'title' => '<a href="' . $scripturl . '?action=helpadmin;help=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . '" onclick="return reqWin(this.href);" class="help"><img src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" align="top" /></a> ' . $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log'],
+		'title' => '<a href="' . $scripturl . '?action=helpadmin;help=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . '" onclick="return reqWin(this.href);" class="help"><img src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a> ' . $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log'],
 		'width' => '100%',
 		'items_per_page' => $context['displaypage'],
 		'no_items_label' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin_log_' : '') . 'no_entries_found'],

Sources/Subs.php

@@ -3491,7 +3491,7 @@ function create_button($name, $alt, $label = '', $custom = '', $force_use = fals
 	if (!$settings['use_image_buttons'])
 		return $txt[$alt];
 	elseif (!empty($settings['use_buttons']))
-		return '<img src="' . $settings['images_url'] . '/buttons/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . ' />' . ($label != '' ? '<strong>' . $txt[$label] . '</strong>' : '');
+		return '<img src="' . $settings['images_url'] . '/buttons/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . ' />' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
 	else
 		return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . ' />';
 }

Themes/default/Admin.template.php

@@ -27,7 +27,7 @@ function template_admin()
 		echo '
 			<object id="quick_search">
 				<form action="', $scripturl, '?action=admin;area=search" method="post" accept-charset="', $context['character_set'], '" class="floatright">
-					<img src="', $settings['images_url'] , '/filter.png" alt="" />
+					<img class="icon" src="', $settings['images_url'] , '/filter.png" alt="" />
 					<input type="text" name="search_term" value="', $txt['admin_search'], '" onclick="if (this.value == \'', $txt['admin_search'], '\') this.value = \'\';" class="input_text" />
 					<select name="search_type">
 						<option value="internal"', (empty($context['admin_preferences']['sb']) || $context['admin_preferences']['sb'] == 'internal' ? ' selected="selected"' : ''), '>', $txt['admin_search_type_internal'], '</option>
@@ -1115,7 +1115,7 @@ function template_edit_profile_field()
 								</select>
 							</dd>
 							<dt>
-								<a id="field_show_enclosed" href="', $scripturl, '?action=helpadmin;help=field_show_enclosed" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" align="top" /></a>
+								<a id="field_show_enclosed" href="', $scripturl, '?action=helpadmin;help=field_show_enclosed" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" /></a>
 								<strong><label for="enclose">', $txt['custom_edit_enclose'], ':</label></strong><br />
 								<span class="smalltext">', $txt['custom_edit_enclose_desc'], '</span>
 							</dt>
@@ -1189,7 +1189,7 @@ function template_edit_profile_field()
 						<legend>', $txt['custom_edit_advanced'], '</legend>
 						<dl class="settings">
 							<dt id="mask_dt">
-								<a id="custom_mask" href="', $scripturl, '?action=helpadmin;help=custom_mask" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" align="top" /></a>
+								<a id="custom_mask" href="', $scripturl, '?action=helpadmin;help=custom_mask" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" /></a>
 								<strong><label for="mask">', $txt['custom_edit_mask'], ':</label></strong><br />
 								<span class="smalltext">', $txt['custom_edit_mask_desc'], '</span>
 							</dt>

Themes/default/ManageNews.template.php

@@ -316,7 +316,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 reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" align="top" /></a> ', $txt['admin_newsletters'], '
+					<a href="', $scripturl, '?action=helpadmin;help=email_members" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a> ', $txt['admin_newsletters'], '
 				</h3>
 			</div>
 			<div class="windowbg">

Themes/default/ManageSearch.template.php

@@ -25,7 +25,7 @@ function template_modify_weights()
 				<div class="content">
 					<dl class="settings">
 						<dt class="large_caption">
-							<a href="', $scripturl, '?action=helpadmin;help=search_weight_frequency" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" align="top" /></a><label for="weight1_val">
+							<a href="', $scripturl, '?action=helpadmin;help=search_weight_frequency" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a><label for="weight1_val">
 							', $txt['search_weight_frequency'], ':</label>
 						</dt>
 						<dd class="large_caption">
@@ -33,7 +33,7 @@ function template_modify_weights()
 							<span id="weight1" class="search_weight">', $context['relative_weights']['search_weight_frequency'], '%</span>
 						</dd>
 						<dt class="large_caption">
-							<a href="', $scripturl, '?action=helpadmin;help=search_weight_age" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" align="top" /></a><label for="weight2_val">
+							<a href="', $scripturl, '?action=helpadmin;help=search_weight_age" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a><label for="weight2_val">
 							', $txt['search_weight_age'], ':</label>
 						</dt>
 						<dd class="large_caption">
@@ -41,7 +41,7 @@ function template_modify_weights()
 							<span id="weight2" class="search_weight">', $context['relative_weights']['search_weight_age'], '%</span>
 						</dd>
 						<dt class="large_caption">
-							<a href="', $scripturl, '?action=helpadmin;help=search_weight_length" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" align="top" /></a><label for="weight3_val">
+							<a href="', $scripturl, '?action=helpadmin;help=search_weight_length" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a><label for="weight3_val">
 							', $txt['search_weight_length'], ':</label>
 						</dt>
 						<dd class="large_caption">
@@ -49,7 +49,7 @@ function template_modify_weights()
 							<span id="weight3" class="search_weight">', $context['relative_weights']['search_weight_length'], '%</span>
 						</dd>
 						<dt class="large_caption">
-							<a href="', $scripturl, '?action=helpadmin;help=search_weight_subject" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" align="top" /></a><label for="weight4_val">
+							<a href="', $scripturl, '?action=helpadmin;help=search_weight_subject" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a><label for="weight4_val">
 							', $txt['search_weight_subject'], ':</label>
 						</dt>
 						<dd class="large_caption">
@@ -57,7 +57,7 @@ function template_modify_weights()
 							<span id="weight4" class="search_weight">', $context['relative_weights']['search_weight_subject'], '%</span>
 						</dd>
 						<dt class="large_caption">
-							<a href="', $scripturl, '?action=helpadmin;help=search_weight_first_message" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" align="top" /></a><label for="weight5_val">
+							<a href="', $scripturl, '?action=helpadmin;help=search_weight_first_message" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a><label for="weight5_val">
 							', $txt['search_weight_first_message'], ':</label>
 						</dt>
 						<dd class="large_caption">

Themes/default/ModerationCenter.template.php

@@ -263,10 +263,10 @@ function template_reported_posts()
 		</div>';
 
 	// Make the buttons.
-	$close_button = create_button('close.png', $context['view_closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close', $context['view_closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close', 'align="middle"');
-	$details_button = create_button('details.png', 'mc_reportedp_details', 'mc_reportedp_details', 'align="middle"');
-	$ignore_button = create_button('ignore.png', 'mc_reportedp_ignore', 'mc_reportedp_ignore', 'align="middle"');
-	$unignore_button = create_button('ignore.png', 'mc_reportedp_unignore', 'mc_reportedp_unignore', 'align="middle"');
+	$close_button = create_button('close.png', $context['view_closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close', $context['view_closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close', 'class="centericon"');
+	$details_button = create_button('details.png', 'mc_reportedp_details', 'mc_reportedp_details', 'class="centericon"');
+	$ignore_button = create_button('ignore.png', 'mc_reportedp_ignore', 'mc_reportedp_ignore', 'class="centericon"');
+	$unignore_button = create_button('ignore.png', 'mc_reportedp_unignore', 'mc_reportedp_unignore', 'class="centericon"');
 
 	foreach ($context['reports'] as $report)
 	{
@@ -342,8 +342,8 @@ function template_unapproved_posts()
 		</div>';
 
 	// Make up some buttons
-	$approve_button = create_button('approve.png', 'approve', 'approve', 'align="middle"');
-	$remove_button = create_button('delete.png', 'remove_message', 'remove', 'align="middle"');
+	$approve_button = create_button('approve.png', 'approve', 'approve', 'class="centericon"');
+	$remove_button = create_button('delete.png', 'remove_message', 'remove', 'class="centericon"');
 
 	// No posts?
 	if (empty($context['unapproved_items']))
@@ -437,8 +437,8 @@ function template_unapproved_attachments()
 			</div>';
 
 	// The ever popular approve button, with the massively unpopular delete.
-	$approve_button = create_button('approve.png', 'approve', 'approve', 'align="middle"');
-	$remove_button = create_button('delete.png', 'remove_message', 'remove', 'align="middle"');
+	$approve_button = create_button('approve.png', 'approve', 'approve', 'class="centericon"');
+	$remove_button = create_button('delete.png', 'remove_message', 'remove', 'class="centericon"');
 
 	// None awaiting?
 	if (empty($context['unapproved_items']))
@@ -540,9 +540,9 @@ function template_viewmodreport()
 					<span class="floatright">';
 
 		// Make the buttons.
-		$close_button = create_button('close.png', $context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close', $context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close', 'align="middle"');
-		$ignore_button = create_button('ignore.png', 'mc_reportedp_ignore', 'mc_reportedp_ignore', 'align="middle"');
-		$unignore_button = create_button('ignore.png', 'mc_reportedp_unignore', 'mc_reportedp_unignore', 'align="middle"');
+		$close_button = create_button('close.png', $context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close', $context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close', 'class="centericon"');
+		$ignore_button = create_button('ignore.png', 'mc_reportedp_ignore', 'mc_reportedp_ignore', 'class="centericon"');
+		$unignore_button = create_button('ignore.png', 'mc_reportedp_unignore', 'mc_reportedp_unignore', 'class="centericon"');
 
 		echo '
 						<a href="', $scripturl, '?action=moderate;area=reports;ignore=', (int) !$context['report']['ignore'], ';rid=', $context['report']['id'], ';', $context['session_var'], '=', $context['session_id'], '" ', !$context['report']['ignore'] ? 'onclick="return confirm(\'' . $txt['mc_reportedp_ignore_confirm'] . '\');"' : '', '>', $context['report']['ignore'] ? $unignore_button : $ignore_button, '</a>
@@ -661,7 +661,7 @@ function template_user_watch_post_callback($post)
 
 	// We'll have a delete please bob.
 	if (empty($delete_button))
-		$delete_button = create_button('delete.png', 'remove_message', 'remove', 'align="middle"');
+		$delete_button = create_button('delete.png', 'remove_message', 'remove', 'class="centericon"');
 
 	$output_html = '
 					<div>

Themes/default/PersonalMessage.template.php

@@ -865,8 +865,8 @@ function template_search_results()
 
 				if ($context['can_send_pm'])
 				{
-					$quote_button = create_button('quote.png', 'reply_quote', 'reply_quote', 'align="middle"');
-					$reply_button = create_button('im_reply.png', 'reply', 'reply', 'align="middle"');
+					$quote_button = create_button('quote.png', 'reply_quote', 'reply_quote', 'class="centericon"');
+					$reply_button = create_button('im_reply.png', 'reply', 'reply', 'class="centericon"');
 					// You can only reply if they are not a guest...
 					if (!$message['member']['is_guest'])
 						echo '

Themes/default/Profile.template.php

@@ -89,7 +89,7 @@ function template_summary()
 				', !isset($context['disabled_fields']['aim']) && !empty($context['member']['aim']['link']) ? '<li>' . $context['member']['aim']['link'] . '</li>' : '', '
 				', !isset($context['disabled_fields']['yim']) && !empty($context['member']['yim']['link']) ? '<li>' . $context['member']['yim']['link'] . '</li>' : '', '
 			</ul>
-			<span id="userstatus">', $context['can_send_pm'] ? '<a href="' . $context['member']['online']['href'] . '" title="' . $context['member']['online']['label'] . '" rel="nofollow">' : '', $settings['use_image_buttons'] ? '<img src="' . $context['member']['online']['image_href'] . '" alt="' . $context['member']['online']['text'] . '" align="middle" />' : $context['member']['online']['text'], $context['can_send_pm'] ? '</a>' : '', $settings['use_image_buttons'] ? '<span class="smalltext"> ' . $context['member']['online']['text'] . '</span>' : '';
+			<span id="userstatus">', $context['can_send_pm'] ? '<a href="' . $context['member']['online']['href'] . '" title="' . $context['member']['online']['label'] . '" rel="nofollow">' : '', $settings['use_image_buttons'] ? '<img src="' . $context['member']['online']['image_href'] . '" alt="' . $context['member']['online']['text'] . '" class="centericon" />' : $context['member']['online']['text'], $context['can_send_pm'] ? '</a>' : '', $settings['use_image_buttons'] ? '<span class="smalltext"> ' . $context['member']['online']['text'] . '</span>' : '';
 
 	// Can they add this member as a buddy?
 	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner'])
@@ -342,10 +342,10 @@ function template_showPosts()
 		</div>';
 
 	// Button shortcuts
-	$quote_button = create_button('quote.png', 'reply_quote', 'quote', 'align="middle"');
-	$reply_button = create_button('reply_sm.png', 'reply', 'reply', 'align="middle"');
-	$remove_button = create_button('delete.png', 'remove_message', 'remove', 'align="middle"');
-	$notify_button = create_button('notify_sm.png', 'notify_replies', 'notify', 'align="middle"');
+	$quote_button = create_button('quote.png', 'reply_quote', 'quote', 'class="centericon"');
+	$reply_button = create_button('reply_sm.png', 'reply', 'reply', 'class="centericon"');
+	$remove_button = create_button('delete.png', 'remove_message', 'remove', 'class="centericon"');
+	$notify_button = create_button('notify_sm.png', 'notify_replies', 'notify', 'class="centericon"');
 
 	// Are we displaying posts or attachments?
 	if (!isset($context['attachments']))
@@ -2807,12 +2807,12 @@ function template_profile_smiley_pick()
 								<strong><label for="smiley_set">', $txt['smileys_current'], ':</label></strong>
 							</dt>
 							<dd>
-								<select name="smiley_set" id="smiley_set" onchange="document.getElementById(\'smileypr\').src = this.selectedIndex == 0 ? \'', $settings['images_url'], '/blank.png\' : \'', $modSettings['smileys_url'], '/\' + (this.selectedIndex != 1 ? this.options[this.selectedIndex].value : \'', !empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'], '\') + \'/smiley.png\';">';
+								<select name="smiley_set" id="smiley_set" onchange="document.getElementById(\'smileypr\').src = this.selectedIndex == 0 ? \'', $settings['images_url'], '/blank.png\' : \'', $modSettings['smileys_url'], '/\' + (this.selectedIndex != 1 ? this.options[this.selectedIndex].value : \'', !empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'], '\') + \'/smiley.gif\';">';
 	foreach ($context['smiley_sets'] as $set)
 		echo '
 									<option value="', $set['id'], '"', $set['selected'] ? ' selected="selected"' : '', '>', $set['name'], '</option>';
 	echo '
-								</select> <img id="smileypr" src="', $context['member']['smiley_set']['id'] != 'none' ? $modSettings['smileys_url'] . '/' . ($context['member']['smiley_set']['id'] != '' ? $context['member']['smiley_set']['id'] : (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'])) . '/smiley.png' : $settings['images_url'] . '/blank.png', '" alt=":)" align="top" style="padding-left: 20px;" />
+								</select> <img id="smileypr" class="centericon" src="', $context['member']['smiley_set']['id'] != 'none' ? $modSettings['smileys_url'] . '/' . ($context['member']['smiley_set']['id'] != '' ? $context['member']['smiley_set']['id'] : (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'])) . '/smiley.gif' : $settings['images_url'] . '/blank.png', '" alt=":)"  style="padding-left: 20px;" />
 							</dd>';
 }
 

Themes/default/SendTopic.template.php

@@ -180,9 +180,9 @@ function template_custom_email()
 							<textarea id="email_body" name="email_body" rows="10" cols="20" style="' . (isBrowser('is_ie8') ? 'width: 635px; max-width: 90%; min-width: 90%' : 'width: 90%') . ';"></textarea>
 						</dd>
 					</dl>
-					<div class="righttext">
-						<input type="submit" name="send" value="', $txt['sendtopic_send'], '" class="button_submit" />
-					</div>
+					<hr class="hrcolor" />
+					<input type="submit" name="send" value="', $txt['sendtopic_send'], '" class="button_submit" />
+					<br class="clear_right" />
 				</div>
 				<span class="botslice"><span></span></span>
 			</div>';

Themes/default/Themes.template.php

@@ -21,7 +21,7 @@ function template_main()
 			<input type="hidden" value="0" name="options[theme_allow]" />
 			<div class="cat_bar">
 				<h3 class="catbg">
-					<span class="ie6_header floatleft"><a href="', $scripturl, '?action=helpadmin;help=themes" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" align="top" /></a>
+					<span class="ie6_header floatleft"><a href="', $scripturl, '?action=helpadmin;help=themes" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" /></a>
 					', $txt['themeadmin_title'], '
 					</span>
 				</h3>
@@ -509,7 +509,7 @@ function template_set_settings()
 		echo '
 			<div class="cat_bar">
 				<h3 class="catbg">
-					<span class="ie6_header floatleft"><img src="', $settings['images_url'], '/icons/config_sm.png" alt="" align="top" /> ', $txt['theme_variants'], '</span>
+					<span class="ie6_header floatleft"><img class="icon" src="', $settings['images_url'], '/icons/config_sm.png" alt="" /> ', $txt['theme_variants'], '</span>
 				</h3>
 			</div>
 			<div class="windowbg2">

Themes/default/css/index.css

@@ -75,28 +75,18 @@ form
 	.input_text    - covers input[type=text] throughout all browsers
 	.input_file    - covers input[type=file] throughout all browsers
 */
-
-input, button, select, textarea
+input, button, select, textarea, textarea.editor 
 {
+	background: #fff;
+	outline: none !important;
+	border: 1px solid #bbb;
+	vertical-align: middle;
+	border-radius: 3px;
+	box-shadow: 0 2px 5px rgba(0,0,0,0.05) inset;
+    padding: 3px;
 	font: 95%/115% verdana, Helvetica, sans-serif;
 	color: #000;
-	background: #fff;
-	border: 1px solid #7f9db9;
-	padding: 2px;
 }
-
-/* Select elements look horrible with the extra padding, so leave them unpadded. */
-select
-{
-	padding: 0;
-}
-
-/* Add some padding to the options instead. */
-select option
-{
-	padding: 2px;
-}
-
 /* The font size of textareas should be just a little bit larger. */
 textarea
 {
@@ -109,7 +99,7 @@ textarea
 	float: none;
 	margin-left: inherit;
 }
-.button_submit, .button_reset
+.button_submit, .button_reset, .button_link
 {
 	background: #cde7ff url(../images/theme/submit_bg.png) no-repeat;
 	border: 1px solid #aaa;
@@ -118,32 +108,19 @@ textarea
 	margin-left: 1em;
 	float: right;
 }
-input:hover, textarea:hover, button:hover, select:hover
-{
-	border: 1px solid #454545;
-}
-.button_submit:hover, .button_reset:hover
-{
-	border: 1px solid #aaa;
-	background: url(../images/theme/submit_bg.png) no-repeat 0 -140px #cde7ff;
-}
-input:focus, textarea:focus, button:focus, select:focus
+.button_link
 {
-	border: 1px solid #454545;
+	padding: 4px 5px 4px 4px;
+	font: 95%/115% verdana, Helvetica, sans-serif;
+	float: right;
+	border-radius: 3px;
 }
-/* Lotsa new stuff innit */
-/* Nifty input focus styling from Mollyhawk pages. */
-
-input, select, textarea, textarea.editor 
-{
-	background: #fff;
-	outline: none !important;
-	border: 1px solid #bbb;
-	vertical-align: top;
-	border-radius: 4px;
-	box-shadow: 0 2px 5px rgba(0,0,0,0.05) inset;
+a.button_link
+{ 
+	color: #000;
+	margin: 0 !important;
 }
-input:hover, select:hover, textarea:hover, textarea.editor:hover 
+input:hover, textarea:hover, button:hover, select:hover
 {
 	outline: none !important;
 	border: 1px solid #999;
@@ -152,39 +129,24 @@ textarea:hover, textarea.editor:hover
 {
 	background: #fbfbfb;
 }
-input:focus, select:focus, textarea:focus, textarea.editor:focus 
+.button_submit:hover, .button_reset:hover, .button_link:hover
 {
-	outline:none !important;
-	border: 1px solid #999;
-	box-shadow: 0 2px 5px rgba(0,0,0,0.1) inset;
+	border: 1px solid #aaa;
+	background: url(../images/theme/submit_bg.png) no-repeat 0 -140px #cde7ff;
 }
-select option 
+.button_link:hover
 {
-	padding: 0.1em 0.3em;
+	text-decoration: none;
 }
-/* End lotsa new stuff */
-
-.button_link
+input:focus, textarea:focus, button:focus, select:focus, textarea.editor:focus
 {
-	background: #cde7ff url(../images/theme/submit_bg.png) no-repeat;
-	border: 1px solid #aaa;
-	padding: 3px 5px 3px 4px;
-	font: 95%/115% verdana, Helvetica, sans-serif;
-	cursor: pointer;
-	font-weight: normal;
-	float: right;
-	border-radius: 4px;
-}
-a.button_link
-{ 
-	color: #000;
-	margin: 0 !important;
+	outline:none !important;
+	border: 1px solid #999;
+	box-shadow: 0 2px 5px rgba(0,0,0,0.1) inset;
 }
-.button_link:hover, .button_link:hover
+select option 
 {
-	border: 1px solid #aaa;
-	text-decoration: none;
-	background: url(../images/theme/submit_bg.png) no-repeat 0 -140px #cde7ff;
+	padding: 0em 0.3em 0 0.3em;
 }
 
 /* the new "button" */
@@ -208,6 +170,7 @@ input.input_check, input.input_radio
 {
 	border: none;
 	background: none;
+	vertical-align: top;
 }
 h3.catbg input.input_check
 {
@@ -242,13 +205,18 @@ h1, h2, h3, h4, h5, h6
 fieldset
 {
 	border: 1px solid #c4c4c4;
-	padding: 1em;
+	padding: 1.5em;
 	margin: 0 0 0.5em 0;
+    border-radius: 3px;
 }
 fieldset legend
 {
 	font-weight: bold;
-	color: #444;
+	color: #555;
+    border-radius: 3px;
+	border: 1px solid #999;
+	box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+    padding: 3px 6px;
 }
 
 /* Define strong as bold, and em as italics */
@@ -535,8 +503,9 @@ tr.catbg th a:link, tr.catbg th a:visited, tr.catbg2 td a:link, tr.catbg2 td a:v
 }
 .catbg select
 {
-	height: 1.8em;
+	height: 2em;
 	font-size: 0.85em;
+	padding: 0;
 }
 
 /* Alternating backgrounds for posts, and several other sections of the forum. */
@@ -811,12 +780,13 @@ dl.settings dd
 dl.settings img
 {
 	margin: 0 10px 0 0;
+	vertical-align: middle;
 }
 /* help icons */
 dl.settings dt a img
 {
 	position: relative;
-	top: 2px;
+	vertical-align: top;
 }
 
 /* Styles for rounded headers.
@@ -1167,7 +1137,7 @@ span.lowerframe span
 {
 	position: absolute;
 	visibility: hidden;
-	border-radius: 4px;
+	border-radius: 3px;
 	outline: none !important;
 	border: 1px solid #bbb;
 }
@@ -1215,7 +1185,7 @@ span.lowerframe span
 	padding: 0 5px 0 5px;
 	margin: 0 0 0 0;
 	display: block;
-	border-radius: 4px;
+	border-radius: 3px;
 }
 /* Level 1 active button. */
 .dropmenu li a.active
@@ -1246,7 +1216,7 @@ span.lowerframe span
 	font-size: 1.1em;
 	background: #fff url(../images/theme/menu_gfx.png) -30px -137px repeat-x;
 	border: solid 1px #999;
-	border-radius: 4px;
+	border-radius: 3px;
 	/* Note: Using a black rgba box-shadow with suitable
 	alpha value gives the best effect on any background. */
 	box-shadow: 1px 2px 2px rgba(0,0,0,0.3);
@@ -2694,7 +2664,7 @@ h3.titlebg img
 {
 	vertical-align: middle;
 	margin-right: 0.5em;
-	margin-top: -1px;
+	margin-top: -4px;
 }
 tr.titlebg td
 {