2018-07-07 10:03:42 +00:00
96 changed files with 4986 additions and 4148 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.8.0) 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.8.2) 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)

@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 30th May, 2018
-+ *Version*: 2.8.0
+ *Last Build*: 7th July, 2018
+ *Version*: 2.8.2
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **185584**
-+ *Field count*: **1054**
-+ *File count*: **1236**
+ *Line count*: **186287**
+ *Field count*: **1058**
+ *File count*: **1238**
 + *Folder count*: **197**

 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
@ -140,6 +140,6 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 ## Donations

 Come on buy VDM a coffee :)
- * PayPal: [paypal.me/asseblief](https://www.paypal.me/asseblief)
+ * PayPal: [paypal.me/asseblief](https://www.paypal.me/asseblief) (Asseblief = Please) in Afrikaans
 * Bitcoin: 18vURxYpPFjvNk8BnUy1ovCAyQmY3MzkSf
 * Ethereum: 0x9548144662b47327c954f3e214edb96662d51218
--- 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.8.0) 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.8.2) 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)

@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 30th May, 2018
-+ *Version*: 2.8.0
+ *Last Build*: 7th July, 2018
+ *Version*: 2.8.2
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **185584**
-+ *Field count*: **1054**
-+ *File count*: **1236**
+ *Line count*: **186287**
+ *Field count*: **1058**
+ *File count*: **1238**
 + *Folder count*: **197**

 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
@ -140,6 +140,6 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 ## Donations

 Come on buy VDM a coffee :)
- * PayPal: [paypal.me/asseblief](https://www.paypal.me/asseblief)
+ * PayPal: [paypal.me/asseblief](https://www.paypal.me/asseblief) (Asseblief = Please) in Afrikaans
 * Bitcoin: 18vURxYpPFjvNk8BnUy1ovCAyQmY3MzkSf
 * Ethereum: 0x9548144662b47327c954f3e214edb96662d51218
--- a/admin/assets/images/ajax-loader.gif
+++ b/admin/assets/images/ajax-loader.gif
--- a/admin/compiler/joomla_3/Helper_email.php
+++ b/admin/compiler/joomla_3/Helper_email.php
@ -45,6 +45,13 @@ abstract class ###Component###Email
 	 */
 	public static $mailer = null;

+	/**
+	 * Custom Headers
+	 *
+	 * @var    array
+	 */
+	protected static $header = array();
+
 	/**
 	 * Get a configuration object
 	 *
@ -58,7 +65,7 @@ abstract class ###Component###Email

 		return self::$config;
 	}
-	
+
 	/**
 	 * Get a mailer object.
 	 *
@ -164,6 +171,17 @@ abstract class ###Component###Email
 		return $mail;
 	}

+	/**
+	 * Set a Mail custom header.
+	 *
+	 * @return  void
+	 */
+	public static function setHeader($target, $value)
+	{
+		// set the header
+		self::$header[$target] = $value;
+	}
+
 	/**
 	 * Send an email
 	 *
@ -172,7 +190,6 @@ abstract class ###Component###Email
 	 */
 	public static function send($recipient, $subject, $body, $textonly, $mode = 0, $bounce_email = null, $idsession = null, $mailreply = null, $replyname = null , $mailfrom = null, $fromname = null, $cc = null, $bcc = null, $attachment = null, $embeded = null , $embeds = null)
 	{
-		
 	 	// Get a JMail instance
 		$mail = self::getMailer();
 		
@ -199,7 +216,16 @@ abstract class ###Component###Email
 		{
 			$mail->addCustomHeader('X-VDMmethodID:'.$idsession);
 		}
-		
+
+		// set headers if found
+		if (isset(self::$header) && is_array(self::$header) && count((array)self::$header) > 0)
+		{
+			foreach (self::$header as $_target => $_value)
+			{
+				$mail->addCustomHeader($_target.':'.$_value);
+			}
+		}
+
 		// set the subject & Body
 		$mail->setSubject($subject);
 		$mail->setBody($body);
@ -243,7 +269,7 @@ abstract class ###Component###Email
 			$mail->ClearReplyTos();
 			$mail->addReplyTo($mailreply, $replyname);
 		}
-		
+
 		// check if we can add the DKIM to email
 		if ($conf->get('enable_dkim'))
 		{
@ -261,20 +287,20 @@ abstract class ###Component###Email
 				$mail->DKIM_private	= $tmp;
 			}
 		}
-		
+
 		$sendmail = $mail->Send();
 		
 		if ($conf->get('enable_dkim') && !empty($conf->get('dkim_domain')) && !empty($conf->get('dkim_selector')) && !empty($conf->get('dkim_private')) && !empty($conf->get('dkim_public')))
 		{
 			@unlink($tmp);
 		}
-		
+
 		if (method_exists('###Component###Helper','storeMessage'))
 		{
 			// store the massage if the method is set
 			###Component###Helper::storeMessage($sendmail, $recipient, $subject, $body, $textonly, $mode, 'email');
 		}
-		
+
 		return $sendmail;
 	}

--- a/admin/config.xml
+++ b/admin/config.xml
@ -47,6 +47,20 @@
 		/>
 		<field type="spacer" name="spacerHistory" hr="true" />

+		<!-- Editor Field. Type: Plugins. (joomla) -->
+		<field
+			type="plugins"
+			name="editor"
+			label="COM_COMPONENTBUILDER_CONFIG_EDITOR_LABEL"
+			default="none"
+			description="COM_COMPONENTBUILDER_CONFIG_EDITOR_DESCRIPTION"
+			folder="editors"
+			filter="cmd"
+		/>
+		<!-- No Manual Options Were Added In Field Settings. -->
+
+		<!-- Spacer_hr_one Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_one" hr="true" class="spacer_hr_one" />
 		<!-- Manage_jcb_package_directories Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@ -79,8 +93,8 @@
 			<option value="jcb">
 				COM_COMPONENTBUILDER_CONFIG_JCB_COMMUNITY_PACKAGES</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" />
+		<!-- Spacer_hr_two Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_two" hr="true" class="spacer_hr_two" />
 		<!-- Add_menu_prefix Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@ -111,8 +125,8 @@
 			autocomplete="on"
 			showon="add_menu_prefix:1"
 		/>
-		<!-- Spacer_hr_two Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_two" hr="true" class="spacer_hr_two" />
+		<!-- Spacer_hr_three Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_three" hr="true" class="spacer_hr_three" />
 		<!-- Minify Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@ -127,8 +141,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CONFIG_NO</option>
 		</field>
-		<!-- Spacer_hr_three Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_three" hr="true" class="spacer_hr_three" />
+		<!-- Spacer_hr_four Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_four" hr="true" class="spacer_hr_four" />
 		<!-- Set_browser_storage Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@ -180,8 +194,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CONFIG_NEVER_UPDATE</option>
 		</field>
-		<!-- Spacer_hr_four Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_four" hr="true" class="spacer_hr_four" />
+		<!-- Spacer_hr_five Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_five" hr="true" class="spacer_hr_five" />
 		<!-- Note_language_global Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_language_global" label="COM_COMPONENTBUILDER_CONFIG_NOTE_LANGUAGE_GLOBAL_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_LANGUAGE_GLOBAL_DESCRIPTION" heading="h4" class="alert alert-info note_language_global" />
 		<!-- Language Field. Type: Lang. (custom) -->
@ -208,8 +222,8 @@
 			max="100"
 			step="10"
 		/>
-		<!-- Spacer_hr_five Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_five" hr="true" class="spacer_hr_five" />
+		<!-- Spacer_hr_six Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_six" hr="true" class="spacer_hr_six" />
 		<!-- Compiler_field_builder_type Field. Type: List. (joomla) -->
 		<field
 			type="list"
@ -226,8 +240,8 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_CONFIG_SIMPLEXMLELEMENT_CLASS</option>
 		</field>
-		<!-- Spacer_hr_six Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_six" hr="true" class="spacer_hr_six" />
+		<!-- Spacer_hr_seven Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_seven" hr="true" class="spacer_hr_seven" />
 		<!-- Api Field. Type: User. (joomla) -->
 		<field
 			type="user"
@ -235,8 +249,8 @@
 			label="COM_COMPONENTBUILDER_CONFIG_API_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION"
 		/>
-		<!-- Spacer_hr_seven Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_seven" hr="true" class="spacer_hr_seven" />
+		<!-- Spacer_hr_eight Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_eight" hr="true" class="spacer_hr_eight" />
 		<field name="autorTitle"
 			type="spacer"
 			label="COM_COMPONENTBUILDER_CONFIG_AUTHOR"
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@ -1804,7 +1804,7 @@ class Get
 				}
 			}
 			// add_php
-			$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowedit', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
+			$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_getform', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowedit', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
 			foreach ($addArrayP as $scripter)
 			{
 				if (isset($view->{'add_' . $scripter}) && $view->{'add_' . $scripter} == 1)
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@ -1295,8 +1295,8 @@ class Fields extends Structure
 			else
 			{
 				$optionArray = false;
-				$field .= PHP_EOL . $this->_t(3) . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->";
 				$field .= PHP_EOL . $this->_t(2) . $taber . "/>";
+				$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->" . PHP_EOL;
 			}
 		}
 		elseif ($setType === 'plain')
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@ -191,8 +191,7 @@ class Interpretation extends Fields
 	 *
 	 * @param   int   $nr  The line number
 	 *
-	 * @return  void
-	 *
+	 * @return  string
 	 */
 	private function setLine($nr)
 	{
@ -254,7 +253,10 @@ class Interpretation extends Fields
 	}

 	/**
-	 * @param $view
+	 * set Lock License Per
+	 *
+	 * @param type $view
+	 * @param type $target
 	 */
 	public function setLockLicensePer(&$view, $target)
 	{
@ -280,6 +282,14 @@ class Interpretation extends Fields
 		}
 	}

+	/**
+	 * Check statment license locked
+	 *
+	 * @param type $boolMethod
+	 * @param type $thIIS
+	 *
+	 * @return string
+	 */
 	public function checkStatmentLicenseLocked($boolMethod, $thIIS = '$this')
 	{
 		$statment[] = PHP_EOL . $this->_t(2) . "if (!" . $thIIS . "->" . $boolMethod . "())";
@ -293,6 +303,14 @@ class Interpretation extends Fields
 		return implode(PHP_EOL, $statment);
 	}

+	/**
+	 * set Bool License Lock
+	 *
+	 * @param type $boolMethod
+	 * @param type $globalbool
+	 *
+	 * @return string
+	 */
 	public function setBoolLicenseLock($boolMethod, $globalbool)
 	{
 		$bool[] = PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
@ -325,6 +343,14 @@ class Interpretation extends Fields
 		return implode(PHP_EOL, $bool);
 	}

+	/**
+	 * set Helper License Lock
+	 *
+	 * @param type $_VDM
+	 * @param type $target
+	 *
+	 * @return string
+	 */
 	public function setHelperLicenseLock($_VDM, $target)
 	{
 		$helper[] = PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
@ -348,6 +374,13 @@ class Interpretation extends Fields
 		return implode(PHP_EOL, $helper);
 	}

+	/**
+	 * set Init License Lock
+	 *
+	 * @param type $_VDM
+	 *
+	 * @return string
+	 */
 	public function setInitLicenseLock($_VDM)
 	{
 		$init[] = PHP_EOL . "if (!defined('" . $_VDM . "'))";
@ -362,6 +395,11 @@ class Interpretation extends Fields
 		return implode(PHP_EOL, $init);
 	}

+	/**
+	 * set WHMCS Cryption
+	 *
+	 * @return string
+	 */
 	public function setWHMCSCryption()
 	{
 		// make sure we have the correct file
@ -549,6 +587,11 @@ class Interpretation extends Fields
 		return '';
 	}

+	/**
+	 * set Get Crypt Key
+	 *
+	 * @return string
+	 */
 	public function setGetCryptKey()
 	{
 		// ENCRYPT_FILE
@ -714,6 +757,9 @@ class Interpretation extends Fields
 		return '';
 	}

+	/**
+	 * set Version Controller
+	 */
 	public function setVersionController()
 	{
 		if (ComponentbuilderHelper::checkArray($this->componentData->version_update) || ComponentbuilderHelper::checkArray($this->updateSQLBuilder))
@ -821,6 +867,12 @@ class Interpretation extends Fields
 		}
 	}

+	/**
+	 * set Dynamic Update XML SQL
+	 *
+	 * @param array $updateXML
+	 * @param bool $current_version
+	 */
 	public function setDynamicUpdateXMLSQL(&$updateXML, $current_version = false)
 	{
 		// start building the update
@ -864,6 +916,13 @@ class Interpretation extends Fields
 		$this->setUpdateXMLSQL($update_, $updateXML, $addDynamicSQL);
 	}

+	/**
+	 * set Update XML SQL
+	 *
+	 * @param array $update
+	 * @param array $updateXML
+	 * @param boolean $addDynamicSQL
+	 */
 	public function setUpdateXMLSQL(&$update, &$updateXML, &$addDynamicSQL)
 	{
 		// ensure version naming is correct
@ -931,6 +990,11 @@ class Interpretation extends Fields
 		}
 	}

+	/**
+	 * no Help
+	 *
+	 * @return string
+	 */
 	public function noHelp()
 	{
 		$help = array();
@ -1353,6 +1417,11 @@ class Interpretation extends Fields
 			$method[] = $this->_t(3) . "'password1' => \$password, // First password field";
 			$method[] = $this->_t(3) . "'password2' => \$password2, // Confirm password field";
 			$method[] = $this->_t(3) . "'block' => 0 );";
+			$method[] = $this->_t(2) . "// set groups if found";
+			$method[] = $this->_t(2) . "if (isset(\$new['groups']) && self::checkArray(\$new['groups']))";
+			$method[] = $this->_t(2) . "{";
+			$method[] = $this->_t(3) . "\$data['groups'] = \$new['groups'];";
+			$method[] = $this->_t(2) . "}";
 			$method[] = $this->_t(2) . "// register the new user";
 			$method[] = $this->_t(2) . "\$done = \$model->save(\$data);";
 			$method[] = $this->_t(2) . "// if user is updated";
@ -6496,23 +6565,36 @@ class Interpretation extends Fields
 		{
 			// set the fields array
 			$field = array();
+			// use custom code
+			$useCustomCode = (isset($this->fieldRelations[$viewName_list][(int) $item['id']]['join_type']) && $this->fieldRelations[$viewName_list][(int) $item['id']]['join_type'] == 2 &&
+				isset($this->fieldRelations[$viewName_list][(int) $item['id']]['set']) && ComponentbuilderHelper::checkString($this->fieldRelations[$viewName_list][(int) $item['id']]['set']));
 			// load the main list view field
 			$field['[field=' . (int) $item['id'] . ']'] = $this->getListItem($item, $viewName_single, $viewName_list, $itemClass, $doNotEscape, $coreLoad, $core, false, $ref, $escape, $user, $refview);
+			// code name
+			if (isset($item['code']) && $useCustomCode)
+			{
+				$field['$item->{' . (int) $item['id'] . '}'] = '$item->' . $item['code'];
+			}
 			// now load the relations
 			foreach ($this->fieldRelations[$viewName_list][(int) $item['id']]['joinfields'] as $join)
 			{
 				$blankClass = '';
 				if (isset($this->listJoinBuilder[$viewName_list]) && isset($this->listJoinBuilder[$viewName_list][(int) $join]))
 				{
+					// code block
 					$field['[field=' . (int) $join . ']'] = $this->getListItem($this->listJoinBuilder[$viewName_list][(int) $join], $viewName_single, $viewName_list, $blankClass, $doNotEscape, $coreLoad, $core, false, $ref, $escape, $user, $refview);
+					// code name
+					if (isset($this->listJoinBuilder[$viewName_list][(int) $join]['code']) && $useCustomCode)
+					{
+						$field['$item->{' . (int) $join . '}'] = '$item->' . $this->listJoinBuilder[$viewName_list][(int) $join]['code'];
+					}
 				}
 			}
 			// join based on join type
-			if (isset($this->fieldRelations[$viewName_list][(int) $item['id']]['join_type']) && $this->fieldRelations[$viewName_list][(int) $item['id']]['join_type'] == 2 &&
-				isset($this->fieldRelations[$viewName_list][(int) $item['id']]['set']) && ComponentbuilderHelper::checkString($this->fieldRelations[$viewName_list][(int) $item['id']]['set']))
+			if ($useCustomCode)
 			{
 				// custom code
-				return PHP_EOL . $this->_t(3) . "<div>" . str_replace(array_keys($field), array_values($field), $this->fieldRelations[$viewName_list][(int) $item['id']]['set']) . PHP_EOL . $this->_t(3) . "</div>";
+				return PHP_EOL . $this->_t(3) . "<div>" . $this->setPlaceholders(str_replace(array_keys($field), array_values($field), $this->fieldRelations[$viewName_list][(int) $item['id']]['set']), $this->placeholders) . PHP_EOL . $this->_t(3) . "</div>";
 			}
 			elseif (isset($this->fieldRelations[$viewName_list][(int) $item['id']]['set']) && ComponentbuilderHelper::checkString($this->fieldRelations[$viewName_list][(int) $item['id']]['set']))
 			{
@ -6520,7 +6602,7 @@ class Interpretation extends Fields
 				return PHP_EOL . $this->_t(3) . "<div>" . implode($this->fieldRelations[$viewName_list][(int) $item['id']]['set'], $field) . PHP_EOL . $this->_t(3) . "</div>";
 			}
 			// default
-			return PHP_EOL . $this->_t(3) . "<div>" . implode(' ', $field) . PHP_EOL . $this->_t(3) . "</div>";
+			return PHP_EOL . $this->_t(3) . "<div>" . implode('', $field) . PHP_EOL . $this->_t(3) . "</div>";
 		}
 		return $this->getListItem($item, $viewName_single, $viewName_list, $itemClass, $doNotEscape, $coreLoad, $core, $class, $ref, $escape, $user, $refview);
 	}
@ -10854,9 +10936,10 @@ class Interpretation extends Fields
 		$allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Now set the local-redirected field default value";
 		$allow[] = $this->_t(4) . "\$form->setValue(\$redirectedField, null, \$redirectedValue);";
 		$allow[] = $this->_t(3) . "}";
-		$allow[] = $this->_t(2) . "}";
+		// load custom script if found
+		$allow[] = $this->_t(2) . "}" . $this->getCustomScriptBuilder('php_getform', $viewName_single, PHP_EOL);
 		// setup the default script
-		$allow[] = PHP_EOL . $this->_t(2) . "return \$form;";
+		$allow[] = $this->_t(2) . "return \$form;";

 		return implode(PHP_EOL, $allow);
 	}
@ -11982,7 +12065,7 @@ class Interpretation extends Fields
 			}
 		}
 		// close the foreach if needed
-		if (ComponentbuilderHelper::checkString($fix))
+		if (ComponentbuilderHelper::checkString($fix) || $export)
 		{
 			// start the loop
 			$forEachStart = PHP_EOL . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " set values to display correctly.";
--- a/admin/helpers/componentbuilderemail.php
+++ b/admin/helpers/componentbuilderemail.php
@ -28,6 +28,13 @@ abstract class ComponentbuilderEmail
 	 */
 	public static $mailer = null;

+	/**
+	 * Custom Headers
+	 *
+	 * @var    array
+	 */
+	protected static $header = array();
+
 	/**
 	 * Get a configuration object
 	 *
@ -41,7 +48,7 @@ abstract class ComponentbuilderEmail

 		return self::$config;
 	}
-	
+
 	/**
 	 * Get a mailer object.
 	 *
@ -147,6 +154,17 @@ abstract class ComponentbuilderEmail
 		return $mail;
 	}

+	/**
+	 * Set a Mail custom header.
+	 *
+	 * @return  void
+	 */
+	public static function setHeader($target, $value)
+	{
+		// set the header
+		self::$header[$target] = $value;
+	}
+
 	/**
 	 * Send an email
 	 *
@ -155,7 +173,6 @@ abstract class ComponentbuilderEmail
 	 */
 	public static function send($recipient, $subject, $body, $textonly, $mode = 0, $bounce_email = null, $idsession = null, $mailreply = null, $replyname = null , $mailfrom = null, $fromname = null, $cc = null, $bcc = null, $attachment = null, $embeded = null , $embeds = null)
 	{
-		
 	 	// Get a JMail instance
 		$mail = self::getMailer();
 		
@ -182,7 +199,16 @@ abstract class ComponentbuilderEmail
 		{
 			$mail->addCustomHeader('X-VDMmethodID:'.$idsession);
 		}
-		
+
+		// set headers if found
+		if (isset(self::$header) && is_array(self::$header) && count((array)self::$header) > 0)
+		{
+			foreach (self::$header as $_target => $_value)
+			{
+				$mail->addCustomHeader($_target.':'.$_value);
+			}
+		}
+
 		// set the subject & Body
 		$mail->setSubject($subject);
 		$mail->setBody($body);
@ -226,7 +252,7 @@ abstract class ComponentbuilderEmail
 			$mail->ClearReplyTos();
 			$mail->addReplyTo($mailreply, $replyname);
 		}
-		
+
 		// check if we can add the DKIM to email
 		if ($conf->get('enable_dkim'))
 		{
@ -244,20 +270,20 @@ abstract class ComponentbuilderEmail
 				$mail->DKIM_private	= $tmp;
 			}
 		}
-		
+
 		$sendmail = $mail->Send();
 		
 		if ($conf->get('enable_dkim') && !empty($conf->get('dkim_domain')) && !empty($conf->get('dkim_selector')) && !empty($conf->get('dkim_private')) && !empty($conf->get('dkim_public')))
 		{
 			@unlink($tmp);
 		}
-		
+
 		if (method_exists('ComponentbuilderHelper','storeMessage'))
 		{
 			// store the massage if the method is set
 			ComponentbuilderHelper::storeMessage($sendmail, $recipient, $subject, $body, $textonly, $mode, 'email');
 		}
-		
+
 		return $sendmail;
 	}

--- a/admin/helpers/extrusion/a_mapping.php
+++ b/admin/helpers/extrusion/a_mapping.php
@ -55,32 +55,33 @@ class Mapping
 	/**
 	 *	The needed set of keys needed to set
 	 */
-	protected $setting = array('id' => 'default', 'buildcompsql' => 'base64', 'addadmin_views' => 'json', 'name_code' => 'safeString');
+	protected $setting = array('id' => 'default', 'buildcompsql' => 'base64', 'name_code' => 'safeString');
 	
 	/**
 	 *	The needed set of keys needed to set
 	 */
 	protected $notRequiered = array('id', 'asset_id', 'published', 
-					'created_by', 'modified_by', 'created', 'modified', 'checked_out','checked_out_time',
-					'version', 'hits', 'access', 'ordering', 
-					'metakey', 'metadesc', 'metadata', 'params');
+		'created_by', 'modified_by', 'created', 'modified', 'checked_out','checked_out_time',
+		'version', 'hits', 'access', 'ordering', 
+		'metakey', 'metadesc', 'metadata', 'params');
 	
 	/**
 	 *	The datatypes and it linked field types (basic)
 	 *	(TODO) We may need to set this dynamicly
 	 */
 	protected $dataTypes = array(	'VARCHAR' => 'Text', 'CHAR' => 'Text',
-					'MEDIUMTEXT' => 'Textarea', 'LONGTEXT'  => 'Textarea',
-					'TEXT' => 'Textarea', 'DATETIME' => 'Calendar',
-					'DATE' => 'Text', 'TIME' => 'Text', 'TINYINT' => 'Text',
-					'BIGINT' => 'Text', 'INT' => 'Text',  'FLOAT' => 'Text',
-					'DECIMAL' => 'Text', 'DOUBLE' => 'Text');
+		'MEDIUMTEXT' => 'Textarea', 'LONGTEXT'  => 'Textarea',
+		'TEXT' => 'Textarea', 'DATETIME' => 'Calendar',
+		'DATE' => 'Text', 'TIME' => 'Text', 'TINYINT' => 'Text',
+		'BIGINT' => 'Text', 'INT' => 'Text',  'FLOAT' => 'Text',
+		'DECIMAL' => 'Text', 'DOUBLE' => 'Text');
 	
 	/**
 	 *	The datasize identifiers
 	 */
-	protected $dataSize = array(	'CHAR', 'VARCHAR', 'INT', 'TINYINT',
-					'BIGINT', 'FLOAT', 'DECIMAL', 'DOUBLE');
+	protected $dataSize = array(
+		'CHAR', 'VARCHAR', 'INT', 'TINYINT',
+		'BIGINT', 'FLOAT', 'DECIMAL', 'DOUBLE');
 	
 	/**
 	 *	The default identifiers
@ -98,10 +99,7 @@ class Mapping
 	 */
 	public function __construct($data = false)
 	{
-		// set the app to insure messages can be set
-		$this->app = JFactory::getApplication();
-		
-		if ($data)
+		if (ComponentbuilderHelper::checkArray($data))
 		{
 			if (isset($data['buildcomp']) && 1 == $data['buildcomp'] && isset($data['buildcompsql']))
 			{
@ -129,6 +127,12 @@ class Mapping
 						}
 					}
 				}
+				// get linked admin views
+				$addadmin_views = ComponentbuilderHelper::getVar('component_admin_views', $data['id'], 'joomla_component', 'addadmin_views');
+				if (ComponentbuilderHelper::checkJson($addadmin_views))
+				{
+					$this->addadmin_views = json_decode($addadmin_views, true);
+				}
 				// set the map of the views needed
 				if ($this->setMap())
 				{
@ -148,7 +152,7 @@ class Mapping
 		);
 		return false;
 	}
-	
+
 	/**
 	 *	The mapping function
 	 *	To Map the views and fields that are needed
@ -162,7 +166,8 @@ class Mapping
 			foreach ($queries as $query)
 			{
 				// only use create table queries
-				if (strpos($query, 'CREATE TABLE IF NOT EXISTS `') !== false)
+				if (strpos($query, 'CREATE TABLE IF NOT EXISTS') !== false ||
+					strpos($query, 'CREATE TABLE') !== false)
 				{
 					if ($tableName = $this->getTableName($query))
 					{
@ -198,15 +203,24 @@ class Mapping
 		}
 		return false;
 	}
-	
+
 	/**
 	 *	Get the table name
 	 */
 	protected function getTableName(&$query)
 	{
-		$tableName = ComponentbuilderHelper::getBetween($query, '`#__', "`");
+		if (strpos($query, '`#__') !== false)
+		{
+			// get table name
+			$tableName = ComponentbuilderHelper::getBetween($query, '`#__', "`");
+		}
+		elseif (strpos($query, "'#__") !== false)
+		{
+			// get table name
+			$tableName = ComponentbuilderHelper::getBetween($query, "'#__", "'");
+		}
 		// if it still was not found
-		if (!ComponentbuilderHelper::checkString($tableName))
+		if (!isset($tableName) || !ComponentbuilderHelper::checkString($tableName))
 		{
 			// skip this query
 			return false;
@ -224,13 +238,13 @@ class Mapping
 		// skip this query
 		return false;
 	}
-	
+
 	/**
 	 *	Get the field details
 	 */
 	protected function getFields(&$query)
 	{	
-		$rows = array_map('trim', explode("\n", $query));
+		$rows = array_map('trim', explode(PHP_EOL, $query));
 		$fields = array();
 		foreach ($rows as $row)
 		{
@ -299,7 +313,7 @@ class Mapping
 		}
 		return false;
 	}
-	
+
 	/**
 	 *	Get the field types
 	 */
@ -318,7 +332,7 @@ class Mapping
 		}
 		return false;
 	}
-	
+
 	/**
 	 *	Get the field size
 	 */
@ -330,7 +344,7 @@ class Mapping
 		}
 		return '';
 	}
-	
+
 	/**
 	 *	Get the field default
 	 */
@ -348,7 +362,7 @@ class Mapping
 		}
 		return '';
 	}
-	
+
 	/**
 	 *	Get the field Null Value
 	 */
@ -366,7 +380,7 @@ class Mapping
 		}
 		return 'NULL';
 	}
-	
+
 	/**
 	 *	Get the field key status
 	 */
--- a/admin/helpers/extrusion/b_builder.php
+++ b/admin/helpers/extrusion/b_builder.php
@ -37,12 +37,13 @@ class Builder extends Mapping
 	public		$user;
 	public		$today;
 	public		$db;
-	public		$views		= array();
-	protected	$fields		= array();
-	protected	$title		= array();
-	protected	$description	= array();
-	protected	$alias		= array();
-	protected	$list		= array();
+	public		$views = array();
+	public		$admin_fields = array();
+	protected	$fields = array();
+	protected	$title = array();
+	protected	$description = array();
+	protected	$alias = array();
+	protected	$list = array();
 	
 	/**
 	 *	Field that should not be used in name, alias, disc, and list view
@ -62,10 +63,10 @@ class Builder extends Mapping
 			$data['buildcomp'] = 0;
 			$data['buildcompsql'] = '';
 			// set some globals
-			$this->db	= JFactory::getDbo();
-			$this->user	= JFactory::getUser();
-			$this->today	= JFactory::getDate()->toSql();
-			
+			$this->db = JFactory::getDbo();
+			$this->user = JFactory::getUser();
+			$this->today = JFactory::getDate()->toSql();
+
 			// no start the building of the views and fields
 			if ($this->setBuild())
 			{
@ -100,22 +101,21 @@ class Builder extends Mapping
 	protected function setView(&$name)
 	{
 		// set the view object
-		$object				= new stdClass();
-		$object->system_name		= ComponentbuilderHelper::safeString($name, 'W') . ' (dynamic build)';
-		$object->name_single		= $name;
-		$object->name_list		= $name. 's';
-		$object->short_description	= $name. ' view (dynamic build)';
-		$object->type			= 1;
-		$object->description		= $name. ' view (dynamic build)';
-		$object->add_fadein		= 1;
-		$object->add_sql		= (isset($this->addSql[$name])) ? $this->addSql[$name]: 0;
-		$object->source			= (isset($this->source[$name])) ? $this->source[$name]: 0;
-		$object->sql			= (isset($this->sql[$name])) ? base64_encode($this->sql[$name]): '';
-		$object->addpermissions		= '{"action":["view.edit","view.edit.own","view.edit.state","view.create","view.delete","view.access"],"implementation":["3","3","3","3","3","3"]}';
-		$object->addfields		= $this->addFields($name);
-		$object->created		= $this->today;
-		$object->created_by		= $this->user->id;
-		$object->published		= 1;
+		$object = new stdClass();
+		$object->system_name = ComponentbuilderHelper::safeString($name, 'W') . ' (dynamic build)';
+		$object->name_single = $name;
+		$object->name_list = $name. 's';
+		$object->short_description = $name. ' view (dynamic build)';
+		$object->type = 1;
+		$object->description = $name. ' view (dynamic build)';
+		$object->add_fadein = 1;
+		$object->add_sql = (isset($this->addSql[$name])) ? $this->addSql[$name]: 0;
+		$object->source = (isset($this->source[$name])) ? $this->source[$name]: 0;
+		$object->sql = (isset($this->sql[$name])) ? base64_encode($this->sql[$name]): '';
+		$object->addpermissions = '{"action":["view.edit","view.edit.own","view.edit.state","view.create","view.delete","view.access"],"implementation":["3","3","3","3","3","3"]}';
+		$object->created = $this->today;
+		$object->created_by = $this->user->id;
+		$object->published = 1;
 		// add to data base
 		if ($this->db->insertObject('#__componentbuilder_admin_view', $object))
 		{
@ -124,7 +124,8 @@ class Builder extends Mapping
 			ComponentbuilderHelper::setAsset($id, 'admin_view');
 			// load the views
 			$this->views[] = $id;
-			return true;
+			// load the admin view fields
+			return $this->addFields($name, $id);
 		}
 		return false;
 	}
@ -132,26 +133,12 @@ class Builder extends Mapping
 	/**
 	 *	Add the fields to the view
 	 */
-	protected function addFields(&$view)
+	protected function addFields(&$view, &$view_id)
 	{
 		if (isset($this->fields[$view]))
 		{
 			// set some defaults
-			$addField = array (
-				'field'		=> array(),
-				'list'		=> array(),
-				'order_list'	=> array(),
-				'title'		=> array(),
-				'alias'		=> array(),
-				'sort'		=> array(),
-				'search'	=> array(),
-				'filter'	=> array(),
-				'link'		=> array(),
-				'tab'		=> array(),
-				'alignment'	=> array(),
-				'order_edit'	=> array(),
-				'permission'	=> array()
-			);
+			$addField = array ();
 			$fixLink = (isset($this->title[$view])) ? 0 : 1;
 			// build the field data... hmmm
 			foreach ($this->fields[$view] as $nr => $id)
@ -171,23 +158,32 @@ class Builder extends Mapping
 					$fixLink = 0;
 				}
 				// load the field values
-				$addField['field'][]		= $id;
-				$addField['list'][]		= $isList;
-				$addField['order_list'][]	= ($key) ? $key : 0;
-				$addField['title'][]		= $isTitle;
-				$addField['alias'][]		= $isAlias;
-				$addField['sort'][]		= $isList;
-				$addField['search'][]		= $isList;
-				$addField['filter'][]		= $isList;
-				$addField['link'][]		= $isLink;
-				$addField['tab'][]		= 1;
-				$addField['alignment'][]	= ($isTitle || $isAlias) ? 4 : $alignment;
-				$addField['order_edit'][]	= $nr;
-				$addField['permission'][]	= 0;
+				$addField['addfields'.$nr]['field'] = $id;
+				$addField['addfields'.$nr]['list'] = $isList;
+				$addField['addfields'.$nr]['order_list'] = ($key) ? $key : 0;
+				$addField['addfields'.$nr]['title'] = $isTitle;
+				$addField['addfields'.$nr]['alias'] = $isAlias;
+				$addField['addfields'.$nr]['sort'] = $isList;
+				$addField['addfields'.$nr]['search'] = $isList;
+				$addField['addfields'.$nr]['filter'] = $isList;
+				$addField['addfields'.$nr]['link'] = $isLink;
+				$addField['addfields'.$nr]['tab'] = 1;
+				$addField['addfields'.$nr]['alignment'] = ($isTitle || $isAlias) ? 4 : $alignment;
+				$addField['addfields'.$nr]['order_edit'] = $nr;
+				$addField['addfields'.$nr]['permission'] = 0;
 			}
-			return json_encode($addField);
+			
+			// set the field object
+			$object = new stdClass();
+			$object->admin_view = $view_id;
+			$object->addfields = json_encode($addField, JSON_FORCE_OBJECT);
+			$object->created = $this->today;
+			$object->created_by = $this->user->id;
+			$object->published = 1;
+			// add to data base
+			return $this->db->insertObject('#__componentbuilder_admin_fields', $object);
 		}
-		return '';
+		return false;
 	}
 	
 	/**
@ -198,21 +194,21 @@ class Builder extends Mapping
 		if ($fieldType = $this->getFieldType($field['fieldType']))
 		{
 			// set the field object
-			$object				= new stdClass();
-			$object->name			= $field['label'] . ' (dynamic build)';
-			$object->fieldtype		= $fieldType;
-			$object->datatype		= $field['dataType'];
-			$object->indexes		= $field['key'];
-			$object->null_switch		= $field['null'];
-			$object->datalenght		= $field['size'];
-			$object->datalenght_other	= $field['sizeOther'];
-			$object->datadefault		= $field['default'];
-			$object->datadefault_other	= $field['defaultOther'];
-			$object->created		= $this->today;
-			$object->created_by		= $this->user->id;
-			$object->published		= 1;
-			$object->store			= 0;
-			$object->xml			= $this->setFieldXML($field, $fieldType);
+			$object = new stdClass();
+			$object->name = $field['label'] . ' (dynamic build)';
+			$object->fieldtype = $fieldType;
+			$object->datatype = $field['dataType'];
+			$object->indexes = $field['key'];
+			$object->null_switch = $field['null'];
+			$object->datalenght = $field['size'];
+			$object->datalenght_other = $field['sizeOther'];
+			$object->datadefault = $field['default'];
+			$object->datadefault_other = $field['defaultOther'];
+			$object->created = $this->today;
+			$object->created_by = $this->user->id;
+			$object->published = 1;
+			$object->store = 0;
+			$object->xml = $this->setFieldXML($field, $fieldType);
 			// add to data base
 			if ($this->db->insertObject('#__componentbuilder_field', $object))
 			{
--- a/admin/helpers/extrusion/c_extrusion.php
+++ b/admin/helpers/extrusion/c_extrusion.php
@ -36,106 +36,84 @@ class Extrusion extends Builder
 	 */
 	public function __construct(&$data)
 	{
-		// first we run the perent constructor
-		if (parent::__construct($data))
+		// set the app to insure messages can be set
+		$this->app = JFactory::getApplication();
+		// make sure we have an id
+		if (isset($data['id']) && $data['id'] > 0)
 		{
-			// link the view data to the component
-			$data['addadmin_views'] = $this->linkAdminViews();
-			if (ComponentbuilderHelper::checkJson($data['addadmin_views']))
+			// first we run the perent constructor
+			if (parent::__construct($data))
 			{
-				$this->app->enqueueMessage(
-					JText::_('All the fields and views from your sql dump has been created and linked to this component.'),
-					'Success'
-				);
-				return true;
+				// link the view data to the component
+				if ($this->setAdminViews($data['id']))
+				{
+					$this->app->enqueueMessage(
+						JText::_('All the fields and views from your sql dump has been created and linked to this component.'),
+						'Success'
+					);
+					return true;
+				}
 			}
+			return false;
 		}
+		$this->app->enqueueMessage(
+			JText::_('Please try again, this error usualy happens if it is a new component, beacues we need a component ID to do this build with your sql dump.'),
+			'Error'
+		);
 		return false;
 	}
 	
 	/**
 	 *	link the build views to the component
 	 */
-	protected function linkAdminViews()
+	protected function setAdminViews(&$component_id)
 	{
 		// check if views were set
 		if (ComponentbuilderHelper::checkArray($this->views))
 		{
-			// insure arrays are set
-			if (!isset($this->addadmin_views['adminview']))
+			$count = 0;
+			if (ComponentbuilderHelper::checkArray($this->addadmin_views))
 			{
-				$this->addadmin_views['adminview'] = array();
-			}
-			if (!isset($this->addadmin_views['icomoon']))
-			{
-				$this->addadmin_views['icomoon'] = array();
-			}
-			if (!isset($this->addadmin_views['mainmenu']))
-			{
-				$this->addadmin_views['mainmenu'] = array();
-			}
-			if (!isset($this->addadmin_views['dashboard_add']))
-			{
-				$this->addadmin_views['dashboard_add'] = array();
-			}
-			if (!isset($this->addadmin_views['dashboard_list']))
-			{
-				$this->addadmin_views['dashboard_list'] = array();
-			}
-			if (!isset($this->addadmin_views['submenu']))
-			{
-				$this->addadmin_views['submenu'] = array();
-			}
-			if (!isset($this->addadmin_views['checkin']))
-			{
-				$this->addadmin_views['checkin'] = array();
-			}
-			if (!isset($this->addadmin_views['history']))
-			{
-				$this->addadmin_views['history'] = array();
-			}
-			if (!isset($this->addadmin_views['metadata']))
-			{
-				$this->addadmin_views['metadata'] = array();
-			}
-			if (!isset($this->addadmin_views['access']))
-			{
-				$this->addadmin_views['access'] = array();
-			}
-			if (!isset($this->addadmin_views['port']))
-			{
-				$this->addadmin_views['port'] = array();
-			}
-			if (!isset($this->addadmin_views['edit_create_site_view']))
-			{
-				$this->addadmin_views['edit_create_site_view'] = array();
-			}
-			if (!isset($this->addadmin_views['order']))
-			{
-				$this->addadmin_views['order'] = array();
+				$count = (int) count((array)$this->addadmin_views) + 3;
 			}
 			// set the admin view data linking
-			foreach ($this->views as $id)
+			foreach ($this->views as $nr => $id)
 			{
-				$this->addadmin_views['adminview'][] = $id;
-				$this->addadmin_views['icomoon'][] = 'joomla';
-				$this->addadmin_views['mainmenu'][] = 1;
-				$this->addadmin_views['dashboard_add'][] = 1;
-				$this->addadmin_views['dashboard_list'][] = 1;
-				$this->addadmin_views['submenu'][] = 1;
-				$this->addadmin_views['checkin'][] = 1;
-				$this->addadmin_views['history'][] = 1;
-				$this->addadmin_views['metadata'][] = 1;
-				$this->addadmin_views['access'][] = 1;
-				$this->addadmin_views['port'][] = 1;
-				$this->addadmin_views['edit_create_site_view'][] = 0;
-				$this->addadmin_views['order'][] = count($this->addadmin_views['order']) + 1;
+				$pointer = $count + $nr;
+				$this->addadmin_views['addadmin_views'.$pointer]['adminview'] = $id;
+				$this->addadmin_views['addadmin_views'.$pointer]['icomoon'] = 'joomla';
+				$this->addadmin_views['addadmin_views'.$pointer]['mainmenu'] = 1;
+				$this->addadmin_views['addadmin_views'.$pointer]['dashboard_add'] = 1;
+				$this->addadmin_views['addadmin_views'.$pointer]['dashboard_list'] = 1;
+				$this->addadmin_views['addadmin_views'.$pointer]['submenu'] = 1;
+				$this->addadmin_views['addadmin_views'.$pointer]['checkin'] = 1;
+				$this->addadmin_views['addadmin_views'.$pointer]['history'] = 1;
+				$this->addadmin_views['addadmin_views'.$pointer]['metadata'] = 1;
+				$this->addadmin_views['addadmin_views'.$pointer]['access'] = 1;
+				$this->addadmin_views['addadmin_views'.$pointer]['port'] = 1;
+				$this->addadmin_views['addadmin_views'.$pointer]['edit_create_site_view'] = 0;
+				$this->addadmin_views['addadmin_views'.$pointer]['order'] = $pointer + 1;
 			}
 		}
 		if (isset($this->addadmin_views) && ComponentbuilderHelper::checkArray($this->addadmin_views))
 		{
-			return json_encode($this->addadmin_views);
+			// set the field object
+			$object = new stdClass();
+			$object->joomla_component = $component_id;
+			$object->addadmin_views = json_encode($this->addadmin_views, JSON_FORCE_OBJECT);
+			$object->created = $this->today;
+			$object->created_by = $this->user->id;
+			$object->published = 1;
+			// check if it is already set
+			if ($item_id = ComponentbuilderHelper::getVar('component_admin_views', $component_id, 'joomla_component', 'id'))
+			{
+				// set ID
+				$object->id = (int) $item_id;
+				return $this->db->updateObject('#__componentbuilder_component_admin_views', $object, 'id');
+			}
+			// add to data base
+			return $this->db->insertObject('#__componentbuilder_component_admin_views', $object);
 		}
-		return '';
+		return false;
 	}	
 }
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@ -424,6 +424,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE="Add Php Before Save"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL="Add PHP (save Method - before data modeling)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETFORM="Add Php Getform"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETFORM_LABEL="Add PHP (getForm Method)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM="Add Php Getitem"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS="Add Php Getitems"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL="Add Php Getitems After All"
@ -525,11 +527,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS="CSS"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW="Css View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS="Css Views"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_HINT="// CSS for the list view"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_DESCRIPTION="Add CSS for the list view. Do not add the style tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_LABEL="CSS"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_HINT="// CSS for the edit view"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_DESCRIPTION="Add CSS for the edit view. Do not add the style tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_LABEL="CSS"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUBE="Cube"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM="Custom"
@ -626,21 +626,17 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_EACH_RECORD="In Relation to each
 COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_THE_WHOLE_VIEW="In Relation to the Whole View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT="JavaScript"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE="Javascript Views File"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_HINT="// JavaScript for the list view that is loaded in the header via a JS file"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_LABEL="Javascript"
+COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_DESCRIPTION="Add JavaScript for the list view that is loaded in the header of the document via a JS file. Do not add the script tags. PHP does not work in this field/area/file."
+COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_LABEL="Javascript (list view file)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER="Javascript Views Footer"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_HINT="// JavaScript for the list view that is loaded in the footer inside script tags"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_LABEL="Javascript"
+COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION="Add JavaScript for the list view that is loaded in the footer inside script tags. Do not add the script tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_LABEL="Javascript (list view footer)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE="Javascript View File"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_HINT="// JavaScript for the edit view that is loaded in the header via a JS file"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_LABEL="Javascript"
+COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_DESCRIPTION="Add JavaScript for the edit view that is loaded in the header of the document via a JS file. Do not add the script tags. PHP does not work in this field/area/file."
+COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_LABEL="Javascript (edit view file)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER="Javascript View Footer"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_HINT="// JavaScript for the edit view that is loaded in the footer inside script tags"
-COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript"
+COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION="Add JavaScript for the edit view that is loaded in the footer inside script tags. Do not add the script tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript (edit view footer)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JOOMLA="Joomla"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY="Key"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_DESCRIPTION="The key to use to link the child view."
@ -748,69 +744,56 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE="Phone"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE_TWO="Phone 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP="PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE="Php After Delete"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_HINT="// PHP Here that should run in the delete Method after items were deleted. Array $pks  is an array of record primary keys."
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION="Add PHP Here that should run in the delete Method after items were deleted. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL="PHP delete Method after<br /><small>Target (array) $pks  is an array of record primary keys.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH="Php After Publish"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_HINT="// PHP Here that should run in the publish Method after the item's published state has been changed. Array $pks is an array of record primary keys and $value is the published state."
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION="Add PHP Here that should run in the publish Method after the item's published state has been changed. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL="PHP publish Method after<small>Target (array) $pks is an array of record primary keys and $value is the published state.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD="Php Ajaxmethod"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_HINT="// PHP Method that should run in the AJAX Model"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL="php Ajax Method"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add PHP Methods that should run in the AJAX Model. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL="PHP Ajax Methods"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT="Php Allowedit"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_HINT="// PHP Here that should run in the allowEdit Method (to add custom access control) The record ID => ($recordId) and the user object => ($user) are already set."
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_DESCRIPTION="Add PHP Here that should run in the allowEdit Method to add custom access control. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL="PHP allowEdit Method<br /><small>The record ID => ($recordId) and the user object => ($user) are already set.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY="Php Batchcopy"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_HINT="// PHP Here that should run in the batchCopy Method (submitted values are in $values, id's are in $pks)"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION="Add PHP Here that should run in the batchCopy Method. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL="PHP batchCopy Method<br /><small>Submitted values are in $values, id's are in $pks</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE="Php Batchmove"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_HINT="// PHP Here that should run in the batchMove Method (submitted values are in $values, id's are in $pks)"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION="Add PHP Here that should run in the batchMove Method. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL="PHP batchMove Method<br /><small>submitted values are in $values, id's are in $pks</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE="Php Before Delete"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_HINT="// PHP Here that should run in the delete Method before items are deleted. Array $pks  is an array of record primary keys."
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION="Add PHP Here that should run in the delete Method before items are deleted. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL="PHP delete Method<br /><small>Target (array) $pks  is an array of record primary keys.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH="Php Before Publish"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_HINT="// PHP Here that should run in the publish Method before items published state is changed. Array $pks  is an array of record primary keys and $value is the published state."
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION="Add PHP Here that should run in the publish Method before items published state is changed. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL="PHP publish Method before<br /><small>Target (array) $pks is an array of record primary keys and $value is the published state.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE="Php Before Save"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_HINT="// PHP Here that should run in the save Method (array) $data is where all values are"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_DESCRIPTION="Add PHP Here that should run in the save Method. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_LABEL="PHP save Method before<br /><small>Target (array) $data values</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER="Php Controller"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add PHP methods for the controller that the button/s will target. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LABEL="PHP (controller methods)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST="Php Controller List"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_HINT="// PHP methods for the controller that the button will target"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION="Add PHP methods for the controller that the button will target. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL="PHP <b>List view</b> (controller methods)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT="Php Document"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="PHP script to the document method."
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_HINT="// add custom PHP script to the document method."
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL="Custom Script (Document)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="Add PHP to the document method in the view.html.php file of this view. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL="PHP document method"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM="Php Getform"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_DESCRIPTION="Add PHP Here that should run in the getForm Method. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_LABEL="PHP getForm Method<br /><small>Target (array) $data values & (bool) $loadData & (object) $form. </small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM="Php Getitem"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS="Php Getitems"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL="Php Getitems After All"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_HINT="// PHP Here that should run in the getItems Method (array) $items is where all values are"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_LABEL="PHP"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_HINT="// PHP Here that should run in the getItems Method (array) $items is where all values are"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_LABEL="PHP"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_HINT="// PHP Here that should run in the getItem Method (object) $item is where all values are"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_DESCRIPTION="Add PHP Here that should run in the getItems Method after all. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_LABEL="PHP getItems Method<br /><small>Target (array) $items values</small>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_DESCRIPTION="Add PHP Here that should run in the getItems Method. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_LABEL="PHP getItems Method<br /><small>Target (array) $items values.</small>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION="Add PHP Here that should run in the getItem Method. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL="PHP getItem Method<br /><small>Target (object) $item values.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY="Php Getlistquery"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT="// PHP Here that should run in the getlistquery Method (to add custom filtering)"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION="Add PHP Here that should run in the getlistquery Method of the model of this view. Do not add the php tags"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL="PHP getlistquery Method<br /><small>used to add custom filtering</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT="Php Import"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY="Php Import Display"
@ -836,21 +819,17 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION="Add your PHP her
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT="// PHP Here that should run in the setData Method, $package,$table,$target_headers"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL="setData Method PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL="Php Model"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_HINT="// PHP methods for the model that the controller will use"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION="Add PHP methods for the model that the controller will use. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL="PHP (model methods)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST="Php Model List"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_HINT="// PHP methods for the model that the controller will use"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION="Add PHP methods for the model that the controller will use. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_LABEL="PHP <b>List view</b> (model methods)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK="Php Postsavehook"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_HINT="// PHP Here that should run in the postSaveHook Method (object) $model is the data model object and (array) $validData is the validated data."
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_DESCRIPTION="Add PHP Here that should run in the postSaveHook Method. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_LABEL="PHP postSaveHook Method<br /><small>Target (object) $model for the data model object and (array) $validData for the validated data.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE="Php Save"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_HINT="// PHP Here that should run in the save Method (array) $data is where all values are"
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_DESCRIPTION="Add PHP Here that should run in the save Method. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_LABEL="PHP save Method<br /><small>Target (array) $data values</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PIE="Pie"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PIN="Pin"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PLAY="Play"
@ -1020,6 +999,7 @@ COM_COMPONENTBUILDER_BACKUP_FAILED_PLEASE_TRY_AGAIN_IF_THE_ERROR_CONTINUE_PLEASE
 COM_COMPONENTBUILDER_BACKUP_LOCAL_DATA_FIRST="Backup Local Data First"
 COM_COMPONENTBUILDER_BACKUP_WAS_DONE_SUCCESSFULLY="Backup was done successfully"
 COM_COMPONENTBUILDER_BACK_TO_LIBRARIES="Back to Libraries"
+COM_COMPONENTBUILDER_BADMIN_FIELDS_RELATIONSB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_NOT_UPDATED_IN_THE_CUSTOM_CODE="<b>Admin fields relations</b> id:%s mismatch in <b>field:%s</b>, and was not updated in the custom code."
 COM_COMPONENTBUILDER_BASIC_TUTORIAL_ON_GIT_BSB="Basic Tutorial on git: <b>%s</b>"
 COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_THIS_PACKAGE_BFAILEDB_CHECKSUM_VALIDATION_THIS_COULD_BE_A_SERIOUS_SECURITY_BREACH_DO_NOT_CONTINUE="<b>Best to not continue!</b><br />This package <b>FAILED</b> checksum validation, this could be a serious security breach! DO NOT CONTINUE!!!"
 COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_WE_COULD_NOT_LOAD_THE_CHECKSUM_FOR_THIS_PACKAGE_AND_SO_NO_VALIDATION_WAS_POSSIBLE_THIS_MAY_BE_DUE_TO_YOUR_NETWORK_OR_A_CHANGE_TO_THAT_PACKAGE_NAME="<b>Best to not continue!</b><br />We could not load the checksum for this package, and so no validation was possible. This may be due to your network, or a change to that package name."
@ -2453,6 +2433,8 @@ COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_DESCRIPTION="This is the TXT value to use
 COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_HINT="v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY"
 COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_LABEL="Value"
 COM_COMPONENTBUILDER_CONFIG_DONT_LOAD="Not"
+COM_COMPONENTBUILDER_CONFIG_EDITOR_DESCRIPTION="Select the editor you would like to use as the JCB global editor for all custom coding areas."
+COM_COMPONENTBUILDER_CONFIG_EDITOR_LABEL="Select an editor"
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_DESCRIPTION="The global email address that will be used to send system email."
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_HINT="Email Address Here"
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL=" From Email"
@ -2821,12 +2803,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREDIT="Credit"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS="Css"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DESCRIPTION="Add CSS to the view.css file that will be included in the header of the view. Do not add the style tags."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT="Css Document"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_DESCRIPTION="CSS script to the document method."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_HINT="// add custom CSS script to the document method. You can add in PHP like this: &quot;.$var.&quot; "
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_DESCRIPTION="CSS script to the document method. You can add in PHP like this: &quot;.$var.&quot;"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL="Custom Script (Document)"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_HINT="// CSS to the view.css"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL="CSS"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUBE="Cube"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON="Custom Button"
@ -2838,7 +2818,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL="Custom Gets"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DASHBOARD="Dashboard"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DATABASE="Database"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT="Default"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_HINT="// Add the code here."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_DESCRIPTION="Add the code here."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_LABEL="Default View"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DELETE="Delete"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DESCRIPTION="Description"
@ -2918,14 +2898,12 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_FILTER_LABEL="Select a Filter"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INT="INT"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_CSS="JavaScript & CSS"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE="Javascript File"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_HINT="// JavaScript for the view that is loaded in the header via a JS file"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL="Javascript"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add JavaScript for the edit view that is loaded in the header of the document via a JS file. Do not add the script tags. PHP does not work in this field/area/file."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL="Javascript (JS file)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JOOMLA="Joomla"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT="Js Document"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION="JS script to the document method."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_HINT="// add custom JS script to the document method. You can add in PHP like this: &quot;.$var.&quot; "
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL="Custom Script (Document)"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL="Custom Script (Document)<br /><small>add custom JS script to the document method. You can add in PHP like this: &quot;.$var.&quot;</small>"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_KEY="Key"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LAMP="Lamp"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LAST="Last"
@ -3000,32 +2978,25 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE="Phone"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE_TWO="Phone 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP="PHP"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD="Php Ajaxmethod"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_HINT="// PHP Method that should run in the AJAX Model"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL="php Ajax Method"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add PHP Methods that should run in the AJAX Model. Do not add the php tags."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL="PHP Ajax Methods"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER="Php Controller"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add PHP methods for the controller that the button/s will target. Do not add the php tags."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_LABEL="PHP (controller methods)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT="Php Document"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="PHP script to the document method."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT="// add custom PHP script to the document method."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL="Custom Script (Document)"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="Add PHP to the document method in the view.html.php file of this view. Do not add the php tags."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL="PHP document method"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW="Php Jview"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DESCRIPTION="PHP methods for the JViewLegacy class."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY="Php Jview Display"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION="PHP script for the JViewLegacy display method."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_HINT="// add custom PHP script to the JViewLegacy display method."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION="Add custom PHP script to the JViewLegacy display method."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL="Custom Script (JViewLegacy display)"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_HINT="// add custom PHP methods to the JViewLegacy class."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_LABEL="Custom Script (JViewLegacy)"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_LABEL="Custom Methods (JViewLegacy)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL="Php Model"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_HINT="// PHP methods for the model that the controller will use"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_DESCRIPTION="Add PHP methods for the model that the controller will use. Do not add the php tags."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_LABEL="PHP (model methods)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW="Php View"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION="the PHP script that must run in the head of the file."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT="// add custom PHP script to head of the file."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL="Custom Script"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PIE="Pie"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PIN="Pin"
@ -3183,8 +3154,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_N_ITEMS_UNPUBLISHED_1="%s Custom Code unpublis
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU="Custom Codes Submenu"
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC="Allows the users in this group to update the submenu of the custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE="Code"
-COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION="Add your code here! [Do not add the placeholders here]"
-COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT="// Add your custom code here **Do Not Add The Placeholders Here** it will be added to the code dynamically!"
+COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION="Add your custom code here. <b>Do Not Add The Placeholders Here</b>, it will be added to the code dynamically!"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL="Custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE="Comment Type"
 COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_DESCRIPTION="Select what type of comment is used to mark the placement of this code."
@ -3632,32 +3602,25 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_PAGINATION_LABEL="Add Pagination"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM="Php After Getitem"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS="Php After Getitems"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_HINT="// PHP Here that should run in the getItems Method (array) $items is where all values are"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_LABEL="PHP"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM_HINT="// PHP Here that should run in the getItem Method (Object) $this->_item[$pk] is the item"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM_LABEL="PHP"
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_DESCRIPTION="Add PHP Here that should run in the getItems Method. Do not add the php tags]"
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_LABEL="PHP getItems Method<br /><small>Target (array) $items values</small>"
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM_DESCRIPTION="Add PHP Here that should run in the getItem Method. Do not add the php tags."
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM_LABEL="PHP getItem Method<br /><small>Target (Object) $this->_item[$pk] is the item</small>"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM="Php Before Getitem"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS="Php Before Getitems"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS_HINT="// PHP Here that should run in the getItems Method before the items are loaded."
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS_LABEL="PHP"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_HINT="// PHP Here that should run in the getItem Method (int) $pk is the item id"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_LABEL="PHP"
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS_DESCRIPTION="Add PHP Here that should run in the getItems Method before the items are loaded. Do not add the php tags."
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS_LABEL="PHP getItems Method"
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_DESCRIPTION="Add PHP Here that should run in the getItem Method. Do not add the php tags."
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_LABEL="PHP getItem Method<br /><small>Target (int) $pk is the item id</small>"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION="Php Calculation"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_HINT="// PHP to do the calculation on any field."
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_DESCRIPTION="Add PHP to do the calculation on any field. Do not add the php tags."
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_LABEL="get Calculation  (Place all calculated/new values in variables with the following naming convention $cal__xxxxxxx)"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET="Php Custom Get"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_HINT="// Custom PHP that will be added to the method selected above as type."
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_DESCRIPTION="Add Custom PHP that will be added to the method selected above as type. Do not add the php tags."
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_LABEL="Custom get"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY="Php Getlistquery"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_HINT="// PHP Here that should run in the getlistquery Method (to add custom filtering)"
-COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_LABEL="PHP"
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_DESCRIPTION="Add PHP Here that should run in the getlistquery Method of the model of this view. Do not add the php tags"
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_LABEL="PHP getlistquery Method<br /><small>used to add custom filtering</small>"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE="Php Router Parse"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE_DESCRIPTION="Add your PHP here! [Do not add the php tags]<br />Add the php code to override the default JCB implementation of the router parse method for the related view where this dynamicGet is added."
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE_HINT="// PHP Here that should run in the parse Method -> switch | (array) $segments - the segments of the URL to parse | (array) $vars - the URL attributes to be used by the application."
@ -3933,6 +3896,7 @@ COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL="Add JavaScript (vie
 COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR="base64"
 COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY="Basic Encryption (local-DB-key)"
 COM_COMPONENTBUILDER_FIELD_BIGINT="BIGINT"
+COM_COMPONENTBUILDER_FIELD_BSB_NOT_FOUND_IN_LOCAL_DATABASE_TABLE_S_SO_IMPORTED_OF_ITS_VALUES_FAILED_PLEASE_UPDATE_YOUR_JCB_INSTALL_AND_TRY_AGAIN="Field <b>%s</b> not found in local database table (%s) so imported of its values failed, please update your JCB install and try again."
 COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION="select one of the following categories"
 COM_COMPONENTBUILDER_FIELD_CATID_LABEL="Category"
 COM_COMPONENTBUILDER_FIELD_CHAR="CHAR"
@ -3942,11 +3906,9 @@ COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC="The date this Field was created."
 COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEW="Css View"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEWS="Css Views"
-COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
-COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_HINT="// CSS for the list view"
+COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION="Add CSS for the list view. Do not add the style tags."
 COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL="CSS"
-COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
-COM_COMPONENTBUILDER_FIELD_CSS_VIEW_HINT="// CSS for the edit view"
+COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION="Add CSS for the edit view. Do not add the style tags."
 COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL="CSS"
 COM_COMPONENTBUILDER_FIELD_CURRENT_TIMESTAMP="CURRENT_TIMESTAMP"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT="Datadefault"
@ -3989,13 +3951,11 @@ COM_COMPONENTBUILDER_FIELD_INDEXES="Indexes"
 COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL="Indexes Type"
 COM_COMPONENTBUILDER_FIELD_INT="INT"
 COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER="Javascript Views Footer"
-COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
-COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_HINT="// JavaScript for the list view that is loaded in the footer inside script tags"
-COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_LABEL="Javascript"
+COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION="Add JavaScript for the list view that is loaded in the footer inside script tags. Do not add the script tags."
+COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_LABEL="Javascript (list view footer)"
 COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER="Javascript View Footer"
-COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
-COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT="// JavaScript for the edit view that is loaded in the footer inside script tags"
-COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript"
+COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION="Add JavaScript for the edit view that is loaded in the footer inside script tags. Do not add the script tags."
+COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript (edit view footer)"
 COM_COMPONENTBUILDER_FIELD_JSON="JSON"
 COM_COMPONENTBUILDER_FIELD_KEY="KEY"
 COM_COMPONENTBUILDER_FIELD_LONGTEXT="LONGTEXT"
@ -4531,12 +4491,10 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER="Creatuserhelper"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER_LABEL="Add Create User Helper Method"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN="Css Admin"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_HINT="// CSS for the entire back-end of your component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_DESCRIPTION="Add CSS for the entire back-end of your component. Do not add the style tags."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_LABEL="CSS (admin)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE="Css Site"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_HINT="// CSS for the entire front-end of your component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_DESCRIPTION="Add CSS for the entire front-end of your component. Do not add the style tags."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL="CSS (site)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE="Custom (used in custom code)"
@ -4589,8 +4547,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL="Component Image"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Import JCB Packages Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the import jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT="Javascript"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_HINT="// JavaScript for the entire back-end"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION="Add JavaScript for the entire back-end. Do not add the script tags."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL="Javascript"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_DESCRIPTION="The settings below are used when you export this component as a JCB Package, for more info on how this works please review the following tutorial (<a href='https://youtu.be/lkE0ZiSWufg' target='_blank'>https://youtu.be/lkE0ZiSWufg</a>)."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_LABEL="JCB Package Export Settings"
@ -4707,7 +4664,7 @@ Project duration: **###projectWeekTime### weeks** or **###projectMonthTime### mo
 ## Donations<br />
 <br />
 If you want to support this project, please consider donating:<br />
- * PayPal: [paypal.me/asseblief](https://www.paypal.me/asseblief)<br />
+ * PayPal: [paypal.me/asseblief](https://www.paypal.me/asseblief) (Asseblief = Please) in Afrikaans<br />
 * Bitcoin: 18vURxYpPFjvNk8BnUy1ovCAyQmY3MzkSf<br />
 * Ethereum: 0x9548144662b47327c954f3e214edb96662d51218
 </code></div>"
@ -4731,44 +4688,34 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER="Other"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT="Php Admin Event"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_DESCRIPTION="PHP script for the global helper admin event method."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_HINT="// add custom PHP script to the global helper admin event method."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_LABEL="Global Helper Admin Event"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_LABEL="Global Helper Admin Event (method)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN="Php Helper Admin"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_HINT="// The PHP abstract Methods to add to the component helper class. Only Methods! as it will directly be add as methods to the helper class!"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_LABEL="PHP"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION="Add the PHP abstract Methods to add to the component helper class. Only Methods! as it will directly be add as methods to the helper class! Do not add the php tags."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_LABEL="PHP (admin helper)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH="Php Helper Both"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_HINT="// The PHP abstract Methods to add to the component helper class. Only Methods! as it will directly be add as methods to the helper class!"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_DESCRIPTION="Add The PHP abstract Methods to add to the component helper class. Only Methods! as it will directly be add as methods to the helper class! Do not add the php tags."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_LABEL="PHP (for both admin & site)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE="Php Helper Site"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_HINT="// The PHP abstract Methods to add to the component helper class. Only Methods! as it will directly be add as methods to the helper class!"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_LABEL="PHP"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_DESCRIPTION="Add the PHP abstract Methods to add to the component helper class. Only Methods! as it will directly be add as methods to the helper class! Do not add the php tags."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_LABEL="PHP (site helper)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL="Php Method Uninstall"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_DESCRIPTION="PHP script that should run during uninstall."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_HINT="// add custom PHP script that should run during uninstall"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_LABEL="PHP Method (uninstall)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL="Php Postflight Install"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_DESCRIPTION="PHP script that should run postflight during install."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_HINT="// add custom PHP script that should run during postflight install"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_LABEL="PHP Postflight (install)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE="Php Postflight Update"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_DESCRIPTION="PHP script that should run postflight during update."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_HINT="// add custom PHP script that should run during postflight update"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_LABEL="PHP Postflight (update)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL="Php Preflight Install"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_DESCRIPTION="PHP script that should run preflight during install."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_HINT="// add custom PHP script that should run during preflight install"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_LABEL="PHP Preflight (install)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE="Php Preflight Update"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_DESCRIPTION="PHP script that should run preflight during update."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_HINT="// add custom PHP script that should run during preflight update"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_LABEL="PHP Preflight (update)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT="Php Site Event"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_DESCRIPTION="PHP script for the global helper site event method."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_HINT="// add custom PHP script to the global helper site event method."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL="Global Helper Site Event"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL="Global Helper Site Event (method)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README="Readme"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL="README.md"
@ -5091,8 +5038,8 @@ COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS="Layout Get Snippets Butt
 COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_LAYOUT_ID="Id"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT="Layout"
-COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT="// Add the layout code here. $displayData is the Object that is used inside the layout file to build displayed output"
-COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL="Layout"
+COM_COMPONENTBUILDER_LAYOUT_LAYOUT_DESCRIPTION="Add the layout code here."
+COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL="Layout<br /><small>$displayData is the Object that is used inside the layout file to build displayed output</small>"
 COM_COMPONENTBUILDER_LAYOUT_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
 COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_LABEL="Libraries"
@ -5118,7 +5065,6 @@ COM_COMPONENTBUILDER_LAYOUT_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_LAYOUT_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW="Php View"
 COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_DESCRIPTION="the PHP script that must run in the head of the file."
-COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_HINT="// add custom PHP script to head of the file."
 COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_LABEL="Custom Script"
 COM_COMPONENTBUILDER_LAYOUT_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_LAYOUT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Layout to customise the alias."
@ -5542,6 +5488,7 @@ COM_COMPONENTBUILDER_NEW_NOTICE="New Notice"
 COM_COMPONENTBUILDER_NO="No"
 COM_COMPONENTBUILDER_NONE_DB="None DB"
 COM_COMPONENTBUILDER_NONE_SELECTED="None selected"
+COM_COMPONENTBUILDER_NOTICE_BOARD="Notice Board"
 COM_COMPONENTBUILDER_NOTRANSLATION="no-translation"
 COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!"
 COM_COMPONENTBUILDER_NOT_SET="not set"
@ -5941,12 +5888,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_SITE_VIEW_CREDIT="Credit"
 COM_COMPONENTBUILDER_SITE_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_SITE_VIEW_CSS="Css"
-COM_COMPONENTBUILDER_SITE_VIEW_CSS_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
+COM_COMPONENTBUILDER_SITE_VIEW_CSS_DESCRIPTION="Add CSS to the view.css file that will be included in the header of the view. Do not add the style tags."
 COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT="Css Document"
-COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_DESCRIPTION="CSS script to the document method."
-COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_HINT="// add custom CSS script to the document method. You can add in PHP like this: &quot;.$var.&quot; "
+COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_DESCRIPTION="CSS script to the document method. You can add in PHP like this: &quot;.$var.&quot;"
 COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_LABEL="Custom Script (Document)"
-COM_COMPONENTBUILDER_SITE_VIEW_CSS_HINT="// CSS to the view.css"
 COM_COMPONENTBUILDER_SITE_VIEW_CSS_LABEL="CSS"
 COM_COMPONENTBUILDER_SITE_VIEW_CUBE="Cube"
 COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM="Custom"
@ -5959,7 +5904,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_LABEL="Custom Gets"
 COM_COMPONENTBUILDER_SITE_VIEW_DASHBOARD="Dashboard"
 COM_COMPONENTBUILDER_SITE_VIEW_DATABASE="Database"
 COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT="Default"
-COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_HINT="// Add the code here."
+COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_DESCRIPTION="Add the code here."
 COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_LABEL="Default View"
 COM_COMPONENTBUILDER_SITE_VIEW_DELETE="Delete"
 COM_COMPONENTBUILDER_SITE_VIEW_DESCRIPTION="Description"
@ -6036,14 +5981,12 @@ COM_COMPONENTBUILDER_SITE_VIEW_INPUT_FILTER_LABEL="Select a Filter"
 COM_COMPONENTBUILDER_SITE_VIEW_INT="INT"
 COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_CSS="JavaScript & CSS"
 COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE="Javascript File"
-COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
-COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_HINT="// JavaScript for the view that is loaded in the header via a JS file"
-COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL="Javascript"
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add JavaScript for the edit view that is loaded in the header of the document via a JS file. Do not add the script tags. PHP does not work in this field/area/file."
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL="Javascript (JS file)"
 COM_COMPONENTBUILDER_SITE_VIEW_JOOMLA="Joomla"
 COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT="Js Document"
 COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION="JS script to the document method."
-COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_HINT="// add custom JS script to the document method. You can add in PHP like this: &quot;.$var.&quot; "
-COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL="Custom Script (Document)"
+COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL="Custom Script (Document)<br /><small>add custom JS script to the document method. You can add in PHP like this: &quot;.$var.&quot;</small>"
 COM_COMPONENTBUILDER_SITE_VIEW_KEY="Key"
 COM_COMPONENTBUILDER_SITE_VIEW_LAMP="Lamp"
 COM_COMPONENTBUILDER_SITE_VIEW_LAST="Last"
@ -6120,32 +6063,25 @@ COM_COMPONENTBUILDER_SITE_VIEW_PHONE="Phone"
 COM_COMPONENTBUILDER_SITE_VIEW_PHONE_TWO="Phone 2"
 COM_COMPONENTBUILDER_SITE_VIEW_PHP="PHP"
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD="Php Ajaxmethod"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_HINT="// PHP Method that should run in the AJAX Model"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_LABEL="php Ajax Method"
+COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add PHP Methods that should run in the AJAX Model. Do not add the php tags."
+COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_LABEL="PHP Ajax Methods"
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER="Php Controller"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target"
+COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_DESCRIPTION="Add PHP methods for the controller that the button/s will target. Do not add the php tags."
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_LABEL="PHP (controller methods)"
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT="Php Document"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION="PHP script to the document method."
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT="// add custom PHP script to the document method."
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL="Custom Script (Document)"
+COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION="Add PHP to the document method in the view.html.php file of this view. Do not add the php tags."
+COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL="PHP document method"
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW="Php Jview"
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DESCRIPTION="PHP methods for the JViewLegacy class."
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY="Php Jview Display"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION="PHP script for the JViewLegacy display method."
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT="// add custom PHP script to the JViewLegacy display method."
+COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION="Add custom PHP script to the JViewLegacy display method."
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL="Custom Script (JViewLegacy display)"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_HINT="// add custom PHP methods to the JViewLegacy class."
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_LABEL="Custom Script (JViewLegacy)"
+COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_LABEL="Custom Methods (JViewLegacy)"
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL="Php Model"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_HINT="// PHP methods for the model that the controller will use"
+COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_DESCRIPTION="Add PHP methods for the model that the controller will use. Do not add the php tags."
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_LABEL="PHP (model methods)"
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW="Php View"
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_DESCRIPTION="the PHP script that must run in the head of the file."
-COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_HINT="// add custom PHP script to head of the file."
 COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_LABEL="Custom Script"
 COM_COMPONENTBUILDER_SITE_VIEW_PIE="Pie"
 COM_COMPONENTBUILDER_SITE_VIEW_PIN="Pin"
@ -6481,6 +6417,7 @@ COM_COMPONENTBUILDER_S_BEING_IMPORTED="%s Being Imported"
 COM_COMPONENTBUILDER_S_NOT_LINKED="%s Not Linked"
 COM_COMPONENTBUILDER_S_PLEASE_WAIT_THE_COMPONENT_IS_BEING_COMPILED="%s, please wait! The component is being compiled"
 COM_COMPONENTBUILDER_TAB="Tab"
+COM_COMPONENTBUILDER_TABLE_BSB_NOT_FOUND_IN_THE_LOCAL_DATABASE_SO_ITS_VALUES_COULD_NOT_BE_IMPORTED_PLEASE_UPDATE_YOUR_JCB_INSTALL_AND_TRY_AGAIN="Table <b>%s</b> not found in the local database so its values could not be imported, please update your JCB install and try again."
 COM_COMPONENTBUILDER_TARGET_BEHAVIOUR="Target Behaviour"
 COM_COMPONENTBUILDER_TARGET_FIELDS="Target Field/s"
 COM_COMPONENTBUILDER_TARGET_PATH="Target Path"
@ -6586,7 +6523,6 @@ COM_COMPONENTBUILDER_TEMPLATE_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_TEMPLATE_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW="Php View"
 COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_DESCRIPTION="the PHP script that must run in the head of the file."
-COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_HINT="// add custom PHP script to head of the file."
 COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_LABEL="Custom Script"
 COM_COMPONENTBUILDER_TEMPLATE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_TEMPLATE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Template to customise the alias."
@ -6595,7 +6531,7 @@ COM_COMPONENTBUILDER_TEMPLATE_SNIPPET_DESCRIPTION="Select a snippet you would li
 COM_COMPONENTBUILDER_TEMPLATE_SNIPPET_LABEL="Select a Snippet"
 COM_COMPONENTBUILDER_TEMPLATE_STATUS="Status"
 COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE="Template"
-COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_HINT="// Add the Template code here."
+COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_DESCRIPTION="Add the Template code here."
 COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_LABEL="Template"
 COM_COMPONENTBUILDER_TEMPLATE_VERSION_DESC="A count of the number of times this Template has been revised."
 COM_COMPONENTBUILDER_TEMPLATE_VERSION_LABEL="Revision"
@ -6796,8 +6732,8 @@ COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_ACCESS_THE_SERVER_DETAILS_BS_
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_CLONE_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to clone a component, please contact your system administrator for more help."
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to import a component, please contact your system administrator for more help."
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_SHARE_THE_SNIPPETS_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to share the snippets, please contact your system administrator for more help."
-COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE="You have %s %s. Adding more then 50 %s is considered bad practice."
-COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S="You have %s %s. Adding more then 50 %s is considered bad practice. Your %s page load in JCB will slowdown. You should consider decoupling some of these %s."
+COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_S_S_IS_CONSIDERED_BAD_PRACTICE="You have %s %s. Adding more then %s %s is considered bad practice."
+COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_S_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S="You have %s %s. Adding more then %s %s is considered bad practice. Your %s page load in JCB will slowdown. You should consider decoupling some of these %s."
 COM_COMPONENTBUILDER_YOU_MUST_ADD_AN_UNIQUE_FUNCTION_NAME="You must add an unique function name."
 COM_COMPONENTBUILDER_YOU_MUST_ADD_AN_UNIQUE_VALIDATION_RULE_NAME="You must add an unique validation rule name."
 COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE="You must first link an admin or a custom admin view to this component, then you can select it here"
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@ -27,6 +27,8 @@ $fields = $displayData->get('fields') ?: array(
 	'php_getitems_after_all',
 	'add_php_getlistquery',
 	'php_getlistquery',
+	'add_php_getform',
+	'php_getform',
 	'add_php_before_save',
 	'php_before_save',
 	'add_php_save',
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@ -14,7 +14,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->wadfields;
+$items	= $displayData->waefields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
--- a/admin/layouts/server/linked_components_fullwidth.php
+++ b/admin/layouts/server/linked_components_fullwidth.php
@ -14,7 +14,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->wanlinked_components;
+$items	= $displayData->waolinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
--- a/admin/models/admin_fields.php
+++ b/admin/models/admin_fields.php
@ -205,7 +205,6 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/admin_fields_conditions.php
+++ b/admin/models/admin_fields_conditions.php
@ -205,7 +205,6 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/admin_fields_relations.php
+++ b/admin/models/admin_fields_relations.php
@ -185,7 +185,6 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@ -86,6 +86,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}

+			if (!empty($item->php_import_headers))
+			{
+				// base64 Decode php_import_headers.
+				$item->php_import_headers = base64_decode($item->php_import_headers);
+			}
+
 			if (!empty($item->html_import_view))
 			{
 				// base64 Decode html_import_view.
@ -98,12 +104,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_save = base64_decode($item->php_import_save);
 			}

-			if (!empty($item->php_import_headers))
-			{
-				// base64 Decode php_import_headers.
-				$item->php_import_headers = base64_decode($item->php_import_headers);
-			}
-
 			if (!empty($item->php_getitem))
 			{
 				// base64 Decode php_getitem.
@ -134,10 +134,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_getlistquery = base64_decode($item->php_getlistquery);
 			}

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

 			if (!empty($item->css_views))
@ -146,78 +146,84 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->css_views = base64_decode($item->css_views);
 			}

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

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

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

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

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

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

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

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

+			if (!empty($item->php_before_delete))
+			{
+				// base64 Decode php_before_delete.
+				$item->php_before_delete = base64_decode($item->php_before_delete);
+			}
+
 			if (!empty($item->php_after_delete))
 			{
 				// base64 Decode php_after_delete.
@ -236,60 +242,68 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_controller = base64_decode($item->php_controller);
 			}

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

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

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

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

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

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

+			if (!empty($item->addtables))
+			{
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
+			}
+
 			if (!empty($item->addpermissions))
 			{
 				// Convert the addpermissions field to an array.
@ -314,14 +328,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->addlinked_views = $addlinked_views->toArray();
 			}

-			if (!empty($item->addtables))
-			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
-			}
-
 			if (!empty($item->alias_builder))
 			{
 				// Convert the alias_builder field to an array.
@ -500,6 +506,22 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			}
 		}

+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		// now get all the editor fields
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		// check if we found any
+		if (ComponentbuilderHelper::checkArray($editors))
+		{
+			foreach ($editors as $editor)
+			{
+				// get the field names
+				$name = (string) $editor['name'];
+				// set the field editor value (with none as fallback)
+				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
+			}
+		}
+
 		return $form;
 	}

@ -1180,6 +1202,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['system_name'] = $data['name_single'];
 		}

+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
 		{
@ -1219,19 +1254,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['addlinked_views'] = '';
 		}

-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
-
 		// Set the alias_builder items to data.
 		if (isset($data['alias_builder']) && is_array($data['alias_builder']))
 		{
@ -1271,6 +1293,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}

+		// Set the php_import_headers string to base64 string.
+		if (isset($data['php_import_headers']))
+		{
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
+		}
+
 		// Set the html_import_view string to base64 string.
 		if (isset($data['html_import_view']))
 		{
@ -1283,12 +1311,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}

-		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_import_headers']))
-		{
-			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
-		}
-
 		// Set the php_getitem string to base64 string.
 		if (isset($data['php_getitem']))
 		{
@ -1319,10 +1341,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
 		}

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

 		// Set the css_views string to base64 string.
@ -1331,78 +1353,84 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['css_views'] = base64_encode($data['css_views']);
 		}

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

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

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

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

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

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

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

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

+		// Set the php_before_delete string to base64 string.
+		if (isset($data['php_before_delete']))
+		{
+			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
+		}
+
 		// Set the php_after_delete string to base64 string.
 		if (isset($data['php_after_delete']))
 		{
@ -1421,54 +1449,54 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_controller'] = base64_encode($data['php_controller']);
 		}

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

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

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

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

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

+		// Set the php_import_setdata string to base64 string.
+		if (isset($data['php_import_setdata']))
+		{
+			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
+		}
+
 		// Set the php_import_ext string to base64 string.
 		if (isset($data['php_import_ext']))
 		{
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@ -244,12 +244,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}

+						// decode php_import_headers
+						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode html_import_view
 						$item->html_import_view = base64_decode($item->html_import_view);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode php_getitem
 						$item->php_getitem = base64_decode($item->php_getitem);
 						// decode php_getitems
@ -260,56 +260,58 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->css_view = base64_decode($item->css_view);
 						// decode php_getlistquery
 						$item->php_getlistquery = base64_decode($item->php_getlistquery);
-						// decode php_before_save
-						$item->php_before_save = base64_decode($item->php_before_save);
+						// decode php_getform
+						$item->php_getform = base64_decode($item->php_getform);
 						// decode css_views
 						$item->css_views = base64_decode($item->css_views);
+						// decode php_before_save
+						$item->php_before_save = base64_decode($item->php_before_save);
 						// decode php_save
 						$item->php_save = base64_decode($item->php_save);
-						// decode php_postsavehook
-						$item->php_postsavehook = base64_decode($item->php_postsavehook);
 						// decode javascript_view_file
 						$item->javascript_view_file = base64_decode($item->javascript_view_file);
+						// decode php_postsavehook
+						$item->php_postsavehook = base64_decode($item->php_postsavehook);
 						// decode php_allowedit
 						$item->php_allowedit = base64_decode($item->php_allowedit);
-						// decode php_batchcopy
-						$item->php_batchcopy = base64_decode($item->php_batchcopy);
 						// decode javascript_view_footer
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode php_batchcopy
+						$item->php_batchcopy = base64_decode($item->php_batchcopy);
 						// decode php_batchmove
 						$item->php_batchmove = base64_decode($item->php_batchmove);
-						// decode php_before_publish
-						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode javascript_views_file
 						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode php_before_publish
+						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode php_after_publish
 						$item->php_after_publish = base64_decode($item->php_after_publish);
-						// decode php_before_delete
-						$item->php_before_delete = base64_decode($item->php_before_delete);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode php_before_delete
+						$item->php_before_delete = base64_decode($item->php_before_delete);
 						// decode php_after_delete
 						$item->php_after_delete = base64_decode($item->php_after_delete);
 						// decode php_document
 						$item->php_document = base64_decode($item->php_document);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
 						// decode php_controller_list
 						$item->php_controller_list = base64_decode($item->php_controller_list);
-						// decode php_import_display
-						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_model_list
 						$item->php_model_list = base64_decode($item->php_model_list);
+						// decode php_import_display
+						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_import
 						$item->php_import = base64_decode($item->php_import);
-						// decode php_import_setdata
-						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode php_import_setdata
+						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_import_ext
 						$item->php_import_ext = base64_decode($item->php_import_ext);
 						// unset the values we don't want exported.
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@ -193,7 +193,7 @@ class ComponentbuilderModelAjax extends JModelList
 		}
 		return $result;
 	}
-	
+
 	protected function hasCurl()
 	{
 		return function_exists('curl_version');
@ -233,24 +233,29 @@ class ComponentbuilderModelAjax extends JModelList
 		return false;
 	}

+	protected $rowNumbers = array(
+		'admin_fields_conditions' => 80,
+		'admin_fields' => 50
+	);
+
 	protected $buttonArray = array(
-				'library_config' => 'libraries_config',
-				'library_files_folders_urls' => 'libraries_files_folders_urls',
-				'admin_fields' => 'admins_fields',
-				'admin_fields_conditions' => 'admins_fields_conditions',
-				'admin_fields_relations' => 'admins_fields_relations',
-				'validation_rule' => 'validation_rules',
-				'field' => 'fields',
-				'component_admin_views' => 'components_admin_views' ,
-				'component_site_views' => 'components_site_views',
-				'component_custom_admin_views' => 'components_custom_views',
-				'component_updates' => 'components_updates',
-				'component_mysql_tweaks' => 'components_mysql_tweaks',
-				'component_custom_admin_menus' => 'components_custom_admin_menus',
-				'component_config' => 'components_config',
-				'component_dashboard' => 'components_dashboard',
-				'component_files_folders' => 'components_files_folders',
-				'language' => true);
+		'library_config' => 'libraries_config',
+		'library_files_folders_urls' => 'libraries_files_folders_urls',
+		'admin_fields' => 'admins_fields',
+		'admin_fields_conditions' => 'admins_fields_conditions',
+		'admin_fields_relations' => 'admins_fields_relations',
+		'validation_rule' => 'validation_rules',
+		'field' => 'fields',
+		'component_admin_views' => 'components_admin_views' ,
+		'component_site_views' => 'components_site_views',
+		'component_custom_admin_views' => 'components_custom_views',
+		'component_updates' => 'components_updates',
+		'component_mysql_tweaks' => 'components_mysql_tweaks',
+		'component_custom_admin_menus' => 'components_custom_admin_menus',
+		'component_config' => 'components_config',
+		'component_dashboard' => 'components_dashboard',
+		'component_files_folders' => 'components_files_folders',
+		'language' => true);

 	public function getButton($type, $size)
 	{
@ -702,15 +707,17 @@ class ComponentbuilderModelAjax extends JModelList
 			$this->checkRepeatableConversion($fieldsData, $fieldName, $id, $idName);
 			// get the table
 			$table = $this->getSubformTable($type, $fieldsData);
+			// get row number
+			$number = (isset($this->rowNumbers[$type]) && $this->rowNumbers[$type]) ? $this->rowNumbers[$type] : false;
 			// set notice of bad practice
 			$notice = '';
-			if ($idName === 'admin_view' && isset($this->rowNumber) && $this->rowNumber > 50)
+			if ($number && isset($this->rowNumber) && $this->rowNumber > $number)
 			{
-				$notice = '<div class="alert alert-warning">' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S', $this->rowNumber, $typeName, $typeName, $typeName, $typeName) . '</div>';
+				$notice = '<div class="alert alert-warning">' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_S_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S', $this->rowNumber, $typeName, $number, $typeName, $typeName, $typeName) . '</div>';
 			}
-			elseif ($idName === 'admin_view' && isset($this->rowNumber))
+			elseif ($number && isset($this->rowNumber))
 			{
-				$notice = '<div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE', $this->rowNumber, $typeName, $typeName) . '</div>';
+				$notice = '<div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_S_S_IS_CONSIDERED_BAD_PRACTICE', $this->rowNumber, $typeName, $number, $typeName) . '</div>';
 			}
 			// return table
 			return $notice.$table;
@ -2110,7 +2117,7 @@ class ComponentbuilderModelAjax extends JModelList
 			'php_after_delete','php_after_publish','php_ajaxmethod','php_allowedit','php_batchcopy',
 			'php_batchmove','php_before_delete','php_before_publish','php_before_save','php_controller',
 			'php_controller_list','php_document','php_getitem','php_getitems','php_getitems_after_all',
-			'php_getlistquery','php_import','php_import_display','php_import_ext','php_import_headers',
+			'php_getlistquery','php_import','php_import_display','php_import_ext','php_import_headers','php_getform',
 			'php_import_save','php_import_setdata','php_model','php_model_list','php_postsavehook','php_save');
 		$targets['admin_view']['view'] = 'admin_views';
 		$targets['admin_view']['not_base64'] = array();
--- a/admin/models/component_admin_views.php
+++ b/admin/models/component_admin_views.php
@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/component_config.php
+++ b/admin/models/component_config.php
@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/component_custom_admin_menus.php
+++ b/admin/models/component_custom_admin_menus.php
@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/component_custom_admin_views.php
+++ b/admin/models/component_custom_admin_views.php
@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/component_dashboard.php
+++ b/admin/models/component_dashboard.php
@ -222,7 +222,6 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/component_files_folders.php
+++ b/admin/models/component_files_folders.php
@ -241,7 +241,6 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/component_mysql_tweaks.php
+++ b/admin/models/component_mysql_tweaks.php
@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/component_site_views.php
+++ b/admin/models/component_site_views.php
@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/component_updates.php
+++ b/admin/models/component_updates.php
@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@ -327,6 +327,22 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			}
 		}

+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		// now get all the editor fields
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		// check if we found any
+		if (ComponentbuilderHelper::checkArray($editors))
+		{
+			foreach ($editors as $editor)
+			{
+				// get the field names
+				$name = (string) $editor['name'];
+				// set the field editor value (with none as fallback)
+				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
+			}
+		}
+
 		return $form;
 	}

--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@ -184,6 +184,22 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 			}
 		}

+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		// now get all the editor fields
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		// check if we found any
+		if (ComponentbuilderHelper::checkArray($editors))
+		{
+			foreach ($editors as $editor)
+			{
+				// get the field names
+				$name = (string) $editor['name'];
+				// set the field editor value (with none as fallback)
+				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
+			}
+		}
+
 		return $form;
 	}

--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@ -334,6 +334,22 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			}
 		}

+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		// now get all the editor fields
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		// check if we found any
+		if (ComponentbuilderHelper::checkArray($editors))
+		{
+			foreach ($editors as $editor)
+			{
+				// get the field names
+				$name = (string) $editor['name'];
+				// set the field editor value (with none as fallback)
+				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
+			}
+		}
+
 		return $form;
 	}

--- a/admin/models/field.php
+++ b/admin/models/field.php
@ -231,7 +231,6 @@ class ComponentbuilderModelField extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@ -125,7 +125,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWadfields()
+	public function getWaefields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -207,13 +207,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWaefields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWaefields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWaefields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWadfields($item->store, 'store');
+					$item->store = $this->selectionTranslationWaefields($item->store, 'store');
 				}
 			}

@ -227,7 +227,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationWadfields($value,$name)
+	public function selectionTranslationWaefields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
@ -450,7 +450,6 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
--- a/admin/models/forms/custom_admin_view.js
+++ b/admin/models/forms/custom_admin_view.js
@ -9,7 +9,6 @@
 */

 // Some Global Values
-jform_vvvvvyevxx_required = false;
 jform_vvvvvyfvxy_required = false;
 jform_vvvvvygvxz_required = false;
 jform_vvvvvyhvya_required = false;
@ -17,373 +16,374 @@ jform_vvvvvyivyb_required = false;
 jform_vvvvvyjvyc_required = false;
 jform_vvvvvykvyd_required = false;
 jform_vvvvvylvye_required = false;
-jform_vvvvvylvyf_required = false;
+jform_vvvvvymvyf_required = false;
 jform_vvvvvymvyg_required = false;
 jform_vvvvvynvyh_required = false;
+jform_vvvvvyovyi_required = false;

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

-	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_display_vvvvvyg = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyg(add_php_jview_display_vvvvvyg);

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

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

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

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

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

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

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

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

-// the vvvvvye function
-function vvvvvye(add_php_view_vvvvvye)
+// the vvvvvyf function
+function vvvvvyf(add_php_view_vvvvvyf)
 {
 	// set the function logic
-	if (add_php_view_vvvvvye == 1)
+	if (add_php_view_vvvvvyf == 1)
 	{
-		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyevxx_required)
+		jQuery('#jform_php_view-lbl').closest('.control-group').show();
+		if (jform_vvvvvyfvxy_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_vvvvvyevxx_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyevxx_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_display_vvvvvyf)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyf == 1)
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvyfvxy_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_display').closest('.control-group').hide();
+		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyfvxy_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_vvvvvyfvxy_required = true;
 		}
 	}
 }

 // the vvvvvyg function
-function vvvvvyg(add_php_jview_vvvvvyg)
+function vvvvvyg(add_php_jview_display_vvvvvyg)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyg == 1)
+	if (add_php_jview_display_vvvvvyg == 1)
 	{
-		jQuery('#jform_php_jview').closest('.control-group').show();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
 		if (jform_vvvvvygvxz_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_vvvvvygvxz_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_jview').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvygvxz_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_vvvvvygvxz_required = true;
 		}
 	}
 }

 // the vvvvvyh function
-function vvvvvyh(add_php_document_vvvvvyh)
+function vvvvvyh(add_php_jview_vvvvvyh)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyh == 1)
+	if (add_php_jview_vvvvvyh == 1)
 	{
-		jQuery('#jform_php_document').closest('.control-group').show();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
 		if (jform_vvvvvyhvya_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_vvvvvyhvya_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_document').closest('.control-group').hide();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyhvya_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_vvvvvyhvya_required = true;
 		}
 	}
 }

 // the vvvvvyi function
-function vvvvvyi(add_css_document_vvvvvyi)
+function vvvvvyi(add_php_document_vvvvvyi)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyi == 1)
+	if (add_php_document_vvvvvyi == 1)
 	{
-		jQuery('#jform_css_document').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvyivyb_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_vvvvvyivyb_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css_document').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyivyb_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_vvvvvyivyb_required = true;
 		}
 	}
 }

 // the vvvvvyj function
-function vvvvvyj(add_javascript_file_vvvvvyj)
+function vvvvvyj(add_css_document_vvvvvyj)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyj == 1)
+	if (add_css_document_vvvvvyj == 1)
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').show();
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvyjvyc_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_vvvvvyjvyc_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').hide();
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyjvyc_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_vvvvvyjvyc_required = true;
 		}
 	}
 }

 // the vvvvvyk function
-function vvvvvyk(add_js_document_vvvvvyk)
+function vvvvvyk(add_javascript_file_vvvvvyk)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyk == 1)
+	if (add_javascript_file_vvvvvyk == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_javascript_file-lbl').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');
+			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_vvvvvykvyd_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_javascript_file-lbl').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');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvykvyd_required = true;
 		}
 	}
 }

 // the vvvvvyl function
-function vvvvvyl(add_custom_button_vvvvvyl)
+function vvvvvyl(add_js_document_vvvvvyl)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyl == 1)
+	if (add_js_document_vvvvvyl == 1)
 	{
-		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
-		jQuery('#jform_php_controller').closest('.control-group').show();
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
 		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');
+			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_vvvvvylvye_required = false;
 		}

-		jQuery('#jform_php_model').closest('.control-group').show();
-		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_vvvvvylvyf_required = false;
-		}
-
 	}
 	else
 	{
-		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
-		jQuery('#jform_php_controller').closest('.control-group').hide();
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
 		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');
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
 			jform_vvvvvylvye_required = true;
 		}
-		jQuery('#jform_php_model').closest('.control-group').hide();
-		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_vvvvvylvyf_required = true;
-		}
 	}
 }

 // the vvvvvym function
-function vvvvvym(add_css_vvvvvym)
+function vvvvvym(add_custom_button_vvvvvym)
 {
 	// set the function logic
-	if (add_css_vvvvvym == 1)
+	if (add_custom_button_vvvvvym == 1)
 	{
-		jQuery('#jform_css').closest('.control-group').show();
+		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
+		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
+		if (jform_vvvvvymvyf_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_vvvvvymvyf_required = false;
+		}
+
+		jQuery('#jform_php_model-lbl').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');
+			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_vvvvvymvyg_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css').closest('.control-group').hide();
+		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvymvyf_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_vvvvvymvyf_required = true;
+		}
+		jQuery('#jform_php_model-lbl').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');
+			updateFieldRequired('php_model',1);
+			jQuery('#jform_php_model').removeAttr('required');
+			jQuery('#jform_php_model').removeAttr('aria-required');
+			jQuery('#jform_php_model').removeClass('required');
 			jform_vvvvvymvyg_required = true;
 		}
 	}
 }

 // the vvvvvyn function
-function vvvvvyn(add_php_ajax_vvvvvyn)
+function vvvvvyn(add_css_vvvvvyn)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyn == 1)
+	if (add_css_vvvvvyn == 1)
 	{
-		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
-		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
+		jQuery('#jform_css-lbl').closest('.control-group').show();
 		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');
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
 			jform_vvvvvynvyh_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
-		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvynvyh_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvynvyh_required = true;
+		}
+	}
+}
+
+// the vvvvvyo function
+function vvvvvyo(add_php_ajax_vvvvvyo)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyo == 1)
+	{
+		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
+		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
+		if (jform_vvvvvyovyi_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_vvvvvyovyi_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvyovyi_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_vvvvvynvyh_required = true;
+			jform_vvvvvyovyi_required = true;
 		}
 	}
 }
--- a/admin/models/forms/custom_admin_view.xml
+++ b/admin/models/forms/custom_admin_view.xml
@ -154,44 +154,56 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Php_jview_display Field. Type: Textarea. (joomla) -->
+		<!-- Php_jview_display Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_jview_display"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_HINT"
 			required="true"
+			validate="code"
 		/>
-		<!-- Php_view Field. Type: Textarea. (joomla) -->
+		<!-- Php_view Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_view"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT"
 			required="true"
+			validate="code"
 		/>
-		<!-- Php_document Field. Type: Textarea. (joomla) -->
+		<!-- Php_document Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_document"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="50"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
 		<field
@ -368,17 +380,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Default Field. Type: Textarea. (joomla) -->
+		<!-- Default Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="default"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_LABEL"
-			rows="20"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_DESCRIPTION"
+			width="100%"
+			height="500px"
 			cols="15"
-			class="text_area span12"
+			rows="30"
+			buttons="no"
+			syntax="html"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
@ -392,18 +409,22 @@
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
 			directory=""
 		/>
-		<!-- Php_jview Field. Type: Textarea. (joomla) -->
+		<!-- Php_jview Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_jview"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_libraries_selection" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION" heading="h4" class="alert alert-info note_libraries_selection" />
@ -434,18 +455,22 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Js_document Field. Type: Textarea. (joomla) -->
+		<!-- Js_document Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="js_document"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_css_document Field. Type: Radio. (joomla) -->
 		<field
@ -461,18 +486,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Javascript_file Field. Type: Textarea. (joomla) -->
+		<!-- Javascript_file Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="javascript_file"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
@ -480,18 +509,22 @@
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Css_document Field. Type: Textarea. (joomla) -->
+		<!-- Css_document Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="css_document"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Custom_get Field. Type: Customgets. (custom) -->
 		<field
@ -501,18 +534,22 @@
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
 			multiple="true"
 		/>
-		<!-- Css Field. Type: Textarea. (joomla) -->
+		<!-- Css Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="css"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Main_get Field. Type: Maingets. (custom) -->
 		<field
@ -524,18 +561,22 @@
 			required="true"
 			button="true"
 		/>
-		<!-- Php_ajaxmethod Field. Type: Textarea. (joomla) -->
+		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_ajaxmethod"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Dynamic_get Field. Type: Dynamicgets. (custom) -->
 		<field
@ -1127,33 +1168,41 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_controller Field. Type: Textarea. (joomla) -->
+		<!-- Php_controller Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_controller"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT"
 			required="false"
+			validate="code"
 		/>
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
-		<!-- Php_model Field. Type: Textarea. (joomla) -->
+		<!-- Php_model Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_model"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_HINT"
 			required="false"
+			validate="code"
 		/>
 	</fieldset>
 	
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@ -9,43 +9,43 @@
 */

 // Some Global Values
-jform_vvvvwaavzp_required = false;
 jform_vvvvwabvzq_required = false;
-jform_vvvvwabvzr_required = false;
-jform_vvvvwabvzs_required = false;
+jform_vvvvwacvzr_required = false;
+jform_vvvvwacvzs_required = false;
+jform_vvvvwacvzt_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	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();
 	vvvvwab(target_vvvvwab);

 	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);
+	vvvvwac(target_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);
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_vvvvwad);
+
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);
 });

-// the vvvvwaa function
-function vvvvwaa(target_vvvvwaa)
+// the vvvvwab function
+function vvvvwab(target_vvvvwab)
 {
 	// set the function logic
-	if (target_vvvvwaa == 2)
+	if (target_vvvvwab == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvwaavzp_required)
+		if (jform_vvvvwabvzq_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_vvvvwaavzp_required = false;
+			jform_vvvvwabvzq_required = false;
 		}

 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@ -54,99 +54,99 @@ function vvvvwaa(target_vvvvwaa)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvwaavzp_required)
+		if (!jform_vvvvwabvzq_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_vvvvwaavzp_required = true;
+			jform_vvvvwabvzq_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }

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

 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwabvzr_required)
+		if (jform_vvvvwacvzs_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwabvzr_required = false;
+			jform_vvvvwacvzs_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_vvvvwabvzs_required)
+		if (jform_vvvvwacvzt_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwabvzs_required = false;
+			jform_vvvvwacvzt_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvwabvzq_required)
+		if (!jform_vvvvwacvzr_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwabvzq_required = true;
+			jform_vvvvwacvzr_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwabvzr_required)
+		if (!jform_vvvvwacvzs_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwabvzr_required = true;
+			jform_vvvvwacvzs_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_vvvvwabvzs_required)
+		if (!jform_vvvvwacvzt_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwabvzs_required = true;
+			jform_vvvvwacvzt_required = true;
 		}
 	}
 }

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

-// the vvvvwad function
-function vvvvwad(type_vvvvwad,target_vvvvwad)
+// the vvvvwae function
+function vvvvwae(type_vvvvwae,target_vvvvwae)
 {
 	// set the function logic
-	if (type_vvvvwad == 1 && target_vvvvwad == 1)
+	if (type_vvvvwae == 1 && target_vvvvwae == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
--- a/admin/models/forms/custom_code.xml
+++ b/admin/models/forms/custom_code.xml
@ -185,18 +185,22 @@
 		/>
 		<!-- Note_placeholders_explained Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_placeholders_explained" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION" heading="h4" class="note_placeholders_explained" />
-		<!-- Code Field. Type: Textarea. (joomla) -->
+		<!-- Code Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="code"
 			label="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_jcb_placeholder" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION" heading="h4" class="span12 note_jcb_placeholder" />
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
--- a/admin/models/forms/dynamic_get.xml
+++ b/admin/models/forms/dynamic_get.xml
@ -244,18 +244,22 @@
 		</field>
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
-		<!-- Php_custom_get Field. Type: Textarea. (joomla) -->
+		<!-- Php_custom_get Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_custom_get"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Db_selection Field. Type: Textarea. (joomla) -->
 		<field
@ -321,18 +325,22 @@
 			message="COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_MESSAGE"
 			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_HINT"
 		/>
-		<!-- Php_before_getitem Field. Type: Textarea. (joomla) -->
+		<!-- Php_before_getitem Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_before_getitem"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Pagination Field. Type: Radio. (joomla) -->
 		<field
@ -349,18 +357,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
 		</field>
-		<!-- Php_after_getitem Field. Type: Textarea. (joomla) -->
+		<!-- Php_after_getitem Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_after_getitem"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
@ -368,18 +380,22 @@
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Php_getlistquery Field. Type: Textarea. (joomla) -->
+		<!-- Php_getlistquery Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_getlistquery"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Filter Field. Type: Subform. (joomla) -->
 		<field
@ -495,18 +511,22 @@
 				/>
 			</form>
 		</field>
-		<!-- Php_before_getitems Field. Type: Textarea. (joomla) -->
+		<!-- Php_before_getitems Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_before_getitems"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Where Field. Type: Subform. (joomla) -->
 		<field
@ -587,18 +607,22 @@
 				/>
 			</form>
 		</field>
-		<!-- Php_after_getitems Field. Type: Textarea. (joomla) -->
+		<!-- Php_after_getitems Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_after_getitems"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Order Field. Type: Subform. (joomla) -->
 		<field
@ -1086,18 +1110,22 @@
 				/>
 			</form>
 		</field>
-		<!-- Php_calculation Field. Type: Textarea. (joomla) -->
+		<!-- Php_calculation Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_calculation"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Join_db_table Field. Type: Subform. (joomla) -->
 		<field
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@ -9,151 +9,96 @@
 */

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

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

-	var datadefault_vvvvwan = jQuery("#jform_datadefault").val();
-	vvvvwan(datadefault_vvvvwan);
-
-	var datatype_vvvvwao = jQuery("#jform_datatype").val();
-	vvvvwao(datatype_vvvvwao);
+	var datadefault_vvvvwao = jQuery("#jform_datadefault").val();
+	vvvvwao(datadefault_vvvvwao);

 	var datatype_vvvvwap = jQuery("#jform_datatype").val();
 	vvvvwap(datatype_vvvvwap);

-	var store_vvvvwaq = jQuery("#jform_store").val();
 	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
-	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
+	vvvvwaq(datatype_vvvvwaq);

-	var add_css_view_vvvvwas = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwas(add_css_view_vvvvwas);
+	var store_vvvvwar = jQuery("#jform_store").val();
+	var datatype_vvvvwar = jQuery("#jform_datatype").val();
+	vvvvwar(store_vvvvwar,datatype_vvvvwar);

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

-	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_css_views_vvvvwau = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwau(add_css_views_vvvvwau);

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

-// the vvvvwam function
-function vvvvwam(datalenght_vvvvwam)
+// the vvvvwan function
+function vvvvwan(datalenght_vvvvwan)
 {
-	if (isSet(datalenght_vvvvwam) && datalenght_vvvvwam.constructor !== Array)
+	if (isSet(datalenght_vvvvwan) && datalenght_vvvvwan.constructor !== Array)
 	{
-		var temp_vvvvwam = datalenght_vvvvwam;
-		var datalenght_vvvvwam = [];
-		datalenght_vvvvwam.push(temp_vvvvwam);
+		var temp_vvvvwan = datalenght_vvvvwan;
+		var datalenght_vvvvwan = [];
+		datalenght_vvvvwan.push(temp_vvvvwan);
 	}
-	else if (!isSet(datalenght_vvvvwam))
+	else if (!isSet(datalenght_vvvvwan))
 	{
-		var datalenght_vvvvwam = [];
+		var datalenght_vvvvwan = [];
 	}
-	var datalenght = datalenght_vvvvwam.some(datalenght_vvvvwam_SomeFunc);
+	var datalenght = datalenght_vvvvwan.some(datalenght_vvvvwan_SomeFunc);


 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwamvzv_required)
+		if (jform_vvvvwanvzw_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_vvvvwamvzv_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwamvzv_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 datalenght_vvvvwam_SomeFunc(datalenght_vvvvwam)
-{
-	// set the function logic
-	if (datalenght_vvvvwam == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwan function
-function vvvvwan(datadefault_vvvvwan)
-{
-	if (isSet(datadefault_vvvvwan) && datadefault_vvvvwan.constructor !== Array)
-	{
-		var temp_vvvvwan = datadefault_vvvvwan;
-		var datadefault_vvvvwan = [];
-		datadefault_vvvvwan.push(temp_vvvvwan);
-	}
-	else if (!isSet(datadefault_vvvvwan))
-	{
-		var datadefault_vvvvwan = [];
-	}
-	var datadefault = datadefault_vvvvwan.some(datadefault_vvvvwan_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwanvzw_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_other').closest('.control-group').hide();
+		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		if (!jform_vvvvwanvzw_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_vvvvwanvzw_required = true;
 		}
 	}
 }

 // the vvvvwan Some function
-function datadefault_vvvvwan_SomeFunc(datadefault_vvvvwan)
+function datalenght_vvvvwan_SomeFunc(datalenght_vvvvwan)
 {
 	// set the function logic
-	if (datadefault_vvvvwan == 'Other')
+	if (datalenght_vvvvwan == 'Other')
 	{
 		return true;
 	}
@ -161,58 +106,54 @@ function datadefault_vvvvwan_SomeFunc(datadefault_vvvvwan)
 }

 // the vvvvwao function
-function vvvvwao(datatype_vvvvwao)
+function vvvvwao(datadefault_vvvvwao)
 {
-	if (isSet(datatype_vvvvwao) && datatype_vvvvwao.constructor !== Array)
+	if (isSet(datadefault_vvvvwao) && datadefault_vvvvwao.constructor !== Array)
 	{
-		var temp_vvvvwao = datatype_vvvvwao;
-		var datatype_vvvvwao = [];
-		datatype_vvvvwao.push(temp_vvvvwao);
+		var temp_vvvvwao = datadefault_vvvvwao;
+		var datadefault_vvvvwao = [];
+		datadefault_vvvvwao.push(temp_vvvvwao);
 	}
-	else if (!isSet(datatype_vvvvwao))
+	else if (!isSet(datadefault_vvvvwao))
 	{
-		var datatype_vvvvwao = [];
+		var datadefault_vvvvwao = [];
 	}
-	var datatype = datatype_vvvvwao.some(datatype_vvvvwao_SomeFunc);
+	var datadefault = datadefault_vvvvwao.some(datadefault_vvvvwao_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_vvvvwaovzx_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_vvvvwaovzx_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_vvvvwaovzx_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_vvvvwaovzx_required = true;
 		}
 	}
 }

 // the vvvvwao Some function
-function datatype_vvvvwao_SomeFunc(datatype_vvvvwao)
+function datadefault_vvvvwao_SomeFunc(datadefault_vvvvwao)
 {
 	// set the function logic
-	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')
+	if (datadefault_vvvvwao == 'Other')
 	{
 		return true;
 	}
@ -238,26 +179,30 @@ function vvvvwap(datatype_vvvvwap)
 	// 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_vvvvwapvzy_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_vvvvwapvzy_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_vvvvwapvzy_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_vvvvwapvzy_required = true;
 		}
 	}
@ -267,7 +212,7 @@ function vvvvwap(datatype_vvvvwap)
 function datatype_vvvvwap_SomeFunc(datatype_vvvvwap)
 {
 	// set the function logic
-	if (datatype_vvvvwap == 'CHAR' || datatype_vvvvwap == 'VARCHAR' || datatype_vvvvwap == 'TEXT' || datatype_vvvvwap == 'MEDIUMTEXT' || datatype_vvvvwap == 'LONGTEXT')
+	if (datatype_vvvvwap == 'CHAR' || datatype_vvvvwap == 'VARCHAR' || datatype_vvvvwap == 'DATETIME' || datatype_vvvvwap == 'DATE' || datatype_vvvvwap == 'TIME' || datatype_vvvvwap == 'INT' || datatype_vvvvwap == 'TINYINT' || datatype_vvvvwap == 'BIGINT' || datatype_vvvvwap == 'FLOAT' || datatype_vvvvwap == 'DECIMAL' || datatype_vvvvwap == 'DOUBLE')
 	{
 		return true;
 	}
@ -275,20 +220,8 @@ function datatype_vvvvwap_SomeFunc(datatype_vvvvwap)
 }

 // the vvvvwaq function
-function vvvvwaq(store_vvvvwaq,datatype_vvvvwaq)
+function 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;
@ -303,27 +236,33 @@ function vvvvwaq(store_vvvvwaq,datatype_vvvvwaq)


 	// 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_vvvvwaqvzz_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwaqvzz_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
+		if (!jform_vvvvwaqvzz_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwaqvzz_required = true;
+		}
 	}
 }

-// the vvvvwaq Some function
-function store_vvvvwaq_SomeFunc(store_vvvvwaq)
-{
-	// set the function logic
-	if (store_vvvvwaq == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwaq Some function
 function datatype_vvvvwaq_SomeFunc(datatype_vvvvwaq)
 {
@ -335,126 +274,187 @@ function datatype_vvvvwaq_SomeFunc(datatype_vvvvwaq)
 	return false;
 }

-// the vvvvwas function
-function vvvvwas(add_css_view_vvvvwas)
+// the vvvvwar function
+function vvvvwar(store_vvvvwar,datatype_vvvvwar)
+{
+	if (isSet(store_vvvvwar) && store_vvvvwar.constructor !== Array)
+	{
+		var temp_vvvvwar = store_vvvvwar;
+		var store_vvvvwar = [];
+		store_vvvvwar.push(temp_vvvvwar);
+	}
+	else if (!isSet(store_vvvvwar))
+	{
+		var store_vvvvwar = [];
+	}
+	var store = store_vvvvwar.some(store_vvvvwar_SomeFunc);
+
+	if (isSet(datatype_vvvvwar) && datatype_vvvvwar.constructor !== Array)
+	{
+		var temp_vvvvwar = datatype_vvvvwar;
+		var datatype_vvvvwar = [];
+		datatype_vvvvwar.push(temp_vvvvwar);
+	}
+	else if (!isSet(datatype_vvvvwar))
+	{
+		var datatype_vvvvwar = [];
+	}
+	var datatype = datatype_vvvvwar.some(datatype_vvvvwar_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 vvvvwar Some function
+function store_vvvvwar_SomeFunc(store_vvvvwar)
 {
 	// set the function logic
-	if (add_css_view_vvvvwas == 1)
+	if (store_vvvvwar == 4)
 	{
-		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwasvzz_required)
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwar Some function
+function datatype_vvvvwar_SomeFunc(datatype_vvvvwar)
+{
+	// set the function logic
+	if (datatype_vvvvwar == 'CHAR' || datatype_vvvvwar == 'VARCHAR' || datatype_vvvvwar == 'TEXT' || datatype_vvvvwar == 'MEDIUMTEXT' || datatype_vvvvwar == 'LONGTEXT')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwat function
+function vvvvwat(add_css_view_vvvvwat)
+{
+	// set the function logic
+	if (add_css_view_vvvvwat == 1)
+	{
+		jQuery('#jform_css_view-lbl').closest('.control-group').show();
+		if (jform_vvvvwatwaa_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_vvvvwasvzz_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwasvzz_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_css_views_vvvvwat)
-{
-	// set the function logic
-	if (add_css_views_vvvvwat == 1)
-	{
-		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwatwaa_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_css_views').closest('.control-group').hide();
+		jQuery('#jform_css_view-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwatwaa_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_vvvvwatwaa_required = true;
 		}
 	}
 }

 // the vvvvwau function
-function vvvvwau(add_javascript_view_footer_vvvvwau)
+function vvvvwau(add_css_views_vvvvwau)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwau == 1)
+	if (add_css_views_vvvvwau == 1)
 	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
+		jQuery('#jform_css_views-lbl').closest('.control-group').show();
 		if (jform_vvvvwauwab_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_vvvvwauwab_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+		jQuery('#jform_css_views-lbl').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');
+			updateFieldRequired('css_views',1);
+			jQuery('#jform_css_views').removeAttr('required');
+			jQuery('#jform_css_views').removeAttr('aria-required');
+			jQuery('#jform_css_views').removeClass('required');
 			jform_vvvvwauwab_required = true;
 		}
 	}
 }

 // the vvvvwav function
-function vvvvwav(add_javascript_views_footer_vvvvwav)
+function vvvvwav(add_javascript_view_footer_vvvvwav)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwav == 1)
+	if (add_javascript_view_footer_vvvvwav == 1)
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		jQuery('#jform_javascript_view_footer-lbl').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');
+			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_vvvvwavwac_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwavwac_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_vvvvwavwac_required = true;
+		}
+	}
+}
+
+// the vvvvwaw function
+function vvvvwaw(add_javascript_views_footer_vvvvwaw)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwaw == 1)
+	{
+		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
+		if (jform_vvvvwawwad_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_vvvvwawwad_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide();
+		if (!jform_vvvvwawwad_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_vvvvwavwac_required = true;
+			jform_vvvvwawwad_required = true;
 		}
 	}
 }
--- a/admin/models/forms/field.xml
+++ b/admin/models/forms/field.xml
@ -219,18 +219,22 @@
 			description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
 			class="inputbox"
 		/>
-		<!-- Css_views Field. Type: Textarea. (joomla) -->
+		<!-- Css_views Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="css_views"
 			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_css_views Field. Type: Radio. (joomla) -->
 		<field
@ -246,18 +250,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</field>
-		<!-- Css_view Field. Type: Textarea. (joomla) -->
+		<!-- Css_view Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="css_view"
 			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_css_view Field. Type: Radio. (joomla) -->
 		<field
@ -397,33 +405,41 @@
 		</field>
 		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
-		<!-- Javascript_view_footer Field. Type: Textarea. (joomla) -->
+		<!-- Javascript_view_footer Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="javascript_view_footer"
 			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Note_no_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_no_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_no_database_settings_needed" />
-		<!-- Javascript_views_footer Field. Type: Textarea. (joomla) -->
+		<!-- Javascript_views_footer Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="javascript_views_footer"
 			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@ -9,24 +9,21 @@
 */

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

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

-	var type_vvvvwbi = jQuery("#jform_type").val();
-	vvvvwbi(type_vvvvwbi);
+	var location_vvvvwbi = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbi(location_vvvvwbi);

 	var type_vvvvwbj = jQuery("#jform_type").val();
 	vvvvwbj(type_vvvvwbj);
@ -34,127 +31,75 @@ jQuery(document).ready(function()
 	var type_vvvvwbk = jQuery("#jform_type").val();
 	vvvvwbk(type_vvvvwbk);

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

-// the vvvvwbg function
-function vvvvwbg(location_vvvvwbg)
-{
-	// set the function logic
-	if (location_vvvvwbg == 1)
-	{
-		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwbgwao_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_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwbgwao_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(location_vvvvwbh)
 {
 	// set the function logic
-	if (location_vvvvwbh == 2)
+	if (location_vvvvwbh == 1)
 	{
-		jQuery('#jform_site_view').closest('.control-group').show();
+		jQuery('#jform_admin_view').closest('.control-group').show();
 		if (jform_vvvvwbhwap_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_vvvvwbhwap_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
+		jQuery('#jform_admin_view').closest('.control-group').hide();
 		if (!jform_vvvvwbhwap_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_vvvvwbhwap_required = true;
 		}
 	}
 }

 // the vvvvwbi function
-function vvvvwbi(type_vvvvwbi)
+function vvvvwbi(location_vvvvwbi)
 {
-	if (isSet(type_vvvvwbi) && type_vvvvwbi.constructor !== Array)
+	// set the function logic
+	if (location_vvvvwbi == 2)
 	{
-		var temp_vvvvwbi = type_vvvvwbi;
-		var type_vvvvwbi = [];
-		type_vvvvwbi.push(temp_vvvvwbi);
-	}
-	else if (!isSet(type_vvvvwbi))
-	{
-		var type_vvvvwbi = [];
-	}
-	var type = type_vvvvwbi.some(type_vvvvwbi_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
+		jQuery('#jform_site_view').closest('.control-group').show();
 		if (jform_vvvvwbiwaq_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_vvvvwbiwaq_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_url').closest('.control-group').hide();
+		jQuery('#jform_site_view').closest('.control-group').hide();
 		if (!jform_vvvvwbiwaq_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_vvvvwbiwaq_required = true;
 		}
 	}
 }

-// the vvvvwbi Some function
-function type_vvvvwbi_SomeFunc(type_vvvvwbi)
-{
-	// set the function logic
-	if (type_vvvvwbi == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbj function
 function vvvvwbj(type_vvvvwbj)
 {
@ -174,26 +119,26 @@ function vvvvwbj(type_vvvvwbj)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_article').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
 		if (jform_vvvvwbjwar_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_vvvvwbjwar_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
 		if (!jform_vvvvwbjwar_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_vvvvwbjwar_required = true;
 		}
 	}
@ -203,7 +148,7 @@ function vvvvwbj(type_vvvvwbj)
 function type_vvvvwbj_SomeFunc(type_vvvvwbj)
 {
 	// set the function logic
-	if (type_vvvvwbj == 1)
+	if (type_vvvvwbj == 3)
 	{
 		return true;
 	}
@ -229,26 +174,26 @@ function vvvvwbk(type_vvvvwbk)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_article').closest('.control-group').show();
 		if (jform_vvvvwbkwas_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_vvvvwbkwas_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_article').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');
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
 			jform_vvvvwbkwas_required = true;
 		}
 	}
@ -258,7 +203,7 @@ function vvvvwbk(type_vvvvwbk)
 function type_vvvvwbk_SomeFunc(type_vvvvwbk)
 {
 	// set the function logic
-	if (type_vvvvwbk == 2)
+	if (type_vvvvwbk == 1)
 	{
 		return true;
 	}
@ -266,32 +211,87 @@ function type_vvvvwbk_SomeFunc(type_vvvvwbk)
 }

 // the vvvvwbl function
-function vvvvwbl(target_vvvvwbl)
+function vvvvwbl(type_vvvvwbl)
 {
-	// set the function logic
-	if (target_vvvvwbl == 1)
+	if (isSet(type_vvvvwbl) && type_vvvvwbl.constructor !== Array)
 	{
-		jQuery('#jform_groups').closest('.control-group').show();
+		var temp_vvvvwbl = type_vvvvwbl;
+		var type_vvvvwbl = [];
+		type_vvvvwbl.push(temp_vvvvwbl);
+	}
+	else if (!isSet(type_vvvvwbl))
+	{
+		var type_vvvvwbl = [];
+	}
+	var type = type_vvvvwbl.some(type_vvvvwbl_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').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');
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
 			jform_vvvvwblwat_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_groups').closest('.control-group').hide();
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwblwat_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwblwat_required = true;
+		}
+	}
+}
+
+// the vvvvwbl Some function
+function type_vvvvwbl_SomeFunc(type_vvvvwbl)
+{
+	// set the function logic
+	if (type_vvvvwbl == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbm function
+function vvvvwbm(target_vvvvwbm)
+{
+	// set the function logic
+	if (target_vvvvwbm == 1)
+	{
+		jQuery('#jform_groups').closest('.control-group').show();
+		if (jform_vvvvwbmwau_required)
+		{
+			updateFieldRequired('groups',0);
+			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_groups').addClass('required');
+			jform_vvvvwbmwau_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_groups').closest('.control-group').hide();
+		if (!jform_vvvvwbmwau_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwblwat_required = true;
+			jform_vvvvwbmwau_required = true;
 		}
 	}
 }
--- a/admin/models/forms/joomla_component.js
+++ b/admin/models/forms/joomla_component.js
@ -130,7 +130,7 @@ function vvvvvvv(add_php_helper_admin_vvvvvvv)
 	// set the function logic
 	if (add_php_helper_admin_vvvvvvv == 1)
 	{
-		jQuery('#jform_php_helper_admin').closest('.control-group').show();
+		jQuery('#jform_php_helper_admin-lbl').closest('.control-group').show();
 		if (jform_vvvvvvvvvv_required)
 		{
 			updateFieldRequired('php_helper_admin',0);
@ -143,7 +143,7 @@ function vvvvvvv(add_php_helper_admin_vvvvvvv)
 	}
 	else
 	{
-		jQuery('#jform_php_helper_admin').closest('.control-group').hide();
+		jQuery('#jform_php_helper_admin-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvvvvvv_required)
 		{
 			updateFieldRequired('php_helper_admin',1);
@ -161,7 +161,7 @@ function vvvvvvw(add_php_helper_site_vvvvvvw)
 	// set the function logic
 	if (add_php_helper_site_vvvvvvw == 1)
 	{
-		jQuery('#jform_php_helper_site').closest('.control-group').show();
+		jQuery('#jform_php_helper_site-lbl').closest('.control-group').show();
 		if (jform_vvvvvvwvvw_required)
 		{
 			updateFieldRequired('php_helper_site',0);
@ -174,7 +174,7 @@ function vvvvvvw(add_php_helper_site_vvvvvvw)
 	}
 	else
 	{
-		jQuery('#jform_php_helper_site').closest('.control-group').hide();
+		jQuery('#jform_php_helper_site-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvvwvvw_required)
 		{
 			updateFieldRequired('php_helper_site',1);
@ -192,7 +192,7 @@ function vvvvvvx(add_php_helper_both_vvvvvvx)
 	// set the function logic
 	if (add_php_helper_both_vvvvvvx == 1)
 	{
-		jQuery('#jform_php_helper_both').closest('.control-group').show();
+		jQuery('#jform_php_helper_both-lbl').closest('.control-group').show();
 		if (jform_vvvvvvxvvx_required)
 		{
 			updateFieldRequired('php_helper_both',0);
@ -205,7 +205,7 @@ function vvvvvvx(add_php_helper_both_vvvvvvx)
 	}
 	else
 	{
-		jQuery('#jform_php_helper_both').closest('.control-group').hide();
+		jQuery('#jform_php_helper_both-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvvxvvx_required)
 		{
 			updateFieldRequired('php_helper_both',1);
@ -223,7 +223,7 @@ function vvvvvvy(add_css_admin_vvvvvvy)
 	// set the function logic
 	if (add_css_admin_vvvvvvy == 1)
 	{
-		jQuery('#jform_css_admin').closest('.control-group').show();
+		jQuery('#jform_css_admin-lbl').closest('.control-group').show();
 		if (jform_vvvvvvyvvy_required)
 		{
 			updateFieldRequired('css_admin',0);
@ -236,7 +236,7 @@ function vvvvvvy(add_css_admin_vvvvvvy)
 	}
 	else
 	{
-		jQuery('#jform_css_admin').closest('.control-group').hide();
+		jQuery('#jform_css_admin-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvvyvvy_required)
 		{
 			updateFieldRequired('css_admin',1);
@ -254,7 +254,7 @@ function vvvvvvz(add_css_site_vvvvvvz)
 	// set the function logic
 	if (add_css_site_vvvvvvz == 1)
 	{
-		jQuery('#jform_css_site').closest('.control-group').show();
+		jQuery('#jform_css_site-lbl').closest('.control-group').show();
 		if (jform_vvvvvvzvvz_required)
 		{
 			updateFieldRequired('css_site',0);
@ -267,7 +267,7 @@ function vvvvvvz(add_css_site_vvvvvvz)
 	}
 	else
 	{
-		jQuery('#jform_css_site').closest('.control-group').hide();
+		jQuery('#jform_css_site-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvvzvvz_required)
 		{
 			updateFieldRequired('css_site',1);
@ -285,7 +285,7 @@ function vvvvvwa(add_javascript_vvvvvwa)
 	// set the function logic
 	if (add_javascript_vvvvvwa == 1)
 	{
-		jQuery('#jform_javascript').closest('.control-group').show();
+		jQuery('#jform_javascript-lbl').closest('.control-group').show();
 		if (jform_vvvvvwavwa_required)
 		{
 			updateFieldRequired('javascript',0);
@ -298,7 +298,7 @@ function vvvvvwa(add_javascript_vvvvvwa)
 	}
 	else
 	{
-		jQuery('#jform_javascript').closest('.control-group').hide();
+		jQuery('#jform_javascript-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvwavwa_required)
 		{
 			updateFieldRequired('javascript',1);
@ -423,7 +423,7 @@ function vvvvvwf(add_admin_event_vvvvvwf)
 	// set the function logic
 	if (add_admin_event_vvvvvwf == 1)
 	{
-		jQuery('#jform_php_admin_event').closest('.control-group').show();
+		jQuery('#jform_php_admin_event-lbl').closest('.control-group').show();
 		if (jform_vvvvvwfvwe_required)
 		{
 			updateFieldRequired('php_admin_event',0);
@ -436,7 +436,7 @@ function vvvvvwf(add_admin_event_vvvvvwf)
 	}
 	else
 	{
-		jQuery('#jform_php_admin_event').closest('.control-group').hide();
+		jQuery('#jform_php_admin_event-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvwfvwe_required)
 		{
 			updateFieldRequired('php_admin_event',1);
@ -454,7 +454,7 @@ function vvvvvwg(add_site_event_vvvvvwg)
 	// set the function logic
 	if (add_site_event_vvvvvwg == 1)
 	{
-		jQuery('#jform_php_site_event').closest('.control-group').show();
+		jQuery('#jform_php_site_event-lbl').closest('.control-group').show();
 		if (jform_vvvvvwgvwf_required)
 		{
 			updateFieldRequired('php_site_event',0);
@ -467,7 +467,7 @@ function vvvvvwg(add_site_event_vvvvvwg)
 	}
 	else
 	{
-		jQuery('#jform_php_site_event').closest('.control-group').hide();
+		jQuery('#jform_php_site_event-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvwgvwf_required)
 		{
 			updateFieldRequired('php_site_event',1);
@ -564,7 +564,7 @@ function vvvvvwl(add_php_postflight_install_vvvvvwl)
 	// set the function logic
 	if (add_php_postflight_install_vvvvvwl == 1)
 	{
-		jQuery('#jform_php_postflight_install').closest('.control-group').show();
+		jQuery('#jform_php_postflight_install-lbl').closest('.control-group').show();
 		if (jform_vvvvvwlvwh_required)
 		{
 			updateFieldRequired('php_postflight_install',0);
@ -577,7 +577,7 @@ function vvvvvwl(add_php_postflight_install_vvvvvwl)
 	}
 	else
 	{
-		jQuery('#jform_php_postflight_install').closest('.control-group').hide();
+		jQuery('#jform_php_postflight_install-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvwlvwh_required)
 		{
 			updateFieldRequired('php_postflight_install',1);
@ -595,7 +595,7 @@ function vvvvvwm(add_php_postflight_update_vvvvvwm)
 	// set the function logic
 	if (add_php_postflight_update_vvvvvwm == 1)
 	{
-		jQuery('#jform_php_postflight_update').closest('.control-group').show();
+		jQuery('#jform_php_postflight_update-lbl').closest('.control-group').show();
 		if (jform_vvvvvwmvwi_required)
 		{
 			updateFieldRequired('php_postflight_update',0);
@ -608,7 +608,7 @@ function vvvvvwm(add_php_postflight_update_vvvvvwm)
 	}
 	else
 	{
-		jQuery('#jform_php_postflight_update').closest('.control-group').hide();
+		jQuery('#jform_php_postflight_update-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvwmvwi_required)
 		{
 			updateFieldRequired('php_postflight_update',1);
@ -626,7 +626,7 @@ function vvvvvwn(add_php_method_uninstall_vvvvvwn)
 	// set the function logic
 	if (add_php_method_uninstall_vvvvvwn == 1)
 	{
-		jQuery('#jform_php_method_uninstall').closest('.control-group').show();
+		jQuery('#jform_php_method_uninstall-lbl').closest('.control-group').show();
 		if (jform_vvvvvwnvwj_required)
 		{
 			updateFieldRequired('php_method_uninstall',0);
@ -639,7 +639,7 @@ function vvvvvwn(add_php_method_uninstall_vvvvvwn)
 	}
 	else
 	{
-		jQuery('#jform_php_method_uninstall').closest('.control-group').hide();
+		jQuery('#jform_php_method_uninstall-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvwnvwj_required)
 		{
 			updateFieldRequired('php_method_uninstall',1);
@ -657,7 +657,7 @@ function vvvvvwo(add_php_preflight_install_vvvvvwo)
 	// set the function logic
 	if (add_php_preflight_install_vvvvvwo == 1)
 	{
-		jQuery('#jform_php_preflight_install').closest('.control-group').show();
+		jQuery('#jform_php_preflight_install-lbl').closest('.control-group').show();
 		if (jform_vvvvvwovwk_required)
 		{
 			updateFieldRequired('php_preflight_install',0);
@ -670,7 +670,7 @@ function vvvvvwo(add_php_preflight_install_vvvvvwo)
 	}
 	else
 	{
-		jQuery('#jform_php_preflight_install').closest('.control-group').hide();
+		jQuery('#jform_php_preflight_install-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvwovwk_required)
 		{
 			updateFieldRequired('php_preflight_install',1);
@ -688,7 +688,7 @@ function vvvvvwp(add_php_preflight_update_vvvvvwp)
 	// set the function logic
 	if (add_php_preflight_update_vvvvvwp == 1)
 	{
-		jQuery('#jform_php_preflight_update').closest('.control-group').show();
+		jQuery('#jform_php_preflight_update-lbl').closest('.control-group').show();
 		if (jform_vvvvvwpvwl_required)
 		{
 			updateFieldRequired('php_preflight_update',0);
@ -701,7 +701,7 @@ function vvvvvwp(add_php_preflight_update_vvvvvwp)
 	}
 	else
 	{
-		jQuery('#jform_php_preflight_update').closest('.control-group').hide();
+		jQuery('#jform_php_preflight_update-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvwpvwl_required)
 		{
 			updateFieldRequired('php_preflight_update',1);
--- a/admin/models/forms/joomla_component.xml
+++ b/admin/models/forms/joomla_component.xml
@ -191,74 +191,94 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT"
 		/>
-		<!-- Php_preflight_update Field. Type: Textarea. (joomla) -->
+		<!-- Php_preflight_update Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_preflight_update"
 			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_HINT"
 			required="true"
+			validate="code"
 		/>
-		<!-- Css_site Field. Type: Textarea. (joomla) -->
+		<!-- Css_site Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="css_site"
 			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- 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) -->
+		<!-- Php_helper_site Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			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"
+			width="100%"
+			height="550px"
+			cols="15"
+			rows="80"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_HINT"
 			required="true"
+			validate="code"
 		/>
-		<!-- Javascript Field. Type: Textarea. (joomla) -->
+		<!-- Javascript Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="javascript"
 			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- 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" />
-		<!-- Php_helper_admin Field. Type: Textarea. (joomla) -->
+		<!-- Php_helper_admin Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			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"
+			width="100%"
+			height="550px"
+			cols="15"
+			rows="80"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Readme Field. Type: Editor. (joomla) -->
 		<field
@ -352,18 +372,22 @@
 		</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) -->
+		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			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"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_email_helper Field. Type: Radio. (joomla) -->
 		<field
@ -458,18 +482,22 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT"
 		/>
-		<!-- Php_helper_both Field. Type: Textarea. (joomla) -->
+		<!-- Php_helper_both Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			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"
+			width="100%"
+			height="550px"
+			cols="15"
+			rows="80"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_license Field. Type: Radio. (joomla) -->
 		<field
@ -486,18 +514,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Php_admin_event Field. Type: Textarea. (joomla) -->
+		<!-- Php_admin_event Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			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"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- License_type Field. Type: List. (joomla) -->
 		<field
@ -520,33 +552,41 @@
 			<option value="4">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE</option>
 		</field>
-		<!-- Php_site_event Field. Type: Textarea. (joomla) -->
+		<!-- Php_site_event Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			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"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- 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) -->
+		<!-- Css_admin Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="css_admin"
 			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Whmcs_key Field. Type: Text. (joomla) -->
 		<field
@ -577,18 +617,22 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_HINT"
 		/>
-		<!-- Php_preflight_install Field. Type: Textarea. (joomla) -->
+		<!-- Php_preflight_install Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			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"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- License Field. Type: Textarea. (joomla) -->
 		<field
@ -604,18 +648,22 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_HINT"
 			required="true"
 		/>
-		<!-- Php_postflight_install Field. Type: Textarea. (joomla) -->
+		<!-- Php_postflight_install Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			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"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Bom Field. Type: Filelist. (joomla) -->
 		<field
@ -627,18 +675,22 @@
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_DESCRIPTION"
 			hide_default="true"
 		/>
-		<!-- Php_method_uninstall Field. Type: Textarea. (joomla) -->
+		<!-- Php_method_uninstall Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_method_uninstall"
 			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Image Field. Type: Media. (joomla) -->
 		<field
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@ -9,42 +9,42 @@
 */

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

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

-// the vvvvvza function
-function vvvvvza(add_php_view_vvvvvza)
+// the vvvvvzb function
+function vvvvvzb(add_php_view_vvvvvzb)
 {
 	// set the function logic
-	if (add_php_view_vvvvvza == 1)
+	if (add_php_view_vvvvvzb == 1)
 	{
-		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvzavyu_required)
+		jQuery('#jform_php_view-lbl').closest('.control-group').show();
+		if (jform_vvvvvzbvyv_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_vvvvvzavyu_required = false;
+			jform_vvvvvzbvyv_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvzavyu_required)
+		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvzbvyv_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_vvvvvzavyu_required = true;
+			jform_vvvvvzbvyv_required = true;
 		}
 	}
 }
--- a/admin/models/forms/layout.xml
+++ b/admin/models/forms/layout.xml
@ -151,18 +151,22 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Php_view Field. Type: Textarea. (joomla) -->
+		<!-- Php_view Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_view"
 			label="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_php_view Field. Type: Radio. (joomla) -->
 		<field
@ -186,17 +190,22 @@
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Layout Field. Type: Textarea. (joomla) -->
+		<!-- Layout Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="layout"
 			label="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL"
-			rows="20"
+			description="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_DESCRIPTION"
+			width="100%"
+			height="450px"
 			cols="15"
-			class="text_area span12"
+			rows="30"
+			buttons="no"
+			syntax="html"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
--- a/admin/models/forms/library.js
+++ b/admin/models/forms/library.js
@ -9,15 +9,12 @@
 */

 // Some Global Values
-jform_vvvvwafvzt_required = false;
-jform_vvvvwalvzu_required = false;
+jform_vvvvwagvzu_required = false;
+jform_vvvvwamvzv_required = false;

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

@ -36,48 +33,13 @@ jQuery(document).ready(function()
 	var how_vvvvwak = jQuery("#jform_how").val();
 	vvvvwak(how_vvvvwak);

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

-// the vvvvwae function
-function vvvvwae(how_vvvvwae)
-{
-	if (isSet(how_vvvvwae) && how_vvvvwae.constructor !== Array)
-	{
-		var temp_vvvvwae = how_vvvvwae;
-		var how_vvvvwae = [];
-		how_vvvvwae.push(temp_vvvvwae);
-	}
-	else if (!isSet(how_vvvvwae))
-	{
-		var how_vvvvwae = [];
-	}
-	var how = how_vvvvwae.some(how_vvvvwae_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 vvvvwae Some function
-function how_vvvvwae_SomeFunc(how_vvvvwae)
-{
-	// set the function logic
-	if (how_vvvvwae == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwaf function
 function vvvvwaf(how_vvvvwaf)
 {
@ -97,28 +59,11 @@ function vvvvwaf(how_vvvvwaf)
 	// set this function logic
 	if (how)
 	{
-		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;
-		}
-
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		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;
-		}
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }

@ -126,7 +71,7 @@ function vvvvwaf(how_vvvvwaf)
 function how_vvvvwaf_SomeFunc(how_vvvvwaf)
 {
 	// set the function logic
-	if (how_vvvvwaf == 3)
+	if (how_vvvvwaf == 2)
 	{
 		return true;
 	}
@ -152,11 +97,28 @@ function vvvvwag(how_vvvvwag)
 	// 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_vvvvwagvzu_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_vvvvwagvzu_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvwagvzu_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_vvvvwagvzu_required = true;
+		}
 	}
 }

@ -164,7 +126,7 @@ function vvvvwag(how_vvvvwag)
 function how_vvvvwag_SomeFunc(how_vvvvwag)
 {
 	// set the function logic
-	if (how_vvvvwag == 2 || how_vvvvwag == 3)
+	if (how_vvvvwag == 3)
 	{
 		return true;
 	}
@ -190,11 +152,11 @@ function vvvvwah(how_vvvvwah)
 	// 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();
 	}
 }

@ -202,7 +164,7 @@ function vvvvwah(how_vvvvwah)
 function how_vvvvwah_SomeFunc(how_vvvvwah)
 {
 	// set the function logic
-	if (how_vvvvwah == 1 || how_vvvvwah == 2 || how_vvvvwah == 3)
+	if (how_vvvvwah == 2 || how_vvvvwah == 3)
 	{
 		return true;
 	}
@ -228,15 +190,11 @@ function vvvvwai(how_vvvvwai)
 	// 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();
 	}
 }

@ -244,7 +202,7 @@ function vvvvwai(how_vvvvwai)
 function how_vvvvwai_SomeFunc(how_vvvvwai)
 {
 	// set the function logic
-	if (how_vvvvwai == 0)
+	if (how_vvvvwai == 1 || how_vvvvwai == 2 || how_vvvvwai == 3)
 	{
 		return true;
 	}
@ -270,13 +228,15 @@ function vvvvwaj(how_vvvvwaj)
 	// 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();
 	}
 }

@ -284,7 +244,7 @@ function vvvvwaj(how_vvvvwaj)
 function how_vvvvwaj_SomeFunc(how_vvvvwaj)
 {
 	// set the function logic
-	if (how_vvvvwaj == 1)
+	if (how_vvvvwaj == 0)
 	{
 		return true;
 	}
@ -307,6 +267,46 @@ function vvvvwak(how_vvvvwak)
 	var how = how_vvvvwak.some(how_vvvvwak_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 vvvvwak Some function
+function how_vvvvwak_SomeFunc(how_vvvvwak)
+{
+	// set the function logic
+	if (how_vvvvwak == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwal function
+function vvvvwal(how_vvvvwal)
+{
+	if (isSet(how_vvvvwal) && how_vvvvwal.constructor !== Array)
+	{
+		var temp_vvvvwal = how_vvvvwal;
+		var how_vvvvwal = [];
+		how_vvvvwal.push(temp_vvvvwal);
+	}
+	else if (!isSet(how_vvvvwal))
+	{
+		var how_vvvvwal = [];
+	}
+	var how = how_vvvvwal.some(how_vvvvwal_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@ -322,44 +322,44 @@ function vvvvwak(how_vvvvwak)
 	}
 }

-// the vvvvwak Some function
-function how_vvvvwak_SomeFunc(how_vvvvwak)
+// the vvvvwal Some function
+function how_vvvvwal_SomeFunc(how_vvvvwal)
 {
 	// set the function logic
-	if (how_vvvvwak == 4)
+	if (how_vvvvwal == 4)
 	{
 		return true;
 	}
 	return false;
 }

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

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

 // Some Global Values
-jform_vvvvwawwae_required = false;
-jform_vvvvwawwaf_required = false;
-jform_vvvvwawwag_required = false;
-jform_vvvvwawwah_required = false;
-jform_vvvvwawwai_required = false;
+jform_vvvvwaxwaf_required = false;
+jform_vvvvwaxwag_required = false;
+jform_vvvvwaxwah_required = false;
+jform_vvvvwaxwai_required = false;
 jform_vvvvwaxwaj_required = false;
 jform_vvvvwaywak_required = false;
-jform_vvvvwbawal_required = false;
-jform_vvvvwbcwam_required = false;
+jform_vvvvwazwal_required = false;
+jform_vvvvwbbwam_required = false;
+jform_vvvvwbdwan_required = false;

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

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

-	var protocol_vvvvwba = jQuery("#jform_protocol").val();
-	var authentication_vvvvwba = jQuery("#jform_authentication").val();
-	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
+	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
+	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
+	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);

-	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
-	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
+	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
+	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);

-	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
-	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
 });

-// the vvvvwaw function
-function vvvvwaw(protocol_vvvvwaw)
-{
-	if (isSet(protocol_vvvvwaw) && protocol_vvvvwaw.constructor !== Array)
-	{
-		var temp_vvvvwaw = protocol_vvvvwaw;
-		var protocol_vvvvwaw = [];
-		protocol_vvvvwaw.push(temp_vvvvwaw);
-	}
-	else if (!isSet(protocol_vvvvwaw))
-	{
-		var protocol_vvvvwaw = [];
-	}
-	var protocol = protocol_vvvvwaw.some(protocol_vvvvwaw_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		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('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('#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('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwawwai_required = true;
-		}
-	}
-}
-
-// the vvvvwaw Some function
-function protocol_vvvvwaw_SomeFunc(protocol_vvvvwaw)
-{
-	// set the function logic
-	if (protocol_vvvvwaw == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwax function
 function vvvvwax(protocol_vvvvwax)
 {
@ -197,28 +64,104 @@ function vvvvwax(protocol_vvvvwax)
 	// 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_vvvvwaxwaf_required)
+		{
+			updateFieldRequired('authentication',0);
+			jQuery('#jform_authentication').prop('required','required');
+			jQuery('#jform_authentication').attr('aria-required',true);
+			jQuery('#jform_authentication').addClass('required');
+			jform_vvvvwaxwaf_required = false;
+		}
+
+		jQuery('#jform_host').closest('.control-group').show();
+		if (jform_vvvvwaxwag_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwaxwag_required = false;
+		}
+
+		jQuery('#jform_port').closest('.control-group').show();
+		if (jform_vvvvwaxwah_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwaxwah_required = false;
+		}
+
+		jQuery('#jform_path').closest('.control-group').show();
+		if (jform_vvvvwaxwai_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwaxwai_required = false;
+		}
+
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
 		if (jform_vvvvwaxwaj_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_vvvvwaxwaj_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_vvvvwaxwaf_required)
+		{
+			updateFieldRequired('authentication',1);
+			jQuery('#jform_authentication').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeClass('required');
+			jform_vvvvwaxwaf_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		if (!jform_vvvvwaxwag_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwaxwag_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		if (!jform_vvvvwaxwah_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwaxwah_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		if (!jform_vvvvwaxwai_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwaxwai_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
 		if (!jform_vvvvwaxwaj_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_vvvvwaxwaj_required = true;
 		}
 	}
@ -228,7 +171,7 @@ function vvvvwax(protocol_vvvvwax)
 function protocol_vvvvwax_SomeFunc(protocol_vvvvwax)
 {
 	// set the function logic
-	if (protocol_vvvvwax == 1)
+	if (protocol_vvvvwax == 2)
 	{
 		return true;
 	}
@ -236,7 +179,7 @@ function protocol_vvvvwax_SomeFunc(protocol_vvvvwax)
 }

 // the vvvvway function
-function vvvvway(protocol_vvvvway,authentication_vvvvway)
+function vvvvway(protocol_vvvvway)
 {
 	if (isSet(protocol_vvvvway) && protocol_vvvvway.constructor !== Array)
 	{
@ -250,42 +193,32 @@ function vvvvway(protocol_vvvvway,authentication_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)
+	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_vvvvwaywak_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_vvvvwaywak_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_vvvvwaywak_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_vvvvwaywak_required = true;
 		}
 	}
@ -295,206 +228,273 @@ function vvvvway(protocol_vvvvway,authentication_vvvvway)
 function protocol_vvvvway_SomeFunc(protocol_vvvvway)
 {
 	// set the function logic
-	if (protocol_vvvvway == 2)
+	if (protocol_vvvvway == 1)
 	{
 		return true;
 	}
 	return false;
 }

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

-// the vvvvwba function
-function vvvvwba(protocol_vvvvwba,authentication_vvvvwba)
+// the vvvvwaz Some function
+function authentication_vvvvwaz_SomeFunc(authentication_vvvvwaz)
 {
-	if (isSet(protocol_vvvvwba) && protocol_vvvvwba.constructor !== Array)
+	// set the function logic
+	if (authentication_vvvvwaz == 1 || authentication_vvvvwaz == 3 || authentication_vvvvwaz == 5)
 	{
-		var temp_vvvvwba = protocol_vvvvwba;
-		var protocol_vvvvwba = [];
-		protocol_vvvvwba.push(temp_vvvvwba);
+		return true;
 	}
-	else if (!isSet(protocol_vvvvwba))
-	{
-		var protocol_vvvvwba = [];
-	}
-	var protocol = protocol_vvvvwba.some(protocol_vvvvwba_SomeFunc);
+	return false;
+}

-	if (isSet(authentication_vvvvwba) && authentication_vvvvwba.constructor !== Array)
+// the vvvvwbb function
+function vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb)
+{
+	if (isSet(protocol_vvvvwbb) && protocol_vvvvwbb.constructor !== Array)
 	{
-		var temp_vvvvwba = authentication_vvvvwba;
-		var authentication_vvvvwba = [];
-		authentication_vvvvwba.push(temp_vvvvwba);
+		var temp_vvvvwbb = protocol_vvvvwbb;
+		var protocol_vvvvwbb = [];
+		protocol_vvvvwbb.push(temp_vvvvwbb);
 	}
-	else if (!isSet(authentication_vvvvwba))
+	else if (!isSet(protocol_vvvvwbb))
 	{
-		var authentication_vvvvwba = [];
+		var protocol_vvvvwbb = [];
 	}
-	var authentication = authentication_vvvvwba.some(authentication_vvvvwba_SomeFunc);
+	var protocol = protocol_vvvvwbb.some(protocol_vvvvwbb_SomeFunc);
+
+	if (isSet(authentication_vvvvwbb) && authentication_vvvvwbb.constructor !== Array)
+	{
+		var temp_vvvvwbb = authentication_vvvvwbb;
+		var authentication_vvvvwbb = [];
+		authentication_vvvvwbb.push(temp_vvvvwbb);
+	}
+	else if (!isSet(authentication_vvvvwbb))
+	{
+		var authentication_vvvvwbb = [];
+	}
+	var authentication = authentication_vvvvwbb.some(authentication_vvvvwbb_SomeFunc);


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

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

-// the vvvvwba Some function
-function protocol_vvvvwba_SomeFunc(protocol_vvvvwba)
+// the vvvvwbb Some function
+function protocol_vvvvwbb_SomeFunc(protocol_vvvvwbb)
 {
 	// set the function logic
-	if (protocol_vvvvwba == 2)
+	if (protocol_vvvvwbb == 2)
 	{
 		return true;
 	}
 	return false;
 }

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

-// the vvvvwbc function
-function vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc)
+// the vvvvwbd function
+function vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd)
 {
-	if (isSet(protocol_vvvvwbc) && protocol_vvvvwbc.constructor !== Array)
+	if (isSet(protocol_vvvvwbd) && protocol_vvvvwbd.constructor !== Array)
 	{
-		var temp_vvvvwbc = protocol_vvvvwbc;
-		var protocol_vvvvwbc = [];
-		protocol_vvvvwbc.push(temp_vvvvwbc);
+		var temp_vvvvwbd = protocol_vvvvwbd;
+		var protocol_vvvvwbd = [];
+		protocol_vvvvwbd.push(temp_vvvvwbd);
 	}
-	else if (!isSet(protocol_vvvvwbc))
+	else if (!isSet(protocol_vvvvwbd))
 	{
-		var protocol_vvvvwbc = [];
+		var protocol_vvvvwbd = [];
 	}
-	var protocol = protocol_vvvvwbc.some(protocol_vvvvwbc_SomeFunc);
+	var protocol = protocol_vvvvwbd.some(protocol_vvvvwbd_SomeFunc);

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


 	// set this function logic
 	if (protocol && authentication)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
-		if (jform_vvvvwbcwam_required)
+		if (jform_vvvvwbdwan_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_vvvvwbcwam_required = false;
+			jform_vvvvwbdwan_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
-		if (!jform_vvvvwbcwam_required)
+		if (!jform_vvvvwbdwan_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_vvvvwbcwam_required = true;
+			jform_vvvvwbdwan_required = true;
 		}
 	}
 }

-// the vvvvwbc Some function
-function protocol_vvvvwbc_SomeFunc(protocol_vvvvwbc)
+// the vvvvwbd Some function
+function protocol_vvvvwbd_SomeFunc(protocol_vvvvwbd)
 {
 	// set the function logic
-	if (protocol_vvvvwbc == 2)
+	if (protocol_vvvvwbd == 2)
 	{
 		return true;
 	}
 	return false;
 }

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

-// the vvvvwbe function
-function vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe)
+// the vvvvwbf function
+function vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf)
 {
-	if (isSet(protocol_vvvvwbe) && protocol_vvvvwbe.constructor !== Array)
+	if (isSet(protocol_vvvvwbf) && protocol_vvvvwbf.constructor !== Array)
 	{
-		var temp_vvvvwbe = protocol_vvvvwbe;
-		var protocol_vvvvwbe = [];
-		protocol_vvvvwbe.push(temp_vvvvwbe);
+		var temp_vvvvwbf = protocol_vvvvwbf;
+		var protocol_vvvvwbf = [];
+		protocol_vvvvwbf.push(temp_vvvvwbf);
 	}
-	else if (!isSet(protocol_vvvvwbe))
+	else if (!isSet(protocol_vvvvwbf))
 	{
-		var protocol_vvvvwbe = [];
+		var protocol_vvvvwbf = [];
 	}
-	var protocol = protocol_vvvvwbe.some(protocol_vvvvwbe_SomeFunc);
+	var protocol = protocol_vvvvwbf.some(protocol_vvvvwbf_SomeFunc);

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


 	// set this function logic
@ -508,22 +508,22 @@ function vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe)
 	}
 }

-// the vvvvwbe Some function
-function protocol_vvvvwbe_SomeFunc(protocol_vvvvwbe)
+// the vvvvwbf Some function
+function protocol_vvvvwbf_SomeFunc(protocol_vvvvwbf)
 {
 	// set the function logic
-	if (protocol_vvvvwbe == 2)
+	if (protocol_vvvvwbf == 2)
 	{
 		return true;
 	}
 	return false;
 }

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

 // Some Global Values
-jform_vvvvvyovyi_required = false;
 jform_vvvvvypvyj_required = false;
 jform_vvvvvyqvyk_required = false;
 jform_vvvvvyrvyl_required = false;
@ -19,392 +18,393 @@ jform_vvvvvyuvyo_required = false;
 jform_vvvvvyvvyp_required = false;
 jform_vvvvvywvyq_required = false;
 jform_vvvvvyxvyr_required = false;
-jform_vvvvvyxvys_required = false;
+jform_vvvvvyyvys_required = false;
+jform_vvvvvyyvyt_required = false;

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

-	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_display_vvvvvyq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyq(add_php_jview_display_vvvvvyq);

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

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

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

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

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

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

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

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

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

-// the vvvvvyo function
-function vvvvvyo(add_php_view_vvvvvyo)
+// the vvvvvyp function
+function vvvvvyp(add_php_view_vvvvvyp)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyo == 1)
+	if (add_php_view_vvvvvyp == 1)
 	{
-		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyovyi_required)
+		jQuery('#jform_php_view-lbl').closest('.control-group').show();
+		if (jform_vvvvvypvyj_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_vvvvvyovyi_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyovyi_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_display_vvvvvyp)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyp == 1)
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvypvyj_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_display').closest('.control-group').hide();
+		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvypvyj_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_vvvvvypvyj_required = true;
 		}
 	}
 }

 // the vvvvvyq function
-function vvvvvyq(add_php_jview_vvvvvyq)
+function vvvvvyq(add_php_jview_display_vvvvvyq)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyq == 1)
+	if (add_php_jview_display_vvvvvyq == 1)
 	{
-		jQuery('#jform_php_jview').closest('.control-group').show();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
 		if (jform_vvvvvyqvyk_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_vvvvvyqvyk_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_jview').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyqvyk_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_vvvvvyqvyk_required = true;
 		}
 	}
 }

 // the vvvvvyr function
-function vvvvvyr(add_php_document_vvvvvyr)
+function vvvvvyr(add_php_jview_vvvvvyr)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyr == 1)
+	if (add_php_jview_vvvvvyr == 1)
 	{
-		jQuery('#jform_php_document').closest('.control-group').show();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
 		if (jform_vvvvvyrvyl_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_vvvvvyrvyl_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_document').closest('.control-group').hide();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyrvyl_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_vvvvvyrvyl_required = true;
 		}
 	}
 }

 // the vvvvvys function
-function vvvvvys(add_css_document_vvvvvys)
+function vvvvvys(add_php_document_vvvvvys)
 {
 	// set the function logic
-	if (add_css_document_vvvvvys == 1)
+	if (add_php_document_vvvvvys == 1)
 	{
-		jQuery('#jform_css_document').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvysvym_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_vvvvvysvym_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css_document').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvysvym_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_vvvvvysvym_required = true;
 		}
 	}
 }

 // the vvvvvyt function
-function vvvvvyt(add_javascript_file_vvvvvyt)
+function vvvvvyt(add_css_document_vvvvvyt)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyt == 1)
+	if (add_css_document_vvvvvyt == 1)
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').show();
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvytvyn_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_vvvvvytvyn_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').hide();
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvytvyn_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_vvvvvytvyn_required = true;
 		}
 	}
 }

 // the vvvvvyu function
-function vvvvvyu(add_js_document_vvvvvyu)
+function vvvvvyu(add_javascript_file_vvvvvyu)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyu == 1)
+	if (add_javascript_file_vvvvvyu == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
 		if (jform_vvvvvyuvyo_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_vvvvvyuvyo_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyuvyo_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_vvvvvyuvyo_required = true;
 		}
 	}
 }

 // the vvvvvyv function
-function vvvvvyv(add_css_vvvvvyv)
+function vvvvvyv(add_js_document_vvvvvyv)
 {
 	// set the function logic
-	if (add_css_vvvvvyv == 1)
+	if (add_js_document_vvvvvyv == 1)
 	{
-		jQuery('#jform_css').closest('.control-group').show();
+		jQuery('#jform_js_document-lbl').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');
+			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_vvvvvyvvyp_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css').closest('.control-group').hide();
+		jQuery('#jform_js_document-lbl').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');
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
 			jform_vvvvvyvvyp_required = true;
 		}
 	}
 }

 // the vvvvvyw function
-function vvvvvyw(add_php_ajax_vvvvvyw)
+function vvvvvyw(add_css_vvvvvyw)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyw == 1)
+	if (add_css_vvvvvyw == 1)
 	{
-		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
-		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
+		jQuery('#jform_css-lbl').closest('.control-group').show();
 		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');
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
 			jform_vvvvvywvyq_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
-		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
 		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');
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
 			jform_vvvvvywvyq_required = true;
 		}
 	}
 }

 // the vvvvvyx function
-function vvvvvyx(add_custom_button_vvvvvyx)
+function vvvvvyx(add_php_ajax_vvvvvyx)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyx == 1)
+	if (add_php_ajax_vvvvvyx == 1)
+	{
+		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
+		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
+		if (jform_vvvvvyxvyr_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_vvvvvyxvyr_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvyxvyr_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_vvvvvyxvyr_required = true;
+		}
+	}
+}
+
+// the vvvvvyy function
+function vvvvvyy(add_custom_button_vvvvvyy)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvyy == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
-		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyxvyr_required)
+		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
+		if (jform_vvvvvyyvys_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_vvvvvyxvyr_required = false;
+			jform_vvvvvyyvys_required = false;
 		}

-		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyxvys_required)
+		jQuery('#jform_php_model-lbl').closest('.control-group').show();
+		if (jform_vvvvvyyvyt_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_vvvvvyxvys_required = false;
+			jform_vvvvvyyvyt_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
-		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyxvyr_required)
+		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvyyvys_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_vvvvvyxvyr_required = true;
+			jform_vvvvvyyvys_required = true;
 		}
-		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyxvys_required)
+		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvyyvyt_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_vvvvvyxvys_required = true;
+			jform_vvvvvyyvyt_required = true;
 		}
 	}
 }

-// the vvvvvyy function
-function vvvvvyy(button_position_vvvvvyy)
+// the vvvvvyz function
+function vvvvvyz(button_position_vvvvvyz)
 {
-	if (isSet(button_position_vvvvvyy) && button_position_vvvvvyy.constructor !== Array)
+	if (isSet(button_position_vvvvvyz) && button_position_vvvvvyz.constructor !== Array)
 	{
-		var temp_vvvvvyy = button_position_vvvvvyy;
-		var button_position_vvvvvyy = [];
-		button_position_vvvvvyy.push(temp_vvvvvyy);
+		var temp_vvvvvyz = button_position_vvvvvyz;
+		var button_position_vvvvvyz = [];
+		button_position_vvvvvyz.push(temp_vvvvvyz);
 	}
-	else if (!isSet(button_position_vvvvvyy))
+	else if (!isSet(button_position_vvvvvyz))
 	{
-		var button_position_vvvvvyy = [];
+		var button_position_vvvvvyz = [];
 	}
-	var button_position = button_position_vvvvvyy.some(button_position_vvvvvyy_SomeFunc);
+	var button_position = button_position_vvvvvyz.some(button_position_vvvvvyz_SomeFunc);


 	// set this function logic
@ -418,11 +418,11 @@ function vvvvvyy(button_position_vvvvvyy)
 	}
 }

-// the vvvvvyy Some function
-function button_position_vvvvvyy_SomeFunc(button_position_vvvvvyy)
+// the vvvvvyz Some function
+function button_position_vvvvvyz_SomeFunc(button_position_vvvvvyz)
 {
 	// set the function logic
-	if (button_position_vvvvvyy == 5)
+	if (button_position_vvvvvyz == 5)
 	{
 		return true;
 	}
--- a/admin/models/forms/site_view.xml
+++ b/admin/models/forms/site_view.xml
@ -154,18 +154,22 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Php_document Field. Type: Textarea. (joomla) -->
+		<!-- Php_document Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_document"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="50"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
 		<field
@ -352,30 +356,39 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Php_jview Field. Type: Textarea. (joomla) -->
+		<!-- Php_jview Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_jview"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_HINT"
 			required="true"
+			validate="code"
 		/>
-		<!-- Default Field. Type: Textarea. (joomla) -->
+		<!-- Default Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="default"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_LABEL"
-			rows="20"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_DESCRIPTION"
+			width="100%"
+			height="500px"
 			cols="15"
-			class="text_area span12"
+			rows="30"
+			buttons="no"
+			syntax="html"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
@ -383,18 +396,22 @@
 		<field type="note" name="note_uikit_snippet" label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL" heading="h4" class="snippet-code note_uikit_snippet" />
 		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
-		<!-- Php_view Field. Type: Textarea. (joomla) -->
+		<!-- Php_view Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_view"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_javascript_file Field. Type: Radio. (joomla) -->
 		<field
@ -411,18 +428,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
 		</field>
-		<!-- Php_jview_display Field. Type: Textarea. (joomla) -->
+		<!-- Php_jview_display Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_jview_display"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_js_document Field. Type: Radio. (joomla) -->
 		<field
@ -446,18 +467,22 @@
 		/>
 		<!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_libraries_selection" label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION" heading="h4" class="alert alert-info note_libraries_selection" />
-		<!-- Javascript_file Field. Type: Textarea. (joomla) -->
+		<!-- Javascript_file Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="javascript_file"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Custom_get Field. Type: Customgets. (custom) -->
 		<field
@ -467,18 +492,22 @@
 			description="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_DESCRIPTION"
 			multiple="true"
 		/>
-		<!-- Js_document Field. Type: Textarea. (joomla) -->
+		<!-- Js_document Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="js_document"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Main_get Field. Type: Maingets. (custom) -->
 		<field
@ -490,18 +519,22 @@
 			required="true"
 			button="true"
 		/>
-		<!-- Css_document Field. Type: Textarea. (joomla) -->
+		<!-- Css_document Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="css_document"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Dynamic_get Field. Type: Dynamicgets. (custom) -->
 		<field
@ -512,33 +545,41 @@
 			multiple="false"
 			required="false"
 		/>
-		<!-- Css Field. Type: Textarea. (joomla) -->
+		<!-- Css Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="css"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="dynamic_values" label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_DESCRIPTION" heading="h4" class="dynamic_values" />
-		<!-- Php_ajaxmethod Field. Type: Textarea. (joomla) -->
+		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_ajaxmethod"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_custom_button Field. Type: Radio. (joomla) -->
 		<field
@ -1146,33 +1187,41 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
 		</field>
-		<!-- Php_controller Field. Type: Textarea. (joomla) -->
+		<!-- Php_controller Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_controller"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_HINT"
 			required="false"
+			validate="code"
 		/>
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
-		<!-- Php_model Field. Type: Textarea. (joomla) -->
+		<!-- Php_model Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_model"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_LABEL"
-			rows="30"
-			cols="15"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_HINT"
 			required="false"
+			validate="code"
 		/>
 	</fieldset>
 	
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@ -9,42 +9,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)
+		jQuery('#jform_php_view-lbl').closest('.control-group').show();
+		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)
+		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
+		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/template.xml
+++ b/admin/models/forms/template.xml
@ -141,18 +141,22 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Php_view Field. Type: Textarea. (joomla) -->
+		<!-- Php_view Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="php_view"
 			label="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_LABEL"
-			rows="17"
-			cols="5"
 			description="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_DESCRIPTION"
-			class="text_area span12"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Add_php_view Field. Type: Radio. (joomla) -->
 		<field
@ -186,17 +190,22 @@
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Template Field. Type: Textarea. (joomla) -->
+		<!-- Template Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
+			type="editor"
 			name="template"
 			label="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_LABEL"
-			rows="20"
+			description="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_DESCRIPTION"
+			width="100%"
+			height="500px"
 			cols="15"
-			class="text_area span12"
+			rows="30"
+			buttons="no"
+			syntax="html"
+			editor="codemirror|none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_HINT"
 			required="true"
+			validate="code"
 		/>
 		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@ -181,7 +181,6 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/import_joomla_components.php
+++ b/admin/models/import_joomla_components.php
@ -66,25 +66,27 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 		parent::populateState();
 	}
 	
-	public $canmerge 		 	= 1;
-	public $postfix 		 	= false;
-	public $forceUpdate 	 	= 0;
-	public $hasKey 		 	= 0;
-	public $sleutle 		 	= null;
-	public $data 		 		= false;
+	public $canmerge = 1;
+	public $postfix = false;
+	public $forceUpdate = 0;
+	public $hasKey = 0;
+	public $sleutle = null;
+	public $data = false;
 	public $app;

-	protected $dir 		 		= false;
-	protected $target 		 	= false;
-	protected $newID 		 	= array();
-	protected $updateAfter 	 	= array('field' => array(), 'adminview' => array());
-	protected $divergedDataMover 	= array();
-	protected $fieldTypes		 	= array();
-	protected $isMultiple		 	= array();
-	protected $specialValue 	 	= false;
-	protected $checksum  	 	= null;
-	protected $checksumURLs  	= array('vdm' => 'https://raw.githubusercontent.com/vdm-io/JCB-Packages/master/', 'jcb' => 'https://raw.githubusercontent.com/vdm-io/JCB-Community-Packages/master/');
-	protected $mustMerge		= array('validation_rule', 'fieldtype', 'snippet', 'language', 'language_translation');
+	protected $dir = false;
+	protected $target = false;
+	protected $newID = array();
+	protected $updateAfter = array('field' => array(), 'adminview' => array());
+	protected $divergedDataMover = array();
+	protected $fieldTypes = array();
+	protected $isMultiple = array();
+	protected $tableColumns = array();
+	protected $fieldImportErrors = array();
+	protected $specialValue = false;
+	protected $checksum = null;
+	protected $checksumURLs = array('vdm' => 'https://raw.githubusercontent.com/vdm-io/JCB-Packages/master/', 'jcb' => 'https://raw.githubusercontent.com/vdm-io/JCB-Community-Packages/master/');
+	protected $mustMerge = array('validation_rule', 'fieldtype', 'snippet', 'language', 'language_translation');

 	/**
 	 * Import an spreadsheet from either folder, url or upload.
@ -702,13 +704,25 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 			'component_custom_admin_views', 'component_updates', 'component_mysql_tweaks',
 			'component_custom_admin_menus', 'component_config', 'component_dashboard', 'component_files_folders'
 		);
+		// get prefix
+		$prefix = $this->_db->getPrefix();
+		// get local tables
+		$localTables = $this->_db->getTableList();
 		// smart table loop
 		foreach ($tables as $table)
 		{
-			// save the table to database
-			if (!$this->saveSmartItems($table))
+			//  only continue the import if the table is available locally
+			if (in_array($prefix . 'componentbuilder_' . $table, $localTables))
 			{
-				return false;
+				// save the table to database
+				if (!$this->saveSmartItems($table))
+				{
+					return false;
+				}
+			}
+			else
+			{
+				$this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_TABLE_BSB_NOT_FOUND_IN_THE_LOCAL_DATABASE_SO_ITS_VALUES_COULD_NOT_BE_IMPORTED_PLEASE_UPDATE_YOUR_JCB_INSTALL_AND_TRY_AGAIN', '#__componentbuilder_' . $table), 'warning');
 			}
 		}
 		// do a after all run on all items that need it
@ -1007,7 +1021,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 	**/
 	public function updateAfterAll()
 	{
-		if (ComponentbuilderHelper::checkArray($this->updateAfter['field']))
+		// update the fields
+		if (isset($this->updateAfter['field']) && ComponentbuilderHelper::checkArray($this->updateAfter['field']))
 		{
 			// update repeatable
 			foreach ($this->updateAfter['field'] as $field)
@ -1069,7 +1084,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 			}
 		}
 		// do a after all run on admin views that need it
-		if (ComponentbuilderHelper::checkArray($this->updateAfter['adminview']))
+		if (isset($this->updateAfter['adminview']) && ComponentbuilderHelper::checkArray($this->updateAfter['adminview']))
 		{
 			// update the addlinked_views
 			foreach ($this->updateAfter['adminview'] as $adminview)
@ -1080,7 +1095,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				}
 				// get the field from db
 				if ($addlinked_views = ComponentbuilderHelper::getVar('admin_view', $adminview, 'id', 'addlinked_views'))
-				{					
+				{
 					if (ComponentbuilderHelper::checkJson($addlinked_views))
 					{
 						$addlinked_views = json_decode($addlinked_views, true);
@ -1094,7 +1109,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 						{
 							// only update the view IDs
 							$addlinked_views = $this->updateSubformIDs($addlinked_views, 'admin_view', array('adminview' => 'admin_view'));
-						}						
+						}
 						// update the fields
 						$object = new stdClass;
 						$object->id = $adminview;
@ -1105,6 +1120,136 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				}
 			}
 		}
+		// update the joomla_component dashboard
+		if (isset($this->updateAfter['joomla_component']) && ComponentbuilderHelper::checkArray($this->updateAfter['joomla_component']))
+		{
+			// update dashboard of the components
+			foreach ($this->updateAfter['joomla_component'] as $component)
+			{
+				if (isset($this->newID['joomla_component'][(int) $component]))
+				{
+					$component = $this->newID['joomla_component'][(int) $component];
+				}
+				// get the dashboard from db
+				if ($dashboard = ComponentbuilderHelper::getVar('joomla_component', $component, 'id', 'dashboard'))
+				{
+					if (ComponentbuilderHelper::checkString($dashboard))
+					{
+						// get id
+						$id = (int) preg_replace("/[^0-9]/", "", $dashboard);
+						// update the value
+						$update = false;
+						// admin_view
+						if ((strpos($dashboard, 'A') !== false || strpos($dashboard, 'a') !== false) && isset($this->newID['admin_view'][$id]))
+						{
+							// set the new value
+							$dashboard = 'A_' . $this->newID['admin_view'][$id];
+							// update the value
+							$update = true;
+						}
+						// custom_admin_view
+						elseif ((strpos($dashboard, 'C') !== false || strpos($dashboard, 'c') !== false) && isset($this->newID['custom_admin_view'][$id]))
+						{
+							// set the new value
+							$dashboard = 'C_' . $this->newID['custom_admin_view'][$id];
+							// update the value
+							$update = true;
+						}
+						// did we get a new value
+						if ($update)
+						{
+							// now update the joomla_component dashboard value
+							$object = new stdClass;
+							$object->id = (int) $component;
+							$object->dashboard = $dashboard;
+							// update the admin view
+							$this->_db->updateObject('#__componentbuilder_joomla_component', $object, 'id');
+						}
+					}
+				}
+			}
+		}
+		// update the admin_fields_relations
+		if (isset($this->updateAfter['relations']) && ComponentbuilderHelper::checkArray($this->updateAfter['relations']))
+		{
+			// update repeatable
+			foreach ($this->updateAfter['relations'] as $relation)
+			{
+				// check if we must update this relation
+				$update = false;
+				if (isset($this->newID['admin_fields_relations'][$relation]))
+				{
+					$relation = $this->newID['admin_fields_relations'][$relation];
+				}
+				// get the set relation from db
+				if ($addrelations = ComponentbuilderHelper::getVar('admin_fields_relations', $relation, 'id', 'addrelations'))
+				{
+					if (ComponentbuilderHelper::checkJson($addrelations))
+					{
+						$addrelations = json_decode($addrelations, true);
+						if (ComponentbuilderHelper::checkArray($addrelations))
+						{
+							foreach ($addrelations as $nr => &$value)
+							{
+								// reset the buckets
+								$bucket = array();
+								// get fields
+								$found = ComponentbuilderHelper::getAllBetween($value['set'], '[field=', ']');
+								// if found
+								if (ComponentbuilderHelper::checkArray($found))
+								{
+									$bucket[] = $found;
+								}
+								// get fields
+								$found = ComponentbuilderHelper::getAllBetween($value['set'], '$item->{', '}');
+								// if found
+								if (ComponentbuilderHelper::checkArray($found))
+								{
+									$bucket[] = $found;
+								}
+								// check if we have values
+								if (ComponentbuilderHelper::checkArray($bucket))
+								{
+									$fields = ComponentbuilderHelper::mergeArrays($bucket);
+									// reset the buckets
+									$bucket = array();
+									if (ComponentbuilderHelper::checkArray($fields))
+									{
+										foreach ($fields as $field)
+										{
+											if (isset($this->newID['field'][(int) $field]))
+											{
+												$bucket['[field=' . (int) $field . ']'] = '[field=' . (int) $this->newID['field'][(int) $field] . ']';
+												$bucket['$item->{' . (int) $field . '}'] = '$item->{' . (int) $this->newID['field'][(int) $field] . '}';
+											}
+											else
+											{
+												$this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BADMIN_FIELDS_RELATIONSB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_NOT_UPDATED_IN_THE_CUSTOM_CODE', $relation, $field), 'warning');
+											}
+										}
+										// check if we have a bucket of values to update
+										if (ComponentbuilderHelper::checkArray($bucket))
+										{
+											$value['set'] = str_replace(array_keys($bucket), array_values($bucket), $value['set']);
+											$update = true;
+										}
+									}
+								}
+							}
+							// update only if needed
+							if ($update)
+							{
+								$object = new stdClass;
+								$object->id = $relation;
+								$object->addrelations = json_encode($addrelations, JSON_FORCE_OBJECT);
+								// update the field
+								$this->_db->updateObject('#__componentbuilder_admin_fields_relations', $object, 'id');
+							}
+						}
+					}
+				}
+			}
+		}
 	}

 	/**
@ -1573,6 +1718,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				}
 			break;
 			case 'joomla_component':
+				// update custom dash after
+				if (isset($item->dashboard_type) && 2 == $item->dashboard_type)
+				{
+					// update the custom dash ID
+					$this->updateAfter['joomla_component'][$item->id] = $item->id; // dashboard
+				}
 				// set the anchors getters
 				$getter = array('joomla_component' => $item->id);
 				// update the addconfig
@ -2055,7 +2206,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 					$updaterT = array(
 						// subformfield => field => type_value
 						'addrelations' => array('listfield' => 'field', 'joinfields' => 'field')
-					);		
+					);
+					// special fix for custom code
+					$this->updateAfter['relations'][$item->id] = $item->id; // addrelations->set
 				}

 				// update the repeatable fields
@ -2066,6 +2219,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				// update the subform ids
 				$this->updateSubformsIDs($item, $type, $updaterT);
 		}
+		// remove all fields/columns not part of the current table
+		$this->removingFields($type, $item);
 		// final action prep
 		switch($action)
 		{
@ -2097,6 +2252,56 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 		return false;
 	}

+	/**
+	* remove all fields/columns not part of the current table
+	*
+	* @param string $type       The table this item belongs to
+	* @param object $item      The item to clean
+	*
+	* @return viod
+	*/
+	protected function removingFields($type, &$item)
+	{
+		// get the columns
+		$columns = $this->getTableColumns("#__componentbuilder_" . $type);
+		if (ComponentbuilderHelper::checkArray($columns))
+		{
+			foreach ($item as $name => $value)
+			{
+				if (!isset($columns[$name]))
+				{
+					// we must show a warning that this field was not imported (but just once)
+					if (!isset($this->fieldImportErrors[$type.$name]))
+					{
+						$this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_FIELD_BSB_NOT_FOUND_IN_LOCAL_DATABASE_TABLE_S_SO_IMPORTED_OF_ITS_VALUES_FAILED_PLEASE_UPDATE_YOUR_JCB_INSTALL_AND_TRY_AGAIN', $name, '#__componentbuilder_' . $type), 'warning');
+						// make sure the message is not loaded again
+						$this->fieldImportErrors[$type.$name] = true;
+					}
+					// remove the field & value
+					unset($item->{$name});
+				}
+			}
+		}
+	}
+
+	/**
+	* get table columns
+	*
+	* @param string $table       The table
+	*
+	* @return array
+	*/
+	protected function getTableColumns($table)
+	{
+		// check if the columns are in memory
+		if (!isset($this->tableColumns[$table]))
+		{
+			// get the columns
+			$this->tableColumns[$table] = $this->_db->getTableColumns($table);
+		}
+		return $this->tableColumns[$table];
+	}
+
 	/**
 	* Set the data that should be moved
 	*
@ -2313,12 +2518,15 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 			// load the created and id
 			$query->where($this->_db->quoteName('a.created') . ' = '. $this->_db->quote($item->created));
 			$query->where($this->_db->quoteName('a.id') .' = '. (int) $item->id);
+			// set to run query
 			$runQuery = true;
 		}
 		elseif (componentbuilderHelper::checkArray($get))
 		{
 			foreach ($get as $field)
 			{
+				// set to run query
+				$runQuery = true;
 				if (isset($item->{$field}))
 				{
 					// set the value
@ -2343,18 +2551,21 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 					}
 					else
 					{
-						return false;
+						// do not run query
+						$runQuery = false;
 					}
-					$runQuery = true;
 				}
 				else
 				{
-					return false;
+					// do not run query
+					$runQuery = false;
 				}
 			}
 		}
 		elseif (isset($item->{$get}))
 		{
+			// set to run query
+			$runQuery = true;
 			// set the value
 			$value = $item->{$get};
 			// check if we have special value
@ -2377,9 +2588,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 			}
 			else
 			{
-				return false; // really not needed but who knows for sure...
+				$runQuery = false; // really not needed but who knows for sure...
 			}
-			$runQuery = true;
 		}
 		// since where has been set run the query
 		if ($runQuery)
@ -2430,12 +2640,18 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 					// get by name and xml to target correct field
 					if ($retry == 2)
 					{
-						// get by id name..
+						// get by name + xml...
 						$getter = array('name','datatype','store','indexes','null_switch','xml');
+						$retryAgain = 3;
+					}
+					elseif ($retry == 3)
+					{
+						// get by name + created...
+						$getter = array('name','datatype','created');
 					}
 					else
 					{
-						// get by id name..
+						// get by name + xml or type..
 						$getter = array('name','datatype','store','indexes','null_switch');
 						// lets try to add the fieldtype
 						if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][(int) $item->fieldtype]) && $this->newID['fieldtype'][(int) $item->fieldtype] > 0)
@ -2448,6 +2664,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 						else
 						{
 							$getter[] = 'xml';
+							$retryAgain = 3;
 						}
 					}
 					break;
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@ -362,6 +362,22 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			}
 		}

+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		// now get all the editor fields
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		// check if we found any
+		if (ComponentbuilderHelper::checkArray($editors))
+		{
+			foreach ($editors as $editor)
+			{
+				// get the field names
+				$name = (string) $editor['name'];
+				// set the field editor value (with none as fallback)
+				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
+			}
+		}
+
 		return $form;
 	}

@ -1175,7 +1191,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		}

 		// we check if component should be build from sql file
-		ComponentbuilderHelper::dynamicBuilder($data, 1);
+		if (isset($data['buildcomp']) && 1 == $data['buildcomp'])
+		{
+			ComponentbuilderHelper::dynamicBuilder($data, 1);
+		}
        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@ -1607,7 +1607,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			'php_after_delete','php_after_publish','php_ajaxmethod','php_allowedit','php_batchcopy',
 			'php_batchmove','php_before_delete','php_before_publish','php_before_save','php_controller',
 			'php_controller_list','php_document','php_getitem','php_getitems','php_getitems_after_all',
-			'php_getlistquery','php_import','php_import_display','php_import_ext','php_import_headers',
+			'php_getlistquery','php_import','php_import_display','php_import_ext','php_import_headers','php_getform',
 			'php_import_save','php_import_setdata','php_model','php_model_list','php_postsavehook','php_save');
 		$targets['admin_view']['view'] = 'admin_views';
 		$targets['admin_view']['not_base64'] = array();
--- a/admin/models/language.php
+++ b/admin/models/language.php
@ -175,7 +175,6 @@ class ComponentbuilderModelLanguage extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@ -215,7 +215,6 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@ -222,6 +222,22 @@ class ComponentbuilderModelLayout extends JModelAdmin
 			}
 		}

+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		// now get all the editor fields
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		// check if we found any
+		if (ComponentbuilderHelper::checkArray($editors))
+		{
+			foreach ($editors as $editor)
+			{
+				// get the field names
+				$name = (string) $editor['name'];
+				// set the field editor value (with none as fallback)
+				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
+			}
+		}
+
 		return $form;
 	}

--- a/admin/models/library.php
+++ b/admin/models/library.php
@ -223,7 +223,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/library_config.php
+++ b/admin/models/library_config.php
@ -185,7 +185,6 @@ class ComponentbuilderModelLibrary_config extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/library_files_folders_urls.php
+++ b/admin/models/library_files_folders_urls.php
@ -217,7 +217,6 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/rules/code.php
+++ b/admin/models/rules/code.php
@ -0,0 +1,53 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule (Code) class for the Joomla Platform.
+ */
+class JFormRuleCode extends FormRule
+{
+	/**
+	 * Method to test the value.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// This removes all validation (is dangerous) but needed to submit code via JCB
+		return true;
+
+		/**
+		 * My idea is to add some kind of validation to improve JCB code (per/language)
+		 *
+		 * So at this time this code validation is used for JavaScript,CSS,HTML and PHP.
+		 * We can see what language is being worked on with the syntax property in the $element. (in JCB)
+		 * What complicates things is the placeholders, of both custom code, component, and view names.
+		 * Ideally we could strip them and then validate the code to being syntactically correct.
+		 * But since some of the placeholders form part of the class/function names and the more, it seems like we are pressed for a much more advance solution.
+		 * If you have any ideas to how we can go about to do this, then please open an issue on github and lets begin. (this is a nice to have, so don't break a leg...)
+		 */
+	}
+}
--- a/admin/models/server.php
+++ b/admin/models/server.php
@ -156,7 +156,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWanlinked_components()
+	public function getWaolinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -316,7 +316,6 @@ class ComponentbuilderModelServer extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@ -345,6 +345,22 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			}
 		}

+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		// now get all the editor fields
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		// check if we found any
+		if (ComponentbuilderHelper::checkArray($editors))
+		{
+			foreach ($editors as $editor)
+			{
+				// get the field names
+				$name = (string) $editor['name'];
+				// set the field editor value (with none as fallback)
+				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
+			}
+		}
+
 		return $form;
 	}

--- a/admin/models/snippet.php
+++ b/admin/models/snippet.php
@ -181,7 +181,6 @@ class ComponentbuilderModelSnippet extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/snippet_type.php
+++ b/admin/models/snippet_type.php
@ -175,7 +175,6 @@ class ComponentbuilderModelSnippet_type extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/models/template.php
+++ b/admin/models/template.php
@ -222,6 +222,22 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 			}
 		}

+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		// now get all the editor fields
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		// check if we found any
+		if (ComponentbuilderHelper::checkArray($editors))
+		{
+			foreach ($editors as $editor)
+			{
+				// get the field names
+				$name = (string) $editor['name'];
+				// set the field editor value (with none as fallback)
+				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
+			}
+		}
+
 		return $form;
 	}

--- a/admin/models/validation_rule.php
+++ b/admin/models/validation_rule.php
@ -207,7 +207,6 @@ class ComponentbuilderModelValidation_rule extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}

--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
--- a/admin/sql/updates/mysql/2.7.10.sql
+++ b/admin/sql/updates/mysql/2.7.10.sql
@ -1,60 +1,3 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_css_view` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_css_views` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT 0,
-	`catid` INT(11) NOT NULL DEFAULT 0,
-	`css_view` TEXT NOT NULL,
-	`css_views` TEXT NOT NULL,
-	`datadefault` CHAR(64) NOT NULL DEFAULT '',
-	`datadefault_other` CHAR(64) NOT NULL DEFAULT '',
-	`datalenght` CHAR(64) NOT NULL DEFAULT '',
-	`datalenght_other` CHAR(64) NOT NULL DEFAULT '',
-	`datatype` CHAR(64) NOT NULL DEFAULT '',
-	`fieldtype` INT(11) NOT NULL DEFAULT 0,
-	`indexes` CHAR(64) NOT NULL DEFAULT '',
-	`javascript_view_footer` TEXT NOT NULL,
-	`javascript_views_footer` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`null_switch` CHAR(64) NOT NULL DEFAULT '',
-	`store` INT(11) NOT NULL DEFAULT 0,
-	`xml` TEXT NOT NULL,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`),
-	KEY `idx_fieldtype` (`fieldtype`),
-	KEY `idx_datatype` (`datatype`),
-	KEY `idx_indexes` (`indexes`),
-	KEY `idx_null_switch` (`null_switch`),
-	KEY `idx_catid` (`catid`),
-	KEY `idx_add_css_views` (`add_css_views`),
-	KEY `idx_add_css_view` (`add_css_view`),
-	KEY `idx_datalenght` (`datalenght`),
-	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
-	KEY `idx_datadefault_other` (`datadefault_other`),
-	KEY `idx_datadefault` (`datadefault`),
-	KEY `idx_datalenght_other` (`datalenght_other`),
-	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields_relations` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
--- a/admin/sql/updates/mysql/2.8.1.sql
+++ b/admin/sql/updates/mysql/2.8.1.sql
@ -0,0 +1,2 @@
+ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_getform` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_document`;
+ALTER TABLE `#__componentbuilder_admin_view` ADD `php_getform` MEDIUMTEXT NOT NULL AFTER `php_document`;
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@ -370,266 +370,266 @@ jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)

 });

-// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxl function
+// #jform_add_php_getform listeners for add_php_getform_vvvvvxl function
+jQuery('#jform_add_php_getform').on('keyup',function()
+{
+	var add_php_getform_vvvvvxl = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
+	vvvvvxl(add_php_getform_vvvvvxl);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_getform',function (e)
+{
+	e.preventDefault();
+	var add_php_getform_vvvvvxl = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
+	vvvvvxl(add_php_getform_vvvvvxl);
+
+});
+
+// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxm function
 jQuery('#jform_add_php_before_save').on('keyup',function()
 {
-	var add_php_before_save_vvvvvxl = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvxl(add_php_before_save_vvvvvxl);
+	var add_php_before_save_vvvvvxm = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	vvvvvxm(add_php_before_save_vvvvvxm);

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	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 add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxw(add_sql_vvvvvxw);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxw(add_sql_vvvvvxw);
-
-});
-
-// #jform_source listeners for source_vvvvvxx function
-jQuery('#jform_source').on('keyup',function()
-{
-	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_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);
+	var add_php_document_vvvvvxw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxw(add_php_document_vvvvvxw);

 });

 // #jform_add_sql listeners for add_sql_vvvvvxx function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	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);
+	vvvvvxx(add_sql_vvvvvxx);

 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	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);
+	vvvvvxx(add_sql_vvvvvxx);

 });

-// #jform_source listeners for source_vvvvvxz function
+// #jform_source listeners for source_vvvvvxy function
 jQuery('#jform_source').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);
+	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);

 });
 jQuery('#adminForm').on('change', '#jform_source',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);
+	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);

 });

-// #jform_add_sql listeners for add_sql_vvvvvxz function
+// #jform_add_sql listeners for add_sql_vvvvvxy 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);
+	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);

 });
 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);
+	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);

 });

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

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

 });

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

 });

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

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

 });

--- a/admin/views/compiler/tmpl/default.php
+++ b/admin/views/compiler/tmpl/default.php
@ -118,10 +118,13 @@ jQuery(document).ready(function($) {
 		</div>
 		<div class="span7">
 			<div id="component-details"><?php echo $selectNotice; ?></div>
-			<div id="noticeboard" class="well well-small">
-				<h2 class="module-title nav-header"><?php echo JText::_('COM_COMPONENTBUILDER_VDM_NOTICE_BOARD'); ?><span id="vdm-new-notice" style="display:none; color:red;"> (<?php echo JText::_('COM_COMPONENTBUILDER_NEW_NOTICE'); ?>)</span></h2>
-				<div id="noticeboard-md"><small><?php echo JText::_('COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING'); ?><span class="loading-dots">.</span></small></div>
-				<div style="text-align:right;"><small><a href="https://github.com/Llewellynvdm" target="_blank" style="color:gray">&lt;&lt;ewe&gt;&gt;yn</a></small></div>
+            <div id="noticeboard">
+              <div  class="well well-small">
+                  <h2 class="module-title nav-header"><?php echo JText::_('COM_COMPONENTBUILDER_VDM_NOTICE_BOARD'); ?><span id="vdm-new-notice" style="display:none; color:red;"> (<?php echo JText::_('COM_COMPONENTBUILDER_NEW_NOTICE'); ?>)</span></h2>
+                  <div id="noticeboard-md"><small><?php echo JText::_('COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING'); ?><span class="loading-dots">.</span></small></div>
+                  <div style="text-align:right;"><small><a href="https://github.com/Llewellynvdm" target="_blank" style="color:gray">&lt;&lt;ewe&gt;&gt;yn</a></small></div>
+              </div>
+				<div><a href="https://volunteers.joomla.org/" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-wide.gif" alt="Joomla! Volunteers Portal" width="728" height="90" border="0"></a></div>
 			</div>
 		</div>
 	</div>
--- a/admin/views/componentbuilder/tmpl/default.php
+++ b/admin/views/componentbuilder/tmpl/default.php
@ -77,15 +77,18 @@ JHtml::_('behavior.tooltip');
 		</div>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>

-		<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', 'notice_board', JText::_('Notice Board', true)); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', 'notice_board', JText::_('COM_COMPONENTBUILDER_NOTICE_BOARD', true)); ?>
 		<div class="row-fluid">
-			<div class="span12">
+			<div class="span10">
 				<?php  echo JHtml::_('bootstrap.startAccordion', 'notice_board_accordian', array('active' => 'notice_board_one')); ?>
 					<?php  echo JHtml::_('bootstrap.addSlide', 'notice_board_accordian', 'Vast Development Method', 'notice_board_one'); ?>
 						<?php echo $this->loadTemplate('notice_board_vast_development_method');?>
 					<?php  echo JHtml::_('bootstrap.endSlide'); ?>
 				<?php  echo JHtml::_('bootstrap.endAccordion'); ?>
 			</div>
+			<div class="span2">
+				<a href="https://volunteers.joomla.org/" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-tall.gif" alt="Joomla! Volunteers Portal" width="160" height="600" border="0"></a>
+			</div>
 		</div>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>

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

 <script type="text/javascript">

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

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

 });

-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyf function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyg function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	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_display_vvvvvyg = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyg(add_php_jview_display_vvvvvyg);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	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_display_vvvvvyg = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyg(add_php_jview_display_vvvvvyg);

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

 <script type="text/javascript">

-// #jform_target listeners for target_vvvvwaa function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(target_vvvvwaa);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(target_vvvvwaa);
-
-});
-
 // #jform_target listeners for target_vvvvwab function
 jQuery('#jform_target').on('keyup',function()
 {
@ -147,67 +132,82 @@ jQuery('#adminForm').on('change', '#jform_target',function (e)
 jQuery('#jform_target').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);
+	vvvvwac(target_vvvvwac);

 });
 jQuery('#adminForm').on('change', '#jform_target',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_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);
+	vvvvwac(target_vvvvwac);

 });

 // #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);
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_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);
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_vvvvwad);
+
+});
+
+// #jform_type listeners for type_vvvvwad function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_vvvvwad);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_vvvvwad);
+
+});
+
+// #jform_type listeners for type_vvvvwae function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);
+
+});
+
+// #jform_target listeners for target_vvvvwae function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);

 });

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

 <script type="text/javascript">

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

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

 });

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

 });

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

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

 });

@ -247,33 +232,14 @@ jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
-	vvvvvzh(addcalculation_vvvvvzh,gettype_vvvvvzh);
+	vvvvvzh(addcalculation_vvvvvzh);

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

 });

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

 });

-// #jform_main_source listeners for main_source_vvvvvzl function
-jQuery('#jform_main_source').on('keyup',function()
+// #jform_addcalculation listeners for addcalculation_vvvvvzj function
+jQuery('#jform_addcalculation').on('keyup',function()
 {
-	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
-	vvvvvzl(main_source_vvvvvzl);
+	var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
+	vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj);

 });
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
-	vvvvvzl(main_source_vvvvvzl);
+	var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
+	vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzj function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
+	vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
+	vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj);

 });

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

 });

-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzn function
+// #jform_main_source listeners for main_source_vvvvvzn function
+jQuery('#jform_main_source').on('keyup',function()
+{
+	var main_source_vvvvvzn = jQuery("#jform_main_source").val();
+	vvvvvzn(main_source_vvvvvzn);
+
+});
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+{
+	e.preventDefault();
+	var main_source_vvvvvzn = jQuery("#jform_main_source").val();
+	vvvvvzn(main_source_vvvvvzn);
+
+});
+
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzo function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	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);
+	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	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);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzn function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	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_gettype',function (e)
-{
-	e.preventDefault();
-	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);
-
-});
-
-// #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 add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_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);
+	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);

 });

 // #jform_gettype listeners for gettype_vvvvvzo function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzo = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_after_getitem_vvvvvzo,gettype_vvvvvzo);
+	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);

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

 });

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

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(gettype_vvvvvzq);
-
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzr function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	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_getlistquery_vvvvvzr,gettype_vvvvvzr);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	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_getlistquery_vvvvvzr,gettype_vvvvvzr);
+	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);

 });

 // #jform_gettype listeners for gettype_vvvvvzr function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	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_getlistquery_vvvvvzr,gettype_vvvvvzr);
+	vvvvvzr(gettype_vvvvvzr);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	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_getlistquery_vvvvvzr,gettype_vvvvvzr);
+	vvvvvzr(gettype_vvvvvzr);

 });

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

 });
-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_vvvvvzs = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitems_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);

 });

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

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

 });

-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzt function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzt function
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);

 });
-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_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);

 });

 // #jform_gettype listeners for gettype_vvvvvzt function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);

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

 });

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

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

 });

@ -575,33 +560,48 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 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);
+	vvvvvzy(gettype_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);
+	vvvvvzy(gettype_vvvvvzy);

 });

-// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzy function
+// #jform_gettype listeners for gettype_vvvvvzz function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzz function
 jQuery('#jform_add_php_router_parse').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);
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_router_parse',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);
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);

 });

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

 <script type="text/javascript">

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

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

 });

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

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

 });

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

 });

-// #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);
+	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);
+	vvvvwaq(datatype_vvvvwaq);

 });

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

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

 });

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

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

 });

-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwau function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwav function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	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_view_footer_vvvvwav = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwav(add_javascript_view_footer_vvvvwav);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	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_view_footer_vvvvwav = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwav(add_javascript_view_footer_vvvvwav);

 });

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

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

 });

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

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

 		// Set the toolbar
 		$this->addToolBar();
--- a/admin/views/get_snippets/tmpl/default.php
+++ b/admin/views/get_snippets/tmpl/default.php
@ -100,7 +100,7 @@ JHtml::_('behavior.keepalive');
 							<span class="uk-hidden-medium"><?php echo JText::_('COM_COMPONENTBUILDER_BULK'); ?></span>
 						</a>
 					</li>
-				</li>
+				</ul>
 			</div>
 		</nav>
 	</div>
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@ -113,21 +113,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

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

 });

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

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

 });

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

 });

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

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

 });

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

 <script type="text/javascript">

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

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

 });

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

 <script type="text/javascript">

-// #jform_how listeners for how_vvvvwae function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwae = jQuery("#jform_how").val();
-	vvvvwae(how_vvvvwae);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwae = jQuery("#jform_how").val();
-	vvvvwae(how_vvvvwae);
-
-});
-
 // #jform_how listeners for how_vvvvwaf function
 jQuery('#jform_how').on('keyup',function()
 {
@ -248,18 +233,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)

 });

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

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

 });

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

 <script type="text/javascript">

-// #jform_protocol listeners for protocol_vvvvwaw function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
-	vvvvwaw(protocol_vvvvwaw);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
-	vvvvwaw(protocol_vvvvwaw);
-
-});
-
 // #jform_protocol listeners for protocol_vvvvwax function
 jQuery('#jform_protocol').on('keyup',function()
 {
@ -156,135 +141,150 @@ jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvway = jQuery("#jform_protocol").val();
-	var authentication_vvvvway = jQuery("#jform_authentication").val();
-	vvvvway(protocol_vvvvway,authentication_vvvvway);
+	vvvvway(protocol_vvvvway);

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

 });

-// #jform_authentication listeners for authentication_vvvvway function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	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_vvvvway = jQuery("#jform_protocol").val();
-	var authentication_vvvvway = jQuery("#jform_authentication").val();
-	vvvvway(protocol_vvvvway,authentication_vvvvway);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwba function
+// #jform_protocol listeners for protocol_vvvvwaz function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwba = jQuery("#jform_protocol").val();
-	var authentication_vvvvwba = jQuery("#jform_authentication").val();
-	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
+	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
+	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
+	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);

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

 });

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

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

 });

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

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

 });

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

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

 });

-// #jform_protocol listeners for protocol_vvvvwbe function
+// #jform_protocol listeners for protocol_vvvvwbd 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);
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);

 });
 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);
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);

 });

-// #jform_authentication listeners for authentication_vvvvwbe function
+// #jform_authentication listeners for authentication_vvvvwbd 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);
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);

 });
 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);
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwbf function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwbf function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);

 });

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

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

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

 <script type="text/javascript">

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

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

 });

-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyp function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyq function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	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_display_vvvvvyq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyq(add_php_jview_display_vvvvvyq);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	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_display_vvvvvyq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyq(add_php_jview_display_vvvvvyq);

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

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

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

 });

--- a/admin/views/template/tmpl/edit.php
+++ b/admin/views/template/tmpl/edit.php
@ -125,18 +125,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/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>30th May, 2018</creationDate>
+	<creationDate>7th July, 2018</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.8.0</version>
+	<version>2.8.2</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.8.0)</h1>
+		<h1>Component Builder (v.2.8.2)</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
@ -395,10 +395,27 @@
 		<description>Builds Complex Joomla Components</description>
 		<element>com_componentbuilder</element>
 		<type>component</type>
-		<version>2.8.0</version>
+		<version>2.8.1</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.0/JCB_v2.8.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.2/JCB_v2.8.2.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.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.8.2</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.2/JCB_v2.8.2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
--- a/script.php
+++ b/script.php
@ -3368,7 +3368,7 @@ 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_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->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": "php_preflight_update","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","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"}]}';

@ -3380,9 +3380,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_batchmove":"add_php_batchmove","add_php_allowedit":"add_php_allowedit","add_php_save":"add_php_save","add_php_getlistquery":"add_php_getlistquery","icon_add":"icon_add","html_import_view":"html_import_view","add_sql":"add_sql","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_after_publish":"add_php_after_publish","not_required":"not_required","add_php_after_delete":"add_php_after_delete","php_import_save":"php_import_save","add_php_getitems_after_all":"add_php_getitems_after_all","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","alias_builder_type":"alias_builder_type","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder":"alias_builder","add_custom_import":"add_custom_import","add_php_getitem":"add_php_getitem","php_import_headers":"php_import_headers","add_php_getitems":"add_php_getitems","icon":"icon","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowedit":"php_allowedit","add_javascript_view_footer":"add_javascript_view_footer","php_batchcopy":"php_batchcopy","javascript_view_footer":"javascript_view_footer","php_batchmove":"php_batchmove","add_javascript_views_file":"add_javascript_views_file","php_before_publish":"php_before_publish","javascript_views_file":"javascript_views_file","php_after_publish":"php_after_publish","add_javascript_views_footer":"add_javascript_views_footer","php_before_delete":"php_before_delete","javascript_views_footer":"javascript_views_footer","php_after_delete":"php_after_delete","add_custom_button":"add_custom_button","php_document":"php_document","source":"source","php_controller":"php_controller","sql":"sql","php_model":"php_model","php_controller_list":"php_controller_list","php_import_display":"php_import_display","php_model_list":"php_model_list","php_import":"php_import","add_php_ajax":"add_php_ajax","php_import_setdata":"php_import_setdata","php_ajaxmethod":"php_ajaxmethod","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitem","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_before_publish":"add_php_before_publish","add_php_batchcopy":"add_php_batchcopy","add_php_postsavehook":"add_php_postsavehook","add_php_before_save":"add_php_before_save","icon_add":"icon_add","php_import_headers":"php_import_headers","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_before_delete":"add_php_before_delete","not_required":"not_required","add_php_document":"add_php_document","add_php_getitems":"add_php_getitems","add_custom_import":"add_custom_import","add_php_getlistquery":"add_php_getlistquery","icon":"icon","add_php_getitems_after_all":"add_php_getitems_after_all","add_php_getform":"add_php_getform","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","alias_builder_type":"alias_builder_type","add_sql":"add_sql","html_import_view":"html_import_view","alias_builder":"alias_builder","php_import_save":"php_import_save","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_getform":"php_getform","css_views":"css_views","php_before_save":"php_before_save","add_javascript_view_file":"add_javascript_view_file","php_save":"php_save","javascript_view_file":"javascript_view_file","php_postsavehook":"php_postsavehook","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_batchcopy":"php_batchcopy","add_javascript_views_file":"add_javascript_views_file","php_batchmove":"php_batchmove","javascript_views_file":"javascript_views_file","php_before_publish":"php_before_publish","add_javascript_views_footer":"add_javascript_views_footer","php_after_publish":"php_after_publish","javascript_views_footer":"javascript_views_footer","php_before_delete":"php_before_delete","add_custom_button":"add_custom_button","php_after_delete":"php_after_delete","php_document":"php_document","php_controller":"php_controller","source":"source","php_model":"php_model","sql":"sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","php_import_display":"php_import_display","add_php_ajax":"add_php_ajax","php_import":"php_import","php_ajaxmethod":"php_ajaxmethod","php_import_setdata":"php_import_setdata","php_import_ext":"php_import_ext","add_php_getitem":"add_php_getitem"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.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","add_php_batchmove","add_php_allowedit","add_php_save","add_php_getlistquery","add_sql","type","add_fadein","add_php_after_publish","add_php_after_delete","add_php_getitems_after_all","add_php_before_save","add_php_postsavehook","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_php_getitem","add_php_getitems","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax"],"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": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.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","add_php_before_publish","add_php_batchcopy","add_php_postsavehook","add_php_before_save","type","add_fadein","add_php_before_delete","add_php_document","add_php_getitems","add_custom_import","add_php_getlistquery","add_php_getitems_after_all","add_php_getform","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"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": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';

 			// Set the object into the content types table.
 			$admin_view_Inserted = $db->insertObject('#__content_types', $admin_view);
@ -3392,7 +3392,7 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_jview_display":"php_jview_display","php_view":"php_view","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_js_document":"add_js_document","default":"default","icon":"icon","php_jview":"php_jview","add_javascript_file":"add_javascript_file","libraries":"libraries","js_document":"js_document","add_css_document":"add_css_document","javascript_file":"javascript_file","not_required":"not_required","css_document":"css_document","custom_get":"custom_get","css":"css","main_get":"main_get","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
+			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_jview_display","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_jview_display":"php_jview_display","php_view":"php_view","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_js_document":"add_js_document","default":"default","icon":"icon","php_jview":"php_jview","add_javascript_file":"add_javascript_file","libraries":"libraries","js_document":"js_document","add_css_document":"add_css_document","javascript_file":"javascript_file","not_required":"not_required","css_document":"css_document","custom_get":"custom_get","css":"css","main_get":"main_get","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
 			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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","snippet","add_php_ajax","add_css","add_js_document","add_javascript_file","add_css_document","not_required","main_get","dynamic_get","add_php_document","add_php_view","add_custom_button","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';

@ -3404,7 +3404,7 @@ class com_componentbuilderInstallerScript
 			$site_view->type_title = 'Componentbuilder Site_view';
 			$site_view->type_alias = 'com_componentbuilder.site_view';
 			$site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_css_document":"add_css_document","libraries":"libraries","php_jview":"php_jview","default":"default","php_view":"php_view","add_javascript_file":"add_javascript_file","php_jview_display":"php_jview_display","add_js_document":"add_js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","js_document":"js_document","main_get":"main_get","css_document":"css_document","dynamic_get":"dynamic_get","css":"css","php_ajaxmethod":"php_ajaxmethod","add_custom_button":"add_custom_button","add_php_document":"add_php_document","button_position":"button_position","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
+			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_document","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_css_document":"add_css_document","libraries":"libraries","php_jview":"php_jview","default":"default","php_view":"php_view","add_javascript_file":"add_javascript_file","php_jview_display":"php_jview_display","add_js_document":"add_js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","js_document":"js_document","main_get":"main_get","css_document":"css_document","dynamic_get":"dynamic_get","css":"css","php_ajaxmethod":"php_ajaxmethod","add_custom_button":"add_custom_button","add_php_document":"add_php_document","button_position":"button_position","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute';
 			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.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","snippet","add_php_ajax","add_css","add_css_document","add_javascript_file","add_js_document","not_required","main_get","dynamic_get","add_custom_button","add_php_document","button_position","add_php_view","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';

@ -3416,7 +3416,7 @@ class com_componentbuilderInstallerScript
 			$template->type_title = 'Componentbuilder Template';
 			$template->type_alias = 'com_componentbuilder.template';
 			$template->table = '{"special": {"dbtable": "#__componentbuilder_template","key": "id","type": "Template","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","dynamic_get":"dynamic_get","not_required":"not_required","template":"template","libraries":"libraries"}}';
+			$template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "php_view","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","dynamic_get":"dynamic_get","not_required":"not_required","template":"template","libraries":"libraries"}}';
 			$template->router = 'ComponentbuilderHelperRoute::getTemplateRoute';
 			$template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.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","snippet","add_php_view","dynamic_get","not_required"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';

@ -3428,7 +3428,7 @@ class com_componentbuilderInstallerScript
 			$layout->type_title = 'Componentbuilder Layout';
 			$layout->type_alias = 'com_componentbuilder.layout';
 			$layout->table = '{"special": {"dbtable": "#__componentbuilder_layout","key": "id","type": "Layout","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","not_required":"not_required","layout":"layout","libraries":"libraries"}}';
+			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "php_view","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","not_required":"not_required","layout":"layout","libraries":"libraries"}}';
 			$layout->router = 'ComponentbuilderHelperRoute::getLayoutRoute';
 			$layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.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","dynamic_get","snippet","add_php_view","not_required"],"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": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';

@ -3440,7 +3440,7 @@ class com_componentbuilderInstallerScript
 			$dynamic_get->type_title = 'Componentbuilder Dynamic_get';
 			$dynamic_get->type_alias = 'com_componentbuilder.dynamic_get';
 			$dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","addcalculation":"addcalculation","add_php_router_parse":"add_php_router_parse","add_php_after_getitems":"add_php_after_getitems","add_php_before_getitems":"add_php_before_getitems","add_php_getlistquery":"add_php_getlistquery","add_php_after_getitem":"add_php_after_getitem","add_php_before_getitem":"add_php_before_getitem","php_custom_get":"php_custom_get","db_selection":"db_selection","db_table_main":"db_table_main","view_selection":"view_selection","view_table_main":"view_table_main","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
+			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_custom_get","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","addcalculation":"addcalculation","add_php_router_parse":"add_php_router_parse","add_php_after_getitems":"add_php_after_getitems","add_php_before_getitems":"add_php_before_getitems","add_php_getlistquery":"add_php_getlistquery","add_php_after_getitem":"add_php_after_getitem","add_php_before_getitem":"add_php_before_getitem","php_custom_get":"php_custom_get","db_selection":"db_selection","db_table_main":"db_table_main","view_selection":"view_selection","view_table_main":"view_table_main","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
 			$dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute';
 			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_router_parse","add_php_after_getitems","add_php_before_getitems","add_php_getlistquery","add_php_after_getitem","add_php_before_getitem","view_table_main","pagination","not_required"],"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": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';

@ -3452,7 +3452,7 @@ class com_componentbuilderInstallerScript
 			$custom_code->type_title = 'Componentbuilder Custom_code';
 			$custom_code->type_alias = 'com_componentbuilder.custom_code';
 			$custom_code->table = '{"special": {"dbtable": "#__componentbuilder_custom_code","key": "id","type": "Custom_code","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","not_required":"not_required","function_name":"function_name","system_name":"system_name","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","from_line":"from_line","hashtarget":"hashtarget"}}';
+			$custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "code","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","not_required":"not_required","function_name":"function_name","system_name":"system_name","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","from_line":"from_line","hashtarget":"hashtarget"}}';
 			$custom_code->router = 'ComponentbuilderHelperRoute::getCustom_codeRoute';
 			$custom_code->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_code.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","component","target","type","comment_type","not_required"],"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": "component","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}';

@ -3500,7 +3500,7 @@ class com_componentbuilderInstallerScript
 			$field->type_title = 'Componentbuilder Field';
 			$field->type_alias = 'com_componentbuilder.field';
 			$field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","store":"store","css_views":"css_views","add_css_views":"add_css_views","css_view":"css_view","add_css_view":"add_css_view","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","add_javascript_view_footer":"add_javascript_view_footer","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","not_required":"not_required","xml":"xml"}}';
+			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "css_views","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","store":"store","css_views":"css_views","add_css_views":"add_css_views","css_view":"css_view","add_css_view":"add_css_view","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","add_javascript_view_footer":"add_javascript_view_footer","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","not_required":"not_required","xml":"xml"}}';
 			$field->router = 'ComponentbuilderHelperRoute::getFieldRoute';
 			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","store","catid","add_css_views","add_css_view","add_javascript_views_footer","add_javascript_view_footer"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';

@ -3776,7 +3776,7 @@ class com_componentbuilderInstallerScript
 			$query = $db->getQuery(true);
 			// Field to update.
 			$fields = array(
-				$db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","manage_jcb_package_directories":"2","add_menu_prefix":"1","menu_prefix":"&#187;","minify":"0","set_browser_storage":"1","storage_time_to_live":"global","language":"en-GB","percentagelanguageadd":"50","compiler_field_builder_type":"2","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'),
+				$db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","editor":"none","manage_jcb_package_directories":"2","add_menu_prefix":"1","menu_prefix":"&#187;","minify":"0","set_browser_storage":"1","storage_time_to_live":"global","language":"en-GB","percentagelanguageadd":"50","compiler_field_builder_type":"2","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'),
 			);
 			// Condition.
 			$conditions = array(
@ -3802,7 +3802,7 @@ 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_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->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": "php_preflight_update","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","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"}]}';

@ -3831,9 +3831,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_batchmove":"add_php_batchmove","add_php_allowedit":"add_php_allowedit","add_php_save":"add_php_save","add_php_getlistquery":"add_php_getlistquery","icon_add":"icon_add","html_import_view":"html_import_view","add_sql":"add_sql","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_after_publish":"add_php_after_publish","not_required":"not_required","add_php_after_delete":"add_php_after_delete","php_import_save":"php_import_save","add_php_getitems_after_all":"add_php_getitems_after_all","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","alias_builder_type":"alias_builder_type","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder":"alias_builder","add_custom_import":"add_custom_import","add_php_getitem":"add_php_getitem","php_import_headers":"php_import_headers","add_php_getitems":"add_php_getitems","icon":"icon","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowedit":"php_allowedit","add_javascript_view_footer":"add_javascript_view_footer","php_batchcopy":"php_batchcopy","javascript_view_footer":"javascript_view_footer","php_batchmove":"php_batchmove","add_javascript_views_file":"add_javascript_views_file","php_before_publish":"php_before_publish","javascript_views_file":"javascript_views_file","php_after_publish":"php_after_publish","add_javascript_views_footer":"add_javascript_views_footer","php_before_delete":"php_before_delete","javascript_views_footer":"javascript_views_footer","php_after_delete":"php_after_delete","add_custom_button":"add_custom_button","php_document":"php_document","source":"source","php_controller":"php_controller","sql":"sql","php_model":"php_model","php_controller_list":"php_controller_list","php_import_display":"php_import_display","php_model_list":"php_model_list","php_import":"php_import","add_php_ajax":"add_php_ajax","php_import_setdata":"php_import_setdata","php_ajaxmethod":"php_ajaxmethod","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitem","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_before_publish":"add_php_before_publish","add_php_batchcopy":"add_php_batchcopy","add_php_postsavehook":"add_php_postsavehook","add_php_before_save":"add_php_before_save","icon_add":"icon_add","php_import_headers":"php_import_headers","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_before_delete":"add_php_before_delete","not_required":"not_required","add_php_document":"add_php_document","add_php_getitems":"add_php_getitems","add_custom_import":"add_custom_import","add_php_getlistquery":"add_php_getlistquery","icon":"icon","add_php_getitems_after_all":"add_php_getitems_after_all","add_php_getform":"add_php_getform","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","alias_builder_type":"alias_builder_type","add_sql":"add_sql","html_import_view":"html_import_view","alias_builder":"alias_builder","php_import_save":"php_import_save","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_getform":"php_getform","css_views":"css_views","php_before_save":"php_before_save","add_javascript_view_file":"add_javascript_view_file","php_save":"php_save","javascript_view_file":"javascript_view_file","php_postsavehook":"php_postsavehook","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_batchcopy":"php_batchcopy","add_javascript_views_file":"add_javascript_views_file","php_batchmove":"php_batchmove","javascript_views_file":"javascript_views_file","php_before_publish":"php_before_publish","add_javascript_views_footer":"add_javascript_views_footer","php_after_publish":"php_after_publish","javascript_views_footer":"javascript_views_footer","php_before_delete":"php_before_delete","add_custom_button":"add_custom_button","php_after_delete":"php_after_delete","php_document":"php_document","php_controller":"php_controller","source":"source","php_model":"php_model","sql":"sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","php_import_display":"php_import_display","add_php_ajax":"add_php_ajax","php_import":"php_import","php_ajaxmethod":"php_ajaxmethod","php_import_setdata":"php_import_setdata","php_import_ext":"php_import_ext","add_php_getitem":"add_php_getitem"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.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","add_php_batchmove","add_php_allowedit","add_php_save","add_php_getlistquery","add_sql","type","add_fadein","add_php_after_publish","add_php_after_delete","add_php_getitems_after_all","add_php_before_save","add_php_postsavehook","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_php_getitem","add_php_getitems","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax"],"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": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.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","add_php_before_publish","add_php_batchcopy","add_php_postsavehook","add_php_before_save","type","add_fadein","add_php_before_delete","add_php_document","add_php_getitems","add_custom_import","add_php_getlistquery","add_php_getitems_after_all","add_php_getform","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"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": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';

 			// Check if admin_view type is already in content_type DB.
 			$admin_view_id = null;
@ -3860,7 +3860,7 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_jview_display":"php_jview_display","php_view":"php_view","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_js_document":"add_js_document","default":"default","icon":"icon","php_jview":"php_jview","add_javascript_file":"add_javascript_file","libraries":"libraries","js_document":"js_document","add_css_document":"add_css_document","javascript_file":"javascript_file","not_required":"not_required","css_document":"css_document","custom_get":"custom_get","css":"css","main_get":"main_get","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
+			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_jview_display","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_jview_display":"php_jview_display","php_view":"php_view","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_js_document":"add_js_document","default":"default","icon":"icon","php_jview":"php_jview","add_javascript_file":"add_javascript_file","libraries":"libraries","js_document":"js_document","add_css_document":"add_css_document","javascript_file":"javascript_file","not_required":"not_required","css_document":"css_document","custom_get":"custom_get","css":"css","main_get":"main_get","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
 			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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","snippet","add_php_ajax","add_css","add_js_document","add_javascript_file","add_css_document","not_required","main_get","dynamic_get","add_php_document","add_php_view","add_custom_button","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';

@ -3889,7 +3889,7 @@ class com_componentbuilderInstallerScript
 			$site_view->type_title = 'Componentbuilder Site_view';
 			$site_view->type_alias = 'com_componentbuilder.site_view';
 			$site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_css_document":"add_css_document","libraries":"libraries","php_jview":"php_jview","default":"default","php_view":"php_view","add_javascript_file":"add_javascript_file","php_jview_display":"php_jview_display","add_js_document":"add_js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","js_document":"js_document","main_get":"main_get","css_document":"css_document","dynamic_get":"dynamic_get","css":"css","php_ajaxmethod":"php_ajaxmethod","add_custom_button":"add_custom_button","add_php_document":"add_php_document","button_position":"button_position","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
+			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_document","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_css_document":"add_css_document","libraries":"libraries","php_jview":"php_jview","default":"default","php_view":"php_view","add_javascript_file":"add_javascript_file","php_jview_display":"php_jview_display","add_js_document":"add_js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","js_document":"js_document","main_get":"main_get","css_document":"css_document","dynamic_get":"dynamic_get","css":"css","php_ajaxmethod":"php_ajaxmethod","add_custom_button":"add_custom_button","add_php_document":"add_php_document","button_position":"button_position","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute';
 			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.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","snippet","add_php_ajax","add_css","add_css_document","add_javascript_file","add_js_document","not_required","main_get","dynamic_get","add_custom_button","add_php_document","button_position","add_php_view","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';

@ -3918,7 +3918,7 @@ class com_componentbuilderInstallerScript
 			$template->type_title = 'Componentbuilder Template';
 			$template->type_alias = 'com_componentbuilder.template';
 			$template->table = '{"special": {"dbtable": "#__componentbuilder_template","key": "id","type": "Template","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","dynamic_get":"dynamic_get","not_required":"not_required","template":"template","libraries":"libraries"}}';
+			$template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "php_view","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","dynamic_get":"dynamic_get","not_required":"not_required","template":"template","libraries":"libraries"}}';
 			$template->router = 'ComponentbuilderHelperRoute::getTemplateRoute';
 			$template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.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","snippet","add_php_view","dynamic_get","not_required"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';

@ -3947,7 +3947,7 @@ class com_componentbuilderInstallerScript
 			$layout->type_title = 'Componentbuilder Layout';
 			$layout->type_alias = 'com_componentbuilder.layout';
 			$layout->table = '{"special": {"dbtable": "#__componentbuilder_layout","key": "id","type": "Layout","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","not_required":"not_required","layout":"layout","libraries":"libraries"}}';
+			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "php_view","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","not_required":"not_required","layout":"layout","libraries":"libraries"}}';
 			$layout->router = 'ComponentbuilderHelperRoute::getLayoutRoute';
 			$layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.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","dynamic_get","snippet","add_php_view","not_required"],"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": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';

@ -3976,7 +3976,7 @@ class com_componentbuilderInstallerScript
 			$dynamic_get->type_title = 'Componentbuilder Dynamic_get';
 			$dynamic_get->type_alias = 'com_componentbuilder.dynamic_get';
 			$dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","addcalculation":"addcalculation","add_php_router_parse":"add_php_router_parse","add_php_after_getitems":"add_php_after_getitems","add_php_before_getitems":"add_php_before_getitems","add_php_getlistquery":"add_php_getlistquery","add_php_after_getitem":"add_php_after_getitem","add_php_before_getitem":"add_php_before_getitem","php_custom_get":"php_custom_get","db_selection":"db_selection","db_table_main":"db_table_main","view_selection":"view_selection","view_table_main":"view_table_main","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
+			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_custom_get","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","addcalculation":"addcalculation","add_php_router_parse":"add_php_router_parse","add_php_after_getitems":"add_php_after_getitems","add_php_before_getitems":"add_php_before_getitems","add_php_getlistquery":"add_php_getlistquery","add_php_after_getitem":"add_php_after_getitem","add_php_before_getitem":"add_php_before_getitem","php_custom_get":"php_custom_get","db_selection":"db_selection","db_table_main":"db_table_main","view_selection":"view_selection","view_table_main":"view_table_main","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
 			$dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute';
 			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_router_parse","add_php_after_getitems","add_php_before_getitems","add_php_getlistquery","add_php_after_getitem","add_php_before_getitem","view_table_main","pagination","not_required"],"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": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';

@ -4005,7 +4005,7 @@ class com_componentbuilderInstallerScript
 			$custom_code->type_title = 'Componentbuilder Custom_code';
 			$custom_code->type_alias = 'com_componentbuilder.custom_code';
 			$custom_code->table = '{"special": {"dbtable": "#__componentbuilder_custom_code","key": "id","type": "Custom_code","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","not_required":"not_required","function_name":"function_name","system_name":"system_name","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","from_line":"from_line","hashtarget":"hashtarget"}}';
+			$custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "code","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","not_required":"not_required","function_name":"function_name","system_name":"system_name","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","from_line":"from_line","hashtarget":"hashtarget"}}';
 			$custom_code->router = 'ComponentbuilderHelperRoute::getCustom_codeRoute';
 			$custom_code->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_code.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","component","target","type","comment_type","not_required"],"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": "component","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}';

@ -4121,7 +4121,7 @@ class com_componentbuilderInstallerScript
 			$field->type_title = 'Componentbuilder Field';
 			$field->type_alias = 'com_componentbuilder.field';
 			$field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","store":"store","css_views":"css_views","add_css_views":"add_css_views","css_view":"css_view","add_css_view":"add_css_view","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","add_javascript_view_footer":"add_javascript_view_footer","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","not_required":"not_required","xml":"xml"}}';
+			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "css_views","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","store":"store","css_views":"css_views","add_css_views":"add_css_views","css_view":"css_view","add_css_view":"add_css_view","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","add_javascript_view_footer":"add_javascript_view_footer","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","not_required":"not_required","xml":"xml"}}';
 			$field->router = 'ComponentbuilderHelperRoute::getFieldRoute';
 			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","store","catid","add_css_views","add_css_view","add_javascript_views_footer","add_javascript_view_footer"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';

@ -4991,7 +4991,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.8.0 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.8.2 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}