diff --git a/theme/formal_white/config.php b/theme/formal_white/config.php
index 2e71288759e..11afab29ed0 100644
--- a/theme/formal_white/config.php
+++ b/theme/formal_white/config.php
@@ -255,4 +255,4 @@ $THEME->csspostprocess = 'formal_white_user_settings';
////////////////////////////////////////////////////
// Sets a custom render factory to use with the
// theme, used when working with custom renderers.
-////////////////////////////////////////////////////
+////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/theme/formal_white/db/install.php b/theme/formal_white/db/install.php
new file mode 100644
index 00000000000..5efe9ca1faf
--- /dev/null
+++ b/theme/formal_white/db/install.php
@@ -0,0 +1,67 @@
+.
+
+/**
+ * formal_white module upgrade code
+ *
+ * This file keeps track of upgrades to
+ * the theme plugin
+ *
+ * Sometimes, changes between versions involve
+ * alterations to database structures and other
+ * major things that may lose the effort they've put
+ * into customising and setting up your theme.
+ *
+ * The upgrade function in this file will attempt
+ * to perform all the necessary actions to upgrade
+ * your older installation to the current version.
+ *
+ * If there's something it cannot do itself, it
+ * will tell you what you need to do.
+ *
+ * The commands in here will all be database-neutral,
+ * using the methods of database_manager class
+ *
+ * Please do not forget to use upgrade_set_timeout()
+ * before any action that may take longer time to finish.
+ *
+ * @package theme
+ * @subpackage formal_white
+ * @copyright Mediatouch 2000 (http://mediatouch.it/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+function xmldb_theme_formal_white_install() {
+ $currentsetting = get_config('theme_formal_white');
+
+ // Remove all the useless settings of the first pre-release
+ // Remove backgroundcolor
+ unset_config('backgroundcolor', 'theme_formal_white');
+ // Remove regionwidth
+ unset_config('regionwidth', 'theme_formal_white');
+ // Remove alwayslangmenu
+ unset_config('alwayslangmenu', 'theme_formal_white');
+
+ // Create a new config setting called lblockcolumnbgc and give it blockcolumnbgc's value.
+ set_config('lblockcolumnbgc', $currentsetting->blockcolumnbgc, 'theme_formal_white');
+ // Remove blockcolumnbgc
+ unset_config('blockcolumnbgc', 'theme_formal_white');
+
+ return true;
+}
\ No newline at end of file
diff --git a/theme/formal_white/lang/en/theme_formal_white.php b/theme/formal_white/lang/en/theme_formal_white.php
index ed545afa006..ed5de001112 100644
--- a/theme/formal_white/lang/en/theme_formal_white.php
+++ b/theme/formal_white/lang/en/theme_formal_white.php
@@ -23,9 +23,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-$string['blockcolumnbgc'] = 'Blocks columns background colour';
-$string['blockcolumnbgcdesc'] = 'This sets the blocks columns background colour for the theme.';
-$string['blockcolumnwidth'] = 'Blocks colum width';
+$string['blockcolumnwidth'] = 'Blocks column width';
$string['blockcolumnwidthdesc'] = 'This sets the blocks column width for the theme. Using widths lower than 200px, the calendar block is not supposed to fit.';
$string['blockcontentbgc'] = 'Blocks content background colour';
$string['blockcontentbgcdesc'] = 'This sets the blocks content background colour for the theme.';
@@ -63,18 +61,22 @@ $string['customcss'] = 'Custom CSS';
$string['customcssdesc'] = 'Any CSS you enter here will be added to every page allowing your to easily customise this theme.';
$string['displaylogo'] = 'Pages header content';
$string['displaylogodesc'] = 'Choose whether display moodle logo or page heading text in the header.';
+$string['fontsizereference'] = 'Font size reference';
+$string['fontsizereferencedesc'] = 'This allows you to set the default font size for this theme. It is not recommended to set this higher than 13px as it is known to cause display problems with certain blocks.';
$string['footnote'] = 'Footnote';
$string['footnotedesc'] = 'The content from this textarea will be displayed in the footer of every page.';
$string['headerbgc'] = 'Header background colour';
$string['headerbgcdesc'] = 'This sets the blocks header background colour for the theme.';
$string['heading'] = 'Display page heading';
+$string['lblockcolumnbgc'] = 'Left column background colour';
+$string['lblockcolumnbgcdesc'] = 'This sets the left column background colour for the theme.';
$string['logo'] = 'logo';
$string['logodesc'] = 'Change the logo of this theme by entering the URL to a new one (i.e., http://www.somesite/animage.png). As a reference, the default logo is 300px wide by 80px high. A transparent .png will work best.
The chosen logo will be shown in each page of the site without any distinction between front page and other pages.';
$string['moodlelogo'] = 'Display moodle logo';
$string['noframe'] = 'Formal white 1.9 look';
$string['noframedesc'] = 'Select this option to require your moodle page to look like moodle 1.*, alias, without the surrounding frame.';
$string['pluginname'] = 'Formal white';
+$string['rblockcolumnbgc'] = 'Right column background colour';
+$string['rblockcolumnbgcdesc'] = 'This sets the right column background colour for the theme. If you leave this empty the left column background color will be used.';
$string['region-side-post'] = 'Right';
-$string['region-side-pre'] = 'Left';
-$string['regionwidth'] = 'Column width';
-$string['regionwidthdesc'] = 'This sets the width of the two block regions that form the left and right columns.';
\ No newline at end of file
+$string['region-side-pre'] = 'Left';
\ No newline at end of file
diff --git a/theme/formal_white/layout/frontpage.php b/theme/formal_white/layout/frontpage.php
index 69eb7d43cc7..35a82c3933c 100644
--- a/theme/formal_white/layout/frontpage.php
+++ b/theme/formal_white/layout/frontpage.php
@@ -168,7 +168,7 @@ if ($hasfooter) {