diff --git a/phpBB/templates/Euclid/modcp_viewip.tpl b/phpBB/templates/Euclid/modcp_viewip.tpl
index d3af822c3d..bd54f20213 100644
--- a/phpBB/templates/Euclid/modcp_viewip.tpl
+++ b/phpBB/templates/Euclid/modcp_viewip.tpl
@@ -1,18 +1,18 @@
 
 <table width="80%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
+		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
 	</tr>
 </table>
 
-<table width="80%" cellpadding="1" cellspacing="0" border="0" align="center">
+<table width="80%" cellspacing="0" cellpadding="0" border="0" align="center">
 	<tr>
-		<td class="tablebg"><table width="100%" cellpadding="3" cellspacing="1" border="0">
+		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
-				<th>{L_IP_INFO}</th>
+				<th height="25">{L_IP_INFO}</th>
 			</tr>
 			<tr>
-				<td class="cat"><span class="cat"><b>{L_THIS_POST_IP}</b></span></td>
+				<td class="cat" height="30"><span class="cattitle">{L_THIS_POST_IP}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><table width="100%" cellspacing="0" cellpadding="0" border="0">
@@ -23,7 +23,7 @@
 				</table></td>
 			</tr>
 			<tr>
-				<td class="cat"><span class="cattitle"><b>{L_OTHER_USERS}</b></span></td>
+				<td class="cat" height="30"><span class="cattitle">{L_OTHER_USERS}</span></td>
 			</tr>
 			<!-- BEGIN userrow -->
 			<tr>
@@ -36,7 +36,7 @@
 			</tr>
 			<!-- END userrow -->
 			<tr>
-				<td class="cat"><span class="cattitle"><b>{L_OTHER_IPS}</b></span></td>
+				<td class="cat" height="30"><span class="cattitle">{L_OTHER_IPS}</span></td>
 			</tr>
 			<!-- BEGIN iprow -->
 			<tr>
diff --git a/phpBB/templates/Euclid/overall_header.tpl b/phpBB/templates/Euclid/overall_header.tpl
index 2309439197..f25fa4c395 100644
--- a/phpBB/templates/Euclid/overall_header.tpl
+++ b/phpBB/templates/Euclid/overall_header.tpl
@@ -3,7 +3,7 @@
 <!--DOCTYPE PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd" -->
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 {META}
 <title>{SITENAME} -+- {PAGE_TITLE}</title>
@@ -39,7 +39,7 @@ A.forumlinks {font-weight:bold}
 A {text-decoration:none}
 A:hover {color:{T_BODY_HLINK};text-decoration:underline}
 
-HR {height:2px}
+HR {border: solid {T_FONTCOLOR1} 0px; border-top-width: 1px; height: 0px; }
 
 @import url("templates/Euclid/ie_form_elements.css"); 
 
@@ -73,7 +73,7 @@ HR {height:2px}
 					</tr>
 					<!-- BEGIN switch_user_logged_out -->
 					<tr>
-						<td colspan="3" align="right" valign="bottom"><span class="gensmall">{L_USERNAME}: <input class="text" type="text" name="username" size="15" />&nbsp;&nbsp;&nbsp;{L_PASSWORD}: <input type="password" name="password" size="15" />&nbsp;&nbsp;&nbsp;{L_AUTO_LOGIN}</span>:&nbsp;<input class="text" type="checkbox" name="autologin" />&nbsp;&nbsp;&nbsp;<input class="mainoptiontable" type="submit" name="submit" value="{L_LOGIN}" />&nbsp;</td>
+						<td colspan="3" align="right" valign="bottom"><span class="gensmall">{L_USERNAME}: <input class="text" type="text" name="username" size="15" />&nbsp;&nbsp;&nbsp;{L_PASSWORD}: <input type="password" name="password" size="15" />&nbsp;&nbsp;&nbsp;{L_AUTO_LOGIN}</span>:&nbsp;<input class="text" type="checkbox" name="autologin" />&nbsp;&nbsp;&nbsp;<input class="mainoptiontable" type="submit" name="login" value="{L_LOGIN}" />&nbsp;</td>
 					</tr>
 					<!-- END switch_user_logged_out -->
 				</table></td>
diff --git a/phpBB/templates/Euclid/posting_body.tpl b/phpBB/templates/Euclid/posting_body.tpl
index 2711c1abb5..9a8dbc39d1 100644
--- a/phpBB/templates/Euclid/posting_body.tpl
+++ b/phpBB/templates/Euclid/posting_body.tpl
@@ -1,6 +1,6 @@
 
 <!-- BEGIN privmsg_extensions -->
-<table width="90%" cellpadding="1" cellspacing="0" border="0" align="center">
+<table width="98%" cellspacing="0" cellpadding="0" border="0" align="center">
 	<tr>
 		<td><span class="cattitle">{INBOX_IMG} {INBOX_LINK} &nbsp; {SENTBOX_IMG} {SENTBOX_LINK} &nbsp; {OUTBOX_IMG} {OUTBOX_LINK} &nbsp; {SAVEBOX_IMG} {SAVEBOX_LINK}</span></td>
 	</tr>
@@ -9,40 +9,209 @@
 <br clear="all" />
 <!-- END privmsg_extensions -->
 
-<form action="{S_POST_ACTION}" method="post" name="post"><table width="90%" cellspacing="0" cellpadding="4" border="0" align="center">
+<form action="{S_POST_ACTION}" method="post" name="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
 	</tr>
 </table>
 
-<script type="text/javascript" language="javascript" src="spellcheck/spch.js"></script>
 <script language="JavaScript" type="text/javascript">
 <!--
-//
-// This is 'borrowed' from subBlue's subSilver template
-// coming soon to phpBB 2.0 !
-//
-function bbstyle(formObj, bbopen, bbclose) {
-	if ((parseInt(navigator.appVersion) >= 4) && (navigator.appName == "Microsoft Internet Explorer")) {
+// bbCode control by
+// subBlue design
+// www.subBlue.com
+
+
+// Startup variables
+var imageTag = false;
+var theSelection = false;
+
+
+// Check for Browser & Platform for PC & IE specific bits
+// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
+var clientPC = navigator.userAgent.toLowerCase(); // Get client info
+var clientVer = parseInt(navigator.appVersion); // Get browser version
+
+var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1));
+var is_nav  = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1)
+                && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1)
+                && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1));
+
+var is_win   = ((clientPC.indexOf("win")!=-1) || (agt.indexOf("16bit")!=-1));
+var is_mac    = (clientPC.indexOf("mac")!=-1);
+
+
+// Helpline messages
+b_help = "Bold text: [b]text[/b]  (alt+b)";
+i_help = "Italic text: [i]text[/i]  (alt+i)";
+u_help = "Underline text: [u]text[/u]  (alt+u)";
+q_help = "Quote text: [quote]text[/quote]  (alt+q)";
+c_help = "Code display: [code]code[/code]  (alt+c)";
+l_help = "List: [list]text[/list] (alt+l)";
+o_help = "Ordered list: [list=]text[/list]  (alt+o)";
+p_help = "Insert image: [img]http://image_url[/img]  (alt+p)";
+w_help = "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)";
+a_help = "Close all open bbCode tags";
+s_help = "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000";
+f_help = "Font size: [size=x-small]small text[/size]";
+
+// Define the bbCode tags
+bbcode = new Array();
+bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]');
+imageTag = false;
+
+// Shows the help messages in the helpline window
+function helpline(help) {
+	document.post.helpbox.value = eval(help + "_help");
+}
+
+
+// Replacement for arrayname.length property
+function getarraysize(thearray) {
+	for (i = 0; i < thearray.length; i++) {
+		if ((thearray[i] == "undefined") || (thearray[i] == "") || (thearray[i] == null))
+			return i;
+		}
+	return thearray.length;
+}
+
+// Replacement for arrayname.push(value) not implemented in IE until version 5.5
+// Appends element to the array
+function arraypush(thearray,value) {
+	thearray[ getarraysize(thearray) ] = value;
+}
+
+// Replacement for arrayname.pop() not implemented in IE until version 5.5
+// Removes and returns the last element of an array
+function arraypop(thearray) {
+	thearraysize = getarraysize(thearray);
+	retval = thearray[thearraysize - 1];
+	delete thearray[thearraysize - 1];
+	return retval;
+}
+
+
+function checkForm() {
+
+	formErrors = false;    
+
+	if (document.post.message.value.length < 2) {
+		formErrors = "You must enter a message!";
+	}
+
+	if (formErrors) {
+		alert(formErrors);
+		return false;
+	} else {
+		bbstyle(-1);
+		//formObj.preview.disabled = true;
+		//formObj.submit.disabled = true;
+		return true;
+	}
+}
+
+function emoticon(text) {
+	text = ' ' + text + ' ';
+	if (document.post.message.createTextRange && document.post.message.caretPos) {
+		var caretPos = document.post.message.caretPos;
+		caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text;
+		document.post.message.focus();
+	} else {
+	document.post.message.value  += text;
+	document.post.message.focus();
+	}
+}
+
+
+function bbfontstyle(bbopen, bbclose) {
+	if ((clientVer >= 4) && is_ie && is_win) {
 		theSelection = document.selection.createRange().text;
 		if (!theSelection) {
-			formObj.message.value += bbopen + bbclose;
-			formObj.message.focus();
+			document.post.message.value += bbopen + bbclose;
+			document.post.message.focus();
 			return;
 		}
 		document.selection.createRange().text = bbopen + theSelection + bbclose;
-		formObj.message.focus();
+		document.post.message.focus();
 		return;
 	} else {
-		formObj.message.value += bbopen + bbclose;
-		formObj.message.focus();
+		document.post.message.value += bbopen + bbclose;
+		document.post.message.focus();
 		return;
 	}
 }
 
-function emoticon(theSmilie) {
-	document.post.message.value += ' ' + theSmilie + ' ';
-	document.post.message.focus();
+
+function bbstyle(bbnumber) {
+
+	donotinsert = false;
+	theSelection = false;
+	bblast = 0;
+
+	if (bbnumber == -1) { // Close all open tags & default button names
+		while (bbcode[0]) {
+			butnumber = arraypop(bbcode) - 1;
+			document.post.message.value += bbtags[butnumber + 1];
+			buttext = eval('document.post.addbbcode' + butnumber + '.value');
+			eval('document.post.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
+		}
+		document.post.message.focus();
+		return;
+	}
+
+	if ((clientVer >= 4) && is_ie && is_win)
+		theSelection = document.selection.createRange().text; // Get text selection
+		
+	if (theSelection) {
+		// Add tags around selection
+		document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1];
+		document.post.message.focus();
+		theSelection = '';
+		return;
+	}
+	
+	// Find last occurance of an open tag the same as the one just clicked
+	for (i = 0; i < bbcode.length; i++) {
+		if (bbcode[i] == bbnumber+1) {
+			bblast = i;
+			donotinsert = true;
+		}
+	}
+
+	if (donotinsert) {		// Close all open tags up to the one just clicked & default button names
+		while (bbcode[bblast]) {
+				butnumber = arraypop(bbcode) - 1;
+				document.post.message.value += bbtags[butnumber + 1];
+				buttext = eval('document.post.addbbcode' + butnumber + '.value');
+				eval('document.post.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
+				imageTag = false;
+			}
+			document.post.message.focus();
+			return;
+	} else { // Open tags
+	
+		if (imageTag && (bbnumber != 14)) {		// Close image tag before adding another
+			document.post.message.value += bbtags[15];
+			lastValue = arraypop(bbcode) - 1;	// Remove the close image tag from the list
+			document.post.addbbcode14.value = "Img";	// Return button back to normal state
+			imageTag = false;
+		}
+		
+		// Open tag
+		document.post.message.value += bbtags[bbnumber];
+		if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag
+		arraypush(bbcode,bbnumber+1);
+		eval('document.post.addbbcode'+bbnumber+'.value += "*"');
+		document.post.message.focus();
+		return;
+	}
+
+}
+
+// Insert at Claret position. Code from
+// http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
+function storeCaret(textEl) {
+	if (textEl.createTextRange) textEl.caretPos = document.selection.createRange().duplicate();
 }
 
 //-->
@@ -52,23 +221,23 @@ function emoticon(theSmilie) {
 
 {ERROR_BOX}
 
-<table width="90%" cellpadding="0" cellspacing="0" border="0" align="center">
+<table width="98%" cellspacing="0" cellpadding="0" border="0" align="center">
 	<tr>
-		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
+		<td class="tablebg"><table width="100%" cellspacing="1" cellpadding="4" border="0">
 			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b>{L_POST_A}</b></span></td>
+				<td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_POST_A}</b></span></td>
 	        </tr>
 			<!-- BEGIN username_select -->
 			<tr>
 				<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
-				<td class="row2"><span class="courier"><input type="text" name="username" size="25" maxlength="25" value="{USERNAME}" /></span></td>
+				<td class="row2"><span class="courier"><input type="text" name="username" size="25" maxlength="30" value="{USERNAME}" /></span></td>
 			</tr>
 			<!-- END username_select -->
 			<!-- This is for private messaging -->
 			<!-- BEGIN privmsg_extensions -->
 			<tr>
 				<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
-				<td class="row2"><input type="text" name="username" maxlength="50" size="20" /> &nbsp; <input type="submit"  name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('search.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=155,resizable=yes,WIDTH=400');return false;" /></td>
+				<td class="row2"><input type="text" name="username" maxlength="30" size="25" /> &nbsp; <input type="submit"  name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('search.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=155,resizable=yes,WIDTH=400');return false;" /></td>
 			</tr>
 			<!-- END privmsg_extensions -->
             <tr>
@@ -79,15 +248,31 @@ function emoticon(theSmilie) {
 				<td class="row1"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}</span></td>
 				<td class="row2" valign="middle"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
-						<td width="50%"><table border="0" cellspacing="0" cellpadding="2">
-							<tr>
-								<td align="center"><span class="courier"><input type="button" name="addbbcode1" value=" B " title="Bold" style="font-weight:bold" onClick="bbstyle(this.form,'[b]','[/b]');"> <input type="button" name="addbbcode2" value=" i " title="Italic" style="font-style:italic" onClick="bbstyle(this.form,'[i]','[/i]');"> <input type="button" name="addbbcode3" value="Quote" title="Quote"  onClick="bbstyle(this.form,'[quote]','[/quote]');"> <input type="button" name="addbbcode4" value="Code" title="Code"  onClick="bbstyle(this.form,'[code]','[/code]');"> <input type="button" name="addbbcode5" value="List" title="List"  onClick="bbstyle(this.form,'[list]','[/list]');"> <input type="button" name="addbbcode6" value="List=" title="Ordered list" onClick="bbstyle(this.form,'[list=]','[/list]');"> <input type="button" name="addbbcode7" value="Img" title="Image"  onClick="bbstyle(this.form,'[img]','[/img]');"> <input type="button" name="addbbcode8" value="URL" title="URL" style="text-decoration: underline" onClick="bbstyle(this.form,'[url]','[/url]');"></span></td>
+						<td width="50%"><table cellspacing="0" cellpadding="2" border="0">
+							<tr align="center" valign="middle"> 
+								<td><span class="gensmall"><input type="button" class="liteoptiontable" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /></span></td>
+								<td><span class="gensmall"><input type="button" class="liteoptiontable" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /></span></td>
+								<td><span class="gensmall"><input type="button" class="liteoptiontable" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /></span></td>
+								<td><span class="gensmall"><input type="button" class="liteoptiontable" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /></span></td>
+								<td><span class="gensmall"><input type="button" class="liteoptiontable" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" onMouseOver="helpline('c')" /></span></td>
+								<td><span class="gensmall"><input type="button" class="liteoptiontable" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /></span></td>
+								<td><span class="gensmall"><input type="button" class="liteoptiontable" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" onMouseOver="helpline('o')" /></span></td>
+								<td><span class="gensmall"><input type="button" class="liteoptiontable" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onClick="bbstyle(14)" onMouseOver="helpline('p')" /></span></td>
+								<td><span class="gensmall"><input type="button" class="liteoptiontable" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /></span></td>
 							</tr>
 							<tr>
-								<td align="center"><span class="gensmall">Font color: </span><span class="courier"><select name="addbbcode9" onChange="bbstyle(this.form, '[color=' + this.form.addbbcode9.options[this.form.addbbcode9.selectedIndex].value + ']', '[/color]')"><option style="color:{T_FONTCOLOR1}" value="{T_FONTCOLOR1}">Default</option><option style="color:darkred" value="darkred">Dark Red</option><option style="color:red" value="darkred">Red</option><option style="color:orange" value="orange">Orange</option><option style="color:brown" value="brown">Brown</option><option style="color:yellow" value="yellow">Yellow</option><option style="color:green" value="green">Green</option><option style="color:olive" value="olive">Olive</option><option style="color:cyan" value="cyan">Cyan</option><option style="color:blue" value="blue">Blue</option><option style="color:darkblue" value="darkblue">Dark Blue</option><option style="color:indigo" value="indigo">Indigo</option><option style="color:violet" value="violet">Violet</option><option style="color:white" value="white">White</option><option style="color:black" value="black">Black</option></select> &nbsp; <span class="gensmall">Font size: </span><span class="courier"><select name="addbbcode10" onChange="bbstyle(this.form, '[size=' + this.form.addbbcode10.options[this.form.addbbcode10.selectedIndex].value + ']', '[/size]')"><option value="-3">Tiny</option><option value="-2">Smaller</option><option value="0" selected="selected">Normal</option><option value="+2">Larger</option><option  value="+3">Largest</option></select></td>
+								<td colspan="9"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+									<tr> 
+										<td><span class="gensmall"> &nbsp;Font color:<select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"><option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="gensmall">Default</option><option style="color:darkred; background-color: white" value="darkred" class="gensmall">Dark Red</option><option style="color:red; background-color: white" value="red" class="gensmall">Red</option><option style="color:orange; background-color: white" value="orange" class="gensmall">Orange</option><option style="color:brown; background-color: white" value="brown" class="gensmall">Brown</option><option style="color:yellow; background-color: white" value="yellow" class="gensmall">Yellow</option><option style="color:green; background-color: white" value="green" class="gensmall">Green</option><option style="color:olive; background-color: white" value="olive" class="gensmall">Olive</option><option style="color:cyan; background-color: white" value="cyan" class="gensmall">Cyan</option><option style="color:blue; background-color: white" value="blue" class="gensmall">Blue</option><option style="color:darkblue; background-color: white" value="darkblue" class="gensmall">Dark Blue</option><option style="color:indigo; background-color: white" value="indigo" class="gensmall">Indigo</option><option style="color:violet; background-color: white" value="violet" class="gensmall">Violet</option><option style="color:white; background-color: white" value="white" class="gensmall">White</option><option style="color:black; background-color: white" value="black" class="gensmall">Black</option></select> &nbsp;Font size: <select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"><option value="9" class="gensmall">Tiny</option><option value="10" class="gensmall">Small</option><option value="12" selected class="gensmall">Normal</option><option value="18" class="gensmall">Large</option><option  value="24" class="gensmall">Huge</option></select></span></td>
+										<td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="gensmall" onMouseOver="helpline('a')">Close Tags</a></span></td>
+									</tr>
+								</table></td>
 							</tr>
-							<tr>
-								<td><span class="courier"><textarea name="message" rows="12" cols="50" wrap="virtual" tabindex="2">{MESSAGE}</textarea></span></td>
+							<tr> 
+								<td colspan="9"><span class="gensmall"><input style="background-color: {T_TD_COLOR2}; border-style: none;" type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" value="Tip: Styles can be applied quickly to selected text" /></span></td>
+							</tr>
+							<tr> 
+								<td colspan="9"><span class="gen"><textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{MESSAGE}</textarea></span></td>
 							</tr>
 						</table></td>
 						<td width="50%" valign="middle"><table border="0" cellspacing="0" cellpadding="5" align="center">
@@ -104,7 +289,7 @@ function emoticon(theSmilie) {
 								<td><a href="javascript:emoticon(':|')"><img src="images/smiles/icon_neutral.gif" width="15" height="15"	border="0"></a></td>
 								<td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15"	border="0"></a></td>
 								<td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15"	border="0"></a></td>
-								<td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_eek.gif" width="15" height="15"	border="0"></a></td>
+								<td><a href="javascript:emoticon(':shock:')"><img src="images/smiles/icon_eek.gif" width="15" height="15"	border="0"></a></td>
 							</tr>
 							<tr align="center" valign="middle">
 								<td><a href="javascript:emoticon(':roll:')"><img src="images/smiles/icon_rolleyes.gif" width="15" height="15"	border="0"></a></td>
@@ -177,13 +362,13 @@ function emoticon(theSmilie) {
 			</tr>
 {POLLBOX}
 			<tr>
-				<td class="cat" colspan="2" align="center">{S_HIDDEN_FORM_FIELDS}<input type="button" tabindex="4" name="spellcheck" value="Spell Check" onclick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB2/spellcheck/sproxy.php', true);" /> &nbsp;<input type="submit" name="preview" value="{L_PREVIEW}" /> &nbsp;<input type="submit" name="submit" value="{L_SUBMIT}" /> &nbsp;<input type="submit" name="cancel" value="{L_CANCEL}" /></td>
+				<td class="cat" colspan="2" height="30" align="center">{S_HIDDEN_FORM_FIELDS}<!-- input class="liteoptiontable" type="button" tabindex="4" name="spellcheck" value="Spell Check" onclick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB2/spellcheck/sproxy.php', true);" /-->&nbsp;<input class="liteoptiontable" type="submit" name="preview" value="{L_PREVIEW}" />&nbsp;<input class="mainoptiontable" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;<input class="liteoptiontable" type="submit" name="cancel" value="{L_CANCEL}" /></td>
 			</tr>
 		</table></td>
 	</tr>
 </table></form>
 
-<table width="90%" cellspacing="2" border="0" align="center">
+<table width="98%" cellspacing="2" border="0" align="center">
 	<tr>
 		<td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
diff --git a/phpBB/templates/Euclid/posting_poll_body.tpl b/phpBB/templates/Euclid/posting_poll_body.tpl
index ce12bef7d5..975dd1fec9 100644
--- a/phpBB/templates/Euclid/posting_poll_body.tpl
+++ b/phpBB/templates/Euclid/posting_poll_body.tpl
@@ -1,5 +1,5 @@
 			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b>{L_ADD_A_POLL}</b></span><br /><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td>
+				<td class="cat" colspan="2" height="30"><span class="cattitle">{L_ADD_A_POLL}</span><br /><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td>
 	        </tr>
             <tr>
 				<td class="row1"><span class="gen"><b>{L_POLL_QUESTION}</b></span></td>
@@ -8,12 +8,12 @@
 			<!-- BEGIN poll_option_rows -->
             <tr>
 				<td class="row1"><span class="gen"><b>{L_POLL_OPTION}</b></span></td>
-				<td class="row2"><span class="courier"><input type="text" name="poll_option_text[{poll_option_rows.S_POLL_OPTION_NUM}]" size="50" maxlength="255" value="{poll_option_rows.POLL_OPTION}" /></span> &nbsp;<input type="submit" name="edit_poll_option[{poll_option_rows.S_POLL_OPTION_NUM}]" value="{L_UPDATE_OPTION}" /> <input type="submit" name="del_poll_option[{poll_option_rows.S_POLL_OPTION_NUM}]" value="{L_DELETE_OPTION}" /></td>
+				<td class="row2"><span class="courier"><input type="text" name="poll_option_text[{poll_option_rows.S_POLL_OPTION_NUM}]" size="50" maxlength="255" value="{poll_option_rows.POLL_OPTION}" /></span> &nbsp;<input class="mainoptiontable" type="submit" name="edit_poll_option[{poll_option_rows.S_POLL_OPTION_NUM}]" value="{L_UPDATE_OPTION}" /> <input class="liteoptiontable" type="submit" name="del_poll_option[{poll_option_rows.S_POLL_OPTION_NUM}]" value="{L_DELETE_OPTION}" /></td>
 			</tr>
 			<!-- END poll_option_rows -->
             <tr>
 				<td class="row1"><span class="gen"><b>{L_POLL_OPTION}</b></span></td>
-				<td class="row2"><span class="courier"><input type="text" name="add_poll_option_text" size="50" maxlength="255" value="{ADD_POLL_OPTION}" /></span> &nbsp;<input type="submit" name="add_poll_option" value="{L_ADD_OPTION}" /></td>
+				<td class="row2"><span class="courier"><input type="text" name="add_poll_option_text" size="50" maxlength="255" value="{ADD_POLL_OPTION}" /></span> &nbsp;<input class="mainoptiontable" type="submit" name="add_poll_option" value="{L_ADD_OPTION}" /></td>
 			</tr>
             <tr>
 				<td class="row1"><span class="gen"><b>{L_POLL_LENGTH}</b></span></td>
diff --git a/phpBB/templates/Euclid/simple_header.tpl b/phpBB/templates/Euclid/simple_header.tpl
index 35972ff194..ee9816c8da 100644
--- a/phpBB/templates/Euclid/simple_header.tpl
+++ b/phpBB/templates/Euclid/simple_header.tpl
@@ -3,24 +3,24 @@
 <!--DOCTYPE PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd" -->
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Type" content="text/html;  charset={S_CONTENT_ENCODING}" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 {META}
 <title>{SITENAME} -+- {PAGE_TITLE}</title>
 <style type="text/css">
 <!--
 
-BODY {background-color:{T_BODY_BGCOLOR}; color:{T_BODY_TEXT}; scrollbar-base-color:{T_TH_COLOR2}; scrollbar-arrow-color:{T_TH_COLOR1}; margin:0px;}
+BODY {background-color:{T_BODY_BGCOLOR};color:{T_BODY_TEXT};scrollbar-base-color:{T_TH_COLOR2};scrollbar-arrow-color:{T_TH_COLOR1}}
 P	{font-family:{T_FONTFACE1};font-size:10pt}
 
-TH	{background-color:{T_TH_COLOR3};font-family:{T_FONTFACE2};font-size:8pt;font-weight:normal}
-TH.secondary	{background-color:{T_TH_COLOR3};font-family:{T_FONTFACE1};font-size:10pt;font-weight:normal;text-align:left}
+TH	{background-color:{T_TH_COLOR3};color:{T_FONTCOLOR2};font-family:{T_FONTFACE2};font-size:8pt;font-weight:bold}
+TH.secondary	{background-color:{T_TH_COLOR3};color:{T_FONTCOLOR2};font-family:{T_FONTFACE1};font-size:10pt;font-weight:normal;text-align:left}
 TD.tablebg	{background-color:{T_TH_COLOR1}}
 TD.cat	{background-color:{T_TH_COLOR2};font-family:{T_FONTFACE1};font-size:12pt}
 TD.row1	{background-color:{T_TD_COLOR1}}
 TD.row2	{background-color:{T_TD_COLOR2}}
 
-SPAN.title	{font-family:Impact,sans-serif;font-size:36pt}
+SPAN.title	{font-family:{T_FONTFACE2};font-size:26pt}
 SPAN.cattitle	{font-family:{T_FONTFACE1};font-size:12pt;font-weight:bold}
 SPAN.gen	{font-family:{T_FONTFACE1};font-size:10pt}
 SPAN.gensmall	{font-family:{T_FONTFACE1};font-size:8pt}
@@ -31,9 +31,17 @@ INPUT {font-family:Verdana;font-size:8pt}
 SELECT.small	{font-family:"Courier New",courier;font-size:8pt;width:140px}
 INPUT.text	{font-family:"Courier New",courier;font-size:8pt;}
 
+INPUT.outsidetable {background-color:{T_TD_COLOR1}}
+INPUT.mainoptiontable {background-color:{T_TD_COLOR1}}
+INPUT.liteoptiontable {background-color:{T_TD_COLOR1}}
+
 A.forumlinks {font-weight:bold}
 A {text-decoration:none}
-A:hover {text-decoration:underline}
+A:hover {color:{T_BODY_HLINK};text-decoration:underline}
+
+HR {border: solid {T_FONTCOLOR1} 0px; border-top-width: 1px; height: 0px; }
+
+@import url("templates/Euclid/ie_form_elements.css"); 
 
 //-->
 </style>
