diff --git a/theme/formal_white/config.php b/theme/formal_white/config.php
index 59de7ac5930..84926989204 100644
--- a/theme/formal_white/config.php
+++ b/theme/formal_white/config.php
@@ -24,21 +24,21 @@
  *  http://docs.moodle.org/dev/Themes_2.0
  *
  * @package   theme_formal_white
- * @copyright Mediatouch 2000 (http://mediatouch.it/)
+ * @copyright 2013 Mediatouch 2000, mediatouch.it
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
 $THEME->name = 'formal_white';
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // Name of the theme. Most likely the name of
 // the directory in which this file resides.
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
-$THEME->parents = array('canvas','base');
-/////////////////////////////////////////////////////
+$THEME->parents = array('canvas', 'base');
+// ///////////////////////////////////////////////////
 // Which existing theme(s) in the /theme/ directory
 // do you want this theme to extend. A theme can
 // extend any number of themes. Rather than
@@ -46,7 +46,7 @@ $THEME->parents = array('canvas','base');
 // of the CSS, you can simply create a new theme,
 // extend the theme you like and just add the
 // changes you want to your theme.
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 $THEME->parents_exclude_sheets = array(
@@ -56,33 +56,33 @@ $THEME->parents_exclude_sheets = array(
         'tables',
     ),
 );
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // An array of stylesheets not to inherit from the
 // themes parents
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
-$THEME->sheets = array('frame'     ,'menu', 'course',
-                       'pagelayout','core', 'calendar',
-                       'tabs'      ,'quiz', 'forum',
-                       'block'     ,'formal_white');
-////////////////////////////////////////////////////
+$THEME->sheets = array('frame'     , 'menu', 'course',
+                       'pagelayout', 'core', 'calendar',
+                       'tabs'      , 'quiz', 'forum',
+                       'block'     , 'formal_white');
+// //////////////////////////////////////////////////
 // Name of the stylesheet(s) you've including in
 // this theme's /styles/ directory.
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 $THEME->enable_dock = true;
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // Do you want to use the new navigation dock?
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 $THEME->editor_sheets = array('editor');
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // An array of stylesheets to include within the
 // body of the editor.
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 $THEME->layouts = array(
@@ -177,80 +177,80 @@ $THEME->layouts = array(
         'defaultregion' => 'side-pre',
     ),
 );
-///////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////
 // These are all of the possible layouts in Moodle. The
 // simplest way to do this is to keep the theme and file
 // variables the same for every layout. Including them
 // all in this way allows some flexibility down the road
 // if you want to add a different layout template to a
 // specific page.
-///////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////
 
 
 $THEME->csspostprocess = 'formal_white_user_settings';
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // Allows the user to provide the name of a function
 // that all CSS should be passed to before being
 // delivered.
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 // $THEME->javascripts
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // An array containing the names of JavaScript files
 // located in /javascript/ to include in the theme.
 // (gets included in the head)
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 // $THEME->javascripts_footer
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // As above but will be included in the page footer.
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
-//$THEME->larrow = "&#60";
-////////////////////////////////////////////////////
+// $THEME->larrow = "&#60";
+// //////////////////////////////////////////////////
 // Overrides the left arrow image used throughout
 // Moodle
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
-//$THEME->rarrow = "&#62";
-////////////////////////////////////////////////////
+// $THEME->rarrow = "&#62";
+// //////////////////////////////////////////////////
 // Overrides the right arrow image used throughout Moodle
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 // $THEME->layouts
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // An array setting the layouts for the theme
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 // $THEME->parents_exclude_javascripts
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // An array of JavaScript files NOT to inherit from
 // the themes parents
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 // $THEME->parents_exclude_sheets
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // An array of stylesheets not to inherit from the
 // themes parents
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 // $THEME->plugins_exclude_sheets
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // An array of plugin sheets to ignore and not
 // include.
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 
 
 // $THEME->rendererfactory
-////////////////////////////////////////////////////
+// //////////////////////////////////////////////////
 // Sets a custom render factory to use with the
 // theme, used when working with custom renderers.
-////////////////////////////////////////////////////
\ No newline at end of file
+// //////////////////////////////////////////////////
\ No newline at end of file
diff --git a/theme/formal_white/db/upgrade.php b/theme/formal_white/db/upgrade.php
index 2ee8b7b63ae..ca4a0e2e92c 100644
--- a/theme/formal_white/db/upgrade.php
+++ b/theme/formal_white/db/upgrade.php
@@ -77,11 +77,9 @@ function xmldb_theme_formal_white_upgrade($oldversion) {
     // Moodle v2.3.0 release upgrade line
     // Put any upgrade step following this
 
-
     // Moodle v2.4.0 release upgrade line
     // Put any upgrade step following this
 
-
     // Moodle v2.5.0 release upgrade line.
     // Put any upgrade step following this.
 
diff --git a/theme/formal_white/lang/en/theme_formal_white.php b/theme/formal_white/lang/en/theme_formal_white.php
index 371d9eaa6c5..2285e63e79b 100644
--- a/theme/formal_white/lang/en/theme_formal_white.php
+++ b/theme/formal_white/lang/en/theme_formal_white.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,10 +15,16 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_formal_white', language 'en', branch 'MOODLE_20_STABLE'
+ * Moodle's formal_white theme, an example of how to make a Bootstrap theme
+ *
+ * DO NOT MODIFY THIS THEME!
+ * COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
+ *
+ * For full information about creating Moodle themes, see:
+ * http://docs.moodle.org/dev/Themes_2.0
  *
  * @package   theme_formal_white
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @copyright 2013 Mediatouch 2000, mediatouch.it
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
diff --git a/theme/formal_white/layout/embedded.php b/theme/formal_white/layout/embedded.php
index 1f7fee9627a..325bcb75501 100644
--- a/theme/formal_white/layout/embedded.php
+++ b/theme/formal_white/layout/embedded.php
@@ -1,4 +1,33 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Moodle's formal_white theme
+ *
+ * DO NOT MODIFY THIS THEME!
+ * COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
+ *
+ * For full information about creating Moodle themes, see:
+ * http://docs.moodle.org/dev/Themes_2.0
+ *
+ * @package   theme_formal_white
+ * @copyright 2013 Mediatouch 2000, mediatouch.it
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
 defined('MOODLE_INTERNAL') || die();
 
 echo $OUTPUT->doctype() ?>
diff --git a/theme/formal_white/layout/frontpage.php b/theme/formal_white/layout/frontpage.php
index f187d751729..30e173fa714 100644
--- a/theme/formal_white/layout/frontpage.php
+++ b/theme/formal_white/layout/frontpage.php
@@ -1,5 +1,32 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+/**
+ * Moodle's formal_white theme
+ *
+ * DO NOT MODIFY THIS THEME!
+ * COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
+ *
+ * For full information about creating Moodle themes, see:
+ * http://docs.moodle.org/dev/Themes_2.0
+ *
+ * @package   theme_formal_white
+ * @copyright 2013 Mediatouch 2000, mediatouch.it
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 defined('MOODLE_INTERNAL') || die();
 
 $hasheading = $PAGE->heading;
@@ -62,14 +89,14 @@ echo $OUTPUT->doctype() ?>
                 <div id="frameleft">
                     <div id="frameright">
                         <div id="wrapper">
-<?php } ?>
+    <?php } ?>
 
 <!-- begin of page-header -->
                             <?php if ($hasheading) { ?>
                             <div id="page-header">
 
                                 <div class="headermenu">
-                                    <?php
+                                <?php
                                     echo $OUTPUT->login_info();
                                     if (($CFG->langmenu) && (!empty($PAGE->layout_options['langmenu']))) {
                                         echo $OUTPUT->lang_menu();
@@ -187,7 +214,7 @@ if ($hasfooter) {
                 </div> <!-- </footerframebottom> -->
             </div> <!-- </footerframetop> -->
             <?php }
-            //one more div is waiting to be closed
+            // one more div is waiting to be closed
 
     } else { ?>
 
@@ -203,7 +230,7 @@ if ($hasfooter) {
 
             </div> <!-- </page-footer-content> -->
             <?php }
-            //one more div is waiting to be closed
+            // one more div is waiting to be closed
 
     } ?>
 
diff --git a/theme/formal_white/layout/general.php b/theme/formal_white/layout/general.php
index 4bfef89cefd..5ab1a819719 100644
--- a/theme/formal_white/layout/general.php
+++ b/theme/formal_white/layout/general.php
@@ -1,4 +1,32 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Moodle's formal_white theme
+ *
+ * DO NOT MODIFY THIS THEME!
+ * COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
+ *
+ * For full information about creating Moodle themes, see:
+ * http://docs.moodle.org/dev/Themes_2.0
+ *
+ * @package   theme_formal_white
+ * @copyright 2013 Mediatouch 2000, mediatouch.it
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 defined('MOODLE_INTERNAL') || die();
 
@@ -77,7 +105,7 @@ echo $OUTPUT->doctype() ?>
                             <div id="page-header">
 
                                 <div class="headermenu">
-                                    <?php
+                                <?php
                                     echo $OUTPUT->login_info();
                                     if (($CFG->langmenu) && (!empty($PAGE->layout_options['langmenu']))) {
                                         echo $OUTPUT->lang_menu();
@@ -207,7 +235,7 @@ if ($hasfooter) {
                 </div> <!-- </footerframebottom> -->
             </div> <!-- </footerframetop> -->
             <?php }
-            //one more div is waiting to be closed
+            // one more div is waiting to be closed
 
     } else { ?>
 
@@ -223,13 +251,13 @@ if ($hasfooter) {
 
             </div> <!-- </page-footer-content> -->
             <?php }
-            //one more div is waiting to be closed
+            // one more div is waiting to be closed
 
     } ?>
             <div class="moodledocsleft">
                 <?php
                 echo $OUTPUT->login_info();
-                //echo $OUTPUT->home_link();
+                // echo $OUTPUT->home_link();
                 ?>
                 <div class="moodledocs">
                     <?php echo page_doc_link(get_string('moodledocslink')); ?>
diff --git a/theme/formal_white/layout/report.php b/theme/formal_white/layout/report.php
index 979389c0389..e30a8121d5c 100644
--- a/theme/formal_white/layout/report.php
+++ b/theme/formal_white/layout/report.php
@@ -1,4 +1,32 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Moodle's formal_white theme
+ *
+ * DO NOT MODIFY THIS THEME!
+ * COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
+ *
+ * For full information about creating Moodle themes, see:
+ * http://docs.moodle.org/dev/Themes_2.0
+ *
+ * @package   theme_formal_white
+ * @copyright 2013 Mediatouch 2000, mediatouch.it
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 defined('MOODLE_INTERNAL') || die();
 
@@ -72,13 +100,13 @@ echo $OUTPUT->doctype() ?>
                             <div id="page-header">
 
                                 <div class="headermenu">
-                                    <?php
+                                <?php
                                     echo $OUTPUT->login_info();
                                     if (($CFG->langmenu) && (!empty($PAGE->layout_options['langmenu']))) {
                                         echo $OUTPUT->lang_menu();
                                     }
                                     echo $PAGE->headingmenu;
-                                    ?>
+                                ?>
                                 </div>
 
                                 <?php if ($displaylogo) { ?>
@@ -189,7 +217,7 @@ if ($hasfooter) {
                 </div> <!-- </footerframebottom> -->
             </div> <!-- </footerframetop> -->
             <?php }
-            //one more div is waiting to be closed
+            // one more div is waiting to be closed
 
     } else { ?>
 
@@ -205,13 +233,13 @@ if ($hasfooter) {
 
             </div> <!-- </page-footer-content> -->
             <?php }
-            //one more div is waiting to be closed
+            // one more div is waiting to be closed
 
     } ?>
             <div class="moodledocsleft">
                 <?php
-                //echo $OUTPUT->login_info();
-                //echo $OUTPUT->home_link();
+                // echo $OUTPUT->login_info();
+                // echo $OUTPUT->home_link();
                 echo $OUTPUT->standard_footer_html();
                 ?>
             </div>
@@ -223,7 +251,7 @@ if ($hasfooter) {
 
     <div class="clearfix"></div>
 
-<?php  } //the waiting div has been closed: </page-footer>
+<?php  } // the waiting div has been closed: </page-footer>
     echo $OUTPUT->standard_end_of_body_html(); ?>
 </body>
 </html>
diff --git a/theme/formal_white/lib.php b/theme/formal_white/lib.php
index 367b25f8464..7993eb1adb2 100644
--- a/theme/formal_white/lib.php
+++ b/theme/formal_white/lib.php
@@ -1,4 +1,32 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Moodle's formal_white theme
+ *
+ * DO NOT MODIFY THIS THEME!
+ * COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
+ *
+ * For full information about creating Moodle themes, see:
+ * http://docs.moodle.org/dev/Themes_2.0
+ *
+ * @package   theme_formal_white
+ * @copyright 2013 Mediatouch 2000, mediatouch.it
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/theme/formal_white/settings.php b/theme/formal_white/settings.php
index 7b8ee1b08f0..28ac5f270cc 100644
--- a/theme/formal_white/settings.php
+++ b/theme/formal_white/settings.php
@@ -1,7 +1,31 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Settings for the formal_white theme
+ * Moodle's formal_white theme
+ *
+ * DO NOT MODIFY THIS THEME!
+ * COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
+ *
+ * For full information about creating Moodle themes, see:
+ * http://docs.moodle.org/dev/Themes_2.0
+ *
+ * @package   theme_formal_white
+ * @copyright 2013 Mediatouch 2000, mediatouch.it
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;
@@ -9,7 +33,7 @@ defined('MOODLE_INTERNAL') || die;
 if ($ADMIN->fulltree) {
     // font size reference
     $name = 'theme_formal_white/fontsizereference';
-    $title = get_string('fontsizereference','theme_formal_white');
+    $title = get_string('fontsizereference', 'theme_formal_white');
     $description = get_string('fontsizereferencedesc', 'theme_formal_white');
     $default = '13';
     $choices = array(11=>'11px', 12=>'12px', 13=>'13px', 14=>'14px', 15=>'15px', 16=>'16px');
@@ -19,7 +43,7 @@ if ($ADMIN->fulltree) {
 
     // moodle 1.* like setting
     $name = 'theme_formal_white/noframe';
-    $title = get_string('noframe','theme_formal_white');
+    $title = get_string('noframe', 'theme_formal_white');
     $description = get_string('noframedesc', 'theme_formal_white');
     $default = '0';
     $setting = new admin_setting_configcheckbox($name, $title, $description, $default);
@@ -28,8 +52,8 @@ if ($ADMIN->fulltree) {
 
     // Frame margin
     $name = 'theme_formal_white/framemargin';
-    $title = get_string('framemargin','theme_formal_white');
-    $description = get_string('framemargindesc', 'theme_formal_white', get_string('noframe','theme_formal_white'));
+    $title = get_string('framemargin', 'theme_formal_white');
+    $description = get_string('framemargindesc', 'theme_formal_white', get_string('noframe', 'theme_formal_white'));
     $default = '15';
     $choices = array(0=>'0px', 5=>'5px', 10=>'10px', 15=>'15px', 20=>'20px', 25=>'25px', 30=>'30px', 35=>'35px', 40=>'40px', 45=>'45px', 50=>'50px');
     $setting = new admin_setting_configselect($name, $title, $description, $default, $choices);
@@ -38,7 +62,7 @@ if ($ADMIN->fulltree) {
 
     // Display logo or heading
     $name = 'theme_formal_white/headercontent';
-    $title = get_string('headercontent','theme_formal_white');
+    $title = get_string('headercontent', 'theme_formal_white');
     $description = get_string('headercontentdesc', 'theme_formal_white');
     $default = '1';
     $choices = array(1=>get_string('displaylogo', 'theme_formal_white'), 0=>get_string('displayheading', 'theme_formal_white'));
@@ -48,7 +72,7 @@ if ($ADMIN->fulltree) {
 
     // Trend colour settings
     $name = 'theme_formal_white/trendcolor';
-    $title = get_string('trendcolor','theme_formal_white');
+    $title = get_string('trendcolor', 'theme_formal_white');
     $description = get_string('trendcolordesc', 'theme_formal_white');
     $default = 'mink';
     $trends = get_directory_list($CFG->dirroot.'/theme/formal_white/pix/trend/', '', false, true, false);
@@ -62,7 +86,7 @@ if ($ADMIN->fulltree) {
 
     // Custom site logo setting
     $name = 'theme_formal_white/customlogourl';
-    $title = get_string('customlogourl','theme_formal_white');
+    $title = get_string('customlogourl', 'theme_formal_white');
     $description = get_string('customlogourldesc', 'theme_formal_white');
     $setting = new admin_setting_configstoredfile($name, $title, $description, 'customlogourl');
     $setting->set_updatedcallback('theme_reset_all_caches');
@@ -70,7 +94,7 @@ if ($ADMIN->fulltree) {
 
     // Custom front page site logo setting
     $name = 'theme_formal_white/frontpagelogourl';
-    $title = get_string('frontpagelogourl','theme_formal_white');
+    $title = get_string('frontpagelogourl', 'theme_formal_white');
     $description = get_string('frontpagelogourldesc', 'theme_formal_white');
     $setting = new admin_setting_configstoredfile($name, $title, $description, 'frontpagelogourl');
     $setting->set_updatedcallback('theme_reset_all_caches');
@@ -78,7 +102,7 @@ if ($ADMIN->fulltree) {
 
     // page header background colour setting
     $name = 'theme_formal_white/headerbgc';
-    $title = get_string('headerbgc','theme_formal_white');
+    $title = get_string('headerbgc', 'theme_formal_white');
     $description = get_string('headerbgcdesc', 'theme_formal_white');
     $default = '#E3DFD4';
     $previewconfig = array('selector'=>'#page-header', 'style'=>'backgroundColor');
@@ -88,7 +112,7 @@ if ($ADMIN->fulltree) {
 
     // creditstomoodleorg: ctmo
     $name = 'theme_formal_white/creditstomoodleorg';
-    $title = get_string('creditstomoodleorg','theme_formal_white');
+    $title = get_string('creditstomoodleorg', 'theme_formal_white');
     $description = get_string('creditstomoodleorgdesc', 'theme_formal_white');
     $default = '2';
     $choices = array(2 => get_string('ctmo_ineverypage', 'theme_formal_white'), 1 => get_string('ctmo_onfrontpageonly', 'theme_formal_white'), 0 => get_string('ctmo_no', 'theme_formal_white'));
@@ -98,7 +122,7 @@ if ($ADMIN->fulltree) {
 
     // Block region width
     $name = 'theme_formal_white/blockcolumnwidth';
-    $title = get_string('blockcolumnwidth','theme_formal_white');
+    $title = get_string('blockcolumnwidth', 'theme_formal_white');
     $description = get_string('blockcolumnwidthdesc', 'theme_formal_white');
     $default = '200';
     $choices = array(150=>'150px', 170=>'170px', 200=>'200px', 240=>'240px', 290=>'290px', 350=>'350px', 420=>'420px');
@@ -108,7 +132,7 @@ if ($ADMIN->fulltree) {
 
     // Block padding
     $name = 'theme_formal_white/blockpadding';
-    $title = get_string('blockpadding','theme_formal_white');
+    $title = get_string('blockpadding', 'theme_formal_white');
     $description = get_string('blockpaddingdesc', 'theme_formal_white');
     $default = '8';
     $choices = array(1=>'1px', 2=>'2px', 4=>'4px', 8=>'8px', 12=>'12px', 16=>'16px');
@@ -118,7 +142,7 @@ if ($ADMIN->fulltree) {
 
     // Block content background colour setting
     $name = 'theme_formal_white/blockcontentbgc';
-    $title = get_string('blockcontentbgc','theme_formal_white');
+    $title = get_string('blockcontentbgc', 'theme_formal_white');
     $description = get_string('blockcontentbgcdesc', 'theme_formal_white');
     $default = '#F6F6F6';
     $previewconfig = array('selector'=>'.block .content', 'style'=>'backgroundColor');
@@ -128,7 +152,7 @@ if ($ADMIN->fulltree) {
 
     // Left column colour setting
     $name = 'theme_formal_white/lblockcolumnbgc';
-    $title = get_string('lblockcolumnbgc','theme_formal_white');
+    $title = get_string('lblockcolumnbgc', 'theme_formal_white');
     $description = get_string('lblockcolumnbgcdesc', 'theme_formal_white');
     $default = '#E3DFD4';
     $previewconfig = array('selector'=>'#page-content, #page-content #region-pre, #page-content #region-post-box', 'style'=>'backgroundColor');
@@ -138,7 +162,7 @@ if ($ADMIN->fulltree) {
 
     // Right column colour setting
     $name = 'theme_formal_white/rblockcolumnbgc';
-    $title = get_string('rblockcolumnbgc','theme_formal_white');
+    $title = get_string('rblockcolumnbgc', 'theme_formal_white');
     $description = get_string('rblockcolumnbgcdesc', 'theme_formal_white');
     $default = '';
     $previewconfig = array('selector'=>'#page-content #region-post-box, #page-content #region-post', 'style'=>'backgroundColor');
@@ -148,7 +172,7 @@ if ($ADMIN->fulltree) {
 
     // Foot note setting
     $name = 'theme_formal_white/footnote';
-    $title = get_string('footnote','theme_formal_white');
+    $title = get_string('footnote', 'theme_formal_white');
     $description = get_string('footnotedesc', 'theme_formal_white');
     $default = '';
     $setting = new admin_setting_confightmleditor($name, $title, $description, $default);
@@ -157,7 +181,7 @@ if ($ADMIN->fulltree) {
 
     // Custom CSS file
     $name = 'theme_formal_white/customcss';
-    $title = get_string('customcss','theme_formal_white');
+    $title = get_string('customcss', 'theme_formal_white');
     $description = get_string('customcssdesc', 'theme_formal_white');
     $default = '';
     $setting = new admin_setting_configtextarea($name, $title, $description, $default);
diff --git a/theme/formal_white/style/course.css b/theme/formal_white/style/course.css
index 52274e4a648..b81f2ddc48f 100644
--- a/theme/formal_white/style/course.css
+++ b/theme/formal_white/style/course.css
@@ -9,7 +9,7 @@
 .course-content ul.weeks li.section .right {padding:5px 0;}
 .course-content .single-section .section-navigation {margin-bottom:0;}
 
-/** Course **/
+/** coursebox **/
 .coursebox {border:1px solid #DDD;border-color:#DDDDDD;}
 #page-enrol-index .generalbox.info,
 #page-course-info .generalbox.info {border:none;}
diff --git a/theme/formal_white/style/formal_white.css b/theme/formal_white/style/formal_white.css
index 52461110909..4a81bead0ba 100644
--- a/theme/formal_white/style/formal_white.css
+++ b/theme/formal_white/style/formal_white.css
@@ -224,7 +224,11 @@ pre, code, tt {
 }
 
 /* MDL-29403 */
-.capdefault {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;}
+.capdefault {
+    background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);
+    background-color:[[setting:blockheaderbackground]];
+    background-repeat:repeat-x;
+}
 table#defineroletable th {border-top:none;}
 
 form.loginform .rememberusername {
diff --git a/theme/formal_white/version.php b/theme/formal_white/version.php
index 09d13733ad7..a48d435aaec 100644
--- a/theme/formal_white/version.php
+++ b/theme/formal_white/version.php
@@ -15,11 +15,17 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Label module version info
+ * Moodle's formal_white theme
  *
- * @package    theme_formal_white
- * @copyright  Mediatouch 2000 (http://mediatouch.it/)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * DO NOT MODIFY THIS THEME!
+ * COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
+ *
+ * For full information about creating Moodle themes, see:
+ * http://docs.moodle.org/dev/Themes_2.0
+ *
+ * @package   theme_formal_white
+ * @copyright 2013 Mediatouch 2000, mediatouch.it
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;