diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index 6c8dc6c155..a729d2451e 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -256,7 +256,7 @@ $lang = array_merge($lang, array(
 	'Very_good' => 'Very Good',
 	'Total_votes' => 'Total Votes',
 	'Message_body' => 'Message body',
-	'Message_body_explain' => 'Enter your message here, it may contain no more than %d characters.',
+	'Message_body_explain' => 'Enter your message here, it may contain no more than <b>%d</b> characters.',
 	'Topic_review' => 'Topic review',
 	'Topic_icon' => 'Topic icon',
 	'No_post_mode' => 'No post mode specified',
@@ -349,6 +349,7 @@ $lang = array_merge($lang, array(
 	'bbcode_f_help' => 'Font size: [size=x-small]small text[/size]',
 	'Emoticons' => 'Emoticons',
 	'More_emoticons' => 'View more Emoticons',
+	'Font_color' => 'Font color',
 	'Font_size' => 'Font size',
 	'font_tiny' => 'Tiny',
 	'font_small' => 'Small',
diff --git a/phpBB/templates/subSilver/posting_body.html b/phpBB/templates/subSilver/posting_body.html
index e69466e7bd..385b51ca5e 100644
--- a/phpBB/templates/subSilver/posting_body.html
+++ b/phpBB/templates/subSilver/posting_body.html
@@ -1,32 +1,12 @@
 <!-- INCLUDE overall_header.html -->
 
-<script language="JavaScript" src="templates/subSilver/color.js"></script>
 <script language="JavaScript" type="text/javascript">
 <!--
-// bbCode control by subBlue design [ www.subBlue.com ]
-// Includes the color bar by mat100 [ see forums ]
 
-// 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) || (clientPC.indexOf("16bit") != -1));
-var is_mac    = (clientPC.indexOf("mac")!=-1);
-
-// This is for the color bar by mat100
-var height1 = 10;//define the height of the color bar
-var pas = 28;// define the number of color in the color bar
-var width1 = Math.floor(-2/15 * pas + 6);//define the width of the color bar here automatic ajust for subsilver template.
+// 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;
 
 // Helpline messages
 b_help = "{L_BBCODE_B_HELP}";
@@ -41,44 +21,6 @@ w_help = "{L_BBCODE_W_HELP}";
 a_help = "{L_BBCODE_A_HELP}";
 s_help = "{L_BBCODE_S_HELP}";
 f_help = "{L_BBCODE_F_HELP}";
-text1 = s_help.substring(0,search(s_help,"="));
-text2 = s_help.substring(search(s_help,"]"),search(s_help,"/"));
-
-// 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() {
 
@@ -101,113 +43,9 @@ function checkForm() {
 	}
 }
 
-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) {
-			document.post.message.value += bbopen + bbclose;
-			document.post.message.focus();
-			return;
-		}
-		document.selection.createRange().text = bbopen + theSelection + bbclose;
-		document.post.message.focus();
-		return;
-	} else {
-		document.post.message.value += bbopen + bbclose;
-		document.post.message.focus();
-		return;
-	}
-	storeCaret(document.post.message);
-}
-
-
-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)) + '"');
-		}
-		imageTag = false; // All tags are closed including image tags :D
-		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;
-	}
-	storeCaret(document.post.message);
-}
-
-// 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();
-}
-
 //-->
 </script>
+<script language="JavaScript" src="templates/subSilver/editor.js"></script>
 
 <form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"><table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr>
@@ -263,8 +101,8 @@ function storeCaret(textEl) {
 	</tr>
 	<!-- ENDIF -->
 	<tr>
-		<td class="row1" width="24%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
-		<td class="row2" width="76%"><input type="text" name="subject" size="45" maxlength="60" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /></td>
+		<td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
+		<td class="row2" width="78%"><input type="text" name="subject" size="45" maxlength="60" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /></td>
 	</tr>
 	<tr>
 		<td class="row1" valign="top"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}</span><br /><br /><table width="80%" cellspacing="5" cellpadding="0" border="0" align="center">
@@ -280,53 +118,50 @@ function storeCaret(textEl) {
 			</tr>
 			<!-- ENDIF -->
 		</table></td>
-		<td class="row2" valign="top"><table width="450" cellspacing="0" cellpadding="2" border="0">
+		<td class="row2" valign="top"><table cellspacing="0" cellpadding="2" border="0">
 			<tr align="center" valign="middle">
-				<td><input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /></td>
-				<td><input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /></td>
-				<td><input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /></td>
-				<td><input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /></td>
-				<td><input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" onMouseOver="helpline('c')" /></td>
-				<td><input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /></td>
-				<td><input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" onMouseOver="helpline('o')" /></td>
-				<td><input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onClick="bbstyle(14)" onMouseOver="helpline('p')" /></td>
-				<td><input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /></td>
+				<td><input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" onmouseover="helpline('b')" /></td>
+				<td><input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" onmouseover="helpline('i')" /></td>
+				<td><input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" onmouseover="helpline('u')" /></td>
+				<td><input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" /></td>
+				<td><input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" /></td>
+				<td><input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" /></td>
+				<td><input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" /></td>
+				<td><input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onclick="bbstyle(14)" onmouseover="helpline('p')" /></td>
+				<td><input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" /></td>
 			</tr>
 			<tr>
 				<td colspan="9"><table width="100%" border="0" cellspacing="0" cellpadding="0">
 					<tr>
-						<td><span class="genmed"> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 1;" onMouseOver="helpline('f')">
+						<td><span class="genmed"> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')">
 							<option value="7" class="genmed">{L_FONT_TINY}</option>
 							<option value="9" class="genmed">{L_FONT_SMALL}</option>
 							<option value="12" selected class="genmed">{L_FONT_NORMAL}</option>
 							<option value="18" class="genmed">{L_FONT_LARGE}</option>
 							<option  value="24" class="genmed">{L_FONT_HUGE}</option>
 						</select></span></td>
-						<td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">{L_BBCODE_CLOSE_TAGS}</a></span></td>
+						<td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="genmed" onmouseover="helpline('a')">{L_BBCODE_CLOSE_TAGS}</a></span></td>
 					</tr>
 				</table></td>
-			</tr>
-			<tr>
-				<td colspan="9"><input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /></td>
-			</tr>
-			<tr>
-				<td colspan="9"><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></td>
-				<td align="center" valign="top"></td>
-		 	</tr>
-		 	<tr>
-		 		<td colspan="9"><table id="ColorPanel" cellspacing="0" cellpadding="0" border="0" align="center">
-		 			<tr>
-						<td style="border:1px" id="ColorUsed" onmouseover="helpline('s')" onclick="if(this.bgColor.length > 0) insertTag(this.bgColor)" valign="center" align="middle"><img src="templates/subSilver/images/spacer.gif" width="10" height="10"border="1"></td>
-						<td width="5"><img src="templates/subSilver/images/spacer.gif" width="5" border="0" /></td>
-						<td><script language="javascript" type="text/javascript"><!--
+				<td rowspan="3" width="100%" align="center" valign="middle"><table cellspacing="5" cellpadding="0" border="0">
+					<tr>
+						<td><span class="genmed">{L_FONT_COLOR}</span></td>
+					</tr>
+					<tr>
+						<td bgcolor="black"><script language="javascript" type="text/javascript"><!--
 
-						// Note this may take some processing ...
-						rgb(pas,width1,height1,text1,text2);
+						unixSafeColours()
 
 						//--></script></td>
 					</tr>
 				</table></td>
 			</tr>
+			<tr>
+				<td colspan="9" width="450"><input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /></td>
+			</tr>
+			<tr>
+				<td colspan="9"><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></td>
+		 	</tr>
 		</table></td>
 	</tr>
 	<tr>