diff --git a/phpBB/adm/images/bg_header.gif b/phpBB/adm/images/bg_header.gif
new file mode 100644
index 0000000000..b95bf3ba95
Binary files /dev/null and b/phpBB/adm/images/bg_header.gif differ
diff --git a/phpBB/adm/images/bg_header.jpg b/phpBB/adm/images/bg_header.jpg
deleted file mode 100644
index bcad88f588..0000000000
Binary files a/phpBB/adm/images/bg_header.jpg and /dev/null differ
diff --git a/phpBB/adm/images/bg_tabs1.gif b/phpBB/adm/images/bg_tabs1.gif
new file mode 100644
index 0000000000..8f3802fd97
Binary files /dev/null and b/phpBB/adm/images/bg_tabs1.gif differ
diff --git a/phpBB/adm/images/bg_tabs2.gif b/phpBB/adm/images/bg_tabs2.gif
new file mode 100644
index 0000000000..fc9c3b8fd9
Binary files /dev/null and b/phpBB/adm/images/bg_tabs2.gif differ
diff --git a/phpBB/adm/images/cellpic1.gif b/phpBB/adm/images/cellpic1.gif
deleted file mode 100644
index 35932cc07b..0000000000
Binary files a/phpBB/adm/images/cellpic1.gif and /dev/null differ
diff --git a/phpBB/adm/images/header_bg.jpg b/phpBB/adm/images/header_bg.jpg
deleted file mode 100644
index 5ecec5360b..0000000000
Binary files a/phpBB/adm/images/header_bg.jpg and /dev/null differ
diff --git a/phpBB/adm/images/header_left.jpg b/phpBB/adm/images/header_left.jpg
deleted file mode 100644
index aaebf33c7a..0000000000
Binary files a/phpBB/adm/images/header_left.jpg and /dev/null differ
diff --git a/phpBB/adm/images/icon_delete.gif b/phpBB/adm/images/icon_delete.gif
new file mode 100644
index 0000000000..57962d5172
Binary files /dev/null and b/phpBB/adm/images/icon_delete.gif differ
diff --git a/phpBB/adm/images/icon_down.gif b/phpBB/adm/images/icon_down.gif
new file mode 100644
index 0000000000..793db26cde
Binary files /dev/null and b/phpBB/adm/images/icon_down.gif differ
diff --git a/phpBB/adm/images/icon_edit.gif b/phpBB/adm/images/icon_edit.gif
new file mode 100644
index 0000000000..c95cf98eb9
Binary files /dev/null and b/phpBB/adm/images/icon_edit.gif differ
diff --git a/phpBB/adm/images/icon_sync.gif b/phpBB/adm/images/icon_sync.gif
new file mode 100644
index 0000000000..16223dfd9a
Binary files /dev/null and b/phpBB/adm/images/icon_sync.gif differ
diff --git a/phpBB/adm/images/icon_up.gif b/phpBB/adm/images/icon_up.gif
new file mode 100644
index 0000000000..7daa95c07e
Binary files /dev/null and b/phpBB/adm/images/icon_up.gif differ
diff --git a/phpBB/adm/images/logo.gif b/phpBB/adm/images/logo.gif
deleted file mode 100644
index f0fe5f1762..0000000000
Binary files a/phpBB/adm/images/logo.gif and /dev/null differ
diff --git a/phpBB/adm/images/phpbb_logo.gif b/phpBB/adm/images/phpbb_logo.gif
new file mode 100644
index 0000000000..daa51daaf3
Binary files /dev/null and b/phpBB/adm/images/phpbb_logo.gif differ
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 3bf193089e..9ad06a98b3 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -42,7 +42,7 @@
 		</dl>
 		<dl>
 			<dt><label for="display_order">{L_DISPLAY_ORDER}:</label><br /><span>{L_DISPLAY_ORDER_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="display_order" name="display_order" value="0"<!-- IF not DISPLAY_ORDER --> checked="checked"<!-- ENDIF --> /> {L_DESCENDING} &nbsp; <input type="radio" name="display_order" value="1"<!-- IF DISPLAY_ORDER --> checked="checked"<!-- ENDIF --> /> {L_ASCENDING}</dd>
+			<dd><input type="radio" class="radio" id="display_order" name="display_order" value="0"<!-- IF not DISPLAY_ORDER --> checked="checked"<!-- ENDIF --> /> {L_DESCENDING} &nbsp; <input type="radio" name="display_order" value="1"<!-- IF DISPLAY_ORDER --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ASCENDING}</dd>
 		</dl>
 		<dl>
 			<dt><label for="attach_quota">{L_ATTACH_QUOTA}:</label><br /><span>{L_ATTACH_QUOTA_EXPLAIN}</span></dt>
@@ -66,15 +66,15 @@
 		</dl>
 		<dl>
 			<dt><label for="secure_downloads">{L_SECURE_DOWNLOADS}:</label><br /><span>{L_SECURE_DOWNLOADS_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="secure_downloads" name="secure_downloads" value="1"<!-- IF SECURE_DOWNLOADS --> checked="checked"<!-- ENDIF --> /> {L_YES}&nbsp;&nbsp;<input type="radio" name="secure_downloads" value="0"<!-- IF not SECURE_DOWNLOADS --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" id="secure_downloads" name="secure_downloads" value="1"<!-- IF SECURE_DOWNLOADS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="secure_downloads" value="0"<!-- IF not SECURE_DOWNLOADS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
 		</dl>
 		<dl>
 			<dt><label for="allow_deny">{L_SECURE_ALLOW_DENY}:</label><br /><span>{L_SECURE_ALLOW_DENY_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="allow_deny" name="secure_allow_deny" value="1"<!-- IF SECURE_ALLOW_DENY --> checked="checked"<!-- ENDIF --> /> {L_ORDER_ALLOW_DENY}&nbsp;&nbsp;<input type="radio" name="secure_allow_deny" value="0"<!-- IF not SECURE_ALLOW_DENY --> checked="checked"<!-- ENDIF --> /> {L_ORDER_DENY_ALLOW}</dd>
+			<dd><input type="radio" id="allow_deny" name="secure_allow_deny" value="1"<!-- IF SECURE_ALLOW_DENY --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ORDER_ALLOW_DENY}&nbsp;&nbsp;<input type="radio" name="secure_allow_deny" value="0"<!-- IF not SECURE_ALLOW_DENY --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ORDER_DENY_ALLOW}</dd>
 		</dl>
 		<dl>
 			<dt><label for="referer">{L_SECURE_EMPTY_REFERER}:</label><br /><span>{L_SECURE_EMPTY_REFERER_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="referer" name="secure_allow_empty_referer" value="1"<!-- IF ALLOW_EMPTY_REFERER --> checked="checked"<!-- ENDIF --> /> {L_YES}&nbsp;&nbsp;<input type="radio" name="secure_allow_empty_referer" value="0"<!-- IF not ALLOW_EMPTY_REFERER --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" id="referer" name="secure_allow_empty_referer" value="1"<!-- IF ALLOW_EMPTY_REFERER --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="secure_allow_empty_referer" value="0"<!-- IF not ALLOW_EMPTY_REFERER --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
 		</dl>
 	</fieldset>
 
@@ -82,12 +82,12 @@
 		<legend>{L_SETTINGS_CAT_IMAGES} [{L_ASSIGNED_GROUP}: {ASSIGNED_GROUPS}]</legend>
 		<dl>
 			<dt><label for="display_inlined">{L_DISPLAY_INLINED}:</label><br /><span>{L_DISPLAY_INLINED_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="display_inlined" name="img_display_inlined" value="1"<!-- IF DISPLAY_INLINED --> checked="checked"<!-- ENDIF --> /> {L_YES}&nbsp;&nbsp;<input type="radio" name="img_display_inlined" value="0"<!-- IF not DISPLAY_INLINED --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" id="display_inlined" name="img_display_inlined" value="1"<!-- IF DISPLAY_INLINED --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="img_display_inlined" value="0"<!-- IF not DISPLAY_INLINED --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
 		</dl>
 	<!-- IF S_THUMBNAIL_SUPPORT -->
 		<dl>
 			<dt><label for="create_thumbnail">{L_CREATE_THUMBNAIL}:</label><br /><span>{L_CREATE_THUMBNAIL_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="create_thumbnail" name="img_create_thumbnail" value="1"<!-- IF CREATE_THUMBNAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}&nbsp;&nbsp;<input type="radio" name="img_create_thumbnail" value="0"<!-- IF not CREATE_THUMBNAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" id="create_thumbnail" name="img_create_thumbnail" value="1"<!-- IF CREATE_THUMBNAIL --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="img_create_thumbnail" value="0"<!-- IF not CREATE_THUMBNAIL --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
 		</dl>
 		<dl>
 			<dt><label for="thumb_filesize">{L_MIN_THUMB_FILESIZE}:</label><br /><span>{L_MIN_THUMB_FILESIZE_EXPLAIN}</span></dt>
@@ -128,7 +128,7 @@
 		</dl>
 		<dl>
 			<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
-			<dd><input type="radio" id="exclude" name="ipexclude" value="1" /> {L_YES} &nbsp; <input type="radio" name="ipexclude" value="0" checked="checked" /> {L_NO}</dd>
+			<dd><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES} &nbsp; <input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd>
 		</dl>
 	</fieldset>
 
@@ -254,7 +254,7 @@
 			</dl>
 			<dl>
 				<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-				<dd><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ALLOW_ALL_FORUMS}&nbsp;&nbsp;<input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ALLOW_SELECTED_FORUMS}</dd>
+				<dd><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> class="radio" />&nbsp;{L_ALLOW_ALL_FORUMS}&nbsp;&nbsp;<input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> class="radio" />&nbsp;{L_ALLOW_SELECTED_FORUMS}</dd>
 				<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
 			</dl>
 		</fieldset>
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index 9a8f5fdc38..35b4539336 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -52,7 +52,7 @@
 	</dl>
 	<dl>
 		<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
-		<dd><input type="radio" name="banexclude" value="1" /> {L_YES} &nbsp; <input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES} &nbsp; <input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd>
 	</dl>
 	<dl>
 		<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index d6a589838c..facf5bd127 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -79,7 +79,7 @@
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
-			<td style="text-align: center;"><input type="checkbox" name="mark[]" value="{bots.BOT_ID}" /></td>
+			<td style="text-align: center;"><input type="checkbox" name="mark[]" value="{bots.BOT_ID}" class="radio" /></td>
 		</tr>
 	<!-- END bots -->
 	</tbody>
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index ec8fc3b268..3d7d5bcc43 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -71,8 +71,8 @@
 	<div id="type_actions"<!-- IF S_FORUM_POST --> style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
-		<dd><input type="radio" id="type_action" name="type_action" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd>
-		<!-- IF S_MOVE_FORUM_OPTIONS --><dd><input type="radio" name="type_action" value="move" /> {L_MOVE_POSTS_TO} <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
+		<dd><input type="radio" class="radio" id="type_action" name="type_action" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd>
+		<!-- IF S_MOVE_FORUM_OPTIONS --><dd><input type="radio" class="radio" name="type_action" value="move" /> {L_MOVE_POSTS_TO} <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
 	</dl>
 	</div>
 	<!-- ENDIF -->
@@ -106,7 +106,7 @@
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
 			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
-			<dd><input type="radio" name="display_active" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="display_active" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 		</fieldset>	
 	</div>
@@ -120,25 +120,25 @@
 		</dl>
 		<dl>
 			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
-			<dd><input type="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 		<dl>
 			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
-			<dd><input type="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 	<!-- IF S_SHOW_DISPLAY_ON_INDEX -->
 		<dl>
 			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><input type="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 	<!-- ENDIF -->
 		<dl>
 			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
-			<dd><input type="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 		<dl>
 			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
-			<dd><input type="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
@@ -154,15 +154,15 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-			<dd><input type="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
-			<dd><input type="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
-			<dd><input type="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
@@ -188,7 +188,7 @@
 		</dl>
 		<dl>
 			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
-			<dd><input type="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -247,18 +247,18 @@
 	<!-- IF S_FORUM_POST -->
 		<dl>
 			<dt><label for="delete_action">{L_ACTION}:</label></dt>
-			<dd><input type="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd>
+			<dd><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd>
 			<!-- IF S_MOVE_FORUM_OPTIONS -->
-				<dd><input type="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO} <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
+				<dd><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO} <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
 			<!-- ENDIF -->
 		</dl>
 	<!-- ENDIF -->
 	<!-- IF S_HAS_SUBFORUMS -->
 		<dl>
 			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt>
-			<dd><input type="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</dd>
+			<dd><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</dd>
 			<!-- IF S_FORUMS_LIST -->
-				<dd><input type="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO} <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+				<dd><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO} <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
 			<!-- ENDIF -->
 		</dl>
 	<!-- ENDIF -->
@@ -290,31 +290,25 @@
 		</div>
 	<!-- ENDIF -->
 	
-	<table cellspacing="1">
-	<tbody>
-	<tr>
-		<td class="row3">{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></td>
-	</tr>
-	</tbody>
-	</table>
+	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p>
 
-<!-- IF .forums -->
+<!-- IF forums -->
 	<table cellspacing="1">
-		<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
+		<col class="row1" /><col class="row1" /><col class="row2" />
 	<tbody>
 	<!-- BEGIN forums -->
 		<tr>
 			<td style="width: 5%;">{forums.FOLDER_IMAGE}</td>
-			<td style="width: 50%; vertical-align: top;">
-				<!-- IF forums.S_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF -->
+			<td>
+				<strong><!-- IF forums.S_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
 				<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
 				<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <b>{forums.FORUM_TOPICS}</b> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></span><!-- ENDIF -->
 			</td>
-			<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;"><a href="{forums.U_MOVE_UP}">{L_MOVE_UP}</a><br /><a href="{forums.U_MOVE_DOWN}">{L_MOVE_DOWN}</a></td>
-			<td style="width: 20%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;
-				<a href="{forums.U_EDIT}">{L_EDIT}</a> | <a href="{forums.U_DELETE}">{L_DELETE}</a>
-				<!-- IF not forums.S_LINK --> | <a href="{forums.U_SYNC}">{L_RESYNC}</a><!-- ENDIF -->
-			&nbsp;</td>
+			<td style="width: 15%; text-align: right; white-space: nowrap;"><!-- IF not forums.S_FIRST_ROW --><a href="{forums.U_MOVE_UP}"><img src="images/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" width="16" height="16" /></a> <!-- ENDIF -->
+				<!-- IF not forums.S_LAST_ROW --><a href="{forums.U_MOVE_DOWN}"><img src="images/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" width="16" height="16" /></a> <!-- ENDIF -->
+				<a href="{forums.U_EDIT}"><img src="images/icon_edit.gif" alt="{L_EDIT}" title="{L_EDIT}" width="16" height="16" /></a> 
+				<!-- IF not forums.S_LINK --><a href="{forums.U_SYNC}"><img src="images/icon_sync.gif" alt="{L_RESYNC}" title="{L_RESYNC}" width="16" height="16" /></a> <!-- ENDIF -->
+				<a href="{forums.U_DELETE}"><img src="images/icon_delete.gif" alt="{L_DELETE}" title="{L_DELETE}" width="16" height="16" /></a></td>
 		</tr>
 	<!-- END forums -->
 	</tbody>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 002ff2eca3..78ecd75867 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -33,10 +33,10 @@
 		<dl>
 			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
-				<input name="group_type" type="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN} &nbsp;
-				<input name="group_type" type="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST} &nbsp;
-				<input name="group_type" type="radio" value="{GROUP_TYPE_CLOSE}"{GROUP_CLOSED} /> {L_GROUP_CLOSED} &nbsp;
-				<input name="group_type" type="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}
+				<input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN} &nbsp;
+				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST} &nbsp;
+				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSE}"{GROUP_CLOSED} /> {L_GROUP_CLOSED} &nbsp;
+				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}
 			</dd>
 		</dl>
 	<!-- ENDIF -->
@@ -113,7 +113,7 @@
 				</tr>
 				<tr>
 					<!-- BEGIN avatar_option_column -->
-						<td class="row2" style="text-align: center;"><input type="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+						<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
 					<!-- END avatar_option_column -->
 				</tr>
 				<!-- END avatar_row -->
@@ -222,11 +222,11 @@
 		<legend>{L_ADD_USERS}</legend>
 	<dl>
 		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt>
-		<dd><input name="leader" type="radio" value="1" /> {L_YES} &nbsp; <input name="leader" type="radio" id="leader" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><input name="leader" type="radio" class="radio" value="1" /> {L_YES} &nbsp; <input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</dd>
 	</dl>
 	<dl>
 		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
-		<dd><input name="default" type="radio" value="1" /> {L_YES} &nbsp; <input name="default" type="radio" id="default" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><input name="default" type="radio" class="radio" value="1" /> {L_YES} &nbsp; <input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</dd>
 	</dl>
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index 8091ce9d79..a417c50f38 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -94,7 +94,7 @@
 			<dd><select id="pak" name="pak">{S_PAK_OPTIONS}</select></dd>
 		</dl>
 			<dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}&nbsp; &nbsp;<input type="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}&nbsp; &nbsp;<input type="radio" name="current" value="delete" /> {L_DELETE_ALL}&nbsp;</dd>
+			<dd><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}&nbsp; &nbsp;<input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}&nbsp; &nbsp;<input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}&nbsp;</dd>
 		</dl>
 	</fieldset>
 
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
index 6352720299..8dee73c5b1 100644
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -19,7 +19,7 @@
 	<legend>{L_ACP_JABBER_SETTINGS}</legend>
 	<dl>
 		<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
-		<dd><input type="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ENABLED}&nbsp; &nbsp;<input type="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_DISABLED}</dd>
+		<dd><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ENABLED}&nbsp; &nbsp;<input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_DISABLED}</dd>
 	</dl>
 	<dl>
 		<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html
index 0baa7bd7e8..d4ca8c7d4c 100644
--- a/phpBB/adm/style/acp_php_info.html
+++ b/phpBB/adm/style/acp_php_info.html
@@ -6,6 +6,7 @@
 
 <p>{L_ACP_PHP_INFO_EXPLAIN}</p>
 
+<div style="overflow: auto; width: 99%;">
 {PHPINFO}
-
+</div>
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
index 31be90427d..22592f79c5 100644
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -78,15 +78,15 @@
 	</dl>
 	<dl>
 		<dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-		<dd><input type="radio" name="prune_old_polls" value="1" /> {L_YES} &nbsp; <input type="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES} &nbsp; <input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</dd>
 	</dl>
 	<dl>
 		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
-		<dd><input type="radio" name="prune_announce" value="1" /> {L_YES} &nbsp; <input type="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES} &nbsp; <input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</dd>
 	</dl>
 	<dl>
 		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt>
-		<dd><input type="radio" name="prune_sticky" value="1" /> {L_YES} &nbsp; <input type="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES} &nbsp; <input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</dd>
 	</dl>
 	</fieldset>
 	
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index beb3d1a59a..a477c24577 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -37,11 +37,11 @@
 </dl>
 <dl>
 	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
-	<dd><input type="radio" name="deleteposts" value="1" /> {L_YES}&nbsp;&nbsp;<input type="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</dd>
+	<dd><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}&nbsp;&nbsp;<input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</dd>
 </dl>
 <dl>
 	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
-	<dd><input type="radio" name="action" value="delete" /> {L_DELETE_USERS}&nbsp;&nbsp;<input type="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</dd>
+	<dd><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}&nbsp;&nbsp;<input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</dd>
 </dl>
 </fieldset>
 
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index 4cddd43636..ee8c337725 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -36,7 +36,7 @@
 	</dl>
 	<dl>
 		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
-		<dd><input onchange="dE('posts', -1)" type="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES} &nbsp;&nbsp;<input onchange="dE('posts', 1)" type="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+		<dd><input onchange="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES} &nbsp;&nbsp;<input onchange="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 	</dl>
 	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
 	<dl>
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 8571fa58ba..a9bd2932cd 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -56,20 +56,20 @@
 	<!-- IF S_STYLE -->
 	<dl>
 		<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
-		<dd><input type="radio" id="inc_template" name="inc_template" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" name="inc_template" value="0" />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_template" value="0" />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl>
 		<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
-		<dd><input type="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" name="inc_theme" value="0" />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_theme" value="0" />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl>
 		<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
-		<dd><input type="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" name="inc_imageset" value="0" />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_imageset" value="0" />&nbsp; {L_NO}</dd>
 	</dl>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
-		<dd><input type="radio" id="store" name="store" value="1" checked="checked" />&nbsp; {L_EXPORT_STORE} &nbsp;<input type="radio" name="store" value="0" />&nbsp; {L_EXPORT_DOWNLOAD}</dd>
+		<dd><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" />&nbsp; {L_EXPORT_STORE} &nbsp;<input type="radio" class="radio" name="store" value="0" />&nbsp; {L_EXPORT_DOWNLOAD}</dd>
 	</dl>
 	<dl>
 		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt>
@@ -114,7 +114,7 @@
 			<!-- IF S_STYLE -->
 				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
 			<!-- ENDIF -->
-			{installed.S_OPTIONS} | <a href="{installed.U_PREVIEW}" target="_preview">{L_PREVIEW}</a>
+			{installed.S_OPTIONS} | <a href="{installed.U_PREVIEW}" onclick="this.target='_preview';">{L_PREVIEW}</a>
 		</td>
 	<!-- END installed -->
 	<tr>
@@ -144,8 +144,6 @@
 	</form>
 	<!-- ENDIF -->
 
-	</form>
-
 <!-- ELSEIF S_DETAILS -->
 
 	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
@@ -190,7 +188,7 @@
 	<!-- IF S_TEMPLATE or S_THEME -->
 		<dl>
 			<dt><label for="store_db">{L_LOCATION}:</label><br /><span>{L_LOCATION_EXPLAIN}</span></dt>
-			<dd><input type="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> />&nbsp; {L_STORE_FILESYSTEM} &nbsp;<input type="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> />&nbsp; {L_STORE_DATABASE}</dd>
+			<dd><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> />&nbsp; {L_STORE_FILESYSTEM} &nbsp;<input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> />&nbsp; {L_STORE_DATABASE}</dd>
 		</dl>
 	<!-- ENDIF -->
 	<!-- IF S_STYLE -->
@@ -200,12 +198,12 @@
 			<legend>{L_OPTIONS}</legend>
 		<dl>
 			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
-			<dd><input type="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+			<dd><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 		</dl>
 		<!-- IF not S_STYLE_DEFAULT -->
 			<dl>
 				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
-				<dd><input type="radio" name="style_default" value="1" />&nbsp; {L_YES} &nbsp;<input type="radio" id="style_default" name="style_default" value="0" checked="checked" />&nbsp; {L_NO}</dd>
+				<dd><input type="radio" class="radio" name="style_default" value="1" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" />&nbsp; {L_NO}</dd>
 			</dl>
 		<!-- ENDIF -->
 	<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 9f4eb84553..92a7b812d5 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -101,7 +101,7 @@
 	</dl>
 	<dl>
 		<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
-		<dd><input type="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp; <input type="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_NO}&nbsp;</dd>
+		<dd><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp; <input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_NO}&nbsp;</dd>
 	</dl>
 	<dl>
 		<dt><label for="user_email">{L_EMAIL}:</label></dt>
@@ -302,35 +302,35 @@
 		<legend>{L_UCP_PREFS_PERSONAL}</legend>
 	<dl> 
 		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt>
-		<dd><input type="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt>
-		<dd><input type="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
-		<dd><input type="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt>
-		<dd><input type="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
-		<dd><input type="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> />&nbsp; {L_NOTIFY_METHOD_EMAIL} &nbsp;<input type="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> />&nbsp; {L_NOTIFY_METHOD_IM} &nbsp;<input type="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> />&nbsp; {L_NOTIFY_METHOD_BOTH}</dd>
+		<dd><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> />&nbsp; {L_NOTIFY_METHOD_EMAIL} &nbsp;<input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> />&nbsp; {L_NOTIFY_METHOD_IM} &nbsp;<input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> />&nbsp; {L_NOTIFY_METHOD_BOTH}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt>
-		<dd><input type="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt>
-		<dd><input type="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> />{L_NO}</dd>
+		<dd><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> />{L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="report_pm_notify">{L_REPORT_PM_NOTIFY}:</label><br /><span>{L_REPORT_PM_NOTIFY_EXPLAIN}</span></dt>
-		<dd><input type="radio" name="report_pm_notify" value="1"<!-- IF REPORT_PM_NOTIFY --> id="report_pm_notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="report_pm_notify" value="0"<!-- IF not REPORT_PM_NOTIFY --> id="report_pm_notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="report_pm_notify" value="1"<!-- IF REPORT_PM_NOTIFY --> id="report_pm_notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="report_pm_notify" value="0"<!-- IF not REPORT_PM_NOTIFY --> id="report_pm_notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
@@ -346,7 +346,7 @@
 	</dl>
 	<dl> 
 		<dt><label for="dst">{L_BOARD_DST}:</label></dt>
-		<dd><input type="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
@@ -359,23 +359,23 @@
 		<legend>{L_UCP_PREFS_POST}</legend>
 	<dl> 
 		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt>
-		<dd><input type="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="html">{L_DEFAULT_HTML}:</label></dt>
-		<dd><input type="radio" name="html" value="1"<!-- IF HTML --> id="html" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="html" value="0"<!-- IF HTML --> id="html" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="html" value="1"<!-- IF HTML --> id="html" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="html" value="0"<!-- IF HTML --> id="html" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt>
-		<dd><input type="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt>
-		<dd><input type="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt>
-		<dd><input type="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	</fieldset>
 
@@ -383,27 +383,27 @@
 		<legend>{L_UCP_PREFS_VIEW}</legend>
 	<dl> 
 		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt>
-		<dd><input type="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt>
-		<dd><input type="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt>
-		<dd><input type="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt>
-		<dd><input type="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt>
-		<dd><input type="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt>
-		<dd><input type="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+		<dd><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
 	<dl> 
 		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
@@ -492,7 +492,7 @@
 				</tr>
 				<tr>
 					<!-- BEGIN avatar_option_column -->
-						<td class="row2" style="text-align: center;"><input type="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+						<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
 					<!-- END avatar_option_column -->
 				</tr>
 				<!-- END avatar_row -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index ea9c1e3f74..b8a1e26f25 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1,147 +1,121 @@
-/* phpBB 3.0 Admin Style Sheet
--------------------------------------------------
-	Author: subBlue  (http://www.subBlue.com/)
-	(c) 2005 phpBB Group
--------------------------------------------------*/
-
+/*  phpBB 3.0 Admin Style Sheet
+    --------------------------------------------------------------
+	Original author: Tom Beddard ( http://www.subBlue.com/ )
+	Modified by:     
+	Last update:     $Id$
+	
+	Copyright 2006 phpBB Group ( http://www.phpbb.com/ )
+    --------------------------------------------------------------
+*/
 
 
 /* General markup styles
 ---------------------------------------- */
 * {
+	/* Reset browsers default margin, padding and font sizes */
 	margin: 0;
 	padding: 0;
-	font-size: 100%;
-}
-
-body, div, p, th, td, li, dd {
-	font-size: x-small;
-	voice-family: "\"}\"" inherit;
-	font-size: small
-}
-
-html>body, html>div, html>p, html>th, html>td, html>li, html>dd	{
-	font-size: small
-}
-
-body {
-	font-family: Verdana, Arial, Helvetica, sans-serif;;
-	color: #000;
-	background-image: url(../images/bg_header.jpg);
-	background-repeat: repeat-x;
-	background-color: #E4EDF0;
-	margin: 0;
-}
-
-/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-ie browsers */
+	}
 html {
+	font-size: 100%;
 	height: 100%;
 	margin-bottom: 1px;
-}
-
+	}
+body {
+	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	color: #536482;
+	background: #E4EDF0 url("../images/bg_header.gif") 0 0 repeat-x;
+	font-size: 62.5%;			/* This sets the default font size to be equivalent to 10px */
+	margin: 0;
+	}
 img {
 	border: 0;
-}
-
-/* Adjust */
-#page-header h1 {
-	font-family: Verdana, Arial, Helvetica, sans-serif;;
-	font-size: 170%;
-	font-weight: normal;
-	color: #12749B;
-}
-
-#content h1 {
-	font: bold 18pt 'Trebuchet MS', Verdana, sans-serif;
+	}
+h1 {
+	font: bold 1.8em 'Trebuchet MS', Verdana, sans-serif;
 	text-decoration: none; 
-	line-height: 120%; 
-	margin-bottom: 0px;
-}
-
+	color: #333333;
+	}
 h2, caption {
-	font: bold 12pt Arial, Helvetica, sans-serif;
+	font: bold 1.2em Arial, Helvetica, sans-serif;
 	text-decoration: none; 
 	line-height: 120%; 
 	text-align: left;
 	margin-top: 25px;
-}
-
+	}
 p {
 	margin-bottom: 0.7em;
-	line-height: 140%;
-	font-size: 90%;
-}
-
+	line-height: 1.4em;
+	font-size: 1.1em;
+	}
 hr {
 	border: 0 none;
 	border-top: 1px solid #999999;
 	margin-bottom: 5px;
 	padding-bottom: 5px;
 	height: 1px;
-}
-
+	}
 .small { 
-	font-size: 85%; 
-}
+	font-size: 1em; 
+	}
+
 
 /* General links  */
 a:link, a:active, a:visited { 
 	color: #006699; 
 	text-decoration: none; 
-}
-
+	}
 a:hover { 
 	color: #DD6900; 
 	text-decoration: underline; 
-}
+	}
+
 
 /* Main blocks
 ---------------------------------------- */
+#wrap {
+	padding: 0 20px 15px 20px;
+	min-width: 615px;
+	}
 #page-header {
-	clear: both;
 	text-align: right;
-	font-size: 85%;
-	height: 60px;
-	
-	padding-right: 20px;
-}
-
+	background: url("../images/phpbb_logo.gif") 0 0 no-repeat;
+	height: 84px;
+	}
+#page-header h1 {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 1.5em;
+	font-weight: normal;
+	padding-top: 15px;
+	}
 #page-header p {
-	font-size: 100%;
-}
-
+	font-size: 1.1em;
+	}
 #page-body {
 	clear: both;
-	min-width: 700px;
-}
-
+	}
 #page-footer {
 	clear: both;
-	font-size: 75%;
+	font-size: 1em;
 	text-align: center;
-}
-
-#logo {
-	float: left;
-	width: auto;
-	margin-left: 4px;
-	margin-bottom: 5px;
-}
-
+	}
 #content {
 	padding: 30px 10px 10px 10px;
-}
-
+	}
+#content h1 {
+	line-height: 1.2em; 
+	margin-bottom: 0px;
+	}
 #main {
 	float:left;
 	width: 76%;
 	margin-left: 3%;
 	min-height: 350px;
-}
-
+	}
 * html #main { 
 	height: 350px; 
-}
+	}
 
 
 /* Tabbed menu
@@ -149,89 +123,76 @@ a:hover {
 ----------------------------------------*/
 #tabs {
 	line-height: normal;
-	margin-left: 27px;
-	margin-bottom: -5px;
-	min-width: 600px;
-}
-
-* html #tabs {
-	width: 700px;
-}
-
+	margin: 0 0 -6px 7px;
+	min-width: 570px;
+	}
 #tabs ul {
+	margin:0;
+	padding: 0;
 	list-style: none;
-}
-
+	}
 #tabs li {
 	display: inline;
-	font-size: 85%;
+	margin: 0;
+	padding: 0;
+	font-size: 1em;
 	font-weight: bold;
-	text-transform: capitalize;
-}
-
+	}
 #tabs a {
-	float: left;
-	background-color: #C7D0D7;
-	margin-right: 2px;
-	padding-left: 7px;
+	float:left;
+	background:url("../images/bg_tabs1.gif") no-repeat 0% -35px;
+	margin: 0 1px 0 0;
+	padding: 0 0 0 6px;
 	text-decoration: none;
-	font-size: 100%;
 	position: relative;
-	border: solid 1px  #A9B8C2;
-	background-image: url(../images/cellpic1.gif);
-}
-
+	}
 #tabs a span {
 	float: left;
 	display: block;
-	padding: 7px 10px 4px 4px;
-	color: #006699;
+	background: url("../images/bg_tabs2.gif") no-repeat 100% -35px;
+	padding: 7px 12px 6px 6px;
+	color: #536482;
 	white-space: nowrap;
-	font-family: Arial, Helvetica, sans-serif;
 	text-transform: uppercase;
-	font-weight: bold;
-	
-}
-
+	}
 /* Commented Backslash Hack hides rule from IE5-Mac \*/
 #tabs a span { float:none; }
 /* End hack */
 
-#tabs a:hover {
-	background-color: #EFEFEF;
-}
-
+#tabs a:hover span {
+	color: #DD6900;
+	}
 #tabs #activetab a {
-	border: solid 1px  #A9B8C2;
-	border-bottom: 1px solid #FFF;
-	background-color: #fff;
-	background-image: none;
-}
-
+	background-position: 0 0px;
+	border-bottom: 1px solid #FFFFFF;
+	}
 #tabs #activetab a span {
-	padding-bottom: 4px;
-	background-color: #fff;
-	color: #006699;
-}
-
-#tabs #activetab a:hover {
-	color: #FFA34F;
-}
+	background-position: 100% 0px;
+	padding-bottom: 7px;
+	color: #333333;
+	}
+#tabs a:hover {
+	background-position: 0 -70px;
+	}
+#tabs a:hover span {
+	background-position:100% -70px;
+	}
+#tabs #activetab a:hover span {
+	color: #333333;
+	}
 
 
-/* box
+/* Main Panel
 ---------------------------------------- */
-.box {
-	margin: 4px 20px;
-	padding: 1px;
-	min-width: 550px;
+.panel {
+	margin: 4px 0;
 	background-color: #FFFFFF;
 	border: solid 1px  #A9B8C2;
-}
+	}
+span.corners-top, span.corners-bottom {
+	display: none;
+	}
 
-.innerbox {
-	background-color: #FFFFFF;
-}
 
 /* Sub-navigation Menu
 ---------------------------------------- */
@@ -240,76 +201,58 @@ a:hover {
 	width: 20%;
 	font-size: 100%;
 	padding: 0;
-	
-}
-
+	}
 #menu p {
-	font-size: 85%;
-}
-
+	font-size: 1em;
+	}
 #menu ul {
-	margin:0;
-	padding:0;
-	list-style:none;
-	background-color: #ECECEC;
-	border: solid 1px  #A9B8C2;
-}
+	list-style: none;
+	}
 
 /* Default list state */
 #menu li {
-	margin: 1px 0;
-	padding: 0; margin: 0;
-	font-size: 10px;
+	font-size: 1em;
 	font-weight: bold;
 	display: inline;
-}
+	}
 
 /* Link styles for the sub-section links */
-#menu li a, #menu li a:link, #menu li a:active, #menu li a:visited {
+#menu li a {
 	display: block;
-	padding: 2px 2px 2px 10px;
-	margin: 1px 0;
-	text-decoration:none;
+	padding: 3px 2px 3px 10px;
+	text-decoration: none;
 	font-weight: normal;
 	color: #006699;
 	font-weight: bold;
-}
-
-#menu li a:active {
-	color: #000;
-	
-}
-
-
+	background-color: #ECECEC;
+	border-top: 1px solid #FFFFFF;
+	}
 #menu li a:hover {
-	text-decoration: underline;
-	color: #DD6900;
-}
-
+	text-decoration: none;
+	background-color: #FFA34F;
+	color: #FFFFFF;
+	}
 #menu li.header {
 	display: block;
-	font-weight: bold;
-	color: #115098;
-	padding: 5px 0;
-	font-size: 11px;
+	padding: 5px;
+	font-size: 0.9em;
 	font-family: Verdana;
-	text-align: center;	
 	color: #FFA34F; 
-	font-weight: bold; background-color: #006699; 
-	background-image: url("../images/cellpic3.gif");
-	background-repeat: repeat-x;
-}
-
-#menu li#activemenu a, #menu li#activemenu a:link, #menu li#activemenu a:active, #menu li#activemenu a:visited {
+	font-weight: bold;
+	background: #006699 url("../images/cellpic3.gif") 0 0 repeat-x;
+	margin-top: 5px;
+	text-transform: uppercase;
+	}
+#menu li#activemenu a {
 	text-decoration: none;
 	font-weight: bold;
 	color: #000;
-}
-
+	background-color: #DADFE4;
+	}
 #menu li#activemenu a:hover {
 	text-decoration: none;
 	color: #000;
-}
+	}
 
 
 /* Table styles
@@ -317,28 +260,23 @@ a:hover {
 
 table {
 	width: 100%;
-	background-color: #ACBBC6
-}
-
+	/*background-color: #ACBBC6;*/
+	}
 th, td { 
-	font:	normal 8pt Verdana, Arial, Helvetica, sans-serif;
-}
-
-th	{
-	height:				25px;
-	background-color:	#006699;
-	color:				#FFA34F;
-	font-weight:		bold;
-	font-size:			11px;
-	background-image: url("../images/cellpic3.gif") !important;
-}
-
-td {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 1.1em;
 	text-align: left;
-	font-size: 85%;
+	}
+th	{
+	padding: 6px 4px;
+	color: #FFA34F;
+	font-weight: bold;
+	background: #006699 url("../images/cellpic3.gif") 0 0 repeat-x;
+	}
+td {
 	padding: 4px;
-	line-height: 120%;
-}
+	line-height: 1.2em;
+	}
 
 .row1 { background-color: #EFEFEF; }
 .row2 { background-color: #DEE3E7; }
@@ -350,119 +288,122 @@ td {
 	background-color: #D1D7DC;
 	height: 1px;
 	line-height: 1px;
-}
+	}
 
 table.type2 {
 	border: none;
 	background: none;
 	padding: 0;
 	width: 0;
-}
-
+	}
 table.type2 th {
 	background: none;
 	border-top: none;
 	text-align: center;
 	color: #FFA34F;
 	padding: 2px 0;
-}
-
+	}
 table.type2 td {
 	padding: 0;
-}
+	}
+
 
 /* General form styles
 ----------------------------------------*/
 fieldset { 
 	margin: 15px 0;
 	padding: 10px; 
-	border-top: 1px solid #D7D7D7;
-	border-right: 1px solid #CCCCCC;
-	border-bottom: 1px solid #CCCCCC;
-	border-left: 1px solid #D7D7D7;
+	border-right: 1px solid #AFAEAA;
+	border-bottom: 1px solid #AFAEAA;
+	border-left: 1px solid #D5D5C8;
+	border-top: 1px solid #D5D5C8;
 	background-color: #ECECEC;
 	position: relative;
-}
-
+	}
 * html fieldset { 
 	padding: 0 10px 5px 10px; 
-}
-
+	}
 fieldset p {
-	font-size: 85% !important;
-}
-
+	font-size: 1.1em;
+	}
 legend {
 	padding: 1px 0; 
 	font-family: arial,Verdana,Sans-serif;
-	font-size: 12px;
+	font-size: 1.1em;
 	font-weight: bold;
 	color: #006699;
 	position: relative;
-	text-transform: capitalize;
+	text-transform: uppercase;
 	line-height: 100%;
 	top: 0em;
 	vertical-align:middle;
-}
-
-/* Hide from macIE \*/
-legend { top: -1.2em; }
-/* end */
-
+	}
 * html legend { 
 	margin-bottom: -10px; 
-	margin-left: -7px; 
-}
+	margin-left: -7px;
+	top: -1.2em;
+	}
 
 input {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 90%;
+	font-size: 100%;
 	font-weight: normal;
-	cursor: pointer;
+	background-color: #FAFAFA;
+	border-left: 1px solid #AFAEAA;
+	border-top: 1px solid #AFAEAA;
+	border-right: 1px solid #D5D5C8;
+	border-bottom: 1px solid #D5D5C8;
+	color: #333333;
+	padding: 2px;
+	cursor: text;
 	vertical-align: middle;
-}
-
-optgroup, select {
+	}
+select {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 85%;
+	font-size: 100%;
 	font-weight: normal;
 	font-style: normal;
-	cursor: pointer;
+	cursor: default;
 	vertical-align: middle;
 	width: auto;
-}
-
+	border: 1px solid #666666;
+	padding: 1px;
+	background-color: #FAFAFA;
+	}
 optgroup {
-	font-size: 100%;
 	font-weight: bold;
-}
-
+	}
+option {
+	padding-right: 1em;
+	}
 .sep {
 	color: white;
 	background-color: #006699;
-}
-
+	}
 textarea {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 85%;
+	font-size: 100%;
 	width: 60%;
 	padding: 2px;
-}
-
+	background-color: #FAFAFA;
+	border-left: 1px solid #AFAEAA;
+	border-top: 1px solid #AFAEAA;
+	border-right: 1px solid #D5D5C8;
+	border-bottom: 1px solid #D5D5C8;
+	cursor: text;
+	}
 label {
 	cursor:pointer;
-	font-size: 85%;
+	font-size: 1.1em;
 	padding-right: 5px;
-}
-
+	}
 label input {
 	font-size: 100%;
 	vertical-align: middle;
-}
-
+	}
 label img {
 	vertical-align: middle;
-}
+	}
 
 fieldset.quick {
 	margin: 0 0 5px 0;
@@ -470,96 +411,98 @@ fieldset.quick {
 	border: none;
 	background-color: transparent;
 	text-align: right;
-}
-
+	font-size: 1.1em;
+	}
 fieldset.nobg {
 	margin: 15px 0 0 0;
 	padding: 0;
 	border: none;
 	background-color: transparent;
-}
-
+	font-size: 1.1em;
+	}
 fieldset.display-options {
 	margin: 15px 0 2px 0;
 	padding: 0 0 4px 0;
 	border: none;
 	background-color: transparent;
 	text-align: center;
-	font-size: 75%;
-}
-
+	font-size: 1.1em;
+	}
 fieldset.display-options select, fieldset.display-options input, fieldset.display-options label {
 	font-size: 100%;
 	vertical-align: middle;
-}
-
+	}
 select option.disabled {
 	background-color: #bbb;
 	color: #fff;
-}
+	}
+
+/* Special case inputs */
+select#board_timezone, 
+select#full_folder_action {
+	width: 95%;
+	}
+
 
 /* Definition list layout for forms
    Other general def. list properties defined in prosilver_main.css
 ---------------------------------------- */
 dl {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 100%;
-}
-
+	}
 dt {
 	float: left;
 	width: auto;
-}
+	}
 
 dd { color: #000; }
-dd + dd { margin-top: 4px; }
+dd + dd { padding-top: 5px; }
 dt span { padding-right: 5px; }
 
 dt label {
 	font-size: 100%;
 	text-align: left;
 	font-weight: bold;
-}
-
+	}
 dd label {
-	font-size: 100%;
 	white-space: nowrap;
-	
 	margin-right: 10px;
-}
+	}
 
 html>body dd label input { vertical-align: text-bottom; }	/* Tweak for Moz to align checkboxes/radio buttons nicely */
-dd input, dd textarea { font-size: 90%; }
-
+dd input, 
+dd select {
+	max-width: 100%;
+	}
+dd textarea {
+	width: 100%;
+	}
+input.radio {
+	width: auto !important;
+	background-color: transparent;
+	border: none;
+	cursor: default;
+	}
 dd select {
 	width: auto;
 	font-size: 100%;
-}
-
-dd textarea {
-	width: 90%;
-}
-
+	}
 fieldset dl {
-	font-size: 85%;
 	margin-bottom: 10px;
-}
-
+	font-size: 1.1em;
+	}
 fieldset dt {
 	width: 45%;
 	text-align: left;
 	border-right: 1px solid #CCC;
 	padding-top: 3px;
-}
-
+	}
 fieldset dd {
 	margin-left: 45%;
 	padding-left: 5px;
-	font-size: 100% !important;
 	border-left: 1px solid #CCC;
 	vertical-align: top;
-}
-
+	}
 dd.full {
 	margin-left: 0;
 	border: 0;
@@ -567,35 +510,30 @@ dd.full {
 	padding-top: 3px;
 	text-align: center;
 	width: 95%;
-}
+	}
 
 /* Hover highlights for form rows */
-fieldset dl:hover dt {
-	border-right-color: #ccc;
-}
+fieldset dl:hover dt label {
+	color: #000000;
+	}
+input:focus, textarea:focus {
+	color: #000000;
+	}
 
-fieldset dl:hover dd {
-	border-left-color: #ccc;
-}
-
-fieldset dl dd label:hover {
-	color: #ccc;
-}
 
 /* Submit button fieldset
 ---------------------------------------- */
 fieldset.submit-buttons {
 	text-align: center;
-	background-image: url(../images/cellpic1.gif);
+	background-color: #DADFE4;
 	margin: 0;
 	padding: 4px;
-	border: solid 1px #A9B8C2;
 	margin-top: -1px;
-}
-
+	}
 fieldset.submit-buttons input {
 	padding: 3px 2px;
-}
+	}
+
 
 /* Input field styles
 ---------------------------------------- */
@@ -610,29 +548,29 @@ fieldset.submit-buttons input {
 	padding:2px;
 	cursor: text;
 	width: 75%;
-}
-
+	}
 select.inputbox {
 	cursor: pointer;
 	padding: 0;
 	width: auto;
-}
-
+	}
 .inputbox:hover {
 	border-left: 1px solid #AFAEAA;
 	border-top: 1px solid #AFAEAA;
 	border-right: 1px solid #AFAEAA;
 	border-bottom: 1px solid #AFAEAA;
 	background-color: #E9E9E2;
-}
-
+	}
 .inputbox:focus {
 	border: 1px solid #BC2A4D;
 	background-color: #E9E9E2;
 	color: #BC2A4D;
-}
+	}
 
-input.full, textarea.full { width: 99%; }
+input.full,
+textarea.full {
+	width: 99%;
+	}
 * html input.full, * html textarea.full { width: 95%; }
 input.medium { width: 50%; }
 input.narrow { width: 25%; }
@@ -640,6 +578,7 @@ input.tiny { width: 10%; }
 input.autowidth { width: auto !important; }
 .box2 .inputbox { background-color: #E9E9E9; }
 
+
 /* Pagination
 ---------------------------------------- */
 .pagination {
@@ -647,14 +586,13 @@ input.autowidth { width: auto !important; }
 	width: auto;
 	text-align: right;
 	margin-top: 5px;
-	font-size: 85%;
+	font-size: 1em;
 	padding-bottom: 2px;
-}
-
-.pagination strong, .pagination b {
+	}
+.pagination strong,
+.pagination b {
 	font-weight: normal;
-}
-
+	}
 .pagination span strong {
 	padding: 0 2px;
 	margin: 0 2px;
@@ -662,8 +600,7 @@ input.autowidth { width: auto !important; }
 	color: #FFFFFF;
 	background: #069;
 	border: 1px solid #069;
-}
-
+	}
 .pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
 	font-weight: normal;
 	text-decoration: none;
@@ -672,40 +609,36 @@ input.autowidth { width: auto !important; }
 	padding: 0 2px;
 	background: #ECEDEE;
 	border: 1px solid #B4BAC0;
-}
-
+	}
 .pagination span a:hover {
 	border-color: #069;
 	background: #069;
 	color: #FFF;
 	text-decoration: none;
-}
-
+	}
 .pagination img {
 	vertical-align: middle;
-}
+	}
+
 
 /* Form button styles
 ---------------------------------------- */
 a.button1, input.button1, input.button3, 
 a.button2, input.button2  {
 	width: auto !important;
-	padding: 1px 3px;
+	padding: 1px 3px 0 3px;
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	color: #000;
-	font-size: 85%;
-	background: #FAFAFA;
-}
-
+	background-color: #EFEFEF;
+	cursor: pointer;
+	}
 a.button1, input.button1 {
 	font-weight: bold;
 	border: 1px solid #666666; 
-}
-
-/* Alternative button */
+	}
 a.button2, input.button2 {
 	border: 1px solid #666666;
-}
+	}
 
 /* <a> button in the style of the form buttons */
 a.button1, a.button1:link, a.button1:visited, a.button1:active,
@@ -713,100 +646,53 @@ a.button2, a.button2:link, a.button2:visited, a.button2:active {
 	text-decoration: none;
 	color: #000000;
 	padding: 4px 8px;
-}
+	}
 
-/* Success highlighting
+
+/* Action Highlighting
 ---------------------------------------- */
 .success {
 	color: #282 !important;
-}
-
-.successbox {
-	padding: 0px;
-	margin: 37px 0;
-	font-size: 100%;
-	background-color: #ECECEC;
-	color: #282;
-	text-align: center;
-	font-weight: bold;
-}
-
-* html .sucessbox { height: 1%; } /* Pixel shift fix for IE */
-
-.successbox h3 {
-	font-size: 11px;
-	color: #FFA34F; 
-	font-weight: bold; 
-	background-color: #006699; 
-	background-image: url('../images/cellpic3.gif');
-	background-repeat: repeat-x;
-	padding: 5px 0;
-}
-
-.successbox p {
-	margin: 20px;
-	font-size: 12px;
-}
-
-.successbox a:link, .errorbox a:active, .errorbox a:visited {
-	text-decoration: none;
-}
-
-.successbox a:hover {
-	text-decoration: none;
-}
-
-/* Error highlighting
----------------------------------------- */
+	}
 .error {
 	color: #BC2A4D !important;
-}
-
-.errorbox {
-	padding: 0px;
-	margin: 37px 0;
-	font-size: 100%;
-	background-color: #ECECEC;
-	color: #BC2A4D;
+	}
+.successbox, .errorbox {
+	padding: 10px;
+	margin: 20px 0;
+	color: #1F5B13;
 	text-align: center;
+	}
+.successbox {
+	background-color: #B9DBB3;
+	}
+.errorbox {
+	background-color: #ECECEC;
+	}
+.successbox h3, .errorbox h3 {
+	font-weight: bold;
+	font-size: 1.4em;
+	margin-bottom: 0.5em;
+	}
+.successbox p, .errorbox p {
+	font-size: 1.1em;
+	margin-bottom: 0;
+	}
+.successbox a, .errorbox a {
 	font-weight: bold;
-}
-
-* html .errorbox { height: 1%; } /* Pixel shift fix for IE */
-
-.errorbox h3 {
-	font-size: 11px;
-	color: #FFA34F; 
-	font-weight: bold; 
-	background-color: #006699; 
-	background-image: url('../images/cellpic3.gif');
-	background-repeat: repeat-x;
-	padding: 5px 0;
-}
-
-.errorbox p {
-	margin: 20px;
-	font-size: 12px;
-}
-
-.errorbox a:link, .errorbox a:active, .errorbox a:visited {
 	text-decoration: none;
-}
+	}
 
-.errorbox a:hover {
-	text-decoration: none;
-}
 
 /*
  Format Buttons for signature editor
 */
 #format-buttons {
 	margin: 15px 0 2px 0;
-}
-
+	}
 #format-buttons input, #format-buttons select {
 	vertical-align: middle;
-}
+	}
 
 /* Nice method for clearing floated blocks without having to insert any extra markup
    From http://www.positioniseverything.net/easyclearing.html */
diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html
index 9f3df63dae..abca1c9ff3 100644
--- a/phpBB/adm/style/custom_profile_fields.html
+++ b/phpBB/adm/style/custom_profile_fields.html
@@ -15,7 +15,7 @@
 
 <!-- BEGIN bool -->
 	<!-- IF bool.FIELD_LENGTH eq 1 -->
-		<!-- BEGIN options --><input type="radio" name="{bool.FIELD_IDENT}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}&nbsp; &nbsp;<!-- END options -->
+		<!-- BEGIN options --><input type="radio" class="radio" name="{bool.FIELD_IDENT}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}&nbsp; &nbsp;<!-- END options -->
 	<!-- ELSE -->
 		<input type="checkbox" name="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
 	<!-- ENDIF -->
diff --git a/phpBB/adm/style/message_body.html b/phpBB/adm/style/message_body.html
index 43021c341f..17db5aca37 100644
--- a/phpBB/adm/style/message_body.html
+++ b/phpBB/adm/style/message_body.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<div class="errorbox">
+<div class="successbox">
 	<h3>{MESSAGE_TITLE}</h3>
 	<p>{MESSAGE_TEXT}</p>
 </div>
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 71c5d62315..b81eba5000 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -1,34 +1,32 @@
-					<br /><br />
-					<!-- End page content -->
+						
+					</div>
 				</div>
-			</div>
-		<div class="corner3"></div><div class="corner4"></div>
-	</div></div>
-</div>
-
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB2. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2004
-// -->
-
-<div id="page-footer">
-
-	<!-- IF S_COPYRIGHT_HTML -->
-		Powered by phpBB {VERSION} &copy; 2005 <a href="http://www.phpbb.com/">phpBB Group</a>
-	<!-- ENDIF -->
-
-	<!-- IF DEBUG_OUTPUT -->
-		<!-- IF S_COPYRIGHT_HTML --><br /><br /><!-- ENDIF -->
-		{DEBUG_OUTPUT}
-	<!-- ENDIF -->
-
+			<span class="corners-bottom"><span></span></span>
+		</div>
+	</div>
+	
+	<!--
+		We request you retain the full copyright notice below including the link to www.phpbb.com.
+		This not only gives respect to the large amount of time given freely by the developers
+		but also helps build interest, traffic and use of phpBB2. If you (honestly) cannot retain
+		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
+		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
+		forums may be affected.
+	
+		The phpBB Group : 2004
+	// -->
+	
+	<div id="page-footer">
+		<!-- IF S_COPYRIGHT_HTML -->
+			Powered by phpBB {VERSION} &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
+		<!-- ENDIF -->
+	
+		<!-- IF DEBUG_OUTPUT -->
+			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
+			{DEBUG_OUTPUT}
+		<!-- ENDIF -->
+	</div>
 </div>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 9f3ec05ec7..277dcdbc93 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -59,45 +59,43 @@ function marklist(match, status)
 </head>
 
 <body>
-<div id="page-header">
-	<a href="{U_INDEX}" title="{L_FORUM_INDEX}"><img src="{ROOT_PATH}images/logo.gif" id="logo" alt="phpBB Creating Communities" /></a>
-	<h1>{L_ADMIN_PANEL}</h1>
-	<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
-</div>
-
-<div id="page-body">
-	<div id="tabs">
-		<ul>
-		<!-- BEGIN t_block1 -->
-			<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
-		<!-- END t_block1 -->
-		</ul>
+<div id="wrap">
+	<div id="page-header">
+		<h1>{L_ADMIN_PANEL}</h1>
+		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
 	</div>
-
-	<div class="box"><div class="innerbox">
-		<div class="corner1"></div><div class="corner2"></div>
-			<div id="content">
-				<div id="menu">
-					<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]</p>
-					<ul>
-					<!-- BEGIN l_block1 -->
-						<!-- IF l_block1.S_SELECTED -->
-
-					<!-- BEGIN l_block2 -->
-						<!-- IF .l_block1.l_block2.l_block3 -->
-						<li class="header">{l_block1.l_block2.L_TITLE}</li>
-						<!-- ENDIF -->
-
-						<!-- BEGIN l_block3 -->
-							<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
-						<!-- END l_block3 -->
-					<!-- END l_block2 -->
-					
-						<!-- ENDIF -->
-					<!-- END l_block1 -->
-					</ul>
-				</div>
-
-				<div id="main">
-
-				<!-- Start page content -->
+	
+	<div id="page-body">
+		<div id="tabs">
+			<ul>
+			<!-- BEGIN t_block1 -->
+				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+			<!-- END t_block1 -->
+			</ul>
+		</div>
+	
+		<div class="panel">
+			<span class="corners-top"><span></span></span>
+				<div id="content">
+					<div id="menu">
+						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]</p>
+						<ul>
+						<!-- BEGIN l_block1 -->
+							<!-- IF l_block1.S_SELECTED -->
+	
+						<!-- BEGIN l_block2 -->
+							<!-- IF .l_block1.l_block2.l_block3 -->
+							<li class="header">{l_block1.l_block2.L_TITLE}</li>
+							<!-- ENDIF -->
+	
+							<!-- BEGIN l_block3 -->
+								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
+							<!-- END l_block3 -->
+						<!-- END l_block2 -->
+						
+							<!-- ENDIF -->
+						<!-- END l_block1 -->
+						</ul>
+					</div>
+	
+					<div id="main">