From 574909efce66a56d69697e35b5c319721bc86295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Sat, 27 Apr 2013 13:22:59 +0200
Subject: [PATCH] MDL-39174 fix phpdocs packages in themes

---
 theme/afterburner/db/upgrade.php                  |  3 +--
 theme/afterburner/version.php                     |  3 +--
 theme/anomaly/config.php                          |  1 -
 theme/anomaly/version.php                         |  3 +--
 theme/arialist/config.php                         |  3 +--
 theme/arialist/lang/en/theme_arialist.php         |  5 ++---
 theme/arialist/version.php                        |  3 +--
 theme/base/config.php                             |  3 +--
 theme/base/version.php                            |  3 +--
 theme/binarius/config.php                         |  3 +--
 theme/binarius/lang/en/theme_binarius.php         |  5 ++---
 theme/binarius/version.php                        |  3 +--
 theme/bootstrapbase/config.php                    |  2 +-
 theme/bootstrapbase/version.php                   |  3 +--
 theme/boxxie/config.php                           |  3 +--
 theme/boxxie/lang/en/theme_boxxie.php             |  5 ++---
 theme/boxxie/version.php                          |  3 +--
 theme/brick/config.php                            |  3 +--
 theme/brick/lang/en/theme_brick.php               |  5 ++---
 theme/brick/version.php                           |  3 +--
 theme/canvas/config.php                           |  3 +--
 theme/canvas/version.php                          |  3 +--
 theme/formal_white/config.php                     |  6 ++----
 theme/formal_white/db/install.php                 |  6 ++----
 theme/formal_white/db/upgrade.php                 |  4 +---
 theme/formal_white/version.php                    |  5 ++---
 theme/formfactor/config.php                       |  3 +--
 theme/formfactor/lang/en/theme_formfactor.php     |  5 ++---
 theme/formfactor/version.php                      |  3 +--
 theme/fusion/config.php                           |  3 +--
 theme/fusion/lang/en/theme_fusion.php             |  5 ++---
 theme/fusion/version.php                          |  3 +--
 theme/image.php                                   |  5 ++---
 theme/index.php                                   |  6 ++++--
 theme/leatherbound/config.php                     |  3 +--
 theme/leatherbound/lang/en/theme_leatherbound.php |  5 ++---
 theme/leatherbound/version.php                    |  3 +--
 theme/magazine/version.php                        |  3 +--
 theme/mymobile/config.php                         |  3 +--
 theme/mymobile/lang/en/theme_mymobile.php         |  5 ++---
 theme/mymobile/layout/embedded.php                |  3 +--
 theme/mymobile/layout/general.php                 |  3 +--
 theme/mymobile/lib.php                            |  3 +--
 theme/mymobile/renderers.php                      | 12 ++++--------
 theme/mymobile/settings.php                       |  3 +--
 theme/mymobile/version.php                        |  6 ++----
 theme/nimble/config.php                           |  3 +--
 theme/nimble/lang/en/theme_nimble.php             |  5 ++---
 theme/nimble/version.php                          |  3 +--
 theme/nonzero/config.php                          |  3 +--
 theme/nonzero/lang/en/theme_nonzero.php           |  5 ++---
 theme/nonzero/lib.php                             |  3 +--
 theme/nonzero/settings.php                        |  3 +--
 theme/nonzero/version.php                         |  3 +--
 theme/overlay/config.php                          |  3 +--
 theme/overlay/lang/en/theme_overlay.php           |  5 ++---
 theme/overlay/version.php                         |  3 +--
 theme/serenity/version.php                        |  3 +--
 theme/sky_high/config.php                         |  3 +--
 theme/sky_high/version.php                        |  3 +--
 theme/splash/version.php                          |  3 +--
 theme/standard/config.php                         |  3 +--
 theme/standard/version.php                        |  3 +--
 theme/standardold/config.php                      | 15 +++------------
 theme/standardold/version.php                     |  3 +--
 theme/styles.php                                  |  3 +--
 theme/styles_debug.php                            |  3 +--
 theme/switchdevice.php                            |  5 ++++-
 theme/yui_combo.php                               |  3 +--
 theme/yui_image.php                               |  3 +--
 70 files changed, 96 insertions(+), 173 deletions(-)

diff --git a/theme/afterburner/db/upgrade.php b/theme/afterburner/db/upgrade.php
index 350feec4d02..1dc107502dd 100644
--- a/theme/afterburner/db/upgrade.php
+++ b/theme/afterburner/db/upgrade.php
@@ -17,8 +17,7 @@
 /**
  * Afterburner upgrades.
  *
- * @package    theme
- * @subpackage afterburner
+ * @package    theme_afterburner
  * @copyright  2013 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/afterburner/version.php b/theme/afterburner/version.php
index 4ec225c138f..bc61f101737 100644
--- a/theme/afterburner/version.php
+++ b/theme/afterburner/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage afterburner
+ * @package    theme_afterburner
  * @copyright  2011 Mary Evans
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/anomaly/config.php b/theme/anomaly/config.php
index 9e840f361bc..c921541e58f 100644
--- a/theme/anomaly/config.php
+++ b/theme/anomaly/config.php
@@ -1,5 +1,4 @@
 <?php
-
 ////////////////////////////////////////////////////////////////////////////////
 /// This file contains a few configuration variables that control
 /// how Moodle uses this theme.
diff --git a/theme/anomaly/version.php b/theme/anomaly/version.php
index 5936ea31af1..5017e4e1725 100644
--- a/theme/anomaly/version.php
+++ b/theme/anomaly/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage anomaly
+ * @package    theme_anomaly
  * @copyright  2010 Patrick Malley (http://newschoollearning.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/arialist/config.php b/theme/arialist/config.php
index f9283a73478..70f9e1c4811 100644
--- a/theme/arialist/config.php
+++ b/theme/arialist/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_arialist
  * @copyright 2010 Patrick Malley (http://newschoollearning.com/)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/arialist/lang/en/theme_arialist.php b/theme/arialist/lang/en/theme_arialist.php
index 0eda6d5cd62..aadc96f017d 100644
--- a/theme/arialist/lang/en/theme_arialist.php
+++ b/theme/arialist/lang/en/theme_arialist.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_arialist', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_arialist', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_arialist
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/arialist/version.php b/theme/arialist/version.php
index 7c81d65a341..9c38e676937 100644
--- a/theme/arialist/version.php
+++ b/theme/arialist/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage arialist
+ * @package    theme_arialist
  * @copyright  2010 Patrick Malley (http://newschoollearning.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/base/config.php b/theme/base/config.php
index d75cfc569b3..bb9e2c4b389 100644
--- a/theme/base/config.php
+++ b/theme/base/config.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
@@ -28,7 +27,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_base
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/base/version.php b/theme/base/version.php
index c7b56375946..af9c9261ce7 100644
--- a/theme/base/version.php
+++ b/theme/base/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage base
+ * @package    theme_base
  * @copyright  2011 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/binarius/config.php b/theme/binarius/config.php
index 1ee59873be7..c1894079474 100644
--- a/theme/binarius/config.php
+++ b/theme/binarius/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_binarius
  * @copyright 2010 Patrick Malley (http://newschoollearning.com/)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/binarius/lang/en/theme_binarius.php b/theme/binarius/lang/en/theme_binarius.php
index 16e01611475..a2d5573540c 100644
--- a/theme/binarius/lang/en/theme_binarius.php
+++ b/theme/binarius/lang/en/theme_binarius.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_binarius', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_binarius', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_binarius
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/binarius/version.php b/theme/binarius/version.php
index 7a42ed2281d..a3873f61df9 100644
--- a/theme/binarius/version.php
+++ b/theme/binarius/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage binarius
+ * @package    theme_binarius
  * @copyright  2010 Patrick Malley (http://newschoollearning.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/bootstrapbase/config.php b/theme/bootstrapbase/config.php
index bd144fc8374..ee16c8a199e 100644
--- a/theme/bootstrapbase/config.php
+++ b/theme/bootstrapbase/config.php
@@ -23,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  * http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   Moodle Bootstrap theme
+ * @package   theme_bootstrapbase
  * @copyright 2013 Bas Brands. www.sonsbeekmedia.nl
  * @authors   Bas Brands, David Scotson
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/theme/bootstrapbase/version.php b/theme/bootstrapbase/version.php
index f1319cec409..886d1b54a82 100644
--- a/theme/bootstrapbase/version.php
+++ b/theme/bootstrapbase/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage bootstrapbase
+ * @package    theme_bootstrapbase
  * @copyright  2013 Bas Brands, www.basbrands.nl
  * @authors   Bas Brands, David Scotson
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/theme/boxxie/config.php b/theme/boxxie/config.php
index 7e05b41bf2a..88e89a5e2fa 100644
--- a/theme/boxxie/config.php
+++ b/theme/boxxie/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_boxxie
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/boxxie/lang/en/theme_boxxie.php b/theme/boxxie/lang/en/theme_boxxie.php
index 7a648a5d960..303f62cff42 100644
--- a/theme/boxxie/lang/en/theme_boxxie.php
+++ b/theme/boxxie/lang/en/theme_boxxie.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_boxxie', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_boxxie', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_boxxie
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/boxxie/version.php b/theme/boxxie/version.php
index 85d002f8431..3b46b47b1cf 100644
--- a/theme/boxxie/version.php
+++ b/theme/boxxie/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage boxxie
+ * @package    theme_boxxie
  * @copyright  2010 Patrick Malley
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/brick/config.php b/theme/brick/config.php
index f6db986eac5..f5c17aa3f34 100644
--- a/theme/brick/config.php
+++ b/theme/brick/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_brick
  * @copyright 2010 John Stabinger (http://newschoollearning.com/)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/brick/lang/en/theme_brick.php b/theme/brick/lang/en/theme_brick.php
index 26d40f2b1ea..d7823e0e070 100644
--- a/theme/brick/lang/en/theme_brick.php
+++ b/theme/brick/lang/en/theme_brick.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_brick', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_brick', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_brick
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/brick/version.php b/theme/brick/version.php
index 491208252ac..1d4d88f19f1 100644
--- a/theme/brick/version.php
+++ b/theme/brick/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage brick
+ * @package    theme_brick
  * @copyright  2010 John Stabinger (http://newschoollearning.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/canvas/config.php b/theme/canvas/config.php
index 9dfd737555d..28eb9e3fadd 100644
--- a/theme/canvas/config.php
+++ b/theme/canvas/config.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
@@ -28,7 +27,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_canvas
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/canvas/version.php b/theme/canvas/version.php
index 5cac8cef1e5..32cb65985d2 100644
--- a/theme/canvas/version.php
+++ b/theme/canvas/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage canvas
+ * @package    theme_canvas
  * @copyright  2010 Patrick Malley
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/formal_white/config.php b/theme/formal_white/config.php
index e6ea9211faa..59de7ac5930 100644
--- a/theme/formal_white/config.php
+++ b/theme/formal_white/config.php
@@ -1,7 +1,4 @@
 <?php
-
-defined('MOODLE_INTERNAL') || die();
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -26,11 +23,12 @@ defined('MOODLE_INTERNAL') || die();
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_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();
 
 $THEME->name = 'formal_white';
 ////////////////////////////////////////////////////
diff --git a/theme/formal_white/db/install.php b/theme/formal_white/db/install.php
index 38d75aa31d1..32e88efcd42 100644
--- a/theme/formal_white/db/install.php
+++ b/theme/formal_white/db/install.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
@@ -39,8 +38,7 @@
  * Please do not forget to use upgrade_set_timeout()
  * before any action that may take longer time to finish.
  *
- * @package    theme
- * @subpackage formal_white
+ * @package    theme_formal_white
  * @copyright  Mediatouch 2000 (http://mediatouch.it/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -50,4 +48,4 @@ defined('MOODLE_INTERNAL') || die();
 function xmldb_theme_formal_white_install() {
 
     return true;
-}
\ No newline at end of file
+}
diff --git a/theme/formal_white/db/upgrade.php b/theme/formal_white/db/upgrade.php
index 5991d016194..c059ca436cf 100644
--- a/theme/formal_white/db/upgrade.php
+++ b/theme/formal_white/db/upgrade.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
@@ -39,8 +38,7 @@
  * Please do not forget to use upgrade_set_timeout()
  * before any action that may take longer time to finish.
  *
- * @package    theme
- * @subpackage formal_white
+ * @package    theme_formal_white
  * @copyright  Mediatouch 2000 (http://mediatouch.it/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/formal_white/version.php b/theme/formal_white/version.php
index 6addea12e4e..432f895a1ad 100644
--- a/theme/formal_white/version.php
+++ b/theme/formal_white/version.php
@@ -17,8 +17,7 @@
 /**
  * Label module version info
  *
- * @package    theme
- * @subpackage formal_white
+ * @package    theme_formal_white
  * @copyright  Mediatouch 2000 (http://mediatouch.it/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -28,4 +27,4 @@ defined('MOODLE_INTERNAL') || die;
 $plugin->version   = 2012112900; // The current module version (Date: YYYYMMDDXX)
 $plugin->requires  = 2012112900; // Requires this Moodle version
 $plugin->component = 'theme_formal_white';
-$plugin->maturity  = MATURITY_STABLE;
\ No newline at end of file
+$plugin->maturity  = MATURITY_STABLE;
diff --git a/theme/formfactor/config.php b/theme/formfactor/config.php
index 0ec27f93187..df63ea7f4c9 100644
--- a/theme/formfactor/config.php
+++ b/theme/formfactor/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_formfactor
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/formfactor/lang/en/theme_formfactor.php b/theme/formfactor/lang/en/theme_formfactor.php
index 88a7860daaf..a5854591e48 100644
--- a/theme/formfactor/lang/en/theme_formfactor.php
+++ b/theme/formfactor/lang/en/theme_formfactor.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_formfactor', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_formfactor', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_formfactor
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/formfactor/version.php b/theme/formfactor/version.php
index 5227f3d3394..79a298d8118 100644
--- a/theme/formfactor/version.php
+++ b/theme/formfactor/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage formfactor
+ * @package    theme_formfactor
  * @copyright  2010 Patrick Malley
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/fusion/config.php b/theme/fusion/config.php
index 3d66e022213..ff5acfd905f 100644
--- a/theme/fusion/config.php
+++ b/theme/fusion/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_fusion
  * @copyright 2010 Patrick Malley (http://newschoollearning.com/)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/fusion/lang/en/theme_fusion.php b/theme/fusion/lang/en/theme_fusion.php
index 85c90b41f8b..a38eb1c5dc8 100644
--- a/theme/fusion/lang/en/theme_fusion.php
+++ b/theme/fusion/lang/en/theme_fusion.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_fusion', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_fusion', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_fusion
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/fusion/version.php b/theme/fusion/version.php
index af3c05f30f0..7596d32dfc3 100644
--- a/theme/fusion/version.php
+++ b/theme/fusion/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage fusion
+ * @package    theme_fusion
  * @copyright  2010 Patrick Malley (http://newschoollearning.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/image.php b/theme/image.php
index 75b7c599617..f3f1c7ab086 100644
--- a/theme/image.php
+++ b/theme/image.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
@@ -18,7 +17,7 @@
 /**
  * This file is responsible for serving the one theme and plugin images.
  *
- * @package   moodlecore
+ * @package   core
  * @copyright 2009 Petr Skoda (skodak)  {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -293,4 +292,4 @@ function cache_image($image, $imagefile, $candidatelocation) {
         @unlink($cacheimage.'.tmp'); // just in case anything fails
     }
     return $cacheimage;
-}
\ No newline at end of file
+}
diff --git a/theme/index.php b/theme/index.php
index ce2a3d10fd1..7f6eb61a032 100644
--- a/theme/index.php
+++ b/theme/index.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,7 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * This page prvides the Administration -> ... -> Theme selector UI.
+ * This page provides the Administration -> ... -> Theme selector UI.
+ *
+ * @package core
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 require_once(dirname(__FILE__) . '/../config.php');
diff --git a/theme/leatherbound/config.php b/theme/leatherbound/config.php
index 3e2d9d126ba..46c0f15665c 100644
--- a/theme/leatherbound/config.php
+++ b/theme/leatherbound/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_leatherbound
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/leatherbound/lang/en/theme_leatherbound.php b/theme/leatherbound/lang/en/theme_leatherbound.php
index b440279b8a7..e8220989211 100644
--- a/theme/leatherbound/lang/en/theme_leatherbound.php
+++ b/theme/leatherbound/lang/en/theme_leatherbound.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_leatherbound', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_leatherbound', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_leatherbound
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/leatherbound/version.php b/theme/leatherbound/version.php
index 4f96fb3bca5..d758c89f091 100644
--- a/theme/leatherbound/version.php
+++ b/theme/leatherbound/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage leatherbound
+ * @package    theme_leatherbound
  * @copyright  2010 Patrick Malley
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/magazine/version.php b/theme/magazine/version.php
index 0b84e728328..315b49bae2c 100644
--- a/theme/magazine/version.php
+++ b/theme/magazine/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage magazine
+ * @package    theme_magazine
  * @copyright  2010 John Stabinger (http://newschoollearning.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/mymobile/config.php b/theme/mymobile/config.php
index 5a2fdd8647c..1870edb2c2f 100644
--- a/theme/mymobile/config.php
+++ b/theme/mymobile/config.php
@@ -17,8 +17,7 @@
 /**
  * Config file for mymobile theme
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/mymobile/lang/en/theme_mymobile.php b/theme/mymobile/lang/en/theme_mymobile.php
index efab4cf0996..68af1e9b65c 100644
--- a/theme/mymobile/lang/en/theme_mymobile.php
+++ b/theme/mymobile/lang/en/theme_mymobile.php
@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Label module version info
+ * mymobile language pack
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/mymobile/layout/embedded.php b/theme/mymobile/layout/embedded.php
index 3c9b6668057..0ee2fd8f3e2 100644
--- a/theme/mymobile/layout/embedded.php
+++ b/theme/mymobile/layout/embedded.php
@@ -17,8 +17,7 @@
 /**
  * Embedded layout for the mymobile theme
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/mymobile/layout/general.php b/theme/mymobile/layout/general.php
index 6b86b6547fa..9a66f134cb4 100644
--- a/theme/mymobile/layout/general.php
+++ b/theme/mymobile/layout/general.php
@@ -17,8 +17,7 @@
 /**
  * General layout for the mymobile theme
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/mymobile/lib.php b/theme/mymobile/lib.php
index 45e2b07834d..36cde181414 100644
--- a/theme/mymobile/lib.php
+++ b/theme/mymobile/lib.php
@@ -17,8 +17,7 @@
 /**
  * Lib file for mymobile theme
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/mymobile/renderers.php b/theme/mymobile/renderers.php
index 13ff0e9feaf..a0005da5b21 100644
--- a/theme/mymobile/renderers.php
+++ b/theme/mymobile/renderers.php
@@ -17,8 +17,7 @@
 /**
  * Renderers for the mymobile theme
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -26,8 +25,7 @@
 /**
  * A custom renderer for the mymobile theme to produce snippets of content.
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -105,8 +103,7 @@ class theme_mymobile_renderer extends plugin_renderer_base {
 /**
  * Overridden core renderer for the mymobile theme
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -802,8 +799,7 @@ class theme_mymobile_core_renderer extends core_renderer {
 /**
  * Overridden choice module renderer for the mymobile theme
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/mymobile/settings.php b/theme/mymobile/settings.php
index 96fd4bd3aa4..e3888c9c73e 100644
--- a/theme/mymobile/settings.php
+++ b/theme/mymobile/settings.php
@@ -17,8 +17,7 @@
 /**
  * settings file for mymobile theme
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/mymobile/version.php b/theme/mymobile/version.php
index 4763657556f..ef77a0e7fe9 100644
--- a/theme/mymobile/version.php
+++ b/theme/mymobile/version.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
@@ -18,8 +17,7 @@
 /**
  * version for mymobile theme
  *
- * @package    theme
- * @subpackage mymobile
+ * @package    theme_mymobile
  * @copyright  John Stabinger
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -29,4 +27,4 @@ defined('MOODLE_INTERNAL') || die;
 $plugin->version = 2012112900;              // The current module version (Date: YYYYMMDDXX)
 $plugin->requires = 2012112900;             // Requires this Moodle version
 $plugin->component = 'theme_mymobile';
-$plugin->maturity = MATURITY_STABLE;
\ No newline at end of file
+$plugin->maturity = MATURITY_STABLE;
diff --git a/theme/nimble/config.php b/theme/nimble/config.php
index bccc74ade2e..82574fce981 100644
--- a/theme/nimble/config.php
+++ b/theme/nimble/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_nimble
  * @copyright 2010 Patrick Malley (http://newschoollearning.com/)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/nimble/lang/en/theme_nimble.php b/theme/nimble/lang/en/theme_nimble.php
index 2f5a16d304e..696a60eea6b 100644
--- a/theme/nimble/lang/en/theme_nimble.php
+++ b/theme/nimble/lang/en/theme_nimble.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_nimble', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_nimble', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_nimble
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/nimble/version.php b/theme/nimble/version.php
index 6dff3a0752e..d9b505614ae 100644
--- a/theme/nimble/version.php
+++ b/theme/nimble/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage nimble
+ * @package    theme_nimble
  * @copyright  2010 Patrick Malley (http://newschoollearning.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/nonzero/config.php b/theme/nonzero/config.php
index fa73b94a988..6a6e1bd246f 100644
--- a/theme/nonzero/config.php
+++ b/theme/nonzero/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_nonzero
  * @copyright 2008 NodeThirtyThree (http://nodethirtythree.com/)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/nonzero/lang/en/theme_nonzero.php b/theme/nonzero/lang/en/theme_nonzero.php
index 32cb24dc378..dd341fefff7 100644
--- a/theme/nonzero/lang/en/theme_nonzero.php
+++ b/theme/nonzero/lang/en/theme_nonzero.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_nonzero', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_nonzero', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_nonzero
  * @copyright 2010 Patrick Malley
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/nonzero/lib.php b/theme/nonzero/lib.php
index 460fef11fa1..e119d76b45d 100644
--- a/theme/nonzero/lib.php
+++ b/theme/nonzero/lib.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
@@ -23,7 +22,7 @@
  *    - Region post width
  *    - Some custom CSS
  *
- * @package  moodlecore
+ * @package  theme_nonzero
  * @copyright 2010 Dietmar Wagner
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/nonzero/settings.php b/theme/nonzero/settings.php
index 8ba71c1c8fb..1b38d4fb42b 100644
--- a/theme/nonzero/settings.php
+++ b/theme/nonzero/settings.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
@@ -23,7 +22,7 @@
  *    - Region post width
  *    - Some custom CSS
  *
- * @package  moodlecore
+ * @package  theme_nonzero
  * @copyright 2010 Dietmar Wagner
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/nonzero/version.php b/theme/nonzero/version.php
index 55286c068d6..c56fe4f4cba 100644
--- a/theme/nonzero/version.php
+++ b/theme/nonzero/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage nonzero
+ * @package    theme_nonzero
  * @copyright  2010 Dietmar Wagner
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/overlay/config.php b/theme/overlay/config.php
index 757bacd1742..4ab175d6438 100644
--- a/theme/overlay/config.php
+++ b/theme/overlay/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_overlay
  * @copyright 2008 NodeThirtyThree (http://nodethirtythree.com/)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/overlay/lang/en/theme_overlay.php b/theme/overlay/lang/en/theme_overlay.php
index f22cab1cfbc..32bc1259bda 100644
--- a/theme/overlay/lang/en/theme_overlay.php
+++ b/theme/overlay/lang/en/theme_overlay.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,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'theme_overlay', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'theme_overlay', language 'en'.
  *
- * @package   moodlecore
+ * @package   theme_overlay
  * @copyright 2010 John Stabinger
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/overlay/version.php b/theme/overlay/version.php
index 33925ae5d56..9d1ea42694c 100644
--- a/theme/overlay/version.php
+++ b/theme/overlay/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage overlay
+ * @package    theme_overlay
  * @copyright  2008 NodeThirtyThree (http://nodethirtythree.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/serenity/version.php b/theme/serenity/version.php
index 777dd6c2bd7..ca76ab81667 100644
--- a/theme/serenity/version.php
+++ b/theme/serenity/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage serenity
+ * @package    theme_serenity
  * @copyright  2010 Patrick Malley (http://newschoollearning.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/sky_high/config.php b/theme/sky_high/config.php
index 99e6e3cacd1..39343f0cb50 100644
--- a/theme/sky_high/config.php
+++ b/theme/sky_high/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_sky_high
   */
 
 $THEME->name = 'sky_high';
diff --git a/theme/sky_high/version.php b/theme/sky_high/version.php
index c450dd6a3fb..75fec465975 100644
--- a/theme/sky_high/version.php
+++ b/theme/sky_high/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage sky_high
+ * @package    theme_sky_high
  * @copyright  2010 John Stabinger (http://newschoollearning.com/)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/splash/version.php b/theme/splash/version.php
index 8a0ec824a55..4f51d30bc4d 100644
--- a/theme/splash/version.php
+++ b/theme/splash/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage splash
+ * @package    theme_splash
  * @copyright  2012 Caroline Kennedy - Synergy Learning
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/standard/config.php b/theme/standard/config.php
index 30df7ae968d..73c25950d62 100644
--- a/theme/standard/config.php
+++ b/theme/standard/config.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
@@ -24,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  *  http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   moodlecore
+ * @package   theme_standard
  * @copyright 2010 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/standard/version.php b/theme/standard/version.php
index 89fefbc1809..98f46017108 100644
--- a/theme/standard/version.php
+++ b/theme/standard/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage standard
+ * @package    theme_standard
  * @copyright  2011 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/standardold/config.php b/theme/standardold/config.php
index 5c8e910b1fe..0c9a219e662 100644
--- a/theme/standardold/config.php
+++ b/theme/standardold/config.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
@@ -15,20 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-
 /**
- * Configuration for Moodle's standard theme.
+ * Configuration for Moodle's legacy standard theme.
  *
- * DO NOT COPY THIS INTO NEW THEMES! Instead use some other theme as a base
- * for your experiments.
+ * Use standard theme or new bootstrapbase instead!!!
  *
- * Options related to theme customisations can be found at
- * http://phpdocs.moodle.org/HEAD/moodlecore/theme_config.html
- *
- * For an overview of how Moodle themes work, Please see
- * http://docs.moodle.org/en/Developement:How_Moodle_outputs_HTML
- *
- * @package   moodlecore
+ * @package   theme_standardold
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/standardold/version.php b/theme/standardold/version.php
index a8bf42d1fe6..9e9e226fbe5 100644
--- a/theme/standardold/version.php
+++ b/theme/standardold/version.php
@@ -17,8 +17,7 @@
 /**
  * Theme version info
  *
- * @package    theme
- * @subpackage standardold
+ * @package    theme_standardold
  * @copyright  2011 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/styles.php b/theme/styles.php
index 44f5825ac68..eeab1ef7904 100644
--- a/theme/styles.php
+++ b/theme/styles.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
@@ -18,7 +17,7 @@
 /**
  * This file is responsible for serving the one huge CSS of each theme.
  *
- * @package   moodlecore
+ * @package   core
  * @copyright 2009 Petr Skoda (skodak)  {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/styles_debug.php b/theme/styles_debug.php
index 140fefdec63..006b81160a8 100644
--- a/theme/styles_debug.php
+++ b/theme/styles_debug.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
@@ -18,7 +17,7 @@
 /**
  * This file is responsible for serving of individual style sheets in designer mode.
  *
- * @package   moodlecore
+ * @package   core
  * @copyright 2009 Petr Skoda (skodak)  {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/switchdevice.php b/theme/switchdevice.php
index c2e41807bcd..084a1adaf82 100644
--- a/theme/switchdevice.php
+++ b/theme/switchdevice.php
@@ -19,6 +19,9 @@
  * 
  * This script doesn't require login as not logged in users should still
  * be able to switch the device theme they are using.
+ *
+ * @package   core
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 require('../config.php');
@@ -30,4 +33,4 @@ require_sesskey();
 
 set_user_device_type($newdevice);
 
-redirect($url);
\ No newline at end of file
+redirect($url);
diff --git a/theme/yui_combo.php b/theme/yui_combo.php
index 957d37f356c..8f73aa90b92 100644
--- a/theme/yui_combo.php
+++ b/theme/yui_combo.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
@@ -18,7 +17,7 @@
 /**
  * This file is responsible for serving of yui images
  *
- * @package   moodlecore
+ * @package   core
  * @copyright 2009 Petr Skoda (skodak)  {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/yui_image.php b/theme/yui_image.php
index 967ed4bc319..508bf3e8786 100644
--- a/theme/yui_image.php
+++ b/theme/yui_image.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
@@ -18,7 +17,7 @@
 /**
  * This file is responsible for serving of yui images
  *
- * @package   moodlecore
+ * @package   core
  * @copyright 2009 Petr Skoda (skodak)  {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */