diff --git a/phpBB/templates/PSO/overall_header.tpl b/phpBB/templates/PSO/overall_header.tpl
index 379ad1ec2a..a78ff5d3a5 100644
--- a/phpBB/templates/PSO/overall_header.tpl
+++ b/phpBB/templates/PSO/overall_header.tpl
@@ -31,6 +31,10 @@ INPUT {font-family:Verdana;font-size:8pt}
 SELECT.small	{font-family:"Courier New",courier;font-size:8pt;width:140px}
 INPUT.text	{font-family:"Courier New",courier;font-size:8pt;}
 
+INPUT.outsidetable {background-color:{T_TD_COLOR1};border:solid 1px;}
+INPUT.mainoptiontable {background-color:{T_TD_COLOR1};border:groove 2px;font-weight:bold}
+INPUT.liteoptiontable {background-color:{T_TD_COLOR1};border:groove 2px;}
+
 A.forumlinks {font-weight:bold}
 A {text-decoration:none}
 A:hover {text-decoration:underline}
diff --git a/phpBB/templates/PSO/privmsgs_popup.tpl b/phpBB/templates/PSO/privmsgs_popup.tpl
new file mode 100644
index 0000000000..4a2f651fde
--- /dev/null
+++ b/phpBB/templates/PSO/privmsgs_popup.tpl
@@ -0,0 +1,20 @@
+
+<script language="javascript" type="text/javascript">
+<!--
+function jump_to_inbox()
+{
+	opener.document.location.href = "{U_PRIVATEMSGS}";
+	window.close();
+}
+//-->
+</script>
+
+<table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
+	<tr>
+		<td class="tablebg"><table width="100%" border="0" cellspacing="1" cellpadding="3">
+			<tr>
+				<td valign="top" class="row1" align="center"><br /><span class="gen">{L_MESSAGE}</span><br /><br /><span class="gensmall"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
diff --git a/phpBB/templates/PSO/profile_add_body.tpl b/phpBB/templates/PSO/profile_add_body.tpl
index 1b93490080..f168278733 100644
--- a/phpBB/templates/PSO/profile_add_body.tpl
+++ b/phpBB/templates/PSO/profile_add_body.tpl
@@ -1,11 +1,11 @@
 
 <form action="{S_PROFILE_ACTION}" enctype="multipart/form-data" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
+		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
 	</tr>
 </table>
 
-<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
+<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
 	<tr>
 		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
@@ -85,6 +85,10 @@
 				<td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td>
 				<td class="row2"><input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} /> <span class="gen">{L_NO}</span></td>
 			</tr>
+			<tr>
+				<td class="row1"><span class="gen">{L_POPUP_ON_PRIVMSG}:</span><br /><span class="gensmall">{L_POPUP_ON_PRIVMSG_EXPLAIN}</span></td>
+				<td class="row2"><input type="radio" name="popup_pm" value="1" {POPUP_PM_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="popup_pm" value="0" {POPUP_PM_NO} /> <span class="gen">{L_NO}</span></td>
+			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td>
 				<td class="row2"><input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} /> <span class="gen">{L_NO}</span></td>
@@ -148,12 +152,12 @@
 			<!-- BEGIN avatargallery -->
 			<tr>
 				<td class="row1"><span class="gen">{L_AVATAR_GALLERY}:</span></td>
-				<td class="row2"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}" /></td>
+				<td class="row2"><input class="liteoptiontable" type="submit" name="avatargallery" value="{L_SHOW_GALLERY}" /></td>
 			</tr>
 			<!-- END avatargallery -->
 			<!-- END avatarblock -->
 			<tr>
-			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></td>
+			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="liteoptiontable" type="reset" value="{L_RESET}" /></td>
 			</tr>
 		</table></td>
 	</tr>
diff --git a/phpBB/templates/PSO/profile_avatar_gallery.tpl b/phpBB/templates/PSO/profile_avatar_gallery.tpl
index b8f8fd9c8d..11d548ca05 100644
--- a/phpBB/templates/PSO/profile_avatar_gallery.tpl
+++ b/phpBB/templates/PSO/profile_avatar_gallery.tpl
@@ -1,37 +1,36 @@
 
 <form action="{S_PROFILE_ACTION}" method="post">
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-  <tr> 
-	<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
-  </tr>
+
+<table width="98%" cellspacing="2" cellpadding="2" border="0" align="center">
+	<tr>
+		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
+	</tr>
 </table>
 
-<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
-	<tr> 
-	  <th class="thHead" colspan="{S_COLSPAN}" height="25" valign="middle">{L_AVATAR_GALLERY}</th>
-	</tr>
-	<tr> 
-	  <td class="catBottom" align="center" valign="middle" colspan="6" height="28"><span class="genmed">{L_CATEGORY}:&nbsp;<select name="avatarcategory">{S_OPTIONS_CATEGORIES}</select>&nbsp;<input type="submit" class="liteoption" value="{L_GO}" name="avatargallery" /></span></td>
-	</tr>
-	<!-- BEGIN avatar_row -->
-	<tr> 
-	<!-- BEGIN avatar_column -->
-		<td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" /></td>
-	<!-- END avatar_column -->
-	</tr>
+<table width="98%" cellspacing="0" cellpadding="0" border="0" align="center">
 	<tr>
-	<!-- BEGIN avatar_option_column -->
-		<td class="row2" align="center"><input type="radio" name="avatarselect" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-	<!-- END avatar_option_column -->
+		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
+			<tr>
+				<td class="cat" colspan="{S_COLSPAN}" align="center"><span class="cattitle">{L_AVATAR_GALLERY}</span></td>
+			</tr>
+			<tr>
+				<th colspan="6">{L_CATEGORY}:&nbsp;<select name="avatarcategory">{S_OPTIONS_CATEGORIES}</select>&nbsp;<input type="submit" class="liteoption" value="{L_GO}" name="avatargallery" /></td>
+			</tr>
+			<!-- BEGIN avatar_row -->
+			<tr> 
+			<!-- BEGIN avatar_column -->
+				<td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" /></td>
+			<!-- END avatar_column -->
+			</tr>
+			<tr>
+			<!-- BEGIN avatar_option_column -->
+				<td class="row2" align="center"><input type="radio" name="avatarselect" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+			<!-- END avatar_option_column -->
+			</tr>
+			<!-- END avatar_row -->
+			<tr> 
+				<td class="cat" colspan="{S_COLSPAN}" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submitavatar" value="{L_SELECT_AVATAR}" class="mainoptiontable" />&nbsp;&nbsp;<input type="submit" name="cancelavatar" value="{L_RETURN_PROFILE}" class="liteoptiontable" /></td>
+			</tr>
+		</table></td>
 	</tr>
-
-	<!-- END avatar_row -->
-	<tr> 
-	  <td class="catBottom" colspan="{S_COLSPAN}" align="center" height="28">{S_HIDDEN_FIELDS} 
-		<input type="submit" name="submitavatar" value="{L_SELECT_AVATAR}" class="mainoption" />
-		&nbsp;&nbsp; 
-		<input type="submit" name="cancelavatar" value="{L_RETURN_PROFILE}" class="liteoption" />
-	  </td>
-	</tr>
-  </table>
-</form>
+</table></form>
diff --git a/phpBB/templates/PSO/viewforum_body.tpl b/phpBB/templates/PSO/viewforum_body.tpl
index 71283bb9b9..80f51fe3c1 100644
--- a/phpBB/templates/PSO/viewforum_body.tpl
+++ b/phpBB/templates/PSO/viewforum_body.tpl
@@ -1,6 +1,7 @@
+
 <form method="post" action="{S_POST_DAYS_ACTION}"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> {FORUM_NAME}</span></td>
+		<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a> -> {FORUM_NAME}</span></td>
 		<td align="right" valign="bottom"  nowrap="nowrap"><span class="gensmall">{L_DISPLAY_TOPICS}:&nbsp;{S_SELECT_TOPIC_DAYS}&nbsp;<input type="submit" value="{L_GO}" /></span></td>
 	</tr>
 </table>
@@ -52,25 +53,36 @@
 	</tr>
 </table></form>
 
-<table width="98%" cellspacing="2" border="0" align="center">
+
+<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center">
 	<tr>
-		<td align="left" valign="top"><table cellspacing="0" border="0">
+		<td align="left" valign="top"><table cellspacing="0" cellpadding="1" border="0">
 			<tr>
-				<td width="20" align="center"><img src="images/folder_new.gif" alt="{L_NEWPOSTS}" /></td>
-				<td><span class="gensmall">{L_NEWPOSTS}</span></td>
+				<td width="20"><img src="{FOLDER_NEW_IMG}" alt="{L_NEW_POSTS}" /></td>
+				<td><span class="gensmall">{L_NEW_POSTS}</span></td>
 				<td>&nbsp;&nbsp;</td>
-				<td width="20" align="center"><img src="images/folder.gif" alt="{L_NONEWPOSTS}" /></td>
-				<td><span class="gensmall">{L_NONEWPOSTS}</span></td>
+				<td width="20"><img src="{FOLDER_IMG}" alt="{L_NO_NEW_POSTS}" /></td>
+				<td><span class="gensmall">{L_NO_NEW_POSTS}</span></td>
 				<td>&nbsp;&nbsp;</td>
-				<td width="20" align="center"><img src="images/folder_lock.gif" alt="{L_FORUM_LOCKED}" /></td>
-				<td><span class="gensmall">{L_TOPIC_IS_LOCKED}</span></td>
+				<td width="20"><img src="{FOLDER_ANNOUNCE_IMG}" alt="{L_ANNOUNCEMENT}" /></td>
+				<td><span class="gensmall">{L_ANNOUNCEMENT}</span></td>
+			</tr>
+			<tr> 
+				<td width="20"><img src="{FOLDER_HOT_NEW_IMG}" alt="{L_NEW_POSTS_HOT}" /></td>
+				<td><span class="gensmall">{L_NEW_POSTS_HOT}</span></td>
+				<td>&nbsp;&nbsp;</td>
+				<td width="20"><img src="{FOLDER_HOT_IMG}" alt="{L_NO_NEW_POSTS_HOT}" /></td>
+				<td><span class="gensmall">{L_NO_NEW_POSTS_HOT}</span></td>
+				<td>&nbsp;&nbsp;</td>
+				<td width="20"><img src="{FOLDER_STICKY_IMG}" alt="{L_STICKY}" /></td>
+				<td><span class="gensmall">{L_STICKY}</span></td>
 			</tr>
 			<tr>
-				<td width="20" align="center"><img src="images/folder_new_hot.gif" alt="{L_NEWPOSTS_HOT}" /></td>
-				<td><span class="gensmall">{L_NEWPOSTS_HOT}</span></td>
+				<td width="20"><img src="{FOLDER_LOCKED_NEW_IMG}" alt="{L_NEW_POSTS_TOPIC_LOCKED}" /></td>
+				<td><span class="gensmall">{L_NEW_POSTS_LOCKED}</span></td>
 				<td>&nbsp;&nbsp;</td>
-				<td width="20" align="center"><img src="images/folder_hot.gif" alt="{L_NONEWPOSTS_HOT}" /></td>
-				<td><span class="gensmall">{L_NONEWPOSTS_HOT}</span></td>
+				<td width="20"><img src="{FOLDER_LOCKED_IMG}" alt="{L_NO_NEW_POSTS_TOPIC_LOCKED}" /></td>
+				<td><span class="gensmall">{L_NO_NEW_POSTS_LOCKED}</span></td>
 			</tr>
 			<tr>
 				<td colspan="8"><br /><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
diff --git a/phpBB/templates/PSO/viewtopic_body.tpl b/phpBB/templates/PSO/viewtopic_body.tpl
index fe411e25cf..47979cf024 100644
--- a/phpBB/templates/PSO/viewtopic_body.tpl
+++ b/phpBB/templates/PSO/viewtopic_body.tpl
@@ -32,9 +32,6 @@
 			</tr>
 		</table></td>
 	</tr>
-	<tr>
-		<td><img src="images/spacer.gif" height="4" /></td>
-	</tr>
 </table>
 
 <!-- BEGIN postrow -->
@@ -75,16 +72,10 @@
 			</tr>
 		</table></td>
 	</tr>
-	<tr>
-		<td><img src="images/spacer.gif" height="2" /></td>
-	</tr>
 </table>
 <!-- END postrow -->
 
 <table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
-	<tr>
-		<td><img src="images/spacer.gif" height="2" /></td>
-	</tr>
 	<tr>
 		<td width="100%" class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
 			<tr>