diff --git a/root/adm/style/portal/acp_portal_custom.html b/root/adm/style/portal/acp_portal_custom.html
new file mode 100644
index 00000000..c164954c
--- /dev/null
+++ b/root/adm/style/portal/acp_portal_custom.html
@@ -0,0 +1,645 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_TITLE}</h1>
+
+<p>{L_TITLE_EXPLAIN}</p>
+
+<!-- IF S_ERROR -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+<!-- ENDIF -->
+<form id="acp_portal_config" method="post" action="{U_ACTION}">
+<!-- IF SHOW_MODULE_OPTIONS -->
+		<fieldset>
+			<legend>{L_MODULE_OPTIONS}</legend>
+			<dl>
+				<dt><label for="module_name">{L_MODULE_NAME}:</label><br /><span>{L_MODULE_NAME_EXP}</span></dt>
+				<dd><input id="module_name" type="text" value="{MODULE_NAME}" name="module_name" maxlength="255" size="64" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="module_image">{L_MODULE_IMAGE}:</label><br /><span>{L_MODULE_IMAGE_EXP}</span></dt>
+				<dd><input id="module_image" type="text" value="{MODULE_IMAGE}" name="module_image" maxlength="255" size="64" /></dd>
+				<!-- IF MODULE_IMAGE_SRC --><dd><img src="{MODULE_IMAGE_SRC}" alt="{L_MODULE_IMAGE}" /></dd><!-- ENDIF -->
+			</dl>
+		</fieldset>
+<!-- ENDIF -->
+		<!-- IF S_PREVIEW -->
+		<fieldset>
+			<legend>{L_ACP_PORTAL_CUSTOM_PREVIEW}</legend>
+		<dl>
+			<dt style="border: none; width: 100%;">
+				{PREVIEW_TEXT}
+			</dt>
+		</dl>
+		</fieldset>
+		<!-- ENDIF -->
+		<fieldset>
+			<legend>{L_PORTAL_CUSTOM}</legend>
+		<dl id="bbcode-buttons"<!-- IF not CUSTOM_USE_BBCODE --> style="display: none;"<!-- ENDIF -->>
+			<dd>
+				<script type="text/javascript">
+				// <![CDATA[
+				/**
+				* bbCode control by subBlue design [ www.subBlue.com ]
+				* Includes unixsafe colour palette selector by SHS`
+				*/
+
+				// Startup variables
+				var imageTag = false;
+				var theSelection = false;
+
+				var bbcodeEnabled = true;
+				// 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_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
+				var baseHeight;
+				
+				var form_name = 'acp_portal_welcome';
+				var text_name = 'welcome_message';
+				var load_draft = false;
+				var upload = false;
+
+				// Define the bbCode tags
+				var bbcode = new Array();
+				var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
+				var imageTag = false;
+
+				// Helpline messages
+				var help_line = {
+					b: '{LA_BBCODE_B_HELP}',
+					i: '{LA_BBCODE_I_HELP}',
+					u: '{LA_BBCODE_U_HELP}',
+					q: '{LA_BBCODE_Q_HELP}',
+					c: '{LA_BBCODE_C_HELP}',
+					l: '{LA_BBCODE_L_HELP}',
+					o: '{LA_BBCODE_O_HELP}',
+					p: '{LA_BBCODE_P_HELP}',
+					w: '{LA_BBCODE_W_HELP}',
+					a: '{LA_BBCODE_A_HELP}',
+					s: '{LA_BBCODE_S_HELP}',
+					f: '{LA_BBCODE_F_HELP}',
+					e: '{LA_BBCODE_E_HELP}',
+					d: '{LA_BBCODE_D_HELP}'
+					<!-- BEGIN custom_tags -->
+						,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
+					<!-- END custom_tags -->
+				}
+
+				var panels = new Array('options-panel', 'attach-panel', 'poll-panel');
+				var show_panel = 'options-panel';
+
+				/**
+				* Shows the help messages in the helpline window
+				*/
+				function helpline(help)
+				{
+					return;
+				}
+
+				/**
+				* Fix a bug involving the TextRange object. From
+				* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
+				*/ 
+				function initInsertions() 
+				{
+					var doc;
+
+					if (document.forms[form_name])
+					{
+						doc = document;
+					}
+					else 
+					{
+						doc = opener.document;
+					}
+
+					var textarea = doc.getElementById(text_name);
+
+					if (is_ie && typeof(baseHeight) != 'number')
+					{
+						textarea.focus();
+						baseHeight = doc.selection.createRange().duplicate().boundingHeight;
+					}
+				}
+
+				/**
+				* bbstyle
+				*/
+				function bbstyle(bbnumber)
+				{	
+					if (bbnumber != -1)
+					{
+						bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
+					} 
+					else 
+					{
+						insert_text('[*]');
+						document.getElementById(text_name).focus();
+					}
+				}
+
+				/**
+				* Apply bbcodes
+				*/
+				function bbfontstyle(bbopen, bbclose)
+				{
+					theSelection = false;
+
+					var textarea = document.getElementById(text_name);
+
+					textarea.focus();
+
+					if ((clientVer >= 4) && is_ie && is_win)
+					{
+						// Get text selection
+						theSelection = document.selection.createRange().text;
+
+						if (theSelection)
+						{
+							// Add tags around selection
+							document.selection.createRange().text = bbopen + theSelection + bbclose;
+							document.getElementById(text_name).focus();
+							theSelection = '';
+							return;
+						}
+					}
+					else if (document.getElementById(text_name).selectionEnd && (document.getElementById(text_name).selectionEnd - document.getElementById(text_name).selectionStart > 0))
+					{
+						mozWrap(document.getElementById(text_name), bbopen, bbclose);
+						document.getElementById(text_name).focus();
+						theSelection = '';
+						return;
+					}
+					
+					//The new position for the cursor after adding the bbcode
+					var caret_pos = getCaretPosition(textarea).start;
+					var new_pos = caret_pos + bbopen.length;		
+
+					// Open tag
+					insert_text(bbopen + bbclose);
+
+					// Center the cursor when we don't have a selection
+					// Gecko and proper browsers
+					if (!isNaN(textarea.selectionStart))
+					{
+						textarea.selectionStart = new_pos;
+						textarea.selectionEnd = new_pos;
+					}	
+					// IE
+					else if (document.selection)
+					{
+						var range = textarea.createTextRange(); 
+						range.move("character", new_pos); 
+						range.select();
+						storeCaret(textarea);
+					}
+
+					textarea.focus();
+					return;
+				}
+
+				/**
+				* Insert text at position
+				*/
+				function insert_text(text, spaces, popup)
+				{
+					var textarea;
+					
+					if (!popup) 
+					{
+						textarea = document.getElementById(text_name);
+					} 
+					else 
+					{
+						textarea = opener.document.getElementById(text_name);
+					}
+					if (spaces) 
+					{
+						text = ' ' + text + ' ';
+					}
+					
+					if (!isNaN(textarea.selectionStart))
+					{
+						var sel_start = textarea.selectionStart;
+						var sel_end = textarea.selectionEnd;
+
+						mozWrap(textarea, text, '')
+						textarea.selectionStart = sel_start + text.length;
+						textarea.selectionEnd = sel_end + text.length;
+					}
+					else if (textarea.createTextRange && textarea.caretPos)
+					{
+						if (baseHeight != textarea.caretPos.boundingHeight) 
+						{
+							textarea.focus();
+							storeCaret(textarea);
+						}
+
+						var caret_pos = textarea.caretPos;
+						caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
+					}
+					else
+					{
+						textarea.value = textarea.value + text;
+					}
+					if (!popup) 
+					{
+						textarea.focus();
+					}
+				}
+
+				/**
+				* Add inline attachment at position
+				*/
+				function attach_inline(index, filename)
+				{
+					insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
+					document.getElementById(text_name).focus();
+				}
+
+				/**
+				* Add quote text to message
+				*/
+				function addquote(post_id, username)
+				{
+					var message_name = 'message_' + post_id;
+					var theSelection = '';
+					var divarea = false;
+
+					if (document.all)
+					{
+						divarea = document.all[message_name];
+					}
+					else
+					{
+						divarea = document.getElementById(message_name);
+					}
+
+					// Get text selection - not only the post content :(
+					if (window.getSelection)
+					{
+						theSelection = window.getSelection().toString();
+					}
+					else if (document.getSelection)
+					{
+						theSelection = document.getSelection();
+					}
+					else if (document.selection)
+					{
+						theSelection = document.selection.createRange().text;
+					}
+
+					if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
+					{
+						if (divarea.innerHTML)
+						{
+							theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
+							theSelection = theSelection.replace(/<br\/>/ig, '\n');
+							theSelection = theSelection.replace(/&lt\;/ig, '<');
+							theSelection = theSelection.replace(/&gt\;/ig, '>');
+							theSelection = theSelection.replace(/&amp\;/ig, '&');
+							theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
+						}
+						else if (document.all)
+						{
+							theSelection = divarea.innerText;
+						}
+						else if (divarea.textContent)
+						{
+							theSelection = divarea.textContent;
+						}
+						else if (divarea.firstChild.nodeValue)
+						{
+							theSelection = divarea.firstChild.nodeValue;
+						}
+					}
+
+					if (theSelection)
+					{
+						if (bbcodeEnabled)
+						{
+							insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
+						}
+						else
+						{
+							var lines = split_lines(theSelection);
+							for (i = 0; i < lines.length; i++)
+							{
+								insert_text('> ' + lines[i] + '\n')
+							}
+						}
+					}
+
+					return;
+				}
+
+				function split_lines(text)
+				{
+					var lines = text.split('\n');
+					var splitLines = new Array();
+					var j = 0;
+					for(i = 0; i < lines.length; i++)
+					{
+						if (lines[i].length <= 80)
+						{
+							splitLines[j] = lines[i];
+							j++;
+						}
+						else
+						{
+							var line = lines[i];
+							do
+							{
+								var splitAt = line.indexOf(' ', 80);
+								
+								if (splitAt == -1)
+								{
+									splitLines[j] = line;
+									j++
+								}
+								else
+								{
+									splitLines[j] = line.substring(0, splitAt);
+									line = line.substring(splitAt);
+									j++;
+								}
+							}
+							while(splitAt != -1)
+						}
+					}
+					return splitLines;
+				}
+				/**
+				* From http://www.massless.org/mozedit/
+				*/
+				function mozWrap(txtarea, open, close)
+				{
+					var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
+					var selStart = txtarea.selectionStart;
+					var selEnd = txtarea.selectionEnd;
+					var scrollTop = txtarea.scrollTop;
+
+					if (selEnd == 1 || selEnd == 2) 
+					{
+						selEnd = selLength;
+					}
+
+					var s1 = (txtarea.value).substring(0,selStart);
+					var s2 = (txtarea.value).substring(selStart, selEnd)
+					var s3 = (txtarea.value).substring(selEnd, selLength);
+
+					txtarea.value = s1 + open + s2 + close + s3;
+					txtarea.selectionStart = selStart + open.length;
+					txtarea.selectionEnd = selEnd + open.length;
+					txtarea.focus();
+					txtarea.scrollTop = scrollTop;
+
+					return;
+				}
+
+				/**
+				* Insert at Caret 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();
+					}
+				}
+
+				/**
+				* Color pallette
+				*/
+				function colorPalette(dir, width, height)
+				{
+					var r = 0, g = 0, b = 0;
+					var numberList = new Array(6);
+					var color = '';
+
+					numberList[0] = '00';
+					numberList[1] = '40';
+					numberList[2] = '80';
+					numberList[3] = 'BF';
+					numberList[4] = 'FF';
+
+					document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
+
+					for (r = 0; r < 5; r++)
+					{
+						if (dir == 'h')
+						{
+							document.writeln('<tr>');
+						}
+
+						for (g = 0; g < 5; g++)
+						{
+							if (dir == 'v')
+							{
+								document.writeln('<tr>');
+							}
+							
+							for (b = 0; b < 5; b++)
+							{
+								color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
+								document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
+								document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" style="margin: -4px 0px -4px 2px;"><img src="images/spacer.gif" width="' + width + '" height="' + (height+10) + '" alt="#' + color + '" title="#' + color + '" style="margin: -4px;" /></a>');
+								document.writeln('</td>');
+							}
+
+							if (dir == 'v')
+							{
+								document.writeln('</tr>');
+							}
+						}
+
+						if (dir == 'h')
+						{
+							document.writeln('</tr>');
+						}
+					}
+					document.writeln('</table>');
+				}
+
+
+				/**
+				* Caret Position object
+				*/
+				function caretPosition()
+				{
+					var start = null;
+					var end = null;
+				}
+
+
+				/**
+				* Get the caret position in an textarea
+				*/
+				function getCaretPosition(txtarea)
+				{
+					var caretPos = new caretPosition();
+					
+					// simple Gecko/Opera way
+					if(txtarea.selectionStart || txtarea.selectionStart == 0)
+					{
+						caretPos.start = txtarea.selectionStart;
+						caretPos.end = txtarea.selectionEnd;
+					}
+					// dirty and slow IE way
+					else if(document.selection)
+					{
+					
+						// get current selection
+						var range = document.selection.createRange();
+
+						// a new selection of the whole textarea
+						var range_all = document.body.createTextRange();
+						range_all.moveToElementText(txtarea);
+						
+						// calculate selection start point by moving beginning of range_all to beginning of range
+						var sel_start;
+						for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
+						{		
+							range_all.moveStart('character', 1);
+						}
+					
+						txtarea.sel_start = sel_start;
+					
+						// we ignore the end value for IE, this is already dirty enough and we don't need it
+						caretPos.start = txtarea.sel_start;
+						caretPos.end = txtarea.sel_start;			
+					}
+
+					return caretPos;
+				}
+				// ]]>
+				</script>
+				<div id="colour_palette" style="display: none;">
+					<dl style="clear: left;">
+						<dt style="border: none;"><label>{L_FONT_COLOR}:</label><br /></dt>
+					</dl>
+					<dl style="clear: left;">
+					<dt style="border: none;">
+						<script type="text/javascript">
+						// <![CDATA[
+							function change_palette()
+							{
+								e = document.getElementById('colour_palette');
+								if(e.style.display == 'block')
+								{
+									dE('colour_palette', -1);
+								}
+								else
+								{
+									dE('colour_palette', 1);
+								}
+								
+								if (e.style.display == 'block')
+								{
+									document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
+								}
+								else
+								{
+									document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
+								}
+							}
+
+							colorPalette('h', 10, 5);
+						// ]]>
+						</script>
+					</dt>
+					</dl>
+				</div>
+				<div id="format-buttons">
+					<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
+					<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
+					<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
+					<!-- IF S_BBCODE_QUOTE -->
+						<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
+					<!-- ENDIF -->
+					<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
+					<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
+					<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
+					<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
+					<!-- IF S_BBCODE_IMG -->
+						<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
+					<!-- ENDIF -->
+					<!-- IF S_LINKS_ALLOWED -->
+						<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
+					<!-- ENDIF -->
+					<!-- IF S_BBCODE_FLASH -->
+						<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
+					<!-- ENDIF -->
+					<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
+						<option value="50">{L_FONT_TINY}</option>
+						<option value="85">{L_FONT_SMALL}</option>
+						<option value="100" selected="selected">{L_FONT_NORMAL}</option>
+						<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
+							<option value="150">{L_FONT_LARGE}</option>
+							<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
+								<option value="200">{L_FONT_HUGE}</option>
+							<!-- ENDIF -->
+						<!-- ENDIF -->
+					</select>
+					<input type="button" class="button2" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />
+					<!-- BEGIN custom_tags -->
+						<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
+					<!-- END custom_tags -->
+				</div>
+			</dd>
+		</dl>
+		<dl>
+			<dt>
+				<label for="custom_code">{L_ACP_PORTAL_CUSTOM_CODE}:</label><br />
+				<span>{L_ACP_PORTAL_CUSTOM_CODE_EXP}</span>
+			</dt>
+			<dd><textarea name="custom_code" id="custom_code" cols="6" rows="12">{CUSTOM_CODE}</textarea></dd>
+		</dl>
+		<dl>
+			<dt>
+				<label for="custom_use_bbcode">{L_ACP_PORTAL_CUSTOM_BBCODE}</label><br />
+				<span>{L_ACP_PORTAL_CUSTOM_BBCODE_EXP}</span>
+			</dt>
+			<dd>
+				<label><input onchange="dE('bbcode-buttons', 1)" class="radio" type="radio" value="1" name="custom_use_bbcode" id="custom_use_bbcode"<!-- IF CUSTOM_USE_BBCODE --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
+				<label><input onchange="dE('bbcode-buttons', -1)" class="radio" type="radio" value="0" name="custom_use_bbcode"<!-- IF not CUSTOM_USE_BBCODE --> checked="checked"<!-- ENDIF --> />{L_NO}</label>
+			</dd>
+		</dl>
+		<dl>
+			<dt>
+				<label for="permission-setting">{L_ACP_PORTAL_CUSTOM_PERMISSION}:</label><br />
+				<span>{L_ACP_PORTAL_CUSTOM_PERMISSION_EXP}</span>
+			</dt>
+			<dd>
+				<select id="permission-setting" size="10" multiple="multiple" name="permission-setting[]">
+					<!-- BEGIN permission_setting -->
+					<option value="{permission_setting.GROUP_ID}"<!-- IF permission_setting.SELECTED -->selected="selected"<!-- ENDIF -->>{permission_setting.GROUP_NAME}</option>
+					<!-- END permission_setting -->
+				</select>
+			</dd>
+		</dl>
+<!-- IF S_AUTH -->
+	<!-- BEGIN auth_tpl -->
+		{auth_tpl.TPL}
+	<!-- END auth_tpl -->
+<!-- ENDIF -->
+
+	<p class="submit-buttons">
+		<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />&nbsp;
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/root/language/en/mods/portal/portal_custom_module.php b/root/language/en/mods/portal/portal_custom_module.php
new file mode 100644
index 00000000..644d7c77
--- /dev/null
+++ b/root/language/en/mods/portal/portal_custom_module.php
@@ -0,0 +1,49 @@
+<?php
+/**
+* @package Portal - Custom
+* @version $Id$
+* @copyright (c) 2009, 2010 Board3 Portal Team
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+$lang = array_merge($lang, array(
+	'PORTAL_CUSTOM'		=> 'Custom Block',
+	
+	// ACP
+	'ACP_PORTAL_CUSTOM_SETTINGS'			=> 'Custom Block Settings',
+	'ACP_PORTAL_CUSTOM_SETTINGS_EXP'		=> 'Here you can edit your custom block',
+	'ACP_PORTAL_CUSTOM_CODE_SHORT'			=> 'The code you entered is not long enough.',
+	'ACP_PORTAL_CUSTOM_PREVIEW'				=> 'Preview',
+	'ACP_PORTAL_CUSTOM_CODE'				=> 'Custom Block Code',
+	'ACP_PORTAL_CUSTOM_CODE_EXP'			=> 'Change the code for the small custom block (HTML or BBCode) here.',
+	'ACP_PORTAL_CUSTOM_PERMISSION'			=> 'Custom Block permissions',
+	'ACP_PORTAL_CUSTOM_PERMISSION_EXP'		=> 'Select the groups that should be able to view the custom block. If you want all users to be able to view the custom block, don´t select anything.<br />Select/Deselect multiple groups by holding <samp>CTRL</samp> and clicking.',
+	'ACP_PORTAL_CUSTOM_BBCODE'				=> 'Activate BBCode for the custom block',
+	'ACP_PORTAL_CUSTOM_BBCODE_EXP'			=> 'BBCode could be used in this box. If BBCode is not activated, HTML will be parsed.',
+));
+
+?>
\ No newline at end of file
diff --git a/root/portal.php b/root/portal.php
index 21b71c8d..d2865f85 100644
--- a/root/portal.php
+++ b/root/portal.php
@@ -86,10 +86,23 @@ while ($row = $db->sql_fetchrow($result))
 		continue;
 	}
 
-	$template->assign_block_vars('modules_' . column_num_string($row['module_column']), array(
-		'TEMPLATE_FILE'		=> 'portal/modules/' . $template_module,
-		'IMAGE_SRC'			=> $phpbb_root_path . 'styles/' . $user->theme['theme_path'] . '/theme/images/portal/' . $row['module_image_src'],
-	));
+	// Custom Blocks that have been defined in the ACP will return an array instead of just the name of the template file
+	if(is_array($template_module))
+	{
+		$template->assign_block_vars('modules_' . column_num_string($row['module_column']), array(
+			'TEMPLATE_FILE'		=> 'portal/modules/' . $template_module['template'],
+			'IMAGE_SRC'			=> $phpbb_root_path . 'styles/' . $user->theme['theme_path'] . '/theme/images/portal/' . $template_module['image_src'],
+			'TITLE'				=> $template_module['title'],
+			'CODE'				=> $template_module['code'],
+		));
+	}
+	else
+	{
+		$template->assign_block_vars('modules_' . column_num_string($row['module_column']), array(
+			'TEMPLATE_FILE'		=> 'portal/modules/' . $template_module,
+			'IMAGE_SRC'			=> $phpbb_root_path . 'styles/' . $user->theme['theme_path'] . '/theme/images/portal/' . $row['module_image_src'],
+		));
+	}
 	unset($template_module);
 }
 $db->sql_freeresult($result);
diff --git a/root/portal/modules/portal_custom.php b/root/portal/modules/portal_custom.php
new file mode 100644
index 00000000..5b36081b
--- /dev/null
+++ b/root/portal/modules/portal_custom.php
@@ -0,0 +1,351 @@
+<?php
+/**
+* @package Portal - Custom
+* @version $Id$
+* @copyright (c) 2009, 2010 Board3 Portal Team
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* @package Custom
+*/
+class portal_custom_module
+{
+	/**
+	* Allowed columns: Just sum up your options (Exp: left + right = 10)
+	* top		1
+	* left		2
+	* center	4
+	* right		8
+	* bottom	16
+	*/
+	var $columns = 31;
+
+	/**
+	* Default modulename
+	*/
+	var $name = 'PORTAL_CUSTOM';
+
+	/**
+	* Default module-image:
+	* file must be in "{T_THEME_PATH}/images/portal/"
+	*/
+	var $image_src = 'portal_custom.png';
+
+	/**
+	* module-language file
+	* file must be in "language/{$user->lang}/mods/portal/"
+	*/
+	var $language = 'portal_custom_module';
+	
+	/**
+	* custom acp template
+	* file must be in "adm/style/portal/"
+	*/
+	var $custom_acp_tpl = 'acp_portal_custom';
+
+	function get_template_center($module_id)
+	{
+		global $config, $template, $portal_config, $user;
+
+		/* 
+		* Run generate_text_for_display if the user uses BBCode for designing his custom block
+		* HTML won't be parsed if the user chooses to use BBCodes in the ACP
+		* If BBCodes are turned off, the custom Block code will be directly assigned and HTML will be parsed
+		*/
+		if ($config['board3_custom_' . $module_id . '_bbcode'])
+		{	
+			// Generate text for display and assign template vars
+			$uid = $config['board3_custom_' . $module_id . '_uid'];
+			$bitfield = $config['board3_custom_' . $module_id . '_bitfield'];
+			$bbcode_options = OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS;
+			$assign_code = generate_text_for_display($portal_config['board3_custom_' . $module_id . '_code'], $uid, $bitfield, $bbcode_options);
+		}
+		else
+		{
+			$assign_code = htmlspecialchars_decode($portal_config['board3_custom_' . $module_id . '_code'], ENT_QUOTES);
+		}
+		
+		$title = (!empty($config['board3_custom_' . $module_id . '_title'])) ? ((isset($user->lang[$config['board3_custom_' . $module_id . '_title']])) ? $user->lang[$config['board3_custom_' . $module_id . '_title']] : $config['board3_custom_' . $module_id . '_title']) : $user->lang[$this->name];
+
+		return array(
+			'template'	=> 'custom_center.html',
+			'title'		=> $title,
+			'code'		=> $assign_code,
+			'image_src'	=> '', // no image for center blocks
+		);
+	}
+
+	function get_template_side($module_id)
+	{
+		global $config, $template, $portal_config, $user;
+
+		/* 
+		* Run generate_text_for_display if the user uses BBCode for designing his custom block
+		* HTML won't be parsed if the user chooses to use BBCodes in the ACP
+		* If BBCodes are turned off, the custom Block code will be directly assigned and HTML will be parsed
+		*/
+		if ($config['board3_custom_' . $module_id . '_bbcode'])
+		{	
+			echo 'shouldn´t be in here';
+			// Generate text for display and assign template vars
+			$uid = $config['board3_custom_' . $module_id . '_uid'];
+			$bitfield = $config['board3_custom_' . $module_id . '_bitfield'];
+			$bbcode_options = OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS;
+			$assign_code = generate_text_for_display($portal_config['board3_custom_' . $module_id . '_code'], $uid, $bitfield, $bbcode_options);
+		}
+		else
+		{
+			$assign_code = htmlspecialchars_decode($portal_config['board3_custom_' . $module_id . '_code'], ENT_QUOTES);
+		}
+		
+		$title = (!empty($config['board3_custom_' . $module_id . '_title'])) ? ((isset($user->lang[$config['board3_custom_' . $module_id . '_title']])) ? $user->lang[$config['board3_custom_' . $module_id . '_title']] : $config['board3_custom_' . $module_id . '_title']) : $user->lang[$this->name];
+
+		return array(
+			'template'	=> 'custom_side.html',
+			'title'		=> $title,
+			'code'		=> $assign_code,
+			'image_src'	=> (!empty($config['board3_custom_' . $module_id . '_image_src'])) ? $config['board3_custom_' . $module_id . '_image_src'] : $this->image_src,
+		);
+	}
+
+	function get_template_acp($module_id)
+	{
+		return array(
+			'title'	=> 'PORTAL_CUSTOM',
+			'vars'	=> array(
+				'legend1'								=> 'PORTAL_CUSTOM',
+				'board3_custom_' . $module_id . '_code'	=> array('lang' => 'PORTAL_CUSTOM',		'validate' => 'string',	'type' => 'custom', 'method' => 'manage_custom', 'submit' => 'update_custom', 'explain' => true),
+			),
+		);
+	}
+
+	/**
+	* API functions
+	*/
+	function install($module_id)
+	{
+		set_portal_config('board3_custom_' . $module_id . '_code', '');
+		set_config('board3_custom_' . $module_id . '_code', '');
+		set_config('board3_custom_' . $module_id . '_bbcode', 1);
+		set_config('board3_custom_' . $module_id . '_title', '');
+		set_config('board3_custom_' . $module_id . '_image_src', '');
+		set_config('board3_custom_' . $module_id . '_uid', '');
+		set_config('board3_custom_' . $module_id . '_bitfield', '');
+		set_config('board3_custom_' . $module_id . '_permission', '');
+		return true;
+	}
+
+	function uninstall($module_id)
+	{
+		global $db;
+
+		$del_config = array(
+			'board3_custom_' . $module_id . '_code',
+		);
+		$sql = 'DELETE FROM ' . PORTAL_CONFIG_TABLE . '
+			WHERE ' . $db->sql_in_set('config_name', $del_config);
+			
+		$check = $db->sql_query($sql);
+
+		$del_config = array(
+			'board3_custom_' . $module_id . '_bbcode',
+			'board3_custom_' . $module_id . '_title',
+			'board3_custom_' . $module_id . '_image_src',
+			'board3_custom_' . $module_id . '_uid',
+			'board3_custom_' . $module_id . '_bitfield',
+			'board3_custom_' . $module_id . '_permission',
+		);
+		$sql = 'DELETE FROM ' . CONFIG_TABLE . '
+			WHERE ' . $db->sql_in_set('config_name', $del_config);
+		return ((!$check) ? $check : $db->sql_query($sql)); // if something went wrong, make sure we are aware of the first query
+	}
+	
+	function manage_custom($value, $key, $module_id)
+	{
+		global $db, $portal_config, $config, $template, $user, $phpEx, $phpbb_admin_path, $phpbb_root_path;
+		
+		$action = (isset($_POST['reset'])) ? 'reset' : '';
+		$action = (isset($_POST['submit'])) ? 'save' : $action;
+		$action = (isset($_POST['preview'])) ? 'preview' : $action;
+		
+		$portal_config = obtain_portal_config();
+
+		$u_action = append_sid($phpbb_admin_path . 'index.' . $phpEx, 'i=portal&amp;mode=config&amp;module_id=' . $module_id);
+		
+		switch($action)
+		{
+			// Save changes
+			case 'save':
+				if (!check_form_key('acp_portal'))
+				{
+					trigger_error($user->lang['FORM_INVALID']. adm_back_link($u_action), E_USER_WARNING);
+				}
+
+				$custom_code = utf8_normalize_nfc(request_var('custom_code', '', true));
+				$custom_bbcode = request_var('custom_use_bbcode', 1); // default to BBCode
+				$custom_permission = request_var('permission-setting', array(0 => ''));
+				$custom_title = utf8_normalize_nfc(request_var('module_name', ''));
+				$custom_image_src = utf8_normalize_nfc(request_var('module_image', ''));
+				$groups_ary = array();
+				$uid = $bitfield = $flags = '';
+				$options = 7;
+				if($custom_bbcode)
+				{
+					generate_text_for_storage($custom_code, $uid, $bitfield, $flags, true, true, true);
+				}
+				
+				
+				// first check for obvious errors, we don't want to waste server resources
+				if(empty($custom_code))
+				{
+					trigger_error($user->lang['ACP_PORTAL_CUSTOM_CODE_SHORT']. adm_back_link($u_action), E_USER_WARNING);
+				}
+				
+				// get groups and check if the selected groups actually exist
+				$sql = 'SELECT group_id
+						FROM ' . GROUPS_TABLE . '
+						ORDER BY group_id ASC';
+				$result = $db->sql_query($sql);
+				while($row = $db->sql_fetchrow($result))
+				{
+					$groups_ary[] = $row['group_id'];
+				}
+				$db->sql_freeresult($result);
+				
+				$custom_permission = array_intersect($custom_permission, $groups_ary);
+				$custom_permission = implode(',', $custom_permission);
+
+				add_log('admin', 'LOG_PORTAL_CONFIG', $user->lang['PORTAL_CUSTOM'] . '&nbsp;-&nbsp;' . $config['board3_custom_' . $module_id . '_title']);
+				
+				// set_portal_config will take care of escaping the welcome message
+				set_portal_config('board3_custom_' . $module_id . '_code', $custom_code);
+				set_config('board3_custom_' . $module_id . '_bbcode', $custom_bbcode);
+				set_config('board3_custom_' . $module_id . '_title', $custom_title);
+				set_config('board3_custom_' . $module_id . '_image_src', $custom_image_src);
+				set_config('board3_custom_' . $module_id . '_uid', $uid);
+				set_config('board3_custom_' . $module_id . '_bitfield', $bitfield);
+				set_config('board3_custom_' . $module_id . '_permission', $custom_permission);
+
+				trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link(($module_id) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=portal&mode=modules') : $u_action));
+
+			break;
+			
+			case 'preview':
+				$custom_code = $text = utf8_normalize_nfc(request_var('custom_code', '', true));
+				$custom_bbcode = request_var('custom_use_bbcode', 1); // default to BBCode
+				$custom_permission = request_var('permission-setting', array(0 => ''));
+				$custom_title = utf8_normalize_nfc(request_var('module_name', ''));
+				$custom_image_src = utf8_normalize_nfc(request_var('module_image', ''));
+				$groups_ary = array();
+				
+				// first check for obvious errors, we don't want to waste server resources
+				if(empty($custom_code))
+				{
+					trigger_error($user->lang['ACP_PORTAL_CUSTOM_CODE_SHORT']. adm_back_link($u_action), E_USER_WARNING);
+				}
+				
+				if (!class_exists('parse_message'))
+				{
+					include($phpbb_root_path . 'includes/message_parser.' . $phpEx);
+				}
+				if($custom_bbcode)
+				{
+					$bbcode_options = OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS;
+					$uid  =  (isset($config['board3_custom_' . $module_id . '_uid'])) ? $config['board3_custom_' . $module_id . '_uid'] : '';
+					$bitfield = (isset($config['board3_custom_' . $module_id . '_bitfield'])) ? $config['board3_custom_' . $module_id . '_bitfield'] : '';
+					$options = OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS;
+					generate_text_for_storage($text, $uid, $bitfield, $options, true, true, true);
+					
+					$text = generate_text_for_display($text, $uid, $bitfield, $options);
+				}
+				else
+				{
+					$text = htmlspecialchars_decode($text, ENT_QUOTES);
+				}
+				
+				$template->assign_vars(array(
+					'PREVIEW_TEXT'		=> $text,
+					'S_PREVIEW'			=> true,
+				));
+				
+				// get groups and check if the selected groups actually exist
+				$sql = 'SELECT group_id
+						FROM ' . GROUPS_TABLE . '
+						ORDER BY group_id ASC';
+				$result = $db->sql_query($sql);
+				while($row = $db->sql_fetchrow($result))
+				{
+					$groups_ary[] = $row['group_id'];
+				}
+				$db->sql_freeresult($result);
+				
+				$temp_permissions = array_intersect($custom_permission, $groups_ary);
+
+			// Edit or add menu item
+			case 'reset':
+			default:
+				if(!isset($custom_code))
+				{
+					$custom_code = generate_text_for_edit($portal_config['board3_custom_' . $module_id . '_code'], $config['board3_custom_' . $module_id . '_uid'], '');
+				}
+
+				$template->assign_vars(array(
+					'CUSTOM_CODE'			=> (is_array($custom_code)) ? $custom_code['text'] : $custom_code,
+					'CUSTOM_USE_BBCODE'		=> (isset($custom_bbcode)) ? $custom_bbcode : (($config['board3_custom_' . $module_id . '_bbcode'] != '') ? $config['board3_custom_' . $module_id . '_bbcode'] : true), // BBCodes are selected by default
+					//'U_BACK'				=> $u_action,
+					'U_ACTION'				=> $u_action,
+					'S_EDIT'				=> true,
+					'S_LINKS_ALLOWED'       => true,
+					'S_BBCODE_IMG'          => true,
+					'S_BBCODE_FLASH'		=> true,
+					'S_BBCODE_QUOTE'		=> true,
+					'S_BBCODE_ALLOWED'		=> true,
+					'MAX_FONT_SIZE'			=> (int) $config['max_post_font_size'],
+				));
+				
+				$groups_ary = (isset($temp_permissions)) ? $temp_permissions : ((isset($config['board3_custom_' . $module_id . '_permission'])) ? explode(',', $config['board3_custom_' . $module_id . '_permission']) : array());
+				
+				// get group info from database and assign the block vars
+				$sql = 'SELECT group_id, group_name 
+						FROM ' . GROUPS_TABLE . '
+						ORDER BY group_id ASC';
+				$result = $db->sql_query($sql);
+				while($row = $db->sql_fetchrow($result))
+				{
+					$template->assign_block_vars('permission_setting', array(
+						'SELECTED'		=> (in_array($row['group_id'], $groups_ary)) ? true : false,
+						'GROUP_NAME'	=> (isset($user->lang['G_' . $row['group_name']])) ? $user->lang['G_' . $row['group_name']] : $row['group_name'],
+						'GROUP_ID'		=> $row['group_id'],
+					));
+				}
+				$db->sql_freeresult($result);
+				
+				if(!function_exists('display_forums'))
+				{
+					include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+				}
+				
+				// Build custom bbcodes array
+				display_custom_bbcodes();
+				$user->add_lang('posting');
+
+			break;		
+		}
+	}
+	
+	function update_custom($key, $module_id)
+	{
+		$this->manage_custom('', $key, $module_id);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/root/styles/prosilver/template/portal/modules/custom_center.html b/root/styles/prosilver/template/portal/modules/custom_center.html
new file mode 100644
index 00000000..86a4288e
--- /dev/null
+++ b/root/styles/prosilver/template/portal/modules/custom_center.html
@@ -0,0 +1,10 @@
+<!--version $Id$ //-->
+{$C_BLOCK_H_L}<dt>{$CUSTOM_TITLE}</dt>{$C_BLOCK_H_R}
+<div class="panel bg1" style="margin-bottom: 0px">
+	<div class="inner"><span class="portal-corners-top-inner"></span>
+		<div class="postbody" style="width: 100%">
+			<div class="content">{$CUSTOM_CODE}</div>
+		</div>
+	<span class="portal-corners-bottom-inner"></span></div>
+</div>
+{$C_BLOCK_F_L}{$C_BLOCK_F_R}
\ No newline at end of file
diff --git a/root/styles/prosilver/template/portal/modules/custom_side.html b/root/styles/prosilver/template/portal/modules/custom_side.html
new file mode 100644
index 00000000..c29be614
--- /dev/null
+++ b/root/styles/prosilver/template/portal/modules/custom_side.html
@@ -0,0 +1,8 @@
+<!--version $Id$ //-->
+{$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="16" height="16" alt="" />&nbsp;<!-- ENDIF -->{$CUSTOM_TITLE}{$LR_BLOCK_H_R}
+   <div class="inner"><span class="portal-corners-top-inner"></span>
+      <div class="postbody" style="width: 100%">
+         <div class="content">{$CUSTOM_CODE}</div>
+      </div>
+   <span class="portal-corners-bottom-inner"></span></div>
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file
diff --git a/root/styles/prosilver/template/portal/portal_body.html b/root/styles/prosilver/template/portal/portal_body.html
index 2ad336f5..5149f919 100644
--- a/root/styles/prosilver/template/portal/portal_body.html
+++ b/root/styles/prosilver/template/portal/portal_body.html
@@ -17,6 +17,8 @@
 			<!-- BEGIN modules_top -->
 				<!-- DEFINE $TEMPLATE_FILE = '{modules_top.TEMPLATE_FILE}' -->
 				<!-- DEFINE $IMAGE_SRC = '{modules_top.IMAGE_SRC}' -->
+				<!-- DEFINE $CUSTOM_CODE = '{modules_top.CODE}' -->
+				<!-- DEFINE $CUSTOM_TITLE = '{modules_top.TITLE}' -->
 				<!-- INCLUDE {$TEMPLATE_FILE} -->
 			<!-- END modules_top -->
 		</td>
@@ -28,6 +30,8 @@
 			<!-- BEGIN modules_left -->
 				<!-- DEFINE $TEMPLATE_FILE = '{modules_left.TEMPLATE_FILE}' -->
 				<!-- DEFINE $IMAGE_SRC = '{modules_left.IMAGE_SRC}' -->
+				<!-- DEFINE $CUSTOM_CODE = '{modules_left.CODE}' -->
+				<!-- DEFINE $CUSTOM_TITLE = '{modules_left.TITLE}' -->
 				<!-- INCLUDE {$TEMPLATE_FILE} -->
 			<!-- END modules_left -->
 		</td>
@@ -38,6 +42,8 @@
 			<!-- BEGIN modules_center -->
 				<!-- DEFINE $TEMPLATE_FILE = '{modules_center.TEMPLATE_FILE}' -->
 				<!-- DEFINE $IMAGE_SRC = '{modules_center.IMAGE_SRC}' -->
+				<!-- DEFINE $CUSTOM_CODE = '{modules_center.CODE}' -->
+				<!-- DEFINE $CUSTOM_TITLE = '{modules_center.TITLE}' -->
 				<!-- INCLUDE {$TEMPLATE_FILE} -->
 			<!-- END modules_center -->
 			<!-- IF S_DISPLAY_JUMPBOX and S_IS_FIXXXXXXXXXXXXXXED -->
@@ -52,6 +58,8 @@
 			<!-- BEGIN modules_right -->
 				<!-- DEFINE $TEMPLATE_FILE = '{modules_right.TEMPLATE_FILE}' -->
 				<!-- DEFINE $IMAGE_SRC = '{modules_right.IMAGE_SRC}' -->
+				<!-- DEFINE $CUSTOM_CODE = '{modules_right.CODE}' -->
+				<!-- DEFINE $CUSTOM_TITLE = '{modules_right.TITLE}' -->
 				<!-- INCLUDE {$TEMPLATE_FILE} -->
 			<!-- END modules_right -->
 		</td>
@@ -63,6 +71,8 @@
 			<!-- BEGIN modules_bottom -->
 				<!-- DEFINE $TEMPLATE_FILE = '{modules_bottom.TEMPLATE_FILE}' -->
 				<!-- DEFINE $IMAGE_SRC = '{modules_bottom.IMAGE_SRC}' -->
+				<!-- DEFINE $CUSTOM_CODE = '{modules_bottom.CODE}' -->
+				<!-- DEFINE $CUSTOM_TITLE = '{modules_bottom.TITLE}' -->
 				<!-- INCLUDE {$TEMPLATE_FILE} -->
 			<!-- END modules_bottom -->
 		</td>
diff --git a/root/styles/prosilver/theme/images/portal/portal_custom.png b/root/styles/prosilver/theme/images/portal/portal_custom.png
new file mode 100644
index 00000000..f9c503e8
Binary files /dev/null and b/root/styles/prosilver/theme/images/portal/portal_custom.png differ