diff --git a/libraries/import.php b/libraries/import.php
index 3217977a34870..c952eae44b1ae 100644
--- a/libraries/import.php
+++ b/libraries/import.php
@@ -6,8 +6,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-defined('_JEXEC') or die;
-
 // Set the platform root path as a constant if necessary.
 if (!defined('JPATH_PLATFORM')) {
 	define('JPATH_PLATFORM', dirname(__FILE__));
@@ -40,6 +38,8 @@
 	require_once JPATH_PLATFORM.'/loader.php';
 }
 
+class_exists('JLoader') or die;
+
 /**
  * Import the base Joomla Platform libraries.
  */
diff --git a/libraries/joomla/access/rules.php b/libraries/joomla/access/rules.php
index 20b201f9a914a..d61eea6d005ec 100644
--- a/libraries/joomla/access/rules.php
+++ b/libraries/joomla/access/rules.php
@@ -36,8 +36,6 @@ class JRules
 	 *
 	 * @param   mixed  $input  A JSON format string (probably from the database) or a nested array.
 	 *
-	 * @return  JRules
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($input = '')
diff --git a/libraries/joomla/application/application.php b/libraries/joomla/application/application.php
index c95c5be6a9d56..c281c0acae284 100644
--- a/libraries/joomla/application/application.php
+++ b/libraries/joomla/application/application.php
@@ -147,7 +147,7 @@ public function __construct($config = array())
 	 *
 	 * @param   mixed   $client  A client identifier or name.
 	 * @param   array   $config  An optional associative array of configuration settings.
-	 * @param   strong  $prefx   A prefix for class names
+	 * @param   string  $prefx   A prefix for class names
 	 *
 	 * @return  JApplication A JApplication object.
 	 *
@@ -171,7 +171,7 @@ public static function getInstance($client, $config = array(), $prefix = 'J')
 				require_once $path;
 
 				// Create a JRouter object.
-				$classname = $prefix.ucfirst($client);
+				$classname = $prefix . ucfirst($client);
 				$instance = new $classname($config);
 			}
 			else {
@@ -190,6 +190,8 @@ public static function getInstance($client, $config = array(), $prefix = 'J')
 	 *
 	 * @param   array  $options  An optional associative array of configuration settings.
 	 *
+	 * @return  void
+	 *
 	 * @since   11.1
 	 */
 	public function initialise($options = array())
@@ -229,14 +231,14 @@ public function initialise($options = array())
 	 * are then set in the request object to be processed when the application is being
 	 * dispatched.
 	 *
-	 * @return  void;
+	 * @return  void
 	 *
 	 * @since   11.1
 	 */
 	public function route()
 	{
 		// Get the full request URI.
-		$uri	= clone JURI::getInstance();
+		$uri = clone JURI::getInstance();
 
 		$router = $this->getRouter();
 		$result = $router->parse($uri);
@@ -249,7 +251,7 @@ public function route()
 	}
 
 	/**
-	 * Dispatch the applicaiton.
+	 * Dispatch the application.
 	 *
 	 * Dispatching is the process of pulling the option from the request object and
 	 * mapping them to a component. If the component does not exist, it handles
@@ -265,7 +267,7 @@ public function dispatch($component = null)
 	{
 		$document = JFactory::getDocument();
 
-		$document->setTitle($this->getCfg('sitename'). ' - ' .JText::_('JADMINISTRATION'));
+		$document->setTitle($this->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION'));
 		$document->setDescription($this->getCfg('MetaDesc'));
 
 		$contents = JComponentHelper::renderComponent($component);
@@ -346,7 +348,7 @@ public function close($code = 0)
 	 *
 	 * @see     JApplication::enqueueMessage()
 	 */
-	public function redirect($url, $msg='', $msgType='message', $moved = false)
+	public function redirect($url, $msg = '', $msgType = 'message', $moved = false)
 	{
 		// Check for relative internal links.
 		if (preg_match('#^index2?\.php#', $url)) {
@@ -606,7 +608,7 @@ public static function registerEvent($event, $handler)
 	 *
 	 * @since   11.1
 	 */
-	function triggerEvent($event, $args=null)
+	function triggerEvent($event, $args = null)
 	{
 		$dispatcher = JDispatcher::getInstance();
 
@@ -658,7 +660,7 @@ public function login($credentials, $options = array())
 					}
 
 					// Return the error.
-					switch($authorisation->status)
+					switch ($authorisation->status)
 					{
 						case JAuthentication::STATUS_EXPIRED:
 							return JError::raiseWarning('102002', JText::_('JLIB_LOGIN_EXPIRED'));
@@ -750,9 +752,6 @@ public function login($credentials, $options = array())
 	 */
 	public function logout($userid = null, $options = array())
 	{
-		// Initialise variables.
-		$retval = false;
-
 		// Get a user object from the JApplication.
 		$user = JFactory::getUser($userid);
 
@@ -917,7 +916,7 @@ public static function getHash($seed)
 	{
 		$conf = JFactory::getConfig();
 
-		return md5($conf->get('secret').$seed);
+		return md5($conf->get('secret') . $seed);
 	}
 
 	/**
@@ -966,7 +965,7 @@ protected function _createSession($name)
 		$options = array();
 		$options['name'] = $name;
 
-		switch($this->_clientId)
+		switch ($this->_clientId)
 		{
 			case 0:
 				if ($this->getCfg('force_ssl') == 2) {
diff --git a/libraries/joomla/application/categories.php b/libraries/joomla/application/categories.php
index a86f17b3779c5..60c8090167897 100644
--- a/libraries/joomla/application/categories.php
+++ b/libraries/joomla/application/categories.php
@@ -95,8 +95,6 @@ class JCategories
 	 *
 	 * @param   array  $options  Array of options
 	 *
-	 * @return  JCategories object
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($options)
@@ -119,13 +117,13 @@ public function __construct($options)
 	 * @param   string  $extension  Name of the categories extension
 	 * @param   array   $options    An array of options
 	 *
-	 * @return  Jcategories         Jcategories object
+	 * @return  JCategories         JCategories object
 	 *
 	 * @since   11.1
 	 */
 	public static function getInstance($extension, $options = array())
 	{
-		$hash = md5($extension.serialize($options));
+		$hash = md5($extension . serialize($options));
 
 		if (isset(self::$instances[$hash])) {
 			return self::$instances[$hash];
@@ -134,7 +132,7 @@ public static function getInstance($extension, $options = array())
 		$parts = explode('.', $extension);
 		$component = 'com_'.strtolower($parts[0]);
 		$section = count($parts) > 1 ? $parts[1] : '';
-		$classname = ucfirst(substr($component, 4)).ucfirst($section).'Categories';
+		$classname = ucfirst(substr($component, 4)) . ucfirst($section).'Categories';
 
 		if (!class_exists($classname)) {
 			$path = JPATH_SITE . '/components/' . $component . '/helpers/category.php';
@@ -342,7 +340,7 @@ class JCategoryNode extends JObject
 	 *  @var    integer
 	 *  @since  11.1
 	 */
-	public $id					= null;
+	public $id = null;
 
 	/**
 	 * The id of the category in the asset table
@@ -350,7 +348,7 @@ class JCategoryNode extends JObject
 	 * @var    integer
 	 * @since  11.1
 	 */
-	public $asset_id			= null;
+	public $asset_id = null;
 
 	/**
 	 * The id of the parent of category in the asset table, 0 for category root
@@ -359,7 +357,7 @@ class JCategoryNode extends JObject
 	 * @since  11.1
 	 */
 
-	public $parent_id			= null;
+	public $parent_id = null;
 
 	/**
 	 * The lft value for this category in the category tree
@@ -368,7 +366,7 @@ class JCategoryNode extends JObject
 	 * @since  11.1
 	 */
 
-	public $lft					= null;
+	public $lft = null;
 
 	/**
 	 * The rgt value for this category in the category tree
@@ -376,14 +374,14 @@ class JCategoryNode extends JObject
 	 * @var    integer
 	 * @since  11.1
 	 */
-	public $rgt					= null;
+	public $rgt = null;
 	/**
 	 * The depth of this category's position in the category tree
 	 *
 	 * @var    integer
 	 * @since  11.1
 	 */
-	public $level				= null;
+	public $level = null;
 
 	/**
 	 * The extension this category is associated with
@@ -391,7 +389,7 @@ class JCategoryNode extends JObject
 	 * @var    integer
 	 * @since  11.1
 	 */
-	public $extension			= null;
+	public $extension = null;
 
 	/**
 	 * The menu title for the category (a short name)
@@ -399,7 +397,7 @@ class JCategoryNode extends JObject
 	 * @var string
 	 * @since  11.1
 	 */
-	public $title				= null;
+	public $title = null;
 
 	/**
 	 * The the alias for the category
@@ -407,7 +405,7 @@ class JCategoryNode extends JObject
 	 * @var    string
 	 * @since  11.1
 	 */
-	public $alias				= null;
+	public $alias = null;
 
 	/**
 	 * Description of the category.
@@ -415,7 +413,7 @@ class JCategoryNode extends JObject
 	 * @var string
 	 * @since  11.1
 	 */
-	public $description			= null;
+	public $description = null;
 
 	/**
 	 * The publication status of the category
@@ -423,7 +421,7 @@ class JCategoryNode extends JObject
 	 * @var    boolean
 	 * @since  11.1
 	 */
-	public $published			= null;
+	public $published = null;
 
 	/**
 	 * Whether the category is or is not checked out
@@ -431,7 +429,7 @@ class JCategoryNode extends JObject
 	 * @var boolean
 	 * @since  11.1
 	 */
-	public $checked_out			= 0;
+	public $checked_out = 0;
 
 	/**
 	 * The time at which the category was checked out
@@ -439,7 +437,7 @@ class JCategoryNode extends JObject
 	 * @var    time
 	 * @since  11.1
 	 */
-	public $checked_out_time	= 0;
+	public $checked_out_time = 0;
 
 	/**
 	 * Access level for the category
@@ -447,7 +445,7 @@ class JCategoryNode extends JObject
 	 * @var integer
 	 * @since  11.1
 	 */
-	public $access				= null;
+	public $access = null;
 
 	/**
 	 * JSON string of parameters
@@ -455,7 +453,7 @@ class JCategoryNode extends JObject
 	 * @var string
 	 * @since  11.1
 	 */
-	public $params				= null;
+	public $params = null;
 
 	/**
 	 * Metadata description
@@ -464,7 +462,7 @@ class JCategoryNode extends JObject
 	 * @since  11.1
 	 */
 
-	public $metadesc			= null;
+	public $metadesc = null;
 
 	/**
 	 * Key words for meta data
@@ -472,7 +470,7 @@ class JCategoryNode extends JObject
 	 * @var string
 	 * @since  11.1
 	 */
-	public $metakey				= null;
+	public $metakey = null;
 
 	/**
 	 * JSON string of other meta data
@@ -480,9 +478,9 @@ class JCategoryNode extends JObject
 	 * @var string
 	 * @since  11.1
 	 */
-	public $metadata			= null;
+	public $metadata = null;
 
-	public $created_user_id		= null;
+	public $created_user_id = null;
 
 	/**
 	 * The time at which the category was created
@@ -490,9 +488,9 @@ class JCategoryNode extends JObject
 	 * @var    time
 	 * @since  11.1
 	 */
-	public $created_time		= null;
+	public $created_time = null;
 
-	public $modified_user_id	= null;
+	public $modified_user_id = null;
 
 	/**
 	 * The time at which the category was modified
@@ -500,7 +498,7 @@ class JCategoryNode extends JObject
 	 * @var    time
 	 * @since  11.1
 	 */
-	public $modified_time		= null;
+	public $modified_time = null;
 
 	/**
 	 * Nmber of times the category has been viewed
@@ -508,7 +506,7 @@ class JCategoryNode extends JObject
 	 * @var    integer
 	 * @since  11.1
 	 */
-	public $hits				= null;
+	public $hits = null;
 
 	/**
 	 * The language for the category in xx-XX format
@@ -516,7 +514,7 @@ class JCategoryNode extends JObject
 	 * @var    time
 	 * @since  11.1
 	 */
-	public $language			= null;
+	public $language = null;
 
 	/**
 	 * Number of items in this category or descendants of this category
@@ -524,7 +522,7 @@ class JCategoryNode extends JObject
 	 * @var    integer
 	 * @since  11.1
 	 */
-	public $numitems			= null;
+	public $numitems = null;
 
 	/**
 	 * Number of children items
@@ -533,7 +531,7 @@ class JCategoryNode extends JObject
 	 * @since  11.1
 	 */
 
-	public $childrennumitems	= null;
+	public $childrennumitems = null;
 
 	/**
 	 * Slug fo the category (used in URL)
@@ -541,7 +539,7 @@ class JCategoryNode extends JObject
 	 * @var    string
 	 * @since  11.1
 	 */
-	public $slug				= null;
+	public $slug = null;
 
 	/**
 	 * Array of  assets
@@ -549,7 +547,7 @@ class JCategoryNode extends JObject
 	 * @var    array
 	 * @since  11.1
 	 */
-	public $assets				= null;
+	public $assets = null;
 
 	/**
 	 * Parent Category object
@@ -610,8 +608,6 @@ class JCategoryNode extends JObject
 	 *
 	 * @param   $category
 	 *
-	 * @return  JCategoryNode
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($category = null, &$constructor = null)
diff --git a/libraries/joomla/application/cli.php b/libraries/joomla/application/cli.php
index 7663629f320c3..8ae2c082a4e36 100644
--- a/libraries/joomla/application/cli.php
+++ b/libraries/joomla/application/cli.php
@@ -27,7 +27,7 @@ class JCli
 	/**
 	 * The application input object.
 	 *
-	 * @var    JInput
+	 * @var    JInputCli  The application input object.
 	 * @since  11.1
 	 */
 	public $input;
@@ -35,7 +35,7 @@ class JCli
 	/**
 	 * The application configuration object.
 	 *
-	 * @var    JRegistry
+	 * @var    JRegistry  The application configuration object.
 	 * @since  11.1
 	 */
 	protected $config;
@@ -51,8 +51,6 @@ class JCli
 	/**
 	 * Class constructor.
 	 *
-	 * @return  void
-	 *
 	 * @since   11.1
 	 */
 	protected function __construct()
diff --git a/libraries/joomla/application/cli/daemon.php b/libraries/joomla/application/cli/daemon.php
index 57c8b8a3fdc21..b34df564b4964 100644
--- a/libraries/joomla/application/cli/daemon.php
+++ b/libraries/joomla/application/cli/daemon.php
@@ -30,10 +30,42 @@ class JDaemon extends JCli
 	 * @since  11.1
 	 */
 	protected static $signals = array(
-		SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, SIGABRT, SIGIOT, SIGBUS, SIGFPE, SIGUSR1,
-		SIGSEGV, SIGUSR2, SIGPIPE, SIGALRM, SIGTERM, SIGSTKFLT, SIGCLD, SIGCHLD, SIGCONT,
-		SIGTSTP, SIGTTIN, SIGTTOU, SIGURG, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, SIGWINCH,
-		SIGPOLL, SIGIO, SIGPWR, SIGSYS, SIGBABY, SIG_BLOCK, SIG_UNBLOCK, SIG_SETMASK
+		SIGHUP,
+		SIGINT,
+		SIGQUIT,
+		SIGILL,
+		SIGTRAP,
+		SIGABRT,
+		SIGIOT,
+		SIGBUS,
+		SIGFPE,
+		SIGUSR1,
+		SIGSEGV,
+		SIGUSR2,
+		SIGPIPE,
+		SIGALRM,
+		SIGTERM,
+		SIGSTKFLT,
+		SIGCLD,
+		SIGCHLD,
+		SIGCONT,
+		SIGTSTP,
+		SIGTTIN,
+		SIGTTOU,
+		SIGURG,
+		SIGXCPU,
+		SIGXFSZ,
+		SIGVTALRM,
+		SIGPROF,
+		SIGWINCH,
+		SIGPOLL,
+		SIGIO,
+		SIGPWR,
+		SIGSYS,
+		SIGBABY,
+		SIG_BLOCK,
+		SIG_UNBLOCK,
+		SIG_SETMASK
 	);
 
 	/**
@@ -65,8 +97,6 @@ class JDaemon extends JCli
 	/**
 	 * Class constructor.
 	 *
-	 * @return  void
-	 *
 	 * @since   11.1
 	 */
 	protected function __construct()
diff --git a/libraries/joomla/application/component/controller.php b/libraries/joomla/application/component/controller.php
index df8e1ef3c00b2..53fa2b462b6b2 100644
--- a/libraries/joomla/application/component/controller.php
+++ b/libraries/joomla/application/component/controller.php
@@ -153,7 +153,7 @@ class JController extends JObject
 	 *
 	 * @return  void
 	 */
-	public static function addModelPath($path, $prefix='')
+	public static function addModelPath($path, $prefix = '')
 	{
 		jimport('joomla.application.component.model');
 		JModel::addIncludePath($path, $prefix);
@@ -456,6 +456,7 @@ public function authorize($task)
 	 * @param   string  $task  The ACO Section Value to check access on.
 	 *
 	 * @return  boolean  True if authorised
+	 *
 	 * @since   11.1
 	 */
 	public function authorise($task)
@@ -485,6 +486,7 @@ public function authorise($task)
 	 * @param   integer  $id       The ID of the record to add to the edit list.
 	 *
 	 * @return  boolean  True if the ID is in the edit list.
+	 *
 	 * @since   11.1
 	 */
 	protected function checkEditId($context, $id)
@@ -518,6 +520,7 @@ protected function checkEditId($context, $id)
 	 * @param   array   $config  Configuration array for the model. Optional.
 	 *
 	 * @return  mixed   Model object on success; otherwise null failure.
+	 *
 	 * @since   11.1
 	 * @note    Replaces _createModel.
 	 */
@@ -596,6 +599,7 @@ protected function createView($name, $prefix = '', $type = '', $config = array()
 	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
 	 * @return  JController  A JController object to support chaining.
+	 *
 	 * @since   11.1
 	 */
 	public function display($cachable = false, $urlparams = false)
@@ -659,6 +663,7 @@ public function display($cachable = false, $urlparams = false)
 	 * @param   string  $task  The task to perform. If no matching task is found, the '__default' task is executed, if defined.
 	 *
 	 * @return  mixed   The value returned by the called method, false in error case.
+	 *
 	 * @since   11.1
 	 */
 	public function execute($task)
@@ -735,6 +740,7 @@ public function getModel($name = '', $prefix = '', $config = array())
 	 * by passing a $config['name'] in the class constructor
 	 *
 	 * @return  string  The name of the dispatcher
+	 *
 	 * @since   11.1
 	 */
 	public function getName()
@@ -756,6 +762,7 @@ public function getName()
 	 * Get the last task that is being performed or was most recently performed.
 	 *
 	 * @return  string  The task that is being performed or was most recently performed.
+	 *
 	 * @since   11.1
 	 */
 	public function getTask()
@@ -767,6 +774,7 @@ public function getTask()
 	 * Gets the available tasks in the controller.
 	 *
 	 * @return  array  Array[i] of task names.
+	 *
 	 * @since   11.1
 	 */
 	public function getTasks()
@@ -783,6 +791,7 @@ public function getTasks()
 	 * @param   array   $config  Configuration array for view. Optional.
 	 *
 	 * @return  object  Reference to the view or an error.
+	 *
 	 * @since   11.1
 	 */
 	public function getView($name = '', $type = '', $prefix = '', $config = array())
@@ -825,6 +834,7 @@ public function getView($name = '', $type = '', $prefix = '', $config = array())
 	 * @param    integer  $id       The ID of the record to add to the edit list.
 	 *
 	 * @return  void
+	 *
 	 * @since   11.1
 	 */
 	protected function holdEditId($context, $id)
@@ -852,6 +862,7 @@ protected function holdEditId($context, $id)
 	 * Redirects the browser or returns false if no redirect is set.
 	 *
 	 * @return  boolean  False if no redirect exists.
+	 *
 	 * @since   11.1
 	 */
 	public function redirect()
@@ -870,6 +881,7 @@ public function redirect()
 	 * @param   string   $method  The name of the method in the derived class to perform if a named task is not found.
 	 *
 	 * @return  JController  A JController object to support chaining.
+	 *
 	 * @since   11.1
 	 */
 	public function registerDefaultTask($method)
@@ -886,6 +898,7 @@ public function registerDefaultTask($method)
 	 * @param   string   $method  The name of the method in the derived class to perform for this task.
 	 *
 	 * @return  JController  A JController object to support chaining.
+	 *
 	 * @since   11.1
 	 */
 	public function registerTask($task, $method)
@@ -903,6 +916,7 @@ public function registerTask($task, $method)
 	 * @param   string  $task  The task.
 	 *
 	 * @return  JController  This object to support chaining.
+	 *
 	 * @since   11.1
 	 */
 	public function unregisterTask($task)
@@ -919,6 +933,7 @@ public function unregisterTask($task)
 	 * @param   integer  $id       The ID of the record to add to the edit list.
 	 *
 	 * @return  void
+	 *
 	 * @since   11.1
 	 */
 	protected function releaseEditId($context, $id)
diff --git a/libraries/joomla/application/component/controlleradmin.php b/libraries/joomla/application/component/controlleradmin.php
index cb10cc5d50757..fd936d4ea836a 100644
--- a/libraries/joomla/application/component/controlleradmin.php
+++ b/libraries/joomla/application/component/controlleradmin.php
@@ -138,7 +138,7 @@ public function display($cachable = false, $urlparams = false)
 	}
 
 	/**
-	 * Method to publish a list of taxa
+	 * Method to publish a list of items
 	 *
 	 * @return  void
 	 *
diff --git a/libraries/joomla/application/component/controllerform.php b/libraries/joomla/application/component/controllerform.php
index 40daad79d84b1..10f6c242f02c2 100644
--- a/libraries/joomla/application/component/controllerform.php
+++ b/libraries/joomla/application/component/controllerform.php
@@ -66,8 +66,6 @@ class JControllerForm extends JController
 	 *
 	 * @param   array  $config  An optional associative array of configuration settings.
 	 *
-	 * @return  JControllerForm  A JControllerForm object
-	 *
 	 * @see     JController
 	 * @since   11.1
 	 */
@@ -170,6 +168,7 @@ public function add()
 	 * @param   array  $data  An array of input data.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   11.1
 	 */
 	protected function allowAdd($data = array())
@@ -188,6 +187,7 @@ protected function allowAdd($data = array())
 	 * @param   string  $key   The name of the key for the primary key; default is id.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   11.1
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
@@ -204,6 +204,7 @@ protected function allowEdit($data = array(), $key = 'id')
 	 * @param   string  $key   The name of the key for the primary key.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   11.1
 	 */
 	protected function allowSave($data, $key = 'id')
@@ -224,6 +225,7 @@ protected function allowSave($data, $key = 'id')
 	 * @param   object	$model  The model of the component being processed.
 	 *
 	 * @return	boolean	True if successful, false otherwise and internal error is set.
+	 *
 	 * @since	11.1
 	 */
 	public function batch($model)
@@ -251,6 +253,7 @@ public function batch($model)
 	 * @param   string  $key  The name of the primary key of the URL variable.
 	 *
 	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
 	 * @since   11.1
 	 */
 	public function cancel($key = null)
@@ -310,6 +313,7 @@ public function cancel($key = null)
 	 *                           (sometimes required to avoid router collisions).
 	 *
 	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
 	 * @since   11.1
 	 */
 	public function edit($key = null, $urlVar = null)
@@ -372,6 +376,7 @@ public function edit($key = null, $urlVar = null)
 	 * @param   array   $config  Configuration array for model. Optional.
 	 *
 	 * @return  object  The model.
+	 *
 	 * @since   11.1
 	 */
 	public function getModel($name = '', $prefix = '', $config = array('ignore_request' => true))
@@ -390,6 +395,7 @@ public function getModel($name = '', $prefix = '', $config = array('ignore_reque
 	 * @param   string   $urlVar    The name of the URL variable for the id.
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
+	 *
 	 * @since   11.1
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
@@ -442,6 +448,7 @@ protected function getRedirectToListAppend()
 	 * @param   array   $validData  The validated data.
 	 *
 	 * @return  void
+	 *
 	 * @since   11.1
 	 */
 	protected function postSaveHook(JModel &$model, $validData = array())
@@ -455,6 +462,7 @@ protected function postSaveHook(JModel &$model, $validData = array())
 	 * @param   string  $urlVar	The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
 	 *
 	 * @return  boolean  True if successful, false otherwise.
+	 *
 	 * @since   11.1
 	 */
 	public function save($key = null, $urlVar = null)
diff --git a/libraries/joomla/application/component/helper.php b/libraries/joomla/application/component/helper.php
index f006a06156d54..63890962f2f74 100644
--- a/libraries/joomla/application/component/helper.php
+++ b/libraries/joomla/application/component/helper.php
@@ -30,9 +30,10 @@ class JComponentHelper
 	 * Get the component information.
 	 *
 	 * @param   string   $option  The component option.
-	 * @param   boolean  $strict  If set and the component does not exist, the enabled attribue will be set to false.
+	 * @param   boolean  $strict  If set and the component does not exist, the enabled attribute will be set to false.
 	 *
 	 * @return  object   An object with the information for the component.
+	 *
 	 * @since   11.1
 	 */
 	public static function getComponent($option, $strict = false)
@@ -59,6 +60,7 @@ public static function getComponent($option, $strict = false)
 	 * @param   boolean  $strict  If set and the component does not exist, false will be returned.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   11.1
 	 */
 	public static function isEnabled($option, $strict = false)
@@ -92,16 +94,17 @@ public static function getParams($option, $strict = false)
 	 * @param   string  $option  The component option.
 	 * @param   array   $params  The component parameters
 	 *
-	 * @return  void
+	 * @return  object
+	 *
 	 * @since   11.1
 	 */
 	public static function renderComponent($option, $params = array())
 	{
 		// Initialise variables.
-		$app	= JFactory::getApplication();
+		$app = JFactory::getApplication();
 
 		// Load template language files.
-		$template	= $app->getTemplate(true)->template;
+		$template = $app->getTemplate(true)->template;
 		$lang = JFactory::getLanguage();
 		$lang->load('tpl_'.$template, JPATH_BASE, null, false, false)
 			||	$lang->load('tpl_'.$template, JPATH_THEMES."/$template", null, false, false)
@@ -180,6 +183,7 @@ public static function renderComponent($option, $params = array())
 	 * @param   string  $option  The element value for the extension
 	 *
 	 * @return  boolean  True on success
+	 *
 	 * @since   11.1
 	 */
 	protected static function _load($option)
@@ -194,7 +198,7 @@ protected static function _load($option)
 
 		$cache = JFactory::getCache('_system', 'callback');
 
-		self::$_components[$option] =  $cache->get(array($db, 'loadObject'), null, $option, false);
+		self::$_components[$option] = $cache->get(array($db, 'loadObject'), null, $option, false);
 
 		if ($error = $db->getErrorMsg() || empty(self::$_components[$option])) {
 			// Fatal error.
diff --git a/libraries/joomla/application/component/model.php b/libraries/joomla/application/component/model.php
index 166d0ebcdb139..26dc2559a917e 100644
--- a/libraries/joomla/application/component/model.php
+++ b/libraries/joomla/application/component/model.php
@@ -27,7 +27,7 @@ abstract class JModel extends JObject
 	 * @var    boolean
 	 * @since  11.1
 	 */
-	protected $__state_set	= null;
+	protected $__state_set = null;
 
 	/**
 	 * Database Connector
@@ -79,6 +79,7 @@ abstract class JModel extends JObject
 	 * @param   string  $prefix  A prefix for models.
 	 *
 	 * @return  array  An array with directory elements. If prefix is equal to '', all directories are returned.
+	 *
 	 * @since   11.1
 	 */
 	public static function addIncludePath($path = '', $prefix = '')
@@ -118,6 +119,7 @@ public static function addIncludePath($path = '', $prefix = '')
 	 * @param   mixed  $path  The directory as a string or directories as an array to add.
 	 *
 	 * @return  void
+	 *
 	 * @since   11.1
 	 */
 	public static function addTablePath($path)
@@ -133,6 +135,7 @@ public static function addTablePath($path)
 	 * @param   array   $parts  An associative array of filename information.
 	 *
 	 * @return  string  The filename
+	 *
 	 * @since   11.1
 	 */
 	protected static function _createFileName($type, $parts = array())
@@ -156,6 +159,7 @@ protected static function _createFileName($type, $parts = array())
 	 * @param   array   $config  Configuration array for model. Optional.
 	 *
 	 * @return  mixed   A model object or false on failure
+	 *
 	 * @since   11.1
 	 */
 	public static function getInstance($type, $prefix = '', $config = array())
@@ -196,7 +200,6 @@ public static function getInstance($type, $prefix = '', $config = array())
 	 *
 	 * @param   array  $config  An array of configuration options (name, state, dbo, table_path, ignore_request).
 	 *
-	 * @return  JModel  A JModel object
 	 * @since   11.1
 	 */
 	public function __construct($config = array())
@@ -268,6 +271,7 @@ public function __construct($config = array())
 	 * @param   integer  $limit       The number of records.
 	 *
 	 * @return  array  An array of results.
+	 *
 	 * @since   11.1
 	 */
 	protected function _getList($query, $limitstart=0, $limit=0)
@@ -284,6 +288,7 @@ protected function _getList($query, $limitstart=0, $limit=0)
 	 * @param    string  $query  The query.
 	 *
 	 * @return   integer  Number of rows for query
+	 *
 	 * @since    11.1
 	 */
 	protected function _getListCount($query)
@@ -302,6 +307,7 @@ protected function _getListCount($query)
 	 * @param   array   $config  Configuration settings to pass to JTable::getInsance
 	 *
 	 * @return  mixed  Model object or boolean false if failed
+	 *
 	 * @since   11.1
 	 * @see     JTable::getInstance
 	 */
@@ -336,6 +342,7 @@ public function getDbo()
 	 *                 by passing a $config['name'] in the class constructor
 	 *
 	 * @return  string  The name of the model
+	 *
 	 * @since   11.1
 	 */
 	public function getName()
@@ -360,6 +367,7 @@ public function getName()
 	 * @param   mixed   $default   Optional default value
 	 *
 	 * @return  object  The property where specified, the state object where omitted
+	 *
 	 * @since   11.1
 	 */
 	public function getState($property = null, $default = null)
@@ -383,6 +391,7 @@ public function getState($property = null, $default = null)
 	 * @param   array    $options  Configuration array for model. Optional.
 	 *
 	 * @return  JTable  A JTable object
+	 *
 	 * @since   11.1
 	 */
 	public function getTable($name = '', $prefix = 'Table', $options = array())
@@ -422,6 +431,7 @@ protected function populateState()
 	 * @param   object  &$db  A JDatabase based object
 	 *
 	 * @return  void
+	 *
 	 * @since   11.1
 	 */
 	public function setDbo(&$db)
@@ -436,6 +446,7 @@ public function setDbo(&$db)
 	 * @param   mixed   $value     The value of the property to set or null.
 	 *
 	 * @return  mixed  The previous value of the property or null if not set.
+	 *
 	 * @since   11.1
 	 */
 	public function setState($property, $value = null)
diff --git a/libraries/joomla/application/component/modeladmin.php b/libraries/joomla/application/component/modeladmin.php
index ca542495e124a..81cb1ed454ede 100644
--- a/libraries/joomla/application/component/modeladmin.php
+++ b/libraries/joomla/application/component/modeladmin.php
@@ -73,8 +73,6 @@ abstract class JModelAdmin extends JModelForm
 	 *
 	 * @param   array  $config  An optional associative array of configuration settings.
 	 *
-	 * @return  JModelAdmin
-	 *
 	 * @see     JController
 	 * @since   11.1
 	 */
@@ -252,7 +250,7 @@ protected function batchAccess($value, $pks)
 	 */
 	protected function batchCopy($value, $pks)
 	{
-		$categoryId	= (int) $value;
+		$categoryId = (int) $value;
 
 		$table	= $this->getTable();
 		$db		= $this->getDbo();
@@ -397,13 +395,13 @@ protected function batchLanguage($value, $pks)
 	 * @param   integer  $value  The new category ID.
 	 * @param   array    $pks    An array of row IDs.
 	 *
-	 * @return  booelan  True if successful, false otherwise and internal error is set.
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
 	 *
 	 * @since	11.1
 	 */
 	protected function batchMove($value, $pks)
 	{
-		$categoryId	= (int) $value;
+		$categoryId = (int) $value;
 
 		$table	= $this->getTable();
 		$db		= $this->getDbo();
@@ -530,7 +528,7 @@ public function checkin($pks = array())
 		}
 
 		// Check in all items.
-		foreach ($pks as $i => $pk)
+		foreach ($pks as $pk)
 		{
 			if ($table->load($pk)) {
 
@@ -557,6 +555,7 @@ public function checkin($pks = array())
 	 * @param   integer  $pk  The ID of the primary key.
 	 *
 	 * @return  boolean  True if successful, false if an error occurs.
+	 *
 	 * @since   11.1
 	 */
 	public function checkout($pk = null)
@@ -573,6 +572,7 @@ public function checkout($pk = null)
 	 * @param   array    $pks  An array of record primary keys.
 	 *
 	 * @return  boolean  True if successful, false if an error occurs.
+	 *
 	 * @since   11.1
 	 */
 	public function delete(&$pks)
@@ -645,6 +645,7 @@ public function delete(&$pks)
 	 * @param   string	$title			The title.
 	 *
 	 * @return	array   Contains the modified title and alias.
+	 *
 	 * @since	11.1
 	 */
 	protected function generateNewTitle($category_id, $alias, $title)
@@ -674,6 +675,7 @@ protected function generateNewTitle($category_id, $alias, $title)
 	 * @param   integer  $pk  The id of the primary key.
 	 *
 	 * @return  mixed    Object on success, false on failure.
+	 *
 	 * @since   11.1
 	 */
 	public function getItem($pk = null)
@@ -712,6 +714,7 @@ public function getItem($pk = null)
 	 * @param   object  $table  A JTable object.
 	 *
 	 * @return  array  An array of conditions to add to ordering queries.
+	 *
 	 * @since   11.1
 	 */
 	protected function getReorderConditions($table)
@@ -723,6 +726,7 @@ protected function getReorderConditions($table)
 	 * Stock method to auto-populate the model state.
 	 *
 	 * @return  void
+	 *
 	 * @since   11.1
 	 */
 	protected function populateState()
@@ -747,6 +751,7 @@ protected function populateState()
 	 * @param   JTable  $table  A reference to a JTable object.
 	 *
 	 * @return  void
+	 *
 	 * @since   11.1
 	 */
 	protected function prepareTable(&$table)
@@ -761,6 +766,7 @@ protected function prepareTable(&$table)
 	 * @param   integer  $value  The value of the published state.
 	 *
 	 * @return  boolean  True on success.
+	 *
 	 * @since   11.1
 	 */
 	function publish(&$pks, $value = 1)
@@ -820,6 +826,7 @@ function publish(&$pks, $value = 1)
 	 * @param   integer  $delta  Increment, usually +1 or -1
 	 *
 	 * @return  mixed  False on failure or error, true on success, null if the $pk is empty (no items selected).
+	 *
 	 * @since   11.1
 	 */
 	public function reorder($pks, $delta = 0)
@@ -881,6 +888,7 @@ public function reorder($pks, $delta = 0)
 	 * @param   array  $data  The form data.
 	 *
 	 * @return  boolean  True on success, False on error.
+	 *
 	 * @since   11.1
 	 */
 	public function save($data)
@@ -962,6 +970,7 @@ public function save($data)
 	 * @param   integer  $order   +1 or -1
 	 *
 	 * @return  mixed
+	 *
 	 * @since   11.1
 	 */
 	function saveorder($pks = null, $order = null)
diff --git a/libraries/joomla/application/component/modelitem.php b/libraries/joomla/application/component/modelitem.php
index 30b94d3b97147..4fa058bdd8695 100644
--- a/libraries/joomla/application/component/modelitem.php
+++ b/libraries/joomla/application/component/modelitem.php
@@ -43,16 +43,15 @@ abstract class JModelItem extends JModel
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string   $context  A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
 	 *
-	 * @return  string   A store id.
+	 * @return  string  A store id.
 	 *
 	 * @since   11.1
 	 */
 	protected function getStoreId($id = '')
 	{
 		// Compile the store id.
-
 		return md5($id);
 	}
 }
diff --git a/libraries/joomla/application/component/modellist.php b/libraries/joomla/application/component/modellist.php
index 447f1eac692b7..de73c15d4bc30 100644
--- a/libraries/joomla/application/component/modellist.php
+++ b/libraries/joomla/application/component/modellist.php
@@ -58,8 +58,6 @@ class JModelList extends JModel
 	 *
 	 * @param   array  $config  An optional associative array of configuration settings.
 	 *
-	 * @return  JModelList
-	 *
 	 * @see     JController
 	 * @since   11.1
 	 */
@@ -81,7 +79,7 @@ public function __construct($config = array())
 	/**
 	 * Method to cache the last query constructed.
 	 *
-	 * This method ensures that the query is contructed only once for a given state of the model.
+	 * This method ensures that the query is constructed only once for a given state of the model.
 	 *
 	 * @return  JDatabaseQuery  A JDatabaseQuery object
 	 *
diff --git a/libraries/joomla/application/component/view.php b/libraries/joomla/application/component/view.php
index 467bc6632f978..c2a1bce62fbd6 100644
--- a/libraries/joomla/application/component/view.php
+++ b/libraries/joomla/application/component/view.php
@@ -265,7 +265,6 @@ public function assign()
 		return false;
 	}
 
-
 	/**
 	 * Assign variable for the view (by reference).
 	 *
@@ -283,11 +282,12 @@ public function assign()
 	 * $view->ref = &$var1;
 	 * </code>
 	 *
-	 *
 	 * @param   string  $key   The name for the reference in the view.
 	 * @param   mixed   &$val  The referenced variable.
 	 *
 	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   11.1
 	 */
 	public function assignRef($key, &$val)
 	{
@@ -306,8 +306,9 @@ public function assignRef($key, &$val)
 	 * If escaping mechanism is either htmlspecialchars or htmlentities, uses
 	 * {@link $_encoding} setting.
 	 *
-	 * @param   mixed The output to escape.
-	 * @return  mixed    The escaped value.
+	 * @param   mixed $var The output to escape.
+	 *
+	 * @return  mixed The escaped value.
 	 */
 	function escape($var)
 	{
@@ -321,9 +322,10 @@ function escape($var)
 	/**
 	 * Method to get data from a registered model or a property of the view
 	 *
-	 * @param   string   The name of the method to call on the model or the property to get
-	 * @param   string   The name of the model to reference or the default value [optional]
-	 * @return  mixed    The return value of the method
+	 * @param   string $property The name of the method to call on the model or the property to get
+	 * @param   string $default  The name of the model to reference or the default value [optional]
+	 *
+	 * @return  mixed  The return value of the method
 	 */
 	public function get($property, $default = null)
 	{
@@ -360,8 +362,11 @@ public function get($property, $default = null)
 	/**
 	 * Method to get the model object
 	 *
-	 * @param   string   The name of the model (optional)
-	 * @return  mixed    JModel object
+	 * @param   string $name The name of the model (optional)
+	 *
+	 * @return  mixed  JModel object
+	 *
+	 * @since   11.1
 	 */
 	public function getModel($name = null)
 	{
@@ -374,7 +379,7 @@ public function getModel($name = null)
 	/**
 	 * Get the layout.
 	 *
-	 * @return  string   The layout name
+	 * @return  string The layout name
 	 */
 	public function getLayout()
 	{
@@ -384,7 +389,7 @@ public function getLayout()
 	/**
 	 * Get the layout template.
 	 *
-	 * @return  string   The layout template name
+	 * @return  string The layout template name
 	 */
 	public function getLayoutTemplate()
 	{
@@ -397,14 +402,12 @@ public function getLayoutTemplate()
 	 * The model name by default parsed using the classname, or it can be set
 	 * by passing a $config['name'] in the class constructor
 	 *
-	 * @return  string   The name of the model
+	 * @return  string The name of the model
 	 * @since   11.1
 	 */
 	public function getName()
 	{
-		$name = $this->_name;
-
-		if (empty($name))
+		if (empty($this->_name))
 		{
 			$r = null;
 			if (!preg_match('/View((view)*(.*(view)?.*))$/i', get_class($this), $r)) {
@@ -414,10 +417,10 @@ public function getName()
 			{
 				JError::raiseWarning('SOME_ERROR_CODE', JText::_('JLIB_APPLICATION_ERROR_VIEW_GET_NAME_SUBSTRING'));
 			}
-			$name = strtolower($r[3]);
+			$this->_name = strtolower($r[3]);
 		}
 
-		return $name;
+		return $this->_name;
 	}
 
 	/**
@@ -427,10 +430,12 @@ public function getName()
 	 * referenced by the name without JModel, eg. JModelCategory is just
 	 * Category.
 	 *
-	 * @param   object   $model   The model to add to the view.
+	 * @param   object   &$model   The model to add to the view.
 	 * @param   boolean  $default  Is this the default model?
 	 *
 	 * @return  object   The added model
+	 *
+	 * @since   11.1
 	 */
 	public function setModel(&$model, $default = false)
 	{
@@ -447,10 +452,11 @@ public function setModel(&$model, $default = false)
 	 * Sets the layout name to use
 	 *
 	 * @param   string  The layout name or a string in format <template>:<layout file>
+	 *
 	 * @return  string  Previous value
+	 *
 	 * @since   11.1
 	 */
-
 	public function setLayout($layout)
 	{
 		$previous = $this->_layout;
@@ -473,7 +479,9 @@ public function setLayout($layout)
 	 * Allows a different extension for the layout files to be used
 	 *
 	 * @param   string   The extension
+	 *
 	 * @return  string   Previous value
+	 *
 	 * @since   11.1
 	 */
 	public function setLayoutExt($value)
@@ -488,7 +496,11 @@ public function setLayoutExt($value)
 	/**
 	 * Sets the _escape() callback.
 	 *
-	 * @param   mixed The callback for _escape() to use.
+	 * @param  mixed $spec The callback for _escape() to use.
+	 *
+	 * @return void
+	 *
+	 * @since  11.1
 	 */
 	function setEscape($spec)
 	{
@@ -499,7 +511,10 @@ function setEscape($spec)
 	 * Adds to the stack of view script paths in LIFO order.
 	 *
 	 * @param   string|array The directory (-ies) to add.
+	 *
 	 * @return void
+	 *
+	 * @since  11.1
 	 */
 	function addTemplatePath($path)
 	{
@@ -510,7 +525,10 @@ function addTemplatePath($path)
 	 * Adds to the stack of helper script paths in LIFO order.
 	 *
 	 * @param   string|array The directory (-ies) to add.
+	 *
 	 * @return void
+	 *
+	 * @since  11.1
 	 */
 	function addHelperPath($path)
 	{
@@ -522,7 +540,10 @@ function addHelperPath($path)
 	 *
 	 * @param   string   The name of the template source file ...
 	 * 					automatically searches the template paths and compiles as needed.
+	 *
 	 * @return  string   The output of the the template script.
+	 *
+	 * @since  11.1
 	 */
 	public function loadTemplate($tpl = null)
 	{
@@ -598,7 +619,10 @@ public function loadTemplate($tpl = null)
 	 *
 	 * @param   string The name of the helper source file ...
 	 * automatically searches the helper paths and compiles as needed.
+	 *
 	 * @return boolean Returns true if the file was loaded
+	 *
+	 * @since  11.1
 	 */
 	public function loadHelper($hlp = null)
 	{
@@ -652,7 +676,11 @@ protected function _setPath($type, $path)
 	/**
 	 * Adds to the search path for templates and resources.
 	 *
-	 * @param   string|array The directory or stream to search.
+	 * @param  string|array The directory or stream to search.
+	 *
+	 * @return void
+	 *
+	 * @since  11.1
 	 */
 	protected function _addPath($type, $path)
 	{
diff --git a/libraries/joomla/application/helper.php b/libraries/joomla/application/helper.php
index 1859e6d868e08..e0ea848c502a1 100644
--- a/libraries/joomla/application/helper.php
+++ b/libraries/joomla/application/helper.php
@@ -35,7 +35,7 @@ class JApplicationHelper
 	 *
 	 * @since   11.1
 	 */
-	public static function getComponentName($default = NULL)
+	public static function getComponentName($default = null)
 	{
 		static $option;
 
diff --git a/libraries/joomla/application/input.php b/libraries/joomla/application/input.php
index 465fc5746f371..428aab2858818 100644
--- a/libraries/joomla/application/input.php
+++ b/libraries/joomla/application/input.php
@@ -9,7 +9,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-JLoader::discover('JInput', dirname(__FILE__).'/input');
+JLoader::discover('JInput', dirname(__FILE__) . '/input');
 
 jimport('joomla.filter.filterinput');
 
@@ -62,8 +62,6 @@ class JInput
 	 * @param   array  $source   Source data (Optional, default is $_REQUEST)
 	 * @param   array  $options  Array of configuration parameters (Optional)
 	 *
-	 * @return  JInput
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($source = null, $options = array())
diff --git a/libraries/joomla/application/input/cli.php b/libraries/joomla/application/input/cli.php
index 59bcf13c1c6fd..3b8fd067cdc4a 100644
--- a/libraries/joomla/application/input/cli.php
+++ b/libraries/joomla/application/input/cli.php
@@ -43,8 +43,6 @@ class JInputCLI extends JInput
 	 * @param   array  $source   Source data (Optional, default is $_REQUEST)
 	 * @param   array  $options  Array of configuration parameters (Optional)
 	 *
-	 * @return  void
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($source = null, $options = array ())
diff --git a/libraries/joomla/application/input/cookie.php b/libraries/joomla/application/input/cookie.php
index 34e70762ad724..ea1a98d6c968a 100644
--- a/libraries/joomla/application/input/cookie.php
+++ b/libraries/joomla/application/input/cookie.php
@@ -26,8 +26,6 @@ class JInputCookie extends JInput
 	 * @param   array  $source   Ignored.
 	 * @param   array  $options  Array of configuration parameters (Optional)
 	 *
-	 * @return  void
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($source = null, $options = array())
diff --git a/libraries/joomla/application/input/files.php b/libraries/joomla/application/input/files.php
index 27238a9e1c79f..44523fd99be62 100644
--- a/libraries/joomla/application/input/files.php
+++ b/libraries/joomla/application/input/files.php
@@ -20,7 +20,6 @@
  */
 class JInputFiles extends JInput
 {
-
 	protected $decodedData = array();
 
 	/**
diff --git a/libraries/joomla/application/menu.php b/libraries/joomla/application/menu.php
index 8edd73599664a..e94011d969025 100644
--- a/libraries/joomla/application/menu.php
+++ b/libraries/joomla/application/menu.php
@@ -24,7 +24,7 @@ class JMenu extends JObject
 	 * @var    array
 	 * @since   11.1
 	 */
-	protected $_items = array ();
+	protected $_items = array();
 
 	/**
 	 * Identifier of the default menu item
diff --git a/libraries/joomla/application/module/helper.php b/libraries/joomla/application/module/helper.php
index ccc5cfe3be8d0..588b87182243a 100644
--- a/libraries/joomla/application/module/helper.php
+++ b/libraries/joomla/application/module/helper.php
@@ -78,7 +78,6 @@ public static function &getModule($name, $title = null)
 	 */
 	public static function &getModules($position)
 	{
-		$app		= JFactory::getApplication();
 		$position	= strtolower($position);
 		$result		= array();
 
diff --git a/libraries/joomla/application/router.php b/libraries/joomla/application/router.php
index 28dc94cd9765b..1424a1082362a 100644
--- a/libraries/joomla/application/router.php
+++ b/libraries/joomla/application/router.php
@@ -170,7 +170,8 @@ public function build($url)
 	/**
 	 * Get the router mode
 	 *
-	 * @return
+	 * @return  integer
+	 *
 	 * @since   11.1
 	 */
 	public function getMode()
@@ -181,7 +182,7 @@ public function getMode()
 	/**
 	 * Set the router mode
 	 *
-	 * @return
+	 * @return  void
 	 *
 	 * @since   11.1
 	 */
@@ -197,7 +198,7 @@ public function setMode($mode)
 	 * @param   mixed    $value   The value of the variable
 	 * @param   boolean  $create  If True, the variable will be created if it doesn't exist yet
 	 *
-	 * @return
+	 * @return  void
 	 *
 	 * @since   11.1
 	 */
@@ -216,7 +217,8 @@ public function setVar($key, $value, $create = true)
 	 * @param   array    $vars    An associative array with variables
 	 * @param   boolean  $merge   If True, the array will be merged instead of overwritten
 	 *
-	 * @return
+	 * @return  void
+	 *
 	 * @since   11.1
 	 */
 	public function setVars($vars = array(), $merge = true)
@@ -291,7 +293,7 @@ public function attachParseRule($callback)
 	 *
 	 * @param   string   The raw route
 	 *
-	 * @return
+	 * @return  boolean
 	 *
 	 * @since   11.1
 	 */
@@ -365,7 +367,7 @@ protected function _processParseRules(&$uri)
 	 *
 	 * @param   string   The URI
 	 *
-	 * @return
+	 * @return  void
 	 *
 	 * @since   11.1
 	 */
@@ -381,7 +383,7 @@ protected function _processBuildRules(&$uri)
 	 *
 	 * @param   string   $url  The URI
 	 *
-	 * @return  A JURI object
+	 * @return  JURI
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/joomla/application/web/index.html b/libraries/joomla/application/web/index.html
new file mode 100644
index 0000000000000..2efb97f319a35
--- /dev/null
+++ b/libraries/joomla/application/web/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/libraries/joomla/base/adapterinstance.php b/libraries/joomla/base/adapterinstance.php
index 44b9559df1b7e..270259b27d257 100644
--- a/libraries/joomla/base/adapterinstance.php
+++ b/libraries/joomla/base/adapterinstance.php
@@ -16,8 +16,8 @@
  * @subpackage  Base
  * @since       11.1
  */
-class JAdapterInstance extends JObject {
-
+class JAdapterInstance extends JObject
+{
 	/**
 	 * Parent
 	 *
@@ -41,8 +41,6 @@ class JAdapterInstance extends JObject {
 	 * @param   object  $db       Database object [JDatabase instance]
 	 * @param   array   $options  Configuration Options
 	 *
-	 * @return  JAdapterInstance
-	 *
 	 * @since   11.1
 	 */
 	public function __construct(&$parent, &$db, $options = array())
@@ -53,13 +51,14 @@ public function __construct(&$parent, &$db, $options = array())
 		// Set the parent and db in case $options for some reason overrides it.
 		$this->parent = &$parent;
 		// Pull in the global dbo in case something happened to it.
-		$this->db = &$db ? $db : JFactory::getDBO();
+		$this->db = $db ? $db : JFactory::getDBO();
 	}
 
 	/**
 	 * Retrieves the parent object
 	 *
 	 * @return  object parent
+	 *
 	 * @since   11.1
 	 */
 	public function getParent()
diff --git a/libraries/joomla/base/node.php b/libraries/joomla/base/node.php
index 7dbf55b3fe662..2679c61fc4ed3 100644
--- a/libraries/joomla/base/node.php
+++ b/libraries/joomla/base/node.php
@@ -18,7 +18,6 @@
  */
 class JNode extends JObject
 {
-
 	/**
 	 * Parent node
 	 * @var    object
@@ -50,7 +49,7 @@ function __construct()
 	 *
 	 * If the child already has a parent, the link is unset
 	 *
-	 * @param   JNode  $child  The child to be added
+	 * @param   JNode  &$child  The child to be added
 	 *
 	 * @return  void
 	 *
@@ -69,7 +68,7 @@ function addChild(&$child)
 	 *
 	 * If the node already has a parent, the link is unset
 	 *
-	 * @param    mixed  The JNode for parent to be set or null
+	 * @param    mixed &$parent The JNode for parent to be set or null
 	 *
 	 * @return   void
 	 *
@@ -119,13 +118,13 @@ function &getParent()
 	/**
 	 * Test if this node has children
 	 *
-	 * @return   boolean  True if there are chilren
+	 * @return   boolean  True if there are children
 	 *
 	 * @since    11.1
 	 */
 	function hasChildren()
 	{
-		return (bool)count($this->_children);
+		return (bool) count($this->_children);
 	}
 
 	/**
diff --git a/libraries/joomla/base/object.php b/libraries/joomla/base/object.php
index f91d8026382dd..b4e13a1ae0278 100644
--- a/libraries/joomla/base/object.php
+++ b/libraries/joomla/base/object.php
@@ -65,6 +65,7 @@ public function __toString()
 	 * @param   mixed   $default   The default value.
 	 *
 	 * @return  mixed
+	 *
 	 * @since   11.1
 	 */
 	public function def($property, $default=null)
@@ -85,7 +86,7 @@ public function def($property, $default=null)
 	 *
 	 * @see     getProperties()
 	 */
-	public function get($property, $default=null)
+	public function get($property, $default = null)
 	{
 		if (isset($this->$property)) {
 			return $this->$property;
@@ -106,7 +107,7 @@ public function get($property, $default=null)
 	 */
 	public function getProperties($public = true)
 	{
-		$vars  = get_object_vars($this);
+		$vars = get_object_vars($this);
 		if ($public)
 		{
 			foreach ($vars as $key => $value)
@@ -201,7 +202,7 @@ public function setProperties($properties)
 		{
 			foreach ((array) $properties as $k => $v)
 			{
-				// Use the set function which might be overriden.
+				// Use the set function which might be overridden.
 				$this->set($k, $v);
 			}
 			return true;
@@ -225,18 +226,21 @@ public function setError($error)
 	}
 
 	/**
+	 * Converts the object to a string (the class name).
+	 *
 	 * @return  string
 	 *
 	 * @since   11.1
-	 *
 	 * @deprecated  12.1    Use magic method __toString()
 	 * @see         __toString()
 	 */
 	function toString()
 	{
+		// @codeCoverageIgnoreStart
 		// Deprecation warning.
 		JLog::add('JObject::toString() is deprecated.', JLog::WARNING, 'deprecated');
 
 		return $this->__toString();
+		// @codeCoverageIgnoreEnd
 	}
 }
diff --git a/libraries/joomla/base/observable.php b/libraries/joomla/base/observable.php
index 75ba817f85e01..b64eeee9566d8 100644
--- a/libraries/joomla/base/observable.php
+++ b/libraries/joomla/base/observable.php
@@ -15,6 +15,8 @@
  * @package     Joomla.Platform
  * @subpackage  Base
  * @since       11.1
+ * @deprecated  12.3
+ * @codeCoverageIgnore
  */
 class JObservable extends JObject
 {
@@ -23,6 +25,7 @@ class JObservable extends JObject
 	 *
 	 * @var    array
 	 * @since  11.1
+	 * @deprecated  12.3
 	 */
 	protected $_observers = array();
 
@@ -31,6 +34,7 @@ class JObservable extends JObject
 	 *
 	 * @var    mixed
 	 * @since  11.1
+	 * @deprecated  12.3
 	 */
 	protected $_state = null;
 
@@ -39,6 +43,7 @@ class JObservable extends JObject
 	 *
 	 * @var    array
 	 * @since  11.1
+	 * @deprecated  12.3
 	 */
 	protected $_methods = array();
 
@@ -46,6 +51,8 @@ class JObservable extends JObject
 	 * Constructor
 	 *
 	 * Note: Make Sure it's not directly instansiated
+	 *
+	 * @deprecated  12.3
 	 */
 	public function __construct()
 	{
@@ -56,7 +63,9 @@ public function __construct()
 	 * Get the state of the JObservable object
 	 *
 	 * @return  mixed    The state of the object.
+	 *
 	 * @since   11.1
+	 * @deprecated  12.3
 	 */
 	public function getState()
 	{
@@ -67,7 +76,9 @@ public function getState()
 	 * Update each attached observer object and return an array of their return values
 	 *
 	 * @return  array    Array of return values from the observers
+	 *
 	 * @since   11.1
+	 * @deprecated  12.3
 	 */
 	public function notify()
 	{
@@ -86,7 +97,9 @@ public function notify()
 	 * @param   object   $observer  An observer object to attach
 	 *
 	 * @return  void
+	 *
 	 * @since   11.1
+	 * @deprecated  12.3
 	 */
 	public function attach($observer)
 	{
@@ -128,7 +141,7 @@ public function attach($observer)
 
 		$key = key($this->_observers);
 
-		foreach($methods as $method)
+		foreach ($methods as $method)
 		{
 			$method = strtolower($method);
 
@@ -145,9 +158,10 @@ public function attach($observer)
 	 *
 	 * @param   object   $observer  An observer object to detach.
 	 *
-	 * @return  bool  True if the observer object was detached.
+	 * @return  boolean  True if the observer object was detached.
 	 *
 	 * @since   11.1
+	 * @deprecated  12.3
 	 */
 	public function detach($observer)
 	{
@@ -160,7 +174,7 @@ public function detach($observer)
 			unset($this->_observers[$key]);
 			$retval = true;
 
-			foreach($this->_methods as &$method)
+			foreach ($this->_methods as &$method)
 			{
 				$k = array_search($key, $method);
 
diff --git a/libraries/joomla/base/observer.php b/libraries/joomla/base/observer.php
index d56915b8a369c..ece192a2a9b6e 100644
--- a/libraries/joomla/base/observer.php
+++ b/libraries/joomla/base/observer.php
@@ -15,6 +15,8 @@
  * @package     Joomla.Platform
  * @subpackage  Base
  * @since       11.1
+ * @deprecated  12.3
+ * @codeCoverageIgnore
  */
 abstract class JObserver extends JObject
 {
@@ -23,17 +25,17 @@ abstract class JObserver extends JObject
 	 *
 	 * @var    object
 	 * @since  11.1
+	 * @deprecated  12.3
 	 */
 	protected $_subject = null;
 
 	/**
 	 * Constructor
 	 *
-	 * @param   object  $subject  The object to observe.
-	 *
-	 * @return  JObserver
+	 * @param   object  &$subject  The object to observe.
 	 *
 	 * @since   11.1
+	 * @deprecated  12.3
 	 */
 	public function __construct(&$subject)
 	{
@@ -47,10 +49,12 @@ public function __construct(&$subject)
 	/**
 	 * Method to update the state of observable objects
 	 *
-	 * @param   array  $args  An array of arguments to pass to the listener.
+	 * @param   array  &$args  An array of arguments to pass to the listener.
 	 *
 	 * @return  mixed
+	 *
 	 * @since   11.1
+	 * @deprecated  12.3
 	 */
 	public abstract function update(&$args);
 }
diff --git a/libraries/joomla/base/tree.php b/libraries/joomla/base/tree.php
index c0cd01d1d41bd..e52525059f15c 100644
--- a/libraries/joomla/base/tree.php
+++ b/libraries/joomla/base/tree.php
@@ -39,8 +39,6 @@ class JTree extends JObject
 	/**
 	 * Constructor
 	 *
-	 * @return  JTree
-	 *
 	 * @since   11.1
 	 */
 	function __construct()
@@ -52,8 +50,8 @@ function __construct()
 	/**
 	 * Method to add a child
 	 *
-	 * @param   array   $node.
-	 * @param   boolean $setCurrent
+	 * @param   array    &$node       The node to process
+	 * @param   boolean  $setCurrent  True to set as current working node
 	 *
 	 * @return  mixed
 	 *
diff --git a/libraries/joomla/cache/cache.php b/libraries/joomla/cache/cache.php
index f7c51a7595f27..b6d4e19ef8bcf 100644
--- a/libraries/joomla/cache/cache.php
+++ b/libraries/joomla/cache/cache.php
@@ -15,22 +15,13 @@
 //Register the controller class with the loader
 JLoader::register('JCacheController', dirname(__FILE__) . '/controller.php');
 
-/**
- * Joomla! Cache base object
- *
- * @package     Joomla.Platform
- * @subpackage  Cache
- * @since       11.1
- */
-
 // Almost everything must be public here to allow overloading.
 
-
 /**
- * Class that handles cache routines.
+ * Joomla! Cache base object
  *
  * @package     Joomla.Platform
- * @subpackage  Access
+ * @subpackage  Cache
  * @since       11.1
  */
 class JCache extends JObject
@@ -271,7 +262,7 @@ public function remove($id, $group=null)
 	 *
 	 * @since   11.1
 	 */
-	public function clean($group=null, $mode='group')
+	public function clean($group = null, $mode = 'group')
 	{
 		// Get the default group
 		$group = ($group) ? $group : $this->_options['defaultgroup'];
@@ -312,7 +303,7 @@ public function gc()
 	 *
 	 * @since   11.1
 	 */
-	public function lock($id, $group=null, $locktime=null)
+	public function lock($id, $group = null, $locktime = null)
 	{
 		$returning = new stdClass;
 		$returning->locklooped = false;
diff --git a/libraries/joomla/cache/controller/output.php b/libraries/joomla/cache/controller/output.php
index 7488b2e0e59e5..2836ba7ff2c93 100644
--- a/libraries/joomla/cache/controller/output.php
+++ b/libraries/joomla/cache/controller/output.php
@@ -43,7 +43,7 @@ class JCacheControllerOutput extends JCacheController
 	 *
 	 * @since   11.1
 	 */
-	public function start($id, $group=null)
+	public function start($id, $group = null)
 	{
 		// If we have data in cache use that.
 		$data = $this->cache->get($id, $group);
@@ -86,6 +86,7 @@ public function start($id, $group=null)
 	 * Stop the cache buffer and store the cached data
 	 *
 	 * @return  boolean  True if cache stored
+	 *
 	 * @since   11.1
 	 */
 	public function end()
diff --git a/libraries/joomla/cache/controller/page.php b/libraries/joomla/cache/controller/page.php
index 102255901c052..ef511487ebeb9 100644
--- a/libraries/joomla/cache/controller/page.php
+++ b/libraries/joomla/cache/controller/page.php
@@ -19,25 +19,19 @@
 class JCacheControllerPage extends JCacheController
 {
 	/**
-	 * ID property for the cache page object.
-	 *
-	 * @var    integer
+	 * @var    integer  ID property for the cache page object.
 	 * @since  11.1
 	 */
 	protected $_id;
 
 	/**
-	 * Cache group
-	 *
-	 * @var    string
+	 * @var    string  Cache group
 	 * @since  11.1
 	 */
 	protected $_group;
 
 	/**
-	 * Cache lock test
-	 *
-	 * @var    object
+	 * @var    object  Cache lock test
 	 * @since  11.1
 	 */
 	protected $_locktest = null;
@@ -52,7 +46,7 @@ class JCacheControllerPage extends JCacheController
 	 *
 	 * @since   11.1
 	 */
-	public function get($id=false, $group='page', $wrkarounds=true)
+	public function get($id = false, $group = 'page', $wrkarounds = true)
 	{
 		// Initialise variables.
 		$data = false;
@@ -113,7 +107,7 @@ public function get($id=false, $group='page', $wrkarounds=true)
 	 *
 	 * @since   11.1
 	 */
-	public function store($wrkarounds=true)
+	public function store($wrkarounds = true)
 	{
 		// Get page data from JResponse body
 		$data = JResponse::getBody();
diff --git a/libraries/joomla/cache/controller/view.php b/libraries/joomla/cache/controller/view.php
index 8d105d1bf193f..ac2dfec94c5bf 100644
--- a/libraries/joomla/cache/controller/view.php
+++ b/libraries/joomla/cache/controller/view.php
@@ -30,7 +30,7 @@ class JCacheControllerView extends JCacheController
 	 *
 	 * @since   11.1
 	 */
-	public function get(&$view, $method, $id=false, $wrkarounds=true)
+	public function get(&$view, $method, $id = false, $wrkarounds = true)
 	{
 		// If an id is not given generate it from the request
 		if ($id == false) {
diff --git a/libraries/joomla/cache/storage/cachelite.php b/libraries/joomla/cache/storage/cachelite.php
index 7e48b85fa5cff..706477cddf8ca 100644
--- a/libraries/joomla/cache/storage/cachelite.php
+++ b/libraries/joomla/cache/storage/cachelite.php
@@ -36,8 +36,6 @@ class JCacheStorageCachelite extends JCacheStorage
 	 *
 	 * @param   array  $options  Optional parameters.
 	 *
-	 * @return  JCacheStorageCachelite
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($options = array())
@@ -102,7 +100,6 @@ public function get($id, $group, $checkTime = true)
 		return $data;
 	}
 
-
 	/**
 	 * Get all cached data
 	 *
diff --git a/libraries/joomla/cache/storage/eaccelerator.php b/libraries/joomla/cache/storage/eaccelerator.php
index 785022fae36c8..473ebf07edb71 100644
--- a/libraries/joomla/cache/storage/eaccelerator.php
+++ b/libraries/joomla/cache/storage/eaccelerator.php
@@ -24,8 +24,6 @@ class JCacheStorageEaccelerator extends JCacheStorage
 	 *
 	 * @param   array  $options  Optional parameters.
 	 *
-	 * @return  JCacheStorageEaccelerator
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($options = array())
diff --git a/libraries/joomla/cache/storage/file.php b/libraries/joomla/cache/storage/file.php
index ccf564dc0d7ae..d329cba5f81c9 100644
--- a/libraries/joomla/cache/storage/file.php
+++ b/libraries/joomla/cache/storage/file.php
@@ -200,6 +200,7 @@ public function clean($group, $mode = null)
 	 * Garbage collect expired cache data
 	 *
 	 * @return  boolean  True on success, false otherwise.
+	 *
 	 * @since   11.1
 	 */
 	public function gc()
diff --git a/libraries/joomla/cache/storage/helpers/helper.php b/libraries/joomla/cache/storage/helpers/helper.php
index 1f2b3e79d1378..0dffee972d64a 100644
--- a/libraries/joomla/cache/storage/helpers/helper.php
+++ b/libraries/joomla/cache/storage/helpers/helper.php
@@ -47,8 +47,6 @@ class JCacheStorageHelper
 	 *
 	 * @param   string  $group  The cache data group
 	 *
-	 * @return  JCacheStorageHelper
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($group)
diff --git a/libraries/joomla/cache/storage/memcache.php b/libraries/joomla/cache/storage/memcache.php
index 009ede2da7b37..7a84466ba3302 100644
--- a/libraries/joomla/cache/storage/memcache.php
+++ b/libraries/joomla/cache/storage/memcache.php
@@ -41,8 +41,6 @@ class JCacheStorageMemcache extends JCacheStorage
 	 *
 	 * @param   array  $options  Optional parameters.
 	 *
-	 * @return  JCacheStorageMemcache
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($options = array())
@@ -116,6 +114,7 @@ public function get($id, $group, $checkTime = true)
 	 * Get all cached data
 	 *
 	 * @return  array    data
+	 *
 	 * @since   11.1
 	 */
 	public function getAll()
@@ -420,6 +419,7 @@ protected function lockindex()
 	 * Unlock cache index
 	 *
 	 * @return  boolean  True on success, false otherwise.
+	 *
 	 * @since   11.1
 	 */
 	protected function unlockindex()
diff --git a/libraries/joomla/cache/storage/wincache.php b/libraries/joomla/cache/storage/wincache.php
index ca19310a2ada6..147d84cf0a43c 100644
--- a/libraries/joomla/cache/storage/wincache.php
+++ b/libraries/joomla/cache/storage/wincache.php
@@ -24,8 +24,6 @@ class JCacheStorageWincache extends JCacheStorage
 	 *
 	 * @param   array  $options  Optional parameters.
 	 *
-	 * @return  JCacheStorageWincache
-	 *
 	 * @since   11.1
 	 */
 	public function __construct( $options = array() )
@@ -55,6 +53,7 @@ public function get($id, $group, $checkTime = true)
 	 * Get all cached data
 	 *
 	 * @return  array    data
+	 *
 	 * @since   11.1
 	 */
 	public function getAll()
@@ -153,6 +152,7 @@ public function clean($group, $mode = null)
 	 * Force garbage collect expired cache data as items are removed only on get/add/delete/info etc
 	 *
 	 * @return  boolean  True on success, false otherwise.
+	 *
 	 * @since   11.1
 	 */
 	public function gc()
diff --git a/libraries/joomla/client/ftp.php b/libraries/joomla/client/ftp.php
index 8e601e5b1205c..ce230798e56c1 100644
--- a/libraries/joomla/client/ftp.php
+++ b/libraries/joomla/client/ftp.php
@@ -102,7 +102,28 @@ class JFTP extends JObject
 	 * @var    array  Array to hold ascii format file extensions
 	 * @since   11.1
 	 */
-	var $_autoAscii = array ("asp", "bat", "c", "cpp", "csv", "h", "htm", "html", "shtml", "ini", "inc", "log", "php", "php3", "pl", "perl", "sh", "sql", "txt", "xhtml", "xml");
+	var $_autoAscii = array (
+		"asp",
+		"bat",
+		"c",
+		"cpp",
+		"csv",
+		"h",
+		"htm",
+		"html",
+		"shtml",
+		"ini",
+		"inc",
+		"log",
+		"php",
+		"php3",
+		"pl",
+		"perl",
+		"sh",
+		"sql",
+		"txt",
+		"xhtml",
+		"xml");
 
 	/**
 	 * Array to hold native line ending characters
@@ -110,17 +131,17 @@ class JFTP extends JObject
 	 * @var    array
 	 * @since  11.1
 	 */
-	var $_lineEndings = array ('UNIX' => "\n", 'MAC' => "\r", 'WIN' => "\r\n");
+	var $_lineEndings = array('UNIX' => "\n", 'MAC' => "\r", 'WIN' => "\r\n");
 
 	/**
 	 * JFTP object constructor
 	 *
 	 * @param   array  $options  Associative array of options to set
 	 *
-	 * @return
 	 * @since   11.1
 	 */
-	function __construct($options=array()) {
+	public function __construct($options=array())
+	{
 
 		// If default transfer type is not set, set it to autoascii detect
 		if (!isset ($options['type'])) {
@@ -149,11 +170,10 @@ function __construct($options=array()) {
 	 *
 	 * Closes an existing connection, if we have one
 	 *
-	 * @return  void
-	 *
 	 * @since   11.1
 	 */
-	function __destruct() {
+	function __destruct()
+	{
 		if (is_resource($this->_conn)) {
 			$this->quit();
 		}
@@ -177,7 +197,7 @@ function __destruct() {
 	 * @return  JFTP              The FTP Client object.
 	 * @since   11.1
 	 */
-	function getInstance($host = '127.0.0.1', $port = '21', $options = null, $user = null, $pass = null)
+	public function getInstance($host = '127.0.0.1', $port = '21', $options = null, $user = null, $pass = null)
 	{
 		static $instances = array();
 
@@ -209,7 +229,8 @@ function getInstance($host = '127.0.0.1', $port = '21', $options = null, $user =
 	 * @return  boolean  True if successful
 	 * @since   11.1
 	 */
-	function setOptions($options) {
+	public function setOptions($options)
+	{
 
 		if (isset ($options['type'])) {
 			$this->_type = $options['type'];
@@ -229,7 +250,8 @@ function setOptions($options) {
 	 * @return  boolean  True if successful
 	 * @since   11.1
 	 */
-	function connect($host = '127.0.0.1', $port = 21) {
+	public function connect($host = '127.0.0.1', $port = 21)
+	{
 
 		// Initialise variables.
 		$errno = null;
@@ -275,9 +297,10 @@ function connect($host = '127.0.0.1', $port = 21) {
 	 * Method to determine if the object is connected to an FTP server
 	 *
 	 * @return  boolean  True if connected
+	 *
 	 * @since   11.1
 	 */
-	function isConnected()
+	public function isConnected()
 	{
 		return is_resource($this->_conn);
 	}
@@ -289,9 +312,11 @@ function isConnected()
 	 * @param   string   $pass	Password to login to the server
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function login($user = 'anonymous', $pass = 'jftp@joomla.org') {
+	public function login($user = 'anonymous', $pass = 'jftp@joomla.org')
+	{
 
 		// If native FTP support is enabled let's use it...
 		if (FTP_NATIVE) {
@@ -326,9 +351,11 @@ function login($user = 'anonymous', $pass = 'jftp@joomla.org') {
 	 * Method to quit and close the connection
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function quit() {
+	public function quit()
+	{
 
 		// If native FTP support is enabled lets use it...
 		if (FTP_NATIVE) {
@@ -347,9 +374,11 @@ function quit() {
 	 * Method to retrieve the current working directory on the FTP server
 	 *
 	 * @return  string   Current working directory
+	 *
 	 * @since   11.1
 	 */
-	function pwd() {
+	public function pwd()
+	{
 
 		// If native FTP support is enabled let's use it...
 		if (FTP_NATIVE) {
@@ -361,7 +390,7 @@ function pwd() {
 		}
 
 		// Initialise variables.
-		$match = array (null);
+		$match = array(null);
 
 		// Send print working directory command and verify success
 		if (!$this->_putCmd('PWD', 257)) {
@@ -380,9 +409,11 @@ function pwd() {
 	 * Method to system string from the FTP server
 	 *
 	 * @return  string   System identifier string
+	 *
 	 * @since   11.1
 	 */
-	function syst() {
+	public function syst()
+	{
 
 		// If native FTP support is enabled lets use it...
 		if (FTP_NATIVE) {
@@ -418,9 +449,11 @@ function syst() {
 	 * @param   string   $path	Path to change into on the server
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function chdir($path) {
+	public function chdir($path)
+	{
 
 		// If native FTP support is enabled lets use it...
 		if (FTP_NATIVE) {
@@ -446,9 +479,11 @@ function chdir($path) {
 	 * NOTE: This command not available on all servers
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function reinit() {
+	public function reinit()
+	{
 
 		// If native FTP support is enabled let's use it...
 		if (FTP_NATIVE) {
@@ -475,9 +510,11 @@ function reinit() {
 	 * @param   string   $to		Path to change file/folder to
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function rename($from, $to) {
+	public function rename($from, $to)
+	{
 
 		// If native FTP support is enabled let's use it...
 		if (FTP_NATIVE) {
@@ -510,9 +547,11 @@ function rename($from, $to) {
 	 * @param   mixed    $mode  Octal value to change mode to, e.g. '0777', 0777 or 511 (string or integer)
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function chmod($path, $mode) {
+	public function chmod($path, $mode)
+	{
 
 		// If no filename is given, we assume the current directory is the target
 		if ($path == '') {
@@ -553,7 +592,8 @@ function chmod($path, $mode) {
 	 * @return  boolean  True if successful
 	 * @since   11.1
 	 */
-	function delete($path) {
+	public function delete($path)
+	{
 
 		// If native FTP support is enabled let's use it...
 		if (FTP_NATIVE) {
@@ -582,9 +622,11 @@ function delete($path) {
 	 * @param   string   $path Directory to create
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function mkdir($path) {
+	public function mkdir($path)
+	{
 
 		// If native FTP support is enabled let's use it...
 		if (FTP_NATIVE) {
@@ -611,7 +653,8 @@ function mkdir($path) {
 	 * @return  boolean   True if successful
 	 * @since   11.1
 	 */
-	function restart($point) {
+	public function restart($point)
+	{
 
 		// If native FTP support is enabled let's use it...
 		if (FTP_NATIVE) {
@@ -639,7 +682,8 @@ function restart($point) {
 	 * @return  boolean  True if successful
 	 * @since   11.1
 	 */
-	function create($path) {
+	public function create($path)
+	{
 
 		// If native FTP support is enabled let's use it...
 		if (FTP_NATIVE) {
@@ -691,7 +735,8 @@ function create($path) {
 	 * @return  boolean  True if successful
 	 * @since   11.1
 	 */
-	function read($remote, &$buffer) {
+	public function read($remote, &$buffer)
+	{
 
 		// Determine file type
 		$mode = $this->_findMode($remote);
@@ -763,9 +808,11 @@ function read($remote, &$buffer) {
 	 * @param   string   $remote	Path to remote file to get on the FTP server
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function get($local, $remote) {
+	public function get($local, $remote)
+	{
 
 		// Determine file type
 		$mode = $this->_findMode($remote);
@@ -834,7 +881,8 @@ function get($local, $remote) {
 	 *
 	 * @since   11.1
 	 */
-	function store($local, $remote = null) {
+	public function store($local, $remote = null)
+	{
 
 		// If remote file is not given, use the filename of the local file in the current
 		// working directory.
@@ -919,9 +967,11 @@ function store($local, $remote = null) {
 	 * @param   string   $buffer   Contents to write to the FTP server
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function write($remote, $buffer) {
+	public function write($remote, $buffer)
+	{
 
 		// Determine file type
 		$mode = $this->_findMode($remote);
@@ -992,9 +1042,11 @@ function write($remote, $buffer) {
 	 * @param   string   $path   Path local file to store on the FTP server
 	 *
 	 * @return  string   Directory listing
+	 *
 	 * @since   11.1
 	 */
-	function listNames($path = null) {
+	public function listNames($path = null)
+	{
 
 		// Initialise variables.
 		$data = null;
@@ -1078,7 +1130,8 @@ function listNames($path = null) {
 	 *
 	 * @return  mixed  If $type is raw: string Directory listing, otherwise array of string with file-names
 	 */
-	function listDetails($path = null, $type = 'all') {
+	public function listDetails($path = null, $type = 'all')
+	{
 
 		// Initialise variables.
 		$dir_list = array();
@@ -1277,7 +1330,8 @@ function listDetails($path = null, $type = 'all') {
 	 *
 	 * @since   11.1
 	 */
-	function _putCmd($cmd, $expectedResponse) {
+	protected function _putCmd($cmd, $expectedResponse)
+	{
 
 		// Make sure we have a connection to the server
 		if (!is_resource($this->_conn)) {
@@ -1300,7 +1354,8 @@ function _putCmd($cmd, $expectedResponse) {
 	 *
 	 * @return  boolean  True if response code from the server is expected
 	 */
-	function _verifyResponse($expected) {
+	protected function _verifyResponse($expected)
+	{
 
 		// Initialise variables.
 		$parts = null;
@@ -1343,9 +1398,11 @@ function _verifyResponse($expected) {
 	 * Set server to passive mode and open a data port connection
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function _passive() {
+	protected function _passive()
+	{
 
 		// Initialize variables.
 		$match = array();
@@ -1413,9 +1470,11 @@ function _passive() {
 	 * @param   string   $fileName	Name of the file
 	 *
 	 * @return  integer  Transfer-mode for this filetype [FTP_ASCII|FTP_BINARY]
+	 *
 	 * @since   11.1
 	 */
-	function _findMode($fileName) {
+	protected function _findMode($fileName)
+	{
 		if ($this->_type == FTP_AUTOASCII) {
 			$dot = strrpos($fileName, '.') + 1;
 			$ext = substr($fileName, $dot);
@@ -1440,9 +1499,11 @@ function _findMode($fileName) {
 	 *                             Defined constants can also be used [FTP_BINARY|FTP_ASCII]
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
-	function _mode($mode) {
+	function _mode($mode)
+	{
 		if ($mode == FTP_BINARY) {
 			if (!$this->_putCmd("TYPE I", 200)) {
 				JError::raiseWarning('35', JText::sprintf('JLIB_CLIENT_ERROR_JFTP_MODE_BINARY', $this->_response));
diff --git a/libraries/joomla/client/helper.php b/libraries/joomla/client/helper.php
index eff9b2a908d18..41b8449e9c299 100644
--- a/libraries/joomla/client/helper.php
+++ b/libraries/joomla/client/helper.php
@@ -29,7 +29,7 @@ class JClientHelper
 	 *                     these fields: enabled, host, port, user, pass, root
 	 * @since   11.1
 	 */
-	public static function getCredentials($client, $force=false)
+	public static function getCredentials($client, $force = false)
 	{
 		static $credentials = array();
 
@@ -91,6 +91,7 @@ public static function getCredentials($client, $force=false)
 	 * @param   string   $pass     Password
 	 *
 	 * @return  boolean  True if the given login credentials have been set and are valid
+	 *
 	 * @since   11.1
 	 */
 	public static function setCredentials($client, $user, $pass)
@@ -145,6 +146,7 @@ public static function setCredentials($client, $user, $pass)
 	 * @param   string   Client name, currently only 'ftp' is supported
 	 *
 	 * @return  boolean  True if login credentials are available
+	 *
 	 * @since   11.1
 	 */
 	public static function hasCredentials($client)
@@ -205,7 +207,7 @@ public static function hasCredentials($client)
 	 */
 	public static function setCredentialsFromRequest($client)
 	{
-		// Determine wether FTP credentials have been passed along with the current request
+		// Determine whether FTP credentials have been passed along with the current request
 		$user = JRequest::getString('username', null, 'POST', JREQUEST_ALLOWRAW);
 		$pass = JRequest::getString('password', null, 'POST', JREQUEST_ALLOWRAW);
 		if ($user != '' && $pass != '')
diff --git a/libraries/joomla/client/http.php b/libraries/joomla/client/http.php
index 91414c7ff8579..471b1ed29ec15 100644
--- a/libraries/joomla/client/http.php
+++ b/libraries/joomla/client/http.php
@@ -15,8 +15,8 @@
  * HTTP client class.
  *
  * @package     Joomla.Platform
- * @since       11.1
  * @subpackage  Client
+ * @since       11.1
  */
 class JHttp
 {
@@ -49,8 +49,6 @@ class JHttp
 	 *
 	 * @param   array  $options  Array of configuration options for the client.
 	 *
-	 * @return  void
-	 *
 	 * @since   11.1
 	 */
 	public function __construct($options = array())
@@ -85,7 +83,7 @@ public function __destruct()
 	 * @return  boolean  True on success.
 	 *
 	 * @since   11.1
-	 * @throws  JException
+	 * @throws  Exception
 	 */
 	public function head($url)
 	{
@@ -115,7 +113,7 @@ public function head($url)
 	 * @return  boolean  True on success.
 	 *
 	 * @since   11.1
-	 * @throws  JException
+	 * @throws  Exception
 	 */
 	public function get($url)
 	{
@@ -146,7 +144,7 @@ public function get($url)
 	 * @return  boolean  True on success.
 	 *
 	 * @since   11.1
-	 * @throws  JException
+	 * @throws  Exception
 	 */
 	public function post($url, $data)
 	{
@@ -177,7 +175,7 @@ public function post($url, $data)
 	 * @return  boolean  True on success.
 	 *
 	 * @since   11.1
-	 * @throws  JException
+	 * @throws  Exception
 	 */
 	protected function _sendRequest($connection, $method, JUri $uri, $data = null, $headers = null)
 	{
@@ -245,7 +243,7 @@ protected function _sendRequest($connection, $method, JUri $uri, $data = null, $
 	 * @return  JHttpResponse
 	 *
 	 * @since   11.1
-	 * @throws  JException
+	 * @throws  Exception
 	 */
 	protected function _getResponseObject()
 	{
@@ -338,31 +336,25 @@ protected function _connect(JUri $uri)
  * HTTP response data object class.
  *
  * @package     Joomla.Platform
- * @since       11.1
  * @subpackage  Client
+ * @since       11.1
  */
 class JHttpResponse
 {
 	/**
-	 * The server response code.
-	 *
-	 * @var    int
+	 * @var    int  The server response code.
 	 * @since  11.1
 	 */
 	public $code;
 
 	/**
-	 * Response headers.
-	 *
-	 * @var    array
+	 * @var    array  Response headers.
 	 * @since  11.1
 	 */
 	public $headers = array();
 
 	/**
-	 * Server response body.
-	 *
-	 * @var    string
+	 * @var    string  Server response body.
 	 * @since  11.1
 	 */
 	public $body;
diff --git a/libraries/joomla/client/ldap.php b/libraries/joomla/client/ldap.php
index 37b037cde7cde..e18254f07e5ce 100644
--- a/libraries/joomla/client/ldap.php
+++ b/libraries/joomla/client/ldap.php
@@ -90,6 +90,7 @@ class JLDAP extends JObject
 	 * @since  11.1
 	 */
 	var $_resource = null;
+
 	/**
 	 *
 	 * @var    string  Current DN
@@ -124,6 +125,7 @@ function __construct($configObj = null)
 	 * Connect to server
 	 *
 	 * @return  boolean  True if successful
+	 *
 	 * @since   11.1
 	 */
 	function connect()
@@ -320,7 +322,8 @@ function replace($dn, $attribute) {
 	 *
 	 * @return mixed result of comparison (true, false, -1 on error)
 	 */
-	function modify($dn, $attribute) {
+	function modify($dn, $attribute)
+	{
 		return @ldap_modify($this->_resource, $dn, $attribute);
 	}
 
@@ -349,7 +352,8 @@ function remove($dn, $attribute)
 	 * @return  mixed    result of comparison (true, false, -1 on error)
 	 * @since   11.1
 	 */
-	function compare($dn, $attribute, $value) {
+	function compare($dn, $attribute, $value)
+	{
 		return @ldap_compare($this->_resource, $dn, $attribute, $value);
 	}
 
@@ -381,7 +385,8 @@ function read($dn, $attribute = array())
 	 *
 	 * @return  boolean  Result of operation
 	 */
-	function delete($dn) {
+	function delete($dn)
+	{
 		return @ldap_delete($this->_resource, $dn);
 	}
 
@@ -393,7 +398,8 @@ function delete($dn) {
 	 *
 	 * @return  boolean  Result of operation
 	 */
-	function create($dn, $entries) {
+	function create($dn, $entries)
+	{
 		return @ldap_add($this->_resource, $dn, $entries);
 	}
 
@@ -406,7 +412,8 @@ function create($dn, $entries) {
 	 *
 	 * @return  boolean   Result of operation
 	 */
-	function add($dn, $entry) {
+	function add($dn, $entry)
+	{
 		return @ldap_mod_add($this->_resource, $dn, $entry);
 	}
 
@@ -419,9 +426,11 @@ function add($dn, $entry) {
 	 * @param   boolean  $deleteolddn  Delete the old values (default)
 	 *
 	 * @return  boolean  Result of operation
+	 *
 	 * @since   11.1
 	 */
-	function rename($dn, $newdn, $newparent, $deleteolddn) {
+	function rename($dn, $newdn, $newparent, $deleteolddn)
+	{
 		return @ldap_rename($this->_resource, $dn, $newdn, $newparent, $deleteolddn);
 	}
 
@@ -429,9 +438,11 @@ function rename($dn, $newdn, $newparent, $deleteolddn) {
 	 * Returns the error message
 	 *
 	 * @return  string   error message
+	 *
 	 * @since   11.1
 	 */
-	function getErrorMsg() {
+	function getErrorMsg()
+	{
 		return @ldap_error($this->_resource);
 	}
 
@@ -441,6 +452,7 @@ function getErrorMsg() {
 	 * @param   string   $ip   IP Address (e.g. xxx.xxx.xxx.xxx)
 	 *
 	 * @return  string   Net address
+	 *
 	 * @since   11.1
 	 */
 	function ipToNetAddress($ip)
@@ -530,9 +542,11 @@ function LDAPNetAddr($networkaddress)
 	 * @param   string   $type       Type of password hash, either md5 or SHA
 	 *
 	 * @return  string   Encrypted password
+	 *
 	 * @since   11.1
 	 */
-	function generatePassword($password, $type='md5') {
+	function generatePassword($password, $type='md5')
+	{
 		$userpassword = '';
 		switch(strtolower($type)) {
 			case 'sha':
diff --git a/libraries/joomla/database/database.php b/libraries/joomla/database/database.php
index 442deb0f60463..8850aaab40628 100644
--- a/libraries/joomla/database/database.php
+++ b/libraries/joomla/database/database.php
@@ -12,13 +12,20 @@
 JLoader::register('DatabaseException', JPATH_PLATFORM.'/joomla/database/databaseexception.php');
 jimport('joomla.filesystem.folder');
 
+/**
+ * Database interface class.
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ * @since       11.2
+ */
 interface JDatabaseInterface {
 	/**
 	 * Test to see if the connector is available.
 	 *
-	 * @return  bool  True on success, false otherwise.
+	 * @return  boolean  True on success, false otherwise.
 	 *
-	 * @since   11.1
+	 * @since   11.2
 	 */
 	static function test();
 }
@@ -109,7 +116,7 @@ abstract class JDatabase implements JDatabaseInterface
 	protected $tablePrefix;
 
 	/**
-	 * @var    bool  True if the database engine supports UTF-8 character encoding.
+	 * @var    boolean  True if the database engine supports UTF-8 character encoding.
 	 * @since  11.1
 	 */
 	protected $utf = false;
@@ -129,7 +136,7 @@ abstract class JDatabase implements JDatabaseInterface
 	protected $errorMsg;
 
 	/**
-	 * @var         bool  If true then there are fields to be quoted for the query.
+	 * @var         boolean  If true then there are fields to be quoted for the query.
 	 * @since       11.1
 	 * @deprecated  12.1
 	 */
@@ -384,8 +391,6 @@ public function __call($method, $args)
 	 *
 	 * @param   array  $options  List of options used to configure the connection
 	 *
-	 * @return  void
-	 *
 	 * @since   11.1
 	 */
 	protected function __construct($options)
@@ -662,7 +667,7 @@ abstract public function getTableList();
 	/**
 	 * Determine whether or not the database engine supports UTF-8 character encoding.
 	 *
-	 * @return  bool  True if the database engine supports UTF-8 character encoding.
+	 * @return  boolean  True if the database engine supports UTF-8 character encoding.
 	 *
 	 * @since   11.1
 	 */
@@ -686,6 +691,8 @@ abstract public function getVersion();
 	 * @return  boolean  True if supported.
 	 *
 	 * @since   11.1
+	 *
+	 * @deprecated  12.1
 	 */
 	abstract public function hasUTF();
 
@@ -705,7 +712,7 @@ abstract public function insertid();
 	 * @param   object  $object  A reference to an object whose public properties match the table fields.
 	 * @param   string  $key     The name of the primary key. If provided the object property is updated.
 	 *
-	 * @return  bool    True on success.
+	 * @return  boolean    True on success.
 	 *
 	 * @since   11.1
 	 * @throws  DatabaseException
diff --git a/media/system/css/mooRainbow.css b/media/system/css/mooRainbow.css
new file mode 100755
index 0000000000000..d25f0f1ca9fc9
--- /dev/null
+++ b/media/system/css/mooRainbow.css
@@ -0,0 +1,140 @@
+/***
+ *  - mooRainbow: defaultCSS
+ * author: w00fz <w00fzPuppy@gmail.com>
+ */
+
+{ font-size: 11px; color: #000; }
+
+.moor-box {
+	width: 125px; 
+	height: 110px; 
+	border: 1px solid #636163; 
+	background-color: #f9f9f9;
+}
+.moor-overlayBox {
+	width: 80px; /* Width and Height of the overlay must be setted here: default 256x256 */
+	height: 80px; 
+	margin-top: 3px; 
+	margin-left: 3px;
+	border: 1px solid #000;
+}
+.moor-slider {
+	border: 1px solid #000;
+	margin-top: 3px; 
+	margin-left: 86px;
+	width: 10px; /* if you want a bigger or smaller slider... */
+	height: 80px;
+}
+.moor-colorBox {
+	/*display: none;*/
+	visibility: hidden;
+	border: 1px solid #000; 
+	width: 59px; 
+	height: 68px; 
+	margin-top: 20px; 
+	margin-left: 315px;
+}
+
+.moor-currentColor { /* Bottom Box Color, the backup one */
+	/*display: none;*/
+	visibility: hidden;
+	margin-top: 55px; 
+	margin-left: 316px; 
+	width: 59px; 
+	height: 34px;
+}
+.moor-okButton {
+	font-family: Tahoma;
+	font-weight: bold;
+	font-size: 8px;
+	margin-top: 90px;
+	margin-left: 3px;
+	background: #e6e6e6;
+	height: 15px;
+	border: 1px solid #d6d6d6;
+	border-left-color: #f5f5f5;
+	border-top-color: #f5f5f5;
+}
+label {
+	font-family: mono;
+}
+/* Following are just <label> */
+.moor-rLabel {
+	/*display: none;*/
+	visibility: hidden;
+	margin-top: 100px;
+	margin-left: 315px;
+}
+.moor-gLabel {
+	/*display: none;*/
+	visibility: hidden;
+	margin-top: 125px;
+	margin-left: 315px;
+}
+.moor-bLabel {
+	/*display: none;*/
+	visibility: hidden;
+	margin-top: 150px;
+	margin-left: 315px;
+}
+.moor-HueLabel {
+	/*display: none;*/
+	visibility: hidden;
+	margin-top: 190px;
+	margin-left: 315px;
+}
+span.moor-ballino { /* Style hue ° (degree) !! */
+	/*display: none;*/
+	visibility: hidden;
+	margin-top: 190px;
+	margin-left: 370px;
+}
+.moor-SatuLabel {
+	/*display: none;*/
+	visibility: hidden;
+	margin-top: 215px;
+	margin-left: 315px;
+}
+.moor-BrighLabel {
+	/*display: none;*/
+	visibility: hidden;
+	margin-top: 240px;
+	margin-left: 315px;
+}
+.moor-hexLabel {
+	font-size: 0px;
+	margin-top: 90px;
+	margin-left: 70px;
+}
+
+/* <input> */
+.moor-rInput, .moor-gInput, .moor-bInput, .moor-HueInput, .moor-SatuInput, .moor-BrighInput { 
+	/*display: none;*/
+	visibility: hidden;
+	width: 30px;
+}
+.moor-hexInput {
+	font-size: 9px;
+	width: 45px;
+}
+.moor-cursor {
+	/*background-image: url(images/moor_cursor.gif); */
+	width: 12px;
+	height: 12px;
+}
+.moor-arrows {
+	/*display: none;*/
+	visibility: hidden;
+	/*background-image: url(images/moor_arrows.gif);*/
+	top: 9px; 
+	left: 270px;
+	width: 41px;
+	height: 9px;
+}
+
+.moor-chooseColor {
+	margin-left: 100px;
+	margin-top: 3px;
+	width: 20px;
+	height: 82px;
+}
\ No newline at end of file
diff --git a/media/system/js/mooRainbow-uncompressed.js b/media/system/js/mooRainbow-uncompressed.js
new file mode 100755
index 0000000000000..50e197ec26dea
--- /dev/null
+++ b/media/system/js/mooRainbow-uncompressed.js
@@ -0,0 +1,571 @@
+/*
+---
+
+script: mooRainbow.js
+version: 1.3
+description: MooRainbow is a ColorPicker for MooTools 1.3
+license: MIT-Style
+authors:
+  - Djamil Legato (w00fz)
+  - Christopher Beloch
+
+requires: [Core/*, More/Slider, More/Drag, More/Color]
+
+provides: [mooRainbow]
+
+...
+*/
+ 
+var MooRainbow = new Class({
+	options: {
+		id: 'mooRainbow',
+		prefix: 'moor-',
+		imgPath: 'images/',
+		startColor: [255, 0, 0],
+		wheel: false,
+		onComplete: Class.empty,
+		onChange: Class.empty
+	},
+	
+	initialize: function(el, options) {
+		this.element = document.id(el); if (!this.element) return;
+		this.setOptions(options);
+		
+		this.sliderPos = 0;
+		this.pickerPos = {x: 0, y: 0};
+		this.backupColor = this.options.startColor;
+		this.currentColor = this.options.startColor;
+		this.sets = {
+			rgb: [],
+			hsb: [],
+			hex: []	
+		};
+		this.pickerClick = this.sliderClick  = false;
+		if (!this.layout) this.doLayout();
+		this.OverlayEvents();
+		this.sliderEvents();
+		this.backupEvent();
+		if (this.options.wheel) this.wheelEvents();
+		this.element.addEvent('click', function(e) { this.toggle(e); }.bind(this));
+				
+		this.layout.overlay.setStyle('background-color', this.options.startColor.rgbToHex());
+		this.layout.backup.setStyle('background-color', this.backupColor.rgbToHex());
+
+		this.pickerPos.x = this.snippet('curPos').l + this.snippet('curSize', 'int').w;
+		this.pickerPos.y = this.snippet('curPos').t + this.snippet('curSize', 'int').h;
+		
+		this.manualSet(this.options.startColor);
+		
+		this.pickerPos.x = this.snippet('curPos').l + this.snippet('curSize', 'int').w;
+		this.pickerPos.y = this.snippet('curPos').t + this.snippet('curSize', 'int').h;
+		this.sliderPos = this.snippet('arrPos') - this.snippet('arrSize', 'int');
+
+		if (window.khtml) this.hide();
+	},
+	
+	toggle: function() {
+		this[this.visible ? 'hide' : 'show']()
+	},
+	
+	show: function() {
+		this.rePosition();
+		this.layout.setStyle('display', 'block');
+		this.layout.set('aria-hidden', 'false');
+		this.visible = true;
+	},
+	
+	hide: function() {
+		this.layout.setStyles({'display': 'none'});
+		this.layout.set('aria-hidden', 'true');
+		this.visible = false;
+	},
+	
+	manualSet: function(color, type) {
+		if (!type || (type != 'hsb' && type != 'hex')) type = 'rgb';
+		var rgb, hsb, hex;
+
+		if (type == 'rgb') { rgb = color; hsb = color.rgbToHsb(); hex = color.rgbToHex(); } 
+		else if (type == 'hsb') { hsb = color; rgb = color.hsbToRgb(); hex = rgb.rgbToHex(); }
+		else { hex = color; rgb = color.hexToRgb(true); hsb = rgb.rgbToHsb(); }
+		
+		this.setMooRainbow(rgb);
+		this.autoSet(hsb);
+	},
+	
+	autoSet: function(hsb) {
+		var curH = this.snippet('curSize', 'int').h;
+		var curW = this.snippet('curSize', 'int').w;
+		var oveH = this.layout.overlay.height;
+		var oveW = this.layout.overlay.width;
+		var sliH = this.layout.slider.height;
+		var arwH = this.snippet('arrSize', 'int');
+		var hue;
+		
+		var posx = Math.round(((oveW * hsb[1]) / 100) - curW);
+		var posy = Math.round(- ((oveH * hsb[2]) / 100) + oveH - curH);
+
+		var c = Math.round(((sliH * hsb[0]) / 360)); c = (c == 360) ? 0 : c;
+		var position = sliH - c + this.snippet('slider') - arwH;
+		hue = [this.sets.hsb[0], 100, 100].hsbToRgb().rgbToHex();
+		
+		this.layout.cursor.setStyles({'top': posy, 'left': posx});
+		this.layout.arrows.setStyle('top', position);
+		this.layout.overlay.setStyle('background-color', hue);
+		this.sliderPos = this.snippet('arrPos') - arwH;
+		this.pickerPos.x = this.snippet('curPos').l + curW;
+		this.pickerPos.y = this.snippet('curPos').t + curH;
+	},
+	
+	setMooRainbow: function(color, type) {
+		if (!type || (type != 'hsb' && type != 'hex')) type = 'rgb';
+		var rgb, hsb, hex;
+
+		if (type == 'rgb') { rgb = color; hsb = color.rgbToHsb(); hex = color.rgbToHex(); } 
+		else if (type == 'hsb') { hsb = color; rgb = color.hsbToRgb(); hex = rgb.rgbToHex(); }
+		else { hex = color; rgb = color.hexToRgb(); hsb = rgb.rgbToHsb(); }
+
+		this.sets = {
+			rgb: rgb,
+			hsb: hsb,
+			hex: hex
+		};
+
+		if (!this.pickerPos.x)
+			this.autoSet(hsb);		
+
+		this.RedInput.value = rgb[0];
+		this.GreenInput.value = rgb[1];
+		this.BlueInput.value = rgb[2];
+		this.HueInput.value = hsb[0];
+		this.SatuInput.value =  hsb[1];
+		this.BrighInput.value = hsb[2];
+		this.hexInput.value = hex;
+		
+		this.currentColor = rgb;
+
+		this.chooseColor.setStyle('background-color', rgb.rgbToHex());
+		
+		this.fireEvent('onChange', [this.sets, this]);
+	},
+	
+	parseColors: function(x, y, z) {
+		var s = Math.round((x * 100) / this.layout.overlay.width);
+		var b = 100 - Math.round((y * 100) / this.layout.overlay.height);
+		var h = 360 - Math.round((z * 360) / this.layout.slider.height) + this.snippet('slider') - this.snippet('arrSize', 'int');
+		h -= this.snippet('arrSize', 'int');
+		h = (h >= 360) ? 0 : (h < 0) ? 0 : h;
+		s = (s > 100) ? 100 : (s < 0) ? 0 : s;
+		b = (b > 100) ? 100 : (b < 0) ? 0 : b;
+
+		return [h, s, b];
+	},
+	
+	OverlayEvents: function() {
+		var lim, curH, curW, inputs;
+		curH = this.snippet('curSize', 'int').h;
+		curW = this.snippet('curSize', 'int').w;
+		inputs = this.arrRGB.concat(this.arrHSB, this.hexInput);
+
+		document.addEvent('click', function() { 
+			if(this.visible) this.hide(this.layout); 
+		}.bind(this));
+
+		inputs.each(function(el) {
+			el.addEvent('keydown', this.eventKeydown.bind(this, el));
+			el.addEvent('keyup', this.eventKeyup.bind(this, el));
+		}, this);
+		[this.element, this.layout].each(function(el) {
+			el.addEvents({
+				'click': function(e) { new Event(e).stop(); },
+				'keyup': function(e) {
+					e = new Event(e);
+					if(e.key == 'esc' && this.visible) this.hide(this.layout);
+				}.bind(this)
+			}, this);
+		}, this);
+		
+		lim = {
+			x: [0 - curW, (this.layout.overlay.width - curW)],
+			y: [0 - curH, (this.layout.overlay.height - curH)]
+		};
+
+		this.layout.drag = new Drag(this.layout.cursor, {
+			onStart: this.overlayDrag.bind(this),
+			onDrag: this.overlayDrag.bind(this),
+			snap: 0
+		});	
+		
+		this.layout.overlay2.addEvent('mousedown', function(e){
+			e = new Event(e);
+			this.layout.cursor.setStyles({
+				'top': e.page.y - this.layout.overlay.getTop() - curH,
+				'left': e.page.x - this.layout.overlay.getLeft() - curW
+			});
+                        this.overlayDrag.call(this);
+			this.layout.drag.start(e);
+		}.bind(this));
+		
+		this.okButton.addEvent('click', function() {
+			if(this.currentColor == this.options.startColor) {
+				this.hide();
+				this.fireEvent('onComplete', [this.sets, this]);
+			}
+			else {
+				this.backupColor = this.currentColor;
+				this.layout.backup.setStyle('background-color', this.backupColor.rgbToHex());
+				this.hide();
+				this.fireEvent('onComplete', [this.sets, this]);
+			}
+		}.bind(this));
+	},
+	
+	overlayDrag: function() {
+		var curH = this.snippet('curSize', 'int').h;
+		var curW = this.snippet('curSize', 'int').w;
+		this.pickerPos.x = this.snippet('curPos').l + curW;
+		this.pickerPos.y = this.snippet('curPos').t + curH;
+		
+		this.setMooRainbow(this.parseColors(this.pickerPos.x, this.pickerPos.y, this.sliderPos), 'hsb');
+		this.fireEvent('onChange', [this.sets, this]);
+	},
+	
+	sliderEvents: function() {
+		var arwH = this.snippet('arrSize', 'int'), lim;
+
+		lim = [0 + this.snippet('slider') - arwH, this.layout.slider.height - arwH + this.snippet('slider')];
+		this.layout.sliderDrag = new Drag(this.layout.arrows, {
+			limit: {y: lim},
+			modifiers: {x: false},
+			onStart: this.sliderDrag.bind(this),
+			onDrag: this.sliderDrag.bind(this),
+			snap: 0
+		});	
+	
+		this.layout.slider.addEvent('mousedown', function(e){
+			e = new Event(e);
+
+			this.layout.arrows.setStyle(
+				'top', e.page.y - this.layout.slider.getTop() + this.snippet('slider') - arwH
+			);
+                        this.sliderDrag.call(this);
+			this.layout.sliderDrag.start(e);
+		}.bind(this));
+	},
+
+	sliderDrag: function() {
+		var arwH = this.snippet('arrSize', 'int'), hue;
+		
+		this.sliderPos = this.snippet('arrPos') - arwH;
+		this.setMooRainbow(this.parseColors(this.pickerPos.x, this.pickerPos.y, this.sliderPos), 'hsb');
+		hue = [this.sets.hsb[0], 100, 100].hsbToRgb().rgbToHex();
+		this.layout.overlay.setStyle('background-color', hue);
+		this.fireEvent('onChange', [this.sets, this]);
+	},
+	
+	backupEvent: function() {
+		this.layout.backup.addEvent('click', function() {
+			this.manualSet(this.backupColor);
+			this.fireEvent('onChange', [this.sets, this]);
+		}.bind(this));
+	},
+	
+	wheelEvents: function() {
+		var arrColors = this.arrRGB.copy().extend(this.arrHSB);
+
+		arrColors.each(function(el) {
+			el.addEvents({
+				'mousewheel': this.eventKeys.bindWithEvent(this, el),
+				'keydown': this.eventKeys.bindWithEvent(this, el)
+			});
+		}, this);
+		
+		[this.layout.arrows, this.layout.slider].each(function(el) {
+			el.addEvents({
+				'mousewheel': this.eventKeys.bindWithEvent(this, [this.arrHSB[0], 'slider']),
+				'keydown': this.eventKeys.bindWithEvent(this, [this.arrHSB[0], 'slider'])
+			});
+		}, this);
+	},
+	
+	eventKeys: function(e, el, id) {
+		var wheel, type;		
+		id = (!id) ? el.id : this.arrHSB[0];
+
+		if (e.type == 'keydown') {
+			if (e.key == 'up') wheel = 1;
+			else if (e.key == 'down') wheel = -1;
+			else return;
+		} else if (e.type == Element.Events.mousewheel.type) wheel = (e.wheel > 0) ? 1 : -1;
+
+		if (this.arrRGB.test(el)) type = 'rgb';
+		else if (this.arrHSB.test(el)) type = 'hsb';
+		else type = 'hsb';
+
+		if (type == 'rgb') {
+			var rgb = this.sets.rgb, hsb = this.sets.hsb, prefix = this.options.prefix, pass;
+			var value = el.value.toInt() + wheel;
+			value = (value > 255) ? 255 : (value < 0) ? 0 : value;
+
+			switch(el.className) {
+				case prefix + 'rInput': pass = [value, rgb[1], rgb[2]];	break;
+				case prefix + 'gInput': pass = [rgb[0], value, rgb[2]];	break;
+				case prefix + 'bInput':	pass = [rgb[0], rgb[1], value];	break;
+				default : pass = rgb;
+			}
+			this.manualSet(pass);
+			this.fireEvent('onChange', [this.sets, this]);
+		} else {
+			var rgb = this.sets.rgb, hsb = this.sets.hsb, prefix = this.options.prefix, pass;
+			var value = el.value.toInt() + wheel;
+
+			if (el.className.test(/(HueInput)/)) value = (value > 359) ? 0 : (value < 0) ? 0 : value;
+			else value = (value > 100) ? 100 : (value < 0) ? 0 : value;
+
+			switch(el.className) {
+				case prefix + 'HueInput': pass = [value, hsb[1], hsb[2]]; break;
+				case prefix + 'SatuInput': pass = [hsb[0], value, hsb[2]]; break;
+				case prefix + 'BrighInput':	pass = [hsb[0], hsb[1], value]; break;
+				default : pass = hsb;
+			}
+			this.manualSet(pass, 'hsb');
+			this.fireEvent('onChange', [this.sets, this]);
+		}
+		e.stop();
+	},
+	
+	eventKeydown: function(el, e) {
+		var n = e.code, k = e.key;
+
+		if 	((!el.className.test(/hexInput/) && !(n >= 48 && n <= 57)) &&
+			(k!='backspace' && k!='tab' && k !='delete' && k!='left' && k!='right'))
+		e.stop();
+	},
+	
+	eventKeyup: function(el, e) {
+		var n = e.code, k = e.key, pass, prefix, chr = el.value.charAt(0);
+
+		if (!(el.value || el.value === 0)) return;
+		if (el.className.test(/hexInput/)) {
+			if (chr != "#" && el.value.length != 6) return;
+			if (chr == '#' && el.value.length != 7) return;
+		} else {
+			if (!(n >= 48 && n <= 57) && (!['backspace', 'tab', 'delete', 'left', 'right'].test(k)) && el.value.length > 3) return;
+		}
+		
+		prefix = this.options.prefix;
+
+		if (el.className.test(/(rInput|gInput|bInput)/)) {
+			if (el.value  < 0 || el.value > 255) return;
+			switch(el.className){
+				case prefix + 'rInput': pass = [el.value, this.sets.rgb[1], this.sets.rgb[2]]; break;
+				case prefix + 'gInput': pass = [this.sets.rgb[0], el.value, this.sets.rgb[2]]; break;
+				case prefix + 'bInput': pass = [this.sets.rgb[0], this.sets.rgb[1], el.value]; break;
+				default : pass = this.sets.rgb;
+			}
+			this.manualSet(pass);
+			this.fireEvent('onChange', [this.sets, this]);
+		}
+		else if (!el.className.test(/hexInput/)) {
+			if (el.className.test(/HueInput/) && el.value  < 0 || el.value > 360) return;
+			else if (el.className.test(/HueInput/) && el.value == 360) el.value = 0;
+			else if (el.className.test(/(SatuInput|BrighInput)/) && el.value  < 0 || el.value > 100) return;
+			switch(el.className){
+				case prefix + 'HueInput': pass = [el.value, this.sets.hsb[1], this.sets.hsb[2]]; break;
+				case prefix + 'SatuInput': pass = [this.sets.hsb[0], el.value, this.sets.hsb[2]]; break;
+				case prefix + 'BrighInput': pass = [this.sets.hsb[0], this.sets.hsb[1], el.value]; break;
+				default : pass = this.sets.hsb;
+			}
+			this.manualSet(pass, 'hsb');
+			this.fireEvent('onChange', [this.sets, this]);
+		} else {
+			pass = el.value.hexToRgb(true);
+			if (isNaN(pass[0])||isNaN(pass[1])||isNaN(pass[2])) return;
+
+			if (pass || pass === 0) {
+				this.manualSet(pass);
+				this.fireEvent('onChange', [this.sets, this]);
+			}
+		}
+			
+	},
+			
+	doLayout: function() {
+		var id = this.options.id, prefix = this.options.prefix;
+		var idPrefix = id + ' .' + prefix;
+
+		this.layout = new Element('div', {
+			'styles': {'display': 'block', 'position': 'absolute'},
+			'id': id
+		}).inject(document.body);
+
+		var box = new Element('div', {
+			'styles':  {'position': 'relative'},
+			'class': prefix + 'box'
+		}).inject(this.layout);
+			
+		var div = new Element('div', {
+			'styles': {'position': 'absolute', 'overflow': 'hidden'},
+			'class': prefix + 'overlayBox'
+		}).inject(box);
+		
+		var ar = new Element('div', {
+			'styles': {'position': 'absolute', 'zIndex': 1},
+			'class': prefix + 'arrows'
+		}).inject(box);
+		ar.width = ar.getStyle('width').toInt();
+		ar.height = ar.getStyle('height').toInt();
+		
+		var ov = new Element('img', {
+			'styles': {'background-color': '#fff', 'position': 'relative', 'zIndex': 2},
+			'src': this.options.imgPath + 'moor_woverlay.png',
+			'class': prefix + 'overlay'
+		}).inject(div);
+		
+		var ov2 = new Element('img', {
+			'styles': {'position': 'absolute', 'top': 0, 'left': 0, 'zIndex': 2},
+			'src': this.options.imgPath + 'moor_boverlay.png',
+			'class': prefix + 'overlay'
+		}).inject(div);
+		
+		if (window.ie6) {
+			div.setStyle('overflow', '');
+			var src = ov.src;
+			ov.src = this.options.imgPath + 'blank.gif';
+			ov.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')";
+			src = ov2.src;
+			ov2.src = this.options.imgPath + 'blank.gif';
+			ov2.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')";
+		}
+		ov.width = ov2.width = div.getStyle('width').toInt();
+		ov.height = ov2.height = div.getStyle('height').toInt();
+
+		var cr = new Element('div', {
+			'styles': {'overflow': 'hidden', 'position': 'absolute', 'zIndex': 2},
+			'class': prefix + 'cursor'	
+		}).inject(div);
+		cr.width = cr.getStyle('width').toInt();
+		cr.height = cr.getStyle('height').toInt();
+		
+		var sl = new Element('img', {
+			'styles': {'position': 'absolute', 'z-index': 2},
+			'src': this.options.imgPath + 'moor_slider.png',
+			'class': prefix + 'slider'
+		}).inject(box);
+		this.layout.slider = Slick.find(document, '#' + idPrefix + 'slider');
+		sl.width = sl.getStyle('width').toInt();
+		sl.height = sl.getStyle('height').toInt();
+
+		new Element('div', {
+			'styles': {'position': 'absolute'},
+			'class': prefix + 'colorBox'
+		}).inject(box);
+
+		new Element('div', {
+			'styles': {'zIndex': 2, 'position': 'absolute'},
+			'class': prefix + 'chooseColor'
+		}).inject(box);
+			
+		this.layout.backup = new Element('div', {
+			'styles': {'zIndex': 2, 'position': 'absolute', 'cursor': 'pointer'},
+			'class': prefix + 'currentColor'
+		}).inject(box);
+		
+		var R = new Element('label').inject(box).setStyle('position', 'absolute');
+		var G = R.clone().inject(box).addClass(prefix + 'gLabel').appendText('G: ');
+		var B = R.clone().inject(box).addClass(prefix + 'bLabel').appendText('B: ');
+		R.appendText('R: ').addClass(prefix + 'rLabel');
+		
+		var inputR = new Element('input');
+		var inputG = inputR.clone().inject(G).addClass(prefix + 'gInput');
+		var inputB = inputR.clone().inject(B).addClass(prefix + 'bInput');
+		inputR.inject(R).addClass(prefix + 'rInput');
+		
+		var HU = new Element('label').inject(box).setStyle('position', 'absolute');
+		var SA = HU.clone().inject(box).addClass(prefix + 'SatuLabel').appendText('S: ');
+		var BR = HU.clone().inject(box).addClass(prefix + 'BrighLabel').appendText('B: ');
+		HU.appendText('H: ').addClass(prefix + 'HueLabel');
+
+		var inputHU = new Element('input');
+		var inputSA = inputHU.clone().inject(SA).addClass(prefix + 'SatuInput');
+		var inputBR = inputHU.clone().inject(BR).addClass(prefix + 'BrighInput');
+		inputHU.inject(HU).addClass(prefix + 'HueInput');
+		SA.appendText(' %'); BR.appendText(' %');
+		(new Element('span', {'styles': {'position': 'absolute'}, 'class': prefix + 'ballino'}).set('html', " &deg;").inject(HU, 'after'));
+
+		var hex = new Element('label').inject(box).setStyle('position', 'absolute').addClass(prefix + 'hexLabel').appendText('#hex: ').adopt(new Element('input').addClass(prefix + 'hexInput'));
+		
+		var ok = new Element('input', {
+			'styles': {'position': 'absolute'},
+			'type': 'button',
+			'value': 'Select',
+			'class': prefix + 'okButton'
+		}).inject(box);
+		
+		this.rePosition();
+
+		var overlays = $$('#' + idPrefix + 'overlay');
+		this.layout.overlay = overlays[0];
+		this.layout.overlay2 = overlays[1];
+		this.layout.cursor = Slick.find(document, '#' + idPrefix + 'cursor');
+		this.layout.arrows = Slick.find(document, '#' + idPrefix + 'arrows');
+		this.chooseColor = Slick.find(document, '#' + idPrefix + 'chooseColor');
+		this.layout.backup = Slick.find(document, '#' + idPrefix + 'currentColor');
+		this.RedInput = Slick.find(document, '#' + idPrefix + 'rInput');
+		this.GreenInput = Slick.find(document, '#' + idPrefix + 'gInput');
+		this.BlueInput = Slick.find(document, '#' + idPrefix + 'bInput');
+		this.HueInput = Slick.find(document, '#' + idPrefix + 'HueInput');
+		this.SatuInput = Slick.find(document, '#' + idPrefix + 'SatuInput');
+		this.BrighInput = Slick.find(document, '#' + idPrefix + 'BrighInput');
+		this.hexInput = Slick.find(document, '#' + idPrefix + 'hexInput');
+
+		this.arrRGB = [this.RedInput, this.GreenInput, this.BlueInput];
+		this.arrHSB = [this.HueInput, this.SatuInput, this.BrighInput];
+		this.okButton = Slick.find(document, '#' + idPrefix + 'okButton');
+		
+		this.layout.cursor.setStyle('background-image', 'url(' + this.options.imgPath + 'moor_cursor.gif)');
+		
+		if (!window.khtml) this.hide();
+	},
+	rePosition: function() {
+		var coords = this.element.getCoordinates();
+		this.layout.setStyles({
+			'left': coords.left,
+			'top': coords.top + coords.height + 1
+		});
+	},
+	
+	snippet: function(mode, type) {
+		var size; type = (type) ? type : 'none';
+
+		switch(mode) {
+			case 'arrPos':
+				var t = this.layout.arrows.getStyle('top').toInt();
+				size = t;
+				break;
+			case 'arrSize': 
+				var h = this.layout.arrows.height;
+				h = (type == 'int') ? (h/2).toInt() : h;
+				size = h;
+				break;		
+			case 'curPos':
+				var l = this.layout.cursor.getStyle('left').toInt();
+				var t = this.layout.cursor.getStyle('top').toInt();
+				size = {'l': l, 't': t};
+				break;
+			case 'slider':
+				var t = this.layout.slider.getStyle('marginTop').toInt();
+				size = t;
+				break;
+			default :
+				var h = this.layout.cursor.height;
+				var w = this.layout.cursor.width;
+				h = (type == 'int') ? (h/2).toInt() : h;
+				w = (type == 'int') ? (w/2).toInt() : w;
+				size = {w: w, h: h};
+		};
+		return size;
+	}
+});
+
+MooRainbow.implement(new Options);
+MooRainbow.implement(new Events);
\ No newline at end of file
diff --git a/media/system/js/mooRainbow.js b/media/system/js/mooRainbow.js
new file mode 100755
index 0000000000000..c8fe4893332a7
--- /dev/null
+++ b/media/system/js/mooRainbow.js
@@ -0,0 +1,27 @@
+var MooRainbow=new Class({options:{id:"mooRainbow",prefix:"moor-",imgPath:"images/",startColor:[255,0,0],wheel:!1,onComplete:Class.empty,onChange:Class.empty},initialize:function(b,c){if(this.element=document.id(b))this.setOptions(c),this.sliderPos=0,this.pickerPos={x:0,y:0},this.currentColor=this.backupColor=this.options.startColor,this.sets={rgb:[],hsb:[],hex:[]},this.pickerClick=this.sliderClick=!1,this.layout||this.doLayout(),this.OverlayEvents(),this.sliderEvents(),this.backupEvent(),this.options.wheel&&
+this.wheelEvents(),this.element.addEvent("click",function(a){this.toggle(a)}.bind(this)),this.layout.overlay.setStyle("background-color",this.options.startColor.rgbToHex()),this.layout.backup.setStyle("background-color",this.backupColor.rgbToHex()),this.pickerPos.x=this.snippet("curPos").l+this.snippet("curSize","int").w,this.pickerPos.y=this.snippet("curPos").t+this.snippet("curSize","int").h,this.manualSet(this.options.startColor),this.pickerPos.x=this.snippet("curPos").l+this.snippet("curSize",
+"int").w,this.pickerPos.y=this.snippet("curPos").t+this.snippet("curSize","int").h,this.sliderPos=this.snippet("arrPos")-this.snippet("arrSize","int"),window.khtml&&this.hide()},toggle:function(){this[this.visible?"hide":"show"]()},show:function(){this.rePosition();this.layout.setStyle("display","block");this.layout.set("aria-hidden","false");this.visible=!0},hide:function(){this.layout.setStyles({display:"none"});this.layout.set("aria-hidden","true");this.visible=!1},manualSet:function(b,c){if(!c||
+c!="hsb"&&c!="hex")c="rgb";var a,d;c=="rgb"?(a=b,d=b.rgbToHsb(),b.rgbToHex()):c=="hsb"?(d=b,a=b.hsbToRgb(),a.rgbToHex()):(a=b.hexToRgb(!0),d=a.rgbToHsb());this.setMooRainbow(a);this.autoSet(d)},autoSet:function(b){var c=this.snippet("curSize","int").h,a=this.snippet("curSize","int").w,d=this.layout.overlay.height,e=this.layout.overlay.width,f=this.layout.slider.height,g=this.snippet("arrSize","int"),e=Math.round(e*b[1]/100-a),d=Math.round(-(d*b[2]/100)+d-c),b=Math.round(f*b[0]/360),b=f-(b==360?0:
+b)+this.snippet("slider")-g,f=[this.sets.hsb[0],100,100].hsbToRgb().rgbToHex();this.layout.cursor.setStyles({top:d,left:e});this.layout.arrows.setStyle("top",b);this.layout.overlay.setStyle("background-color",f);this.sliderPos=this.snippet("arrPos")-g;this.pickerPos.x=this.snippet("curPos").l+a;this.pickerPos.y=this.snippet("curPos").t+c},setMooRainbow:function(b,c){if(!c||c!="hsb"&&c!="hex")c="rgb";var a,d,e;c=="rgb"?(a=b,d=b.rgbToHsb(),e=b.rgbToHex()):c=="hsb"?(d=b,a=b.hsbToRgb(),e=a.rgbToHex()):
+(e=b,a=b.hexToRgb(),d=a.rgbToHsb());this.sets={rgb:a,hsb:d,hex:e};this.pickerPos.x||this.autoSet(d);this.RedInput.value=a[0];this.GreenInput.value=a[1];this.BlueInput.value=a[2];this.HueInput.value=d[0];this.SatuInput.value=d[1];this.BrighInput.value=d[2];this.hexInput.value=e;this.currentColor=a;this.chooseColor.setStyle("background-color",a.rgbToHex());this.fireEvent("onChange",[this.sets,this])},parseColors:function(b,c,a){b=Math.round(b*100/this.layout.overlay.width);c=100-Math.round(c*100/this.layout.overlay.height);
+a=360-Math.round(a*360/this.layout.slider.height)+this.snippet("slider")-this.snippet("arrSize","int");a-=this.snippet("arrSize","int");return[a>=360?0:a<0?0:a,b>100?100:b<0?0:b,c>100?100:c<0?0:c]},OverlayEvents:function(){var b,c,a;b=this.snippet("curSize","int").h;c=this.snippet("curSize","int").w;a=this.arrRGB.concat(this.arrHSB,this.hexInput);document.addEvent("click",function(){this.visible&&this.hide(this.layout)}.bind(this));a.each(function(a){a.addEvent("keydown",this.eventKeydown.bind(this,
+a));a.addEvent("keyup",this.eventKeyup.bind(this,a))},this);[this.element,this.layout].each(function(a){a.addEvents({click:function(a){(new Event(a)).stop()},keyup:function(a){a=new Event(a);a.key=="esc"&&this.visible&&this.hide(this.layout)}.bind(this)},this)},this);this.layout.drag=new Drag(this.layout.cursor,{onStart:this.overlayDrag.bind(this),onDrag:this.overlayDrag.bind(this),snap:0});this.layout.overlay2.addEvent("mousedown",function(a){a=new Event(a);this.layout.cursor.setStyles({top:a.page.y-
+this.layout.overlay.getTop()-b,left:a.page.x-this.layout.overlay.getLeft()-c});this.overlayDrag.call(this);this.layout.drag.start(a)}.bind(this));this.okButton.addEvent("click",function(){if(this.currentColor!=this.options.startColor)this.backupColor=this.currentColor,this.layout.backup.setStyle("background-color",this.backupColor.rgbToHex());this.hide();this.fireEvent("onComplete",[this.sets,this])}.bind(this))},overlayDrag:function(){var b=this.snippet("curSize","int").h,c=this.snippet("curSize",
+"int").w;this.pickerPos.x=this.snippet("curPos").l+c;this.pickerPos.y=this.snippet("curPos").t+b;this.setMooRainbow(this.parseColors(this.pickerPos.x,this.pickerPos.y,this.sliderPos),"hsb");this.fireEvent("onChange",[this.sets,this])},sliderEvents:function(){var b=this.snippet("arrSize","int"),c;c=[0+this.snippet("slider")-b,this.layout.slider.height-b+this.snippet("slider")];this.layout.sliderDrag=new Drag(this.layout.arrows,{limit:{y:c},modifiers:{x:!1},onStart:this.sliderDrag.bind(this),onDrag:this.sliderDrag.bind(this),
+snap:0});this.layout.slider.addEvent("mousedown",function(a){a=new Event(a);this.layout.arrows.setStyle("top",a.page.y-this.layout.slider.getTop()+this.snippet("slider")-b);this.sliderDrag.call(this);this.layout.sliderDrag.start(a)}.bind(this))},sliderDrag:function(){var b=this.snippet("arrSize","int");this.sliderPos=this.snippet("arrPos")-b;this.setMooRainbow(this.parseColors(this.pickerPos.x,this.pickerPos.y,this.sliderPos),"hsb");this.layout.overlay.setStyle("background-color",[this.sets.hsb[0],
+100,100].hsbToRgb().rgbToHex());this.fireEvent("onChange",[this.sets,this])},backupEvent:function(){this.layout.backup.addEvent("click",function(){this.manualSet(this.backupColor);this.fireEvent("onChange",[this.sets,this])}.bind(this))},wheelEvents:function(){this.arrRGB.copy().extend(this.arrHSB).each(function(b){b.addEvents({mousewheel:this.eventKeys.bindWithEvent(this,b),keydown:this.eventKeys.bindWithEvent(this,b)})},this);[this.layout.arrows,this.layout.slider].each(function(b){b.addEvents({mousewheel:this.eventKeys.bindWithEvent(this,
+[this.arrHSB[0],"slider"]),keydown:this.eventKeys.bindWithEvent(this,[this.arrHSB[0],"slider"])})},this)},eventKeys:function(b,c){var a,d;if(b.type=="keydown")if(b.key=="up")a=1;else if(b.key=="down")a=-1;else return;else b.type==Element.Events.mousewheel.type&&(a=b.wheel>0?1:-1);this.arrRGB.test(c)?d="rgb":(this.arrHSB.test(c),d="hsb");if(d=="rgb"){d=this.sets.rgb;var e=this.sets.hsb,f=this.options.prefix;a=c.value.toInt()+a;a=a>255?255:a<0?0:a;switch(c.className){case f+"rInput":a=[a,d[1],d[2]];
+break;case f+"gInput":a=[d[0],a,d[2]];break;case f+"bInput":a=[d[0],d[1],a];break;default:a=d}this.manualSet(a)}else{e=this.sets.hsb;f=this.options.prefix;a=c.value.toInt()+a;a=c.className.test(/(HueInput)/)?a>359?0:a<0?0:a:a>100?100:a<0?0:a;switch(c.className){case f+"HueInput":a=[a,e[1],e[2]];break;case f+"SatuInput":a=[e[0],a,e[2]];break;case f+"BrighInput":a=[e[0],e[1],a];break;default:a=e}this.manualSet(a,"hsb")}this.fireEvent("onChange",[this.sets,this]);b.stop()},eventKeydown:function(b,c){var a=
+c.code,d=c.key;!b.className.test(/hexInput/)&&!(a>=48&&a<=57)&&d!="backspace"&&d!="tab"&&d!="delete"&&d!="left"&&d!="right"&&c.stop()},eventKeyup:function(b,c){var a=c.code,d=c.key,e=b.value.charAt(0);if(b.value||b.value===0){if(b.className.test(/hexInput/)){if(e!="#"&&b.value.length!=6)return;if(e=="#"&&b.value.length!=7)return}else if(!(a>=48&&a<=57)&&!["backspace","tab","delete","left","right"].test(d)&&b.value.length>3)return;a=this.options.prefix;if(b.className.test(/(rInput|gInput|bInput)/)){if(!(b.value<
+0||b.value>255)){switch(b.className){case a+"rInput":a=[b.value,this.sets.rgb[1],this.sets.rgb[2]];break;case a+"gInput":a=[this.sets.rgb[0],b.value,this.sets.rgb[2]];break;case a+"bInput":a=[this.sets.rgb[0],this.sets.rgb[1],b.value];break;default:a=this.sets.rgb}this.manualSet(a);this.fireEvent("onChange",[this.sets,this])}}else if(b.className.test(/hexInput/)){if(a=b.value.hexToRgb(!0),!isNaN(a[0])&&!isNaN(a[1])&&!isNaN(a[2])&&(a||a===0))this.manualSet(a),this.fireEvent("onChange",[this.sets,this])}else if(!(b.className.test(/HueInput/)&&
+b.value<0||b.value>360)){if(b.className.test(/HueInput/)&&b.value==360)b.value=0;else if(b.className.test(/(SatuInput|BrighInput)/)&&b.value<0||b.value>100)return;switch(b.className){case a+"HueInput":a=[b.value,this.sets.hsb[1],this.sets.hsb[2]];break;case a+"SatuInput":a=[this.sets.hsb[0],b.value,this.sets.hsb[2]];break;case a+"BrighInput":a=[this.sets.hsb[0],this.sets.hsb[1],b.value];break;default:a=this.sets.hsb}this.manualSet(a,"hsb");this.fireEvent("onChange",[this.sets,this])}}},doLayout:function(){var b=
+this.options.id,c=this.options.prefix,a=b+" ."+c;this.layout=(new Element("div",{styles:{display:"block",position:"absolute"},id:b})).inject(document.body);var b=(new Element("div",{styles:{position:"relative"},"class":c+"box"})).inject(this.layout),d=(new Element("div",{styles:{position:"absolute",overflow:"hidden"},"class":c+"overlayBox"})).inject(b),e=(new Element("div",{styles:{position:"absolute",zIndex:1},"class":c+"arrows"})).inject(b);e.width=e.getStyle("width").toInt();e.height=e.getStyle("height").toInt();
+var e=(new Element("img",{styles:{"background-color":"#fff",position:"relative",zIndex:2},src:this.options.imgPath+"moor_woverlay.png","class":c+"overlay"})).inject(d),f=(new Element("img",{styles:{position:"absolute",top:0,left:0,zIndex:2},src:this.options.imgPath+"moor_boverlay.png","class":c+"overlay"})).inject(d);if(window.ie6){d.setStyle("overflow","");var g=e.src;e.src=this.options.imgPath+"blank.gif";e.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+g+"', sizingMethod='scale')";
+g=f.src;f.src=this.options.imgPath+"blank.gif";f.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+g+"', sizingMethod='scale')"}e.width=f.width=d.getStyle("width").toInt();e.height=f.height=d.getStyle("height").toInt();d=(new Element("div",{styles:{overflow:"hidden",position:"absolute",zIndex:2},"class":c+"cursor"})).inject(d);d.width=d.getStyle("width").toInt();d.height=d.getStyle("height").toInt();d=(new Element("img",{styles:{position:"absolute","z-index":2},src:this.options.imgPath+
+"moor_slider.png","class":c+"slider"})).inject(b);this.layout.slider=Slick.find(document,"#"+a+"slider");d.width=d.getStyle("width").toInt();d.height=d.getStyle("height").toInt();(new Element("div",{styles:{position:"absolute"},"class":c+"colorBox"})).inject(b);(new Element("div",{styles:{zIndex:2,position:"absolute"},"class":c+"chooseColor"})).inject(b);this.layout.backup=(new Element("div",{styles:{zIndex:2,position:"absolute",cursor:"pointer"},"class":c+"currentColor"})).inject(b);d=(new Element("label")).inject(b).setStyle("position",
+"absolute");e=d.clone().inject(b).addClass(c+"gLabel").appendText("G: ");f=d.clone().inject(b).addClass(c+"bLabel").appendText("B: ");d.appendText("R: ").addClass(c+"rLabel");g=new Element("input");g.clone().inject(e).addClass(c+"gInput");g.clone().inject(f).addClass(c+"bInput");g.inject(d).addClass(c+"rInput");d=(new Element("label")).inject(b).setStyle("position","absolute");e=d.clone().inject(b).addClass(c+"SatuLabel").appendText("S: ");f=d.clone().inject(b).addClass(c+"BrighLabel").appendText("B: ");
+d.appendText("H: ").addClass(c+"HueLabel");g=new Element("input");g.clone().inject(e).addClass(c+"SatuInput");g.clone().inject(f).addClass(c+"BrighInput");g.inject(d).addClass(c+"HueInput");e.appendText(" %");f.appendText(" %");(new Element("span",{styles:{position:"absolute"},"class":c+"ballino"})).set("html"," &deg;").inject(d,"after");(new Element("label")).inject(b).setStyle("position","absolute").addClass(c+"hexLabel").appendText("#hex: ").adopt((new Element("input")).addClass(c+"hexInput"));
+(new Element("input",{styles:{position:"absolute"},type:"button",value:"Select","class":c+"okButton"})).inject(b);this.rePosition();c=$$("#"+a+"overlay");this.layout.overlay=c[0];this.layout.overlay2=c[1];this.layout.cursor=Slick.find(document,"#"+a+"cursor");this.layout.arrows=Slick.find(document,"#"+a+"arrows");this.chooseColor=Slick.find(document,"#"+a+"chooseColor");this.layout.backup=Slick.find(document,"#"+a+"currentColor");this.RedInput=Slick.find(document,"#"+a+"rInput");this.GreenInput=Slick.find(document,
+"#"+a+"gInput");this.BlueInput=Slick.find(document,"#"+a+"bInput");this.HueInput=Slick.find(document,"#"+a+"HueInput");this.SatuInput=Slick.find(document,"#"+a+"SatuInput");this.BrighInput=Slick.find(document,"#"+a+"BrighInput");this.hexInput=Slick.find(document,"#"+a+"hexInput");this.arrRGB=[this.RedInput,this.GreenInput,this.BlueInput];this.arrHSB=[this.HueInput,this.SatuInput,this.BrighInput];this.okButton=Slick.find(document,"#"+a+"okButton");this.layout.cursor.setStyle("background-image","url("+
+this.options.imgPath+"moor_cursor.gif)");window.khtml||this.hide()},rePosition:function(){var b=this.element.getCoordinates();this.layout.setStyles({left:b.left,top:b.top+b.height+1})},snippet:function(b,c){var a,c=c?c:"none";switch(b){case "arrPos":a=this.layout.arrows.getStyle("top").toInt();break;case "arrSize":a=this.layout.arrows.height;a=c=="int"?(a/2).toInt():a;break;case "curPos":var d=this.layout.cursor.getStyle("left").toInt();a=this.layout.cursor.getStyle("top").toInt();a={l:d,t:a};break;
+case "slider":a=this.layout.slider.getStyle("marginTop").toInt();break;default:a=this.layout.cursor.height,d=this.layout.cursor.width,a=c=="int"?(a/2).toInt():a,d=c=="int"?(d/2).toInt():d,a={w:d,h:a}}return a}});MooRainbow.implement(new Options);MooRainbow.implement(new Events);
\ No newline at end of file
diff --git a/media/system/js/passwordstrength.js b/media/system/js/passwordstrength.js
new file mode 100644
index 0000000000000..3eca11a2ed0a7
--- /dev/null
+++ b/media/system/js/passwordstrength.js
@@ -0,0 +1,102 @@
+/*
+---
+description: Form.PasswordStrength class, and basic dom methods
+
+license: MIT-style
+
+authors:
+ - Al Kent
+
+requires:
+ - core/1.3.1: '*'
+
+provides:
+ - Form.PasswordStrength
+ - Element.Events.keyupandchange
+ - String.strength
+...
+*/
+
+if (!this.Form) this.Form = {};
+
+Form.PasswordStrength = new Class({
+	
+	Implements: [Options, Events],
+	
+	options: {
+		//onUpdate: $empty,
+		threshold: 66,
+		primer: '',
+		height: 5,
+		opacity: 1,
+		bgcolor: 'transparent'
+	},
+	
+	element: null,
+	fx: null,
+	
+	initialize: function(el, options){
+		this.element = document.id(el);
+		this.setOptions(options);
+		if (this.options.primer) this.options.threshold = this.options.primer.strength();
+		var coord = this.element.getCoordinates();
+		var bar = new Element('div', {
+			styles: {
+				'position': 'absolute',
+				'top': coord.top + coord.height,
+				'left': coord.left,
+				'width': coord.width,
+				'height': this.options.height,
+				'opacity': this.options.opacity,
+				'background-color': this.options.bgcolor
+			}
+		}).inject(document.body, 'bottom');
+		var meter = new Element('div', {
+			styles: {
+				'width': 0,
+				'height': '100%'
+			}
+		}).inject(bar);
+		this.fx = new Fx.Morph(meter, {
+			duration: 'short',
+			link: 'cancel',
+			unit: '%'
+		});
+		this.element.addEvent('keyupandchange', this.animate.bind(this));
+		if (this.element.get('value')) this.animate();
+	},
+	
+	animate: function(){
+		var value = this.element.get('value');
+		var color, strength = value.strength(), ratio = (strength / this.options.threshold).round(2).limit(0, 1);
+		if (ratio < 0.5) color = ('rgb(255, ' + (255 * ratio * 2).round() + ', 0)').rgbToHex();
+		else color = ('rgb(' + (255 * (1 - ratio) * 2).round() + ', 255, 0)').rgbToHex();
+		this.fx.start({
+			'width': 100 * ratio,
+			'background-color': color
+		});
+		this.fireEvent('update', [this.element, strength, this.options.threshold]);
+	}
+});
+
+Element.Events.keyupandchange = {
+	base: 'keyup',
+	condition: function(event){
+		var prev = this.retrieve('prev', null);
+		var cur = this.get('value');
+		if (typeOf(prev) != 'null' && prev == cur) return false;
+		this.store('prev', cur);
+		return true;
+	}
+};
+
+String.implement({
+	strength: function(){
+		var n = 0;
+		if (this.match(/\d/)) n += 10;
+		if (this.match(/[a-z]+/)) n += 26;
+		if (this.match(/[A-Z]+/)) n += 26;
+		if (this.match(/[^\da-zA-Z]/)) n += 33;
+		return (n == 0) ? 0 : (this.length * n.log() / (2).log()).round();
+	}
+});