diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 36d8f24f32..950e9bb6f9 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -117,8 +117,7 @@
 
 	<!-- IF S_EDIT_GROUP -->
 		<script type="text/javascript" defer="defer">
-		<!--
-
+		// <![CDATA[
 			function update_image(newimage)
 			{
 				if (newimage == 'no_image')
@@ -163,7 +162,7 @@
 				}
 			}
 
-		//-->
+		// ]]>
 		</script>
 
 		<form id="extgroups" method="post" action="{U_ACTION}">
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index e371d48bfc..8dd771f7fa 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -9,24 +9,24 @@
 <p>{L_EXPLAIN}</p>
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 
 	var ban_length = new Array();
 		ban_length[-1] = '';
 	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}";
+		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
 	<!-- END ban_length -->
 
 	var ban_reason = new Array();
 		ban_reason[-1] = '';
 	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}";
+		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
 	<!-- END ban_reason -->
 
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = '';
 	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
+		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
 	<!-- END ban_give_reason -->
 
 	function display_details(option)
@@ -36,7 +36,7 @@
 		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
 	}
 
-//-->
+// ]]>
 </script>
 
 <form id="acp_ban" method="post" action="{U_ACTION}">
@@ -46,7 +46,7 @@
 <dl>
 	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
 	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
-	<!-- IF S_USERNAME_BAN --><dd>[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
+	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
 </dl>
 <dl>
 	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index d1ac03dc7b..fcb79920fc 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -33,7 +33,7 @@
 	<p>{L_ACP_BACKUP_EXPLAIN}</p>
 
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 
 		function selector(bool)
 		{
@@ -45,7 +45,7 @@
 			}
 		}
 
-	//-->
+	// ]]>
 	</script>
 
 	<form id="acp_backup" method="post" action="{U_ACTION}">
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
index 5744136230..b2c12c944d 100644
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -24,7 +24,7 @@
 <dl>
 	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
 	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
 <dl>
 	<dt><label for="subject">{L_SUBJECT}:</label></dt>
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 77d3c59a6f..802cd81815 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -5,8 +5,7 @@
 <!-- IF S_EDIT_FORUM -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		/**
 		* Handle displaying/hiding several options based on the forum type
 		*/
@@ -92,7 +91,7 @@
 			<!-- ENDIF -->
 		}
 
-	//-->
+	// ]]>
 	</script>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
@@ -368,12 +367,11 @@
 <!-- ELSEIF S_CONTINUE_SYNC -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		var close_waitscreen = 0;
-		window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
-
-	//-->
+		// no scrollbars...
+		popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
+	// ]]>
 	</script>
 
 	<h1>{L_FORUM_ADMIN}</h1>
@@ -385,18 +383,17 @@
 <!-- ELSE -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		/**
 		* Popup search progress bar
 		*/
 		function popup_progress_bar()
 		{
 			var close_waitscreen = 0;
-			window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
+			// no scrollbars...
+			popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
 		}
-
-	//-->
+	// ]]>
 	</script>
 
 	<h1>{L_FORUM_ADMIN}</h1>
@@ -412,9 +409,9 @@
 
 	<!-- IF S_RESYNCED -->
 		<script type="text/javascript">
-		<!--
+		// <![CDATA[
 			var close_waitscreen = 1;
-		//-->
+		// ]]>
 		</script>
 
 		<div class="successbox">
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index a659207f9e..f1b4c4ecaa 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -76,7 +76,7 @@
 	</dl>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
+		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
@@ -254,7 +254,7 @@
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 	</dl>
 
 	<p class="quick">
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index 5100de32d8..6a8db53f08 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -5,7 +5,7 @@
 <!-- IF S_EDIT -->
 
 	<script type="text/javascript" defer="defer">
-	<!--
+	// <![CDATA[
 	<!-- IF S_ADD_CODE -->
 	
 			var smiley = Array();
@@ -22,7 +22,7 @@
 			{
 				var use_element = smiley[newimage];
 
-				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + newimage;
+				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
 				document.getElementById('add_code').value = use_element['code'];
 				document.getElementById('add_emotion').value = use_element['emotion'];
 				document.getElementById('add_width').value = use_element['width'];
@@ -60,10 +60,9 @@
 			nodisp.className = '';
 		}
 	}
-	//-->
+	// ]]>
 	</script>
 
-
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
@@ -112,7 +111,7 @@
 		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
 		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
 		<td>
-			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.IMG}', this.checked, 'order[{items.IMG}]');"/>
+			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, 'order[{items.A_IMG}]');"/>
 			<!-- IF items.S_ID -->
 				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}" />
 			<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 3fafd1288b..cae5781c8d 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -5,8 +5,7 @@
 <!-- IF S_EDIT_MODULE -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		function display_options(value)
 		{
 			if (value == 'category')
@@ -38,7 +37,7 @@
 			var j = 0;
 <!-- BEGIN m_names -->
 		
-			if (value == '{m_names.NAME}')
+			if (value == '{m_names.A_NAME}')
 			{
 	<!-- BEGIN modes -->
 				item.options[j] = new Option('{m_names.modes.A_VALUE}');
@@ -52,7 +51,7 @@
 			item.options[0].selected = true;
 		}
 
-	//-->
+	// ]]>
 	</script>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index e16d7598ab..80b1003003 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -5,7 +5,7 @@
 <!-- IF S_EDIT -->
 
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 		var active_pmask = '0';
 		var active_fmask = '0';
 		var active_cat = '0';
@@ -17,7 +17,7 @@
 		<!-- IF S_ROLE_JS_ARRAY -->
 			{S_ROLE_JS_ARRAY}
 		<!-- ENDIF -->
-	//-->
+	// ]]>
 	</script>
 
 	<script type="text/javascript" src="style/permissions.js"></script>
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index 5eb9c2eab3..d30a38e697 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -74,7 +74,7 @@
 		<dl>
 			<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
 			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>
-			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 		</dl>
 
@@ -138,7 +138,7 @@
 				<p>{L_USERNAMES_EXPLAIN}</p>
 			<dl>
 				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
-				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 			</dl>
 			</fieldset>
 
@@ -225,7 +225,7 @@
 			<dl>
 				<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
 				<dd><input type="text" id="username" name="username[]" /></dd>
-				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 			</dl>
 			</fieldset>
@@ -327,9 +327,9 @@
 	<!-- include tooltip file -->
 	<script type="text/javascript" src="style/tooltip.js"></script>
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 		window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
-	//-->
+	// ]]>
 	</script>
 
 	<form id="set-permissions" method="post" action="{U_ACTION}">
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 1300ddffb2..9a2926df7f 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -33,7 +33,7 @@
 <dl>
 	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
-	<dd>[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
 <dl>
 	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index bfb805f3d8..0bc8636f7d 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -7,13 +7,13 @@
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 		function update_image(newimage)
 		{
-			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + newimage : "./images/spacer.gif";
+			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + encodeURI(newimage) : "./images/spacer.gif";
 		}
 
-	//-->
+	// ]]>
 	</script>
 
 	<h1>{L_ACP_MANAGE_RANKS}</h1>
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 8d0ad2f07c..9afe9c5789 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -66,17 +66,17 @@
 <!-- ELSEIF S_INDEX -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		/**
 		* Popup search progress bar
 		*/
 		function popup_progress_bar(progress_type)
 		{
 			close_waitscreen = 0;
-			window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=240,resizable=yes,scrollbars=no,WIDTH=400');
+			// no scrollbars
+			popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
 		}
-	//-->
+	// ]]>
 	</script>
 
 	<h1>{L_ACP_SEARCH_INDEX}</h1>
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index efa06aa538..0908c19480 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -51,15 +51,15 @@
 	<!-- ENDIF -->
 
 	<script type="text/javascript" defer="defer">
-	<!--
+	// <![CDATA[
 		function update_image(newimage)
 		{
-			document.getElementById('newimg').src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png";
+			document.getElementById('newimg').src = (newimage) ? '../styles/{A_NAME}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
 		}
-	//-->
+	// ]]>
 	</script>
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 		/**
 		* Handle displaying/hiding the dimension fields
 		*/
@@ -85,7 +85,7 @@
 				dE('img_dimensions', -1);
 			<!-- ENDIF -->
 		}
-	//-->
+	// ]]>
 	</script>
 
 	<form method="post" action="{U_ACTION}">
@@ -153,33 +153,6 @@
 
 <!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
 
-	<script type="text/javascript" defer="defer">
-	<!--
-		function append_text_rows(form_name, value)
-		{
-			url = document.getElementById(form_name).action;
-			var_start = url.indexOf('&text_rows=');
-			if (var_start == -1)
-			{
-				document.getElementById(form_name).action = url + "&text_rows=" + value;
-			}
-			else
-			{
-				url_start = url.substring(0, var_start + 1);
-				var_end = url.substring(var_start + 1).indexOf('&');
-				if (var_end == -1)
-				{
-					document.getElementById(form_name).action = url_start + "text_rows=" + value;
-				}
-				else
-				{
-					document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
-				}
-			}
-		}
-	//-->
-	</script>
-
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_EDIT}</h1>
@@ -204,10 +177,17 @@
 
 	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) -->
 		<script type="text/javascript" defer="defer">
-		<!--
+		// <![CDATA[
 
 			function change_editor_height(height)
 			{
+				height = Number(height);
+
+				if (isNaN(height))
+				{
+					return;
+				}
+
 				editor = document.getElementById('template_data');
 				editor.rows = Math.max(5, Math.min(height, 999));
 
@@ -217,7 +197,18 @@
 
 			function append_text_rows(form_name, value)
 			{
+				value = Number(value);
+
+				if (isNaN(value))
+				{
+					return;
+				}
+
 				url = document.getElementById(form_name).action;
+
+				// Make sure &amp; is actually... &
+				url = url.replace(/&amp;/g, '&');
+
 				var_start = url.indexOf('&text_rows=');
 				if (var_start == -1)
 				{
@@ -238,7 +229,7 @@
 				}
 			}
 
-		//-->
+		// ]]>
 		</script>
 
 		<form id="acp_template" method="post" action="{U_ACTION}">
@@ -269,18 +260,6 @@
 
 <!-- ELSEIF S_CACHE -->
 
-	<script type="text/javascript">
-	<!--
-
-		function viewsource(url)
-		{
-			window.open(url, '_source', 'HEIGHT=550,resizable=yes,scrollbars=yes,WIDTH=750');
-			return false;
-		}
-	
-	//-->
-	</script>
-
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 	
 	<h1>{L_TEMPLATE_CACHE}</h1>
@@ -304,7 +283,7 @@
 	<tbody>
 	<!-- BEGIN file -->
 		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{file.U_VIEWSOURCE}" onclick="viewsource('{file.UA_VIEWSOURCE}');return false">{file.FILENAME}</a></td>
+			<td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME}</a></td>
 			<td>{file.FILESIZE}</td>
 			<td>{file.CACHED}</td>
 			<td>{file.MODIFIED}</td>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index a7ac71abed..cc369bab66 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -15,7 +15,7 @@
 	<dl>
 		<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
 		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 	</dl>
 
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 60090d5a3f..2dfb82e52f 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -21,7 +21,7 @@
 <dl>
 	<dt><label>{L_REGISTERED_IP}:</label></dt>
 	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
-	<dd>[ <a href="{U_WHOIS}" onclick="window.open(this.href, '_whois', 'height=500, resizable=yes, scrollbars=yes, width=700'); return false;">{L_WHOIS}</a> ]</dd>
+	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>
 </dl>
 <!-- ENDIF -->
 <dl>
@@ -70,7 +70,7 @@
 <!-- IF not S_USER_FOUNDER or S_FOUNDER -->
 
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 
 		function display_reason(option)
 		{
@@ -103,7 +103,7 @@
 			}
 		}
 
-	//-->
+	// ]]>
 	</script>
 
 	<form id="user_quick_tools" method="post" action="{U_ACTION}">
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index 99e82ea0db..1dfa6a614b 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -1,3 +1,9 @@
+<script type="text/javascript">
+// <![CDATA[
+	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
+// ]]>
+</script>
+
 	<form id="user_prefs" method="post" action="{U_ACTION}">
 
 	<fieldset>
@@ -57,7 +63,7 @@
 	</dl>
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
-		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{A_DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
+		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
 		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
 	</dl>
 	</fieldset>
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 8c9fcaeec6..9d6b8d11e9 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -1,5 +1,5 @@
-	<script type="text/javascript">
-	<!--
+<script type="text/javascript">
+// <![CDATA[
 
 	var form_name = 'user_signature';
 	var text_name = 'signature';
@@ -31,11 +31,11 @@
 		<!-- END custom_tags -->
 	}
 
-	//-->
-	</script>
-	<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+// ]]>
+</script>
+<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
 
-	<form id="user_signature" method="post" action="{U_ACTION}">
+<form id="user_signature" method="post" action="{U_ACTION}">
 
 	<!-- IF SIGNATURE_PREVIEW -->
 		<fieldset>
@@ -86,9 +86,12 @@
 		<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p>
 
 		<dl>
-			<dt style="width: 90px;"><script type="text/javascript"><!--
-				colorPalette('v', 12, 10);
-				//--></script>
+			<dt style="width: 90px;">
+				<script type="text/javascript">
+				// <![CDATA[
+					colorPalette('v', 12, 10);
+				// ]]>
+				</script>
 			</dt>
 			<dd style="margin-left: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd>
 			<dd style="margin-left: 90px; margin-top: 5px;">
@@ -111,4 +114,4 @@
 		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
 	</fieldset>
 
-	</form>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
index f52f3217c5..f3c5a812dc 100644
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -36,7 +36,7 @@
 <body>
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	var r = 0, g = 0, b = 0;
 
 	var numberList = new Array(6);
@@ -71,7 +71,7 @@
 	{
 		opener.document.forms["{OPENER}"].{NAME}.value = color;
 	}
-//-->
+// ]]>
 </script>
 
 </body>
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 34d00241cb..e19f1fe211 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -1,13 +1,13 @@
 <!-- INCLUDE install_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	function diff_popup(url)
 	{
-		window.open(url.replace(/&amp;/g, '&'), 'diff', 'height=600,resizable=yes,scrollbars=yes,width=950');
+		popup(url, 950, 600, '_diff');
 		return false;
 	}
-//-->
+// ]]>
 </script>
 
 <!-- IF S_ERROR -->
@@ -201,7 +201,7 @@
 								<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
 								<!-- ENDIF -->
 							</dt>
-							<dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' -->&nbsp;<!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup('{files.U_SHOW_DIFF}'); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd>
+							<dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' -->&nbsp;<!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd>
 							<!-- IF files.S_CUSTOM -->
 								<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
 							<!-- ENDIF -->
@@ -210,15 +210,15 @@
 							</dl>
 							<dl>
 								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup('{files.U_SHOW_DIFF}'); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
 							</dl>
 							<dl>
 								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup('{files.U_VIEW_NO_MERGE_NEW}'); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
 							</dl>
 							<dl>
 								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup('{files.U_VIEW_NO_MERGE_MOD}'); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
 							</dl>
 							<!-- IF not files.S_LAST_ROW -->
 							</fieldset>
@@ -233,20 +233,20 @@
 							</dl>
 							<dl>
 								<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup('{files.U_VIEW_NO_MERGE_NEW}'); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
 							</dl>
 							<dl>
 								<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup('{files.U_VIEW_NO_MERGE_MOD}'); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
 							</dl>
 								<!-- IF not files.S_BINARY -->
 									<dl>
 										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="diff_popup('{files.U_VIEW_NEW_FILE}'); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
 									</dl>
 									<dl>
 										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup('{files.U_VIEW_MOD_FILE}'); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
 									</dl>
 								<!-- ENDIF -->
 							<!-- IF not files.S_LAST_ROW -->
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index ce1a241abe..b9ac19ae5d 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -12,7 +12,7 @@
 <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 function resize_panel()
 {
 	var block = document.getElementById('codepanel');	
@@ -28,7 +28,7 @@ function resize_panel()
 		//whatever IE needs to do this
 	}	
 }
--->
+// ]]>
 </script>
 
 <style type="text/css">
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index a6b053b543..e883e66d80 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -12,11 +12,11 @@
 <link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}:';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
-var base_url = '{BASE_URL}';
+var base_url = '{A_BASE_URL}';
 
 var menu_state = 'shown';
 
@@ -81,34 +81,26 @@ function marklist(id, name, state)
 	}
 }
 
-/**
-* Open trace popup
-*/
-function trace(link)
-{
-	window.open(link.replace(/&amp;/g, '&'), '_trace', 'height=515, resizable=yes, scrollbars=yes, width=750');
-	return false;
-}
-
 /**
 * Find a member
 */
-function find_username()
+function find_username(url)
 {
-	<!-- IF UA_FIND_USERNAME -->
-	window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=570, resizable=yes, scrollbars=yes, width=760');
-	<!-- ENDIF -->
+	popup(url, 760, 570, '_usersearch');
 	return false;
 }
 
 /**
-* Color swatch
+* Window popup
 */
-function swatch(field)
+function popup(url, width, height, name)
 {
-	<!-- IF UA_SWATCH -->
-	window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
-	<!-- ENDIF -->
+	if (!name)
+	{
+		name = '_popup';
+	}
+
+	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
 	return false;
 }
 
@@ -162,7 +154,7 @@ function switch_menu()
 	}
 }
 
-//-->
+// ]]>
 </script>
 </head>
 
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 1889f84d28..19a24a48b8 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -1,6 +1,6 @@
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	var active_pmask = '0';
 	var active_fmask = '0';
 	var active_cat = '0';
@@ -12,7 +12,7 @@
 	<!-- IF S_ROLE_JS_ARRAY -->
 		{S_ROLE_JS_ARRAY}
 	<!-- ENDIF -->
-//-->
+// ]]>
 </script>
 <script type="text/javascript" src="style/permissions.js"></script>
 
@@ -102,7 +102,7 @@
 				<tbody>
 				<!-- BEGIN mask -->
 					<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-					<th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="#" class="trace" onclick="trace('{p_mask.f_mask.category.mask.U_TRACE}'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
+					<th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="{p_mask.f_mask.category.mask.U_TRACE}" class="trace" onclick="popup(this.href, 750, 515, '_trace'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
 					<!-- IF p_mask.S_VIEW -->
 						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->>&nbsp;</td>
 						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ENDIF -->></td>
diff --git a/phpBB/adm/style/progress_bar.html b/phpBB/adm/style/progress_bar.html
index ef9590119f..00e1e5e885 100644
--- a/phpBB/adm/style/progress_bar.html
+++ b/phpBB/adm/style/progress_bar.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE simple_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	/**
 	* Close previously opened popup
 	*/
@@ -22,7 +22,7 @@
 		setTimeout("close_popup()", 1000);
 		return 0;
 	}
-//-->
+// ]]>
 </script>
 
 <div class="successbox">
@@ -32,9 +32,9 @@
 </div>
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	close_popup();
-//-->
+// ]]>
 </script>
 
 <!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 882026a1c1..3e36c47988 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -12,11 +12,25 @@
 <link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}:';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
-var base_url = '{BASE_URL}';
+var base_url = '{A_BASE_URL}';
+
+/**
+* Window popup
+*/
+function popup(url, width, height, name)
+{
+	if (!name)
+	{
+		name = '_popup';
+	}
+
+	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
+	return false;
+}
 
 /**
 * Jump to page
@@ -76,26 +90,13 @@ function marklist(id, name, state)
 /**
 * Find a member
 */
-function find_username()
+function find_username(url)
 {
-	<!-- IF UA_FIND_USERNAME -->
-	window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=570, resizable=yes, scrollbars=yes, width=760');
-	<!-- ENDIF -->
+	popup(url, 760, 570, '_usersearch');
 	return false;
 }
 
-/**
-* Color swatch
-*/
-function swatch(field)
-{
-	<!-- IF UA_SWATCH -->
-	window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
-	<!-- ENDIF -->
-	return false;
-}
-
-//-->
+// ]]>
 </script>
 </head>
 
diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php
index 9e537290ff..5a5a4e6d5c 100644
--- a/phpBB/adm/swatch.php
+++ b/phpBB/adm/swatch.php
@@ -29,9 +29,16 @@ $template->set_filenames(array(
 	'body' => 'colour_swatch.html')
 );
 
+$form = request_var('form', '');
+$name = request_var('name', '');
+
+// We validate form and name here, only id/class allowed
+$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
+$name = (!preg_match('/^[a-z0-9_-]+$/i', $name)) ? '' : $name;
+
 $template->assign_vars(array(
-	'OPENER'		=> addslashes(request_var('form', '')),
-	'NAME'			=> request_var('name', ''),
+	'OPENER'		=> $form,
+	'NAME'			=> $name,
 	'T_IMAGES_PATH'	=> "{$phpbb_root_path}images/",
 
 	'S_USER_LANG'			=> $user->lang['USER_LANG'],
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index 206f332c36..f5669b2c04 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -97,9 +97,8 @@ class acp_ban
 			'S_USERNAME_BAN'	=> ($mode == 'user') ? true : false,
 			
 			'U_ACTION'			=> $this->u_action,
-			'U_FIND_USER'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_ban&amp;field=ban'),
-			)
-		);
+			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_ban&amp;field=ban'),
+		));
 	}
 
 	/**
@@ -179,10 +178,10 @@ class acp_ban
 			foreach ($ban_length as $ban_id => $length)
 			{
 				$template->assign_block_vars('ban_length', array(
-					'BAN_ID'	=> $ban_id,
+					'BAN_ID'	=> (int) $ban_id,
 					'LENGTH'	=> $length,
-					'A_LENGTH'	=> addslashes($length))
-				);
+					'A_LENGTH'	=> addslashes($length),
+				));
 			}
 		}
 
@@ -193,8 +192,8 @@ class acp_ban
 				$template->assign_block_vars('ban_reason', array(
 					'BAN_ID'	=> $ban_id,
 					'REASON'	=> $reason,
-					'A_REASON'	=> addslashes(htmlspecialchars_decode($reason)))
-				);
+					'A_REASON'	=> addslashes(htmlspecialchars_decode($reason)),
+				));
 			}
 		}
 
@@ -205,8 +204,8 @@ class acp_ban
 				$template->assign_block_vars('ban_give_reason', array(
 					'BAN_ID'	=> $ban_id,
 					'REASON'	=> $reason,
-					'A_REASON'	=> addslashes(htmlspecialchars_decode($reason)))
-				);
+					'A_REASON'	=> addslashes(htmlspecialchars_decode($reason)),
+				));
 			}
 		}
 
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 5bcbae82ba..7cee81ffe2 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -784,7 +784,7 @@ class acp_board
 		$user->timezone = $old_tz;
 		$user->dst = $old_dst;
 
-		return "<select name=\"dateoptions\" id=\"dateoptions\" onchange=\"if (this.value == 'custom') { document.getElementById('$key').value = '$value'; } else { document.getElementById('$key').value = this.value; }\">$dateformat_options</select>
+		return "<select name=\"dateoptions\" id=\"dateoptions\" onchange=\"if (this.value == 'custom') { document.getElementById('" . addslashes($key) . "').value = '" . addslashes($value) . "'; } else { document.getElementById('" . addslashes($key) . "').value = this.value; }\">$dateformat_options</select>
 		<input type=\"text\" name=\"config[$key]\" id=\"$key\" value=\"$value\" maxlength=\"30\" />";
 	}
 }
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 50f3d2a4c8..cc7c99c90b 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -235,7 +235,6 @@ class acp_email
 			'S_GROUP_OPTIONS'		=> $select_list,
 			'USERNAMES'				=> $usernames,
 			'U_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_email&amp;field=usernames'),
-			'UA_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=acp_email&field=usernames', false),
 			'SUBJECT'				=> $subject,
 			'MESSAGE'				=> $message,
 			'S_PRIORITY_OPTIONS'	=> $s_priority_options)
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 8ac3f2cec7..446c67011d 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -344,7 +344,7 @@ class acp_forums
 
 						$template->assign_vars(array(
 							'U_PROGRESS_BAR'		=> $this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['forum_topics_real']}",
-							'UA_PROGRESS_BAR'		=> str_replace('&amp;', '&', $this->u_action) . "&action=progress_bar&start=$topics_done&total={$row['forum_topics_real']}",
+							'UA_PROGRESS_BAR'		=> addslashes($this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['forum_topics_real']}"),
 							'S_CONTINUE_SYNC'		=> true,
 							'L_PROGRESS_EXPLAIN'	=> sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $topics_done, $row['forum_topics_real']))
 						);
@@ -358,7 +358,7 @@ class acp_forums
 
 				$template->assign_vars(array(
 					'U_PROGRESS_BAR'		=> $this->u_action . '&amp;action=progress_bar',
-					'UA_PROGRESS_BAR'		=> str_replace('&amp;', '&', $this->u_action) . '&action=progress_bar',
+					'UA_PROGRESS_BAR'		=> addslashes($this->u_action . '&amp;action=progress_bar'),
 					'S_CONTINUE_SYNC'		=> true,
 					'L_PROGRESS_EXPLAIN'	=> sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], 0, $row['forum_topics_real']))
 				);
@@ -831,8 +831,8 @@ class acp_forums
 			'U_ACTION'		=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
 
 			'U_PROGRESS_BAR'	=> $this->u_action . '&amp;action=progress_bar',
-			'UA_PROGRESS_BAR'	=> str_replace('&amp;', '&', $this->u_action) . '&action=progress_bar')
-		);
+			'UA_PROGRESS_BAR'	=> addslashes($this->u_action . '&amp;action=progress_bar'),
+		));
 	}
 
 	/**
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 35499b132f..6c8591818c 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -558,7 +558,6 @@ class acp_groups
 
 					'U_BACK'			=> $u_back,
 					'U_SWATCH'			=> append_sid("{$phpbb_admin_path}swatch.$phpEx", 'form=settings&amp;name=group_colour'),
-					'UA_SWATCH'			=> append_sid("{$phpbb_admin_path}swatch.$phpEx", 'form=settings&name=group_colour', false),
 					'U_ACTION'			=> "{$this->u_action}&amp;action=$action&amp;g=$group_id",
 					'L_AVATAR_EXPLAIN'	=> sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)),
 					)
@@ -628,9 +627,8 @@ class acp_groups
 					'U_ACTION'			=> $this->u_action . "&amp;g=$group_id",
 					'U_BACK'			=> $this->u_action,
 					'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=list&amp;field=usernames'),
-					'UA_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=list&field=usernames', false),
-					'U_DEFAULT_ALL'		=> "{$this->u_action}&amp;action=default&amp;g=$group_id")
-				);
+					'U_DEFAULT_ALL'		=> "{$this->u_action}&amp;action=default&amp;g=$group_id",
+				));
 
 				// Grab the members
 				$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending 
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index 56a660ced2..24d65bf02c 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -241,6 +241,7 @@ class acp_icons
 				{
 					$template->assign_block_vars('items', array(
 						'IMG'		=> $img,
+						'A_IMG'		=> addslashes($img),
 						'IMG_SRC'	=> $phpbb_root_path . $img_path . '/' . $img,
 
 						'CODE'		=> ($mode == 'smilies' && isset($img_row['code'])) ? $img_row['code'] : '',
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 8077bfa2b4..44fe4ed462 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -310,7 +310,7 @@ class acp_modules
 					// Name options
 					$s_name_options .= '<option value="' . $option . '"' . (($option == $module_data['module_basename']) ? ' selected="selected"' : '') . '>' . $this->lang_name($values['title']) . ' [' . $this->module_class . '_' . $option . ']</option>';
 
-					$template->assign_block_vars('m_names', array('NAME' => $option));
+					$template->assign_block_vars('m_names', array('NAME' => $option, 'A_NAME' => addslashes($option)));
 
 					// Build module modes
 					foreach ($values['modes'] as $m_mode => $m_values)
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index cc64d84dfe..4b06d2edad 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -332,8 +332,7 @@ class acp_permissions
 					$template->assign_vars(array(
 						'S_SELECT_USER'			=> true,
 						'U_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=select_victim&amp;field=username&amp;select_single=true'),
-						'UA_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=select_victim&field=username&select_single=true', false))
-					);
+					));
 
 				break;
 
@@ -395,8 +394,7 @@ class acp_permissions
 						'S_DEFINED_GROUP_OPTIONS'	=> $items['group_ids_options'],
 						'S_ADD_GROUP_OPTIONS'		=> group_select_options(false, $items['group_ids'], (($user->data['user_type'] == USER_FOUNDER) ? false : 0)),
 						'U_FIND_USERNAME'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=add_user&amp;field=username&amp;select_single=true'),
-						'UA_FIND_USERNAME'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=add_user&field=username&select_single=true', false))
-					);
+					));
 
 				break;
 			}
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index 34f43e2426..b7e49ea983 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -350,8 +350,8 @@ class acp_prune
 			'S_JOINED_OPTIONS'	=> $s_find_join_time,
 			'S_ACTIVE_OPTIONS'	=> $s_find_active_time,
 			'S_COUNT_OPTIONS'	=> $s_find_count,
-			'U_FIND_USER'		=> append_sid($phpbb_root_path . "memberlist.$phpEx", 'mode=searchuser&amp;form=acp_prune&amp;field=users'))
-		);
+			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_prune&amp;field=users'),
+		));
 	}
 
 	/**
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index f8d4f1f80d..12d3095d40 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -473,8 +473,8 @@ class acp_search
 			'S_INDEX'				=> true,
 			'U_ACTION'				=> $this->u_action,
 			'U_PROGRESS_BAR'		=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=$mode&amp;action=progress_bar"),
-			'UA_PROGRESS_BAR'		=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=$mode&action=progress_bar", false))
-		);
+			'UA_PROGRESS_BAR'		=> addslashes(append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=$mode&amp;action=progress_bar")),
+		));
 
 		if (isset($this->state[1]))
 		{
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 5a176ead30..a0c648ba1f 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -987,7 +987,6 @@ parse_css_file = {PARSE_CSS_FILE}
 
 			$template->assign_block_vars('file', array(
 				'U_VIEWSOURCE'	=> $this->u_action . "&amp;action=cache&amp;id=$template_id&amp;source=$file",
-				'UA_VIEWSOURCE'	=> str_replace('&amp;', '&', $this->u_action) . "&action=cache&id=$template_id&source=$file",
 
 				'CACHED'		=> $user->format_date(filemtime("{$phpbb_root_path}cache/$filename")),
 				'FILENAME'		=> $file,
@@ -1454,6 +1453,7 @@ parse_css_file = {PARSE_CSS_FILE}
 			'U_ACTION'			=> $this->u_action . "&amp;action=edit&amp;id=$imageset_id",
 			'U_BACK'			=> $this->u_action,
 			'NAME'				=> $imageset_name,
+			'A_NAME'			=> addslashes($imageset_name),
 			'ERROR'				=> !$valid_name,
 			'IMG_SRC'			=> ($image_found) ? '../styles/' . $imageset_path . '/imageset/' . $img_val : 'images/no_image.png',
 			'IMAGE_SELECT'		=> $image_found
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index aaf066dfca..3748dbaaf9 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -68,9 +68,7 @@ class acp_users
 
 				'S_SELECT_USER'		=> true,
 				'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=select_user&amp;field=username&amp;select_single=true'),
-				'UA_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=select_user&field=username&select_single=true', false),
-				)
-			);
+			));
 
 			return;
 		}
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index e3514833b5..68156718ab 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -382,7 +382,7 @@ class auth_admin extends auth
 					continue;
 				}
 
-				$s_role_js_array[$row['role_id']] .= 'role_options[' . $row['role_id'] . '][\'' . $row['auth_option'] . '\'] = ' . $row['auth_setting'] . '; ';
+				$s_role_js_array[$row['role_id']] .= 'role_options[' . $row['role_id'] . '][\'' . addslashes($row['auth_option']) . '\'] = ' . $row['auth_setting'] . '; ';
 			}
 			$db->sql_freeresult($result);
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4155103eef..004c4d8828 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1530,13 +1530,14 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 	}
 
 	$template->assign_vars(array(
-		$tpl_prefix . 'BASE_URL'	=> $base_url,
-		$tpl_prefix . 'PER_PAGE'	=> $per_page,
+		$tpl_prefix . 'BASE_URL'		=> $base_url,
+		'A_' . $tpl_prefix . 'BASE_URL'	=> addslashes($base_url),
+		$tpl_prefix . 'PER_PAGE'		=> $per_page,
 
 		$tpl_prefix . 'PREVIOUS_PAGE'	=> ($on_page == 1) ? '' : $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page),
 		$tpl_prefix . 'NEXT_PAGE'		=> ($on_page == $total_pages) ? '' : $base_url . "{$url_delim}start=" . ($on_page * $per_page),
-		$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages)
-	);
+		$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages,
+	));
 
 	return $page_string;
 }
@@ -4152,9 +4153,8 @@ function page_header($page_title = '', $display_online_list = true)
 
 		'U_PRIVATEMSGS'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),
 		'U_RETURN_INBOX'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),
-		'UA_RETURN_INBOX'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox', false),
 		'U_POPUP_PM'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=popup'),
-		'UA_POPUP_PM'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup', false),
+		'UA_POPUP_PM'			=> addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=popup')),
 		'U_MEMBERLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
 		'U_MEMBERSLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
 		'U_VIEWONLINE'			=> ($auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$phpbb_root_path}viewonline.$phpEx") : '',
diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php
index d7c1b28b77..4b33af8b09 100644
--- a/phpBB/includes/mcp/mcp_ban.php
+++ b/phpBB/includes/mcp/mcp_ban.php
@@ -142,7 +142,7 @@ class mcp_ban
 			'S_USERNAME_BAN'	=> ($mode == 'user') ? true : false,
 
 			'U_ACTION'			=> $this->u_action,
-			'U_FIND_USER'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=mcp_ban&amp;field=ban'),
+			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=mcp_ban&amp;field=ban'),
 		));
 
 		if ($mode != 'user')
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 391d41b6fb..6e6e1ffdd9 100755
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -42,11 +42,10 @@ class mcp_notes
 			case 'front':
 				$template->assign_vars(array(
 					'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=mcp&amp;field=username&amp;select_single=true'),
-					'UA_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=mcp&field=username&select_single=true', false),
 					'U_POST_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&amp;mode=user_notes'),
 
-					'L_TITLE'			=> $user->lang['MCP_NOTES'])
-				);
+					'L_TITLE'			=> $user->lang['MCP_NOTES'],
+				));
 
 				$this->tpl_name = 'mcp_notes_front';
 			break;
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index b98910f55f..4a5bf77bca 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -176,7 +176,6 @@ function mcp_post_details($id, $mode, $action)
 
 		'U_EDIT'				=> ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;f={$post_info['forum_id']}&amp;p={$post_info['post_id']}") : '',
 		'U_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=mcp_chgposter&amp;field=username&amp;select_single=true'),
-		'UA_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=mcp_chgposter&field=username&select_single=true', false),
 		'U_MCP_APPROVE'			=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=approve_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
 		'U_MCP_REPORT'			=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=report_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
 		'U_MCP_USER_NOTES'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&amp;mode=user_notes&amp;u=' . $post_info['user_id']),
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 892929539f..3f61f6549a 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -71,7 +71,6 @@ class mcp_warn
 
 		$template->assign_vars(array(
 			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=mcp&amp;field=username&amp;select_single=true'),
-			'UA_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=mcp&field=username&select_single=true', false),
 			'U_POST_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&amp;mode=warn_user'),
 		));
 
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 44b5498ca7..6e93f64acb 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -678,7 +678,6 @@ class ucp_groups
 							'GROUP_HIDDEN'		=> $type_hidden,
 
 							'U_SWATCH'			=> append_sid("{$phpbb_root_path}adm/swatch.$phpEx", 'form=ucp&amp;name=group_colour'),
-							'UA_SWATCH'			=> append_sid("{$phpbb_root_path}adm/swatch.$phpEx", 'form=ucp&name=group_colour', false),
 							'S_UCP_ACTION'		=> $this->u_action . "&amp;action=$action&amp;g=$group_id",
 							'L_AVATAR_EXPLAIN'	=> sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)))
 						);
@@ -790,8 +789,7 @@ class ucp_groups
 
 							'U_ACTION'			=> $this->u_action . "&amp;g=$group_id",
 							'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=ucp&amp;field=usernames'),
-							'UA_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=usernames', false))
-						);
+						));
 
 					break;
 
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index 426b9a9c5b..b383d3e36d 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -95,7 +95,7 @@ class ucp_pm
 				$template->assign_vars(array(
 					'MESSAGE'			=> $l_new_message,
 					'S_NOT_LOGGED_IN'	=> ($user->data['user_id'] == ANONYMOUS) ? true : false,
-					'CLICK_TO_VIEW'		=> sprintf($user->lang['CLICK_VIEW_PRIVMSG'], '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox') . '" onclick="jump_to_inbox(); return false;">', '</a>'),
+					'CLICK_TO_VIEW'		=> sprintf($user->lang['CLICK_VIEW_PRIVMSG'], '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox') . '" onclick="jump_to_inbox(this.href); return false;">', '</a>'),
 					'U_INBOX'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),
 					'UA_INBOX'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox', false))
 				);
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index ba73f3dc3c..fe48e4c0ef 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -105,8 +105,7 @@ function compose_pm($id, $mode, $action)
 			'S_ALLOW_MASS_PM'	=> ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? true : false,
 			'S_GROUP_OPTIONS'	=> ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '',
 			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=searchuser&amp;form=postform&amp;field=username_list&amp;select_single=$select_single"),
-			'UA_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=searchuser&form=postform&field=username_list&select_single=$select_single", false))
-		);
+		));
 	}
 
 	$sql = '';
@@ -969,9 +968,8 @@ function compose_pm($id, $mode, $action)
 
 		'S_CLOSE_PROGRESS_WINDOW'	=> isset($_POST['add_file']),
 		'U_PROGRESS_BAR'			=> append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&amp;mode=popup'),
-		'UA_PROGRESS_BAR'			=> append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&mode=popup', false),
-		)
-	);
+		'UA_PROGRESS_BAR'			=> addslashes(append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&amp;mode=popup')),
+	));
 
 	// Build custom bbcodes array
 	display_custom_bbcodes();
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index b4f2cbeb65..e4d067115d 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -443,8 +443,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		'DEFAULT_ACTION'		=> ($config['full_folder_action'] == 1) ? $user->lang['DELETE_OLDEST_MESSAGES'] : $user->lang['HOLD_NEW_MESSAGES'],
 
 		'U_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=ucp&amp;field=rule_string&amp;select_single=true'),
-		'UA_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=rule_string&select_single=true', false))
-	);
+	));
 
 	$rule_lang = $action_lang = $check_lang = array();
 
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index 49ba7329be..aa2dcb15b7 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -231,7 +231,6 @@ class ucp_zebra
 			'L_TITLE'			=> $user->lang['UCP_ZEBRA_' . $l_mode],
 
 			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=ucp&amp;field=add'),
-			'UA_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=add', false),
 
 			'S_USERNAME_OPTIONS'	=> $s_username_options,
 			'S_HIDDEN_FIELDS'		=> $s_hidden_fields,
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index cea0afc9a8..417ba5e100 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -364,6 +364,11 @@ switch ($mode)
 		// Send vars to the template
 		$template->assign_vars(array(
 			'IM_CONTACT'	=> $row[$sql_field],
+			'A_IM_CONTACT'	=> addslashes($row[$sql_field]),
+
+			'U_AIM_CONTACT'	=> ($action == 'aim') ? 'aim:addbuddy?screenname=' . urlencode($row[$sql_field]) : '',
+			'U_AIM_MESSAGE'	=> ($action == 'aim') ? 'aim:goim?screenname=' . urlencode($row[$sql_field]) . '&amp;message=' . urlencode($config['sitename']) : '',
+
 			'USERNAME'		=> $row['username'],
 			'CONTACT_NAME'	=> $row[$sql_field],
 			'SITENAME'		=> $config['sitename'],
@@ -897,7 +902,11 @@ switch ($mode)
 
 		$form			= request_var('form', '');
 		$field			= request_var('field', '');
-		$select_single 	= request_var('select_single', false);	
+		$select_single 	= request_var('select_single', false);
+
+		// We validate form and field here, only id/class allowed
+		$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
+		$field = (!preg_match('/^[a-z0-9_-]+$/i', $field)) ? '' : $field;
 
 		if ($mode == 'searchuser' && ($config['load_search'] || $auth->acl_get('a_')))
 		{
@@ -1518,6 +1527,8 @@ function show_profile($data)
 		'USER_COLOR'		=> get_username_string('colour', $user_id, $username, $data['user_colour']),
 		'U_VIEW_PROFILE'	=> get_username_string('profile', $user_id, $username, $data['user_colour']),
 
+		'A_USERNAME'		=> addslashes(get_username_string('username', $user_id, $username, $data['user_colour'])),
+
 		'ONLINE_IMG'		=> (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
 		'S_ONLINE'			=> ($config['load_onlinetrack'] && $online) ? true : false,
 		'RANK_IMG'			=> $rank_img,
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 657e1d0082..2204b872f2 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1289,7 +1289,7 @@ $template->assign_vars(array(
 	'U_VIEW_FORUM'			=> append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id"),
 	'U_VIEW_TOPIC'			=> ($mode != 'post') ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id") : '',
 	'U_PROGRESS_BAR'		=> append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&amp;mode=popup"),
-	'UA_PROGRESS_BAR'		=> append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&mode=popup", false),
+	'UA_PROGRESS_BAR'		=> addslashes(append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&amp;mode=popup")),
 
 	'S_PRIVMSGS'				=> false,
 	'S_CLOSE_PROGRESS_WINDOW'	=> (isset($_POST['add_file'])) ? true : false,
diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html
index 9e68274f0b..f48f49efb4 100644
--- a/phpBB/styles/prosilver/template/attachment.html
+++ b/phpBB/styles/prosilver/template/attachment.html
@@ -93,7 +93,7 @@
 			</object>
 
 			<script type="text/javascript">
-			<!--
+			// <![CDATA[
 				if (document.rmstream_{_file.ATTACH_ID}.GetClipWidth)
 				{
 					while (!document.rmstream_{_file.ATTACH_ID}.GetClipWidth())
@@ -107,13 +107,13 @@
 					document.rmstream_{_file.ATTACH_ID}.height = height;
 					document.ctrls_{_file.ATTACH_ID}.width = width;
 				}
-			//-->
+			// ]]>
 			</script>
 		<!-- ENDIF -->
 
 		<!-- IF _file.S_WM_FILE or _file.S_RM_FILE or _file.S_FLASH_FILE or _file.S_QUICKTIME_FILE -->
 			<p>
-			<!-- IF _file.S_QUICKTIME_FILE --><a href="javascript:play_qt_file(document.qtstream_{_file.ATTACH_ID});">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF -->
+			<!-- IF _file.S_QUICKTIME_FILE --><a href="#" onclick="play_qt_file(document.qtstream_{_file.ATTACH_ID}); return false;">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF -->
 			<a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</p>
 		<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index dd6c9b2aa1..6694dfb61b 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -5,9 +5,14 @@
 /**
 * Window popup
 */
-function popup(url, width, height)
+function popup(url, width, height, name)
 {
-	window.open(url.replace(/&amp;/g, '&'), '_popup', 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
+	if (!name)
+	{
+		name = '_popup';
+	}
+
+	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
 	return false;
 }
 
diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html
index 6643851c63..3bfc7b41d1 100644
--- a/phpBB/styles/prosilver/template/mcp_ban.html
+++ b/phpBB/styles/prosilver/template/mcp_ban.html
@@ -1,24 +1,24 @@
 <!-- INCLUDE mcp_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 
 	var ban_length = new Array();
 		ban_length[-1] = '';
 	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}";
+		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
 	<!-- END ban_length -->
 
 	var ban_reason = new Array();
 		ban_reason[-1] = '';
 	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}";
+		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
 	<!-- END ban_reason -->
 
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = '';
 	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
+		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
 	<!-- END ban_give_reason -->
 
 	function display_details(option)
@@ -28,7 +28,7 @@
 		document.getElementById('unbanlength').textContent = ban_length[option];
 	}
 
-//-->
+// ]]>
 </script>
 
 <form id="mcp_ban" method="post" action="{U_ACTION}">
@@ -45,7 +45,7 @@
 	<dl>
 		<dt><label for="ban">{L_BAN_CELL}:</label></dt>
 		<dd><label for="ban"><textarea name="ban" id="ban" class="inputbox" cols="40" rows="3">{USERNAMES}</textarea></label></dd>
-		<!-- IF S_USERNAME_BAN --><dd><strong><a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a></strong></dd><!-- ENDIF -->
+		<!-- IF S_USERNAME_BAN --><dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd><!-- ENDIF -->
 	</dl>
 	<dl>
 		<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html
index 19b143c521..b54115f7e8 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_front.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_front.html
@@ -11,7 +11,7 @@
 	<dl>
 		<dt><label for="username">{L_SELECT_USER}:</label></dt>
 		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a></strong></dd>
+		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 65798a89a8..7ccec8f7e8 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -118,7 +118,7 @@
 					<input class="inputbox autowidth" type="text" name="username" value="" />
 					<input type="submit" class="button2" name="action[chgposter]" value="{L_CONFIRM}" />
 					<br />
-					<span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span>
+					<span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span>
 				</dd>
 			</dl>
 			</fieldset>
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index b979376dc9..acbe140ebf 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -3,9 +3,9 @@
 <h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2>
 
 <script type="text/javascript">
-<!--
-
+// <![CDATA[
 var panels = new Array('display-panel', 'split-panel', 'merge-panel');
+
 <!-- IF S_MERGE_VIEW -->
 	var show_panel = 'merge-panel';
 <!-- ELSEIF S_SPLIT_VIEW -->
@@ -16,7 +16,7 @@ var panels = new Array('display-panel', 'split-panel', 'merge-panel');
 
 onload_functions.push('subPanels()');
 
-//-->
+// ]]>
 </script>
 
 <div id="minitabs">
@@ -96,7 +96,7 @@ onload_functions.push('subPanels()');
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<h3 id="review">
-		<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; } else if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
+		<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
 		{L_TOPIC_REVIEW}: {TOPIC_TITLE}
 	</h3>
 
diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html
index 77eb1d013d..d6b81c685d 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_front.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_front.html
@@ -13,7 +13,7 @@
 	<dl>
 		<dt><label for="username">{L_SELECT_USER}:</label></dt>
 		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a></strong></dd>
+		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index a76ca2229d..6846432b2e 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -120,7 +120,7 @@
 			<!-- ENDIF -->
 
 	<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF -->{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --><br />[&nbsp;<a href="#" onclick="insert_single('{memberrow.USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
+		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF -->{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --><br />[&nbsp;<a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
 		<td class="posts"><!-- IF memberrow.POSTS --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
 		<td class="info"><!-- IF memberrow.U_WWW or memberrow.LOCATION --><!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}: {memberrow.U_WWW}">{memberrow.U_WWW}</a></div><!-- ENDIF --><!-- IF memberrow.LOCATION --><div>{memberrow.LOCATION}</div><!-- ENDIF --><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
 		<td>{memberrow.JOINED}</td>
diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html
index cb5bf8d4ea..0d1babd1b7 100644
--- a/phpBB/styles/prosilver/template/memberlist_email.html
+++ b/phpBB/styles/prosilver/template/memberlist_email.html
@@ -1,36 +1,8 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript">
-<!--
-function checkForm(formObj)
-{
-	var formErrors = false;
-
-	if (formObj.message.value.length < 2 )
-	{
-		formErrors = "{L_EMPTY_MESSAGE_EMAIL}";
-	}
-	else if (formObj.subject.value.length < 2)
-	{
-		formErrors = "{L_EMPTY_SUBJECT_EMAIL}";
-	}
-
-	if (formErrors)
-	{
-		alert(formErrors);
-		return false;
-	}
-	else
-	{
-		return true;
-	}
-}
-//-->
-</script>
-
 <h2 class="titlespace">{L_SEND_EMAIL_USER} {USERNAME}</h2>
 
-<form method="post" action="{S_POST_ACTION}" id="post" onsubmit="return checkForm(this)">
+<form method="post" action="{S_POST_ACTION}" id="post">
 
 <div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index 43a31e668d..667f68f2c0 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -37,8 +37,8 @@
 	<!-- IF S_SEND_AIM -->
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
-			<dd><a href="aim:addbuddy?screenname={IM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd>
-			<dd><a href="aim:goim?screenname={IM_CONTACT}&amp;message={SITENAME}">{L_IM_SEND_MESSAGE}</a></dd>
+			<dd><a href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd>
+			<dd><a href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a></dd>
 			<dd><a href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
 		</dl>
 	<!-- ENDIF -->
@@ -46,9 +46,9 @@
 	<!-- IF S_SEND_MSNM -->
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
-			<dd><object classid="clsid:FB7199AB-79BF-11d2-8D94-0000F875C541" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd>
-			<dd><a href="#" onclick="objMessengerApp.LaunchAddContactUI('{IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd>
-			<dd><a href="#" onclick="objMessengerApp.LaunchIMUI('{IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a></dd>
+			<dd><object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd>
+			<dd><a href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd>
+			<dd><a href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a></dd>
 		</dl>
 	<!-- ENDIF -->
 
@@ -84,5 +84,74 @@
 
 </form>
 
+<script type="text/javascript">
+// <![CDATA[
+
+	/** The following will not work with Windows Vista **/
+
+	var app = document.getElementById('objMessengerApp');
+
+	/**
+	* Check whether the browser supports this and whether MSNM is connected
+	*/
+	function msn_supported()
+	{
+		// Does the browser support the MSNM object?
+		if (app.MyStatus)
+		{
+			// Is MSNM connected?
+			if (app.MyStatus == 1)
+			{
+				alert('{LA_IM_MSNM_CONNECT}');
+				return false;
+			}
+		}
+		else
+		{
+			alert('{LA_IM_MSNM_BROWSER}');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	* Add to your contact list
+	*/
+	function add_contact(address) 
+	{
+		if (msn_supported()) 
+		{
+			// Could return an error while MSNM is connecting, don't want that
+			try
+			{
+				app.AddContact(0, address);
+			}
+			catch (e)
+			{
+				return;
+			}
+	}
+}
+
+/**
+* Write IM to contact
+*/
+function im_contact(address)
+{
+	if (msn_supported())
+	{
+		// Could return an error while MSNM is connecting, don't want that
+		try
+		{
+			app.InstantMessage(address);
+		}
+		catch (e)
+		{
+			return;
+		}
+	}
+}
+// ]]>
+</script>
 
 <!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 1061d30628..72f96e7988 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -1,7 +1,7 @@
 <!-- IF S_IN_SEARCH_POPUP -->
 <!-- You should retain this javascript in your own template! -->
 <script type="text/javascript">
-<!--
+// <![CDATA[
 function insert_user(user)
 {
 	opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user;
@@ -35,7 +35,7 @@ function insert_single(user)
 	opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = user;
 	self.close();
 }
-//-->
+// ]]>
 </script>
 <script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
 <!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index dfcf8a7f38..53f516b193 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -60,11 +60,11 @@
 		<!-- IF U_WWW --><dt>{L_WEBSITE}:</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}">{U_WWW}</a></dd><!-- ENDIF -->
 		<!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd>
 		<!-- ENDIF -->
-		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}:</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup('{U_MSN}', 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}:</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup('{U_YIM}', 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup('{U_AIM}', 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}:</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup('{U_ICQ}', 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}:</dt> <dd><a href="{U_JABBER}" onclick="popup('{U_JABBER}', 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}:</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
+		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}:</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
+		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}:</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
+		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
+		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}:</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF -->
+		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}:</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}:</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
 		<!-- IF S_PROFILE_FIELD_1 -->
 			<!-- NOTE: Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
 			<dt>{postrow.PROFILE_FIELD1_NAME}:</dt> <dd>{postrow.PROFILE_FIELD1_VALUE}</dd>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 202b50fe5d..754f92ab0c 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -27,10 +27,10 @@
 
 <script type="text/javascript">
 // <![CDATA[
-	var jump_page = '{L_JUMP_PAGE}:';
+	var jump_page = '{LA_JUMP_PAGE}:';
 	var on_page = '{ON_PAGE}';
 	var per_page = '{PER_PAGE}';
-	var base_url = '{BASE_URL}';
+	var base_url = '{A_BASE_URL}';
 	var style_cookie = 'phpBBstyle';
 	var onload_functions = new Array();
 	var onunload_functions = new Array();
@@ -38,18 +38,16 @@
 	<!-- IF S_USER_PM_POPUP -->
 		if ({S_NEW_PM})
 		{
-			window.open('{UA_POPUP_PM}', '_phpbbprivmsg', 'height=225,resizable=yes,width=400');
+			popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg');
 		}
 	<!-- ENDIF -->
 
 	/**
 	* Find a member
 	*/
-	function find_username()
+	function find_username(url)
 	{
-		<!-- IF UA_FIND_USERNAME -->
-		window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740');
-		<!-- ENDIF -->
+		popup(url, 760, 570, '_usersearch');
 		return false;
 	}
 
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 768f2356f7..c235e49d04 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -1,6 +1,6 @@
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	var form_name = 'postform';
 	var text_name = <!-- IF $SIG_EDIT -->'signature'<!-- ELSE -->'message'<!-- ENDIF -->;
 	var load_draft = false;
@@ -38,7 +38,7 @@
 		{
 			if (!upload)
 			{
-				alert('{L_EMPTY_MESSAGE}');
+				alert('{LA_EMPTY_MESSAGE}');
 				return false;
 			}
 			upload = false;
@@ -54,7 +54,7 @@
 	var show_panel = 'options-panel';
 
 
-//-->
+// ]]>
 </script>
 <script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
 
@@ -64,7 +64,7 @@
 		<dt><label>{L_FONT_COLOR}:</label></dt>
 		<dd>
 		<script type="text/javascript">
-		<!--
+		// <![CDATA[
 			function change_palette()
 			{
 				dE('colour_palette');
@@ -81,7 +81,7 @@
 			}
 
 			colorPalette('h', 15, 10);
-		//-->
+		// ]]>
 		</script>
 		</dd>
 	</dl>
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 0a5285ff44..6c0f325a13 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -31,13 +31,13 @@
 			<!-- ENDIF -->
 			<dl class="pmlist">
 				<dt><textarea id="username_list" name="username_list" class="inputbox"></textarea></dt>
-				<dd><span><a href="{U_FIND_USERNAME}" onclick="find_username(); return false">{L_FIND_USERNAME}</a></span></dd>
+				<dd><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span></dd>
 				<dd><input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
 				<dd><input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" /></dd>
 			</dl>
 		<!-- ELSE -->
 			<dl>
-				<dt><label for="username_list">{L_TO}:</label><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(); return false">{L_FIND_USERNAME}</a></span></dt>
+				<dt><label for="username_list">{L_TO}:</label><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span></dt>
 				<!-- IF .to_recipient -->
 					<dd>
 						<!-- BEGIN to_recipient -->
@@ -114,7 +114,7 @@
 			<!-- END smiley -->
 		<!-- ENDIF -->
 		<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED-->
-			<br /><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300'); return false;">{L_MORE_SMILIES}</a>
+			<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>
 		<!-- ENDIF -->
 
 		<!-- IF BBCODE_STATUS -->
diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html
index b5c5e7dcfd..f858c3818b 100644
--- a/phpBB/styles/prosilver/template/posting_layout.html
+++ b/phpBB/styles/prosilver/template/posting_layout.html
@@ -81,9 +81,9 @@
 </form>
 <!-- IF not S_PRIVMSGS -->
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	subPanels(show_panel);
--->
+// ]]>
 </script>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html
index 12f5cd3c77..dd0963baf5 100644
--- a/phpBB/styles/prosilver/template/posting_smilies.html
+++ b/phpBB/styles/prosilver/template/posting_smilies.html
@@ -1,10 +1,10 @@
 <!-- INCLUDE simple_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	var form_name = 'postform';
 	var text_name = 'message';
-//-->
+// ]]>
 </script>
 <script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
 
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
index f3aa5d94d0..ad51e4f264 100644
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -1,6 +1,6 @@
 
 <h3 id="review">
-	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; } else if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
+	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
 	{L_TOPIC_REVIEW}: {TOPIC_TITLE}
 </h3>
 
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index 84b9aae8f9..2af1a0317a 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -12,19 +12,6 @@
 	<!-- IF S_EDIT -->
 		<h3>{L_GROUP_DETAILS}</h3>
 	
-		<script type="text/javascript">
-		<!--
-		/**
-		* Colour swatch
-		*/
-		function swatch()
-		{
-			window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
-			return false;
-		}
-		//-->
-		</script>
-
 		<!-- IF S_ERROR -->
 		<div class="errorbox">
 			<h3>{L_WARNING}</h3>
@@ -68,7 +55,7 @@
 	<fieldset>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="7" maxlength="7" class="inputbox narrow" /> <span style="background-color: {GROUP_COLOUR};">&nbsp;&nbsp;&nbsp;</span> [ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</dd>
+		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="7" maxlength="7" class="inputbox narrow" /> <span style="background-color: {GROUP_COLOUR};">&nbsp;&nbsp;&nbsp;</span> [ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</dd>
 	</dl>
 	<dl>
 		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
@@ -191,7 +178,7 @@
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea name="usernames" id="usernames" rows="3" cols="30" class="inputbox"></textarea></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a></strong></dd>
+		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index 3a32beac95..cadb44e914 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -1,6 +1,6 @@
 
 <h3 id="review">
-	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; } else if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
+	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
 	{L_MESSAGE_HISTORY}: {HISTORY_TITLE}
 </h3>
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html
index 02ffe3cee4..f383b08768 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_options.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_options.html
@@ -49,7 +49,7 @@
 						<!-- IF S_TEXT_CONDITION -->
 							<input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox medium" maxlength="250" />
 						<!-- ELSEIF S_USER_CONDITION -->
-							<input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox tiny" />&nbsp;<span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span>
+							<input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox tiny" />&nbsp;<span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span>
 						<!-- ELSEIF S_GROUP_CONDITION -->
 							<input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF -->
 						<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_popup.html b/phpBB/styles/prosilver/template/ucp_pm_popup.html
index 44012a9b65..325362dc4d 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_popup.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_popup.html
@@ -1,16 +1,16 @@
 <!-- INCLUDE simple_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 /**
 * Jump to inbox
 */
-function jump_to_inbox()
+function jump_to_inbox(url)
 {
-	opener.document.location.href = "{UA_RETURN_INBOX}";
+	opener.document.location.href = url.replace(/&amp;/g, '&');
 	window.close();
 }
-//-->
+// ]]>
 </script>
 
 <div class="panel">
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index a760328ee8..4c244782d8 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -81,7 +81,7 @@
 			<!-- IF U_ICQ --><li class="icq-icon"><a href="{U_ICQ}" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
 			<!-- IF U_YIM --><li class="yahoo-icon"><a href="{U_YIM}" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
 			<!-- IF U_AIM --><li class="aim-icon"><a href="{U_AIM}" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_JABBER --><li class="jabber-icon"><a href="{U_JABBER}" onclick="popup('{U_JABBER}', 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
+			<!-- IF U_JABBER --><li class="jabber-icon"><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
 			</ul>
 		</dd>
 		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index 6ffe6f69c3..fe277cd373 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -87,7 +87,7 @@
 	<dl>
 		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd>
-			<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{A_DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">
+			<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
 				{S_DATEFORMAT_OPTIONS}
 			</select>
 		</dd>
@@ -106,8 +106,9 @@
 </form>
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	var date_format = '{A_DATE_FORMAT}';
+	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
 
 	function customDates()
 	{
@@ -137,7 +138,7 @@
 	}
 
 	customDates();
-//-->
+// ]]>
 </script>
 
 <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index 3b9d88d550..723aeff517 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	/**
 	* Change language
 	*/
@@ -10,7 +10,7 @@
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit.click();
 	}
-//-->
+// ]]>
 </script>
 
 <form method="post" action="{S_UCP_ACTION}" id="register">
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html
index e580e3c1c9..b1d448fd11 100644
--- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html
+++ b/phpBB/styles/prosilver/template/ucp_zebra_foes.html
@@ -24,7 +24,7 @@
 	<dl>
 		<dt><label for="add">{L_ADD_FOES}:</label><br /><span>{L_ADD_FOES_EXPLAIN}</span></dt>
 		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a></strong></dd>
+		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html
index ffd60e3bf1..fd5bcba07c 100644
--- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html
+++ b/phpBB/styles/prosilver/template/ucp_zebra_friends.html
@@ -24,7 +24,7 @@
 	<dl>
 		<dt><label for="add">{L_ADD_FRIENDS}:</label><br /><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt>
 		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a></strong></dd>
+		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index f5cc564a8e..d91c05d3f2 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -47,7 +47,7 @@
 		<div class="search-box">
 			<form method="post" id="forum-search" action="{S_SEARCHBOX_ACTION}">	
 			<fieldset>
-				<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{L_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{L_SEARCH_FORUM}';" />
+				<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{LA_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_FORUM}';" />
 				<input class="button2" type="submit" value="{L_SEARCH}" />	
 				<input type="hidden" value="{FORUM_ID}" name="fid[]" />
 			</fieldset>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 08fd7deed0..814546f46e 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -40,7 +40,7 @@
 		<div class="search-box">
 			<form method="post" id="topic-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
-				<input class="inputbox search tiny"  type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{L_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{L_SEARCH_TOPIC}';" />
+				<input class="inputbox search tiny"  type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" />
 				<input class="button2" type="submit" value="{L_SEARCH}" />
 				<input type="hidden" value="{TOPIC_ID}" name="t" />
 				<input type="hidden" value="msgonly" name="sf" />
@@ -205,7 +205,7 @@
 					<!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup('{postrow.U_JABBER}', 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
+					<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
 				</ul>
 			</dd>
 		<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/attachment.html b/phpBB/styles/subsilver2/template/attachment.html
index b8071bec06..c3352be251 100644
--- a/phpBB/styles/subsilver2/template/attachment.html
+++ b/phpBB/styles/subsilver2/template/attachment.html
@@ -90,7 +90,7 @@
 			</object>
 
 			<script type="text/javascript">
-			<!--
+			// <![CDATA[
 				if (document.rmstream_{_file.ATTACH_ID}.GetClipWidth)
 				{
 					while (!document.rmstream_{_file.ATTACH_ID}.GetClipWidth())
@@ -104,13 +104,13 @@
 					document.rmstream_{_file.ATTACH_ID}.height = height;
 					document.ctrls_{_file.ATTACH_ID}.width = width;
 				}
-			//-->
+			// ]]>
 			</script>
 		<!-- ENDIF -->
 
 		<!-- IF _file.S_WM_FILE or _file.S_RM_FILE or _file.S_FLASH_FILE or _file.S_QUICKTIME_FILE -->
 			<br />
-			<!-- IF _file.S_QUICKTIME_FILE --><a href="javascript:play_qt_file(document.qtstream_{_file.ATTACH_ID});">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF -->
+			<!-- IF _file.S_QUICKTIME_FILE --><a href="#" onclick="play_qt_file(document.qtstream_{_file.ATTACH_ID}); return false;">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF -->
 			<span class="gensmall"><a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
 		<!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/mcp_ban.html b/phpBB/styles/subsilver2/template/mcp_ban.html
index 389f71c6fc..442b6ee4db 100644
--- a/phpBB/styles/subsilver2/template/mcp_ban.html
+++ b/phpBB/styles/subsilver2/template/mcp_ban.html
@@ -1,24 +1,24 @@
 <!-- INCLUDE mcp_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 
 	var ban_length = new Array();
 		ban_length[-1] = '';
 	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}";
+		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
 	<!-- END ban_length -->
 
 	var ban_reason = new Array();
 		ban_reason[-1] = '';
 	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}";
+		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
 	<!-- END ban_reason -->
 
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = '';
 	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
+		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
 	<!-- END ban_give_reason -->
 
 	function display_details(option)
@@ -28,7 +28,7 @@
 		document.getElementById('mcp_ban').unbanlength.value = ban_length[option];
 	}
 
-//-->
+// ]]>
 </script>
 
 <form id="mcp_ban" method="post" action="{U_ACTION}">
@@ -44,7 +44,7 @@
 	<td class="row1" width="45%" valign="top"><b>{L_BAN_CELL}:</b></td>
 	<td class="row2">
 		<textarea name="ban" id="ban" cols="40" rows="3" class="post">{USERNAMES}</textarea>
-		<!-- IF S_USERNAME_BAN --><br />[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]<!-- ENDIF -->
+		<!-- IF S_USERNAME_BAN --><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- ENDIF -->
 	</td>
 </tr>
 <tr>
diff --git a/phpBB/styles/subsilver2/template/mcp_header.html b/phpBB/styles/subsilver2/template/mcp_header.html
index 7db7c31d5b..f107732234 100644
--- a/phpBB/styles/subsilver2/template/mcp_header.html
+++ b/phpBB/styles/subsilver2/template/mcp_header.html
@@ -37,7 +37,7 @@
 					<!-- END l_block2 -->
 					</ul>
 				<!-- ELSE -->
-					<td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href='{l_block1.U_TITLE}'"><a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a>
+					<td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href=this.firstChild.href;"><a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a>
 				<!-- ENDIF -->
 					</td>
 				</tr>
diff --git a/phpBB/styles/subsilver2/template/mcp_jumpbox.html b/phpBB/styles/subsilver2/template/mcp_jumpbox.html
index 43b20d236d..14856596f0 100644
--- a/phpBB/styles/subsilver2/template/mcp_jumpbox.html
+++ b/phpBB/styles/subsilver2/template/mcp_jumpbox.html
@@ -11,8 +11,8 @@
 <!-- ENDIF -->
 
 <!-- BEGIN options -->
-	<option value="{options.VALUE}"<!-- IF options.VALUE eq -1 --> class="greyed"<!-- ENDIF -->{options.SELECTED}/>{options.TEXT}</option>
+	<option value="{options.VALUE}"<!-- IF options.VALUE eq -1 --> class="disabled-option"<!-- ENDIF -->{options.SELECTED}/>{options.TEXT}</option>
 <!-- BEGINELSE -->
 <!-- END options -->
-</select>&nbsp;<input type="hidden" name="current_f" value="{S_CURRENT_FORUM}" /><input name="jumpbox" class="btnlite" type="submit" value="{L_GO}" onClick="if(document.jumpbox.f.value == -1){return false;}" />
+</select>&nbsp;<input type="hidden" name="current_f" value="{S_CURRENT_FORUM}" /><input name="jumpbox" class="btnlite" type="submit" value="{L_GO}" onclick="if(document.jumpbox.f.value == -1){return false;}" />
 </form>
diff --git a/phpBB/styles/subsilver2/template/mcp_notes_front.html b/phpBB/styles/subsilver2/template/mcp_notes_front.html
index 663da412f7..a805be6749 100644
--- a/phpBB/styles/subsilver2/template/mcp_notes_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_notes_front.html
@@ -7,7 +7,7 @@
 	<th colspan="2"align="center">{L_SELECT_USER}</th>
 </tr>
 <tr>
-	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span></td>
+	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>
 	<td class="row2"><input type="text" class="post" name="username" size="20" /></td>
 </tr>
 <tr>
diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html
index 2c1d464d9a..ad3e0df07c 100644
--- a/phpBB/styles/subsilver2/template/mcp_post.html
+++ b/phpBB/styles/subsilver2/template/mcp_post.html
@@ -126,7 +126,7 @@
 		<!-- IF S_CAN_CHGPOSTER -->
 			<tr>
 				<td class="row1" valign="top"><b class="gen">{L_CHANGE_POSTER}</b></td>
-				<td class="row2"><form method="post" name="mcp_chgposter" action="{U_POST_ACTION}"><input class="post" type="text" name="username" value="" /> <input class="btnmain" type="submit" value="{L_CONFIRM}" name="action[chgposter]" /><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span><!-- IF S_USER_SELECT --><br /><select name="u">{S_USER_SELECT}</select> <input type="submit" class="btnmain" name="action[chgposter_ip]" value="{L_CONFIRM}" /><!-- ENDIF --></form></td>
+				<td class="row2"><form method="post" name="mcp_chgposter" action="{U_POST_ACTION}"><input class="post" type="text" name="username" value="" /> <input class="btnmain" type="submit" value="{L_CONFIRM}" name="action[chgposter]" /><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span><!-- IF S_USER_SELECT --><br /><select name="u">{S_USER_SELECT}</select> <input type="submit" class="btnmain" name="action[chgposter_ip]" value="{L_CONFIRM}" /><!-- ENDIF --></form></td>
 			</tr>
 		<!-- ENDIF -->
 		<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST -->
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html
index b8322fe669..fc127bc25c 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_front.html
@@ -7,7 +7,7 @@
 	<th colspan="2"align="center">{L_SELECT_USER}</th>
 </tr>
 <tr>
-	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span></td>
+	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>
 	<td class="row2"><input type="text" class="post" name="username" size="20" /></td>
 </tr>
 <tr>
diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
index cbc25a147f..836d0ce5df 100644
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ b/phpBB/styles/subsilver2/template/memberlist_body.html
@@ -60,7 +60,7 @@
 	<!-- IF memberrow.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE -->	<tr class="row1"><!-- ENDIF -->
 
 		<td class="gen" align="center">&nbsp;{memberrow.ROW_NUMBER}&nbsp;</td>
-		<td class="genmed" align="{S_CONTENT_FLOW_BEGIN}">{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --> [&nbsp;<a href="#" onclick="insert_single('{memberrow.USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
+		<td class="genmed" align="{S_CONTENT_FLOW_BEGIN}">{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --> [&nbsp;<a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
 		<td class="genmed" align="center" nowrap="nowrap">&nbsp;{memberrow.JOINED}&nbsp;</td>
 		<td class="gen" align="center">{memberrow.POSTS}</td>
 		<td class="gen" align="center"><!-- IF memberrow.RANK_IMG -->{memberrow.RANK_IMG}<!-- ELSE -->{memberrow.RANK_TITLE}<!-- ENDIF --></td>
diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html
index 9e74ec5335..ba6c194fc9 100644
--- a/phpBB/styles/subsilver2/template/memberlist_email.html
+++ b/phpBB/styles/subsilver2/template/memberlist_email.html
@@ -1,35 +1,8 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript">
-<!--
-
-function checkForm(formObj)
-{
-	return;
-
-	formErrors = false;
-
-	if (formObj.message.value.length < 2)
-	{
-		formErrors = "{LA_EMPTY_MESSAGE_EMAIL}";
-	}
-	else if ( formObj.subject.value.length < 2)
-	{
-		formErrors = "{LA_EMPTY_SUBJECT_EMAIL}";
-	}
-
-	if (formErrors) 
-	{
-		alert(formErrors);
-		return false;
-	}
-}
-//-->
-</script>
-
 <div id="pagecontent">
 
-	<form action="{S_POST_ACTION}" method="post" name="postform" onsubmit="return checkForm(this)">
+	<form action="{S_POST_ACTION}" method="post" name="postform">
 	
 	<table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index e3c13efd58..05c53808c6 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -19,7 +19,7 @@
 
 	<!-- IF S_SEND_AIM -->
 		<tr>
-			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="aim:addbuddy?screenname={IM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="aim:goim?screenname={IM_CONTACT}&message={SITENAME}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a> </td>
+			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a> </td>
 		</tr>
 		<tr>
 			<td class="cat" colspan="2" align="center">&nbsp;</td>
@@ -31,60 +31,59 @@
 			<td class="row1" colspan="2" align="center">
 				<object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object>
 				<script type="text/javascript">
-				<!--					
+				// <![CDATA[
 					var app = document.getElementById('objMessengerApp');
 					
 					/**
-					 * Check whether the browser supports this and whether MSNM is connected
-					 */
+					* Check whether the browser supports this and whether MSNM is connected
+					*/
 					function msn_supported()
 					{
-						//Does the browser support the MSNM object?
+						// Does the browser support the MSNM object?
 						if (app.MyStatus) 
 						{
-							//Is MSNM connected?
+							// Is MSNM connected?
 							if (app.MyStatus == 1)
 							{
-									alert('{L_IM_MSNM_CONNECT}');
-									return false;
+								alert('{LA_IM_MSNM_CONNECT}');
+								return false;
 							}
 						}
-						else 
-						{	
-							alert('{L_IM_MSNM_BROWSER}');
+						else
+						{
+							alert('{LA_IM_MSNM_BROWSER}');
 							return false;
-						}				
+						}
 						return true;
 					}
-					
+
 					/**
-					 * Add to your contact list
-					 */					
-					function add_contact(address) 
+					* Add to your contact list
+					*/
+					function add_contact(address)
 					{
-						if (msn_supported()) 
+						if (msn_supported())
 						{
 							// Could return an error while MSNM is connecting, don't want that
 							try
 							{
 								app.AddContact(0, address);
-							} 
+							}
 							catch (e)
 							{
 								return;
 							}
 						}
-							
 					}
-					
+
 					/**
-					 * Write IM to contact
-					 */							
-					function im_contact(address) 
+					* Write IM to contact
+					*/
+					function im_contact(address)
 					{
-						if (msn_supported()) 
+						if (msn_supported())
 						{
-							// Could return an error while MSNM is connecting, don't want that						
+							// Could return an error while MSNM is connecting, don't want that
 							try
 							{
 								app.InstantMessage(address);
@@ -93,12 +92,12 @@
 							{
 								return;
 							}
-						}	
+						}
 					}
-				//-->
+				// ]]>
 				</script>
 	
-				<a class="gen" href="#" onclick="add_contact('{IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="#" onclick="im_contact('{IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a>
+				<a class="gen" href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a>
 			</td>
 		</tr>
 		<tr>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index 4d943e348d..c6e08dc815 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -2,7 +2,7 @@
 
 <!-- IF S_IN_SEARCH_POPUP -->
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 		function insert_user(user)
 		{
 			opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user;
@@ -64,7 +64,7 @@
 				}
 			}
 		}
-	//-->
+	// ]]>
 	</script>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 98536a5265..cb7346dacf 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -108,23 +108,23 @@
 			<!-- ENDIF -->
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_MSNM}: </td>
-				<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup('{U_MSN}', 550, 320); return false">{MSN_IMG}</a><!-- ELSEIF USER_MSN -->{USER_MSN}<!-- ENDIF --></td>
+				<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false">{MSN_IMG}</a><!-- ELSEIF USER_MSN -->{USER_MSN}<!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_YIM}: </td>
-				<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup('{U_YIM}', 780, 550); return false">{YIM_IMG}</a><!-- ELSEIF USER_YIM -->{USER_YIM}<!-- ENDIF --></td>
+				<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false">{YIM_IMG}</a><!-- ELSEIF USER_YIM -->{USER_YIM}<!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_AIM}: </td>
-				<td><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup('{U_AIM}', 550, 320); return false">{AIM_IMG}</a><!-- ELSEIF USER_AIM -->{USER_AIM}<!-- ENDIF --></td>
+				<td><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false">{AIM_IMG}</a><!-- ELSEIF USER_AIM -->{USER_AIM}<!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_ICQ}: </td>
-				<td><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup('{U_ICQ}', 550, 320); return false">{ICQ_IMG}</a><!-- ELSEIF USER_ICQ -->{USER_ICQ}<!-- ENDIF --></td>
+				<td><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false">{ICQ_IMG}</a><!-- ELSEIF USER_ICQ -->{USER_ICQ}<!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_JABBER}: </td>
-				<td><!-- IF U_JABBER and S_JABBER_ENABLED --><a href="{U_JABBER}" onclick="popup('{U_JABBER}', 550, 320); return false">{JABBER_IMG}</a><!-- ELSEIF USER_JABBER -->{USER_JABBER_IMG}<!-- ENDIF --></td>
+				<td><!-- IF U_JABBER and S_JABBER_ENABLED --><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false">{JABBER_IMG}</a><!-- ELSEIF USER_JABBER -->{USER_JABBER_IMG}<!-- ENDIF --></td>
 			</tr>
 			</table>
 		</td>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 4cdd0c993e..3603d8a3e2 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -17,17 +17,22 @@
 <link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 <!-- IF S_USER_PM_POPUP -->
 	if ({S_NEW_PM})
 	{
-		window.open('{UA_POPUP_PM}', '_phpbbprivmsg', 'height=225,resizable=yes,width=400');
+		popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg');
 	}
 <!-- ENDIF -->
 
-function popup(url, width, height)
+function popup(url, width, height, name)
 {
-	window.open(url.replace(/&amp;/g, '&'), '_popup', 'HEIGHT=' + height + ',resizable=yes,scrollbars=yes, WIDTH=' + width);
+	if (!name)
+	{
+		name = '_popup';
+	}
+
+	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes,width=' + width);
 	return false;
 }
 
@@ -35,7 +40,7 @@ function jumpto()
 {
 	var page = prompt('{LA_JUMP_PAGE}:', '{ON_PAGE}');
 	var perpage = '{PER_PAGE}';
-	var base_url = '{BASE_URL}';
+	var base_url = '{A_BASE_URL}';
 
 	if (page !== null && !isNaN(page) && page > 0)
 	{
@@ -46,11 +51,9 @@ function jumpto()
 /**
 * Find a member
 */
-function find_username()
+function find_username(url)
 {
-	<!-- IF UA_FIND_USERNAME -->
-	window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740');
-	<!-- ENDIF -->
+	popup(url, 760, 570, '_usersearch');
 	return false;
 }
 
@@ -120,7 +123,7 @@ function marklist(id, name, state)
 	}
 <!-- ENDIF -->
 
-//-->
+// ]]>
 </script>
 </head>
 <body class="{S_CONTENT_DIRECTION}">
diff --git a/phpBB/styles/subsilver2/template/posting_attach_body.html b/phpBB/styles/subsilver2/template/posting_attach_body.html
index e9de2e7516..8c70e4c831 100644
--- a/phpBB/styles/subsilver2/template/posting_attach_body.html
+++ b/phpBB/styles/subsilver2/template/posting_attach_body.html
@@ -1,23 +1,24 @@
 <tr>
 	<th colspan="2">
 		<script type="text/javascript">
-		<!--
+		// <![CDATA[
 			/**
 			* Show upload progress bar
 			*/
 			function popup_progress_bar()
 			{
 				close_waitscreen = 0;
-				window.open('{UA_PROGRESS_BAR}', '_upload', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400');
+				// no scrollbars
+				popup('{UA_PROGRESS_BAR}', 400, 200, '_upload');
 			}
-		//-->
+		// ]]>
 		</script>
 
 		<!-- IF S_CLOSE_PROGRESS_WINDOW -->
 			<script type="text/javascript">
-			<!--
+			// <![CDATA[
 				close_waitscreen = 1;
-			//-->
+			// ]]>
 			</script>
 		<!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 744fcb4189..b94c972773 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -192,7 +192,7 @@
 
 		<!-- IF S_SHOW_SMILEY_LINK -->
 			<tr>
-				<td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300');return false;">{L_MORE_SMILIES}</a></td>
+				<td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a></td>
 			</tr>
 		<!-- ENDIF -->
 
@@ -201,11 +201,10 @@
 	</td>
 	<td class="row2" valign="top">
 		<script type="text/javascript">
-			<!--
-
+		// <![CDATA[
 			var form_name = 'postform';
 			var text_name = 'message';
-			//-->
+		// ]]>
 		</script>
 
 		<table width="100%" cellspacing="0" cellpadding="0" border="0">
@@ -215,9 +214,9 @@
 			<!-- IF S_BBCODE_ALLOWED -->
 			<td width="80" align="center" valign="top">
 				<script type="text/javascript">
-				<!--
+				// <![CDATA[
 					colorPalette('v', 7, 6)
-				//-->
+				// ]]>
 				</script>
 			</td>
 			<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index 61b5bd9da0..b57a273e25 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -1,7 +1,7 @@
 <tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
 	<td colspan="2">
 		<script type="text/javascript">
-		<!--
+		// <![CDATA[
 		
 		// Define the bbCode tags
 		var bbcode = new Array();
@@ -29,22 +29,8 @@
 				,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}'
 			<!-- END custom_tags -->
 		}
-		
-		function checkForm()
-		{
-			if (document.post.message.value.length < 2)
-			{
-				alert('{LA_EMPTY_MESSAGE}');
-				return false;
-			}
-			else
-			{
-		//		document.post.post.disabled = true;
-				return true;
-			}
-		}
-		
-		//-->
+
+		// ]]>
 		</script>
 		<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
 
diff --git a/phpBB/styles/subsilver2/template/posting_progress_bar.html b/phpBB/styles/subsilver2/template/posting_progress_bar.html
index 9a7daede6d..f9decc506b 100644
--- a/phpBB/styles/subsilver2/template/posting_progress_bar.html
+++ b/phpBB/styles/subsilver2/template/posting_progress_bar.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE simple_header.html -->
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	/**
 	* Close upload popup
 	*/
@@ -21,7 +21,7 @@
 		setTimeout("close_popup()", 1000);
 		return 0;
 	}
-//-->
+// ]]>
 </script>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="10">
@@ -37,8 +37,8 @@
 </table>
 
 <script type="text/javascript">
-<!-- 
+// <![CDATA[
 	close_popup();	
-//-->
+// ]]>
 </script>
 <!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html
index 01564c9694..a6f35bf2b7 100644
--- a/phpBB/styles/subsilver2/template/posting_smilies.html
+++ b/phpBB/styles/subsilver2/template/posting_smilies.html
@@ -1,11 +1,10 @@
 <!-- INCLUDE simple_header.html -->
 
 <script type="text/javascript">
-<!--
-
-var form_name = 'postform';
-var text_name = 'message';
-//-->
+// <![CDATA[
+	var form_name = 'postform';
+	var text_name = 'message';
+// ]]>
 </script>
 <script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
 
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index bce8546920..4a3296d153 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -2,19 +2,6 @@
 
 <!-- IF S_EDIT -->
 
-	<script type="text/javascript">
-	<!--
-	/**
-	* Colour swatch
-	*/
-	function swatch()
-	{
-		window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
-		return false;
-	}
-	//-->
-	</script>
-
 	<!-- IF S_ERROR -->
 		<div class="errorbox">
 			<h3>{L_WARNING}</h3>
@@ -62,7 +49,7 @@
 	</tr>
 	<tr>
 		<td class="row1" width="35%"><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></td>
-		<td class="row2"><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></td>
+		<td class="row2"><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</span></td>
 	</tr>
 	<tr>
 		<td class="row1" width="35%"><label for="group_rank">{L_GROUP_RANK}:</label></td>
@@ -216,7 +203,7 @@
 	</tr>
 	<tr>
 		<td class="row1"><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></td>
-		<td class="row2"><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</td>
+		<td class="row2"><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</td>
 	</tr>
 	<tr>
 		<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="addusers" value="{L_SUBMIT}" /></td>
diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html
index d4dafbb71b..d330918270 100644
--- a/phpBB/styles/subsilver2/template/ucp_header.html
+++ b/phpBB/styles/subsilver2/template/ucp_header.html
@@ -15,7 +15,7 @@
 	</tr>
 	<!-- IF not S_ALLOW_MASS_PM -->
 	<tr>
-		<td class="row1"><b class="genmed">{L_USERNAME}:</b><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</td>
+		<td class="row1"><b class="genmed">{L_USERNAME}:</b><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</td>
 	</tr>
 	
 	<tr>
@@ -27,7 +27,7 @@
 		</tr>
 		<tr>
 			<td class="row2"><textarea name="username_list" rows="5" cols="22"></textarea><br />
-				[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]
+				[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]
 			</td>
 		</tr>
 	<!-- ENDIF -->
@@ -86,7 +86,7 @@
 			<!-- END l_block2 -->
 			</ul>
 		<!-- ELSE -->
-			<td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href='{l_block1.U_TITLE}'"><a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a>
+			<td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href=this.firstChild.href;"><a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a>
 		<!-- ENDIF -->
 		</td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
index a8611684b3..14ae52be53 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
@@ -61,12 +61,11 @@
 		<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}: </b><br /><span class="gensmall">{L_EDIT_DRAFT_EXPLAIN}</span></td>
 		<td class="row2">
 			<script type="text/javascript">
-				<!--
-		
+			// <![CDATA[
 				var form_name = 'ucp';
 				var text_name = 'message';
-				//-->
-			</script>				
+			// ]]>
+			</script>
 			<table cellspacing="0" cellpadding="2" border="0">
 			<!-- INCLUDE posting_buttons.html -->
 			<tr>
@@ -78,9 +77,9 @@
 					<tr>
 						<td align="{S_CONTENT_FLOW_BEGIN}">
 							<script type="text/javascript">
-							<!--
+							// <![CDATA[
 								colorPalette('h', 6, 5)
-							//-->
+							// ]]>
 							</script>
 						</td>
 					</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_options.html b/phpBB/styles/subsilver2/template/ucp_pm_options.html
index fe0d8ce199..111dcc9e3c 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_options.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_options.html
@@ -42,7 +42,7 @@
 					<!-- IF S_TEXT_CONDITION -->
 						<input type="text" name="rule_string" value="{CURRENT_STRING}" size="30" maxlength="250" class="post" />
 					<!-- ELSEIF S_USER_CONDITION -->
-						<input type="text" class="post" name="rule_string" value="{CURRENT_STRING}" size="20" />&nbsp;<span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span>
+						<input type="text" class="post" name="rule_string" value="{CURRENT_STRING}" size="20" />&nbsp;<span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span>
 					<!-- ELSEIF S_GROUP_CONDITION -->
 						<input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF -->
 					<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_popup.html b/phpBB/styles/subsilver2/template/ucp_pm_popup.html
index ee49eb2a6b..68816b88a8 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_popup.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_popup.html
@@ -1,16 +1,16 @@
 <!-- INCLUDE simple_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 /**
 * Jump to inbox
 */
-function jump_to_inbox()
+function jump_to_inbox(url)
 {
-	opener.document.location.href = "{UA_RETURN_INBOX}";
+	opener.document.location.href = url.replace(/&amp;/g, '&');
 	window.close();
 }
-//-->
+// ]]>
 </script>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="10">
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
index 3dd6e3cfb4..e2266b7d38 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE ucp_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	/**
 	* Set display of page element
 	* s[-1,0,1] = hide,toggle display,show
@@ -15,7 +15,9 @@
 		}
 		e.style.display = (s == 1) ? 'block' : 'none';
 	}
-//-->
+
+	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
+// ]]>
 </script>
 
 <table class="tablebg" width="100%" cellspacing="1">
@@ -82,7 +84,7 @@
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td>
 	<td class="row2">
-		<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{A_DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">
+		<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
 			{S_DATEFORMAT_OPTIONS}
 		</select>
 		<div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="post" style="margin-top: 3px;" /></div>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html
index ff0bfe5749..26b0804df1 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html
@@ -18,10 +18,10 @@
 <tr>
 	<td colspan="2" class="row2">
 		<script type="text/javascript">
-			<!--			
+		// <![CDATA[
 			var form_name = 'ucp';
 			var text_name = 'signature';
-			-->
+		// ]]>
 		</script>
 		
 		<table cellspacing="0" cellpadding="2" border="0" width="99%">
@@ -36,9 +36,9 @@
 				<tr>
 					<td align="{S_CONTENT_FLOW_BEGIN}">
 						<script type="text/javascript">
-						<!--
+						// <![CDATA[
 							colorPalette('h', 6, 5)
-						//-->
+						// ]]>
 						</script>
 					</td>
 				</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html
index cfcca28e70..b465be7570 100644
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ b/phpBB/styles/subsilver2/template/ucp_register.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	/**
 	* Change language
 	*/
@@ -10,7 +10,7 @@
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit.click();
 	}
-//-->
+// ]]>
 </script>
 
 <form name="register" method="post" action="{S_UCP_ACTION}">
diff --git a/phpBB/styles/subsilver2/template/ucp_zebra_foes.html b/phpBB/styles/subsilver2/template/ucp_zebra_foes.html
index 406be35658..3de5737b53 100644
--- a/phpBB/styles/subsilver2/template/ucp_zebra_foes.html
+++ b/phpBB/styles/subsilver2/template/ucp_zebra_foes.html
@@ -17,7 +17,7 @@
 	<td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FOES}</b><!-- ENDIF --></td>
 </tr>
 <tr>
-	<td class="row1"><b class="genmed">{L_ADD_FOES}:</b><br /><span class="gensmall">{L_ADD_FOES_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span></td>
+	<td class="row1"><b class="genmed">{L_ADD_FOES}:</b><br /><span class="gensmall">{L_ADD_FOES_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>
 	<td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td>
 </tr>
 <tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_zebra_friends.html b/phpBB/styles/subsilver2/template/ucp_zebra_friends.html
index 147e3f070b..2abea04b8f 100644
--- a/phpBB/styles/subsilver2/template/ucp_zebra_friends.html
+++ b/phpBB/styles/subsilver2/template/ucp_zebra_friends.html
@@ -17,7 +17,7 @@
 	<td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FRIENDS}</b><!-- ENDIF --></td>
 </tr>
 <tr>
-	<td class="row1"><b class="genmed">{L_ADD_FRIENDS}:</b><br /><span class="gensmall">{L_ADD_FRIENDS_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false">{L_FIND_USERNAME}</a> ]</span></td>
+	<td class="row1"><b class="genmed">{L_ADD_FRIENDS}:</b><br /><span class="gensmall">{L_ADD_FRIENDS_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>
 	<td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td>
 </tr>
 <tr>