Added the email field type to resolve gh-283. Fixed the CSS inclution error to resolve gh-278. Added the option to add sql_uninstall dump value to a component. Did some class formating on the compiler.

2018-05-11 06:08:14 +02:00 · 2018-05-11 06:08:14 +02:00 · e04db1b5b2
commit e04db1b5b2
parent 476a0c525a
51 changed files with 3782 additions and 3640 deletions
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.7.9) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.7.10) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -126,13 +126,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 5th May, 2018
-+ *Version*: 2.7.9
+ *Last Build*: 11th May, 2018
+ *Version*: 2.7.10
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **193874**
-+ *Field count*: **1034**
-+ *File count*: **1202**
+ *Line count*: **194639**
+ *Field count*: **1036**
+ *File count*: **1203**
 + *Folder count*: **193**

 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
--- a/admin/README.txt
+++ b/admin/README.txt
@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.7.9) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.7.10) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -126,13 +126,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 5th May, 2018
-+ *Version*: 2.7.9
+ *Last Build*: 11th May, 2018
+ *Version*: 2.7.10
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **193874**
-+ *Field count*: **1034**
-+ *File count*: **1202**
+ *Line count*: **194639**
+ *Field count*: **1036**
+ *File count*: **1203**
 + *Folder count*: **193**

 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
--- a/admin/helpers/compiler.php
+++ b/admin/helpers/compiler.php
@ -11,7 +11,7 @@
                                                      |_|
  /-------------------------------------------------------------------------------------------------------------------------------/

-  @version		2.6.x
+  @version		2.7.x
  @created		30th April, 2015
  @package		Component Builder
  @subpackage	compiler.php
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@ -11,7 +11,7 @@
                                                      |_|
  /-------------------------------------------------------------------------------------------------------------------------------/

-  @version		2.6.x
+  @version		2.7.x
  @created		30th April, 2015
  @package		Component Builder
  @subpackage	compiler.php
@ -947,7 +947,8 @@ class Get
 			// build the admin_views settings
 			$component->admin_views = array_map(function($array)
 			{
-				$array = array_map(function($value) {
+				$array = array_map(function($value)
+				{
 					if (!ComponentbuilderHelper::checkArray($value) && !ComponentbuilderHelper::checkObject($value) && strval($value) === strval(intval($value)))
 					{
 						return (int) $value;
@ -1213,6 +1214,12 @@ class Get
 			$this->customScriptBuilder['sql']['component_sql'] = base64_decode($component->sql);
 		}
 		unset($component->sql);
+		// add_sql_uninstall
+		if ($component->add_sql_uninstall == 1)
+		{
+			$this->customScriptBuilder['sql_uninstall'] = base64_decode($component->sql_uninstall);
+		}
+		unset($component->sql_uninstall);
 		// bom
 		if (ComponentbuilderHelper::checkString($component->bom))
 		{
@ -1783,27 +1790,28 @@ class Get
 				}
 			}
 			// activate alias builder
-			if (!isset($this->customAliasBuilder[$name_single]) && isset($view->alias_builder_type) && 2 == $view->alias_builder_type
-				&& isset($view->alias_builder) && ComponentbuilderHelper::checkJson($view->alias_builder))
+			if (!isset($this->customAliasBuilder[$name_single]) && isset($view->alias_builder_type) && 2 == $view->alias_builder_type && isset($view->alias_builder) && ComponentbuilderHelper::checkJson($view->alias_builder))
 			{
 				// get the aliasFields
 				$alias_fields = (array) json_decode($view->alias_builder, true);
 				// get the active fields
-				$alias_fields = (array) array_filter($view->fields, function($field)  use($alias_fields) {
-					// check if field is in view fields
-					if (in_array($field['field'], $alias_fields))
+				$alias_fields = (array) array_filter($view->fields, function($field) use($alias_fields)
 					{
-						return true;
-					}
-					return false;
-				});
+						// check if field is in view fields
+						if (in_array($field['field'], $alias_fields))
+						{
+							return true;
+						}
+						return false;
+					});
 				// check if all is well
 				if (ComponentbuilderHelper::checkArray($alias_fields))
 				{
 					// load the field names
-					$this->customAliasBuilder[$name_single] = (array) array_map(function ($field) use($name_list) {
+					$this->customAliasBuilder[$name_single] = (array) array_map(function ($field) use($name_list)
+						{
 							return $this->getFieldName($field, $name_list);
-						},$alias_fields
+						}, $alias_fields
 					);
 				}
 			}
@ -2167,7 +2175,7 @@ class Get
 							if (!in_array($validationRule, (array) $coreValidationRules))
 							{
 								// get the class methods for this rule if it exists
-								if ($this->validationRules[$validationRule] = ComponentbuilderHelper::getVar('validation_rule', $validationRule, 'name','php'))
+								if ($this->validationRules[$validationRule] = ComponentbuilderHelper::getVar('validation_rule', $validationRule, 'name', 'php'))
 								{
 									// open and set the validation rule
 									$this->validationRules[$validationRule] = $this->setDynamicValues(base64_decode($this->validationRules[$validationRule]));
@ -5497,13 +5505,13 @@ class Get
 		// get targets to search for
 		$langStringTargets = array_filter(
 			$this->langStringTargets, function($get) use($string)
+		{
+			if (strpos($string, $get) !== false)
 			{
-				if (strpos($string, $get) !== false)
-				{
-					return true;
-				}
-				return false;
-			});
+				return true;
+			}
+			return false;
+		});
 		// check if we should continue
 		if (ComponentbuilderHelper::checkArray($langStringTargets))
 		{
@ -5745,31 +5753,31 @@ class Get
 	public function bcmath($type, $val1, $val2)
 	{
 		// build function name
-		$function = 'bc'.$type;
+		$function = 'bc' . $type;
 		// use the bcmath function of available
 		if (function_exists($function))
 		{
 			return $function($val1, $val2);
 		}
 		// if function does not exist we use +-*/ operators (since it realy not that serious)
-		switch($type)
+		switch ($type)
 		{
 			// Multiply two numbers
 			case 'mul':
 				return round($val1 * $val2);
-			break;
+				break;
 			// Divide of two numbers
 			case 'div':
 				return round($val1 / $val2);
-			break;
+				break;
 			// Adding two numbers
 			case 'add':
 				return round($val1 + $val2);
-			break;
+				break;
 			// Subtract one number from the other
 			case 'add':
 				return round($val1 - $val2);
-			break;
+				break;
 		}
 		return false;
 	}
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@ -11,7 +11,7 @@
                                                      |_|
  /-------------------------------------------------------------------------------------------------------------------------------/

-  @version		2.6.x
+  @version		2.7.x
  @created		30th April, 2015
  @package		Component Builder
  @subpackage	compiler.php
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@ -11,7 +11,7 @@
                                                      |_|
  /-------------------------------------------------------------------------------------------------------------------------------/

-  @version		2.6.x
+  @version		2.7.x
  @created		30th April, 2015
  @package		Component Builder
  @subpackage	compiler.php
@ -2179,7 +2179,7 @@ class Fields extends Structure
 					// dont load the button to repeatable
 					$xmlValue = (string) ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'button="', '"'));
 					// add to custom values
-					$fieldAttributes['custom']['add_button'] = (ComponentbuilderHelper::checkString($xmlValue) || 1 == $xmlValue) ? $xmlValue: 'false';
+					$fieldAttributes['custom']['add_button'] = (ComponentbuilderHelper::checkString($xmlValue) || 1 == $xmlValue) ? $xmlValue : 'false';
 				}
 				elseif ($property['name'] === 'required' && $repeatable)
 				{
@ -2841,7 +2841,7 @@ class Fields extends Structure
 				$fieldData['component'] = "com_" . $fieldData['component'];
 			}
 			// make sure the component is update if ### or [[[ component placeholder is used
-			if (strpos($fieldData['component'], '###') !== false || strpos($fieldData['component'], '[[[') !== false ) // should not be needed... but
+			if (strpos($fieldData['component'], '###') !== false || strpos($fieldData['component'], '[[[') !== false) // should not be needed... but
 			{
 				$fieldData['component'] = $this->setPlaceholders($fieldData['component'], $this->placeholders);
 			}
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@ -11,7 +11,7 @@
                                                      |_|
  /-------------------------------------------------------------------------------------------------------------------------------/

-  @version		2.6.x
+  @version		2.7.x
  @created		30th April, 2015
  @package		Component Builder
  @subpackage	compiler.php
@ -1270,7 +1270,7 @@ class Interpretation extends Fields
 			$method[] = "\t\t\$lang = JFactory::getLanguage();";
 			$method[] = "\t\t\$extension = 'com_users';";
 			$method[] = "\t\t\$base_dir = JPATH_SITE;";
-			$method[] = "\t\t\$language_tag = '".$this->langTag."';";
+			$method[] = "\t\t\$language_tag = '" . $this->langTag . "';";
 			$method[] = "\t\t\$reload = true;";
 			$method[] = "\t\t\$lang->load(\$extension, \$base_dir, \$language_tag, \$reload);";
 			$method[] = "\t\t//" . $this->setLine(__LINE__) . " load the user regestration model";
@ -1351,7 +1351,7 @@ class Interpretation extends Fields
 			$method[] = "\t\t\$lang = JFactory::getLanguage();";
 			$method[] = "\t\t\$extension = 'com_users';";
 			$method[] = "\t\t\$base_dir = JPATH_ADMINISTRATOR;";
-			$method[] = "\t\t\$language_tag = '".$this->langTag."';";
+			$method[] = "\t\t\$language_tag = '" . $this->langTag . "';";
 			$method[] = "\t\t\$reload = true;";
 			$method[] = "\t\t\$lang->load(\$extension, \$base_dir, \$language_tag, \$reload);";
 			$method[] = "\t\t// load the user model";
@ -5472,7 +5472,7 @@ class Interpretation extends Fields
 		elseif (!$category && !$alias && ($title && count($titles) == 1 && !in_array('user', $titles) && !in_array('jobnumber', $titles))) // TODO [jobnumber] just for one project (not ideal)
 		{
 			$batchcopy[] = PHP_EOL . "\t\t\t//" . $this->setLine(__LINE__) . " Only for strings";
-			$batchcopy[] = "\t\t\tif (" . $Helper . "::checkString(\$this->table->" . implode('', $titles). ") && !is_numeric(\$this->table->" . implode('', $titles) . "))";
+			$batchcopy[] = "\t\t\tif (" . $Helper . "::checkString(\$this->table->" . implode('', $titles) . ") && !is_numeric(\$this->table->" . implode('', $titles) . "))";
 			$batchcopy[] = "\t\t\t{";
 			$batchcopy[] = "\t\t\t\t\$this->table->" . implode('', $titles) . " = \$this->generateUniqe('" . implode('', $titles) . "',\$this->table->" . implode('', $titles) . ");";
 			$batchcopy[] = "\t\t\t}";
@ -5572,7 +5572,7 @@ class Interpretation extends Fields
 				$titles = array($this->titleBuilder[$viewName_single]);
 			}
 			// start building the fix
-			$fixUniqe[] = PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Alter the " . implode(', ',$titles) . " for save as copy";
+			$fixUniqe[] = PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Alter the " . implode(', ', $titles) . " for save as copy";
 			$fixUniqe[] = "\t\tif (\$input->get('task') === 'save2copy')";
 			$fixUniqe[] = "\t\t{";
 			$fixUniqe[] = "\t\t\t\$origTable = clone \$this->getTable();";
@ -5594,15 +5594,15 @@ class Interpretation extends Fields
 			$fixUniqe[] = "\t\t\t{";
 			if ($setCategory && count($titles) == 1)
 			{
-				$fixUniqe[] = "\t\t\t\tlist(" . implode('',$titleVars) . ", \$" . $alias . ") = \$this->generateNewTitle(\$data['" . $category . "'], \$data['" . $alias . "'], " . implode('',$titleData) . ");";
+				$fixUniqe[] = "\t\t\t\tlist(" . implode('', $titleVars) . ", \$" . $alias . ") = \$this->generateNewTitle(\$data['" . $category . "'], \$data['" . $alias . "'], " . implode('', $titleData) . ");";
 			}
 			elseif (count($titles) == 1)
 			{
-				$fixUniqe[] = "\t\t\t\tlist(" . implode(', ',$titleVars) . ", \$" . $alias . ") = \$this->_generateNewTitle(\$data['" . $alias . "'], " . implode('',$titleData) . ");";
+				$fixUniqe[] = "\t\t\t\tlist(" . implode(', ', $titleVars) . ", \$" . $alias . ") = \$this->_generateNewTitle(\$data['" . $alias . "'], " . implode('', $titleData) . ");";
 			}
 			else
 			{
-				$fixUniqe[] = "\t\t\t\tlist(" . implode(', ',$titleVars) . ", \$" . $alias . ") = \$this->_generateNewTitle(\$data['" . $alias . "'], array(" . implode(', ',$titleData) . "));";
+				$fixUniqe[] = "\t\t\t\tlist(" . implode(', ', $titleVars) . ", \$" . $alias . ") = \$this->_generateNewTitle(\$data['" . $alias . "'], array(" . implode(', ', $titleData) . "));";
 			}
 			$fixUniqe[] = implode("\n", $titleUpdate);
 			$fixUniqe[] = "\t\t\t\t\$data['" . $alias . "'] = \$" . $alias . ";";
@ -5627,7 +5627,7 @@ class Interpretation extends Fields
 			$fixUniqe[] = "\t\t\t\t}";
 			$fixUniqe[] = "\t\t\t\telse";
 			$fixUniqe[] = "\t\t\t\t{";
-			$fixUniqe[] = "\t\t\t\t\t\$data['" . $alias . "'] = JFilterOutput::stringURLSafe(". implode(' . " " . ', $titleData) .");";
+			$fixUniqe[] = "\t\t\t\t\t\$data['" . $alias . "'] = JFilterOutput::stringURLSafe(" . implode(' . " " . ', $titleData) . ");";
 			$fixUniqe[] = "\t\t\t\t}";
 			$fixUniqe[] = PHP_EOL . "\t\t\t\t\$table = JTable::getInstance('" . $viewName_single . "', '" . $this->fileContentStatic['###component###'] . "Table');";
 			if ($setCategory && count($titles) == 1)
@ -5636,7 +5636,7 @@ class Interpretation extends Fields
 				$fixUniqe[] = "\t\t\t\t{";
 				$fixUniqe[] = "\t\t\t\t\t\$msg = JText:" . ":_('COM_" . $this->fileContentStatic['###COMPONENT###'] . "_" . $VIEW . "_SAVE_WARNING');";
 				$fixUniqe[] = "\t\t\t\t}";
-				$fixUniqe[] = PHP_EOL . "\t\t\t\tlist(" . implode('',$titleVars) . ", \$" . $alias . ") = \$this->generateNewTitle(\$data['" . $category . "'], \$data['" . $alias . "'], " . implode('',$titleData) . ");";
+				$fixUniqe[] = PHP_EOL . "\t\t\t\tlist(" . implode('', $titleVars) . ", \$" . $alias . ") = \$this->generateNewTitle(\$data['" . $category . "'], \$data['" . $alias . "'], " . implode('', $titleData) . ");";
 				$fixUniqe[] = "\t\t\t\t\$data['" . $alias . "'] = \$" . $alias . ";";
 			}
 			else
@ -5698,7 +5698,7 @@ class Interpretation extends Fields
 			$newFunction[] = PHP_EOL . "\t\twhile (\$table->load(array('alias' => \$alias)))";
 			$newFunction[] = "\t\t{";
 			$newFunction[] = "\t\t\t//" . $this->setLine(__LINE__) . " Check if this is an array of titles";
-			$newFunction[] = "\t\t\tif (".$Component."Helper::checkArray(\$title))";
+			$newFunction[] = "\t\t\tif (" . $Component . "Helper::checkArray(\$title))";
 			$newFunction[] = "\t\t\t{";
 			$newFunction[] = "\t\t\t\tforeach(\$title as \$nr => &\$_title)";
 			$newFunction[] = "\t\t\t\t{";
@ -5713,7 +5713,7 @@ class Interpretation extends Fields
 			$newFunction[] = "\t\t\t\$alias = JString::increment(\$alias, 'dash');";
 			$newFunction[] = "\t\t}";
 			$newFunction[] = "\t\t//" . $this->setLine(__LINE__) . " Check if this is an array of titles";
-			$newFunction[] = "\t\tif (".$Component."Helper::checkArray(\$title))";
+			$newFunction[] = "\t\tif (" . $Component . "Helper::checkArray(\$title))";
 			$newFunction[] = "\t\t{";
 			$newFunction[] = "\t\t\t\$title[] = \$alias;";
 			$newFunction[] = "\t\t\treturn \$title;";
@ -5794,14 +5794,14 @@ class Interpretation extends Fields
 			$newFunction[] = "\t{";
 			$newFunction[] = "\t\tif (empty(\$this->alias))";
 			$newFunction[] = "\t\t{";
-			$newFunction[] = "\t\t\t\$this->alias = ".implode(".' '.",$titleData).';';
+			$newFunction[] = "\t\t\t\$this->alias = " . implode(".' '.", $titleData) . ';';
 			$newFunction[] = "\t\t}";
-			$newFunction[] = PHP_EOL ."\t\t\$this->alias = JApplication::stringURLSafe(\$this->alias);";
-			$newFunction[] = PHP_EOL ."\t\tif (trim(str_replace('-', '', \$this->alias)) == '')";
+			$newFunction[] = PHP_EOL . "\t\t\$this->alias = JApplication::stringURLSafe(\$this->alias);";
+			$newFunction[] = PHP_EOL . "\t\tif (trim(str_replace('-', '', \$this->alias)) == '')";
 			$newFunction[] = "\t\t{";
 			$newFunction[] = "\t\t\t\$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');";
 			$newFunction[] = "\t\t}";
-			$newFunction[] = PHP_EOL ."\t\treturn \$this->alias;";
+			$newFunction[] = PHP_EOL . "\t\treturn \$this->alias;";
 			$newFunction[] = "\t}";
 			return implode(PHP_EOL, $newFunction);
 		}
@ -6048,6 +6048,7 @@ class Interpretation extends Fields
 					$placeholders = array('[[[component]]]' => $component, '[[[view]]]' => $for);
 					$db .= $this->setPlaceholders($customSql, $placeholders) . PHP_EOL . PHP_EOL;
 				}
+				unset($this->customScriptBuilder['sql']);
 			}
 			return $db;
 		}
@ -6056,16 +6057,21 @@ class Interpretation extends Fields

 	public function setUninstall()
 	{
+		$db = '';
 		if (isset($this->queryBuilder) && ComponentbuilderHelper::checkArray($this->queryBuilder))
 		{
-			$bd = '';
 			foreach ($this->uninstallBuilder as $line)
 			{
-				$bd .= $line . PHP_EOL;
+				$db .= $line . PHP_EOL;
 			}
-			return $bd;
 		}
-		return '';
+		// add custom sql uninstall dump to the file
+		if (isset($this->customScriptBuilder['sql_uninstall']) && ComponentbuilderHelper::checkString($this->customScriptBuilder['sql_uninstall']))
+		{
+			$db .= $this->setPlaceholders($this->customScriptBuilder['sql_uninstall'], $this->placeholders) . PHP_EOL;
+			unset($this->customScriptBuilder['sql_uninstall']);
+		}
+		return $db;
 	}

 	public function setLangAdmin()
@ -11924,7 +11930,7 @@ class Interpretation extends Fields
 								{
 									$keyTableNAme = $item['custom']['table'];
 								}
-								$fix .= PHP_EOL . "\t" . $tab . "\t\t\t\$item->" . $item['name'] . " = " . $Component . "Helper::jsonToString(\$item->" . $item['name'] . ", ', ', '" . $keyTableNAme . "', '".$item['custom']['id']."', '".$item['custom']['text']."');";
+								$fix .= PHP_EOL . "\t" . $tab . "\t\t\t\$item->" . $item['name'] . " = " . $Component . "Helper::jsonToString(\$item->" . $item['name'] . ", ', ', '" . $keyTableNAme . "', '" . $item['custom']['id'] . "', '" . $item['custom']['text'] . "');";
 							}
 							else
 							{
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@ -11,7 +11,7 @@
                                                      |_|
  /-------------------------------------------------------------------------------------------------------------------------------/

-  @version		2.6.x
+  @version		2.7.x
  @created		30th April, 2015
  @package		Component Builder
  @subpackage	compiler.php
@ -479,10 +479,10 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] = $this->setJviewListCanDo($viewName_single, $viewName_list);

 					// ###VIEWSCSS### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$viewName_list]['###VIEWSCSS###'] = $this->getCustomScriptBuilder('css_views', $viewName_list, '', null, true);
+					$this->fileContentDynamic[$viewName_list]['###VIEWSCSS###'] = $this->getCustomScriptBuilder('css_views', $viewName_single, '', null, true);

 					// ###VIEWS_FOOTER_SCRIPT### <<<DYNAMIC>>>
-					$scriptNote = PHP_EOL . '//' . $this->setLine(__LINE__) . ' ' . $viewName_list.' footer script';
+					$scriptNote = PHP_EOL . '//' . $this->setLine(__LINE__) . ' ' . $viewName_list . ' footer script';
 					if ($footerScript = $this->getCustomScriptBuilder('views_footer', $viewName_single, '', $scriptNote, true, false, PHP_EOL))
 					{
 						// only minfy if no php is added to the footer script
@ -775,9 +775,9 @@ class Infusion extends Interpretation
 					$target = array('admin' => 'a_rule_zi');
 					$this->buildDynamique($target, 'rule', $rule);
 					// set the JFormRule Name
-					$this->fileContentDynamic['a_rule_zi_'.$rule]['###Name###'] = ucfirst($rule);
+					$this->fileContentDynamic['a_rule_zi_' . $rule]['###Name###'] = ucfirst($rule);
 					// set the JFormRule PHP
-					$this->fileContentDynamic['a_rule_zi_'.$rule]['###VALIDATION_RULE_METHODS###'] = PHP_EOL . $_php;
+					$this->fileContentDynamic['a_rule_zi_' . $rule]['###VALIDATION_RULE_METHODS###'] = PHP_EOL . $_php;
 				}
 			}

@ -1135,12 +1135,12 @@ class Infusion extends Interpretation
 							if ($percentage < $this->percentageLanguageAdd)
 							{
 								// dont add
-								$this->langNot[$area . ' ' . $tag] = '<b>' . $mainLangLoader[$area] . '</b>(total '.$this->langTag.' strings) only <b>' . $langStringNr . '</b>' . $stringNAme . ' = ' . $percentage;
+								$this->langNot[$area . ' ' . $tag] = '<b>' . $mainLangLoader[$area] . '</b>(total ' . $this->langTag . ' strings) only <b>' . $langStringNr . '</b>' . $stringNAme . ' = ' . $percentage;
 								continue;
 							}
 						}
 						// show if it was added as well
-						$this->langSet[$area . ' ' . $tag] = '<b>' . $mainLangLoader[$area] . '</b>(total '.$this->langTag.' strings) and <b>' . $langStringNr . '</b>' . $stringNAme . ' = ' . $percentage;
+						$this->langSet[$area . ' ' . $tag] = '<b>' . $mainLangLoader[$area] . '</b>(total ' . $this->langTag . ' strings) and <b>' . $langStringNr . '</b>' . $stringNAme . ' = ' . $percentage;
 					}
 					// set naming convention
 					$p = 'admin';
@ -1172,13 +1172,14 @@ class Infusion extends Interpretation
 					// count the file created
 					$this->fileCount++;
 					// add content to it
-					$lang = array_map(function ($langstring, $placeholder) {
+					$lang = array_map(function ($langstring, $placeholder)
+					{
 						return $placeholder . '="' . $langstring . '"';
 					}, $languageStrings, array_keys($languageStrings));
 					// add to language file
 					$this->writeFile($path . '/' . $fileName, implode(PHP_EOL, $lang));
 					// set the line counter
-					$this->lineCount = $this->lineCount + count((array)$lang);
+					$this->lineCount = $this->lineCount + count((array) $lang);
 					// build xml strings
 					if (!isset($langXML[$p]))
 					{
@ -1210,4 +1211,5 @@ class Infusion extends Interpretation
 			}
 		}
 	}
+
 }
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@ -347,7 +347,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL="Add PHP (postSaveHoo
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE="Add Php Save"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL="Add PHP (save Method - after data modeling)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL="Add Sql"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL="Add MySQL (to view table)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL="Add MySQL - (Install)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW="Adminview"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION="Select an admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL="View"
@ -810,7 +810,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCE_LABEL="Select MySql Source"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SQL="Sql"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_DESCRIPTION="Add your MySQL here!"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT="// Add MySQL Table Dump Here"
-COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_LABEL="MySQL"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_LABEL="MySQL - (Install)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SQUARE="Square"
 COM_COMPONENTBUILDER_ADMIN_VIEW_STACK="Stack"
 COM_COMPONENTBUILDER_ADMIN_VIEW_STAR_TWO="Star 2"
@ -4377,7 +4377,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SALES_SERVER_LABEL="Add Sales Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SITE_EVENT="Add Site Event"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SITE_EVENT_LABEL="Add Global Site Event"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL="Add Sql"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL="Add MySQL (to view table)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL="Add MySQL - (Install)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_UNINSTALL="Add Sql Uninstall"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_UNINSTALL_LABEL="Add MySQL - (Uninstall)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTHREE="Add Uikit v3"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTWO="Add Uikit v2"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER="Add Update Server"
@ -4684,7 +4686,11 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SITE_VIEWS="Site Views"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL="Sql"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_DESCRIPTION="Add your MySQL here!"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_HINT="// Add MySQL Table Dump Here"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_LABEL="MySQL"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_LABEL="MySQL - (Install)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL="Sql Uninstall"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_DESCRIPTION="Add your MySQL here for uninstall!"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_HINT="// Add MySQL to uninstall Here"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_LABEL="MySQL - (Uninstall)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_STATUS="Status"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SYSTEM_NAME="System Name"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SYSTEM_NAME_DESCRIPTION="Used only in the system."
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->wacfields;
+$items	= $displayData->wadfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
--- a/admin/layouts/joomla_component/mysql_fullwidth.php
+++ b/admin/layouts/joomla_component/mysql_fullwidth.php
@ -31,7 +31,9 @@ $form = $displayData->getForm();

 $fields = $displayData->get('fields') ?: array(
 	'add_sql',
-	'sql'
+	'sql',
+	'add_sql_uninstall',
+	'sql_uninstall'
 );

 ?>
--- a/admin/layouts/server/linked_components_fullwidth.php
+++ b/admin/layouts/server/linked_components_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->wamlinked_components;
+$items	= $displayData->wanlinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
--- a/admin/models/fields/adminviewsreadonly.php
+++ b/admin/models/fields/adminviewsreadonly.php
@ -50,21 +50,22 @@ class JFormFieldAdminviewsreadonly extends JFormFieldList
 	public function getOptions()
 	{
 		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.system_name'),array('id','admin_view_system_name')));
-		$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
-		$query->order('a.system_name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->admin_view_system_name);
-			}
-		}
-		return $options;
+$query = $db->getQuery(true);
+$query->select($db->quoteName(array('a.id','a.system_name'),array('id','admin_view_system_name')));
+$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
+$query->order('a.system_name ASC');
+$db->setQuery((string)$query);
+$items = $db->loadObjectList();
+$options = array();
+if ($items)
+{
+	$options[] = JHtml::_('select.option', '', 'Select an option');
+	foreach($items as $item)
+	{
+		$options[] = JHtml::_('select.option', $item->id, $item->admin_view_system_name);
+	}
+}
+
+return $options;
 	}
 }
--- a/admin/models/fields/joomlacomponents.php
+++ b/admin/models/fields/joomlacomponents.php
@ -50,21 +50,22 @@ class JFormFieldJoomlacomponents extends JFormFieldList
 	public function getOptions()
 	{
 		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.system_name'),array('id','joomla_component_system_name')));
-		$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
-		$query->order('a.system_name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->joomla_component_system_name);
-			}
-		}
-		return $options;
+$query = $db->getQuery(true);
+$query->select($db->quoteName(array('a.id','a.system_name'),array('id','joomla_component_system_name')));
+$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
+$query->order('a.system_name ASC');
+$db->setQuery((string)$query);
+$items = $db->loadObjectList();
+$options = array();
+if ($items)
+{
+	$options[] = JHtml::_('select.option', '', 'Select an option');
+	foreach($items as $item)
+	{
+		$options[] = JHtml::_('select.option', $item->id, $item->joomla_component_system_name);
+	}
+}
+
+return $options;
 	}
 }
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getWacfields()
+	public function getWadfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWacfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWacfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWacfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWacfields($item->store, 'store');
+					$item->store = $this->selectionTranslationWadfields($item->store, 'store');
 				}
 			}

@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationWacfields($value,$name)
+	public function selectionTranslationWadfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
--- a/admin/models/forms/custom_admin_view.js
+++ b/admin/models/forms/custom_admin_view.js
@ -23,7 +23,6 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvydvxw_required = false;
 jform_vvvvvyevxx_required = false;
 jform_vvvvvyfvxy_required = false;
 jform_vvvvvygvxz_required = false;
@ -31,286 +30,287 @@ jform_vvvvvyhvya_required = false;
 jform_vvvvvyivyb_required = false;
 jform_vvvvvyjvyc_required = false;
 jform_vvvvvykvyd_required = false;
-jform_vvvvvykvye_required = false;
+jform_vvvvvylvye_required = false;
 jform_vvvvvylvyf_required = false;
 jform_vvvvvymvyg_required = false;
+jform_vvvvvynvyh_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyd(add_php_view_vvvvvyd);
+	var add_php_view_vvvvvye = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvye(add_php_view_vvvvvye);

-	var add_php_jview_display_vvvvvye = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvye(add_php_jview_display_vvvvvye);
+	var add_php_jview_display_vvvvvyf = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyf(add_php_jview_display_vvvvvyf);

-	var add_php_jview_vvvvvyf = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyf(add_php_jview_vvvvvyf);
+	var add_php_jview_vvvvvyg = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyg(add_php_jview_vvvvvyg);

-	var add_php_document_vvvvvyg = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyg(add_php_document_vvvvvyg);
+	var add_php_document_vvvvvyh = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyh(add_php_document_vvvvvyh);

-	var add_css_document_vvvvvyh = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyh(add_css_document_vvvvvyh);
+	var add_css_document_vvvvvyi = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyi(add_css_document_vvvvvyi);

-	var add_javascript_file_vvvvvyi = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyi(add_javascript_file_vvvvvyi);
+	var add_javascript_file_vvvvvyj = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyj(add_javascript_file_vvvvvyj);

-	var add_js_document_vvvvvyj = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyj(add_js_document_vvvvvyj);
+	var add_js_document_vvvvvyk = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyk(add_js_document_vvvvvyk);

-	var add_custom_button_vvvvvyk = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyk(add_custom_button_vvvvvyk);
+	var add_custom_button_vvvvvyl = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyl(add_custom_button_vvvvvyl);

-	var add_css_vvvvvyl = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyl(add_css_vvvvvyl);
+	var add_css_vvvvvym = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvym(add_css_vvvvvym);

-	var add_php_ajax_vvvvvym = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvym(add_php_ajax_vvvvvym);
+	var add_php_ajax_vvvvvyn = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyn(add_php_ajax_vvvvvyn);
 });

-// the vvvvvyd function
-function vvvvvyd(add_php_view_vvvvvyd)
+// the vvvvvye function
+function vvvvvye(add_php_view_vvvvvye)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyd == 1)
+	if (add_php_view_vvvvvye == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvydvxw_required)
+		if (jform_vvvvvyevxx_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvydvxw_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvydvxw_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvydvxw_required = true;
-		}
-	}
-}
-
-// the vvvvvye function
-function vvvvvye(add_php_jview_display_vvvvvye)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvye == 1)
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvyevxx_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyevxx_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_jview_display').closest('.control-group').hide();
+		jQuery('#jform_php_view').closest('.control-group').hide();
 		if (!jform_vvvvvyevxx_required)
 		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
+			updateFieldRequired('php_view',1);
+			jQuery('#jform_php_view').removeAttr('required');
+			jQuery('#jform_php_view').removeAttr('aria-required');
+			jQuery('#jform_php_view').removeClass('required');
 			jform_vvvvvyevxx_required = true;
 		}
 	}
 }

 // the vvvvvyf function
-function vvvvvyf(add_php_jview_vvvvvyf)
+function vvvvvyf(add_php_jview_display_vvvvvyf)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyf == 1)
+	if (add_php_jview_display_vvvvvyf == 1)
 	{
-		jQuery('#jform_php_jview').closest('.control-group').show();
+		jQuery('#jform_php_jview_display').closest('.control-group').show();
 		if (jform_vvvvvyfvxy_required)
 		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyfvxy_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_jview').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display').closest('.control-group').hide();
 		if (!jform_vvvvvyfvxy_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvyfvxy_required = true;
 		}
 	}
 }

 // the vvvvvyg function
-function vvvvvyg(add_php_document_vvvvvyg)
+function vvvvvyg(add_php_jview_vvvvvyg)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyg == 1)
+	if (add_php_jview_vvvvvyg == 1)
 	{
-		jQuery('#jform_php_document').closest('.control-group').show();
+		jQuery('#jform_php_jview').closest('.control-group').show();
 		if (jform_vvvvvygvxz_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvygvxz_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_document').closest('.control-group').hide();
+		jQuery('#jform_php_jview').closest('.control-group').hide();
 		if (!jform_vvvvvygvxz_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvygvxz_required = true;
 		}
 	}
 }

 // the vvvvvyh function
-function vvvvvyh(add_css_document_vvvvvyh)
+function vvvvvyh(add_php_document_vvvvvyh)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyh == 1)
+	if (add_php_document_vvvvvyh == 1)
 	{
-		jQuery('#jform_css_document').closest('.control-group').show();
+		jQuery('#jform_php_document').closest('.control-group').show();
 		if (jform_vvvvvyhvya_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvyhvya_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css_document').closest('.control-group').hide();
+		jQuery('#jform_php_document').closest('.control-group').hide();
 		if (!jform_vvvvvyhvya_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvyhvya_required = true;
 		}
 	}
 }

 // the vvvvvyi function
-function vvvvvyi(add_javascript_file_vvvvvyi)
+function vvvvvyi(add_css_document_vvvvvyi)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyi == 1)
+	if (add_css_document_vvvvvyi == 1)
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').show();
+		jQuery('#jform_css_document').closest('.control-group').show();
 		if (jform_vvvvvyivyb_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvyivyb_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').hide();
+		jQuery('#jform_css_document').closest('.control-group').hide();
 		if (!jform_vvvvvyivyb_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvyivyb_required = true;
 		}
 	}
 }

 // the vvvvvyj function
-function vvvvvyj(add_js_document_vvvvvyj)
+function vvvvvyj(add_javascript_file_vvvvvyj)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyj == 1)
+	if (add_javascript_file_vvvvvyj == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_javascript_file').closest('.control-group').show();
 		if (jform_vvvvvyjvyc_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyjvyc_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_javascript_file').closest('.control-group').hide();
 		if (!jform_vvvvvyjvyc_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyjvyc_required = true;
 		}
 	}
 }

 // the vvvvvyk function
-function vvvvvyk(add_custom_button_vvvvvyk)
+function vvvvvyk(add_js_document_vvvvvyk)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyk == 1)
+	if (add_js_document_vvvvvyk == 1)
+	{
+		jQuery('#jform_js_document').closest('.control-group').show();
+		if (jform_vvvvvykvyd_required)
+		{
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
+			jform_vvvvvykvyd_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_js_document').closest('.control-group').hide();
+		if (!jform_vvvvvykvyd_required)
+		{
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
+			jform_vvvvvykvyd_required = true;
+		}
+	}
+}
+
+// the vvvvvyl function
+function vvvvvyl(add_custom_button_vvvvvyl)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvyl == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvykvyd_required)
+		if (jform_vvvvvylvye_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvykvyd_required = false;
+			jform_vvvvvylvye_required = false;
 		}

 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvykvye_required)
+		if (jform_vvvvvylvyf_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvykvye_required = false;
+			jform_vvvvvylvyf_required = false;
 		}

 	}
@ -318,72 +318,72 @@ function vvvvvyk(add_custom_button_vvvvvyk)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvykvyd_required)
+		if (!jform_vvvvvylvye_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvykvyd_required = true;
+			jform_vvvvvylvye_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvykvye_required)
+		if (!jform_vvvvvylvyf_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvykvye_required = true;
-		}
-	}
-}
-
-// the vvvvvyl function
-function vvvvvyl(add_css_vvvvvyl)
-{
-	// set the function logic
-	if (add_css_vvvvvyl == 1)
-	{
-		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvylvyf_required)
-		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
-			jform_vvvvvylvyf_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvylvyf_required)
-		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
 			jform_vvvvvylvyf_required = true;
 		}
 	}
 }

 // the vvvvvym function
-function vvvvvym(add_php_ajax_vvvvvym)
+function vvvvvym(add_css_vvvvvym)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvym == 1)
+	if (add_css_vvvvvym == 1)
+	{
+		jQuery('#jform_css').closest('.control-group').show();
+		if (jform_vvvvvymvyg_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvymvyg_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css').closest('.control-group').hide();
+		if (!jform_vvvvvymvyg_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvymvyg_required = true;
+		}
+	}
+}
+
+// the vvvvvyn function
+function vvvvvyn(add_php_ajax_vvvvvyn)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyn == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvymvyg_required)
+		if (jform_vvvvvynvyh_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvymvyg_required = false;
+			jform_vvvvvynvyh_required = false;
 		}

 	}
@ -391,13 +391,13 @@ function vvvvvym(add_php_ajax_vvvvvym)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvymvyg_required)
+		if (!jform_vvvvvynvyh_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvymvyg_required = true;
+			jform_vvvvvynvyh_required = true;
 		}
 	}
 }
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@ -23,43 +23,43 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvzzvzo_required = false;
 jform_vvvvwaavzp_required = false;
-jform_vvvvwaavzq_required = false;
-jform_vvvvwaavzr_required = false;
+jform_vvvvwabvzq_required = false;
+jform_vvvvwabvzr_required = false;
+jform_vvvvwabvzs_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzz(target_vvvvvzz);
-
 	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
 	vvvvwaa(target_vvvvwaa);

 	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwab(target_vvvvwab,type_vvvvwab);
+	vvvvwab(target_vvvvwab);

-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwac(type_vvvvwac,target_vvvvwac);
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwac(target_vvvvwac,type_vvvvwac);
+
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwad(type_vvvvwad,target_vvvvwad);
 });

-// the vvvvvzz function
-function vvvvvzz(target_vvvvvzz)
+// the vvvvwaa function
+function vvvvwaa(target_vvvvwaa)
 {
 	// set the function logic
-	if (target_vvvvvzz == 2)
+	if (target_vvvvwaa == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzzvzo_required)
+		if (jform_vvvvwaavzp_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvvzzvzo_required = false;
+			jform_vvvvwaavzp_required = false;
 		}

 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@ -68,99 +68,99 @@ function vvvvvzz(target_vvvvvzz)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzzvzo_required)
+		if (!jform_vvvvwaavzp_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvvzzvzo_required = true;
+			jform_vvvvwaavzp_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }

-// the vvvvwaa function
-function vvvvwaa(target_vvvvwaa)
+// the vvvvwab function
+function vvvvwab(target_vvvvwab)
 {
 	// set the function logic
-	if (target_vvvvwaa == 1)
+	if (target_vvvvwab == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvwaavzp_required)
+		if (jform_vvvvwabvzq_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwaavzp_required = false;
+			jform_vvvvwabvzq_required = false;
 		}

 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwaavzq_required)
+		if (jform_vvvvwabvzr_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwaavzq_required = false;
+			jform_vvvvwabvzr_required = false;
 		}

 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
-		if (jform_vvvvwaavzr_required)
+		if (jform_vvvvwabvzs_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwaavzr_required = false;
+			jform_vvvvwabvzs_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvwaavzp_required)
+		if (!jform_vvvvwabvzq_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwaavzp_required = true;
+			jform_vvvvwabvzq_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwaavzq_required)
+		if (!jform_vvvvwabvzr_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwaavzq_required = true;
+			jform_vvvvwabvzr_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
-		if (!jform_vvvvwaavzr_required)
+		if (!jform_vvvvwabvzs_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwaavzr_required = true;
+			jform_vvvvwabvzs_required = true;
 		}
 	}
 }

-// the vvvvwab function
-function vvvvwab(target_vvvvwab,type_vvvvwab)
+// the vvvvwac function
+function vvvvwac(target_vvvvwac,type_vvvvwac)
 {
 	// set the function logic
-	if (target_vvvvwab == 1 && type_vvvvwab == 1)
+	if (target_vvvvwac == 1 && type_vvvvwac == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@ -172,11 +172,11 @@ function vvvvwab(target_vvvvwab,type_vvvvwab)
 	}
 }

-// the vvvvwac function
-function vvvvwac(type_vvvvwac,target_vvvvwac)
+// the vvvvwad function
+function vvvvwad(type_vvvvwad,target_vvvvwad)
 {
 	// set the function logic
-	if (type_vvvvwac == 1 && target_vvvvwac == 1)
+	if (type_vvvvwad == 1 && target_vvvvwad == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@ -23,151 +23,96 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvwalvzu_required = false;
 jform_vvvvwamvzv_required = false;
 jform_vvvvwanvzw_required = false;
 jform_vvvvwaovzx_required = false;
-jform_vvvvwarvzy_required = false;
+jform_vvvvwapvzy_required = false;
 jform_vvvvwasvzz_required = false;
 jform_vvvvwatwaa_required = false;
 jform_vvvvwauwab_required = false;
+jform_vvvvwavwac_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwal = jQuery("#jform_datalenght").val();
-	vvvvwal(datalenght_vvvvwal);
+	var datalenght_vvvvwam = jQuery("#jform_datalenght").val();
+	vvvvwam(datalenght_vvvvwam);

-	var datadefault_vvvvwam = jQuery("#jform_datadefault").val();
-	vvvvwam(datadefault_vvvvwam);
-
-	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwan(datatype_vvvvwan);
+	var datadefault_vvvvwan = jQuery("#jform_datadefault").val();
+	vvvvwan(datadefault_vvvvwan);

 	var datatype_vvvvwao = jQuery("#jform_datatype").val();
 	vvvvwao(datatype_vvvvwao);

-	var store_vvvvwap = jQuery("#jform_store").val();
 	var datatype_vvvvwap = jQuery("#jform_datatype").val();
-	vvvvwap(store_vvvvwap,datatype_vvvvwap);
+	vvvvwap(datatype_vvvvwap);

-	var add_css_view_vvvvwar = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwar(add_css_view_vvvvwar);
+	var store_vvvvwaq = jQuery("#jform_store").val();
+	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
+	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);

-	var add_css_views_vvvvwas = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwas(add_css_views_vvvvwas);
+	var add_css_view_vvvvwas = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwas(add_css_view_vvvvwas);

-	var add_javascript_view_footer_vvvvwat = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwat(add_javascript_view_footer_vvvvwat);
+	var add_css_views_vvvvwat = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwat(add_css_views_vvvvwat);

-	var add_javascript_views_footer_vvvvwau = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwau(add_javascript_views_footer_vvvvwau);
+	var add_javascript_view_footer_vvvvwau = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwau(add_javascript_view_footer_vvvvwau);
+
+	var add_javascript_views_footer_vvvvwav = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwav(add_javascript_views_footer_vvvvwav);
 });

-// the vvvvwal function
-function vvvvwal(datalenght_vvvvwal)
+// the vvvvwam function
+function vvvvwam(datalenght_vvvvwam)
 {
-	if (isSet(datalenght_vvvvwal) && datalenght_vvvvwal.constructor !== Array)
+	if (isSet(datalenght_vvvvwam) && datalenght_vvvvwam.constructor !== Array)
 	{
-		var temp_vvvvwal = datalenght_vvvvwal;
-		var datalenght_vvvvwal = [];
-		datalenght_vvvvwal.push(temp_vvvvwal);
+		var temp_vvvvwam = datalenght_vvvvwam;
+		var datalenght_vvvvwam = [];
+		datalenght_vvvvwam.push(temp_vvvvwam);
 	}
-	else if (!isSet(datalenght_vvvvwal))
+	else if (!isSet(datalenght_vvvvwam))
 	{
-		var datalenght_vvvvwal = [];
+		var datalenght_vvvvwam = [];
 	}
-	var datalenght = datalenght_vvvvwal.some(datalenght_vvvvwal_SomeFunc);
+	var datalenght = datalenght_vvvvwam.some(datalenght_vvvvwam_SomeFunc);


 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwalvzu_required)
+		if (jform_vvvvwamvzv_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwalvzu_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwalvzu_required)
-		{
-			updateFieldRequired('datalenght_other',1);
-			jQuery('#jform_datalenght_other').removeAttr('required');
-			jQuery('#jform_datalenght_other').removeAttr('aria-required');
-			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwalvzu_required = true;
-		}
-	}
-}
-
-// the vvvvwal Some function
-function datalenght_vvvvwal_SomeFunc(datalenght_vvvvwal)
-{
-	// set the function logic
-	if (datalenght_vvvvwal == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwam function
-function vvvvwam(datadefault_vvvvwam)
-{
-	if (isSet(datadefault_vvvvwam) && datadefault_vvvvwam.constructor !== Array)
-	{
-		var temp_vvvvwam = datadefault_vvvvwam;
-		var datadefault_vvvvwam = [];
-		datadefault_vvvvwam.push(temp_vvvvwam);
-	}
-	else if (!isSet(datadefault_vvvvwam))
-	{
-		var datadefault_vvvvwam = [];
-	}
-	var datadefault = datadefault_vvvvwam.some(datadefault_vvvvwam_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwamvzv_required)
-		{
-			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_datadefault_other').addClass('required');
 			jform_vvvvwamvzv_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
+		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		if (!jform_vvvvwamvzv_required)
 		{
-			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_datadefault_other').removeClass('required');
+			updateFieldRequired('datalenght_other',1);
+			jQuery('#jform_datalenght_other').removeAttr('required');
+			jQuery('#jform_datalenght_other').removeAttr('aria-required');
+			jQuery('#jform_datalenght_other').removeClass('required');
 			jform_vvvvwamvzv_required = true;
 		}
 	}
 }

 // the vvvvwam Some function
-function datadefault_vvvvwam_SomeFunc(datadefault_vvvvwam)
+function datalenght_vvvvwam_SomeFunc(datalenght_vvvvwam)
 {
 	// set the function logic
-	if (datadefault_vvvvwam == 'Other')
+	if (datalenght_vvvvwam == 'Other')
 	{
 		return true;
 	}
@ -175,58 +120,54 @@ function datadefault_vvvvwam_SomeFunc(datadefault_vvvvwam)
 }

 // the vvvvwan function
-function vvvvwan(datatype_vvvvwan)
+function vvvvwan(datadefault_vvvvwan)
 {
-	if (isSet(datatype_vvvvwan) && datatype_vvvvwan.constructor !== Array)
+	if (isSet(datadefault_vvvvwan) && datadefault_vvvvwan.constructor !== Array)
 	{
-		var temp_vvvvwan = datatype_vvvvwan;
-		var datatype_vvvvwan = [];
-		datatype_vvvvwan.push(temp_vvvvwan);
+		var temp_vvvvwan = datadefault_vvvvwan;
+		var datadefault_vvvvwan = [];
+		datadefault_vvvvwan.push(temp_vvvvwan);
 	}
-	else if (!isSet(datatype_vvvvwan))
+	else if (!isSet(datadefault_vvvvwan))
 	{
-		var datatype_vvvvwan = [];
+		var datadefault_vvvvwan = [];
 	}
-	var datatype = datatype_vvvvwan.some(datatype_vvvvwan_SomeFunc);
+	var datadefault = datadefault_vvvvwan.some(datadefault_vvvvwan_SomeFunc);


 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		if (jform_vvvvwanvzw_required)
 		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
+			updateFieldRequired('datadefault_other',0);
+			jQuery('#jform_datadefault_other').prop('required','required');
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').addClass('required');
 			jform_vvvvwanvzw_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		if (!jform_vvvvwanvzw_required)
 		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
+			updateFieldRequired('datadefault_other',1);
+			jQuery('#jform_datadefault_other').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwanvzw_required = true;
 		}
 	}
 }

 // the vvvvwan Some function
-function datatype_vvvvwan_SomeFunc(datatype_vvvvwan)
+function datadefault_vvvvwan_SomeFunc(datadefault_vvvvwan)
 {
 	// set the function logic
-	if (datatype_vvvvwan == 'CHAR' || datatype_vvvvwan == 'VARCHAR' || datatype_vvvvwan == 'DATETIME' || datatype_vvvvwan == 'DATE' || datatype_vvvvwan == 'TIME' || datatype_vvvvwan == 'INT' || datatype_vvvvwan == 'TINYINT' || datatype_vvvvwan == 'BIGINT' || datatype_vvvvwan == 'FLOAT' || datatype_vvvvwan == 'DECIMAL' || datatype_vvvvwan == 'DOUBLE')
+	if (datadefault_vvvvwan == 'Other')
 	{
 		return true;
 	}
@ -252,26 +193,30 @@ function vvvvwao(datatype_vvvvwao)
 	// set this function logic
 	if (datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
 		if (jform_vvvvwaovzx_required)
 		{
-			updateFieldRequired('store',0);
-			jQuery('#jform_store').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwaovzx_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
 		if (!jform_vvvvwaovzx_required)
 		{
-			updateFieldRequired('store',1);
-			jQuery('#jform_store').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
 			jform_vvvvwaovzx_required = true;
 		}
 	}
@ -281,7 +226,7 @@ function vvvvwao(datatype_vvvvwao)
 function datatype_vvvvwao_SomeFunc(datatype_vvvvwao)
 {
 	// set the function logic
-	if (datatype_vvvvwao == 'CHAR' || datatype_vvvvwao == 'VARCHAR' || datatype_vvvvwao == 'TEXT' || datatype_vvvvwao == 'MEDIUMTEXT' || datatype_vvvvwao == 'LONGTEXT')
+	if (datatype_vvvvwao == 'CHAR' || datatype_vvvvwao == 'VARCHAR' || datatype_vvvvwao == 'DATETIME' || datatype_vvvvwao == 'DATE' || datatype_vvvvwao == 'TIME' || datatype_vvvvwao == 'INT' || datatype_vvvvwao == 'TINYINT' || datatype_vvvvwao == 'BIGINT' || datatype_vvvvwao == 'FLOAT' || datatype_vvvvwao == 'DECIMAL' || datatype_vvvvwao == 'DOUBLE')
 	{
 		return true;
 	}
@ -289,20 +234,8 @@ function datatype_vvvvwao_SomeFunc(datatype_vvvvwao)
 }

 // the vvvvwap function
-function vvvvwap(store_vvvvwap,datatype_vvvvwap)
+function vvvvwap(datatype_vvvvwap)
 {
-	if (isSet(store_vvvvwap) && store_vvvvwap.constructor !== Array)
-	{
-		var temp_vvvvwap = store_vvvvwap;
-		var store_vvvvwap = [];
-		store_vvvvwap.push(temp_vvvvwap);
-	}
-	else if (!isSet(store_vvvvwap))
-	{
-		var store_vvvvwap = [];
-	}
-	var store = store_vvvvwap.some(store_vvvvwap_SomeFunc);
-
 	if (isSet(datatype_vvvvwap) && datatype_vvvvwap.constructor !== Array)
 	{
 		var temp_vvvvwap = datatype_vvvvwap;
@ -317,27 +250,33 @@ function vvvvwap(store_vvvvwap,datatype_vvvvwap)


 	// set this function logic
-	if (store && datatype)
+	if (datatype)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		if (jform_vvvvwapvzy_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwapvzy_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
+		if (!jform_vvvvwapvzy_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwapvzy_required = true;
+		}
 	}
 }

-// the vvvvwap Some function
-function store_vvvvwap_SomeFunc(store_vvvvwap)
-{
-	// set the function logic
-	if (store_vvvvwap == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwap Some function
 function datatype_vvvvwap_SomeFunc(datatype_vvvvwap)
 {
@ -349,126 +288,187 @@ function datatype_vvvvwap_SomeFunc(datatype_vvvvwap)
 	return false;
 }

-// the vvvvwar function
-function vvvvwar(add_css_view_vvvvwar)
+// the vvvvwaq function
+function vvvvwaq(store_vvvvwaq,datatype_vvvvwaq)
+{
+	if (isSet(store_vvvvwaq) && store_vvvvwaq.constructor !== Array)
+	{
+		var temp_vvvvwaq = store_vvvvwaq;
+		var store_vvvvwaq = [];
+		store_vvvvwaq.push(temp_vvvvwaq);
+	}
+	else if (!isSet(store_vvvvwaq))
+	{
+		var store_vvvvwaq = [];
+	}
+	var store = store_vvvvwaq.some(store_vvvvwaq_SomeFunc);
+
+	if (isSet(datatype_vvvvwaq) && datatype_vvvvwaq.constructor !== Array)
+	{
+		var temp_vvvvwaq = datatype_vvvvwaq;
+		var datatype_vvvvwaq = [];
+		datatype_vvvvwaq.push(temp_vvvvwaq);
+	}
+	else if (!isSet(datatype_vvvvwaq))
+	{
+		var datatype_vvvvwaq = [];
+	}
+	var datatype = datatype_vvvvwaq.some(datatype_vvvvwaq_SomeFunc);
+
+
+	// set this function logic
+	if (store && datatype)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwaq Some function
+function store_vvvvwaq_SomeFunc(store_vvvvwaq)
 {
 	// set the function logic
-	if (add_css_view_vvvvwar == 1)
+	if (store_vvvvwaq == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaq Some function
+function datatype_vvvvwaq_SomeFunc(datatype_vvvvwaq)
+{
+	// set the function logic
+	if (datatype_vvvvwaq == 'CHAR' || datatype_vvvvwaq == 'VARCHAR' || datatype_vvvvwaq == 'TEXT' || datatype_vvvvwaq == 'MEDIUMTEXT' || datatype_vvvvwaq == 'LONGTEXT')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwas function
+function vvvvwas(add_css_view_vvvvwas)
+{
+	// set the function logic
+	if (add_css_view_vvvvwas == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwarvzy_required)
+		if (jform_vvvvwasvzz_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwarvzy_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwarvzy_required)
-		{
-			updateFieldRequired('css_view',1);
-			jQuery('#jform_css_view').removeAttr('required');
-			jQuery('#jform_css_view').removeAttr('aria-required');
-			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwarvzy_required = true;
-		}
-	}
-}
-
-// the vvvvwas function
-function vvvvwas(add_css_views_vvvvwas)
-{
-	// set the function logic
-	if (add_css_views_vvvvwas == 1)
-	{
-		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwasvzz_required)
-		{
-			updateFieldRequired('css_views',0);
-			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwasvzz_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css_views').closest('.control-group').hide();
+		jQuery('#jform_css_view').closest('.control-group').hide();
 		if (!jform_vvvvwasvzz_required)
 		{
-			updateFieldRequired('css_views',1);
-			jQuery('#jform_css_views').removeAttr('required');
-			jQuery('#jform_css_views').removeAttr('aria-required');
-			jQuery('#jform_css_views').removeClass('required');
+			updateFieldRequired('css_view',1);
+			jQuery('#jform_css_view').removeAttr('required');
+			jQuery('#jform_css_view').removeAttr('aria-required');
+			jQuery('#jform_css_view').removeClass('required');
 			jform_vvvvwasvzz_required = true;
 		}
 	}
 }

 // the vvvvwat function
-function vvvvwat(add_javascript_view_footer_vvvvwat)
+function vvvvwat(add_css_views_vvvvwat)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwat == 1)
+	if (add_css_views_vvvvwat == 1)
 	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
+		jQuery('#jform_css_views').closest('.control-group').show();
 		if (jform_vvvvwatwaa_required)
 		{
-			updateFieldRequired('javascript_view_footer',0);
-			jQuery('#jform_javascript_view_footer').prop('required','required');
-			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_view_footer').addClass('required');
+			updateFieldRequired('css_views',0);
+			jQuery('#jform_css_views').prop('required','required');
+			jQuery('#jform_css_views').attr('aria-required',true);
+			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwatwaa_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+		jQuery('#jform_css_views').closest('.control-group').hide();
 		if (!jform_vvvvwatwaa_required)
 		{
-			updateFieldRequired('javascript_view_footer',1);
-			jQuery('#jform_javascript_view_footer').removeAttr('required');
-			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
-			jQuery('#jform_javascript_view_footer').removeClass('required');
+			updateFieldRequired('css_views',1);
+			jQuery('#jform_css_views').removeAttr('required');
+			jQuery('#jform_css_views').removeAttr('aria-required');
+			jQuery('#jform_css_views').removeClass('required');
 			jform_vvvvwatwaa_required = true;
 		}
 	}
 }

 // the vvvvwau function
-function vvvvwau(add_javascript_views_footer_vvvvwau)
+function vvvvwau(add_javascript_view_footer_vvvvwau)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwau == 1)
+	if (add_javascript_view_footer_vvvvwau == 1)
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
 		if (jform_vvvvwauwab_required)
 		{
-			updateFieldRequired('javascript_views_footer',0);
-			jQuery('#jform_javascript_views_footer').prop('required','required');
-			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_views_footer').addClass('required');
+			updateFieldRequired('javascript_view_footer',0);
+			jQuery('#jform_javascript_view_footer').prop('required','required');
+			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_view_footer').addClass('required');
 			jform_vvvvwauwab_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
 		if (!jform_vvvvwauwab_required)
+		{
+			updateFieldRequired('javascript_view_footer',1);
+			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jform_vvvvwauwab_required = true;
+		}
+	}
+}
+
+// the vvvvwav function
+function vvvvwav(add_javascript_views_footer_vvvvwav)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwav == 1)
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		if (jform_vvvvwavwac_required)
+		{
+			updateFieldRequired('javascript_views_footer',0);
+			jQuery('#jform_javascript_views_footer').prop('required','required');
+			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_views_footer').addClass('required');
+			jform_vvvvwavwac_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		if (!jform_vvvvwavwac_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwauwab_required = true;
+			jform_vvvvwavwac_required = true;
 		}
 	}
 }
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@ -23,24 +23,21 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvwbfwan_required = false;
 jform_vvvvwbgwao_required = false;
 jform_vvvvwbhwap_required = false;
 jform_vvvvwbiwaq_required = false;
 jform_vvvvwbjwar_required = false;
 jform_vvvvwbkwas_required = false;
+jform_vvvvwblwat_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwbf = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbf(location_vvvvwbf);
-
 	var location_vvvvwbg = jQuery("#jform_location input[type='radio']:checked").val();
 	vvvvwbg(location_vvvvwbg);

-	var type_vvvvwbh = jQuery("#jform_type").val();
-	vvvvwbh(type_vvvvwbh);
+	var location_vvvvwbh = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbh(location_vvvvwbh);

 	var type_vvvvwbi = jQuery("#jform_type").val();
 	vvvvwbi(type_vvvvwbi);
@ -48,127 +45,75 @@ jQuery(document).ready(function()
 	var type_vvvvwbj = jQuery("#jform_type").val();
 	vvvvwbj(type_vvvvwbj);

-	var target_vvvvwbk = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbk(target_vvvvwbk);
+	var type_vvvvwbk = jQuery("#jform_type").val();
+	vvvvwbk(type_vvvvwbk);
+
+	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbl(target_vvvvwbl);
 });

-// the vvvvwbf function
-function vvvvwbf(location_vvvvwbf)
-{
-	// set the function logic
-	if (location_vvvvwbf == 1)
-	{
-		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwbfwan_required)
-		{
-			updateFieldRequired('admin_view',0);
-			jQuery('#jform_admin_view').prop('required','required');
-			jQuery('#jform_admin_view').attr('aria-required',true);
-			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwbfwan_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwbfwan_required)
-		{
-			updateFieldRequired('admin_view',1);
-			jQuery('#jform_admin_view').removeAttr('required');
-			jQuery('#jform_admin_view').removeAttr('aria-required');
-			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwbfwan_required = true;
-		}
-	}
-}
-
 // the vvvvwbg function
 function vvvvwbg(location_vvvvwbg)
 {
 	// set the function logic
-	if (location_vvvvwbg == 2)
+	if (location_vvvvwbg == 1)
 	{
-		jQuery('#jform_site_view').closest('.control-group').show();
+		jQuery('#jform_admin_view').closest('.control-group').show();
 		if (jform_vvvvwbgwao_required)
 		{
-			updateFieldRequired('site_view',0);
-			jQuery('#jform_site_view').prop('required','required');
-			jQuery('#jform_site_view').attr('aria-required',true);
-			jQuery('#jform_site_view').addClass('required');
+			updateFieldRequired('admin_view',0);
+			jQuery('#jform_admin_view').prop('required','required');
+			jQuery('#jform_admin_view').attr('aria-required',true);
+			jQuery('#jform_admin_view').addClass('required');
 			jform_vvvvwbgwao_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
+		jQuery('#jform_admin_view').closest('.control-group').hide();
 		if (!jform_vvvvwbgwao_required)
 		{
-			updateFieldRequired('site_view',1);
-			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_site_view').removeClass('required');
+			updateFieldRequired('admin_view',1);
+			jQuery('#jform_admin_view').removeAttr('required');
+			jQuery('#jform_admin_view').removeAttr('aria-required');
+			jQuery('#jform_admin_view').removeClass('required');
 			jform_vvvvwbgwao_required = true;
 		}
 	}
 }

 // the vvvvwbh function
-function vvvvwbh(type_vvvvwbh)
+function vvvvwbh(location_vvvvwbh)
 {
-	if (isSet(type_vvvvwbh) && type_vvvvwbh.constructor !== Array)
+	// set the function logic
+	if (location_vvvvwbh == 2)
 	{
-		var temp_vvvvwbh = type_vvvvwbh;
-		var type_vvvvwbh = [];
-		type_vvvvwbh.push(temp_vvvvwbh);
-	}
-	else if (!isSet(type_vvvvwbh))
-	{
-		var type_vvvvwbh = [];
-	}
-	var type = type_vvvvwbh.some(type_vvvvwbh_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
+		jQuery('#jform_site_view').closest('.control-group').show();
 		if (jform_vvvvwbhwap_required)
 		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
+			updateFieldRequired('site_view',0);
+			jQuery('#jform_site_view').prop('required','required');
+			jQuery('#jform_site_view').attr('aria-required',true);
+			jQuery('#jform_site_view').addClass('required');
 			jform_vvvvwbhwap_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_url').closest('.control-group').hide();
+		jQuery('#jform_site_view').closest('.control-group').hide();
 		if (!jform_vvvvwbhwap_required)
 		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
+			updateFieldRequired('site_view',1);
+			jQuery('#jform_site_view').removeAttr('required');
+			jQuery('#jform_site_view').removeAttr('aria-required');
+			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwbhwap_required = true;
 		}
 	}
 }

-// the vvvvwbh Some function
-function type_vvvvwbh_SomeFunc(type_vvvvwbh)
-{
-	// set the function logic
-	if (type_vvvvwbh == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbi function
 function vvvvwbi(type_vvvvwbi)
 {
@ -188,26 +133,26 @@ function vvvvwbi(type_vvvvwbi)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_article').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
 		if (jform_vvvvwbiwaq_required)
 		{
-			updateFieldRequired('article',0);
-			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
+			updateFieldRequired('url',0);
+			jQuery('#jform_url').prop('required','required');
+			jQuery('#jform_url').attr('aria-required',true);
+			jQuery('#jform_url').addClass('required');
 			jform_vvvvwbiwaq_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
 		if (!jform_vvvvwbiwaq_required)
 		{
-			updateFieldRequired('article',1);
-			jQuery('#jform_article').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
+			updateFieldRequired('url',1);
+			jQuery('#jform_url').removeAttr('required');
+			jQuery('#jform_url').removeAttr('aria-required');
+			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwbiwaq_required = true;
 		}
 	}
@ -217,7 +162,7 @@ function vvvvwbi(type_vvvvwbi)
 function type_vvvvwbi_SomeFunc(type_vvvvwbi)
 {
 	// set the function logic
-	if (type_vvvvwbi == 1)
+	if (type_vvvvwbi == 3)
 	{
 		return true;
 	}
@ -243,26 +188,26 @@ function vvvvwbj(type_vvvvwbj)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_article').closest('.control-group').show();
 		if (jform_vvvvwbjwar_required)
 		{
-			updateFieldRequired('content',0);
-			jQuery('#jform_content').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			updateFieldRequired('article',0);
+			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_article').addClass('required');
 			jform_vvvvwbjwar_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_article').closest('.control-group').hide();
 		if (!jform_vvvvwbjwar_required)
 		{
-			updateFieldRequired('content',1);
-			jQuery('#jform_content').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
 			jform_vvvvwbjwar_required = true;
 		}
 	}
@ -272,7 +217,7 @@ function vvvvwbj(type_vvvvwbj)
 function type_vvvvwbj_SomeFunc(type_vvvvwbj)
 {
 	// set the function logic
-	if (type_vvvvwbj == 2)
+	if (type_vvvvwbj == 1)
 	{
 		return true;
 	}
@ -280,32 +225,87 @@ function type_vvvvwbj_SomeFunc(type_vvvvwbj)
 }

 // the vvvvwbk function
-function vvvvwbk(target_vvvvwbk)
+function vvvvwbk(type_vvvvwbk)
 {
-	// set the function logic
-	if (target_vvvvwbk == 1)
+	if (isSet(type_vvvvwbk) && type_vvvvwbk.constructor !== Array)
 	{
-		jQuery('#jform_groups').closest('.control-group').show();
+		var temp_vvvvwbk = type_vvvvwbk;
+		var type_vvvvwbk = [];
+		type_vvvvwbk.push(temp_vvvvwbk);
+	}
+	else if (!isSet(type_vvvvwbk))
+	{
+		var type_vvvvwbk = [];
+	}
+	var type = type_vvvvwbk.some(type_vvvvwbk_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
 		if (jform_vvvvwbkwas_required)
 		{
-			updateFieldRequired('groups',0);
-			jQuery('#jform_groups').prop('required','required');
-			jQuery('#jform_groups').attr('aria-required',true);
-			jQuery('#jform_groups').addClass('required');
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
 			jform_vvvvwbkwas_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_groups').closest('.control-group').hide();
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwbkwas_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwbkwas_required = true;
+		}
+	}
+}
+
+// the vvvvwbk Some function
+function type_vvvvwbk_SomeFunc(type_vvvvwbk)
+{
+	// set the function logic
+	if (type_vvvvwbk == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbl function
+function vvvvwbl(target_vvvvwbl)
+{
+	// set the function logic
+	if (target_vvvvwbl == 1)
+	{
+		jQuery('#jform_groups').closest('.control-group').show();
+		if (jform_vvvvwblwat_required)
+		{
+			updateFieldRequired('groups',0);
+			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_groups').addClass('required');
+			jform_vvvvwblwat_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_groups').closest('.control-group').hide();
+		if (!jform_vvvvwblwat_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwbkwas_required = true;
+			jform_vvvvwblwat_required = true;
 		}
 	}
 }
--- a/admin/models/forms/joomla_component.js
+++ b/admin/models/forms/joomla_component.js
@ -30,17 +30,18 @@ jform_vvvvvvyvvy_required = false;
 jform_vvvvvvzvvz_required = false;
 jform_vvvvvwavwa_required = false;
 jform_vvvvvwbvwb_required = false;
-jform_vvvvvwdvwc_required = false;
+jform_vvvvvwcvwc_required = false;
 jform_vvvvvwevwd_required = false;
 jform_vvvvvwfvwe_required = false;
 jform_vvvvvwgvwf_required = false;
-jform_vvvvvwkvwg_required = false;
+jform_vvvvvwhvwg_required = false;
 jform_vvvvvwlvwh_required = false;
 jform_vvvvvwmvwi_required = false;
 jform_vvvvvwnvwj_required = false;
 jform_vvvvvwovwk_required = false;
-jform_vvvvvwvvwl_required = false;
+jform_vvvvvwpvwl_required = false;
 jform_vvvvvwwvwm_required = false;
+jform_vvvvvwxvwn_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -66,72 +67,75 @@ jQuery(document).ready(function()
 	var add_sql_vvvvvwb = jQuery("#jform_add_sql input[type='radio']:checked").val();
 	vvvvvwb(add_sql_vvvvvwb);

-	var emptycontributors_vvvvvwc = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
-	vvvvvwc(emptycontributors_vvvvvwc);
+	var add_sql_uninstall_vvvvvwc = jQuery("#jform_add_sql_uninstall input[type='radio']:checked").val();
+	vvvvvwc(add_sql_uninstall_vvvvvwc);

-	var add_license_vvvvvwd = jQuery("#jform_add_license input[type='radio']:checked").val();
-	vvvvvwd(add_license_vvvvvwd);
+	var emptycontributors_vvvvvwd = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
+	vvvvvwd(emptycontributors_vvvvvwd);

-	var add_admin_event_vvvvvwe = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
-	vvvvvwe(add_admin_event_vvvvvwe);
+	var add_license_vvvvvwe = jQuery("#jform_add_license input[type='radio']:checked").val();
+	vvvvvwe(add_license_vvvvvwe);

-	var add_site_event_vvvvvwf = jQuery("#jform_add_site_event input[type='radio']:checked").val();
-	vvvvvwf(add_site_event_vvvvvwf);
+	var add_admin_event_vvvvvwf = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
+	vvvvvwf(add_admin_event_vvvvvwf);

-	var addreadme_vvvvvwg = jQuery("#jform_addreadme input[type='radio']:checked").val();
-	vvvvvwg(addreadme_vvvvvwg);
+	var add_site_event_vvvvvwg = jQuery("#jform_add_site_event input[type='radio']:checked").val();
+	vvvvvwg(add_site_event_vvvvvwg);

-	var add_update_server_vvvvvwh = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwh(add_update_server_vvvvvwh);
+	var addreadme_vvvvvwh = jQuery("#jform_addreadme input[type='radio']:checked").val();
+	vvvvvwh(addreadme_vvvvvwh);

-	var add_sales_server_vvvvvwi = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
-	vvvvvwi(add_sales_server_vvvvvwi);
+	var add_update_server_vvvvvwi = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwi(add_update_server_vvvvvwi);

-	var add_license_vvvvvwj = jQuery("#jform_add_license input[type='radio']:checked").val();
-	vvvvvwj(add_license_vvvvvwj);
+	var add_sales_server_vvvvvwj = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
+	vvvvvwj(add_sales_server_vvvvvwj);

-	var add_php_postflight_install_vvvvvwk = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
-	vvvvvwk(add_php_postflight_install_vvvvvwk);
+	var add_license_vvvvvwk = jQuery("#jform_add_license input[type='radio']:checked").val();
+	vvvvvwk(add_license_vvvvvwk);

-	var add_php_postflight_update_vvvvvwl = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
-	vvvvvwl(add_php_postflight_update_vvvvvwl);
+	var add_php_postflight_install_vvvvvwl = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
+	vvvvvwl(add_php_postflight_install_vvvvvwl);

-	var add_php_method_uninstall_vvvvvwm = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
-	vvvvvwm(add_php_method_uninstall_vvvvvwm);
+	var add_php_postflight_update_vvvvvwm = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
+	vvvvvwm(add_php_postflight_update_vvvvvwm);

-	var add_php_preflight_install_vvvvvwn = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
-	vvvvvwn(add_php_preflight_install_vvvvvwn);
+	var add_php_method_uninstall_vvvvvwn = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
+	vvvvvwn(add_php_method_uninstall_vvvvvwn);

-	var add_php_preflight_update_vvvvvwo = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
-	vvvvvwo(add_php_preflight_update_vvvvvwo);
+	var add_php_preflight_install_vvvvvwo = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
+	vvvvvwo(add_php_preflight_install_vvvvvwo);

-	var update_server_target_vvvvvwp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp);
+	var add_php_preflight_update_vvvvvwp = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
+	vvvvvwp(add_php_preflight_update_vvvvvwp);

-	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
 	var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq);
+	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq);

-	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
 	var add_update_server_vvvvvwr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr);
+	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	vvvvvwr(add_update_server_vvvvvwr,update_server_target_vvvvvwr);

-	var update_server_target_vvvvvwt = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt);
+	var update_server_target_vvvvvws = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvws = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws);

-	var add_update_server_vvvvvwv = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwv(add_update_server_vvvvvwv);
+	var update_server_target_vvvvvwu = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvwu = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwu(update_server_target_vvvvvwu,add_update_server_vvvvvwu);

-	var buildcomp_vvvvvww = jQuery("#jform_buildcomp input[type='radio']:checked").val();
-	vvvvvww(buildcomp_vvvvvww);
+	var add_update_server_vvvvvww = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvww(add_update_server_vvvvvww);

-	var dashboard_type_vvvvvwx = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
-	vvvvvwx(dashboard_type_vvvvvwx);
+	var buildcomp_vvvvvwx = jQuery("#jform_buildcomp input[type='radio']:checked").val();
+	vvvvvwx(buildcomp_vvvvvwx);

 	var dashboard_type_vvvvvwy = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
 	vvvvvwy(dashboard_type_vvvvvwy);
+
+	var dashboard_type_vvvvvwz = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwz(dashboard_type_vvvvvwz);
 });

 // the vvvvvvv function
@ -352,10 +356,41 @@ function vvvvvwb(add_sql_vvvvvwb)
 }

 // the vvvvvwc function
-function vvvvvwc(emptycontributors_vvvvvwc)
+function vvvvvwc(add_sql_uninstall_vvvvvwc)
 {
 	// set the function logic
-	if (emptycontributors_vvvvvwc == 1)
+	if (add_sql_uninstall_vvvvvwc == 1)
+	{
+		jQuery('#jform_sql_uninstall').closest('.control-group').show();
+		if (jform_vvvvvwcvwc_required)
+		{
+			updateFieldRequired('sql_uninstall',0);
+			jQuery('#jform_sql_uninstall').prop('required','required');
+			jQuery('#jform_sql_uninstall').attr('aria-required',true);
+			jQuery('#jform_sql_uninstall').addClass('required');
+			jform_vvvvvwcvwc_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_sql_uninstall').closest('.control-group').hide();
+		if (!jform_vvvvvwcvwc_required)
+		{
+			updateFieldRequired('sql_uninstall',1);
+			jQuery('#jform_sql_uninstall').removeAttr('required');
+			jQuery('#jform_sql_uninstall').removeAttr('aria-required');
+			jQuery('#jform_sql_uninstall').removeClass('required');
+			jform_vvvvvwcvwc_required = true;
+		}
+	}
+}
+
+// the vvvvvwd function
+function vvvvvwd(emptycontributors_vvvvvwd)
+{
+	// set the function logic
+	if (emptycontributors_vvvvvwd == 1)
 	{
 		jQuery('#jform_number').closest('.control-group').show();
 	}
@ -365,114 +400,114 @@ function vvvvvwc(emptycontributors_vvvvvwc)
 	}
 }

-// the vvvvvwd function
-function vvvvvwd(add_license_vvvvvwd)
+// the vvvvvwe function
+function vvvvvwe(add_license_vvvvvwe)
 {
 	// set the function logic
-	if (add_license_vvvvvwd == 1)
+	if (add_license_vvvvvwe == 1)
 	{
 		jQuery('#jform_license_type').closest('.control-group').show();
-		if (jform_vvvvvwdvwc_required)
+		if (jform_vvvvvwevwd_required)
 		{
 			updateFieldRequired('license_type',0);
 			jQuery('#jform_license_type').prop('required','required');
 			jQuery('#jform_license_type').attr('aria-required',true);
 			jQuery('#jform_license_type').addClass('required');
-			jform_vvvvvwdvwc_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_license_type').closest('.control-group').hide();
-		if (!jform_vvvvvwdvwc_required)
-		{
-			updateFieldRequired('license_type',1);
-			jQuery('#jform_license_type').removeAttr('required');
-			jQuery('#jform_license_type').removeAttr('aria-required');
-			jQuery('#jform_license_type').removeClass('required');
-			jform_vvvvvwdvwc_required = true;
-		}
-	}
-}
-
-// the vvvvvwe function
-function vvvvvwe(add_admin_event_vvvvvwe)
-{
-	// set the function logic
-	if (add_admin_event_vvvvvwe == 1)
-	{
-		jQuery('#jform_php_admin_event').closest('.control-group').show();
-		if (jform_vvvvvwevwd_required)
-		{
-			updateFieldRequired('php_admin_event',0);
-			jQuery('#jform_php_admin_event').prop('required','required');
-			jQuery('#jform_php_admin_event').attr('aria-required',true);
-			jQuery('#jform_php_admin_event').addClass('required');
 			jform_vvvvvwevwd_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_admin_event').closest('.control-group').hide();
+		jQuery('#jform_license_type').closest('.control-group').hide();
 		if (!jform_vvvvvwevwd_required)
 		{
-			updateFieldRequired('php_admin_event',1);
-			jQuery('#jform_php_admin_event').removeAttr('required');
-			jQuery('#jform_php_admin_event').removeAttr('aria-required');
-			jQuery('#jform_php_admin_event').removeClass('required');
+			updateFieldRequired('license_type',1);
+			jQuery('#jform_license_type').removeAttr('required');
+			jQuery('#jform_license_type').removeAttr('aria-required');
+			jQuery('#jform_license_type').removeClass('required');
 			jform_vvvvvwevwd_required = true;
 		}
 	}
 }

 // the vvvvvwf function
-function vvvvvwf(add_site_event_vvvvvwf)
+function vvvvvwf(add_admin_event_vvvvvwf)
 {
 	// set the function logic
-	if (add_site_event_vvvvvwf == 1)
+	if (add_admin_event_vvvvvwf == 1)
 	{
-		jQuery('#jform_php_site_event').closest('.control-group').show();
+		jQuery('#jform_php_admin_event').closest('.control-group').show();
 		if (jform_vvvvvwfvwe_required)
 		{
-			updateFieldRequired('php_site_event',0);
-			jQuery('#jform_php_site_event').prop('required','required');
-			jQuery('#jform_php_site_event').attr('aria-required',true);
-			jQuery('#jform_php_site_event').addClass('required');
+			updateFieldRequired('php_admin_event',0);
+			jQuery('#jform_php_admin_event').prop('required','required');
+			jQuery('#jform_php_admin_event').attr('aria-required',true);
+			jQuery('#jform_php_admin_event').addClass('required');
 			jform_vvvvvwfvwe_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_site_event').closest('.control-group').hide();
+		jQuery('#jform_php_admin_event').closest('.control-group').hide();
 		if (!jform_vvvvvwfvwe_required)
 		{
-			updateFieldRequired('php_site_event',1);
-			jQuery('#jform_php_site_event').removeAttr('required');
-			jQuery('#jform_php_site_event').removeAttr('aria-required');
-			jQuery('#jform_php_site_event').removeClass('required');
+			updateFieldRequired('php_admin_event',1);
+			jQuery('#jform_php_admin_event').removeAttr('required');
+			jQuery('#jform_php_admin_event').removeAttr('aria-required');
+			jQuery('#jform_php_admin_event').removeClass('required');
 			jform_vvvvvwfvwe_required = true;
 		}
 	}
 }

 // the vvvvvwg function
-function vvvvvwg(addreadme_vvvvvwg)
+function vvvvvwg(add_site_event_vvvvvwg)
 {
 	// set the function logic
-	if (addreadme_vvvvvwg == 1)
+	if (add_site_event_vvvvvwg == 1)
+	{
+		jQuery('#jform_php_site_event').closest('.control-group').show();
+		if (jform_vvvvvwgvwf_required)
+		{
+			updateFieldRequired('php_site_event',0);
+			jQuery('#jform_php_site_event').prop('required','required');
+			jQuery('#jform_php_site_event').attr('aria-required',true);
+			jQuery('#jform_php_site_event').addClass('required');
+			jform_vvvvvwgvwf_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_php_site_event').closest('.control-group').hide();
+		if (!jform_vvvvvwgvwf_required)
+		{
+			updateFieldRequired('php_site_event',1);
+			jQuery('#jform_php_site_event').removeAttr('required');
+			jQuery('#jform_php_site_event').removeAttr('aria-required');
+			jQuery('#jform_php_site_event').removeClass('required');
+			jform_vvvvvwgvwf_required = true;
+		}
+	}
+}
+
+// the vvvvvwh function
+function vvvvvwh(addreadme_vvvvvwh)
+{
+	// set the function logic
+	if (addreadme_vvvvvwh == 1)
 	{
 		jQuery('.note_readme').closest('.control-group').show();
 		jQuery('#jform_readme-lbl').closest('.control-group').show();
-		if (jform_vvvvvwgvwf_required)
+		if (jform_vvvvvwhvwg_required)
 		{
 			updateFieldRequired('readme',0);
 			jQuery('#jform_readme').prop('required','required');
 			jQuery('#jform_readme').attr('aria-required',true);
 			jQuery('#jform_readme').addClass('required');
-			jform_vvvvvwgvwf_required = false;
+			jform_vvvvvwhvwg_required = false;
 		}

 	}
@ -480,22 +515,22 @@ function vvvvvwg(addreadme_vvvvvwg)
 	{
 		jQuery('.note_readme').closest('.control-group').hide();
 		jQuery('#jform_readme-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvwgvwf_required)
+		if (!jform_vvvvvwhvwg_required)
 		{
 			updateFieldRequired('readme',1);
 			jQuery('#jform_readme').removeAttr('required');
 			jQuery('#jform_readme').removeAttr('aria-required');
 			jQuery('#jform_readme').removeClass('required');
-			jform_vvvvvwgvwf_required = true;
+			jform_vvvvvwhvwg_required = true;
 		}
 	}
 }

-// the vvvvvwh function
-function vvvvvwh(add_update_server_vvvvvwh)
+// the vvvvvwi function
+function vvvvvwi(add_update_server_vvvvvwi)
 {
 	// set the function logic
-	if (add_update_server_vvvvvwh == 1)
+	if (add_update_server_vvvvvwi == 1)
 	{
 		jQuery('#jform_update_server_url').closest('.control-group').show();
 	}
@ -505,11 +540,11 @@ function vvvvvwh(add_update_server_vvvvvwh)
 	}
 }

-// the vvvvvwi function
-function vvvvvwi(add_sales_server_vvvvvwi)
+// the vvvvvwj function
+function vvvvvwj(add_sales_server_vvvvvwj)
 {
 	// set the function logic
-	if (add_sales_server_vvvvvwi == 1)
+	if (add_sales_server_vvvvvwj == 1)
 	{
 		jQuery('#jform_sales_server').closest('.control-group').show();
 	}
@ -519,11 +554,11 @@ function vvvvvwi(add_sales_server_vvvvvwi)
 	}
 }

-// the vvvvvwj function
-function vvvvvwj(add_license_vvvvvwj)
+// the vvvvvwk function
+function vvvvvwk(add_license_vvvvvwk)
 {
 	// set the function logic
-	if (add_license_vvvvvwj == 1)
+	if (add_license_vvvvvwk == 1)
 	{
 		jQuery('.note_whmcs_lisencing_note').closest('.control-group').show();
 		jQuery('#jform_whmcs_key').closest('.control-group').show();
@ -537,182 +572,166 @@ function vvvvvwj(add_license_vvvvvwj)
 	}
 }

-// the vvvvvwk function
-function vvvvvwk(add_php_postflight_install_vvvvvwk)
+// the vvvvvwl function
+function vvvvvwl(add_php_postflight_install_vvvvvwl)
 {
 	// set the function logic
-	if (add_php_postflight_install_vvvvvwk == 1)
+	if (add_php_postflight_install_vvvvvwl == 1)
 	{
 		jQuery('#jform_php_postflight_install').closest('.control-group').show();
-		if (jform_vvvvvwkvwg_required)
+		if (jform_vvvvvwlvwh_required)
 		{
 			updateFieldRequired('php_postflight_install',0);
 			jQuery('#jform_php_postflight_install').prop('required','required');
 			jQuery('#jform_php_postflight_install').attr('aria-required',true);
 			jQuery('#jform_php_postflight_install').addClass('required');
-			jform_vvvvvwkvwg_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_postflight_install').closest('.control-group').hide();
-		if (!jform_vvvvvwkvwg_required)
-		{
-			updateFieldRequired('php_postflight_install',1);
-			jQuery('#jform_php_postflight_install').removeAttr('required');
-			jQuery('#jform_php_postflight_install').removeAttr('aria-required');
-			jQuery('#jform_php_postflight_install').removeClass('required');
-			jform_vvvvvwkvwg_required = true;
-		}
-	}
-}
-
-// the vvvvvwl function
-function vvvvvwl(add_php_postflight_update_vvvvvwl)
-{
-	// set the function logic
-	if (add_php_postflight_update_vvvvvwl == 1)
-	{
-		jQuery('#jform_php_postflight_update').closest('.control-group').show();
-		if (jform_vvvvvwlvwh_required)
-		{
-			updateFieldRequired('php_postflight_update',0);
-			jQuery('#jform_php_postflight_update').prop('required','required');
-			jQuery('#jform_php_postflight_update').attr('aria-required',true);
-			jQuery('#jform_php_postflight_update').addClass('required');
 			jform_vvvvvwlvwh_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_postflight_update').closest('.control-group').hide();
+		jQuery('#jform_php_postflight_install').closest('.control-group').hide();
 		if (!jform_vvvvvwlvwh_required)
 		{
-			updateFieldRequired('php_postflight_update',1);
-			jQuery('#jform_php_postflight_update').removeAttr('required');
-			jQuery('#jform_php_postflight_update').removeAttr('aria-required');
-			jQuery('#jform_php_postflight_update').removeClass('required');
+			updateFieldRequired('php_postflight_install',1);
+			jQuery('#jform_php_postflight_install').removeAttr('required');
+			jQuery('#jform_php_postflight_install').removeAttr('aria-required');
+			jQuery('#jform_php_postflight_install').removeClass('required');
 			jform_vvvvvwlvwh_required = true;
 		}
 	}
 }

 // the vvvvvwm function
-function vvvvvwm(add_php_method_uninstall_vvvvvwm)
+function vvvvvwm(add_php_postflight_update_vvvvvwm)
 {
 	// set the function logic
-	if (add_php_method_uninstall_vvvvvwm == 1)
+	if (add_php_postflight_update_vvvvvwm == 1)
 	{
-		jQuery('#jform_php_method_uninstall').closest('.control-group').show();
+		jQuery('#jform_php_postflight_update').closest('.control-group').show();
 		if (jform_vvvvvwmvwi_required)
 		{
-			updateFieldRequired('php_method_uninstall',0);
-			jQuery('#jform_php_method_uninstall').prop('required','required');
-			jQuery('#jform_php_method_uninstall').attr('aria-required',true);
-			jQuery('#jform_php_method_uninstall').addClass('required');
+			updateFieldRequired('php_postflight_update',0);
+			jQuery('#jform_php_postflight_update').prop('required','required');
+			jQuery('#jform_php_postflight_update').attr('aria-required',true);
+			jQuery('#jform_php_postflight_update').addClass('required');
 			jform_vvvvvwmvwi_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_method_uninstall').closest('.control-group').hide();
+		jQuery('#jform_php_postflight_update').closest('.control-group').hide();
 		if (!jform_vvvvvwmvwi_required)
 		{
-			updateFieldRequired('php_method_uninstall',1);
-			jQuery('#jform_php_method_uninstall').removeAttr('required');
-			jQuery('#jform_php_method_uninstall').removeAttr('aria-required');
-			jQuery('#jform_php_method_uninstall').removeClass('required');
+			updateFieldRequired('php_postflight_update',1);
+			jQuery('#jform_php_postflight_update').removeAttr('required');
+			jQuery('#jform_php_postflight_update').removeAttr('aria-required');
+			jQuery('#jform_php_postflight_update').removeClass('required');
 			jform_vvvvvwmvwi_required = true;
 		}
 	}
 }

 // the vvvvvwn function
-function vvvvvwn(add_php_preflight_install_vvvvvwn)
+function vvvvvwn(add_php_method_uninstall_vvvvvwn)
 {
 	// set the function logic
-	if (add_php_preflight_install_vvvvvwn == 1)
+	if (add_php_method_uninstall_vvvvvwn == 1)
 	{
-		jQuery('#jform_php_preflight_install').closest('.control-group').show();
+		jQuery('#jform_php_method_uninstall').closest('.control-group').show();
 		if (jform_vvvvvwnvwj_required)
 		{
-			updateFieldRequired('php_preflight_install',0);
-			jQuery('#jform_php_preflight_install').prop('required','required');
-			jQuery('#jform_php_preflight_install').attr('aria-required',true);
-			jQuery('#jform_php_preflight_install').addClass('required');
+			updateFieldRequired('php_method_uninstall',0);
+			jQuery('#jform_php_method_uninstall').prop('required','required');
+			jQuery('#jform_php_method_uninstall').attr('aria-required',true);
+			jQuery('#jform_php_method_uninstall').addClass('required');
 			jform_vvvvvwnvwj_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_preflight_install').closest('.control-group').hide();
+		jQuery('#jform_php_method_uninstall').closest('.control-group').hide();
 		if (!jform_vvvvvwnvwj_required)
 		{
-			updateFieldRequired('php_preflight_install',1);
-			jQuery('#jform_php_preflight_install').removeAttr('required');
-			jQuery('#jform_php_preflight_install').removeAttr('aria-required');
-			jQuery('#jform_php_preflight_install').removeClass('required');
+			updateFieldRequired('php_method_uninstall',1);
+			jQuery('#jform_php_method_uninstall').removeAttr('required');
+			jQuery('#jform_php_method_uninstall').removeAttr('aria-required');
+			jQuery('#jform_php_method_uninstall').removeClass('required');
 			jform_vvvvvwnvwj_required = true;
 		}
 	}
 }

 // the vvvvvwo function
-function vvvvvwo(add_php_preflight_update_vvvvvwo)
+function vvvvvwo(add_php_preflight_install_vvvvvwo)
 {
 	// set the function logic
-	if (add_php_preflight_update_vvvvvwo == 1)
+	if (add_php_preflight_install_vvvvvwo == 1)
 	{
-		jQuery('#jform_php_preflight_update').closest('.control-group').show();
+		jQuery('#jform_php_preflight_install').closest('.control-group').show();
 		if (jform_vvvvvwovwk_required)
 		{
-			updateFieldRequired('php_preflight_update',0);
-			jQuery('#jform_php_preflight_update').prop('required','required');
-			jQuery('#jform_php_preflight_update').attr('aria-required',true);
-			jQuery('#jform_php_preflight_update').addClass('required');
+			updateFieldRequired('php_preflight_install',0);
+			jQuery('#jform_php_preflight_install').prop('required','required');
+			jQuery('#jform_php_preflight_install').attr('aria-required',true);
+			jQuery('#jform_php_preflight_install').addClass('required');
 			jform_vvvvvwovwk_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_preflight_update').closest('.control-group').hide();
+		jQuery('#jform_php_preflight_install').closest('.control-group').hide();
 		if (!jform_vvvvvwovwk_required)
 		{
-			updateFieldRequired('php_preflight_update',1);
-			jQuery('#jform_php_preflight_update').removeAttr('required');
-			jQuery('#jform_php_preflight_update').removeAttr('aria-required');
-			jQuery('#jform_php_preflight_update').removeClass('required');
+			updateFieldRequired('php_preflight_install',1);
+			jQuery('#jform_php_preflight_install').removeAttr('required');
+			jQuery('#jform_php_preflight_install').removeAttr('aria-required');
+			jQuery('#jform_php_preflight_install').removeClass('required');
 			jform_vvvvvwovwk_required = true;
 		}
 	}
 }

 // the vvvvvwp function
-function vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp)
+function vvvvvwp(add_php_preflight_update_vvvvvwp)
 {
 	// set the function logic
-	if (update_server_target_vvvvvwp == 1 && add_update_server_vvvvvwp == 1)
+	if (add_php_preflight_update_vvvvvwp == 1)
 	{
-		jQuery('#jform_update_server').closest('.control-group').show();
-		jQuery('.note_update_server_note_ftp').closest('.control-group').show();
+		jQuery('#jform_php_preflight_update').closest('.control-group').show();
+		if (jform_vvvvvwpvwl_required)
+		{
+			updateFieldRequired('php_preflight_update',0);
+			jQuery('#jform_php_preflight_update').prop('required','required');
+			jQuery('#jform_php_preflight_update').attr('aria-required',true);
+			jQuery('#jform_php_preflight_update').addClass('required');
+			jform_vvvvvwpvwl_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('#jform_update_server').closest('.control-group').hide();
-		jQuery('.note_update_server_note_ftp').closest('.control-group').hide();
+		jQuery('#jform_php_preflight_update').closest('.control-group').hide();
+		if (!jform_vvvvvwpvwl_required)
+		{
+			updateFieldRequired('php_preflight_update',1);
+			jQuery('#jform_php_preflight_update').removeAttr('required');
+			jQuery('#jform_php_preflight_update').removeAttr('aria-required');
+			jQuery('#jform_php_preflight_update').removeClass('required');
+			jform_vvvvvwpvwl_required = true;
+		}
 	}
 }

 // the vvvvvwq function
-function vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq)
+function vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq)
 {
 	// set the function logic
-	if (add_update_server_vvvvvwq == 1 && update_server_target_vvvvvwq == 1)
+	if (update_server_target_vvvvvwq == 1 && add_update_server_vvvvvwq == 1)
 	{
 		jQuery('#jform_update_server').closest('.control-group').show();
 		jQuery('.note_update_server_note_ftp').closest('.control-group').show();
@ -725,10 +744,26 @@ function vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq)
 }

 // the vvvvvwr function
-function vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr)
+function vvvvvwr(add_update_server_vvvvvwr,update_server_target_vvvvvwr)
 {
 	// set the function logic
-	if (update_server_target_vvvvvwr == 2 && add_update_server_vvvvvwr == 1)
+	if (add_update_server_vvvvvwr == 1 && update_server_target_vvvvvwr == 1)
+	{
+		jQuery('#jform_update_server').closest('.control-group').show();
+		jQuery('.note_update_server_note_ftp').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('#jform_update_server').closest('.control-group').hide();
+		jQuery('.note_update_server_note_ftp').closest('.control-group').hide();
+	}
+}
+
+// the vvvvvws function
+function vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws)
+{
+	// set the function logic
+	if (update_server_target_vvvvvws == 2 && add_update_server_vvvvvws == 1)
 	{
 		jQuery('.note_update_server_note_zip').closest('.control-group').show();
 	}
@ -738,11 +773,11 @@ function vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr)
 	}
 }

-// the vvvvvwt function
-function vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt)
+// the vvvvvwu function
+function vvvvvwu(update_server_target_vvvvvwu,add_update_server_vvvvvwu)
 {
 	// set the function logic
-	if (update_server_target_vvvvvwt == 3 && add_update_server_vvvvvwt == 1)
+	if (update_server_target_vvvvvwu == 3 && add_update_server_vvvvvwu == 1)
 	{
 		jQuery('.note_update_server_note_other').closest('.control-group').show();
 	}
@ -752,73 +787,73 @@ function vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt)
 	}
 }

-// the vvvvvwv function
-function vvvvvwv(add_update_server_vvvvvwv)
+// the vvvvvww function
+function vvvvvww(add_update_server_vvvvvww)
 {
 	// set the function logic
-	if (add_update_server_vvvvvwv == 1)
+	if (add_update_server_vvvvvww == 1)
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').show();
-		if (jform_vvvvvwvvwl_required)
+		if (jform_vvvvvwwvwm_required)
 		{
 			updateFieldRequired('update_server_target',0);
 			jQuery('#jform_update_server_target').prop('required','required');
 			jQuery('#jform_update_server_target').attr('aria-required',true);
 			jQuery('#jform_update_server_target').addClass('required');
-			jform_vvvvvwvvwl_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_update_server_target').closest('.control-group').hide();
-		if (!jform_vvvvvwvvwl_required)
-		{
-			updateFieldRequired('update_server_target',1);
-			jQuery('#jform_update_server_target').removeAttr('required');
-			jQuery('#jform_update_server_target').removeAttr('aria-required');
-			jQuery('#jform_update_server_target').removeClass('required');
-			jform_vvvvvwvvwl_required = true;
-		}
-	}
-}
-
-// the vvvvvww function
-function vvvvvww(buildcomp_vvvvvww)
-{
-	// set the function logic
-	if (buildcomp_vvvvvww == 1)
-	{
-		jQuery('#jform_buildcompsql').closest('.control-group').show();
-		if (jform_vvvvvwwvwm_required)
-		{
-			updateFieldRequired('buildcompsql',0);
-			jQuery('#jform_buildcompsql').prop('required','required');
-			jQuery('#jform_buildcompsql').attr('aria-required',true);
-			jQuery('#jform_buildcompsql').addClass('required');
 			jform_vvvvvwwvwm_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_buildcompsql').closest('.control-group').hide();
+		jQuery('#jform_update_server_target').closest('.control-group').hide();
 		if (!jform_vvvvvwwvwm_required)
 		{
-			updateFieldRequired('buildcompsql',1);
-			jQuery('#jform_buildcompsql').removeAttr('required');
-			jQuery('#jform_buildcompsql').removeAttr('aria-required');
-			jQuery('#jform_buildcompsql').removeClass('required');
+			updateFieldRequired('update_server_target',1);
+			jQuery('#jform_update_server_target').removeAttr('required');
+			jQuery('#jform_update_server_target').removeAttr('aria-required');
+			jQuery('#jform_update_server_target').removeClass('required');
 			jform_vvvvvwwvwm_required = true;
 		}
 	}
 }

 // the vvvvvwx function
-function vvvvvwx(dashboard_type_vvvvvwx)
+function vvvvvwx(buildcomp_vvvvvwx)
 {
 	// set the function logic
-	if (dashboard_type_vvvvvwx == 2)
+	if (buildcomp_vvvvvwx == 1)
+	{
+		jQuery('#jform_buildcompsql').closest('.control-group').show();
+		if (jform_vvvvvwxvwn_required)
+		{
+			updateFieldRequired('buildcompsql',0);
+			jQuery('#jform_buildcompsql').prop('required','required');
+			jQuery('#jform_buildcompsql').attr('aria-required',true);
+			jQuery('#jform_buildcompsql').addClass('required');
+			jform_vvvvvwxvwn_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_buildcompsql').closest('.control-group').hide();
+		if (!jform_vvvvvwxvwn_required)
+		{
+			updateFieldRequired('buildcompsql',1);
+			jQuery('#jform_buildcompsql').removeAttr('required');
+			jQuery('#jform_buildcompsql').removeAttr('aria-required');
+			jQuery('#jform_buildcompsql').removeClass('required');
+			jform_vvvvvwxvwn_required = true;
+		}
+	}
+}
+
+// the vvvvvwy function
+function vvvvvwy(dashboard_type_vvvvvwy)
+{
+	// set the function logic
+	if (dashboard_type_vvvvvwy == 2)
 	{
 		jQuery('#jform_dashboard').closest('.control-group').show();
 		jQuery('.note_dynamic_dashboard').closest('.control-group').show();
@ -830,11 +865,11 @@ function vvvvvwx(dashboard_type_vvvvvwx)
 	}
 }

-// the vvvvvwy function
-function vvvvvwy(dashboard_type_vvvvvwy)
+// the vvvvvwz function
+function vvvvvwz(dashboard_type_vvvvvwz)
 {
 	// set the function logic
-	if (dashboard_type_vvvvvwy == 1)
+	if (dashboard_type_vvvvvwz == 1)
 	{
 		jQuery('.note_botton_component_dashboard').closest('.control-group').show();
 	}
--- a/admin/models/forms/joomla_component.xml
+++ b/admin/models/forms/joomla_component.xml
@ -191,21 +191,6 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT"
 		/>
-		<!-- Php_postflight_update Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_postflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_LABEL"
-			rows="17"
-			cols="5"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_HINT"
-			required="true"
-		/>
-		<!-- Note_botton_component_dashboard Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_botton_component_dashboard" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION" heading="h4" class="alert alert-info note_botton_component_dashboard" />
 		<!-- Php_preflight_update Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@ -219,19 +204,6 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_HINT"
 			required="true"
 		/>
-		<!-- Javascript Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="javascript"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_HINT"
-			required="true"
-		/>
 		<!-- Css_site Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@ -245,31 +217,68 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_HINT"
 			required="true"
 		/>
-		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
+		<!-- Note_botton_component_dashboard Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_botton_component_dashboard" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION" heading="h4" class="alert alert-info note_botton_component_dashboard" />
+		<!-- Php_helper_site Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_helper_site"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_LABEL"
+			rows="80"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_HINT"
+			required="true"
+		/>
+		<!-- Javascript Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="javascript"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_HINT"
+			required="true"
+		/>
 		<!-- Note_version_options_two Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_version_options_two" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_TWO_DESCRIPTION" class="alert alert-info note_version_options_two" showon="mvc_versiondate:2" />
-		<!-- Debug_linenr Field. Type: Radio. (joomla) -->
+		<!-- Php_helper_admin Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_helper_admin"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_LABEL"
+			rows="80"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_HINT"
+			required="true"
+		/>
+		<!-- Readme Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="readme"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL"
+			default="You can use all the normal markdown, including the place-holders."
+			width="100%"
+			height="1200px"
+			buttons="false"
+			editor="none"
+			filter="raw"
+			required="true"
+		/>
+		<!-- Buildcomp Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="debug_linenr"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
-		<!-- Add_email_helper Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_email_helper"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION"
+			name="buildcomp"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@ -343,6 +352,34 @@
 		</field>
 		<!-- Note_version_options_three Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_version_options_three" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_THREE_DESCRIPTION" class="alert alert-info note_version_options_three" showon="mvc_versiondate:3" />
+		<!-- Php_postflight_update Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_postflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_LABEL"
+			rows="17"
+			cols="5"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_HINT"
+			required="true"
+		/>
+		<!-- Add_email_helper Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_email_helper"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Sql Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@ -356,24 +393,14 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_HINT"
 			required="true"
 		/>
-		<!-- Php_helper_admin Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_helper_admin"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_LABEL"
-			rows="80"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_HINT"
-			required="true"
-		/>
-		<!-- Add_update_server Field. Type: Radio. (joomla) -->
+		<!-- Note_version_options_one Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_version_options_one" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_ONE_DESCRIPTION" class="alert alert-info note_version_options_one" showon="mvc_versiondate:1" />
+		<!-- Debug_linenr Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER_LABEL"
+			name="debug_linenr"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@ -383,32 +410,21 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Php_helper_site Field. Type: Textarea. (joomla) -->
+		<!-- Email Field. Type: Text. (joomla) -->
 		<field
-			type="textarea"
-			name="php_helper_site"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_LABEL"
-			rows="80"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_HINT"
+			type="text"
+			name="email"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_LABEL"
+			size="40"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_DESCRIPTION"
+			class="text_area"
 			required="true"
+			filter="STRING"
+			validate="email"
+			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT"
 		/>
-		<!-- Sales_server Field. Type: Servers. (custom) -->
-		<field
-			type="servers"
-			name="sales_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_DESCRIPTION"
-			class="list_class"
-			multiple="false"
-			default="0"
-			button="true"
-		/>
-		<!-- Note_version_options_one Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_version_options_one" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_ONE_DESCRIPTION" class="alert alert-info note_version_options_one" showon="mvc_versiondate:1" />
 		<!-- Adduikit Field. Type: List. (joomla) -->
 		<field
 			type="list"
@ -427,34 +443,6 @@
 			<option value="3">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTHREE</option>
 		</field>
-		<!-- Email Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="email"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_LABEL"
-			size="40"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_DESCRIPTION"
-			class="text_area"
-			required="true"
-			filter="STRING"
-			validate="email"
-			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT"
-		/>
-		<!-- Php_helper_both Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_helper_both"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_LABEL"
-			rows="80"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_HINT"
-			required="true"
-		/>
 		<!-- Website Field. Type: Url. (joomla) -->
 		<field
 			type="url"
@ -470,17 +458,17 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT"
 		/>
-		<!-- Php_admin_event Field. Type: Textarea. (joomla) -->
+		<!-- Php_helper_both Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_admin_event"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_LABEL"
-			rows="17"
-			cols="5"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_DESCRIPTION"
+			name="php_helper_both"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_LABEL"
+			rows="80"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_HINT"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_HINT"
 			required="true"
 		/>
 		<!-- Add_license Field. Type: Radio. (joomla) -->
@ -498,17 +486,17 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Php_site_event Field. Type: Textarea. (joomla) -->
+		<!-- Php_admin_event Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_site_event"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL"
+			name="php_admin_event"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_LABEL"
 			rows="17"
 			cols="5"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_HINT"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_HINT"
 			required="true"
 		/>
 		<!-- License_type Field. Type: List. (joomla) -->
@ -532,6 +520,21 @@
 			<option value="4">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE</option>
 		</field>
+		<!-- Php_site_event Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_site_event"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL"
+			rows="17"
+			cols="5"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_HINT"
+			required="true"
+		/>
+		<!-- Note_whmcs_lisencing_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_whmcs_lisencing_note" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_lisencing_note" />
 		<!-- Css_admin Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@ -545,10 +548,6 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_HINT"
 			required="true"
 		/>
-		<!-- Note_whmcs_lisencing_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_whmcs_lisencing_note" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_lisencing_note" />
-		<!-- Note_dynamic_dashboard Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_dynamic_dashboard" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_DESCRIPTION" heading="h4" class="alert alert-info note_dynamic_dashboard" />
 		<!-- Whmcs_key Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@ -562,19 +561,8 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_HINT"
 		/>
-		<!-- Php_preflight_install Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_preflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_LABEL"
-			rows="17"
-			cols="5"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_HINT"
-			required="true"
-		/>
+		<!-- Note_dynamic_dashboard Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_dynamic_dashboard" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_DESCRIPTION" heading="h4" class="alert alert-info note_dynamic_dashboard" />
 		<!-- Whmcs_url Field. Type: Url. (joomla) -->
 		<field
 			type="url"
@ -589,17 +577,17 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_HINT"
 		/>
-		<!-- Php_postflight_install Field. Type: Textarea. (joomla) -->
+		<!-- Php_preflight_install Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_LABEL"
+			name="php_preflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_LABEL"
 			rows="17"
 			cols="5"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_HINT"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_HINT"
 			required="true"
 		/>
 		<!-- License Field. Type: Textarea. (joomla) -->
@ -616,6 +604,29 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_HINT"
 			required="true"
 		/>
+		<!-- Php_postflight_install Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_postflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_LABEL"
+			rows="17"
+			cols="5"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_HINT"
+			required="true"
+		/>
+		<!-- Bom Field. Type: Filelist. (joomla) -->
+		<field
+			type="filelist"
+			name="bom"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_LABEL"
+			directory="administrator/components/com_componentbuilder/compiler"
+			default="default.txt"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_DESCRIPTION"
+			hide_default="true"
+		/>
 		<!-- Php_method_uninstall Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@ -629,29 +640,6 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_HINT"
 			required="true"
 		/>
-		<!-- Bom Field. Type: Filelist. (joomla) -->
-		<field
-			type="filelist"
-			name="bom"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_LABEL"
-			directory="administrator/components/com_componentbuilder/compiler"
-			default="default.txt"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_DESCRIPTION"
-			hide_default="true"
-		/>
-		<!-- Readme Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="readme"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL"
-			default="You can use all the normal markdown, including the place-holders."
-			width="100%"
-			height="1200px"
-			buttons="false"
-			editor="none"
-			filter="raw"
-			required="true"
-		/>
 		<!-- Image Field. Type: Media. (joomla) -->
 		<field
 			type="media"
@ -660,6 +648,19 @@
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION"
 			directory=""
 		/>
+		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="sql_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_HINT"
+			required="true"
+		/>
 		<!-- Update_server_target Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@ -677,12 +678,20 @@
 			<option value="3">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER</option>
 		</field>
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<!-- Add_update_server Field. Type: Radio. (joomla) -->
 		<field
-			type="hidden"
-			name="not_required"
-			default="[]"
-		/>
+			type="radio"
+			name="add_update_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Update_server Field. Type: Servers. (custom) -->
 		<field
 			type="servers"
@ -694,39 +703,29 @@
 			default="0"
 			button="true"
 		/>
+		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
+		<!-- Sales_server Field. Type: Servers. (custom) -->
+		<field
+			type="servers"
+			name="sales_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			default="0"
+			button="true"
+		/>
 		<!-- Note_moved_views Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_moved_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_moved_views" />
-		<!-- Buildcomp Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="buildcomp"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
 		<!-- Spacer_hr_one Field. Type: Spacer. A None Database Field. (joomla) -->
 		<field type="spacer" name="spacer_hr_one" hr="true" class="spacer_hr_one" />
-		<!-- Creatuserhelper Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="creatuserhelper"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
 		<!-- Note_mysql_tweak_options Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_mysql_tweak_options" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_mysql_tweak_options" />
 		<!-- Addfootable Field. Type: List. (joomla) -->
@ -1173,13 +1172,14 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Addreadme Field. Type: Radio. (joomla) -->
+		<!-- Add_sql_uninstall Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="addreadme"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDREADME_LABEL"
+			name="add_sql_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_UNINSTALL_LABEL"
 			class="btn-group btn-group-yesno"
-			default="0">
+			default="0"
+			required="true">
 			<!-- Option Set. -->
 			<option value="1">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
@ -1197,10 +1197,25 @@
 			max="40"
 			step="1"
 		/>
-		<!-- Note_readme Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_readme" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_DESCRIPTION" heading="h4" class="note_readme" />
+		<!-- Addreadme Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="addreadme"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDREADME_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Note_on_admin_views Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_on_admin_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_admin_views" />
+		<!-- Note_readme Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_readme" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_DESCRIPTION" heading="h4" class="note_readme" />
+		<!-- Note_display_component_admin_views Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_display_component_admin_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_ADMIN_VIEWS_DESCRIPTION" class="note_display_component_admin_views" />
 		<!-- Update_server_url Field. Type: Url. (joomla) -->
 		<field
 			type="url"
@ -1215,16 +1230,16 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_URL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_URL_HINT"
 		/>
-		<!-- Note_display_component_admin_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_display_component_admin_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_ADMIN_VIEWS_DESCRIPTION" class="note_display_component_admin_views" />
-		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
 		<!-- Note_on_site_views Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_on_site_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_SITE_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_SITE_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_site_views" />
-		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
+		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
 		<!-- Note_display_component_site_views Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_display_component_site_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_SITE_VIEWS_DESCRIPTION" class="note_display_component_site_views" />
+		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
+		<!-- Note_on_custom_admin_views Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_custom_admin_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CUSTOM_ADMIN_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CUSTOM_ADMIN_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_custom_admin_views" />
 		<!-- Add_sales_server Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@ -1239,12 +1254,24 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Note_on_custom_admin_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_custom_admin_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CUSTOM_ADMIN_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CUSTOM_ADMIN_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_custom_admin_views" />
-		<!-- Note_buildcomp_dynamic_mysql Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_buildcomp_dynamic_mysql" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_DESCRIPTION" heading="h4" class="alert alert-info note_buildcomp_dynamic_mysql" />
 		<!-- Note_display_component_custom_admin_views Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_display_component_custom_admin_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_CUSTOM_ADMIN_VIEWS_DESCRIPTION" class="note_display_component_custom_admin_views" />
+		<!-- Note_buildcomp_dynamic_mysql Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_buildcomp_dynamic_mysql" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_DESCRIPTION" heading="h4" class="alert alert-info note_buildcomp_dynamic_mysql" />
+		<!-- Creatuserhelper Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="creatuserhelper"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Buildcompsql Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvyzvyt_required = false;
+jform_vvvvvzavyu_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyz(add_php_view_vvvvvyz);
+	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvza(add_php_view_vvvvvza);
 });

-// the vvvvvyz function
-function vvvvvyz(add_php_view_vvvvvyz)
+// the vvvvvza function
+function vvvvvza(add_php_view_vvvvvza)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyz == 1)
+	if (add_php_view_vvvvvza == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyzvyt_required)
+		if (jform_vvvvvzavyu_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyzvyt_required = false;
+			jform_vvvvvzavyu_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyzvyt_required)
+		if (!jform_vvvvvzavyu_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyzvyt_required = true;
+			jform_vvvvvzavyu_required = true;
 		}
 	}
 }
--- a/admin/models/forms/library.js
+++ b/admin/models/forms/library.js
@ -23,15 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvwaevzs_required = false;
-jform_vvvvwakvzt_required = false;
+jform_vvvvwafvzt_required = false;
+jform_vvvvwalvzu_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvwad = jQuery("#jform_how").val();
-	vvvvwad(how_vvvvwad);
-
 	var how_vvvvwae = jQuery("#jform_how").val();
 	vvvvwae(how_vvvvwae);

@ -50,48 +47,13 @@ jQuery(document).ready(function()
 	var how_vvvvwaj = jQuery("#jform_how").val();
 	vvvvwaj(how_vvvvwaj);

-	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwak(type_vvvvwak);
+	var how_vvvvwak = jQuery("#jform_how").val();
+	vvvvwak(how_vvvvwak);
+
+	var type_vvvvwal = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwal(type_vvvvwal);
 });

-// the vvvvwad function
-function vvvvwad(how_vvvvwad)
-{
-	if (isSet(how_vvvvwad) && how_vvvvwad.constructor !== Array)
-	{
-		var temp_vvvvwad = how_vvvvwad;
-		var how_vvvvwad = [];
-		how_vvvvwad.push(temp_vvvvwad);
-	}
-	else if (!isSet(how_vvvvwad))
-	{
-		var how_vvvvwad = [];
-	}
-	var how = how_vvvvwad.some(how_vvvvwad_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwad Some function
-function how_vvvvwad_SomeFunc(how_vvvvwad)
-{
-	// set the function logic
-	if (how_vvvvwad == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwae function
 function vvvvwae(how_vvvvwae)
 {
@ -111,28 +73,11 @@ function vvvvwae(how_vvvvwae)
 	// set this function logic
 	if (how)
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvwaevzs_required)
-		{
-			updateFieldRequired('php_setdocument',0);
-			jQuery('#jform_php_setdocument').prop('required','required');
-			jQuery('#jform_php_setdocument').attr('aria-required',true);
-			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvwaevzs_required = false;
-		}
-
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvwaevzs_required)
-		{
-			updateFieldRequired('php_setdocument',1);
-			jQuery('#jform_php_setdocument').removeAttr('required');
-			jQuery('#jform_php_setdocument').removeAttr('aria-required');
-			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvwaevzs_required = true;
-		}
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }

@ -140,7 +85,7 @@ function vvvvwae(how_vvvvwae)
 function how_vvvvwae_SomeFunc(how_vvvvwae)
 {
 	// set the function logic
-	if (how_vvvvwae == 3)
+	if (how_vvvvwae == 2)
 	{
 		return true;
 	}
@ -166,11 +111,28 @@ function vvvvwaf(how_vvvvwaf)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		if (jform_vvvvwafvzt_required)
+		{
+			updateFieldRequired('php_setdocument',0);
+			jQuery('#jform_php_setdocument').prop('required','required');
+			jQuery('#jform_php_setdocument').attr('aria-required',true);
+			jQuery('#jform_php_setdocument').addClass('required');
+			jform_vvvvwafvzt_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvwafvzt_required)
+		{
+			updateFieldRequired('php_setdocument',1);
+			jQuery('#jform_php_setdocument').removeAttr('required');
+			jQuery('#jform_php_setdocument').removeAttr('aria-required');
+			jQuery('#jform_php_setdocument').removeClass('required');
+			jform_vvvvwafvzt_required = true;
+		}
 	}
 }

@ -178,7 +140,7 @@ function vvvvwaf(how_vvvvwaf)
 function how_vvvvwaf_SomeFunc(how_vvvvwaf)
 {
 	// set the function logic
-	if (how_vvvvwaf == 2 || how_vvvvwaf == 3)
+	if (how_vvvvwaf == 3)
 	{
 		return true;
 	}
@ -204,11 +166,11 @@ function vvvvwag(how_vvvvwag)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
 	}
 }

@ -216,7 +178,7 @@ function vvvvwag(how_vvvvwag)
 function how_vvvvwag_SomeFunc(how_vvvvwag)
 {
 	// set the function logic
-	if (how_vvvvwag == 1 || how_vvvvwag == 2 || how_vvvvwag == 3)
+	if (how_vvvvwag == 2 || how_vvvvwag == 3)
 	{
 		return true;
 	}
@ -242,15 +204,11 @@ function vvvvwah(how_vvvvwah)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
 	}
 }

@ -258,7 +216,7 @@ function vvvvwah(how_vvvvwah)
 function how_vvvvwah_SomeFunc(how_vvvvwah)
 {
 	// set the function logic
-	if (how_vvvvwah == 0)
+	if (how_vvvvwah == 1 || how_vvvvwah == 2 || how_vvvvwah == 3)
 	{
 		return true;
 	}
@ -284,13 +242,15 @@ function vvvvwai(how_vvvvwai)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }

@ -298,7 +258,7 @@ function vvvvwai(how_vvvvwai)
 function how_vvvvwai_SomeFunc(how_vvvvwai)
 {
 	// set the function logic
-	if (how_vvvvwai == 1)
+	if (how_vvvvwai == 0)
 	{
 		return true;
 	}
@ -321,6 +281,46 @@ function vvvvwaj(how_vvvvwaj)
 	var how = how_vvvvwaj.some(how_vvvvwaj_SomeFunc);


+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwaj Some function
+function how_vvvvwaj_SomeFunc(how_vvvvwaj)
+{
+	// set the function logic
+	if (how_vvvvwaj == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwak function
+function vvvvwak(how_vvvvwak)
+{
+	if (isSet(how_vvvvwak) && how_vvvvwak.constructor !== Array)
+	{
+		var temp_vvvvwak = how_vvvvwak;
+		var how_vvvvwak = [];
+		how_vvvvwak.push(temp_vvvvwak);
+	}
+	else if (!isSet(how_vvvvwak))
+	{
+		var how_vvvvwak = [];
+	}
+	var how = how_vvvvwak.some(how_vvvvwak_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@ -336,44 +336,44 @@ function vvvvwaj(how_vvvvwaj)
 	}
 }

-// the vvvvwaj Some function
-function how_vvvvwaj_SomeFunc(how_vvvvwaj)
+// the vvvvwak Some function
+function how_vvvvwak_SomeFunc(how_vvvvwak)
 {
 	// set the function logic
-	if (how_vvvvwaj == 4)
+	if (how_vvvvwak == 4)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwak function
-function vvvvwak(type_vvvvwak)
+// the vvvvwal function
+function vvvvwal(type_vvvvwal)
 {
 	// set the function logic
-	if (type_vvvvwak == 2)
+	if (type_vvvvwal == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwakvzt_required)
+		if (jform_vvvvwalvzu_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwakvzt_required = false;
+			jform_vvvvwalvzu_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwakvzt_required)
+		if (!jform_vvvvwalvzu_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwakvzt_required = true;
+			jform_vvvvwalvzu_required = true;
 		}
 	}
 }
--- a/admin/models/forms/server.js
+++ b/admin/models/forms/server.js
@ -23,175 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvwavwad_required = false;
-jform_vvvvwavwae_required = false;
-jform_vvvvwavwaf_required = false;
-jform_vvvvwavwag_required = false;
-jform_vvvvwavwah_required = false;
+jform_vvvvwawwae_required = false;
+jform_vvvvwawwaf_required = false;
+jform_vvvvwawwag_required = false;
+jform_vvvvwawwah_required = false;
 jform_vvvvwawwai_required = false;
 jform_vvvvwaxwaj_required = false;
-jform_vvvvwazwak_required = false;
-jform_vvvvwbbwal_required = false;
+jform_vvvvwaywak_required = false;
+jform_vvvvwbawal_required = false;
+jform_vvvvwbcwam_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwav = jQuery("#jform_protocol").val();
-	vvvvwav(protocol_vvvvwav);
-
 	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
 	vvvvwaw(protocol_vvvvwaw);

 	var protocol_vvvvwax = jQuery("#jform_protocol").val();
-	var authentication_vvvvwax = jQuery("#jform_authentication").val();
-	vvvvwax(protocol_vvvvwax,authentication_vvvvwax);
+	vvvvwax(protocol_vvvvwax);

-	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
+	var protocol_vvvvway = jQuery("#jform_protocol").val();
+	var authentication_vvvvway = jQuery("#jform_authentication").val();
+	vvvvway(protocol_vvvvway,authentication_vvvvway);

-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);

-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
+
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
 });

-// the vvvvwav function
-function vvvvwav(protocol_vvvvwav)
-{
-	if (isSet(protocol_vvvvwav) && protocol_vvvvwav.constructor !== Array)
-	{
-		var temp_vvvvwav = protocol_vvvvwav;
-		var protocol_vvvvwav = [];
-		protocol_vvvvwav.push(temp_vvvvwav);
-	}
-	else if (!isSet(protocol_vvvvwav))
-	{
-		var protocol_vvvvwav = [];
-	}
-	var protocol = protocol_vvvvwav.some(protocol_vvvvwav_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('#jform_authentication').closest('.control-group').show();
-		if (jform_vvvvwavwad_required)
-		{
-			updateFieldRequired('authentication',0);
-			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwavwad_required = false;
-		}
-
-		jQuery('#jform_host').closest('.control-group').show();
-		if (jform_vvvvwavwae_required)
-		{
-			updateFieldRequired('host',0);
-			jQuery('#jform_host').prop('required','required');
-			jQuery('#jform_host').attr('aria-required',true);
-			jQuery('#jform_host').addClass('required');
-			jform_vvvvwavwae_required = false;
-		}
-
-		jQuery('#jform_port').closest('.control-group').show();
-		if (jform_vvvvwavwaf_required)
-		{
-			updateFieldRequired('port',0);
-			jQuery('#jform_port').prop('required','required');
-			jQuery('#jform_port').attr('aria-required',true);
-			jQuery('#jform_port').addClass('required');
-			jform_vvvvwavwaf_required = false;
-		}
-
-		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwavwag_required)
-		{
-			updateFieldRequired('path',0);
-			jQuery('#jform_path').prop('required','required');
-			jQuery('#jform_path').attr('aria-required',true);
-			jQuery('#jform_path').addClass('required');
-			jform_vvvvwavwag_required = false;
-		}
-
-		jQuery('.note_ssh_security').closest('.control-group').show();
-		jQuery('#jform_username').closest('.control-group').show();
-		if (jform_vvvvwavwah_required)
-		{
-			updateFieldRequired('username',0);
-			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_username').addClass('required');
-			jform_vvvvwavwah_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_authentication').closest('.control-group').hide();
-		if (!jform_vvvvwavwad_required)
-		{
-			updateFieldRequired('authentication',1);
-			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwavwad_required = true;
-		}
-		jQuery('#jform_host').closest('.control-group').hide();
-		if (!jform_vvvvwavwae_required)
-		{
-			updateFieldRequired('host',1);
-			jQuery('#jform_host').removeAttr('required');
-			jQuery('#jform_host').removeAttr('aria-required');
-			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwavwae_required = true;
-		}
-		jQuery('#jform_port').closest('.control-group').hide();
-		if (!jform_vvvvwavwaf_required)
-		{
-			updateFieldRequired('port',1);
-			jQuery('#jform_port').removeAttr('required');
-			jQuery('#jform_port').removeAttr('aria-required');
-			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwavwaf_required = true;
-		}
-		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwavwag_required)
-		{
-			updateFieldRequired('path',1);
-			jQuery('#jform_path').removeAttr('required');
-			jQuery('#jform_path').removeAttr('aria-required');
-			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwavwag_required = true;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').hide();
-		jQuery('#jform_username').closest('.control-group').hide();
-		if (!jform_vvvvwavwah_required)
-		{
-			updateFieldRequired('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwavwah_required = true;
-		}
-	}
-}
-
-// the vvvvwav Some function
-function protocol_vvvvwav_SomeFunc(protocol_vvvvwav)
-{
-	// set the function logic
-	if (protocol_vvvvwav == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwaw function
 function vvvvwaw(protocol_vvvvwaw)
 {
@ -211,28 +78,104 @@ function vvvvwaw(protocol_vvvvwaw)
 	// set this function logic
 	if (protocol)
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').show();
-		jQuery('#jform_signature').closest('.control-group').show();
+		jQuery('#jform_authentication').closest('.control-group').show();
+		if (jform_vvvvwawwae_required)
+		{
+			updateFieldRequired('authentication',0);
+			jQuery('#jform_authentication').prop('required','required');
+			jQuery('#jform_authentication').attr('aria-required',true);
+			jQuery('#jform_authentication').addClass('required');
+			jform_vvvvwawwae_required = false;
+		}
+
+		jQuery('#jform_host').closest('.control-group').show();
+		if (jform_vvvvwawwaf_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwawwaf_required = false;
+		}
+
+		jQuery('#jform_port').closest('.control-group').show();
+		if (jform_vvvvwawwag_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwawwag_required = false;
+		}
+
+		jQuery('#jform_path').closest('.control-group').show();
+		if (jform_vvvvwawwah_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwawwah_required = false;
+		}
+
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
 		if (jform_vvvvwawwai_required)
 		{
-			updateFieldRequired('signature',0);
-			jQuery('#jform_signature').prop('required','required');
-			jQuery('#jform_signature').attr('aria-required',true);
-			jQuery('#jform_signature').addClass('required');
+			updateFieldRequired('username',0);
+			jQuery('#jform_username').prop('required','required');
+			jQuery('#jform_username').attr('aria-required',true);
+			jQuery('#jform_username').addClass('required');
 			jform_vvvvwawwai_required = false;
 		}

 	}
 	else
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').hide();
-		jQuery('#jform_signature').closest('.control-group').hide();
+		jQuery('#jform_authentication').closest('.control-group').hide();
+		if (!jform_vvvvwawwae_required)
+		{
+			updateFieldRequired('authentication',1);
+			jQuery('#jform_authentication').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeClass('required');
+			jform_vvvvwawwae_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		if (!jform_vvvvwawwaf_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwawwaf_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		if (!jform_vvvvwawwag_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwawwag_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		if (!jform_vvvvwawwah_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwawwah_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
 		if (!jform_vvvvwawwai_required)
 		{
-			updateFieldRequired('signature',1);
-			jQuery('#jform_signature').removeAttr('required');
-			jQuery('#jform_signature').removeAttr('aria-required');
-			jQuery('#jform_signature').removeClass('required');
+			updateFieldRequired('username',1);
+			jQuery('#jform_username').removeAttr('required');
+			jQuery('#jform_username').removeAttr('aria-required');
+			jQuery('#jform_username').removeClass('required');
 			jform_vvvvwawwai_required = true;
 		}
 	}
@ -242,7 +185,7 @@ function vvvvwaw(protocol_vvvvwaw)
 function protocol_vvvvwaw_SomeFunc(protocol_vvvvwaw)
 {
 	// set the function logic
-	if (protocol_vvvvwaw == 1)
+	if (protocol_vvvvwaw == 2)
 	{
 		return true;
 	}
@ -250,7 +193,7 @@ function protocol_vvvvwaw_SomeFunc(protocol_vvvvwaw)
 }

 // the vvvvwax function
-function vvvvwax(protocol_vvvvwax,authentication_vvvvwax)
+function vvvvwax(protocol_vvvvwax)
 {
 	if (isSet(protocol_vvvvwax) && protocol_vvvvwax.constructor !== Array)
 	{
@ -264,42 +207,32 @@ function vvvvwax(protocol_vvvvwax,authentication_vvvvwax)
 	}
 	var protocol = protocol_vvvvwax.some(protocol_vvvvwax_SomeFunc);

-	if (isSet(authentication_vvvvwax) && authentication_vvvvwax.constructor !== Array)
-	{
-		var temp_vvvvwax = authentication_vvvvwax;
-		var authentication_vvvvwax = [];
-		authentication_vvvvwax.push(temp_vvvvwax);
-	}
-	else if (!isSet(authentication_vvvvwax))
-	{
-		var authentication_vvvvwax = [];
-	}
-	var authentication = authentication_vvvvwax.some(authentication_vvvvwax_SomeFunc);
-

 	// set this function logic
-	if (protocol && authentication)
+	if (protocol)
 	{
-		jQuery('#jform_password').closest('.control-group').show();
+		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_signature').closest('.control-group').show();
 		if (jform_vvvvwaxwaj_required)
 		{
-			updateFieldRequired('password',0);
-			jQuery('#jform_password').prop('required','required');
-			jQuery('#jform_password').attr('aria-required',true);
-			jQuery('#jform_password').addClass('required');
+			updateFieldRequired('signature',0);
+			jQuery('#jform_signature').prop('required','required');
+			jQuery('#jform_signature').attr('aria-required',true);
+			jQuery('#jform_signature').addClass('required');
 			jform_vvvvwaxwaj_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_password').closest('.control-group').hide();
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_signature').closest('.control-group').hide();
 		if (!jform_vvvvwaxwaj_required)
 		{
-			updateFieldRequired('password',1);
-			jQuery('#jform_password').removeAttr('required');
-			jQuery('#jform_password').removeAttr('aria-required');
-			jQuery('#jform_password').removeClass('required');
+			updateFieldRequired('signature',1);
+			jQuery('#jform_signature').removeAttr('required');
+			jQuery('#jform_signature').removeAttr('aria-required');
+			jQuery('#jform_signature').removeClass('required');
 			jform_vvvvwaxwaj_required = true;
 		}
 	}
@ -309,206 +242,273 @@ function vvvvwax(protocol_vvvvwax,authentication_vvvvwax)
 function protocol_vvvvwax_SomeFunc(protocol_vvvvwax)
 {
 	// set the function logic
-	if (protocol_vvvvwax == 2)
+	if (protocol_vvvvwax == 1)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwax Some function
-function authentication_vvvvwax_SomeFunc(authentication_vvvvwax)
+// the vvvvway function
+function vvvvway(protocol_vvvvway,authentication_vvvvway)
+{
+	if (isSet(protocol_vvvvway) && protocol_vvvvway.constructor !== Array)
+	{
+		var temp_vvvvway = protocol_vvvvway;
+		var protocol_vvvvway = [];
+		protocol_vvvvway.push(temp_vvvvway);
+	}
+	else if (!isSet(protocol_vvvvway))
+	{
+		var protocol_vvvvway = [];
+	}
+	var protocol = protocol_vvvvway.some(protocol_vvvvway_SomeFunc);
+
+	if (isSet(authentication_vvvvway) && authentication_vvvvway.constructor !== Array)
+	{
+		var temp_vvvvway = authentication_vvvvway;
+		var authentication_vvvvway = [];
+		authentication_vvvvway.push(temp_vvvvway);
+	}
+	else if (!isSet(authentication_vvvvway))
+	{
+		var authentication_vvvvway = [];
+	}
+	var authentication = authentication_vvvvway.some(authentication_vvvvway_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_password').closest('.control-group').show();
+		if (jform_vvvvwaywak_required)
+		{
+			updateFieldRequired('password',0);
+			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_password').addClass('required');
+			jform_vvvvwaywak_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_password').closest('.control-group').hide();
+		if (!jform_vvvvwaywak_required)
+		{
+			updateFieldRequired('password',1);
+			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_password').removeClass('required');
+			jform_vvvvwaywak_required = true;
+		}
+	}
+}
+
+// the vvvvway Some function
+function protocol_vvvvway_SomeFunc(protocol_vvvvway)
 {
 	// set the function logic
-	if (authentication_vvvvwax == 1 || authentication_vvvvwax == 3 || authentication_vvvvwax == 5)
+	if (protocol_vvvvway == 2)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwaz function
-function vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz)
+// the vvvvway Some function
+function authentication_vvvvway_SomeFunc(authentication_vvvvway)
 {
-	if (isSet(protocol_vvvvwaz) && protocol_vvvvwaz.constructor !== Array)
+	// set the function logic
+	if (authentication_vvvvway == 1 || authentication_vvvvway == 3 || authentication_vvvvway == 5)
 	{
-		var temp_vvvvwaz = protocol_vvvvwaz;
-		var protocol_vvvvwaz = [];
-		protocol_vvvvwaz.push(temp_vvvvwaz);
+		return true;
 	}
-	else if (!isSet(protocol_vvvvwaz))
-	{
-		var protocol_vvvvwaz = [];
-	}
-	var protocol = protocol_vvvvwaz.some(protocol_vvvvwaz_SomeFunc);
+	return false;
+}

-	if (isSet(authentication_vvvvwaz) && authentication_vvvvwaz.constructor !== Array)
+// the vvvvwba function
+function vvvvwba(protocol_vvvvwba,authentication_vvvvwba)
+{
+	if (isSet(protocol_vvvvwba) && protocol_vvvvwba.constructor !== Array)
 	{
-		var temp_vvvvwaz = authentication_vvvvwaz;
-		var authentication_vvvvwaz = [];
-		authentication_vvvvwaz.push(temp_vvvvwaz);
+		var temp_vvvvwba = protocol_vvvvwba;
+		var protocol_vvvvwba = [];
+		protocol_vvvvwba.push(temp_vvvvwba);
 	}
-	else if (!isSet(authentication_vvvvwaz))
+	else if (!isSet(protocol_vvvvwba))
 	{
-		var authentication_vvvvwaz = [];
+		var protocol_vvvvwba = [];
 	}
-	var authentication = authentication_vvvvwaz.some(authentication_vvvvwaz_SomeFunc);
+	var protocol = protocol_vvvvwba.some(protocol_vvvvwba_SomeFunc);
+
+	if (isSet(authentication_vvvvwba) && authentication_vvvvwba.constructor !== Array)
+	{
+		var temp_vvvvwba = authentication_vvvvwba;
+		var authentication_vvvvwba = [];
+		authentication_vvvvwba.push(temp_vvvvwba);
+	}
+	else if (!isSet(authentication_vvvvwba))
+	{
+		var authentication_vvvvwba = [];
+	}
+	var authentication = authentication_vvvvwba.some(authentication_vvvvwba_SomeFunc);


 	// set this function logic
 	if (protocol && authentication)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
-		if (jform_vvvvwazwak_required)
+		if (jform_vvvvwbawal_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwazwak_required = false;
+			jform_vvvvwbawal_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
-		if (!jform_vvvvwazwak_required)
+		if (!jform_vvvvwbawal_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwazwak_required = true;
+			jform_vvvvwbawal_required = true;
 		}
 	}
 }

-// the vvvvwaz Some function
-function protocol_vvvvwaz_SomeFunc(protocol_vvvvwaz)
+// the vvvvwba Some function
+function protocol_vvvvwba_SomeFunc(protocol_vvvvwba)
 {
 	// set the function logic
-	if (protocol_vvvvwaz == 2)
+	if (protocol_vvvvwba == 2)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwaz Some function
-function authentication_vvvvwaz_SomeFunc(authentication_vvvvwaz)
+// the vvvvwba Some function
+function authentication_vvvvwba_SomeFunc(authentication_vvvvwba)
 {
 	// set the function logic
-	if (authentication_vvvvwaz == 2 || authentication_vvvvwaz == 3)
+	if (authentication_vvvvwba == 2 || authentication_vvvvwba == 3)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwbb function
-function vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb)
+// the vvvvwbc function
+function vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc)
 {
-	if (isSet(protocol_vvvvwbb) && protocol_vvvvwbb.constructor !== Array)
+	if (isSet(protocol_vvvvwbc) && protocol_vvvvwbc.constructor !== Array)
 	{
-		var temp_vvvvwbb = protocol_vvvvwbb;
-		var protocol_vvvvwbb = [];
-		protocol_vvvvwbb.push(temp_vvvvwbb);
+		var temp_vvvvwbc = protocol_vvvvwbc;
+		var protocol_vvvvwbc = [];
+		protocol_vvvvwbc.push(temp_vvvvwbc);
 	}
-	else if (!isSet(protocol_vvvvwbb))
+	else if (!isSet(protocol_vvvvwbc))
 	{
-		var protocol_vvvvwbb = [];
+		var protocol_vvvvwbc = [];
 	}
-	var protocol = protocol_vvvvwbb.some(protocol_vvvvwbb_SomeFunc);
+	var protocol = protocol_vvvvwbc.some(protocol_vvvvwbc_SomeFunc);

-	if (isSet(authentication_vvvvwbb) && authentication_vvvvwbb.constructor !== Array)
+	if (isSet(authentication_vvvvwbc) && authentication_vvvvwbc.constructor !== Array)
 	{
-		var temp_vvvvwbb = authentication_vvvvwbb;
-		var authentication_vvvvwbb = [];
-		authentication_vvvvwbb.push(temp_vvvvwbb);
+		var temp_vvvvwbc = authentication_vvvvwbc;
+		var authentication_vvvvwbc = [];
+		authentication_vvvvwbc.push(temp_vvvvwbc);
 	}
-	else if (!isSet(authentication_vvvvwbb))
+	else if (!isSet(authentication_vvvvwbc))
 	{
-		var authentication_vvvvwbb = [];
+		var authentication_vvvvwbc = [];
 	}
-	var authentication = authentication_vvvvwbb.some(authentication_vvvvwbb_SomeFunc);
+	var authentication = authentication_vvvvwbc.some(authentication_vvvvwbc_SomeFunc);


 	// set this function logic
 	if (protocol && authentication)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
-		if (jform_vvvvwbbwal_required)
+		if (jform_vvvvwbcwam_required)
 		{
 			updateFieldRequired('private_key',0);
 			jQuery('#jform_private_key').prop('required','required');
 			jQuery('#jform_private_key').attr('aria-required',true);
 			jQuery('#jform_private_key').addClass('required');
-			jform_vvvvwbbwal_required = false;
+			jform_vvvvwbcwam_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
-		if (!jform_vvvvwbbwal_required)
+		if (!jform_vvvvwbcwam_required)
 		{
 			updateFieldRequired('private_key',1);
 			jQuery('#jform_private_key').removeAttr('required');
 			jQuery('#jform_private_key').removeAttr('aria-required');
 			jQuery('#jform_private_key').removeClass('required');
-			jform_vvvvwbbwal_required = true;
+			jform_vvvvwbcwam_required = true;
 		}
 	}
 }

-// the vvvvwbb Some function
-function protocol_vvvvwbb_SomeFunc(protocol_vvvvwbb)
+// the vvvvwbc Some function
+function protocol_vvvvwbc_SomeFunc(protocol_vvvvwbc)
 {
 	// set the function logic
-	if (protocol_vvvvwbb == 2)
+	if (protocol_vvvvwbc == 2)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwbb Some function
-function authentication_vvvvwbb_SomeFunc(authentication_vvvvwbb)
+// the vvvvwbc Some function
+function authentication_vvvvwbc_SomeFunc(authentication_vvvvwbc)
 {
 	// set the function logic
-	if (authentication_vvvvwbb == 4 || authentication_vvvvwbb == 5)
+	if (authentication_vvvvwbc == 4 || authentication_vvvvwbc == 5)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwbd function
-function vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd)
+// the vvvvwbe function
+function vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe)
 {
-	if (isSet(protocol_vvvvwbd) && protocol_vvvvwbd.constructor !== Array)
+	if (isSet(protocol_vvvvwbe) && protocol_vvvvwbe.constructor !== Array)
 	{
-		var temp_vvvvwbd = protocol_vvvvwbd;
-		var protocol_vvvvwbd = [];
-		protocol_vvvvwbd.push(temp_vvvvwbd);
+		var temp_vvvvwbe = protocol_vvvvwbe;
+		var protocol_vvvvwbe = [];
+		protocol_vvvvwbe.push(temp_vvvvwbe);
 	}
-	else if (!isSet(protocol_vvvvwbd))
+	else if (!isSet(protocol_vvvvwbe))
 	{
-		var protocol_vvvvwbd = [];
+		var protocol_vvvvwbe = [];
 	}
-	var protocol = protocol_vvvvwbd.some(protocol_vvvvwbd_SomeFunc);
+	var protocol = protocol_vvvvwbe.some(protocol_vvvvwbe_SomeFunc);

-	if (isSet(authentication_vvvvwbd) && authentication_vvvvwbd.constructor !== Array)
+	if (isSet(authentication_vvvvwbe) && authentication_vvvvwbe.constructor !== Array)
 	{
-		var temp_vvvvwbd = authentication_vvvvwbd;
-		var authentication_vvvvwbd = [];
-		authentication_vvvvwbd.push(temp_vvvvwbd);
+		var temp_vvvvwbe = authentication_vvvvwbe;
+		var authentication_vvvvwbe = [];
+		authentication_vvvvwbe.push(temp_vvvvwbe);
 	}
-	else if (!isSet(authentication_vvvvwbd))
+	else if (!isSet(authentication_vvvvwbe))
 	{
-		var authentication_vvvvwbd = [];
+		var authentication_vvvvwbe = [];
 	}
-	var authentication = authentication_vvvvwbd.some(authentication_vvvvwbd_SomeFunc);
+	var authentication = authentication_vvvvwbe.some(authentication_vvvvwbe_SomeFunc);


 	// set this function logic
@ -522,22 +522,22 @@ function vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd)
 	}
 }

-// the vvvvwbd Some function
-function protocol_vvvvwbd_SomeFunc(protocol_vvvvwbd)
+// the vvvvwbe Some function
+function protocol_vvvvwbe_SomeFunc(protocol_vvvvwbe)
 {
 	// set the function logic
-	if (protocol_vvvvwbd == 2)
+	if (protocol_vvvvwbe == 2)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwbd Some function
-function authentication_vvvvwbd_SomeFunc(authentication_vvvvwbd)
+// the vvvvwbe Some function
+function authentication_vvvvwbe_SomeFunc(authentication_vvvvwbe)
 {
 	// set the function logic
-	if (authentication_vvvvwbd == 2 || authentication_vvvvwbd == 3 || authentication_vvvvwbd == 4 || authentication_vvvvwbd == 5)
+	if (authentication_vvvvwbe == 2 || authentication_vvvvwbe == 3 || authentication_vvvvwbe == 4 || authentication_vvvvwbe == 5)
 	{
 		return true;
 	}
--- a/admin/models/forms/site_view.js
+++ b/admin/models/forms/site_view.js
@ -23,7 +23,6 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvynvyh_required = false;
 jform_vvvvvyovyi_required = false;
 jform_vvvvvypvyj_required = false;
 jform_vvvvvyqvyk_required = false;
@ -33,308 +32,309 @@ jform_vvvvvytvyn_required = false;
 jform_vvvvvyuvyo_required = false;
 jform_vvvvvyvvyp_required = false;
 jform_vvvvvywvyq_required = false;
-jform_vvvvvywvyr_required = false;
+jform_vvvvvyxvyr_required = false;
+jform_vvvvvyxvys_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyn = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyn(add_php_view_vvvvvyn);
+	var add_php_view_vvvvvyo = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyo(add_php_view_vvvvvyo);

-	var add_php_jview_display_vvvvvyo = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyo(add_php_jview_display_vvvvvyo);
+	var add_php_jview_display_vvvvvyp = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyp(add_php_jview_display_vvvvvyp);

-	var add_php_jview_vvvvvyp = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyp(add_php_jview_vvvvvyp);
+	var add_php_jview_vvvvvyq = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyq(add_php_jview_vvvvvyq);

-	var add_php_document_vvvvvyq = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyq(add_php_document_vvvvvyq);
+	var add_php_document_vvvvvyr = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyr(add_php_document_vvvvvyr);

-	var add_css_document_vvvvvyr = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyr(add_css_document_vvvvvyr);
+	var add_css_document_vvvvvys = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvys(add_css_document_vvvvvys);

-	var add_javascript_file_vvvvvys = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvys(add_javascript_file_vvvvvys);
+	var add_javascript_file_vvvvvyt = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyt(add_javascript_file_vvvvvyt);

-	var add_js_document_vvvvvyt = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyt(add_js_document_vvvvvyt);
+	var add_js_document_vvvvvyu = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyu(add_js_document_vvvvvyu);

-	var add_css_vvvvvyu = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyu(add_css_vvvvvyu);
+	var add_css_vvvvvyv = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyv(add_css_vvvvvyv);

-	var add_php_ajax_vvvvvyv = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyv(add_php_ajax_vvvvvyv);
+	var add_php_ajax_vvvvvyw = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyw(add_php_ajax_vvvvvyw);

-	var add_custom_button_vvvvvyw = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyw(add_custom_button_vvvvvyw);
+	var add_custom_button_vvvvvyx = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyx(add_custom_button_vvvvvyx);

-	var button_position_vvvvvyx = jQuery("#jform_button_position").val();
-	vvvvvyx(button_position_vvvvvyx);
+	var button_position_vvvvvyy = jQuery("#jform_button_position").val();
+	vvvvvyy(button_position_vvvvvyy);
 });

-// the vvvvvyn function
-function vvvvvyn(add_php_view_vvvvvyn)
+// the vvvvvyo function
+function vvvvvyo(add_php_view_vvvvvyo)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyn == 1)
+	if (add_php_view_vvvvvyo == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvynvyh_required)
+		if (jform_vvvvvyovyi_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvynvyh_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvynvyh_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvynvyh_required = true;
-		}
-	}
-}
-
-// the vvvvvyo function
-function vvvvvyo(add_php_jview_display_vvvvvyo)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyo == 1)
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvyovyi_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyovyi_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_jview_display').closest('.control-group').hide();
+		jQuery('#jform_php_view').closest('.control-group').hide();
 		if (!jform_vvvvvyovyi_required)
 		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
+			updateFieldRequired('php_view',1);
+			jQuery('#jform_php_view').removeAttr('required');
+			jQuery('#jform_php_view').removeAttr('aria-required');
+			jQuery('#jform_php_view').removeClass('required');
 			jform_vvvvvyovyi_required = true;
 		}
 	}
 }

 // the vvvvvyp function
-function vvvvvyp(add_php_jview_vvvvvyp)
+function vvvvvyp(add_php_jview_display_vvvvvyp)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyp == 1)
+	if (add_php_jview_display_vvvvvyp == 1)
 	{
-		jQuery('#jform_php_jview').closest('.control-group').show();
+		jQuery('#jform_php_jview_display').closest('.control-group').show();
 		if (jform_vvvvvypvyj_required)
 		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvypvyj_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_jview').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display').closest('.control-group').hide();
 		if (!jform_vvvvvypvyj_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvypvyj_required = true;
 		}
 	}
 }

 // the vvvvvyq function
-function vvvvvyq(add_php_document_vvvvvyq)
+function vvvvvyq(add_php_jview_vvvvvyq)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyq == 1)
+	if (add_php_jview_vvvvvyq == 1)
 	{
-		jQuery('#jform_php_document').closest('.control-group').show();
+		jQuery('#jform_php_jview').closest('.control-group').show();
 		if (jform_vvvvvyqvyk_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvyqvyk_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_document').closest('.control-group').hide();
+		jQuery('#jform_php_jview').closest('.control-group').hide();
 		if (!jform_vvvvvyqvyk_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvyqvyk_required = true;
 		}
 	}
 }

 // the vvvvvyr function
-function vvvvvyr(add_css_document_vvvvvyr)
+function vvvvvyr(add_php_document_vvvvvyr)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyr == 1)
+	if (add_php_document_vvvvvyr == 1)
 	{
-		jQuery('#jform_css_document').closest('.control-group').show();
+		jQuery('#jform_php_document').closest('.control-group').show();
 		if (jform_vvvvvyrvyl_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvyrvyl_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css_document').closest('.control-group').hide();
+		jQuery('#jform_php_document').closest('.control-group').hide();
 		if (!jform_vvvvvyrvyl_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvyrvyl_required = true;
 		}
 	}
 }

 // the vvvvvys function
-function vvvvvys(add_javascript_file_vvvvvys)
+function vvvvvys(add_css_document_vvvvvys)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvys == 1)
+	if (add_css_document_vvvvvys == 1)
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').show();
+		jQuery('#jform_css_document').closest('.control-group').show();
 		if (jform_vvvvvysvym_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvysvym_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').hide();
+		jQuery('#jform_css_document').closest('.control-group').hide();
 		if (!jform_vvvvvysvym_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvysvym_required = true;
 		}
 	}
 }

 // the vvvvvyt function
-function vvvvvyt(add_js_document_vvvvvyt)
+function vvvvvyt(add_javascript_file_vvvvvyt)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyt == 1)
+	if (add_javascript_file_vvvvvyt == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_javascript_file').closest('.control-group').show();
 		if (jform_vvvvvytvyn_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvytvyn_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_javascript_file').closest('.control-group').hide();
 		if (!jform_vvvvvytvyn_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvytvyn_required = true;
 		}
 	}
 }

 // the vvvvvyu function
-function vvvvvyu(add_css_vvvvvyu)
+function vvvvvyu(add_js_document_vvvvvyu)
 {
 	// set the function logic
-	if (add_css_vvvvvyu == 1)
+	if (add_js_document_vvvvvyu == 1)
 	{
-		jQuery('#jform_css').closest('.control-group').show();
+		jQuery('#jform_js_document').closest('.control-group').show();
 		if (jform_vvvvvyuvyo_required)
 		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
 			jform_vvvvvyuvyo_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css').closest('.control-group').hide();
+		jQuery('#jform_js_document').closest('.control-group').hide();
 		if (!jform_vvvvvyuvyo_required)
 		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
 			jform_vvvvvyuvyo_required = true;
 		}
 	}
 }

 // the vvvvvyv function
-function vvvvvyv(add_php_ajax_vvvvvyv)
+function vvvvvyv(add_css_vvvvvyv)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyv == 1)
+	if (add_css_vvvvvyv == 1)
+	{
+		jQuery('#jform_css').closest('.control-group').show();
+		if (jform_vvvvvyvvyp_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvyvvyp_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css').closest('.control-group').hide();
+		if (!jform_vvvvvyvvyp_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvyvvyp_required = true;
+		}
+	}
+}
+
+// the vvvvvyw function
+function vvvvvyw(add_php_ajax_vvvvvyw)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyw == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvyvvyp_required)
+		if (jform_vvvvvywvyq_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvyvvyp_required = false;
+			jform_vvvvvywvyq_required = false;
 		}

 	}
@ -342,42 +342,42 @@ function vvvvvyv(add_php_ajax_vvvvvyv)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvyvvyp_required)
+		if (!jform_vvvvvywvyq_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvyvvyp_required = true;
+			jform_vvvvvywvyq_required = true;
 		}
 	}
 }

-// the vvvvvyw function
-function vvvvvyw(add_custom_button_vvvvvyw)
+// the vvvvvyx function
+function vvvvvyx(add_custom_button_vvvvvyx)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyw == 1)
+	if (add_custom_button_vvvvvyx == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvywvyq_required)
+		if (jform_vvvvvyxvyr_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvywvyq_required = false;
+			jform_vvvvvyxvyr_required = false;
 		}

 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvywvyr_required)
+		if (jform_vvvvvyxvys_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvywvyr_required = false;
+			jform_vvvvvyxvys_required = false;
 		}

 	}
@ -385,40 +385,40 @@ function vvvvvyw(add_custom_button_vvvvvyw)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvywvyq_required)
+		if (!jform_vvvvvyxvyr_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvywvyq_required = true;
+			jform_vvvvvyxvyr_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvywvyr_required)
+		if (!jform_vvvvvyxvys_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvywvyr_required = true;
+			jform_vvvvvyxvys_required = true;
 		}
 	}
 }

-// the vvvvvyx function
-function vvvvvyx(button_position_vvvvvyx)
+// the vvvvvyy function
+function vvvvvyy(button_position_vvvvvyy)
 {
-	if (isSet(button_position_vvvvvyx) && button_position_vvvvvyx.constructor !== Array)
+	if (isSet(button_position_vvvvvyy) && button_position_vvvvvyy.constructor !== Array)
 	{
-		var temp_vvvvvyx = button_position_vvvvvyx;
-		var button_position_vvvvvyx = [];
-		button_position_vvvvvyx.push(temp_vvvvvyx);
+		var temp_vvvvvyy = button_position_vvvvvyy;
+		var button_position_vvvvvyy = [];
+		button_position_vvvvvyy.push(temp_vvvvvyy);
 	}
-	else if (!isSet(button_position_vvvvvyx))
+	else if (!isSet(button_position_vvvvvyy))
 	{
-		var button_position_vvvvvyx = [];
+		var button_position_vvvvvyy = [];
 	}
-	var button_position = button_position_vvvvvyx.some(button_position_vvvvvyx_SomeFunc);
+	var button_position = button_position_vvvvvyy.some(button_position_vvvvvyy_SomeFunc);


 	// set this function logic
@ -432,11 +432,11 @@ function vvvvvyx(button_position_vvvvvyx)
 	}
 }

-// the vvvvvyx Some function
-function button_position_vvvvvyx_SomeFunc(button_position_vvvvvyx)
+// the vvvvvyy Some function
+function button_position_vvvvvyy_SomeFunc(button_position_vvvvvyy)
 {
 	// set the function logic
-	if (button_position_vvvvvyx == 5)
+	if (button_position_vvvvvyy == 5)
 	{
 		return true;
 	}
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvyyvys_required = false;
+jform_vvvvvyzvyt_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyy = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyy(add_php_view_vvvvvyy);
+	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyz(add_php_view_vvvvvyz);
 });

-// the vvvvvyy function
-function vvvvvyy(add_php_view_vvvvvyy)
+// the vvvvvyz function
+function vvvvvyz(add_php_view_vvvvvyz)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyy == 1)
+	if (add_php_view_vvvvvyz == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyyvys_required)
+		if (jform_vvvvvyzvyt_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyyvys_required = false;
+			jform_vvvvvyzvyt_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyyvys_required)
+		if (!jform_vvvvvyzvyt_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyyvys_required = true;
+			jform_vvvvvyzvyt_required = true;
 		}
 	}
 }
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@ -100,34 +100,28 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}

-			if (!empty($item->php_postflight_update))
-			{
-				// base64 Decode php_postflight_update.
-				$item->php_postflight_update = base64_decode($item->php_postflight_update);
-			}
-
 			if (!empty($item->php_preflight_update))
 			{
 				// base64 Decode php_preflight_update.
 				$item->php_preflight_update = base64_decode($item->php_preflight_update);
 			}

-			if (!empty($item->javascript))
-			{
-				// base64 Decode javascript.
-				$item->javascript = base64_decode($item->javascript);
-			}
-
 			if (!empty($item->css_site))
 			{
 				// base64 Decode css_site.
 				$item->css_site = base64_decode($item->css_site);
 			}

-			if (!empty($item->sql))
+			if (!empty($item->php_helper_site))
 			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
+				// base64 Decode php_helper_site.
+				$item->php_helper_site = base64_decode($item->php_helper_site);
+			}
+
+			if (!empty($item->javascript))
+			{
+				// base64 Decode javascript.
+				$item->javascript = base64_decode($item->javascript);
 			}

 			if (!empty($item->php_helper_admin))
@ -136,10 +130,22 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->php_helper_admin = base64_decode($item->php_helper_admin);
 			}

-			if (!empty($item->php_helper_site))
+			if (!empty($item->readme))
 			{
-				// base64 Decode php_helper_site.
-				$item->php_helper_site = base64_decode($item->php_helper_site);
+				// base64 Decode readme.
+				$item->readme = base64_decode($item->readme);
+			}
+
+			if (!empty($item->php_postflight_update))
+			{
+				// base64 Decode php_postflight_update.
+				$item->php_postflight_update = base64_decode($item->php_postflight_update);
+			}
+
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
 			}

 			if (!empty($item->php_helper_both))
@ -184,10 +190,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
 			}

-			if (!empty($item->readme))
+			if (!empty($item->sql_uninstall))
 			{
-				// base64 Decode readme.
-				$item->readme = base64_decode($item->readme);
+				// base64 Decode sql_uninstall.
+				$item->sql_uninstall = base64_decode($item->sql_uninstall);
 			}

 			if (!empty($item->buildcompsql))
@ -1063,34 +1069,28 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['addcontributors'] = '';
 		}

-		// Set the php_postflight_update string to base64 string.
-		if (isset($data['php_postflight_update']))
-		{
-			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
-		}
-
 		// Set the php_preflight_update string to base64 string.
 		if (isset($data['php_preflight_update']))
 		{
 			$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
 		}

-		// Set the javascript string to base64 string.
-		if (isset($data['javascript']))
-		{
-			$data['javascript'] = base64_encode($data['javascript']);
-		}
-
 		// Set the css_site string to base64 string.
 		if (isset($data['css_site']))
 		{
 			$data['css_site'] = base64_encode($data['css_site']);
 		}

-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
+		// Set the php_helper_site string to base64 string.
+		if (isset($data['php_helper_site']))
 		{
-			$data['sql'] = base64_encode($data['sql']);
+			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
+		}
+
+		// Set the javascript string to base64 string.
+		if (isset($data['javascript']))
+		{
+			$data['javascript'] = base64_encode($data['javascript']);
 		}

 		// Set the php_helper_admin string to base64 string.
@ -1099,10 +1099,22 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
 		}

-		// Set the php_helper_site string to base64 string.
-		if (isset($data['php_helper_site']))
+		// Set the readme string to base64 string.
+		if (isset($data['readme']))
 		{
-			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
+			$data['readme'] = base64_encode($data['readme']);
+		}
+
+		// Set the php_postflight_update string to base64 string.
+		if (isset($data['php_postflight_update']))
+		{
+			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+		}
+
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
 		}

 		// Set the php_helper_both string to base64 string.
@ -1147,10 +1159,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
 		}

-		// Set the readme string to base64 string.
-		if (isset($data['readme']))
+		// Set the sql_uninstall string to base64 string.
+		if (isset($data['sql_uninstall']))
 		{
-			$data['readme'] = base64_encode($data['readme']);
+			$data['sql_uninstall'] = base64_encode($data['sql_uninstall']);
 		}

 		// Set the buildcompsql string to base64 string.
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@ -1921,20 +1921,22 @@ class ComponentbuilderModelJoomla_components extends JModelList
 							continue;
 						}

-						// decode php_postflight_update
-						$item->php_postflight_update = base64_decode($item->php_postflight_update);
 						// decode php_preflight_update
 						$item->php_preflight_update = base64_decode($item->php_preflight_update);
-						// decode javascript
-						$item->javascript = base64_decode($item->javascript);
 						// decode css_site
 						$item->css_site = base64_decode($item->css_site);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
-						// decode php_helper_admin
-						$item->php_helper_admin = base64_decode($item->php_helper_admin);
 						// decode php_helper_site
 						$item->php_helper_site = base64_decode($item->php_helper_site);
+						// decode javascript
+						$item->javascript = base64_decode($item->javascript);
+						// decode php_helper_admin
+						$item->php_helper_admin = base64_decode($item->php_helper_admin);
+						// decode readme
+						$item->readme = base64_decode($item->readme);
+						// decode php_postflight_update
+						$item->php_postflight_update = base64_decode($item->php_postflight_update);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
 						// decode php_helper_both
 						$item->php_helper_both = base64_decode($item->php_helper_both);
 						// decode php_admin_event
@ -1954,8 +1956,8 @@ class ComponentbuilderModelJoomla_components extends JModelList
 						$item->php_postflight_install = base64_decode($item->php_postflight_install);
 						// decode php_method_uninstall
 						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-						// decode readme
-						$item->readme = base64_decode($item->readme);
+						// decode sql_uninstall
+						$item->sql_uninstall = base64_decode($item->sql_uninstall);
 						if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
 						{
 							// decrypt export_key
--- a/admin/models/server.php
+++ b/admin/models/server.php
@ -170,7 +170,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getWamlinked_components()
+	public function getWanlinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
--- a/admin/sql/uninstall.mysql.utf8.sql
+++ b/admin/sql/uninstall.mysql.utf8.sql
@ -29,3 +29,4 @@ DROP TABLE IF EXISTS `#__componentbuilder_component_files_folders`;
 DROP TABLE IF EXISTS `#__componentbuilder_snippet_type`;
 DROP TABLE IF EXISTS `#__componentbuilder_library_config`;
 DROP TABLE IF EXISTS `#__componentbuilder_library_files_folders_urls`;
+DROP TABLE IF EXISTS `#__componentbuilder_external_code`;
--- a/admin/sql/updates/mysql/2.7.9.sql
+++ b/admin/sql/updates/mysql/2.7.9.sql
@ -0,0 +1,3 @@
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_sql_uninstall` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_sql`;
+
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `sql_uninstall` MEDIUMTEXT NOT NULL AFTER `sql`;
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@ -219,431 +219,416 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_add_css_view listeners for add_css_view_vvvvvwz function
+// #jform_add_css_view listeners for add_css_view_vvvvvxa function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvvwz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvvwz(add_css_view_vvvvvwz);
+	var add_css_view_vvvvvxa = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvvxa(add_css_view_vvvvvxa);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvvwz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvvwz(add_css_view_vvvvvwz);
+	var add_css_view_vvvvvxa = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvvxa(add_css_view_vvvvvxa);

 });

-// #jform_add_css_views listeners for add_css_views_vvvvvxa function
+// #jform_add_css_views listeners for add_css_views_vvvvvxb function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvvxa = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvvxa(add_css_views_vvvvvxa);
+	var add_css_views_vvvvvxb = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvvxb(add_css_views_vvvvvxb);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvvxa = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvvxa(add_css_views_vvvvvxa);
+	var add_css_views_vvvvvxb = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvvxb(add_css_views_vvvvvxb);

 });

-// #jform_add_javascript_view_file listeners for add_javascript_view_file_vvvvvxb function
+// #jform_add_javascript_view_file listeners for add_javascript_view_file_vvvvvxc function
 jQuery('#jform_add_javascript_view_file').on('keyup',function()
 {
-	var add_javascript_view_file_vvvvvxb = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
-	vvvvvxb(add_javascript_view_file_vvvvvxb);
+	var add_javascript_view_file_vvvvvxc = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+	vvvvvxc(add_javascript_view_file_vvvvvxc);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_file_vvvvvxb = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
-	vvvvvxb(add_javascript_view_file_vvvvvxb);
+	var add_javascript_view_file_vvvvvxc = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+	vvvvvxc(add_javascript_view_file_vvvvvxc);

 });

-// #jform_add_javascript_views_file listeners for add_javascript_views_file_vvvvvxc function
+// #jform_add_javascript_views_file listeners for add_javascript_views_file_vvvvvxd function
 jQuery('#jform_add_javascript_views_file').on('keyup',function()
 {
-	var add_javascript_views_file_vvvvvxc = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
-	vvvvvxc(add_javascript_views_file_vvvvvxc);
+	var add_javascript_views_file_vvvvvxd = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+	vvvvvxd(add_javascript_views_file_vvvvvxd);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_file_vvvvvxc = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
-	vvvvvxc(add_javascript_views_file_vvvvvxc);
+	var add_javascript_views_file_vvvvvxd = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+	vvvvvxd(add_javascript_views_file_vvvvvxd);

 });

-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvvxd function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvvxe function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvvxd = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvvxd(add_javascript_view_footer_vvvvvxd);
+	var add_javascript_view_footer_vvvvvxe = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvvxe(add_javascript_view_footer_vvvvvxe);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvvxd = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvvxd(add_javascript_view_footer_vvvvvxd);
+	var add_javascript_view_footer_vvvvvxe = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvvxe(add_javascript_view_footer_vvvvvxe);

 });

-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvvxe function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvvxf function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvvxe = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvvxe(add_javascript_views_footer_vvvvvxe);
+	var add_javascript_views_footer_vvvvvxf = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvvxf(add_javascript_views_footer_vvvvvxf);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvvxe = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvvxe(add_javascript_views_footer_vvvvvxe);
+	var add_javascript_views_footer_vvvvvxf = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvvxf(add_javascript_views_footer_vvvvvxf);

 });

-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvxf function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvxg function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvxf = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvxf(add_php_ajax_vvvvvxf);
+	var add_php_ajax_vvvvvxg = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvxg(add_php_ajax_vvvvvxg);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvxf = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvxf(add_php_ajax_vvvvvxf);
+	var add_php_ajax_vvvvvxg = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvxg(add_php_ajax_vvvvvxg);

 });

-// #jform_add_php_getitem listeners for add_php_getitem_vvvvvxg function
+// #jform_add_php_getitem listeners for add_php_getitem_vvvvvxh function
 jQuery('#jform_add_php_getitem').on('keyup',function()
 {
-	var add_php_getitem_vvvvvxg = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
-	vvvvvxg(add_php_getitem_vvvvvxg);
+	var add_php_getitem_vvvvvxh = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+	vvvvvxh(add_php_getitem_vvvvvxh);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_getitem_vvvvvxg = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
-	vvvvvxg(add_php_getitem_vvvvvxg);
+	var add_php_getitem_vvvvvxh = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+	vvvvvxh(add_php_getitem_vvvvvxh);

 });

-// #jform_add_php_getitems listeners for add_php_getitems_vvvvvxh function
+// #jform_add_php_getitems listeners for add_php_getitems_vvvvvxi function
 jQuery('#jform_add_php_getitems').on('keyup',function()
 {
-	var add_php_getitems_vvvvvxh = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
-	vvvvvxh(add_php_getitems_vvvvvxh);
+	var add_php_getitems_vvvvvxi = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+	vvvvvxi(add_php_getitems_vvvvvxi);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_getitems_vvvvvxh = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
-	vvvvvxh(add_php_getitems_vvvvvxh);
+	var add_php_getitems_vvvvvxi = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+	vvvvvxi(add_php_getitems_vvvvvxi);

 });

-// #jform_add_php_getitems_after_all listeners for add_php_getitems_after_all_vvvvvxi function
+// #jform_add_php_getitems_after_all listeners for add_php_getitems_after_all_vvvvvxj function
 jQuery('#jform_add_php_getitems_after_all').on('keyup',function()
 {
-	var add_php_getitems_after_all_vvvvvxi = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
-	vvvvvxi(add_php_getitems_after_all_vvvvvxi);
+	var add_php_getitems_after_all_vvvvvxj = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+	vvvvvxj(add_php_getitems_after_all_vvvvvxj);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitems_after_all',function (e)
 {
 	e.preventDefault();
-	var add_php_getitems_after_all_vvvvvxi = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
-	vvvvvxi(add_php_getitems_after_all_vvvvvxi);
+	var add_php_getitems_after_all_vvvvvxj = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+	vvvvvxj(add_php_getitems_after_all_vvvvvxj);

 });

-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvxj function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvxk function
 jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvxj = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	vvvvvxj(add_php_getlistquery_vvvvvxj);
+	var add_php_getlistquery_vvvvvxk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+	vvvvvxk(add_php_getlistquery_vvvvvxk);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvxj = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	vvvvvxj(add_php_getlistquery_vvvvvxj);
+	var add_php_getlistquery_vvvvvxk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+	vvvvvxk(add_php_getlistquery_vvvvvxk);

 });

-// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxk function
+// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxl function
 jQuery('#jform_add_php_before_save').on('keyup',function()
 {
-	var add_php_before_save_vvvvvxk = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvxk(add_php_before_save_vvvvvxk);
+	var add_php_before_save_vvvvvxl = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	vvvvvxl(add_php_before_save_vvvvvxl);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_save',function (e)
 {
 	e.preventDefault();
-	var add_php_before_save_vvvvvxk = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvxk(add_php_before_save_vvvvvxk);
+	var add_php_before_save_vvvvvxl = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	vvvvvxl(add_php_before_save_vvvvvxl);

 });

-// #jform_add_php_save listeners for add_php_save_vvvvvxl function
+// #jform_add_php_save listeners for add_php_save_vvvvvxm function
 jQuery('#jform_add_php_save').on('keyup',function()
 {
-	var add_php_save_vvvvvxl = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvxl(add_php_save_vvvvvxl);
+	var add_php_save_vvvvvxm = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	vvvvvxm(add_php_save_vvvvvxm);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_save',function (e)
 {
 	e.preventDefault();
-	var add_php_save_vvvvvxl = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvxl(add_php_save_vvvvvxl);
+	var add_php_save_vvvvvxm = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	vvvvvxm(add_php_save_vvvvvxm);

 });

-// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxm function
+// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxn function
 jQuery('#jform_add_php_postsavehook').on('keyup',function()
 {
-	var add_php_postsavehook_vvvvvxm = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvxm(add_php_postsavehook_vvvvvxm);
+	var add_php_postsavehook_vvvvvxn = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	vvvvvxn(add_php_postsavehook_vvvvvxn);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_postsavehook',function (e)
 {
 	e.preventDefault();
-	var add_php_postsavehook_vvvvvxm = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvxm(add_php_postsavehook_vvvvvxm);
+	var add_php_postsavehook_vvvvvxn = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	vvvvvxn(add_php_postsavehook_vvvvvxn);

 });

-// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxn function
+// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxo function
 jQuery('#jform_add_php_allowedit').on('keyup',function()
 {
-	var add_php_allowedit_vvvvvxn = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxn(add_php_allowedit_vvvvvxn);
+	var add_php_allowedit_vvvvvxo = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	vvvvvxo(add_php_allowedit_vvvvvxo);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_allowedit',function (e)
 {
 	e.preventDefault();
-	var add_php_allowedit_vvvvvxn = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxn(add_php_allowedit_vvvvvxn);
+	var add_php_allowedit_vvvvvxo = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	vvvvvxo(add_php_allowedit_vvvvvxo);

 });

-// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxo function
+// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxp function
 jQuery('#jform_add_php_batchcopy').on('keyup',function()
 {
-	var add_php_batchcopy_vvvvvxo = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxo(add_php_batchcopy_vvvvvxo);
+	var add_php_batchcopy_vvvvvxp = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxp(add_php_batchcopy_vvvvvxp);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e)
 {
 	e.preventDefault();
-	var add_php_batchcopy_vvvvvxo = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxo(add_php_batchcopy_vvvvvxo);
+	var add_php_batchcopy_vvvvvxp = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxp(add_php_batchcopy_vvvvvxp);

 });

-// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxp function
+// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxq function
 jQuery('#jform_add_php_batchmove').on('keyup',function()
 {
-	var add_php_batchmove_vvvvvxp = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxp(add_php_batchmove_vvvvvxp);
+	var add_php_batchmove_vvvvvxq = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxq(add_php_batchmove_vvvvvxq);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e)
 {
 	e.preventDefault();
-	var add_php_batchmove_vvvvvxp = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxp(add_php_batchmove_vvvvvxp);
+	var add_php_batchmove_vvvvvxq = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxq(add_php_batchmove_vvvvvxq);

 });

-// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxq function
+// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxr function
 jQuery('#jform_add_php_before_publish').on('keyup',function()
 {
-	var add_php_before_publish_vvvvvxq = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxq(add_php_before_publish_vvvvvxq);
+	var add_php_before_publish_vvvvvxr = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxr(add_php_before_publish_vvvvvxr);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_before_publish_vvvvvxq = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxq(add_php_before_publish_vvvvvxq);
+	var add_php_before_publish_vvvvvxr = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxr(add_php_before_publish_vvvvvxr);

 });

-// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxr function
+// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxs function
 jQuery('#jform_add_php_after_publish').on('keyup',function()
 {
-	var add_php_after_publish_vvvvvxr = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxr(add_php_after_publish_vvvvvxr);
+	var add_php_after_publish_vvvvvxs = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxs(add_php_after_publish_vvvvvxs);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_after_publish_vvvvvxr = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxr(add_php_after_publish_vvvvvxr);
+	var add_php_after_publish_vvvvvxs = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxs(add_php_after_publish_vvvvvxs);

 });

-// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxs function
+// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxt function
 jQuery('#jform_add_php_before_delete').on('keyup',function()
 {
-	var add_php_before_delete_vvvvvxs = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxs(add_php_before_delete_vvvvvxs);
+	var add_php_before_delete_vvvvvxt = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxt(add_php_before_delete_vvvvvxt);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_before_delete_vvvvvxs = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxs(add_php_before_delete_vvvvvxs);
+	var add_php_before_delete_vvvvvxt = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxt(add_php_before_delete_vvvvvxt);

 });

-// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxt function
+// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxu function
 jQuery('#jform_add_php_after_delete').on('keyup',function()
 {
-	var add_php_after_delete_vvvvvxt = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxt(add_php_after_delete_vvvvvxt);
+	var add_php_after_delete_vvvvvxu = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxu(add_php_after_delete_vvvvvxu);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_after_delete_vvvvvxt = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxt(add_php_after_delete_vvvvvxt);
+	var add_php_after_delete_vvvvvxu = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxu(add_php_after_delete_vvvvvxu);

 });

-// #jform_add_php_document listeners for add_php_document_vvvvvxu function
+// #jform_add_php_document listeners for add_php_document_vvvvvxv function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvxu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxu(add_php_document_vvvvvxu);
+	var add_php_document_vvvvvxv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxv(add_php_document_vvvvvxv);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvxu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxu(add_php_document_vvvvvxu);
-
-});
-
-// #jform_add_sql listeners for add_sql_vvvvvxv function
-jQuery('#jform_add_sql').on('keyup',function()
-{
-	var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxv(add_sql_vvvvvxv);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxv(add_sql_vvvvvxv);
-
-});
-
-// #jform_source listeners for source_vvvvvxw function
-jQuery('#jform_source').on('keyup',function()
-{
-	var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw);
-
-});
-jQuery('#adminForm').on('change', '#jform_source',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw);
+	var add_php_document_vvvvvxv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxv(add_php_document_vvvvvxv);

 });

 // #jform_add_sql listeners for add_sql_vvvvvxw function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw);
+	vvvvvxw(add_sql_vvvvvxw);

 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw);
+	vvvvvxw(add_sql_vvvvvxw);

 });

-// #jform_source listeners for source_vvvvvxy function
+// #jform_source listeners for source_vvvvvxx function
 jQuery('#jform_source').on('keyup',function()
 {
-	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+	var source_vvvvvxx = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx);

 });
 jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+	var source_vvvvvxx = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx);

 });

-// #jform_add_sql listeners for add_sql_vvvvvxy function
+// #jform_add_sql listeners for add_sql_vvvvvxx function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+	var source_vvvvvxx = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx);

 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+	var source_vvvvvxx = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx);

 });

-// #jform_add_custom_import listeners for add_custom_import_vvvvvya function
-jQuery('#jform_add_custom_import').on('keyup',function()
+// #jform_source listeners for source_vvvvvxz function
+jQuery('#jform_source').on('keyup',function()
 {
-	var add_custom_import_vvvvvya = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvya(add_custom_import_vvvvvya);
+	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);

 });
-jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvya = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvya(add_custom_import_vvvvvya);
+	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvxz function
+jQuery('#jform_add_sql').on('keyup',function()
+{
+	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);

 });

@ -662,18 +647,33 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)

 });

-// #jform_add_custom_button listeners for add_custom_button_vvvvvyc function
+// #jform_add_custom_import listeners for add_custom_import_vvvvvyc function
+jQuery('#jform_add_custom_import').on('keyup',function()
+{
+	var add_custom_import_vvvvvyc = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyc(add_custom_import_vvvvvyc);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+{
+	e.preventDefault();
+	var add_custom_import_vvvvvyc = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyc(add_custom_import_vvvvvyc);
+
+});
+
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyd function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyc(add_custom_button_vvvvvyc);
+	var add_custom_button_vvvvvyd = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyd(add_custom_button_vvvvvyd);

 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyc(add_custom_button_vvvvvyc);
+	var add_custom_button_vvvvvyd = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyd(add_custom_button_vvvvvyd);

 });

--- a/admin/views/custom_admin_view/tmpl/edit.php
+++ b/admin/views/custom_admin_view/tmpl/edit.php
@ -173,153 +173,153 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_add_php_view listeners for add_php_view_vvvvvyd function
+// #jform_add_php_view listeners for add_php_view_vvvvvye function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyd(add_php_view_vvvvvyd);
+	var add_php_view_vvvvvye = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvye(add_php_view_vvvvvye);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyd(add_php_view_vvvvvyd);
+	var add_php_view_vvvvvye = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvye(add_php_view_vvvvvye);

 });

-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvye function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyf function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvye = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvye(add_php_jview_display_vvvvvye);
+	var add_php_jview_display_vvvvvyf = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyf(add_php_jview_display_vvvvvyf);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvye = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvye(add_php_jview_display_vvvvvye);
+	var add_php_jview_display_vvvvvyf = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyf(add_php_jview_display_vvvvvyf);

 });

-// #jform_add_php_jview listeners for add_php_jview_vvvvvyf function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyg function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyf = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyf(add_php_jview_vvvvvyf);
+	var add_php_jview_vvvvvyg = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyg(add_php_jview_vvvvvyg);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyf = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyf(add_php_jview_vvvvvyf);
+	var add_php_jview_vvvvvyg = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyg(add_php_jview_vvvvvyg);

 });

-// #jform_add_php_document listeners for add_php_document_vvvvvyg function
+// #jform_add_php_document listeners for add_php_document_vvvvvyh function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyg = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyg(add_php_document_vvvvvyg);
+	var add_php_document_vvvvvyh = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyh(add_php_document_vvvvvyh);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyg = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyg(add_php_document_vvvvvyg);
+	var add_php_document_vvvvvyh = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyh(add_php_document_vvvvvyh);

 });

-// #jform_add_css_document listeners for add_css_document_vvvvvyh function
+// #jform_add_css_document listeners for add_css_document_vvvvvyi function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyh = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyh(add_css_document_vvvvvyh);
+	var add_css_document_vvvvvyi = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyi(add_css_document_vvvvvyi);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyh = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyh(add_css_document_vvvvvyh);
+	var add_css_document_vvvvvyi = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyi(add_css_document_vvvvvyi);

 });

-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyi function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyj function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyi = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyi(add_javascript_file_vvvvvyi);
+	var add_javascript_file_vvvvvyj = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyj(add_javascript_file_vvvvvyj);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyi = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyi(add_javascript_file_vvvvvyi);
+	var add_javascript_file_vvvvvyj = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyj(add_javascript_file_vvvvvyj);

 });

-// #jform_add_js_document listeners for add_js_document_vvvvvyj function
+// #jform_add_js_document listeners for add_js_document_vvvvvyk function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyj = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyj(add_js_document_vvvvvyj);
+	var add_js_document_vvvvvyk = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyk(add_js_document_vvvvvyk);

 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyj = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyj(add_js_document_vvvvvyj);
+	var add_js_document_vvvvvyk = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyk(add_js_document_vvvvvyk);

 });

-// #jform_add_custom_button listeners for add_custom_button_vvvvvyk function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyl function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyk = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyk(add_custom_button_vvvvvyk);
+	var add_custom_button_vvvvvyl = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyl(add_custom_button_vvvvvyl);

 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyk = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyk(add_custom_button_vvvvvyk);
+	var add_custom_button_vvvvvyl = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyl(add_custom_button_vvvvvyl);

 });

-// #jform_add_css listeners for add_css_vvvvvyl function
+// #jform_add_css listeners for add_css_vvvvvym function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyl = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyl(add_css_vvvvvyl);
+	var add_css_vvvvvym = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvym(add_css_vvvvvym);

 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyl = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyl(add_css_vvvvvyl);
+	var add_css_vvvvvym = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvym(add_css_vvvvvym);

 });

-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvym function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyn function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvym = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvym(add_php_ajax_vvvvvym);
+	var add_php_ajax_vvvvvyn = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyn(add_php_ajax_vvvvvyn);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvym = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvym(add_php_ajax_vvvvvym);
+	var add_php_ajax_vvvvvyn = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyn(add_php_ajax_vvvvvyn);

 });

--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@ -127,21 +127,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_target listeners for target_vvvvvzz function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzz(target_vvvvvzz);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzz(target_vvvvvzz);
-
-});
-
 // #jform_target listeners for target_vvvvwaa function
 jQuery('#jform_target').on('keyup',function()
 {
@ -161,67 +146,82 @@ jQuery('#adminForm').on('change', '#jform_target',function (e)
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwab(target_vvvvwab,type_vvvvwab);
+	vvvvwab(target_vvvvwab);

 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwab(target_vvvvwab,type_vvvvwab);
-
-});
-
-// #jform_type listeners for type_vvvvwab function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwab(target_vvvvwab,type_vvvvwab);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwab(target_vvvvwab,type_vvvvwab);
-
-});
-
-// #jform_type listeners for type_vvvvwac function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwac(type_vvvvwac,target_vvvvwac);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwac(type_vvvvwac,target_vvvvwac);
+	vvvvwab(target_vvvvwab);

 });

 // #jform_target listeners for target_vvvvwac function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwac(type_vvvvwac,target_vvvvwac);
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwac(target_vvvvwac,type_vvvvwac);

 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwac(type_vvvvwac,target_vvvvwac);
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwac(target_vvvvwac,type_vvvvwac);
+
+});
+
+// #jform_type listeners for type_vvvvwac function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwac(target_vvvvwac,type_vvvvwac);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwac(target_vvvvwac,type_vvvvwac);
+
+});
+
+// #jform_type listeners for type_vvvvwad function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwad(type_vvvvwad,target_vvvvwad);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwad(type_vvvvwad,target_vvvvwad);
+
+});
+
+// #jform_target listeners for target_vvvvwad function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwad(type_vvvvwad,target_vvvvwad);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwad(type_vvvvwad,target_vvvvwad);

 });

--- a/admin/views/dynamic_get/tmpl/edit.php
+++ b/admin/views/dynamic_get/tmpl/edit.php
@ -167,33 +167,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_gettype listeners for gettype_vvvvvza function
+// #jform_gettype listeners for gettype_vvvvvzb function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
-	vvvvvza(gettype_vvvvvza);
+	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	vvvvvzb(gettype_vvvvvzb);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
-	vvvvvza(gettype_vvvvvza);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvzb function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvzb = jQuery("#jform_main_source").val();
-	vvvvvzb(main_source_vvvvvzb);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvzb = jQuery("#jform_main_source").val();
-	vvvvvzb(main_source_vvvvvzb);
+	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	vvvvvzb(gettype_vvvvvzb);

 });

@ -242,18 +227,18 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)

 });

-// #jform_addcalculation listeners for addcalculation_vvvvvzf function
-jQuery('#jform_addcalculation').on('keyup',function()
+// #jform_main_source listeners for main_source_vvvvvzf function
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzf(addcalculation_vvvvvzf);
+	var main_source_vvvvvzf = jQuery("#jform_main_source").val();
+	vvvvvzf(main_source_vvvvvzf);

 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzf(addcalculation_vvvvvzf);
+	var main_source_vvvvvzf = jQuery("#jform_main_source").val();
+	vvvvvzf(main_source_vvvvvzf);

 });

@ -261,33 +246,14 @@ jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
-	vvvvvzg(addcalculation_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzg(addcalculation_vvvvvzg);

 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
-	vvvvvzg(addcalculation_vvvvvzg,gettype_vvvvvzg);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzg function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
-	vvvvvzg(addcalculation_vvvvvzg,gettype_vvvvvzg);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
-	vvvvvzg(addcalculation_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzg(addcalculation_vvvvvzg);

 });

@ -325,18 +291,37 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)

 });

-// #jform_main_source listeners for main_source_vvvvvzk function
-jQuery('#jform_main_source').on('keyup',function()
+// #jform_addcalculation listeners for addcalculation_vvvvvzi function
+jQuery('#jform_addcalculation').on('keyup',function()
 {
-	var main_source_vvvvvzk = jQuery("#jform_main_source").val();
-	vvvvvzk(main_source_vvvvvzk);
+	var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
+	vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi);

 });
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzk = jQuery("#jform_main_source").val();
-	vvvvvzk(main_source_vvvvvzk);
+	var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
+	vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzi function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
+	vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
+	vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi);

 });

@ -355,203 +340,203 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)

 });

-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzm function
+// #jform_main_source listeners for main_source_vvvvvzm function
+jQuery('#jform_main_source').on('keyup',function()
+{
+	var main_source_vvvvvzm = jQuery("#jform_main_source").val();
+	vvvvvzm(main_source_vvvvvzm);
+
+});
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+{
+	e.preventDefault();
+	var main_source_vvvvvzm = jQuery("#jform_main_source").val();
+	vvvvvzm(main_source_vvvvvzm);
+
+});
+
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzn function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzm = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_before_getitem_vvvvvzm,gettype_vvvvvzm);
+	var add_php_before_getitem_vvvvvzn = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(add_php_before_getitem_vvvvvzn,gettype_vvvvvzn);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzm = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_before_getitem_vvvvvzm,gettype_vvvvvzm);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzm function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_before_getitem_vvvvvzm = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_before_getitem_vvvvvzm,gettype_vvvvvzm);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitem_vvvvvzm = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_before_getitem_vvvvvzm,gettype_vvvvvzm);
-
-});
-
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzn function
-jQuery('#jform_add_php_after_getitem').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzn = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzn = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_after_getitem_vvvvvzn,gettype_vvvvvzn);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzn = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_after_getitem_vvvvvzn,gettype_vvvvvzn);
+	vvvvvzn(add_php_before_getitem_vvvvvzn,gettype_vvvvvzn);

 });

 // #jform_gettype listeners for gettype_vvvvvzn function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzn = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzn = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_after_getitem_vvvvvzn,gettype_vvvvvzn);
+	vvvvvzn(add_php_before_getitem_vvvvvzn,gettype_vvvvvzn);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzn = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzn = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_after_getitem_vvvvvzn,gettype_vvvvvzn);
+	vvvvvzn(add_php_before_getitem_vvvvvzn,gettype_vvvvvzn);

 });

-// #jform_gettype listeners for gettype_vvvvvzp function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzo function
+jQuery('#jform_add_php_after_getitem').on('keyup',function()
+{
+	var add_php_after_getitem_vvvvvzo = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(add_php_after_getitem_vvvvvzo,gettype_vvvvvzo);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitem_vvvvvzo = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(add_php_after_getitem_vvvvvzo,gettype_vvvvvzo);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzo function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(gettype_vvvvvzp);
+	var add_php_after_getitem_vvvvvzo = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(add_php_after_getitem_vvvvvzo,gettype_vvvvvzo);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(gettype_vvvvvzp);
-
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzq function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzq = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(add_php_getlistquery_vvvvvzq,gettype_vvvvvzq);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzq = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(add_php_getlistquery_vvvvvzq,gettype_vvvvvzq);
+	var add_php_after_getitem_vvvvvzo = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(add_php_after_getitem_vvvvvzo,gettype_vvvvvzo);

 });

 // #jform_gettype listeners for gettype_vvvvvzq function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvzq = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(add_php_getlistquery_vvvvvzq,gettype_vvvvvzq);
+	vvvvvzq(gettype_vvvvvzq);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvzq = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(add_php_getlistquery_vvvvvzq,gettype_vvvvvzq);
+	vvvvvzq(gettype_vvvvvzq);

 });

-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzr function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzr function
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzr = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzr = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_before_getitems_vvvvvzr,gettype_vvvvvzr);
+	vvvvvzr(add_php_getlistquery_vvvvvzr,gettype_vvvvvzr);

 });
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzr = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzr = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_before_getitems_vvvvvzr,gettype_vvvvvzr);
+	vvvvvzr(add_php_getlistquery_vvvvvzr,gettype_vvvvvzr);

 });

 // #jform_gettype listeners for gettype_vvvvvzr function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzr = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzr = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_before_getitems_vvvvvzr,gettype_vvvvvzr);
+	vvvvvzr(add_php_getlistquery_vvvvvzr,gettype_vvvvvzr);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzr = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzr = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_before_getitems_vvvvvzr,gettype_vvvvvzr);
+	vvvvvzr(add_php_getlistquery_vvvvvzr,gettype_vvvvvzr);

 });

-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzs function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzs function
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzs = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzs = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_after_getitems_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_before_getitems_vvvvvzs,gettype_vvvvvzs);

 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzs = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzs = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_after_getitems_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_before_getitems_vvvvvzs,gettype_vvvvvzs);

 });

 // #jform_gettype listeners for gettype_vvvvvzs function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzs = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzs = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_after_getitems_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_before_getitems_vvvvvzs,gettype_vvvvvzs);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzs = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzs = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_after_getitems_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_before_getitems_vvvvvzs,gettype_vvvvvzs);

 });

-// #jform_gettype listeners for gettype_vvvvvzu function
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzt function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzt function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(gettype_vvvvvzu);
+	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(gettype_vvvvvzu);
+	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);

 });

@ -589,33 +574,48 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_gettype').on('keyup',function()
 {
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzx = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzx(gettype_vvvvvzx,add_php_router_parse_vvvvvzx);
+	vvvvvzx(gettype_vvvvvzx);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzx = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzx(gettype_vvvvvzx,add_php_router_parse_vvvvvzx);
+	vvvvvzx(gettype_vvvvvzx);

 });

-// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzx function
+// #jform_gettype listeners for gettype_vvvvvzy function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzy = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzy(gettype_vvvvvzy,add_php_router_parse_vvvvvzy);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzy = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzy(gettype_vvvvvzy,add_php_router_parse_vvvvvzy);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzy function
 jQuery('#jform_add_php_router_parse').on('keyup',function()
 {
-	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzx = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzx(gettype_vvvvvzx,add_php_router_parse_vvvvvzx);
+	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzy = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzy(gettype_vvvvvzy,add_php_router_parse_vvvvvzy);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_router_parse',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzx = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzx(gettype_vvvvvzx,add_php_router_parse_vvvvvzx);
+	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzy = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzy(gettype_vvvvvzy,add_php_router_parse_vvvvvzy);

 });

--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@ -158,48 +158,33 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_datalenght listeners for datalenght_vvvvwal function
+// #jform_datalenght listeners for datalenght_vvvvwam function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwal = jQuery("#jform_datalenght").val();
-	vvvvwal(datalenght_vvvvwal);
+	var datalenght_vvvvwam = jQuery("#jform_datalenght").val();
+	vvvvwam(datalenght_vvvvwam);

 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwal = jQuery("#jform_datalenght").val();
-	vvvvwal(datalenght_vvvvwal);
+	var datalenght_vvvvwam = jQuery("#jform_datalenght").val();
+	vvvvwam(datalenght_vvvvwam);

 });

-// #jform_datadefault listeners for datadefault_vvvvwam function
+// #jform_datadefault listeners for datadefault_vvvvwan function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwam = jQuery("#jform_datadefault").val();
-	vvvvwam(datadefault_vvvvwam);
+	var datadefault_vvvvwan = jQuery("#jform_datadefault").val();
+	vvvvwan(datadefault_vvvvwan);

 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwam = jQuery("#jform_datadefault").val();
-	vvvvwam(datadefault_vvvvwam);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwan function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwan(datatype_vvvvwan);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwan(datatype_vvvvwan);
+	var datadefault_vvvvwan = jQuery("#jform_datadefault").val();
+	vvvvwan(datadefault_vvvvwan);

 });

@ -218,97 +203,112 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)

 });

-// #jform_store listeners for store_vvvvwap function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwap = jQuery("#jform_store").val();
-	var datatype_vvvvwap = jQuery("#jform_datatype").val();
-	vvvvwap(store_vvvvwap,datatype_vvvvwap);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwap = jQuery("#jform_store").val();
-	var datatype_vvvvwap = jQuery("#jform_datatype").val();
-	vvvvwap(store_vvvvwap,datatype_vvvvwap);
-
-});
-
 // #jform_datatype listeners for datatype_vvvvwap function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwap = jQuery("#jform_store").val();
 	var datatype_vvvvwap = jQuery("#jform_datatype").val();
-	vvvvwap(store_vvvvwap,datatype_vvvvwap);
+	vvvvwap(datatype_vvvvwap);

 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwap = jQuery("#jform_store").val();
 	var datatype_vvvvwap = jQuery("#jform_datatype").val();
-	vvvvwap(store_vvvvwap,datatype_vvvvwap);
+	vvvvwap(datatype_vvvvwap);

 });

-// #jform_add_css_view listeners for add_css_view_vvvvwar function
+// #jform_store listeners for store_vvvvwaq function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwaq = jQuery("#jform_store").val();
+	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
+	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwaq = jQuery("#jform_store").val();
+	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
+	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwaq function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwaq = jQuery("#jform_store").val();
+	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
+	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwaq = jQuery("#jform_store").val();
+	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
+	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwas function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwar = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwar(add_css_view_vvvvwar);
+	var add_css_view_vvvvwas = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwas(add_css_view_vvvvwas);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwar = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwar(add_css_view_vvvvwar);
+	var add_css_view_vvvvwas = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwas(add_css_view_vvvvwas);

 });

-// #jform_add_css_views listeners for add_css_views_vvvvwas function
+// #jform_add_css_views listeners for add_css_views_vvvvwat function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwas = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwas(add_css_views_vvvvwas);
+	var add_css_views_vvvvwat = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwat(add_css_views_vvvvwat);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwas = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwas(add_css_views_vvvvwas);
+	var add_css_views_vvvvwat = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwat(add_css_views_vvvvwat);

 });

-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwat function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwau function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwat = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwat(add_javascript_view_footer_vvvvwat);
+	var add_javascript_view_footer_vvvvwau = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwau(add_javascript_view_footer_vvvvwau);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwat = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwat(add_javascript_view_footer_vvvvwat);
+	var add_javascript_view_footer_vvvvwau = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwau(add_javascript_view_footer_vvvvwau);

 });

-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwau function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwav function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwau = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwau(add_javascript_views_footer_vvvvwau);
+	var add_javascript_views_footer_vvvvwav = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwav(add_javascript_views_footer_vvvvwav);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwau = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwau(add_javascript_views_footer_vvvvwau);
+	var add_javascript_views_footer_vvvvwav = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwav(add_javascript_views_footer_vvvvwav);

 });

--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@ -64,7 +64,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}

 		// Get Linked view data
-		$this->wacfields = $this->get('Wacfields');
+		$this->wadfields = $this->get('Wadfields');

 		// Set the toolbar
 		$this->addToolBar();
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@ -127,21 +127,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_location listeners for location_vvvvwbf function
-jQuery('#jform_location').on('keyup',function()
-{
-	var location_vvvvwbf = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbf(location_vvvvwbf);
-
-});
-jQuery('#adminForm').on('change', '#jform_location',function (e)
-{
-	e.preventDefault();
-	var location_vvvvwbf = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbf(location_vvvvwbf);
-
-});
-
 // #jform_location listeners for location_vvvvwbg function
 jQuery('#jform_location').on('keyup',function()
 {
@ -157,18 +142,18 @@ jQuery('#adminForm').on('change', '#jform_location',function (e)

 });

-// #jform_type listeners for type_vvvvwbh function
-jQuery('#jform_type').on('keyup',function()
+// #jform_location listeners for location_vvvvwbh function
+jQuery('#jform_location').on('keyup',function()
 {
-	var type_vvvvwbh = jQuery("#jform_type").val();
-	vvvvwbh(type_vvvvwbh);
+	var location_vvvvwbh = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbh(location_vvvvwbh);

 });
-jQuery('#adminForm').on('change', '#jform_type',function (e)
+jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwbh = jQuery("#jform_type").val();
-	vvvvwbh(type_vvvvwbh);
+	var location_vvvvwbh = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbh(location_vvvvwbh);

 });

@ -202,18 +187,33 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)

 });

-// #jform_target listeners for target_vvvvwbk function
+// #jform_type listeners for type_vvvvwbk function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwbk = jQuery("#jform_type").val();
+	vvvvwbk(type_vvvvwbk);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwbk = jQuery("#jform_type").val();
+	vvvvwbk(type_vvvvwbk);
+
+});
+
+// #jform_target listeners for target_vvvvwbl function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwbk = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbk(target_vvvvwbk);
+	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbl(target_vvvvwbl);

 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwbk = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbk(target_vvvvwbk);
+	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbl(target_vvvvwbl);

 });

--- a/admin/views/joomla_component/tmpl/edit.php
+++ b/admin/views/joomla_component/tmpl/edit.php
@ -340,379 +340,379 @@ jQuery('#adminForm').on('change', '#jform_add_sql',function (e)

 });

-// #jform_emptycontributors listeners for emptycontributors_vvvvvwc function
+// #jform_add_sql_uninstall listeners for add_sql_uninstall_vvvvvwc function
+jQuery('#jform_add_sql_uninstall').on('keyup',function()
+{
+	var add_sql_uninstall_vvvvvwc = jQuery("#jform_add_sql_uninstall input[type='radio']:checked").val();
+	vvvvvwc(add_sql_uninstall_vvvvvwc);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql_uninstall',function (e)
+{
+	e.preventDefault();
+	var add_sql_uninstall_vvvvvwc = jQuery("#jform_add_sql_uninstall input[type='radio']:checked").val();
+	vvvvvwc(add_sql_uninstall_vvvvvwc);
+
+});
+
+// #jform_emptycontributors listeners for emptycontributors_vvvvvwd function
 jQuery('#jform_emptycontributors').on('keyup',function()
 {
-	var emptycontributors_vvvvvwc = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
-	vvvvvwc(emptycontributors_vvvvvwc);
+	var emptycontributors_vvvvvwd = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
+	vvvvvwd(emptycontributors_vvvvvwd);

 });
 jQuery('#adminForm').on('change', '#jform_emptycontributors',function (e)
 {
 	e.preventDefault();
-	var emptycontributors_vvvvvwc = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
-	vvvvvwc(emptycontributors_vvvvvwc);
+	var emptycontributors_vvvvvwd = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
+	vvvvvwd(emptycontributors_vvvvvwd);

 });

-// #jform_add_license listeners for add_license_vvvvvwd function
+// #jform_add_license listeners for add_license_vvvvvwe function
 jQuery('#jform_add_license').on('keyup',function()
 {
-	var add_license_vvvvvwd = jQuery("#jform_add_license input[type='radio']:checked").val();
-	vvvvvwd(add_license_vvvvvwd);
+	var add_license_vvvvvwe = jQuery("#jform_add_license input[type='radio']:checked").val();
+	vvvvvwe(add_license_vvvvvwe);

 });
 jQuery('#adminForm').on('change', '#jform_add_license',function (e)
 {
 	e.preventDefault();
-	var add_license_vvvvvwd = jQuery("#jform_add_license input[type='radio']:checked").val();
-	vvvvvwd(add_license_vvvvvwd);
+	var add_license_vvvvvwe = jQuery("#jform_add_license input[type='radio']:checked").val();
+	vvvvvwe(add_license_vvvvvwe);

 });

-// #jform_add_admin_event listeners for add_admin_event_vvvvvwe function
+// #jform_add_admin_event listeners for add_admin_event_vvvvvwf function
 jQuery('#jform_add_admin_event').on('keyup',function()
 {
-	var add_admin_event_vvvvvwe = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
-	vvvvvwe(add_admin_event_vvvvvwe);
+	var add_admin_event_vvvvvwf = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
+	vvvvvwf(add_admin_event_vvvvvwf);

 });
 jQuery('#adminForm').on('change', '#jform_add_admin_event',function (e)
 {
 	e.preventDefault();
-	var add_admin_event_vvvvvwe = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
-	vvvvvwe(add_admin_event_vvvvvwe);
+	var add_admin_event_vvvvvwf = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
+	vvvvvwf(add_admin_event_vvvvvwf);

 });

-// #jform_add_site_event listeners for add_site_event_vvvvvwf function
+// #jform_add_site_event listeners for add_site_event_vvvvvwg function
 jQuery('#jform_add_site_event').on('keyup',function()
 {
-	var add_site_event_vvvvvwf = jQuery("#jform_add_site_event input[type='radio']:checked").val();
-	vvvvvwf(add_site_event_vvvvvwf);
+	var add_site_event_vvvvvwg = jQuery("#jform_add_site_event input[type='radio']:checked").val();
+	vvvvvwg(add_site_event_vvvvvwg);

 });
 jQuery('#adminForm').on('change', '#jform_add_site_event',function (e)
 {
 	e.preventDefault();
-	var add_site_event_vvvvvwf = jQuery("#jform_add_site_event input[type='radio']:checked").val();
-	vvvvvwf(add_site_event_vvvvvwf);
+	var add_site_event_vvvvvwg = jQuery("#jform_add_site_event input[type='radio']:checked").val();
+	vvvvvwg(add_site_event_vvvvvwg);

 });

-// #jform_addreadme listeners for addreadme_vvvvvwg function
+// #jform_addreadme listeners for addreadme_vvvvvwh function
 jQuery('#jform_addreadme').on('keyup',function()
 {
-	var addreadme_vvvvvwg = jQuery("#jform_addreadme input[type='radio']:checked").val();
-	vvvvvwg(addreadme_vvvvvwg);
+	var addreadme_vvvvvwh = jQuery("#jform_addreadme input[type='radio']:checked").val();
+	vvvvvwh(addreadme_vvvvvwh);

 });
 jQuery('#adminForm').on('change', '#jform_addreadme',function (e)
 {
 	e.preventDefault();
-	var addreadme_vvvvvwg = jQuery("#jform_addreadme input[type='radio']:checked").val();
-	vvvvvwg(addreadme_vvvvvwg);
+	var addreadme_vvvvvwh = jQuery("#jform_addreadme input[type='radio']:checked").val();
+	vvvvvwh(addreadme_vvvvvwh);

 });

-// #jform_add_update_server listeners for add_update_server_vvvvvwh function
+// #jform_add_update_server listeners for add_update_server_vvvvvwi function
 jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var add_update_server_vvvvvwh = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwh(add_update_server_vvvvvwh);
+	var add_update_server_vvvvvwi = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwi(add_update_server_vvvvvwi);

 });
 jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var add_update_server_vvvvvwh = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwh(add_update_server_vvvvvwh);
+	var add_update_server_vvvvvwi = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwi(add_update_server_vvvvvwi);

 });

-// #jform_add_sales_server listeners for add_sales_server_vvvvvwi function
+// #jform_add_sales_server listeners for add_sales_server_vvvvvwj function
 jQuery('#jform_add_sales_server').on('keyup',function()
 {
-	var add_sales_server_vvvvvwi = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
-	vvvvvwi(add_sales_server_vvvvvwi);
+	var add_sales_server_vvvvvwj = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
+	vvvvvwj(add_sales_server_vvvvvwj);

 });
 jQuery('#adminForm').on('change', '#jform_add_sales_server',function (e)
 {
 	e.preventDefault();
-	var add_sales_server_vvvvvwi = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
-	vvvvvwi(add_sales_server_vvvvvwi);
+	var add_sales_server_vvvvvwj = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
+	vvvvvwj(add_sales_server_vvvvvwj);

 });

-// #jform_add_license listeners for add_license_vvvvvwj function
+// #jform_add_license listeners for add_license_vvvvvwk function
 jQuery('#jform_add_license').on('keyup',function()
 {
-	var add_license_vvvvvwj = jQuery("#jform_add_license input[type='radio']:checked").val();
-	vvvvvwj(add_license_vvvvvwj);
+	var add_license_vvvvvwk = jQuery("#jform_add_license input[type='radio']:checked").val();
+	vvvvvwk(add_license_vvvvvwk);

 });
 jQuery('#adminForm').on('change', '#jform_add_license',function (e)
 {
 	e.preventDefault();
-	var add_license_vvvvvwj = jQuery("#jform_add_license input[type='radio']:checked").val();
-	vvvvvwj(add_license_vvvvvwj);
+	var add_license_vvvvvwk = jQuery("#jform_add_license input[type='radio']:checked").val();
+	vvvvvwk(add_license_vvvvvwk);

 });

-// #jform_add_php_postflight_install listeners for add_php_postflight_install_vvvvvwk function
+// #jform_add_php_postflight_install listeners for add_php_postflight_install_vvvvvwl function
 jQuery('#jform_add_php_postflight_install').on('keyup',function()
 {
-	var add_php_postflight_install_vvvvvwk = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
-	vvvvvwk(add_php_postflight_install_vvvvvwk);
+	var add_php_postflight_install_vvvvvwl = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
+	vvvvvwl(add_php_postflight_install_vvvvvwl);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_postflight_install',function (e)
 {
 	e.preventDefault();
-	var add_php_postflight_install_vvvvvwk = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
-	vvvvvwk(add_php_postflight_install_vvvvvwk);
+	var add_php_postflight_install_vvvvvwl = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
+	vvvvvwl(add_php_postflight_install_vvvvvwl);

 });

-// #jform_add_php_postflight_update listeners for add_php_postflight_update_vvvvvwl function
+// #jform_add_php_postflight_update listeners for add_php_postflight_update_vvvvvwm function
 jQuery('#jform_add_php_postflight_update').on('keyup',function()
 {
-	var add_php_postflight_update_vvvvvwl = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
-	vvvvvwl(add_php_postflight_update_vvvvvwl);
+	var add_php_postflight_update_vvvvvwm = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
+	vvvvvwm(add_php_postflight_update_vvvvvwm);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_postflight_update',function (e)
 {
 	e.preventDefault();
-	var add_php_postflight_update_vvvvvwl = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
-	vvvvvwl(add_php_postflight_update_vvvvvwl);
+	var add_php_postflight_update_vvvvvwm = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
+	vvvvvwm(add_php_postflight_update_vvvvvwm);

 });

-// #jform_add_php_method_uninstall listeners for add_php_method_uninstall_vvvvvwm function
+// #jform_add_php_method_uninstall listeners for add_php_method_uninstall_vvvvvwn function
 jQuery('#jform_add_php_method_uninstall').on('keyup',function()
 {
-	var add_php_method_uninstall_vvvvvwm = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
-	vvvvvwm(add_php_method_uninstall_vvvvvwm);
+	var add_php_method_uninstall_vvvvvwn = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
+	vvvvvwn(add_php_method_uninstall_vvvvvwn);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_method_uninstall',function (e)
 {
 	e.preventDefault();
-	var add_php_method_uninstall_vvvvvwm = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
-	vvvvvwm(add_php_method_uninstall_vvvvvwm);
+	var add_php_method_uninstall_vvvvvwn = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
+	vvvvvwn(add_php_method_uninstall_vvvvvwn);

 });

-// #jform_add_php_preflight_install listeners for add_php_preflight_install_vvvvvwn function
+// #jform_add_php_preflight_install listeners for add_php_preflight_install_vvvvvwo function
 jQuery('#jform_add_php_preflight_install').on('keyup',function()
 {
-	var add_php_preflight_install_vvvvvwn = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
-	vvvvvwn(add_php_preflight_install_vvvvvwn);
+	var add_php_preflight_install_vvvvvwo = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
+	vvvvvwo(add_php_preflight_install_vvvvvwo);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_preflight_install',function (e)
 {
 	e.preventDefault();
-	var add_php_preflight_install_vvvvvwn = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
-	vvvvvwn(add_php_preflight_install_vvvvvwn);
+	var add_php_preflight_install_vvvvvwo = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
+	vvvvvwo(add_php_preflight_install_vvvvvwo);

 });

-// #jform_add_php_preflight_update listeners for add_php_preflight_update_vvvvvwo function
+// #jform_add_php_preflight_update listeners for add_php_preflight_update_vvvvvwp function
 jQuery('#jform_add_php_preflight_update').on('keyup',function()
 {
-	var add_php_preflight_update_vvvvvwo = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
-	vvvvvwo(add_php_preflight_update_vvvvvwo);
+	var add_php_preflight_update_vvvvvwp = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
+	vvvvvwp(add_php_preflight_update_vvvvvwp);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_preflight_update',function (e)
 {
 	e.preventDefault();
-	var add_php_preflight_update_vvvvvwo = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
-	vvvvvwo(add_php_preflight_update_vvvvvwo);
-
-});
-
-// #jform_update_server_target listeners for update_server_target_vvvvvwp function
-jQuery('#jform_update_server_target').on('keyup',function()
-{
-	var update_server_target_vvvvvwp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp);
-
-});
-jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
-{
-	e.preventDefault();
-	var update_server_target_vvvvvwp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp);
-
-});
-
-// #jform_add_update_server listeners for add_update_server_vvvvvwp function
-jQuery('#jform_add_update_server').on('keyup',function()
-{
-	var update_server_target_vvvvvwp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
-{
-	e.preventDefault();
-	var update_server_target_vvvvvwp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp);
-
-});
-
-// #jform_add_update_server listeners for add_update_server_vvvvvwq function
-jQuery('#jform_add_update_server').on('keyup',function()
-{
-	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
-{
-	e.preventDefault();
-	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq);
+	var add_php_preflight_update_vvvvvwp = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
+	vvvvvwp(add_php_preflight_update_vvvvvwp);

 });

 // #jform_update_server_target listeners for update_server_target_vvvvvwq function
 jQuery('#jform_update_server_target').on('keyup',function()
 {
-	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
 	var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq);
+	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq);

 });
 jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
 {
 	e.preventDefault();
-	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
 	var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq);
+	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq);

 });

-// #jform_update_server_target listeners for update_server_target_vvvvvwr function
-jQuery('#jform_update_server_target').on('keyup',function()
+// #jform_add_update_server listeners for add_update_server_vvvvvwq function
+jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr);
+	var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq);

 });
-jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
+jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr);
+	var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq);

 });

 // #jform_add_update_server listeners for add_update_server_vvvvvwr function
 jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
 	var add_update_server_vvvvvwr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr);
+	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	vvvvvwr(add_update_server_vvvvvwr,update_server_target_vvvvvwr);

 });
 jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
 	var add_update_server_vvvvvwr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr);
+	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	vvvvvwr(add_update_server_vvvvvwr,update_server_target_vvvvvwr);

 });

-// #jform_update_server_target listeners for update_server_target_vvvvvwt function
+// #jform_update_server_target listeners for update_server_target_vvvvvwr function
 jQuery('#jform_update_server_target').on('keyup',function()
 {
-	var update_server_target_vvvvvwt = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt);
+	var add_update_server_vvvvvwr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	vvvvvwr(add_update_server_vvvvvwr,update_server_target_vvvvvwr);

 });
 jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
 {
 	e.preventDefault();
-	var update_server_target_vvvvvwt = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt);
+	var add_update_server_vvvvvwr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	vvvvvwr(add_update_server_vvvvvwr,update_server_target_vvvvvwr);

 });

-// #jform_add_update_server listeners for add_update_server_vvvvvwt function
+// #jform_update_server_target listeners for update_server_target_vvvvvws function
+jQuery('#jform_update_server_target').on('keyup',function()
+{
+	var update_server_target_vvvvvws = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvws = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws);
+
+});
+jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
+{
+	e.preventDefault();
+	var update_server_target_vvvvvws = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvws = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws);
+
+});
+
+// #jform_add_update_server listeners for add_update_server_vvvvvws function
 jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var update_server_target_vvvvvwt = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt);
+	var update_server_target_vvvvvws = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvws = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws);

 });
 jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var update_server_target_vvvvvwt = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt);
+	var update_server_target_vvvvvws = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvws = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws);

 });

-// #jform_add_update_server listeners for add_update_server_vvvvvwv function
+// #jform_update_server_target listeners for update_server_target_vvvvvwu function
+jQuery('#jform_update_server_target').on('keyup',function()
+{
+	var update_server_target_vvvvvwu = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvwu = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwu(update_server_target_vvvvvwu,add_update_server_vvvvvwu);
+
+});
+jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
+{
+	e.preventDefault();
+	var update_server_target_vvvvvwu = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvwu = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwu(update_server_target_vvvvvwu,add_update_server_vvvvvwu);
+
+});
+
+// #jform_add_update_server listeners for add_update_server_vvvvvwu function
 jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var add_update_server_vvvvvwv = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwv(add_update_server_vvvvvwv);
+	var update_server_target_vvvvvwu = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvwu = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwu(update_server_target_vvvvvwu,add_update_server_vvvvvwu);

 });
 jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var add_update_server_vvvvvwv = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwv(add_update_server_vvvvvwv);
+	var update_server_target_vvvvvwu = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvwu = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwu(update_server_target_vvvvvwu,add_update_server_vvvvvwu);

 });

-// #jform_buildcomp listeners for buildcomp_vvvvvww function
+// #jform_add_update_server listeners for add_update_server_vvvvvww function
+jQuery('#jform_add_update_server').on('keyup',function()
+{
+	var add_update_server_vvvvvww = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvww(add_update_server_vvvvvww);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
+{
+	e.preventDefault();
+	var add_update_server_vvvvvww = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvww(add_update_server_vvvvvww);
+
+});
+
+// #jform_buildcomp listeners for buildcomp_vvvvvwx function
 jQuery('#jform_buildcomp').on('keyup',function()
 {
-	var buildcomp_vvvvvww = jQuery("#jform_buildcomp input[type='radio']:checked").val();
-	vvvvvww(buildcomp_vvvvvww);
+	var buildcomp_vvvvvwx = jQuery("#jform_buildcomp input[type='radio']:checked").val();
+	vvvvvwx(buildcomp_vvvvvwx);

 });
 jQuery('#adminForm').on('change', '#jform_buildcomp',function (e)
 {
 	e.preventDefault();
-	var buildcomp_vvvvvww = jQuery("#jform_buildcomp input[type='radio']:checked").val();
-	vvvvvww(buildcomp_vvvvvww);
-
-});
-
-// #jform_dashboard_type listeners for dashboard_type_vvvvvwx function
-jQuery('#jform_dashboard_type').on('keyup',function()
-{
-	var dashboard_type_vvvvvwx = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
-	vvvvvwx(dashboard_type_vvvvvwx);
-
-});
-jQuery('#adminForm').on('change', '#jform_dashboard_type',function (e)
-{
-	e.preventDefault();
-	var dashboard_type_vvvvvwx = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
-	vvvvvwx(dashboard_type_vvvvvwx);
+	var buildcomp_vvvvvwx = jQuery("#jform_buildcomp input[type='radio']:checked").val();
+	vvvvvwx(buildcomp_vvvvvwx);

 });

@ -731,6 +731,21 @@ jQuery('#adminForm').on('change', '#jform_dashboard_type',function (e)

 });

+// #jform_dashboard_type listeners for dashboard_type_vvvvvwz function
+jQuery('#jform_dashboard_type').on('keyup',function()
+{
+	var dashboard_type_vvvvvwz = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwz(dashboard_type_vvvvvwz);
+
+});
+jQuery('#adminForm').on('change', '#jform_dashboard_type',function (e)
+{
+	e.preventDefault();
+	var dashboard_type_vvvvvwz = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwz(dashboard_type_vvvvvwz);
+
+});
+



--- a/admin/views/layout/tmpl/edit.php
+++ b/admin/views/layout/tmpl/edit.php
@ -139,18 +139,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_add_php_view listeners for add_php_view_vvvvvyz function
+// #jform_add_php_view listeners for add_php_view_vvvvvza function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyz(add_php_view_vvvvvyz);
+	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvza(add_php_view_vvvvvza);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyz(add_php_view_vvvvvyz);
+	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvza(add_php_view_vvvvvza);

 });

--- a/admin/views/library/tmpl/edit.php
+++ b/admin/views/library/tmpl/edit.php
@ -157,21 +157,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_how listeners for how_vvvvwad function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwad = jQuery("#jform_how").val();
-	vvvvwad(how_vvvvwad);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwad = jQuery("#jform_how").val();
-	vvvvwad(how_vvvvwad);
-
-});
-
 // #jform_how listeners for how_vvvvwae function
 jQuery('#jform_how').on('keyup',function()
 {
@ -262,18 +247,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)

 });

-// #jform_type listeners for type_vvvvwak function
+// #jform_how listeners for how_vvvvwak function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwak = jQuery("#jform_how").val();
+	vvvvwak(how_vvvvwak);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwak = jQuery("#jform_how").val();
+	vvvvwak(how_vvvvwak);
+
+});
+
+// #jform_type listeners for type_vvvvwal function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwak(type_vvvvwak);
+	var type_vvvvwal = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwal(type_vvvvwal);

 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwak(type_vvvvwak);
+	var type_vvvvwal = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwal(type_vvvvwal);

 });

--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@ -136,21 +136,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_protocol listeners for protocol_vvvvwav function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwav = jQuery("#jform_protocol").val();
-	vvvvwav(protocol_vvvvwav);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwav = jQuery("#jform_protocol").val();
-	vvvvwav(protocol_vvvvwav);
-
-});
-
 // #jform_protocol listeners for protocol_vvvvwaw function
 jQuery('#jform_protocol').on('keyup',function()
 {
@ -170,135 +155,150 @@ jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvwax = jQuery("#jform_protocol").val();
-	var authentication_vvvvwax = jQuery("#jform_authentication").val();
-	vvvvwax(protocol_vvvvwax,authentication_vvvvwax);
+	vvvvwax(protocol_vvvvwax);

 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
 	var protocol_vvvvwax = jQuery("#jform_protocol").val();
-	var authentication_vvvvwax = jQuery("#jform_authentication").val();
-	vvvvwax(protocol_vvvvwax,authentication_vvvvwax);
+	vvvvwax(protocol_vvvvwax);

 });

-// #jform_authentication listeners for authentication_vvvvwax function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	var protocol_vvvvwax = jQuery("#jform_protocol").val();
-	var authentication_vvvvwax = jQuery("#jform_authentication").val();
-	vvvvwax(protocol_vvvvwax,authentication_vvvvwax);
-
-});
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwax = jQuery("#jform_protocol").val();
-	var authentication_vvvvwax = jQuery("#jform_authentication").val();
-	vvvvwax(protocol_vvvvwax,authentication_vvvvwax);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwaz function
+// #jform_protocol listeners for protocol_vvvvway function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
+	var protocol_vvvvway = jQuery("#jform_protocol").val();
+	var authentication_vvvvway = jQuery("#jform_authentication").val();
+	vvvvway(protocol_vvvvway,authentication_vvvvway);

 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
+	var protocol_vvvvway = jQuery("#jform_protocol").val();
+	var authentication_vvvvway = jQuery("#jform_authentication").val();
+	vvvvway(protocol_vvvvway,authentication_vvvvway);

 });

-// #jform_authentication listeners for authentication_vvvvwaz function
+// #jform_authentication listeners for authentication_vvvvway function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
+	var protocol_vvvvway = jQuery("#jform_protocol").val();
+	var authentication_vvvvway = jQuery("#jform_authentication").val();
+	vvvvway(protocol_vvvvway,authentication_vvvvway);

 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
+	var protocol_vvvvway = jQuery("#jform_protocol").val();
+	var authentication_vvvvway = jQuery("#jform_authentication").val();
+	vvvvway(protocol_vvvvway,authentication_vvvvway);

 });

-// #jform_protocol listeners for protocol_vvvvwbb function
+// #jform_protocol listeners for protocol_vvvvwba function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);

 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);

 });

-// #jform_authentication listeners for authentication_vvvvwbb function
+// #jform_authentication listeners for authentication_vvvvwba function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);

 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);

 });

-// #jform_protocol listeners for protocol_vvvvwbd function
+// #jform_protocol listeners for protocol_vvvvwbc function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);

 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);

 });

-// #jform_authentication listeners for authentication_vvvvwbd function
+// #jform_authentication listeners for authentication_vvvvwbc function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);

 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwbe function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwbe function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);

 });

--- a/admin/views/server/view.html.php
+++ b/admin/views/server/view.html.php
@ -64,7 +64,7 @@ class ComponentbuilderViewServer extends JViewLegacy
 		}

 		// Get Linked view data
-		$this->wamlinked_components = $this->get('Wamlinked_components');
+		$this->wanlinked_components = $this->get('Wanlinked_components');

 		// Set the toolbar
 		$this->addToolBar();
--- a/admin/views/site_view/tmpl/edit.php
+++ b/admin/views/site_view/tmpl/edit.php
@ -176,168 +176,168 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_add_php_view listeners for add_php_view_vvvvvyn function
+// #jform_add_php_view listeners for add_php_view_vvvvvyo function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyn = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyn(add_php_view_vvvvvyn);
+	var add_php_view_vvvvvyo = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyo(add_php_view_vvvvvyo);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyn = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyn(add_php_view_vvvvvyn);
+	var add_php_view_vvvvvyo = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyo(add_php_view_vvvvvyo);

 });

-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyo function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyp function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyo = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyo(add_php_jview_display_vvvvvyo);
+	var add_php_jview_display_vvvvvyp = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyp(add_php_jview_display_vvvvvyp);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyo = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyo(add_php_jview_display_vvvvvyo);
+	var add_php_jview_display_vvvvvyp = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyp(add_php_jview_display_vvvvvyp);

 });

-// #jform_add_php_jview listeners for add_php_jview_vvvvvyp function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyq function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyp = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyp(add_php_jview_vvvvvyp);
+	var add_php_jview_vvvvvyq = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyq(add_php_jview_vvvvvyq);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyp = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyp(add_php_jview_vvvvvyp);
+	var add_php_jview_vvvvvyq = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyq(add_php_jview_vvvvvyq);

 });

-// #jform_add_php_document listeners for add_php_document_vvvvvyq function
+// #jform_add_php_document listeners for add_php_document_vvvvvyr function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyq = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyq(add_php_document_vvvvvyq);
+	var add_php_document_vvvvvyr = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyr(add_php_document_vvvvvyr);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyq = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyq(add_php_document_vvvvvyq);
+	var add_php_document_vvvvvyr = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyr(add_php_document_vvvvvyr);

 });

-// #jform_add_css_document listeners for add_css_document_vvvvvyr function
+// #jform_add_css_document listeners for add_css_document_vvvvvys function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyr = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyr(add_css_document_vvvvvyr);
+	var add_css_document_vvvvvys = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvys(add_css_document_vvvvvys);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyr = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyr(add_css_document_vvvvvyr);
+	var add_css_document_vvvvvys = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvys(add_css_document_vvvvvys);

 });

-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvys function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyt function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvys = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvys(add_javascript_file_vvvvvys);
+	var add_javascript_file_vvvvvyt = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyt(add_javascript_file_vvvvvyt);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvys = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvys(add_javascript_file_vvvvvys);
+	var add_javascript_file_vvvvvyt = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyt(add_javascript_file_vvvvvyt);

 });

-// #jform_add_js_document listeners for add_js_document_vvvvvyt function
+// #jform_add_js_document listeners for add_js_document_vvvvvyu function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyt = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyt(add_js_document_vvvvvyt);
+	var add_js_document_vvvvvyu = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyu(add_js_document_vvvvvyu);

 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyt = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyt(add_js_document_vvvvvyt);
+	var add_js_document_vvvvvyu = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyu(add_js_document_vvvvvyu);

 });

-// #jform_add_css listeners for add_css_vvvvvyu function
+// #jform_add_css listeners for add_css_vvvvvyv function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyu = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyu(add_css_vvvvvyu);
+	var add_css_vvvvvyv = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyv(add_css_vvvvvyv);

 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyu = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyu(add_css_vvvvvyu);
+	var add_css_vvvvvyv = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyv(add_css_vvvvvyv);

 });

-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyv function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyw function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyv = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyv(add_php_ajax_vvvvvyv);
+	var add_php_ajax_vvvvvyw = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyw(add_php_ajax_vvvvvyw);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyv = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyv(add_php_ajax_vvvvvyv);
+	var add_php_ajax_vvvvvyw = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyw(add_php_ajax_vvvvvyw);

 });

-// #jform_add_custom_button listeners for add_custom_button_vvvvvyw function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyx function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyw = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyw(add_custom_button_vvvvvyw);
+	var add_custom_button_vvvvvyx = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyx(add_custom_button_vvvvvyx);

 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyw = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyw(add_custom_button_vvvvvyw);
+	var add_custom_button_vvvvvyx = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyx(add_custom_button_vvvvvyx);

 });

-// #jform_button_position listeners for button_position_vvvvvyx function
+// #jform_button_position listeners for button_position_vvvvvyy function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvvyx = jQuery("#jform_button_position").val();
-	vvvvvyx(button_position_vvvvvyx);
+	var button_position_vvvvvyy = jQuery("#jform_button_position").val();
+	vvvvvyy(button_position_vvvvvyy);

 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvvyx = jQuery("#jform_button_position").val();
-	vvvvvyx(button_position_vvvvvyx);
+	var button_position_vvvvvyy = jQuery("#jform_button_position").val();
+	vvvvvyy(button_position_vvvvvyy);

 });

--- a/admin/views/template/tmpl/edit.php
+++ b/admin/views/template/tmpl/edit.php
@ -139,18 +139,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_add_php_view listeners for add_php_view_vvvvvyy function
+// #jform_add_php_view listeners for add_php_view_vvvvvyz function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyy = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyy(add_php_view_vvvvvyy);
+	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyz(add_php_view_vvvvvyz);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyy = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyy(add_php_view_vvvvvyy);
+	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyz(add_php_view_vvvvvyz);

 });

--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>5th May, 2018</creationDate>
+	<creationDate>11th May, 2018</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>2.7.9</version>
+	<version>2.7.10</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.7.9)</h1>
+		<h1>Component Builder (v.2.7.10)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.

--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@ -373,4 +373,21 @@
 		<maintainerurl>http://joomlacomponentbuilder.com</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.7.10</version>
+		<infourl title="Component Builder!">http://joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.7.10/JCB_v2.7.10.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>
--- a/script.php
+++ b/script.php
@ -3296,9 +3296,9 @@ class com_componentbuilderInstallerScript
 			$joomla_component->type_title = 'Componentbuilder Joomla_component';
 			$joomla_component->type_alias = 'com_componentbuilder.joomla_component';
 			$joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_postflight_update":"php_postflight_update","php_preflight_update":"php_preflight_update","javascript":"javascript","css_site":"css_site","debug_linenr":"debug_linenr","add_email_helper":"add_email_helper","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","sql":"sql","php_helper_admin":"php_helper_admin","add_update_server":"add_update_server","php_helper_site":"php_helper_site","sales_server":"sales_server","adduikit":"adduikit","email":"email","php_helper_both":"php_helper_both","website":"website","php_admin_event":"php_admin_event","add_license":"add_license","php_site_event":"php_site_event","license_type":"license_type","css_admin":"css_admin","whmcs_key":"whmcs_key","php_preflight_install":"php_preflight_install","whmcs_url":"whmcs_url","php_postflight_install":"php_postflight_install","license":"license","php_method_uninstall":"php_method_uninstall","bom":"bom","readme":"readme","image":"image","update_server_target":"update_server_target","not_required":"not_required","update_server":"update_server","buildcomp":"buildcomp","creatuserhelper":"creatuserhelper","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_css_admin":"add_css_admin","toignore":"toignore","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","export_key":"export_key","add_php_preflight_install":"add_php_preflight_install","joomla_source_link":"joomla_source_link","add_php_preflight_update":"add_php_preflight_update","export_buy_link":"export_buy_link","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","emptycontributors":"emptycontributors","addreadme":"addreadme","number":"number","update_server_url":"update_server_url","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql","name":"name"}}';
+			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_update":"php_preflight_update","css_site":"css_site","php_helper_site":"php_helper_site","javascript":"javascript","php_helper_admin":"php_helper_admin","readme":"readme","buildcomp":"buildcomp","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_postflight_update":"php_postflight_update","add_email_helper":"add_email_helper","sql":"sql","debug_linenr":"debug_linenr","email":"email","adduikit":"adduikit","website":"website","php_helper_both":"php_helper_both","add_license":"add_license","php_admin_event":"php_admin_event","license_type":"license_type","php_site_event":"php_site_event","css_admin":"css_admin","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_install":"php_preflight_install","license":"license","php_postflight_install":"php_postflight_install","bom":"bom","php_method_uninstall":"php_method_uninstall","image":"image","sql_uninstall":"sql_uninstall","update_server_target":"update_server_target","add_update_server":"add_update_server","update_server":"update_server","not_required":"not_required","sales_server":"sales_server","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_css_admin":"add_css_admin","toignore":"toignore","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","export_key":"export_key","add_php_preflight_install":"add_php_preflight_install","joomla_source_link":"joomla_source_link","add_php_preflight_update":"add_php_preflight_update","export_buy_link":"export_buy_link","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","emptycontributors":"emptycontributors","add_sql_uninstall":"add_sql_uninstall","number":"number","addreadme":"addreadme","update_server_url":"update_server_url","add_sales_server":"add_sales_server","creatuserhelper":"creatuserhelper","buildcompsql":"buildcompsql","name":"name"}}';
 			$joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute';
-			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","debug_linenr","add_email_helper","add_placeholders","mvc_versiondate","add_update_server","sales_server","adduikit","add_license","license_type","update_server_target","not_required","update_server","buildcomp","creatuserhelper","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","emptycontributors","addreadme","number","add_sales_server"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}';
+			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","buildcomp","add_placeholders","mvc_versiondate","add_email_helper","debug_linenr","adduikit","add_license","license_type","update_server_target","add_update_server","update_server","not_required","sales_server","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","emptycontributors","add_sql_uninstall","number","addreadme","add_sales_server","creatuserhelper"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}';

 			// Set the object into the content types table.
 			$joomla_component_Inserted = $db->insertObject('#__content_types', $joomla_component);
@ -3718,9 +3718,9 @@ class com_componentbuilderInstallerScript
 			$joomla_component->type_title = 'Componentbuilder Joomla_component';
 			$joomla_component->type_alias = 'com_componentbuilder.joomla_component';
 			$joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_postflight_update":"php_postflight_update","php_preflight_update":"php_preflight_update","javascript":"javascript","css_site":"css_site","debug_linenr":"debug_linenr","add_email_helper":"add_email_helper","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","sql":"sql","php_helper_admin":"php_helper_admin","add_update_server":"add_update_server","php_helper_site":"php_helper_site","sales_server":"sales_server","adduikit":"adduikit","email":"email","php_helper_both":"php_helper_both","website":"website","php_admin_event":"php_admin_event","add_license":"add_license","php_site_event":"php_site_event","license_type":"license_type","css_admin":"css_admin","whmcs_key":"whmcs_key","php_preflight_install":"php_preflight_install","whmcs_url":"whmcs_url","php_postflight_install":"php_postflight_install","license":"license","php_method_uninstall":"php_method_uninstall","bom":"bom","readme":"readme","image":"image","update_server_target":"update_server_target","not_required":"not_required","update_server":"update_server","buildcomp":"buildcomp","creatuserhelper":"creatuserhelper","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_css_admin":"add_css_admin","toignore":"toignore","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","export_key":"export_key","add_php_preflight_install":"add_php_preflight_install","joomla_source_link":"joomla_source_link","add_php_preflight_update":"add_php_preflight_update","export_buy_link":"export_buy_link","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","emptycontributors":"emptycontributors","addreadme":"addreadme","number":"number","update_server_url":"update_server_url","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql","name":"name"}}';
+			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_update":"php_preflight_update","css_site":"css_site","php_helper_site":"php_helper_site","javascript":"javascript","php_helper_admin":"php_helper_admin","readme":"readme","buildcomp":"buildcomp","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_postflight_update":"php_postflight_update","add_email_helper":"add_email_helper","sql":"sql","debug_linenr":"debug_linenr","email":"email","adduikit":"adduikit","website":"website","php_helper_both":"php_helper_both","add_license":"add_license","php_admin_event":"php_admin_event","license_type":"license_type","php_site_event":"php_site_event","css_admin":"css_admin","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_install":"php_preflight_install","license":"license","php_postflight_install":"php_postflight_install","bom":"bom","php_method_uninstall":"php_method_uninstall","image":"image","sql_uninstall":"sql_uninstall","update_server_target":"update_server_target","add_update_server":"add_update_server","update_server":"update_server","not_required":"not_required","sales_server":"sales_server","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_css_admin":"add_css_admin","toignore":"toignore","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","export_key":"export_key","add_php_preflight_install":"add_php_preflight_install","joomla_source_link":"joomla_source_link","add_php_preflight_update":"add_php_preflight_update","export_buy_link":"export_buy_link","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","emptycontributors":"emptycontributors","add_sql_uninstall":"add_sql_uninstall","number":"number","addreadme":"addreadme","update_server_url":"update_server_url","add_sales_server":"add_sales_server","creatuserhelper":"creatuserhelper","buildcompsql":"buildcompsql","name":"name"}}';
 			$joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute';
-			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","debug_linenr","add_email_helper","add_placeholders","mvc_versiondate","add_update_server","sales_server","adduikit","add_license","license_type","update_server_target","not_required","update_server","buildcomp","creatuserhelper","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","emptycontributors","addreadme","number","add_sales_server"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}';
+			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","buildcomp","add_placeholders","mvc_versiondate","add_email_helper","debug_linenr","adduikit","add_license","license_type","update_server_target","add_update_server","update_server","not_required","sales_server","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","emptycontributors","add_sql_uninstall","number","addreadme","add_sales_server","creatuserhelper"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}';

 			// Check if joomla_component type is already in content_type DB.
 			$joomla_component_id = null;
@ -4878,7 +4878,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.7.9 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.7.10 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}