Release of v5.0.2

Fix site view form missing classes in J4+. Fix permissions tab in items in J4+. Fix site display controller checkEditId function in J4+. Add class methods to the HtmlView classes in J4+. Fix broken toolbar call in HtmlView in J4+. Fix missing scripts and styles fields and methods in the site admin view model. Update subform field layout across JCB for cleaner look. Remove expansion feature. Fix helper area. Fix database mySql update in J4+. Remove phpspreadsheet completely from Joomla 4+. Add option to use powers in preflight event in the installer class. Fix abstract schema class function check default index warring. Fix dynamicGet so that the table values will load again. #1155. Add more pure JS to the dynamic get area. Add native plugin builder for Joomla 4 & 5. Add basic API for admin views.

CHANGELOG.md

@@ -1,3 +1,50 @@
+# v5.0.2
+
+- Fix site view form missing classes in J4+
+- Fix permissions tab in items in J4+
+- Fix site display controller checkEditId function in J4+
+- Add class methods to the HtmlView classes in J4+
+- Fix broken toolbar call in HtmlView in J4+
+- Fix missing scripts and styles fields and methods in the site admin view model
+- Update subform field layout across JCB for cleaner look
+- Remove expansion feature
+- Fix helper area
+- Fix database mySql update in J4+
+- Remove phpspreadsheet completely from Joomla 4+
+- Add option to use powers in preflight event in the installer class
+- Fix abstract schema class function check default index warring
+- Fix dynamicGet so that the table values will load again. #1155
+- Add more pure JS to the dynamic get area
+- Add native plugin builder for Joomla 4 & 5
+- Add basic API for admin views
+
+# v5.0.1
+
+- Fix auto build from SQL in Joomla 5.
+- Fix permission issue for admin views.
+- Add in JCB gitea push feature to help maintain JCB core features.
+- Add extending options to interfaces.
+- Change the extendsinterfaces field to allow null, #1139
+- Update the Schema class to also update null mismatching if needed
+- Add repositories for better integration with gitea
+- Refactored the Data classes
+- Add new Data classes
+- Add new subform classes
+- Fix registry class methods return type
+- Update all list and custom fields to use the new layouts
+- Add push options to Joomla Power
+- Complete the Joomla Power Init and Reset features
+- Fix Gitea Contents class functions
+- Fix subform set methods
+- Improved the Joomla Power Push path
+- Fix the metadata, metadesc, metakey database issue
+- Fix function mismatch call in the compiler power class.
+- Fix init feature to only add missing powers
+- Fix controller postSaveHook function, for correct model class in Joomla 4 and 5
+- Fix app instances (mismatch) in the install script and schema class when installing from CLI
+- Add option to use placeholders in Joomla Power namespaces.
+- Fix subform layout of uikit in JCB
+
 # v5.0.0
 
 - Fix the plug-in installer script builder bug #1067
@@ -42,72 +89,40 @@
 - Add the BaseDatabaseModel use statement to custom site view controller. #1119
 - Fix the customfolderlist field. #1120
 
-# v4.0.0
+# v4.0.2
 
-- Fix the plug-in installer script builder bug #1067
-- Fix Event triggers for Joomla 4 and 5 builds.
-- Add fix to the update script, so that upgrading JCB from Joomla 3 to 4 will not fail.
-- Fix plugin field selection
-- Fix plugin params tab layout
-- Add issue templates
-- Force autoloader to always load. 
-- Fix repeatable layout #1076
-- Add Factory class to the J5 Event class. #1093
-- Fix customfilelist field to conform to the new namespacing conventions. #1094
-- Add menus for languages, servers, get snippets to J4 #1095
-- Fix [Set String Value] in placeholder table to store the value as a base64 string.
-- Fix the search area layout.
-- Fix the search area code line selection.
-- Fix the input edit button for custom fields.
-- Add the new layout to list fields (GUI UPDATE)
-- Start fixing the field view in Joomla 4. #1096
-- Add power path override option on component level.
-- Fix the sql build feature. #1032
-- Add the compiler menu back.
-- Fix the CustomfolderlistField #1094
-- Add view list and single name fix.
-- Add component code name fix.
-- Add reset list of powers.
-- Add Joomla powers for namespace dynamic management.
-- Add fallback option to ensure that all JCB tables and fields exist.
-- Move the powers autoloader to its own file.
-- Fix the media field size limitation. #1109
-- Add dynamic datatype update to schema field check.
-- Fix version_update column size.
-- Improved the Schema Table update engine.
-- Improved the Schema Table update engine (more).
-- Fix autoloader timing, and loading.
-- Implement the Joomla Powers in JCB code, to move away from JClasses.
-- Remove the SQL update, to only use the Schema updates of table columns to avoid collusion.
-- Fix the admin.css file loading on dashboard. #1112
-- Fix dynamic get data-type default to 0. #1110
-- Fix the missing model call. #1114
-- Fix the wrong $date call. #1115
-- Add the BaseDatabaseModel use statement to custom site view controller. #1119
-- Fix the customfolderlist field. #1120
+- Fix site view form missing classes in J4+
+- Fix permissions tab in items in J4+
+- Fix site display controller checkEditId function in J4+
+- Add class methods to the HtmlView classes in J4+
+- Fix broken toolbar call in HtmlView in J4+
+- Fix missing scripts and styles fields and methods in the site admin view model
+- Update subform field layout across JCB for cleaner look
+- Remove expansion feature
+- Fix helper area
+- Fix database mySql update in J4+
+- Remove phpspreadsheet completely from Joomla 4+
+- Add option to use powers in preflight event in the installer class
+- Fix abstract schema class function check default index warring
+- Fix dynamicGet so that the table values will load again. #1155
+- Add more pure JS to the dynamic get area
+- Add native plugin builder for Joomla 4 & 5
 
-# v3.2.1
+# v3.2.3
 
-- Add power path override option on component level.
-- Fix the sql build feature. #1032
-- Add view list and single name fix.
-- Add component code name fix.
-- Add reset list of powers.
-- Fix missing Factory class in plugin. #1102
-- Fix plugin code display when methods and properties are missing.
-- Add Joomla powers for namespace dynamic management.
-- Add fallback option to ensure that all JCB tables and fields exist.
-- Move the powers autoloader to its own file.
-- Fix the media field size limitation. #1109
-- Add dynamic datatype update to schema field check.
-- Fix version_update column size.
-- Improved the Schema Table update engine.
-- Improved the Schema Table update engine (more)
-- Fix autoloader timing, and loading.
-- Implement the Joomla Powers in JCB code, to move away from JClasses.
-- Remove many of the SQL updates, to only use the Schema updates of table columns to avoid collusion.
-- Fix the admin.css file loading on dashboard. #1112
-- Fix the missing model call. #1114
-- Fix the wrong $date call. #1115
-- Add the BaseDatabaseModel use statement to custom site view controller. #1119
-- Fix the customfolderlist field. #1120
+- Fix site view form missing classes in J4+
+- Fix permissions tab in items in J4+
+- Fix site display controller checkEditId function in J4+
+- Add class methods to the HtmlView classes in J4+
+- Fix broken toolbar call in HtmlView in J4+
+- Fix missing scripts and styles fields and methods in the site admin view model
+- Update subform field layout across JCB for cleaner look
+- Remove expansion feature
+- Fix helper area
+- Fix database mySql update in J4+
+- Remove phpspreadsheet completely from Joomla 4+
+- Add option to use powers in preflight event in the installer class
+- Fix abstract schema class function check default index warring
+- Fix dynamicGet so that the table values will load again. #1155
+- Keep jQuery in dynamicGet area for Joomla 3
+- Add native plugin builder for Joomla 4 & 5

ComponentbuilderInstallerPowerloader.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 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('_JEXEC') or die;
+
+// register additional namespace
+spl_autoload_register(function ($class) {
+	// project-specific base directories and namespace prefix
+	$search = [
+		'libraries/vendor_jcb/VDM.Joomla.Gitea' => 'VDM\\Joomla\\Gitea',
+		'libraries/vendor_jcb/VDM.Joomla.FOF' => 'VDM\\Joomla\\FOF',
+		'libraries/vendor_jcb/VDM.Joomla' => 'VDM\\Joomla',
+		'libraries/vendor_jcb/VDM.Minify' => 'VDM\\Minify',
+		'libraries/vendor_jcb/VDM.Psr' => 'VDM\\Psr'
+	];
+	// Start the search and load if found
+	$found = false;
+	$found_base_dir = "";
+	$found_len = 0;
+	foreach ($search as $base_dir => $prefix)
+	{
+		// does the class use the namespace prefix?
+		$len = strlen($prefix);
+		if (strncmp($prefix, $class, $len) === 0)
+		{
+			// we have a match so load the values
+			$found = true;
+			$found_base_dir = $base_dir;
+			$found_len = $len;
+			// done here
+			break;
+		}
+	}
+	// check if we found a match
+	if (!$found)
+	{
+		// not found so move to the next registered autoloader
+		return;
+	}
+	// get the relative class name
+	$relative_class = substr($class, $found_len);
+	// replace the namespace prefix with the base directory, replace namespace
+	// separators with directory separators in the relative class name, append
+	// with .php
+	$file = __DIR__ . '/' . $found_base_dir . '/src' . str_replace('\\', '/', $relative_class) . '.php';
+	// if the file exists, require it
+	if (file_exists($file))
+	{
+		require $file;
+	}
+});

ComponentbuilderInstallerScript.php

@@ -14,13 +14,13 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Installer\InstallerScriptInterface;
-use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Version;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\Filesystem\Folder;
 use Joomla\Database\DatabaseInterface;
-use VDM\Joomla\Componentbuilder\Table\Schema;
+use VDM\Joomla\Componentbuilder\PHPConfigurationChecker;
+use VDM\Joomla\Componentbuilder\Table\SchemaChecker;
 
 // No direct access to this file
 defined('_JEXEC') or die;
@@ -35,7 +35,6 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	/**
 	 * The CMS Application.
 	 *
-	 * @var   CMSApplication
 	 * @since 4.4.2
 	 */
 	protected $app;
@@ -50,7 +49,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	/**
 	 * The version number of the extension.
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $release;
@@ -58,7 +57,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	/**
 	 * The table the parameters are stored in.
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $paramTable;
@@ -66,7 +65,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	/**
 	 * The extension name. This should be set in the installer script.
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $extension;
@@ -74,7 +73,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	/**
 	 * A list of files to be deleted
 	 *
-	 * @var   array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $deleteFiles = [];
@@ -82,7 +81,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	/**
 	 * A list of folders to be deleted
 	 *
-	 * @var   array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $deleteFolders = [];
@@ -90,7 +89,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	/**
 	 * A list of CLI script files to be copied to the cli directory
 	 *
-	 * @var   array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $cliScriptFiles = [];
@@ -98,7 +97,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	/**
 	 * Minimum PHP version required to install the extension
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $minimumPhp;
@@ -106,7 +105,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	/**
 	 * Minimum Joomla! version required to install the extension
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $minimumJoomla;
@@ -160,7 +159,6 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter  $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function install(InstallerAdapter $adapter): bool {return true;}
@@ -182,7 +180,6 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter   $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function uninstall(InstallerAdapter $adapter): bool
@@ -264,6 +261,9 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 		// Remove Server Data
 		$this->removeViewData("com_componentbuilder.server");
 
+		// Remove Repository Data
+		$this->removeViewData("com_componentbuilder.repository");
+
 		// Remove Help document Data
 		$this->removeViewData("com_componentbuilder.help_document");
 
@@ -423,6 +423,9 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 		// Remove Server from action logs config table.
 		$this->removeActionLogConfig('com_componentbuilder.server');
 
+		// Remove Repository from action logs config table.
+		$this->removeActionLogConfig('com_componentbuilder.repository');
+
 		// Remove Help_document from action logs config table.
 		$this->removeActionLogConfig('com_componentbuilder.help_document');
 
@@ -521,7 +524,6 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter  $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function preflight(string $type, InstallerAdapter $adapter): bool
@@ -550,38 +552,41 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 		if ($type === 'update')
 		{
 
-			// Check if the class and method exist before attempting to call it.
-			if (class_exists('\VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper') &&
-				method_exists('\VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper', 'removeFolder'))
-			{
-				// path to the compiler folders
-				$jcb_powers = [];
-				$jcb_powers[] = JPATH_LIBRARIES . '/vendor_jcb/VDM.Joomla/src/Componentbuilder';
-				$jcb_powers[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla/src/Componentbuilder';
-				$jcb_powers[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.FOF';
-				$jcb_powers[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.Gitea';
-				$jcb_powers[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.Openai';
-				$jcb_powers[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.Wasabi';
-				$jcb_powers[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Minify';
-				$jcb_powers[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Psr';
+
+			// all things to clear out
+			$jcb_cleaner = [];
+			$jcb_cleaner[] = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/compiler';
+			$jcb_cleaner[] = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/extrusion';
+			$jcb_cleaner[] = JPATH_LIBRARIES . '/vendor_jcb/VDM.Joomla/src/Componentbuilder';
+			$jcb_cleaner[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla/src/Componentbuilder';
+			$jcb_cleaner[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.FOF';
+			$jcb_cleaner[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.Gitea';
+			$jcb_cleaner[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.Openai';
+			$jcb_cleaner[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.Wasabi';
+			$jcb_cleaner[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Minify';
+			$jcb_cleaner[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Psr';
 
-				// we always remove all the old files to avoid mismatching
-				foreach ($jcb_powers as $jcb_power)
-				{
-					\VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper::removeFolder($jcb_power);
-				}
+			foreach ($jcb_cleaner as $cleaner)
+			{
+				$this->removeFolder($cleaner);
 			}
 
-			// Check that the required configuration are set for PHP
-			$this->phpConfigurationCheck($this->app);
+			// Check that the PHP configurations are sufficient 
+			if ($this->classExists(PHPConfigurationChecker::class))
+			{
+				(new PHPConfigurationChecker())->run();
+			}
 		}
 
 		// do any install needed
 		if ($type === 'install')
 		{
 
-			// Check that the required configuration are set for PHP
-			$this->phpConfigurationCheck($this->app);
+			// Check that the PHP configurations are sufficient 
+			if ($this->classExists(PHPConfigurationChecker::class))
+			{
+				(new PHPConfigurationChecker())->run();
+			}
 		}
 
 		return true;
@@ -594,7 +599,6 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter  $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function postflight(string $type, InstallerAdapter $adapter): bool
@@ -617,11 +621,11 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// rules
 				'',
 				// fieldMappings
-				'{"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_site_event","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","short_description":"short_description","companyname":"companyname","php_site_event":"php_site_event","component_version":"component_version","php_admin_event":"php_admin_event","crowdin_username":"crowdin_username","php_preflight_install":"php_preflight_install","remove_line_breaks":"remove_line_breaks","description":"description","php_method_uninstall":"php_method_uninstall","debug_linenr":"debug_linenr","mvc_versiondate":"mvc_versiondate","css_admin":"css_admin","addreadme":"addreadme","php_postflight_install":"php_postflight_install","add_placeholders":"add_placeholders","sql":"sql","author":"author","update_server_url":"update_server_url","email":"email","add_backup_folder_path":"add_backup_folder_path","website":"website","translation_tool":"translation_tool","add_license":"add_license","buildcompsql":"buildcompsql","license_type":"license_type","php_helper_admin":"php_helper_admin","php_helper_site":"php_helper_site","whmcs_key":"whmcs_key","javascript":"javascript","whmcs_url":"whmcs_url","css_site":"css_site","whmcs_buy_link":"whmcs_buy_link","license":"license","php_preflight_update":"php_preflight_update","bom":"bom","php_postflight_update":"php_postflight_update","image":"image","php_method_install":"php_method_install","copyright":"copyright","sql_uninstall":"sql_uninstall","preferred_joomla_version":"preferred_joomla_version","add_powers":"add_powers","add_sales_server":"add_sales_server","backup_folder_path":"backup_folder_path","add_jcb_powers_path":"add_jcb_powers_path","crowdin_project_identifier":"crowdin_project_identifier","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_namespace_prefix":"add_namespace_prefix","add_javascript":"add_javascript","namespace_prefix":"namespace_prefix","add_css_admin":"add_css_admin","add_css_site":"add_css_site","add_menu_prefix":"add_menu_prefix","dashboard_type":"dashboard_type","menu_prefix":"menu_prefix","dashboard":"dashboard","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","toignore":"toignore","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","export_key":"export_key","add_php_method_install":"add_php_method_install","joomla_source_link":"joomla_source_link","add_sql":"add_sql","export_buy_link":"export_buy_link","add_sql_uninstall":"add_sql_uninstall","assets_table_fix":"assets_table_fix","readme":"readme","add_update_server":"add_update_server","emptycontributors":"emptycontributors","update_server_target":"update_server_target","number":"number","update_server":"update_server","sales_server":"sales_server","add_git_folder_path":"add_git_folder_path","git_folder_path":"git_folder_path","jcb_powers_path":"jcb_powers_path","creatuserhelper":"creatuserhelper","adduikit":"adduikit","crowdin_project_api_key":"crowdin_project_api_key","addfootable":"addfootable","crowdin_account_api_key":"crowdin_account_api_key","add_email_helper":"add_email_helper","buildcomp":"buildcomp","add_php_helper_both":"add_php_helper_both","guid":"guid","php_helper_both":"php_helper_both","name":"name"}}',
+				'{"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_postflight_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","short_description":"short_description","companyname":"companyname","crowdin_project_identifier":"crowdin_project_identifier","backup_folder_path":"backup_folder_path","sql_uninstall":"sql_uninstall","php_postflight_update":"php_postflight_update","css_site":"css_site","mvc_versiondate":"mvc_versiondate","remove_line_breaks":"remove_line_breaks","add_placeholders":"add_placeholders","php_helper_site":"php_helper_site","javascript":"javascript","description":"description","debug_linenr":"debug_linenr","author":"author","php_method_install":"php_method_install","email":"email","website":"website","add_sales_server":"add_sales_server","license":"license","add_jcb_powers_path":"add_jcb_powers_path","bom":"bom","image":"image","php_admin_event":"php_admin_event","copyright":"copyright","php_site_event":"php_site_event","css_admin":"css_admin","php_preflight_update":"php_preflight_update","component_version":"component_version","php_preflight_install":"php_preflight_install","preferred_joomla_version":"preferred_joomla_version","php_postflight_install":"php_postflight_install","add_powers":"add_powers","php_method_uninstall":"php_method_uninstall","sql":"sql","addreadme":"addreadme","update_server_url":"update_server_url","add_backup_folder_path":"add_backup_folder_path","translation_tool":"translation_tool","crowdin_username":"crowdin_username","buildcompsql":"buildcompsql","add_namespace_prefix":"add_namespace_prefix","namespace_prefix":"namespace_prefix","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_menu_prefix":"add_menu_prefix","add_javascript":"add_javascript","menu_prefix":"menu_prefix","add_css_admin":"add_css_admin","add_css_site":"add_css_site","dashboard_type":"dashboard_type","toignore":"toignore","dashboard":"dashboard","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","export_key":"export_key","add_php_postflight_install":"add_php_postflight_install","joomla_source_link":"joomla_source_link","add_php_postflight_update":"add_php_postflight_update","export_buy_link":"export_buy_link","add_php_method_uninstall":"add_php_method_uninstall","add_php_method_install":"add_php_method_install","add_sql":"add_sql","add_sql_uninstall":"add_sql_uninstall","emptycontributors":"emptycontributors","assets_table_fix":"assets_table_fix","number":"number","readme":"readme","add_update_server":"add_update_server","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","creatuserhelper":"creatuserhelper","add_git_folder_path":"add_git_folder_path","adduikit":"adduikit","git_folder_path":"git_folder_path","addfootable":"addfootable","jcb_powers_path":"jcb_powers_path","add_email_helper":"add_email_helper","add_php_helper_both":"add_php_helper_both","crowdin_project_api_key":"crowdin_project_api_key","php_helper_both":"php_helper_both","crowdin_account_api_key":"crowdin_account_api_key","add_php_helper_admin":"add_php_helper_admin","buildcomp":"buildcomp","php_helper_admin":"php_helper_admin","guid":"guid","add_admin_event":"add_admin_event","name":"name"}}',
 				// router
 				'',
 				// contentHistoryOptions
-				'{"formFile": "administrator/components/com_componentbuilder/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","remove_line_breaks","debug_linenr","mvc_versiondate","addreadme","add_placeholders","add_backup_folder_path","translation_tool","add_license","license_type","preferred_joomla_version","add_powers","add_sales_server","add_jcb_powers_path","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_php_method_install","add_sql","add_sql_uninstall","assets_table_fix","add_update_server","emptycontributors","update_server_target","number","update_server","sales_server","add_git_folder_path","creatuserhelper","adduikit","addfootable","add_email_helper","buildcomp","add_php_helper_both"],"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": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}'
+				'{"formFile": "administrator/components/com_componentbuilder/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","mvc_versiondate","remove_line_breaks","add_placeholders","debug_linenr","add_sales_server","add_jcb_powers_path","preferred_joomla_version","add_powers","addreadme","add_backup_folder_path","translation_tool","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_php_method_install","add_sql","add_sql_uninstall","emptycontributors","assets_table_fix","number","add_update_server","update_server_target","update_server","sales_server","creatuserhelper","add_git_folder_path","adduikit","addfootable","add_email_helper","add_php_helper_both","add_php_helper_admin","buildcomp","add_admin_event"],"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": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}'
 			);
 			// Install Joomla module Content Types.
 			$this->setContentType(
@@ -685,11 +689,11 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// rules
 				'',
 				// fieldMappings
-				'{"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": "head","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","namespace":"namespace","type":"type","power_version":"power_version","licensing_template":"licensing_template","description":"description","extends":"extends","approved":"approved","add_head":"add_head","extends_custom":"extends_custom","implements_custom":"implements_custom","implements":"implements","head":"head","approved_paths":"approved_paths","main_class_code":"main_class_code","add_licensing_template":"add_licensing_template","guid":"guid","name":"name"}}',
+				'{"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": "head","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","namespace":"namespace","type":"type","power_version":"power_version","description":"description","licensing_template":"licensing_template","approved":"approved","extendsinterfaces_custom":"extendsinterfaces_custom","add_head":"add_head","extends":"extends","extends_custom":"extends_custom","implements_custom":"implements_custom","implements":"implements","extendsinterfaces":"extendsinterfaces","approved_paths":"approved_paths","head":"head","add_licensing_template":"add_licensing_template","main_class_code":"main_class_code","guid":"guid","name":"name"}}',
 				// router
 				'',
 				// contentHistoryOptions
-				'{"formFile": "administrator/components/com_componentbuilder/forms/power.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","approved","add_head","add_licensing_template"],"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": "extends","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "implements","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"}]}'
+				'{"formFile": "administrator/components/com_componentbuilder/forms/power.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","approved","add_head","add_licensing_template"],"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": "extends","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "implements","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "extendsinterfaces","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"}]}'
 			);
 			// Install Admin view Content Types.
 			$this->setContentType(
@@ -923,7 +927,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// rules
 				'',
 				// fieldMappings
-				'{"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","on_save_model_field":"on_save_model_field","initiator_on_get_model":"initiator_on_get_model","initiator_on_save_model":"initiator_on_save_model","xml":"xml","datalenght":"datalenght","css_views":"css_views","css_view":"css_view","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","on_get_model_field":"on_get_model_field","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","add_css_view":"add_css_view","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","add_javascript_views_footer":"add_javascript_views_footer","guid":"guid"}}',
+				'{"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": "javascript_view_footer","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","on_get_model_field":"on_get_model_field","on_save_model_field":"on_save_model_field","initiator_on_get_model":"initiator_on_get_model","xml":"xml","datalenght":"datalenght","javascript_view_footer":"javascript_view_footer","css_views":"css_views","css_view":"css_view","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","javascript_views_footer":"javascript_views_footer","add_css_view":"add_css_view","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","add_javascript_views_footer":"add_javascript_views_footer","initiator_on_save_model":"initiator_on_save_model","guid":"guid"}}',
 				// router
 				'',
 				// contentHistoryOptions
@@ -1031,6 +1035,23 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// contentHistoryOptions
 				'{"formFile": "administrator/components/com_componentbuilder/forms/server.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","protocol","authentication"],"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"}]}'
 			);
+			// Install Repository Content Types.
+			$this->setContentType(
+				// typeTitle
+				'Componentbuilder Repository',
+				// typeAlias
+				'com_componentbuilder.repository',
+				// table
+				'{"special": {"dbtable": "#__componentbuilder_repository","key": "id","type": "RepositoryTable","prefix": "VDM\Component\Componentbuilder\Administrator\Table"}}',
+				// rules
+				'',
+				// fieldMappings
+				'{"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": "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","organisation":"organisation","repository":"repository","target":"target","type":"type","base":"base","guid":"guid","access_repo":"access_repo","write_branch":"write_branch","read_branch":"read_branch","token":"token","username":"username"}}',
+				// router
+				'',
+				// contentHistoryOptions
+				'{"formFile": "administrator/components/com_componentbuilder/forms/repository.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","target","type","access_repo"],"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"}]}'
+			);
 			// Install Help document Content Types.
 			$this->setContentType(
 				// typeTitle
@@ -1042,11 +1063,11 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// rules
 				'',
 				// fieldMappings
-				'{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","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": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","not_required":"not_required","content":"content","article":"article","url":"url","target":"target","alias":"alias"}}',
+				'{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","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": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","alias":"alias","content":"content","article":"article","url":"url","target":"target"}}',
 				// router
 				'',
 				// contentHistoryOptions
-				'{"formFile": "administrator/components/com_componentbuilder/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","type","location","not_required","article","target"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}'
+				'{"formFile": "administrator/components/com_componentbuilder/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","type","location","article","target"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}'
 			);
 			// Install Admin fields Content Types.
 			$this->setContentType(
@@ -1493,16 +1514,19 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 
 
 			// Fix the assets table rules column size.
-			$this->setDatabaseAssetsRulesFix(93920, "MEDIUMTEXT");
+			$this->setDatabaseAssetsRulesFix(95040, "MEDIUMTEXT");
 			// Install the global extension params.
 			$this->setExtensionsParams(
-				'{"autorName":"Llewellyn van der Merwe","autorEmail":"joomla@vdm.io","subform_layouts":"default","editor":"none","manage_jcb_package_directories":"2","set_browser_storage":"1","storage_time_to_live":"global","super_powers_documentation":"0","powers_repository":"0","super_powers_repositories":"0","approved_paths":"default","add_custom_gitea_url":"1","custom_gitea_url":"https://git.vdm.dev","super_powers_core_organisation":"joomla","super_powers_core":"joomla/super-powers","builder_gif_size":"480-272","compiler_plugin":["componentbuilderactionlogcompiler","componentbuilderfieldorderingcompiler","componentbuilderheaderscompiler","componentbuilderpowersautoloadercompiler","componentbuilderprivacycompiler"],"add_menu_prefix":"1","menu_prefix":"»","namespace_prefix":"JCB","minify":"0","language":"en-GB","percentagelanguageadd":"30","assets_table_fix":"2","compiler_field_builder_type":"2","field_name_builder":"1","type_name_builder":"1","import_guid_only":"1","export_language_strings":"1","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","add_jquery_framework":"1","uikit_load":"1","uikit_min":"","uikit_style":""}'
+				'{"autorName":"Llewellyn van der Merwe","autorEmail":"joomla@vdm.io","subform_layouts":"default","editor":"none","manage_jcb_package_directories":"2","set_browser_storage":"1","storage_time_to_live":"global","super_powers_documentation":"0","powers_repository":"0","super_powers_repositories":"0","builder_gif_size":"480-272","compiler_plugin":["componentbuilderactionlogcompiler","componentbuilderfieldorderingcompiler","componentbuilderheaderscompiler","componentbuilderpowersautoloadercompiler","componentbuilderprivacycompiler"],"add_menu_prefix":"1","menu_prefix":"»","namespace_prefix":"JCB","minify":"0","language":"en-GB","percentagelanguageadd":"30","assets_table_fix":"2","compiler_field_builder_type":"2","field_name_builder":"1","type_name_builder":"1","import_guid_only":"1","export_language_strings":"1","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_company":"Vast Development Method","export_owner":"Llewellyn van der Merwe","export_email":"joomla@vdm.io","export_website":"https://dev.vdm.io/","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","add_jquery_framework":"1","uikit_load":"1","uikit_min":"","uikit_style":""}'
 			);
 
 
 
 			// Check that the database is up-to date
-			$this->databaseSchemaCheck($this->app);
+			if ($this->classExists(SchemaChecker::class))
+			{
+				(new SchemaChecker())->run();
+			}
 
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
@@ -1879,6 +1903,22 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				'COM_COMPONENTBUILDER'
 			);
 
+			// Add Repository to the action logs config table.
+			$this->setActionLogConfig(
+				// typeTitle
+				'REPOSITORY',
+				// typeAlias
+				'com_componentbuilder.repository',
+				// idHolder
+				'id',
+				// titleHolder
+				'system_name',
+				// tableName
+				'#__componentbuilder_repository',
+				// textPrefix
+				'COM_COMPONENTBUILDER'
+			);
+
 			// Add Help_document to the action logs config table.
 			$this->setActionLogConfig(
 				// typeTitle
@@ -2327,11 +2367,11 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// rules
 				'',
 				// fieldMappings
-				'{"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_site_event","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","short_description":"short_description","companyname":"companyname","php_site_event":"php_site_event","component_version":"component_version","php_admin_event":"php_admin_event","crowdin_username":"crowdin_username","php_preflight_install":"php_preflight_install","remove_line_breaks":"remove_line_breaks","description":"description","php_method_uninstall":"php_method_uninstall","debug_linenr":"debug_linenr","mvc_versiondate":"mvc_versiondate","css_admin":"css_admin","addreadme":"addreadme","php_postflight_install":"php_postflight_install","add_placeholders":"add_placeholders","sql":"sql","author":"author","update_server_url":"update_server_url","email":"email","add_backup_folder_path":"add_backup_folder_path","website":"website","translation_tool":"translation_tool","add_license":"add_license","buildcompsql":"buildcompsql","license_type":"license_type","php_helper_admin":"php_helper_admin","php_helper_site":"php_helper_site","whmcs_key":"whmcs_key","javascript":"javascript","whmcs_url":"whmcs_url","css_site":"css_site","whmcs_buy_link":"whmcs_buy_link","license":"license","php_preflight_update":"php_preflight_update","bom":"bom","php_postflight_update":"php_postflight_update","image":"image","php_method_install":"php_method_install","copyright":"copyright","sql_uninstall":"sql_uninstall","preferred_joomla_version":"preferred_joomla_version","add_powers":"add_powers","add_sales_server":"add_sales_server","backup_folder_path":"backup_folder_path","add_jcb_powers_path":"add_jcb_powers_path","crowdin_project_identifier":"crowdin_project_identifier","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_namespace_prefix":"add_namespace_prefix","add_javascript":"add_javascript","namespace_prefix":"namespace_prefix","add_css_admin":"add_css_admin","add_css_site":"add_css_site","add_menu_prefix":"add_menu_prefix","dashboard_type":"dashboard_type","menu_prefix":"menu_prefix","dashboard":"dashboard","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","toignore":"toignore","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","export_key":"export_key","add_php_method_install":"add_php_method_install","joomla_source_link":"joomla_source_link","add_sql":"add_sql","export_buy_link":"export_buy_link","add_sql_uninstall":"add_sql_uninstall","assets_table_fix":"assets_table_fix","readme":"readme","add_update_server":"add_update_server","emptycontributors":"emptycontributors","update_server_target":"update_server_target","number":"number","update_server":"update_server","sales_server":"sales_server","add_git_folder_path":"add_git_folder_path","git_folder_path":"git_folder_path","jcb_powers_path":"jcb_powers_path","creatuserhelper":"creatuserhelper","adduikit":"adduikit","crowdin_project_api_key":"crowdin_project_api_key","addfootable":"addfootable","crowdin_account_api_key":"crowdin_account_api_key","add_email_helper":"add_email_helper","buildcomp":"buildcomp","add_php_helper_both":"add_php_helper_both","guid":"guid","php_helper_both":"php_helper_both","name":"name"}}',
+				'{"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_postflight_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","short_description":"short_description","companyname":"companyname","crowdin_project_identifier":"crowdin_project_identifier","backup_folder_path":"backup_folder_path","sql_uninstall":"sql_uninstall","php_postflight_update":"php_postflight_update","css_site":"css_site","mvc_versiondate":"mvc_versiondate","remove_line_breaks":"remove_line_breaks","add_placeholders":"add_placeholders","php_helper_site":"php_helper_site","javascript":"javascript","description":"description","debug_linenr":"debug_linenr","author":"author","php_method_install":"php_method_install","email":"email","website":"website","add_sales_server":"add_sales_server","license":"license","add_jcb_powers_path":"add_jcb_powers_path","bom":"bom","image":"image","php_admin_event":"php_admin_event","copyright":"copyright","php_site_event":"php_site_event","css_admin":"css_admin","php_preflight_update":"php_preflight_update","component_version":"component_version","php_preflight_install":"php_preflight_install","preferred_joomla_version":"preferred_joomla_version","php_postflight_install":"php_postflight_install","add_powers":"add_powers","php_method_uninstall":"php_method_uninstall","sql":"sql","addreadme":"addreadme","update_server_url":"update_server_url","add_backup_folder_path":"add_backup_folder_path","translation_tool":"translation_tool","crowdin_username":"crowdin_username","buildcompsql":"buildcompsql","add_namespace_prefix":"add_namespace_prefix","namespace_prefix":"namespace_prefix","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_menu_prefix":"add_menu_prefix","add_javascript":"add_javascript","menu_prefix":"menu_prefix","add_css_admin":"add_css_admin","add_css_site":"add_css_site","dashboard_type":"dashboard_type","toignore":"toignore","dashboard":"dashboard","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","export_key":"export_key","add_php_postflight_install":"add_php_postflight_install","joomla_source_link":"joomla_source_link","add_php_postflight_update":"add_php_postflight_update","export_buy_link":"export_buy_link","add_php_method_uninstall":"add_php_method_uninstall","add_php_method_install":"add_php_method_install","add_sql":"add_sql","add_sql_uninstall":"add_sql_uninstall","emptycontributors":"emptycontributors","assets_table_fix":"assets_table_fix","number":"number","readme":"readme","add_update_server":"add_update_server","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","creatuserhelper":"creatuserhelper","add_git_folder_path":"add_git_folder_path","adduikit":"adduikit","git_folder_path":"git_folder_path","addfootable":"addfootable","jcb_powers_path":"jcb_powers_path","add_email_helper":"add_email_helper","add_php_helper_both":"add_php_helper_both","crowdin_project_api_key":"crowdin_project_api_key","php_helper_both":"php_helper_both","crowdin_account_api_key":"crowdin_account_api_key","add_php_helper_admin":"add_php_helper_admin","buildcomp":"buildcomp","php_helper_admin":"php_helper_admin","guid":"guid","add_admin_event":"add_admin_event","name":"name"}}',
 				// router
 				'',
 				// contentHistoryOptions
-				'{"formFile": "administrator/components/com_componentbuilder/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","remove_line_breaks","debug_linenr","mvc_versiondate","addreadme","add_placeholders","add_backup_folder_path","translation_tool","add_license","license_type","preferred_joomla_version","add_powers","add_sales_server","add_jcb_powers_path","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_php_method_install","add_sql","add_sql_uninstall","assets_table_fix","add_update_server","emptycontributors","update_server_target","number","update_server","sales_server","add_git_folder_path","creatuserhelper","adduikit","addfootable","add_email_helper","buildcomp","add_php_helper_both"],"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": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}'
+				'{"formFile": "administrator/components/com_componentbuilder/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","mvc_versiondate","remove_line_breaks","add_placeholders","debug_linenr","add_sales_server","add_jcb_powers_path","preferred_joomla_version","add_powers","addreadme","add_backup_folder_path","translation_tool","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_php_method_install","add_sql","add_sql_uninstall","emptycontributors","assets_table_fix","number","add_update_server","update_server_target","update_server","sales_server","creatuserhelper","add_git_folder_path","adduikit","addfootable","add_email_helper","add_php_helper_both","add_php_helper_admin","buildcomp","add_admin_event"],"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": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}'
 			);
 			// Update Joomla module Content Types.
 			$this->setContentType(
@@ -2395,11 +2435,11 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// rules
 				'',
 				// fieldMappings
-				'{"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": "head","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","namespace":"namespace","type":"type","power_version":"power_version","licensing_template":"licensing_template","description":"description","extends":"extends","approved":"approved","add_head":"add_head","extends_custom":"extends_custom","implements_custom":"implements_custom","implements":"implements","head":"head","approved_paths":"approved_paths","main_class_code":"main_class_code","add_licensing_template":"add_licensing_template","guid":"guid","name":"name"}}',
+				'{"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": "head","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","namespace":"namespace","type":"type","power_version":"power_version","description":"description","licensing_template":"licensing_template","approved":"approved","extendsinterfaces_custom":"extendsinterfaces_custom","add_head":"add_head","extends":"extends","extends_custom":"extends_custom","implements_custom":"implements_custom","implements":"implements","extendsinterfaces":"extendsinterfaces","approved_paths":"approved_paths","head":"head","add_licensing_template":"add_licensing_template","main_class_code":"main_class_code","guid":"guid","name":"name"}}',
 				// router
 				'',
 				// contentHistoryOptions
-				'{"formFile": "administrator/components/com_componentbuilder/forms/power.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","approved","add_head","add_licensing_template"],"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": "extends","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "implements","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"}]}'
+				'{"formFile": "administrator/components/com_componentbuilder/forms/power.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","approved","add_head","add_licensing_template"],"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": "extends","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "implements","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "extendsinterfaces","targetTable": "#__componentbuilder_power","targetColumn": "guid","displayColumn": "name"}]}'
 			);
 			// Update Admin view Content Types.
 			$this->setContentType(
@@ -2633,7 +2673,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// rules
 				'',
 				// fieldMappings
-				'{"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","on_save_model_field":"on_save_model_field","initiator_on_get_model":"initiator_on_get_model","initiator_on_save_model":"initiator_on_save_model","xml":"xml","datalenght":"datalenght","css_views":"css_views","css_view":"css_view","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","on_get_model_field":"on_get_model_field","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","add_css_view":"add_css_view","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","add_javascript_views_footer":"add_javascript_views_footer","guid":"guid"}}',
+				'{"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": "javascript_view_footer","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","on_get_model_field":"on_get_model_field","on_save_model_field":"on_save_model_field","initiator_on_get_model":"initiator_on_get_model","xml":"xml","datalenght":"datalenght","javascript_view_footer":"javascript_view_footer","css_views":"css_views","css_view":"css_view","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","javascript_views_footer":"javascript_views_footer","add_css_view":"add_css_view","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","add_javascript_views_footer":"add_javascript_views_footer","initiator_on_save_model":"initiator_on_save_model","guid":"guid"}}',
 				// router
 				'',
 				// contentHistoryOptions
@@ -2741,6 +2781,23 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// contentHistoryOptions
 				'{"formFile": "administrator/components/com_componentbuilder/forms/server.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","protocol","authentication"],"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"}]}'
 			);
+			// Update Repository Content Types.
+			$this->setContentType(
+				// typeTitle
+				'Componentbuilder Repository',
+				// typeAlias
+				'com_componentbuilder.repository',
+				// table
+				'{"special": {"dbtable": "#__componentbuilder_repository","key": "id","type": "RepositoryTable","prefix": "VDM\Component\Componentbuilder\Administrator\Table"}}',
+				// rules
+				'',
+				// fieldMappings
+				'{"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": "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","organisation":"organisation","repository":"repository","target":"target","type":"type","base":"base","guid":"guid","access_repo":"access_repo","write_branch":"write_branch","read_branch":"read_branch","token":"token","username":"username"}}',
+				// router
+				'',
+				// contentHistoryOptions
+				'{"formFile": "administrator/components/com_componentbuilder/forms/repository.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","target","type","access_repo"],"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"}]}'
+			);
 			// Update Help document Content Types.
 			$this->setContentType(
 				// typeTitle
@@ -2752,11 +2809,11 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				// rules
 				'',
 				// fieldMappings
-				'{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","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": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","not_required":"not_required","content":"content","article":"article","url":"url","target":"target","alias":"alias"}}',
+				'{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","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": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","alias":"alias","content":"content","article":"article","url":"url","target":"target"}}',
 				// router
 				'',
 				// contentHistoryOptions
-				'{"formFile": "administrator/components/com_componentbuilder/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","type","location","not_required","article","target"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}'
+				'{"formFile": "administrator/components/com_componentbuilder/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","version","hits","type","location","article","target"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}'
 			);
 			// Update Admin fields Content Types.
 			$this->setContentType(
@@ -3205,12 +3262,15 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 
 
 			// Check that the database is up-to date
-			$this->databaseSchemaCheck($this->app);
+			if ($this->classExists(SchemaChecker::class))
+			{
+				(new SchemaChecker())->run();
+			}
 
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 5.0.0 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 5.0.2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Add/Update component in the action logs extensions table.
 			$this->setActionLogsExtensions();
@@ -3583,6 +3643,22 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 				'COM_COMPONENTBUILDER'
 			);
 
+			// Add/Update Repository in the action logs config table.
+			$this->setActionLogConfig(
+				// typeTitle
+				'REPOSITORY',
+				// typeAlias
+				'com_componentbuilder.repository',
+				// idHolder
+				'id',
+				// titleHolder
+				'system_name',
+				// tableName
+				'#__componentbuilder_repository',
+				// textPrefix
+				'COM_COMPONENTBUILDER'
+			);
+
 			// Add/Update Help_document in the action logs config table.
 			$this->setActionLogConfig(
 				// typeTitle
@@ -4025,11 +4101,84 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 		return true;
 	}
 
+	/**
+	 * Remove folders with files (with ignore options)
+	 *
+	 * @param   string	    $dir	 The path to the folder to remove.
+	 * @param   array|null  $ignore  The folders and files to ignore and not remove.
+	 *
+	 * @return  bool   True if all specified files/folders are removed, false otherwise.
+	 * @since   3.2.2
+	 */
+	protected function removeFolder(string $dir, ?array $ignore = null): bool
+	{
+		if (!is_dir($dir))
+		{
+			return false;
+		}
+
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		$it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
+
+		// Remove trailing slash
+		$dir = rtrim($dir, '/');
+
+		foreach ($it as $file)
+		{
+			$filePath = $file->getPathname();
+			$relativePath = str_replace($dir . '/', '', $filePath);
+
+			if ($ignore !== null && in_array($relativePath, $ignore, true))
+			{
+				continue;
+			}
+
+			if ($file->isDir())
+			{
+				Folder::delete($filePath);
+			}
+			else
+			{
+				File::delete($filePath);
+			}
+		}
+
+		// Delete the root folder if there are no ignored files/folders left
+		if ($ignore === null || $this->isDirEmpty($dir, $ignore))
+		{
+			return Folder::delete($dir);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory is empty considering ignored files/folders.
+	 *
+	 * @param   string  $dir	 The path to the folder to check.
+	 * @param   array   $ignore  The folders and files to ignore.
+	 *
+	 * @return  bool    True if the directory is empty or contains only ignored items, false otherwise.
+     * @since   3.2.1
+	 */
+	protected function isDirEmpty(string $dir, array $ignore): bool
+	{
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		foreach ($it as $file)
+		{
+			$relativePath = str_replace($dir . '/', '', $file->getPathname());
+			if (!in_array($relativePath, $ignore, true))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
 	/**
 	 * Remove the files and folders in the given array from
 	 *
 	 * @return  void
-	 *
 	 * @since   3.6
 	 */
 	protected function removeFiles()
@@ -4061,7 +4210,6 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * Moves the CLI scripts into the CLI folder in the CMS
 	 *
 	 * @return  void
-	 *
 	 * @since   3.6
 	 */
 	protected function moveCliFiles()
@@ -4092,7 +4240,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $contentHistoryOptions
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setContentType(
 		string $typeTitle,
@@ -4154,7 +4302,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $textPrefix
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setActionLogConfig(
 		string $typeTitle,
@@ -4207,7 +4355,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * Set action logs extensions integration
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setActionLogsExtensions(): void
 	{
@@ -4248,7 +4396,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $rules   The component rules
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setAssetsRules(string $rules): void
 	{
@@ -4286,7 +4434,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $params   The component rules
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setExtensionsParams(string $params): void
 	{
@@ -4329,7 +4477,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string  $dataType          This datatype we will change the rules column to if it to small.
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setDatabaseAssetsRulesFix(int $accessWorseCase, string $dataType): void
 	{
@@ -4364,7 +4512,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   bool     $fields    The switch to also remove related field data
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeViewData(string $context, bool $fields = false): void
 	{
@@ -4387,7 +4535,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeContentTypes(string $context): void
 	{
@@ -4444,7 +4592,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeFields(string $context): void
 	{
@@ -4506,7 +4654,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   array    $ids       The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeFieldsValues(string $context, array $ids): void
 	{
@@ -4537,7 +4685,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeFieldsGroups(string $context): void
 	{
@@ -4592,7 +4740,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeViewHistory(string $context): void
 	{
@@ -4624,7 +4772,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   array   $ids   The type ids
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeUcmBase(array $ids): void
 	{
@@ -4657,7 +4805,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeUcmContent(string $context): void
 	{
@@ -4689,7 +4837,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeContentItemTagMap(string $context): void
 	{
@@ -4724,7 +4872,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeActionLogConfig(string $context): void
 	{
@@ -4754,7 +4902,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * Remove Asset Table Integrated
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeAssetData(): void
 	{
@@ -4782,7 +4930,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * Remove action logs extensions integrated
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeActionLogsExtensions(): void
 	{
@@ -4812,7 +4960,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 	 * Remove remove database fix (if possible)
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeDatabaseAssetsRulesFix(): void
 	{
@@ -4843,172 +4991,42 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 		}
 	}
 
-	/**
-	 * Define the required limits with specific messages for success and warning scenarios
-	 *
-	 * @var array
-	 * @since 3.2.1
-	 */
-	protected array $requiredPHPConfigs = [
-		'upload_max_filesize' => [
-			'value'   => '128M',
-			'success' => 'The upload_max_filesize is appropriately set to handle large files, which is essential for uploading substantial components and media.',
-			'warning' => 'The current upload_max_filesize may not support large file uploads effectively, potentially causing failures during component installation.'
-		],
-		'post_max_size' => [
-			'value'   => '128M',
-			'success' => 'The post_max_size setting is sufficient to manage large data submissions, ensuring smooth data processing within forms and uploads.',
-			'warning' => 'An insufficient post_max_size can lead to truncated data submissions, affecting form functionality and data integrity.'
-		],
-		'max_execution_time' => [
-			'value'   => 60,
-			'success' => 'Max execution time is set high enough to execute complex operations without premature termination, which is crucial for lengthy operations.',
-			'warning' => 'A low max execution time could lead to script timeouts, especially during intensive operations, which might interrupt execution and cause failures during the compiling of a large extension.'
-		],
-		'max_input_vars' => [
-			'value'   => 7000,
-			'success' => 'The max_input_vars setting supports a high number of input variables, facilitating complex forms and detailed component configurations.',
-			'warning' => 'Too few max_input_vars may result in lost data during processing complex forms, which can lead to incomplete configurations and operational issues.'
-		],
-		'max_input_time' => [
-			'value'   => 60,
-			'success' => 'Max input time is adequate for processing inputs efficiently during high-load operations, ensuring no premature timeouts.',
-			'warning' => 'An insufficient max input time could result in incomplete data processing during input-heavy operations, potentially leading to errors and data loss.'
-		],
-		'memory_limit' => [
-			'value'   => '256M',
-			'success' => 'The memory limit is set high to accommodate extensive operations and data processing, which enhances overall performance and stability.',
-			'warning' => 'A low memory limit can lead to frequent crashes and performance issues, particularly when processing large amounts of data or complex calculations.'
-		]
-	];
-
-	/**
-	 * Helper function to convert PHP INI memory values to bytes
-	 *
-	 * @param  string  $value     The value to convert
-	 *
-	 * @return int   The bytes value
-	 * @since 3.2.1
-	 */
-	protected function convertToBytes(string $value): int
-	{
-		$value = trim($value);
-		$lastChar = strtolower($value[strlen($value) - 1]);
-		$numValue = substr($value, 0, -1);
-
-		switch ($lastChar)
-		{
-			case 'g':
-				return $numValue * 1024 * 1024 * 1024;
-			case 'm':
-				return $numValue * 1024 * 1024;
-			case 'k':
-				return $numValue * 1024;
-			default:
-				return (int) $value;
-		}
-	}
-
-	/**
-	 * Check that the required configurations are set for PHP
-	 *
-	 * @param  $app  The application
-	 *
-	 * @return void
-	 * @since 3.2.1
-	 */
-	protected function phpConfigurationCheck($app): void
-	{
-		$showHelp = false;
-
-		// Check each configuration and provide detailed feedback
-		foreach ($this->requiredPHPConfigs as $configName => $configDetails)
-		{
-			$currentValue = ini_get($configName);
-			if ($currentValue === false)
-			{
-				$app->enqueueMessage("Error: Unable to retrieve current setting for '{$configName}'.", 'error');
-				continue;
-			}
-
-			$isMemoryValue = strpbrk($configDetails['value'], 'KMG') !== false;
-			$requiredValueBytes = $isMemoryValue ? $this->convertToBytes($configDetails['value']) : (int) $configDetails['value'];
-			$currentValueBytes = $isMemoryValue ? $this->convertToBytes($currentValue) : (int) $currentValue;
-			$conditionMet = $currentValueBytes >= $requiredValueBytes;
-
-			$messageType = $conditionMet ? 'message' : 'warning';
-			$messageText = $conditionMet ? 
-				"Success: {$configName} is set to {$currentValue}. " . $configDetails['success'] :
-				"Warning: {$configName} configuration should be at least {$configDetails['value']} but is currently {$currentValue}. " . $configDetails['warning'];
-			$showHelp = ($showHelp || $messageType === 'warning') ? true : false;
-			$app->enqueueMessage($messageText, $messageType);
-		}
-
-		if ($showHelp)
-		{
-			$app->enqueueMessage('To optimize your Joomla Component Builder (JCB) development environment, specific PHP settings must be enhanced.<br>These settings are crucial for ensuring the successful installation and compilation of extensions.<br>We\'ve identified that certain configurations currently do not meet the recommended standards.<br>To adjust these settings and prevent potential issues, please consult our detailed guide available at <a href="https://git.vdm.dev/joomla/Component-Builder/wiki/PHP-Settings" target="_blank">JCB PHP Settings Wiki</a>.
-', 'notice');
-		}
-	}
+	/**
+	 * Ensures that a class in the namespace is available.
+	 * If the class is not already loaded, it attempts to load it via the specified autoloader.
+	 *
+	 * @param string  $className   The fully qualified name of the class to check.
+	 *
+	 * @return bool True if the class exists or was successfully loaded, false otherwise.
+	 * @since  4.0.1
+	 */
+	protected function classExists(string $className): bool
+	{
+		if (class_exists($className, true))
+		{
+			return true;
+		}
 
-	/**
-	 * Make sure that the componentbuilder database schema is up to date.
-	 *
-	 * @return void
-	 * @since 3.2.1
-	 */
-	protected function databaseSchemaCheck($app): void
-	{
-		// try to load the schema class
-		try
-		{
-			// make sure the class is loaded
-			$this->ensureClassExists(
-				Schema::class
-			);
-
-			// instantiate the schema class and check/update the database
-			$messages = (new Schema())->update();
-		}
-		catch (\Exception $e)
-		{
-			$app->enqueueMessage($e->getMessage(), 'warning');
-			return;
-		}
-
-		foreach ($messages as $message)
-		{
-			$app->enqueueMessage($message, 'message');
-		}
-	}
+		// Autoloaders to check
+		$autoloaders = [
+			__DIR__ . '/ComponentbuilderInstallerPowerloader.php',
+			JPATH_ADMINISTRATOR . '/components/com_componentbuilder/src/Helper/PowerloaderHelper.php'
+		];
 
-	/**
-	 * Ensures that a class in the namespace is available.
-	 * If the class is not already loaded, it attempts to load it via the power autoloader.
-	 *
-	 * @param mixed    $nameClass    The name::class we are looking for.
-	 *
-	 * @return void
-	 * @since 3.2.1
-	 * @throws \Exception If the class could not be loaded.
-	 */
-	protected function ensureClassExists($nameClass): void
-	{
-		if (!class_exists($nameClass, true))
-		{
-			// The power autoloader for this project admin area.
-			$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/src/Helper/PowerloaderHelper.php';
-			if (file_exists($power_autoloader))
-			{
-				require_once $power_autoloader;
-			}
-
-			// Check again if the class now exists after requiring it
-			if (!class_exists($nameClass, true))
-			{
-				throw new \Exception("We failed to find/load the $nameClass");
-			}
-		}
+		foreach ($autoloaders as $autoloader)
+		{
+			if (file_exists($autoloader))
+			{
+				require_once $autoloader;
+
+				if (class_exists($className, true))
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
 	}
 
 	/**

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 save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.0) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.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)
 
@@ -144,14 +144,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 10th May, 2024
-+ *Version*: 5.0.0
++ *Last Build*: 16th August, 2024
++ *Version*: 5.0.2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **746228**
-+ *Field count*: **2097**
-+ *File count*: **5287**
-+ *Folder count*: **528**
++ *Line count*: **826768**
++ *Field count*: **2100**
++ *File count*: **5753**
++ *Folder count*: **618**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

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 save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.0) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.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)
 
@@ -144,14 +144,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 10th May, 2024
-+ *Version*: 5.0.0
++ *Last Build*: 16th August, 2024
++ *Version*: 5.0.2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **746228**
-+ *Field count*: **2097**
-+ *File count*: **5287**
-+ *Folder count*: **528**
++ *Line count*: **826768**
++ *Field count*: **2100**
++ *File count*: **5753**
++ *Folder count*: **618**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/access.xml

@@ -13,7 +13,6 @@
 		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
 		<action name="core.edit.created_by" title="COM_COMPONENTBUILDER_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC" />
 		<action name="core.edit.created" title="COM_COMPONENTBUILDER_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC" />
-		<action name="admin_view.run_expansion" title="COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="admin_view.access" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC" />
 		<action name="admin_view.batch" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC" />
 		<action name="admin_view.create" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC" />
@@ -250,7 +249,6 @@
 		<action name="custom_code.edit.state" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_STATE" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_STATE_DESC" />
 		<action name="custom_code.version" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_VERSION" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_VERSION_DESC" />
 		<action name="custom_code.submenu" title="COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU" description="COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC" />
-		<action name="dynamic_get.run_expansion" title="COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="dynamic_get.access" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS_DESC" />
 		<action name="dynamic_get.batch" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE_DESC" />
 		<action name="dynamic_get.create" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_CREATE" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_CREATE_DESC" />
@@ -262,7 +260,6 @@
 		<action name="dynamic_get.edit.state" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_STATE" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_STATE_DESC" />
 		<action name="dynamic_get.version" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION_DESC" />
 		<action name="dynamic_get.submenu" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC" />
-		<action name="field.run_expansion" title="COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="field.access" title="COM_COMPONENTBUILDER_FIELDS_ACCESS" description="COM_COMPONENTBUILDER_FIELDS_ACCESS_DESC" />
 		<action name="field.batch" title="COM_COMPONENTBUILDER_FIELDS_BATCH_USE" description="COM_COMPONENTBUILDER_FIELDS_BATCH_USE_DESC" />
 		<action name="field.create" title="COM_COMPONENTBUILDER_FIELDS_CREATE" description="COM_COMPONENTBUILDER_FIELDS_CREATE_DESC" />
@@ -315,7 +312,6 @@
 		<action name="joomla_component.version" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC" />
 		<action name="joomla_component.submenu" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC" />
 		<action name="joomla_module.get_snippets" title="COM_COMPONENTBUILDER_JOOMLA_MODULE_GET_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_GET_SNIPPETS_BUTTON_ACCESS_DESC" />
-		<action name="joomla_module.run_expansion" title="COM_COMPONENTBUILDER_JOOMLA_MODULE_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="joomla_module.access" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_ACCESS_DESC" />
 		<action name="joomla_module.batch" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_BATCH_USE_DESC" />
 		<action name="joomla_module.create" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_CREATE_DESC" />
@@ -354,7 +350,6 @@
 		<action name="joomla_plugin_group.version" title="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_EDIT_VERSION_DESC" />
 		<action name="joomla_plugin.methods" title="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_METHODS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_METHODS_BUTTON_ACCESS_DESC" />
 		<action name="joomla_plugin.properties" title="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PROPERTIES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PROPERTIES_BUTTON_ACCESS_DESC" />
-		<action name="joomla_plugin.run_expansion" title="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="joomla_plugin.access" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_ACCESS_DESC" />
 		<action name="joomla_plugin.batch" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_BATCH_USE_DESC" />
 		<action name="joomla_plugin.create" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_CREATE_DESC" />
@@ -388,6 +383,7 @@
 		<action name="joomla_plugin_updates.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE_DESC" />
 		<action name="joomla_plugin_updates.version" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION_DESC" />
 		<action name="joomla_power.init" title="COM_COMPONENTBUILDER_JOOMLA_POWER_INIT_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_POWER_INIT_BUTTON_ACCESS_DESC" />
+		<action name="joomla_power.push" title="COM_COMPONENTBUILDER_JOOMLA_POWER_PUSH_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_POWER_PUSH_BUTTON_ACCESS_DESC" />
 		<action name="joomla_power.reset" title="COM_COMPONENTBUILDER_JOOMLA_POWER_RESET_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_POWER_RESET_BUTTON_ACCESS_DESC" />
 		<action name="joomla_power.access" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS_DESC" />
 		<action name="joomla_power.batch" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_BATCH_USE_DESC" />
@@ -470,7 +466,6 @@
 		<action name="placeholder.submenu" title="COM_COMPONENTBUILDER_PLACEHOLDERS_SUBMENU" description="COM_COMPONENTBUILDER_PLACEHOLDERS_SUBMENU_DESC" />
 		<action name="power.init" title="COM_COMPONENTBUILDER_POWER_INIT_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_POWER_INIT_BUTTON_ACCESS_DESC" />
 		<action name="power.reset" title="COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS_DESC" />
-		<action name="power.run_expansion" title="COM_COMPONENTBUILDER_POWER_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_POWER_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="power.access" title="COM_COMPONENTBUILDER_POWERS_ACCESS" description="COM_COMPONENTBUILDER_POWERS_ACCESS_DESC" />
 		<action name="power.batch" title="COM_COMPONENTBUILDER_POWERS_BATCH_USE" description="COM_COMPONENTBUILDER_POWERS_BATCH_USE_DESC" />
 		<action name="power.create" title="COM_COMPONENTBUILDER_POWERS_CREATE" description="COM_COMPONENTBUILDER_POWERS_CREATE_DESC" />
@@ -483,6 +478,18 @@
 		<action name="power.edit.state" title="COM_COMPONENTBUILDER_POWERS_EDIT_STATE" description="COM_COMPONENTBUILDER_POWERS_EDIT_STATE_DESC" />
 		<action name="power.version" title="COM_COMPONENTBUILDER_POWERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_POWERS_EDIT_VERSION_DESC" />
 		<action name="power.submenu" title="COM_COMPONENTBUILDER_POWERS_SUBMENU" description="COM_COMPONENTBUILDER_POWERS_SUBMENU_DESC" />
+		<action name="repository.access" title="COM_COMPONENTBUILDER_REPOSITORIES_ACCESS" description="COM_COMPONENTBUILDER_REPOSITORIES_ACCESS_DESC" />
+		<action name="repository.batch" title="COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE" description="COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE_DESC" />
+		<action name="repository.create" title="COM_COMPONENTBUILDER_REPOSITORIES_CREATE" description="COM_COMPONENTBUILDER_REPOSITORIES_CREATE_DESC" />
+		<action name="repository.dashboard_list" title="COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST_DESC" />
+		<action name="repository.delete" title="COM_COMPONENTBUILDER_REPOSITORIES_DELETE" description="COM_COMPONENTBUILDER_REPOSITORIES_DELETE_DESC" />
+		<action name="repository.edit" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_DESC" />
+		<action name="repository.edit.created_by" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY_DESC" />
+		<action name="repository.edit.created" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE_DESC" />
+		<action name="repository.edit.own" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN_DESC" />
+		<action name="repository.edit.state" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE_DESC" />
+		<action name="repository.version" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION_DESC" />
+		<action name="repository.submenu" title="COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU" description="COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU_DESC" />
 		<action name="search.access" title="COM_COMPONENTBUILDER_SEARCH_ACCESS" description="COM_COMPONENTBUILDER_SEARCH_ACCESS_DESC" />
 		<action name="search.compiler" title="COM_COMPONENTBUILDER_SEARCH_COMPILER_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_SEARCH_COMPILER_BUTTON_ACCESS_DESC" />
 		<action name="search.dashboard_list" title="COM_COMPONENTBUILDER_SEARCH_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_SEARCH_DASHBOARD_LIST_DESC" />
@@ -527,7 +534,6 @@
 		<action name="template.dashboard_list" title="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST_DESC" />
 		<action name="template.version" title="COM_COMPONENTBUILDER_TEMPLATES_EDIT_VERSION" description="COM_COMPONENTBUILDER_TEMPLATES_EDIT_VERSION_DESC" />
 		<action name="template.submenu" title="COM_COMPONENTBUILDER_TEMPLATES_SUBMENU" description="COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC" />
-		<action name="validation_rule.run_expansion" title="COM_COMPONENTBUILDER_VALIDATION_RULE_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_VALIDATION_RULE_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="validation_rule.access" title="COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS" description="COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS_DESC" />
 		<action name="validation_rule.batch" title="COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_USE" description="COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_USE_DESC" />
 		<action name="validation_rule.create" title="COM_COMPONENTBUILDER_VALIDATION_RULES_CREATE" description="COM_COMPONENTBUILDER_VALIDATION_RULES_CREATE_DESC" />
@@ -766,6 +772,17 @@
 		<action name="server.access" title="COM_COMPONENTBUILDER_SERVERS_ACCESS" description="COM_COMPONENTBUILDER_SERVERS_ACCESS_DESC" />
 		<action name="server.version" title="COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION_DESC" />
 	</section>
+	<section name="repository">
+		<action name="repository.edit" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_DESC" />
+		<action name="repository.edit.own" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN_DESC" />
+		<action name="repository.edit.state" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE_DESC" />
+		<action name="repository.edit.created_by" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY_DESC" />
+		<action name="repository.edit.created" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE_DESC" />
+		<action name="repository.create" title="COM_COMPONENTBUILDER_REPOSITORIES_CREATE" description="COM_COMPONENTBUILDER_REPOSITORIES_CREATE_DESC" />
+		<action name="repository.delete" title="COM_COMPONENTBUILDER_REPOSITORIES_DELETE" description="COM_COMPONENTBUILDER_REPOSITORIES_DELETE_DESC" />
+		<action name="repository.access" title="COM_COMPONENTBUILDER_REPOSITORIES_ACCESS" description="COM_COMPONENTBUILDER_REPOSITORIES_ACCESS_DESC" />
+		<action name="repository.version" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION_DESC" />
+	</section>
 	<section name="help_document">
 		<action name="help_document.edit" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_DESC" />
 		<action name="help_document.edit.own" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN_DESC" />

admin/assets/css/admin.css

@@ -14,7 +14,7 @@
 }
 .fieldMedium { width: 120px; }
 .fieldLarge { width: 320px; }
-.fieldMid { width: 80px; }
+.fieldMid { width: 89px; }
 .fieldFull { width: 100%; }
-.fieldSmall { width: 60px; }
+.fieldSmall { width: 74px; }
 code { display: inline-block; margin: 3px;}

admin/assets/css/repositories.css

@@ -0,0 +1,13 @@
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* CSS Document */
+
+

admin/assets/css/repository.css

@@ -0,0 +1,13 @@
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* CSS Document */
+
+

admin/compiler/joomla_3/Helper.php

@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-###CUSTOM_POWER_AUTOLOADER###
+###POWER_AUTOLOADER###
 
 ###ADMIN_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_3/Helper_site.php

@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-###SITE_CUSTOM_POWER_AUTOLOADER###
+###SITE_POWER_AUTOLOADER###
 
 ###SITE_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_3/component_admin.php

@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-###CUSTOM_POWER_AUTOLOADER###
+###POWER_AUTOLOADER###
 
 ###ADMIN_COMPONENT_HEADER###
 

admin/compiler/joomla_3/component_site.php

@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-###SITE_CUSTOM_POWER_AUTOLOADER###
+###SITE_POWER_AUTOLOADER###
 
 ###SITE_COMPONENT_HEADER###
 

admin/compiler/joomla_3/script.php

@@ -28,6 +28,8 @@ HTML::_('bootstrap.renderModal');
 
 /**
  * Script File of ###Component### Component
+ *
+ * @since   1.5.0
  */
 class Com_###Component###InstallerScript
 {
@@ -35,6 +37,7 @@ class Com_###Component###InstallerScript
 	 * Constructor
 	 *
 	 * @param   ComponentAdapter  $parent  The object responsible for running this script
+	 * @since   1.5.0
 	 */
 	public function __construct(ComponentAdapter $parent) {}
 
@@ -44,6 +47,7 @@ class Com_###Component###InstallerScript
 	 * @param   ComponentAdapter  $parent  The object responsible for running this script
 	 *
 	 * @return  boolean  True on success
+	 * @since   1.5.0
 	 */
 	public function install(ComponentAdapter $parent) {}
 
@@ -51,6 +55,8 @@ class Com_###Component###InstallerScript
 	 * Called on uninstallation
 	 *
 	 * @param   ComponentAdapter  $parent  The object responsible for running this script
+	 *
+	 * @since   1.5.0
 	 */
 	public function uninstall(ComponentAdapter $parent)
 	{###UNINSTALLSCRIPT###
@@ -68,6 +74,7 @@ class Com_###Component###InstallerScript
 	 * @param   ComponentAdapter  $parent  The object responsible for running this script
 	 *
 	 * @return  boolean  True on success
+	 * @since   1.5.0
 	 */
 	public function update(ComponentAdapter $parent){}
 
@@ -78,6 +85,7 @@ class Com_###Component###InstallerScript
 	 * @param   ComponentAdapter  $parent  The object responsible for running this script
 	 *
 	 * @return  boolean  True on success
+	 * @since   1.5.0
 	 */
 	public function preflight($type, ComponentAdapter $parent)
 	{
@@ -121,6 +129,7 @@ class Com_###Component###InstallerScript
 	 * @param   ComponentAdapter  $parent  The object responsible for running this script
 	 *
 	 * @return  boolean  True on success
+	 * @since   1.5.0
 	 */
 	public function postflight($type, ComponentAdapter $parent)
 	{
@@ -138,76 +147,77 @@ class Com_###Component###InstallerScript
 	}
 
 	/**
-	 * Remove folders with files
+	 * Remove folders with files (with ignore options)
 	 *
-	 * @param   string   $dir     The path to folder to remove
-	 * @param   boolean  $ignore  The folders and files to ignore and not remove
-	 *
-	 * @return  boolean   True in all is removed
+	 * @param   string	    $dir	 The path to the folder to remove.
+	 * @param   array|null  $ignore  The folders and files to ignore and not remove.
 	 *
+	 * @return  bool   True if all specified files/folders are removed, false otherwise.
+	 * @since   3.2.2
 	 */
-	protected function removeFolder($dir, $ignore = false)
+	protected function removeFolder(string $dir, ?array $ignore = null): bool
 	{
-		if (Folder::exists($dir))
+		if (!is_dir($dir))
 		{
-			$it = new RecursiveDirectoryIterator($dir);
-			$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
-			// remove ending /
-			$dir = rtrim($dir, '/');
-			// now loop the files & folders
-			foreach ($it as $file)
-			{
-				if ('.' === $file->getBasename() || '..' ===  $file->getBasename()) continue;
-				// set file dir
-				$file_dir = $file->getPathname();
-				// check if this is a dir or a file
-				if ($file->isDir())
-				{
-					$keeper = false;
-					if ($this->checkArray($ignore))
-					{
-						foreach ($ignore as $keep)
-						{
-							if (strpos($file_dir, $dir.'/'.$keep) !== false)
-							{
-								$keeper = true;
-							}
-						}
-					}
-					if ($keeper)
-					{
-						continue;
-					}
-					Folder::delete($file_dir);
-				}
-				else
-				{
-					$keeper = false;
-					if ($this->checkArray($ignore))
-					{
-						foreach ($ignore as $keep)
-						{
-							if (strpos($file_dir, $dir.'/'.$keep) !== false)
-							{
-								$keeper = true;
-							}
-						}
-					}
-					if ($keeper)
-					{
-						continue;
-					}
-					File::delete($file_dir);
-				}
-			}
-			// delete the root folder if not ignore found
-			if (!$this->checkArray($ignore))
-			{
-				return Folder::delete($dir);
-			}
-			return true;
+			return false;
 		}
-		return false;
+
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		$it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
+
+		// Remove trailing slash
+		$dir = rtrim($dir, '/');
+
+		foreach ($it as $file)
+		{
+			$filePath = $file->getPathname();
+			$relativePath = str_replace($dir . '/', '', $filePath);
+
+			if ($ignore !== null && in_array($relativePath, $ignore, true))
+			{
+				continue;
+			}
+
+			if ($file->isDir())
+			{
+				Folder::delete($filePath);
+			}
+			else
+			{
+				File::delete($filePath);
+			}
+		}
+
+		// Delete the root folder if there are no ignored files/folders left
+		if ($ignore === null || $this->isDirEmpty($dir, $ignore))
+		{
+			return Folder::delete($dir);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory is empty considering ignored files/folders.
+	 *
+	 * @param   string  $dir	 The path to the folder to check.
+	 * @param   array   $ignore  The folders and files to ignore.
+	 *
+	 * @return  bool    True if the directory is empty or contains only ignored items, false otherwise.
+     * @since   3.2.1
+	 */
+	protected function isDirEmpty(string $dir, array $ignore): bool
+	{
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		foreach ($it as $file)
+		{
+			$relativePath = str_replace($dir . '/', '', $file->getPathname());
+			if (!in_array($relativePath, $ignore, true))
+			{
+				return false;
+			}
+		}
+		return true;
 	}
 
 	/**
@@ -216,6 +226,7 @@ class Com_###Component###InstallerScript
 	 * @input    array   The array to check
 	 *
 	 * @returns bool/int  number of items in array on success
+	 * @since   3.2.2
 	 */
 	protected function checkArray($array, $removeEmptyString = false)
 	{
@@ -235,6 +246,41 @@ class Com_###Component###InstallerScript
 			}
 			return $nr;
 		}
+		return false;
+	}
+
+	/**
+	 * Ensures that a class in the namespace is available.
+	 * If the class is not already loaded, it attempts to load it via the specified autoloader.
+	 *
+	 * @param string  $className   The fully qualified name of the class to check.
+	 *
+	 * @return bool True if the class exists or was successfully loaded, false otherwise.
+	 * @since  3.2.2
+	 */
+	protected function classExists(string $className): bool
+	{
+		if (class_exists($className, true))
+		{
+			return true;
+		}
+
+		// Autoloaders to check
+		$autoloaders = [###INSTALLER_POWER_AUTOLOADER_ARRAY###];
+
+		foreach ($autoloaders as $autoloader)
+		{
+			if (file_exists($autoloader))
+			{
+				require_once $autoloader;
+
+				if (class_exists($className, true))
+				{
+					return true;
+				}
+			}
+		}
+
 		return false;
 	}###INSTALLERMETHODS###
 }

admin/compiler/joomla_3/script_powerloader.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 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('_JEXEC') or die('Restricted access');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die;###INSTALLER_POWER_HELPER###

admin/compiler/joomla_3/settings.json

@@ -184,6 +184,12 @@
 				"rename": false,
 				"type": "file"
 			},
+			"script_powerloader.php": {
+				"naam": "script_powerloader.php",
+				"path": "c0mp0n3nt/",
+				"rename": false,
+				"type": "file"
+			},
 			"install.mysql.utf8.sql": {
 				"naam": "install.mysql.utf8.sql",
 				"path": "c0mp0n3nt/admin/sql",

admin/compiler/joomla_4/ADMIN_HELPER_CLASS.php

@@ -15,7 +15,7 @@ defined('_JCB_TEMPLATE') or die;
 ###BOM###
 namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator\Helper;
 
-###CUSTOM_POWER_AUTOLOADER###
+###POWER_AUTOLOADER###
 
 ###ADMIN_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_4/ADMIN_PROVIDER.php

@@ -14,7 +14,7 @@ defined('_JCB_TEMPLATE') or die;
 ?>
 ###BOM###
 
-###CUSTOM_POWER_AUTOLOADER###
+###POWER_AUTOLOADER###
 
 // (soon) use Joomla\CMS\Association\AssociationExtensionInterface;
 use Joomla\CMS\Categories\CategoryFactoryInterface;
@@ -55,10 +55,10 @@ return new class () implements ServiceProviderInterface
 	{
 		// (soon) $container->set(AssociationExtensionInterface::class, new AssociationsHelper());
 
-		$container->registerServiceProvider(new CategoryFactory('\\###NAMESPACEPREFIX###\\Component\\###Component###'));
-		$container->registerServiceProvider(new MVCFactory('\\###NAMESPACEPREFIX###\\Component\\###Component###'));
-		$container->registerServiceProvider(new ComponentDispatcherFactory('\\###NAMESPACEPREFIX###\\Component\\###Component###'));
-		$container->registerServiceProvider(new RouterFactory('\\###NAMESPACEPREFIX###\\Component\\###Component###'));
+		$container->registerServiceProvider(new CategoryFactory('\\###NAMESPACEPREFIX###\\Component\\###ComponentNamespace###'));
+		$container->registerServiceProvider(new MVCFactory('\\###NAMESPACEPREFIX###\\Component\\###ComponentNamespace###'));
+		$container->registerServiceProvider(new ComponentDispatcherFactory('\\###NAMESPACEPREFIX###\\Component\\###ComponentNamespace###'));
+		$container->registerServiceProvider(new RouterFactory('\\###NAMESPACEPREFIX###\\Component\\###ComponentNamespace###'));
 
 		$container->set(
 			ComponentInterface::class,

admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php

@@ -27,6 +27,62 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The return here base64 url
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $return_here;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+	 * @since  3.10.11
+	 */
+	public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
 	/**
 	 * ###Views### view display method
 	 *
@@ -43,7 +99,7 @@ class HtmlView extends BaseHtmlView
 		$this->state = $this->get('State');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');
-		$this->user ??= Factory::getApplication()->getIdentity();###ADMIN_DIPLAY_METHOD###
+		$this->user ??= $this->getCurrentUser();###ADMIN_DIPLAY_METHOD###
 		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) Uri::getInstance()));

admin/compiler/joomla_4/ADMIN_VIEW_CONTROLLER.php

@@ -261,7 +261,7 @@ class ###View###Controller extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/compiler/joomla_4/ADMIN_VIEW_HTML.php

@@ -27,6 +27,86 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * ###View### view display method
 	 *
@@ -41,7 +121,7 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_###component###');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->styles = $this->get('Styles');
 		$this->scripts = $this->get('Scripts');

admin/compiler/joomla_4/API_VIEWS_CONTROLLER.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Api\Controller;
+
+###API_VIEWS_CONTROLLER_HEADER###
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * ###Views### Api Controller
+ *
+ * @since  4.0.0
+ */
+class ###Views###Controller extends ApiController
+{
+	/**
+	 * The content type of the item.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $contentType = '###views###';
+
+	/**
+	 * The default view for the display method.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $default_view = '###views###';
+}

admin/compiler/joomla_4/API_VIEWS_JSON.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Api\View\###Views###;
+
+###API_VIEWS_JSON_HEADER###
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * ###Component### Json View class for the ###Views###
+ *
+ * @since  4.0.0
+ */
+class JsonapiView extends BaseApiView
+{
+}

admin/compiler/joomla_4/API_VIEW_CONTROLLER.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Api\Controller;
+
+###API_VIEW_CONTROLLER_HEADER###
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * ###View### Api Controller
+ *
+ * @since  4.0.0
+ */
+class ###View###Controller extends ApiController
+{
+	/**
+	 * The content type of the item.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $contentType = '###view###';
+
+	/**
+	 * The default view for the display method.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $default_view = '###view###';
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = [])
+	{###JCONTROLLERFORM_ALLOWADD###
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = [], $key = 'id')
+	{###JCONTROLLERFORM_ALLOWEDIT###
+	}
+}

admin/compiler/joomla_4/API_VIEW_JSON.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Api\View\###View###;
+
+###API_VIEW_JSON_HEADER###
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * ###View### Json View class
+ *
+ * @since  4.0.0
+ */
+class JsonapiView extends BaseApiView
+{
+}

admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php

@@ -27,6 +27,38 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+	 * @since  3.10.11
+	 */
+	public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
 	/**
 	 * Display the view
 	 *
@@ -42,11 +74,11 @@ class HtmlView extends BaseHtmlView
 		// get the application
 		$this->app ??= Factory::getApplication();
 		// get the user object
-		$this->user ??= $this->app->getIdentity();
+		$this->user ??= $this->getCurrentUser();
 		// get global action permissions
 		$this->canDo = ###Component###Helper::getActions('###sview###');
-		$this->styles = $this->get('Styles');
-		$this->scripts = $this->get('Scripts');###CUSTOM_ADMIN_DIPLAY_METHOD###
+		$this->styles = $this->get('Styles') ?? [];
+		$this->scripts = $this->get('Scripts') ?? [];###CUSTOM_ADMIN_DIPLAY_METHOD###
 
 		// Set the html view document stuff
 		$this->_prepareDocument();

admin/compiler/joomla_4/INSTALLER_AUTOLOADER_CLASS.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die;###INSTALLER_POWER_HELPER###

admin/compiler/joomla_4/INSTALLER_SCRIPT.php

@@ -19,7 +19,6 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Installer\InstallerScriptInterface;
-use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Version;
 use Joomla\CMS\HTML\HTMLHelper as Html;
@@ -39,7 +38,6 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * The CMS Application.
 	 *
-	 * @var   CMSApplication
 	 * @since 4.4.2
 	 */
 	protected $app;
@@ -54,7 +52,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * The version number of the extension.
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $release;
@@ -62,7 +60,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * The table the parameters are stored in.
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $paramTable;
@@ -70,7 +68,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * The extension name. This should be set in the installer script.
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $extension;
@@ -78,7 +76,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * A list of files to be deleted
 	 *
-	 * @var   array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $deleteFiles = [];
@@ -86,7 +84,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * A list of folders to be deleted
 	 *
-	 * @var   array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $deleteFolders = [];
@@ -94,7 +92,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * A list of CLI script files to be copied to the cli directory
 	 *
-	 * @var   array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $cliScriptFiles = [];
@@ -102,7 +100,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * Minimum PHP version required to install the extension
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $minimumPhp;
@@ -110,7 +108,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * Minimum Joomla! version required to install the extension
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $minimumJoomla;
@@ -164,7 +162,6 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter  $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function install(InstallerAdapter $adapter): bool {return true;}
@@ -186,7 +183,6 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter   $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function uninstall(InstallerAdapter $adapter): bool
@@ -209,7 +205,6 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter  $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function preflight(string $type, InstallerAdapter $adapter): bool
@@ -254,7 +249,6 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter  $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function postflight(string $type, InstallerAdapter $adapter): bool
@@ -279,11 +273,84 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		return true;
 	}
 
+	/**
+	 * Remove folders with files (with ignore options)
+	 *
+	 * @param   string	    $dir	 The path to the folder to remove.
+	 * @param   array|null  $ignore  The folders and files to ignore and not remove.
+	 *
+	 * @return  bool   True if all specified files/folders are removed, false otherwise.
+	 * @since   3.2.2
+	 */
+	protected function removeFolder(string $dir, ?array $ignore = null): bool
+	{
+		if (!is_dir($dir))
+		{
+			return false;
+		}
+
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		$it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
+
+		// Remove trailing slash
+		$dir = rtrim($dir, '/');
+
+		foreach ($it as $file)
+		{
+			$filePath = $file->getPathname();
+			$relativePath = str_replace($dir . '/', '', $filePath);
+
+			if ($ignore !== null && in_array($relativePath, $ignore, true))
+			{
+				continue;
+			}
+
+			if ($file->isDir())
+			{
+				Folder::delete($filePath);
+			}
+			else
+			{
+				File::delete($filePath);
+			}
+		}
+
+		// Delete the root folder if there are no ignored files/folders left
+		if ($ignore === null || $this->isDirEmpty($dir, $ignore))
+		{
+			return Folder::delete($dir);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory is empty considering ignored files/folders.
+	 *
+	 * @param   string  $dir	 The path to the folder to check.
+	 * @param   array   $ignore  The folders and files to ignore.
+	 *
+	 * @return  bool    True if the directory is empty or contains only ignored items, false otherwise.
+     * @since   3.2.1
+	 */
+	protected function isDirEmpty(string $dir, array $ignore): bool
+	{
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		foreach ($it as $file)
+		{
+			$relativePath = str_replace($dir . '/', '', $file->getPathname());
+			if (!in_array($relativePath, $ignore, true))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
 	/**
 	 * Remove the files and folders in the given array from
 	 *
 	 * @return  void
-	 *
 	 * @since   3.6
 	 */
 	protected function removeFiles()
@@ -315,7 +382,6 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * Moves the CLI scripts into the CLI folder in the CMS
 	 *
 	 * @return  void
-	 *
 	 * @since   3.6
 	 */
 	protected function moveCliFiles()
@@ -346,7 +412,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $contentHistoryOptions
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setContentType(
 		string $typeTitle,
@@ -408,7 +474,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $textPrefix
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setActionLogConfig(
 		string $typeTitle,
@@ -461,7 +527,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * Set action logs extensions integration
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setActionLogsExtensions(): void
 	{
@@ -502,7 +568,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $rules   The component rules
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setAssetsRules(string $rules): void
 	{
@@ -540,7 +606,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $params   The component rules
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setExtensionsParams(string $params): void
 	{
@@ -583,7 +649,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string  $dataType          This datatype we will change the rules column to if it to small.
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setDatabaseAssetsRulesFix(int $accessWorseCase, string $dataType): void
 	{
@@ -618,7 +684,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   bool     $fields    The switch to also remove related field data
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeViewData(string $context, bool $fields = false): void
 	{
@@ -641,7 +707,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeContentTypes(string $context): void
 	{
@@ -698,7 +764,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeFields(string $context): void
 	{
@@ -760,7 +826,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   array    $ids       The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeFieldsValues(string $context, array $ids): void
 	{
@@ -791,7 +857,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeFieldsGroups(string $context): void
 	{
@@ -846,7 +912,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeViewHistory(string $context): void
 	{
@@ -878,7 +944,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   array   $ids   The type ids
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeUcmBase(array $ids): void
 	{
@@ -911,7 +977,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeUcmContent(string $context): void
 	{
@@ -943,7 +1009,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeContentItemTagMap(string $context): void
 	{
@@ -978,7 +1044,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeActionLogConfig(string $context): void
 	{
@@ -1008,7 +1074,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * Remove Asset Table Integrated
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeAssetData(): void
 	{
@@ -1036,7 +1102,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * Remove action logs extensions integrated
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeActionLogsExtensions(): void
 	{
@@ -1066,7 +1132,7 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	 * Remove remove database fix (if possible)
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeDatabaseAssetsRulesFix(): void
 	{
@@ -1095,5 +1161,40 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 				);
 			}
 		}
+	}
+
+	/**
+	 * Ensures that a class in the namespace is available.
+	 * If the class is not already loaded, it attempts to load it via the specified autoloader.
+	 *
+	 * @param string  $className   The fully qualified name of the class to check.
+	 *
+	 * @return bool True if the class exists or was successfully loaded, false otherwise.
+	 * @since  4.0.1
+	 */
+	protected function classExists(string $className): bool
+	{
+		if (class_exists($className, true))
+		{
+			return true;
+		}
+
+		// Autoloaders to check
+		$autoloaders = [###INSTALLER_POWER_AUTOLOADER_ARRAY###];
+
+		foreach ($autoloaders as $autoloader)
+		{
+			if (file_exists($autoloader))
+			{
+				require_once $autoloader;
+
+				if (class_exists($className, true))
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
 	}###INSTALLERMETHODS###
 }

admin/compiler/joomla_4/SITE_ADMIN_VIEW_CONTROLLER.php

@@ -277,7 +277,7 @@ class ###View###Controller extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php

@@ -27,6 +27,86 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The item from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $item;
+
+	/**
+	 * The state object
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $state;
+
+	/**
+	 * The form from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $form;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The origin referral view name
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $ref;
+
+	/**
+	 * The origin referral view item id
+	 *
+	 * @var    int
+	 * @since  3.10.11
+	 */
+	public int $refid;
+
+	/**
+	 * The referral url suffix values
+	 *
+	 * @var    string
+	 * @since  3.10.11
+	 */
+	public string $referral;
+
 	/**
 	 * ###View### view display method
 	 *
@@ -41,11 +121,11 @@ class HtmlView extends BaseHtmlView
 		$this->params = ComponentHelper::getParams('com_###component###');
 		$this->useCoreUI = true;
 		// Assign the variables
-		$this->form = $this->get('Form');
+		$this->form ??= $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->state = $this->get('State');
-		$this->styles = $this->get('Styles');
-		$this->scripts = $this->get('Scripts');
+		$this->styles = $this->get('Styles') ?? [];
+		$this->scripts = $this->get('Scripts') ?? [];
 		// get action permissions
 		$this->canDo = ###Component###Helper::getActions('###view###', $this->item);
 		// get input
@@ -97,6 +177,9 @@ class HtmlView extends BaseHtmlView
 	protected function addToolbar(): void
 	{
 		###ADDTOOLBAR###
+
+		// now initiate the toolbar
+		$this->toolbar ??= Toolbar::getInstance();
 	}
 
 	/**

admin/compiler/joomla_4/SITE_ADMIN_VIEW_MODEL.php

@@ -36,6 +36,28 @@ class ###View###Model extends AdminModel
 	 */
 	protected $tabLayoutFields = ###TABLAYOUTFIELDSARRAY###;
 
+	/**
+	 * The styles array.
+	 *
+	 * @var    array
+	 * @since  4.3
+	 */
+	protected array $styles = [
+		'components/com_###component###/assets/css/site.css',
+		'components/com_###component###/assets/css/###view###.css'
+ 	];
+
+	/**
+	 * The scripts array.
+	 *
+	 * @var    array
+	 * @since  4.3
+	 */
+	protected array $scripts = [
+		'components/com_###component###/assets/js/site.js',
+		'media/com_###component###/js/###view###.js'
+ 	];
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
@@ -119,13 +141,47 @@ class ###View###Model extends AdminModel
 	}
 
 	/**
-	 * Method to get the script that have to be included on the form
+	 * Method to get the styles that have to be included on the view
 	 *
-	 * @return string    script files
+	 * @return  array    styles files
+	 * @since   4.3
 	 */
-	public function getScript()
+	public function getStyles(): array
 	{
-		return 'media/com_###component###/js/###view###.js';
+		return $this->styles;
+	}
+
+	/**
+	 * Method to set the styles that have to be included on the view
+	 *
+	 * @return  void
+	 * @since   4.3
+	 */
+	public function setStyles(string $path): void
+	{
+		$this->styles[] = $path;
+	}
+
+	/**
+	 * Method to get the script that have to be included on the view
+	 *
+	 * @return  array    script files
+	 * @since   4.3
+	 */
+	public function getScripts(): array
+	{
+		return $this->scripts;
+	}
+
+	/**
+	 * Method to set the script that have to be included on the view
+	 *
+	 * @return  void
+	 * @since   4.3
+	 */
+	public function setScript(string $path): void
+	{
+		$this->scripts[] = $path;
 	}
 
 	/**

admin/compiler/joomla_4/SITE_DISPLAY_CONTROLLER.php

@@ -15,9 +15,13 @@ defined('_JCB_TEMPLATE') or die;
 ###BOM###
 namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\Controller;
 
+use Joomla\Input\Input;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\User\User;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Language\Text;
 
@@ -31,13 +35,50 @@ use Joomla\CMS\Language\Text;
  */
 class DisplayController extends BaseController
 {
+	/**
+	 * The allowed edit views.
+	 *
+	 * @var array
+	 * @since  4.0.0
+	 */
+	protected array $allowed_edit_views = [###SITE_ALLOW_EDIT_VIEWS_ARRAY###
+	];
+
+	/**
+	 * The application identity object.
+	 *
+	 * @var User
+	 * @since  4.0.0
+	 */
+	protected $identity;
+
+	/**
+	 * @param   array                     $config       An optional associative array of configuration settings.
+	 *                                                  Recognized key values include 'name', 'default_task', 'model_path', and
+	 *                                                  'view_path' (this list is not meant to be comprehensive).
+	 * @param   MVCFactoryInterface|null  $factory      The factory.
+	 * @param   CMSApplication|null       $app          The Application for the dispatcher
+	 * @param   Input|null                $input        The Input object for the request
+	 *
+	 * @throws \Exception
+	 * @since   3.0.1
+	 */
+	public function __construct($config = [], MVCFactoryInterface $factory = null, $app = null, $input = null)
+	{
+		$app ??= Factory::getApplication();
+		$this->identity ??= $app->getIdentity();
+
+		parent::__construct($config, $factory, $app, $input);
+	}
+
 	/**
 	 * Method to display a view.
 	 *
-	 * @param   boolean  $cachable   If true, the view output will be cached.
-	 * @param   boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link InputFilter::clean()}.
+	 * @param   boolean        $cachable   If true, the view output will be cached.
+	 * @param   boolean|array  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link InputFilter::clean()}.
 	 *
 	 * @return  DisplayController  This object to support chaining.
+	 * @throws \Exception
      * @since   1.5
 	 */
 	function display($cachable = false, $urlparams = false)
@@ -51,14 +92,13 @@ class DisplayController extends BaseController
 		$cachable      = true;
 
 		// ensure that the view is not cashable if edit view or if user is logged in
-		$user = $this->app->getIdentity();
-		if ($user->get('id') || $this->input->getMethod() === 'POST' || $isEdit)
+		if ($this->identity->get('id') || $this->input->getMethod() === 'POST' || $isEdit)
 		{
 			$cachable = false;
 		}
 
 		// Check for edit form.
-		if ($isEdit && !$this->checkEditId('com_###component###.edit.'.$view, $id))
+		if ($isEdit && !$this->checkEditId($view, $id))
 		{
 			// check if item was opened from other than its own list view
 			$ref    = $this->input->getCmd('ref', 0);
@@ -68,12 +108,12 @@ class DisplayController extends BaseController
 			if ($refid > 0 && Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($ref))
 			{
 				// redirect to item of ref
-				$this->setRedirect(Route::_('index.php?option=com_###component###&view='.(string)$ref.'&layout=edit&id='.(int)$refid, false));
+				$this->setRedirect(Route::_('index.php?option=com_###component###&view=' . (string) $ref . '&layout=edit&id=' . (int) $refid, false));
 			}
 			elseif (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($ref))
 			{
 				// redirect to ref
-				 $this->setRedirect(Route::_('index.php?option=com_###component###&view='.(string)$ref, false));
+				 $this->setRedirect(Route::_('index.php?option=com_###component###&view=' . (string) $ref, false));
 			}
 			else
 			{
@@ -115,18 +155,133 @@ class DisplayController extends BaseController
 		return $this;
 	}
 
-	protected function checkEditView($view)
+	/**
+	 * Method to check whether an ID is in the edit list.
+	 *
+	 * @param   string   $context  The view name.
+	 * @param   integer  $id       The ID of the record to add to the edit list.
+	 *
+	 * @return  boolean  True if the ID is in the edit list.
+	 *
+	 * @throws \Exception
+	 * @since   3.0
+	 */
+	protected function checkEditId($context, $id)
+	{
+		if (parent::checkEditId("com_###component###.edit.{$context}", $id))
+		{
+			return true;
+		}
+
+		// check user edit access
+		if ($this->canEditId($context, $id))
+		{
+			$this->holdEditId("com_###component###.edit.{$context}", $id);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to check whether an ID is allowed to be edited by the active user.
+	 *
+	 * @param   string   $view    The view name.
+	 * @param   integer  $id      The ID of the record to add to the edit list.
+	 *
+	 * @return  boolean  True if the ID is in the edit list.
+	 *
+	 * @since   5.0.2
+	 */
+	protected function canEditId($view, $id): bool
+	{
+		// check that this view is even allowed
+		$allowed = $this->getAllowedEditView($view);
+		if ($allowed === null)
+		{
+			return false;
+		}
+
+		// check if this item has custom function set for canEditId
+		if (isset($allowed['function'])
+			&& method_exists($this, $allowed['function'])
+			&& $this->{$allowed['function']}(['id' => $id], 'id'))
+		{
+			return true;
+		}
+
+		// check if this item can be accessed (and has access)
+		$access = true;
+		if (isset($allowed['access']))
+		{
+			$access = ($this->identity->authorise($allowed['access'], "com_###component###.{$view}." . (int) $id)
+				&& $this->identity->authorise($allowed['access'], 'com_###component###'));
+		}
+
+		// check if this item can be edited
+		$edit = false;
+		if ($access && isset($allowed['edit']))
+		{
+			$edit = ($this->identity->authorise($allowed['edit'], "com_###component###.{$view}." . (int) $id)
+				&& $this->identity->authorise($allowed['edit'], 'com_###component###'));
+		}
+
+		// check if this item can be edited by owner
+		if ($access && !$edit && isset($allowed['edit.own']))
+		{
+			$edit = ($this->identity->authorise($allowed['edit.own'], "com_###component###.{$view}." . (int) $id)
+				&& $this->identity->authorise($allowed['edit.own'], 'com_###component###'));
+		}
+
+		return $edit;
+	}
+
+	/**
+	 * Checks if the provided view is an edit view.
+	 *
+	 * This method verifies whether the given view name is recognized as an edit view.
+	 * It uses the StringHelper::check() method to validate the input and then checks
+	 * against a predefined list of edit views.
+	 *
+	 * @param  string|null  $view  The name of the view to check.
+	 * 
+	 * @return  bool   True if the view is an edit view, false otherwise.
+	 * @since   4.0.0
+	 */
+	protected function checkEditView(?string $view): bool
 	{
 		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($view))
 		{
-			$views = [###SITE_EDIT_VIEW_ARRAY###
-				];
-			// check if this is a edit view
-			if (in_array($view,$views))
+			// check if this is an edit view
+			if (isset($this->allowed_edit_views[$view]))
 			{
 				return true;
 			}
 		}
+
 		return false;
 	}
+
+	/**
+	 * Get the allowed edit view permission map
+	 *
+	 * @param  string|null  $view  The name of the view to check.
+	 * 
+	 * @return  array|null   The permissions map
+	 * @since   5.0.2
+	 */
+	protected function getAllowedEditView(?string $view): ?array
+	{
+		if (Super___1f28cb53_60d9_4db1_b517_3c7dc6b429ef___Power::check($view))
+		{
+			// check if this is an edit view
+			if (isset($this->allowed_edit_views[$view]))
+			{
+				return $this->allowed_edit_views[$view];
+			}
+		}
+
+		return null;
+	}###SITE_ALLOW_EDIT_VIEWS_FUNCTIONS###
 }

admin/compiler/joomla_4/SITE_HELPER_CLASS.php

@@ -15,7 +15,7 @@ defined('_JCB_TEMPLATE') or die;
 ###BOM###
 namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\Helper;
 
-###SITE_CUSTOM_POWER_AUTOLOADER###
+###SITE_POWER_AUTOLOADER###
 
 ###SITE_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_4/SITE_VIEWS_HTML.php

@@ -27,6 +27,54 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The items from the model
+	 *
+	 * @var    mixed
+	 * @since  3.10.11
+	 */
+	public mixed $items;
+
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  5.0.0
+	 */
+	protected array $scripts;
+
+	/**
+	 * The actions object
+	 *
+	 * @var    object
+	 * @since  3.10.11
+	 */
+	public object $canDo;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+	 * @since  3.10.11
+	 */
+	public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
 	/**
 	 * Display the view
 	 *
@@ -82,6 +130,7 @@ class HtmlView extends BaseHtmlView
 		{
 			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
+
 		// now initiate the toolbar
 		$this->toolbar = Toolbar::getInstance();
 	}###SITE_GET_MODULE###

admin/compiler/joomla_4/SITE_VIEW_CONTROLLER.php

@@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\Controll
  *
  * @since  1.6
  */
-class ###SView###Controller extends FormController
+class ###SView###Controller extends Joomla___907ccae5_57a9_44b9_a8aa_5b905d1cd70f___Power
 {
 	/**
 	 * The prefix to use with controller messages.
@@ -107,14 +107,14 @@ class ###SView###Controller extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModelLegacy  $model      The data model object.
-	 * @param   array         $validData  The validated data.
+	 * @param   Joomla___6dce7a1b_cfc3_4c2a_837d_be9cbc902446___Power  $model      The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.2
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = [])
+	protected function postSaveHook(Joomla___6dce7a1b_cfc3_4c2a_837d_be9cbc902446___Power $model, $validData = [])
 	{
 	}
 }

admin/compiler/joomla_4/SITE_VIEW_HTML.php

@@ -27,6 +27,38 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###
  */
 class HtmlView extends BaseHtmlView
 {
+	/**
+	 * The toolbar object
+	 *
+	 * @var    Toolbar
+	 * @since  3.10.11
+	 */
+	public Toolbar $toolbar;
+
+	/**
+	 * The styles url array
+	 *
+	 * @var    array
+	 * @since  3.10.11
+	 */
+	protected array $styles;
+
+	/**
+	 * The scripts url array
+	 *
+	 * @var    array
+	 * @since  3.10.11
+	 */
+	protected array $scripts;
+
+	/**
+	 * The user object.
+	 *
+	 * @var    Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power
+	 * @since  3.10.11
+	 */
+	public Joomla___effdaf6d_2275_425d_9f52_d4952e564d34___Power $user;
+
 	/**
 	 * Display the view
 	 *
@@ -41,10 +73,10 @@ class HtmlView extends BaseHtmlView
 		$this->app ??= Factory::getApplication();
 		$this->params = $this->app->getParams();
 		$this->menu = $this->app->getMenu()->getActive();
-		$this->styles = $this->get('Styles');
-		$this->scripts = $this->get('Scripts');
+		$this->styles = $this->get('Styles') ?? [];
+		$this->scripts = $this->get('Scripts') ?? [];
 		// get the user object
-		$this->user ??= $this->app->getIdentity();###SITE_DIPLAY_METHOD###
+		$this->user ??= $this->getCurrentUser();###SITE_DIPLAY_METHOD###
 	}###SITE_EXTRA_DIPLAY_METHODS###
 
 	/**
@@ -82,8 +114,9 @@ class HtmlView extends BaseHtmlView
 		{
 			ToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
+
 		// now initiate the toolbar
-		$this->toolbar = Toolbar::getInstance();
+		$this->toolbar ??= Toolbar::getInstance();
 	}###SITE_GET_MODULE###
 
 	/**

admin/compiler/joomla_4/settings.json

@@ -33,6 +33,12 @@
 			},
 			"tmpl": "tmpl"
 		},
+		"api": {
+			"src": {
+				"Controller": "Controller",
+				"View": "View"
+			}
+		},
 		"site": {
 			"assets": {
 				"css": "css",
@@ -182,6 +188,13 @@
 				"newName": "[[[Component]]]InstallerScript.php",
 				"type": "file"
 			},
+			"INSTALLER_AUTOLOADER_CLASS.php": {
+				"naam": "INSTALLER_AUTOLOADER_CLASS.php",
+				"path": "c0mp0n3nt/",
+				"rename": "new",
+				"newName": "[[[Component]]]InstallerPowerloader.php",
+				"type": "file"
+			},
 			"SITE_DISPATCHER.php": {
 				"naam": "SITE_DISPATCHER.php",
 				"path": "c0mp0n3nt/site/src/Dispatcher",
@@ -557,6 +570,32 @@
 					"type": "javascript_file"
 				}
 			},
+			"api": {
+				"API_VIEW_CONTROLLER.php": {
+					"path": "c0mp0n3nt/api/src/Controller",
+					"rename": "new",
+					"newName": "[[[Name]]]Controller.php",
+					"type": "single"
+				},
+				"API_VIEW_JSON.php": {
+					"path": "c0mp0n3nt/api/src/View/[[[Name]]]",
+					"rename": "new",
+					"newName": "JsonapiView.php",
+					"type": "single"
+				},
+				"API_VIEWS_CONTROLLER.php": {
+					"path": "c0mp0n3nt/api/src/Controller",
+					"rename": "new",
+					"newName": "[[[Name]]]Controller.php",
+					"type": "list"
+				},
+				"API_VIEWS_JSON.php": {
+					"path": "c0mp0n3nt/api/src/View/[[[Name]]]",
+					"rename": "new",
+					"newName": "JsonapiView.php",
+					"type": "list"
+				}
+			},
 			"site": {
 				"SITE_VIEWS_HTML.php": {
 					"path": "c0mp0n3nt/site/src/View/[[[Name]]]",

admin/config.xml

@@ -113,7 +113,7 @@
 					multiple="false"
 					filter="CMD"
 					required="true"
-					default="joomla.form.field.subform.repeatable-table">
+					default="repeatablejcbjfive">
 					<!-- Option Set. -->
 					<option value="joomla.form.field.subform.repeatable-table">
 						COM_COMPONENTBUILDER_CONFIG_REPEATABLETABLE_JOOMLA</option>
@@ -134,6 +134,19 @@
 			folder="editors"
 			filter="cmd"
 		/>
+		<!-- Gitea_username Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="gitea_username"
+			label="COM_COMPONENTBUILDER_CONFIG_GITEA_USERNAME_LABEL"
+			size="128"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_CONFIG_GITEA_USERNAME_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_CONFIG_GITEA_USERNAME_MESSAGE"
+			hint="COM_COMPONENTBUILDER_CONFIG_GITEA_USERNAME_HINT"
+		/>
 		<!-- Gitea_token Field. Type: Password. (joomla) -->
 		<field
 			type="password"
@@ -189,6 +202,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="true"
 			default=""
 			showon="manage_jcb_package_directories:1">
@@ -222,6 +236,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="global"
 			showon="set_browser_storage:1">
@@ -743,62 +758,7 @@
 				COM_COMPONENTBUILDER_CONFIG_NO</option>
 		</field>
 		<!-- Note_super_powers_repositories Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_super_powers_repositories" label="COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_DESCRIPTION" heading="h4" class="alert alert-info note_super_powers_repositories" showon="powers_repository:1[AND]super_powers_repositories:1" />
-		<!-- Approved_paths Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="approved_paths"
-			label="COM_COMPONENTBUILDER_CONFIG_APPROVED_PATHS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			buttons="add,remove,move"
-			icon="list"
-			max="30"
-			min="1"
-			showon="powers_repository:1[AND]super_powers_repositories:1">
-			<form hidden="true" name="list_approved_paths_modal" repeat="true">
-				<!-- Owner Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="owner"
-					label="COM_COMPONENTBUILDER_CONFIG_OWNER_LABEL"
-					size="70"
-					maxlength="150"
-					class="text_area span12"
-					readonly="false"
-					filter="CMD"
-					hint="COM_COMPONENTBUILDER_CONFIG_OWNER_HINT"
-					autocomplete="on"
-				/>
-				<!-- Repo Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="repo"
-					label="COM_COMPONENTBUILDER_CONFIG_REPO_LABEL"
-					size="70"
-					maxlength="150"
-					class="text_area span12"
-					readonly="false"
-					filter="CMD"
-					hint="COM_COMPONENTBUILDER_CONFIG_REPO_HINT"
-					autocomplete="on"
-				/>
-				<!-- Branch Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="branch"
-					label="COM_COMPONENTBUILDER_CONFIG_BRANCH_LABEL"
-					size="70"
-					maxlength="150"
-					default="default"
-					class="text_area span12"
-					readonly="false"
-					filter="CMD"
-					hint="COM_COMPONENTBUILDER_CONFIG_BRANCH_HINT"
-					autocomplete="on"
-				/>
-			</form>
-		</field>
+		<field type="note" name="note_super_powers_repositories" label="COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_DESCRIPTION" heading="h4" class="alert alert-error note_super_powers_repositories" showon="powers_repository:1[AND]super_powers_repositories:1" />
 		<!-- Note_powers_repository_path Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_powers_repository_path" label="COM_COMPONENTBUILDER_CONFIG_NOTE_POWERS_REPOSITORY_PATH_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_POWERS_REPOSITORY_PATH_DESCRIPTION" heading="h4" class="alert alert-info note_powers_repository_path" showon="powers_repository:1" />
 		<!-- Local_powers_repository_path Field. Type: Text. (joomla) -->
@@ -819,88 +779,6 @@
 			autocomplete="on"
 			showon="powers_repository:1"
 		/>
-		<!-- Add_custom_gitea_url Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_custom_gitea_url"
-			label="COM_COMPONENTBUILDER_CONFIG_ADD_CUSTOM_GITEA_URL_LABEL"
-			description="COM_COMPONENTBUILDER_CONFIG_ADD_CUSTOM_GITEA_URL_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CONFIG_GITVDMDEV</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_CONFIG_CUSTOMGITEA</option>
-		</field>
-		<!-- Note_custom_gitea_url Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_custom_gitea_url" label="COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_GITEA_URL_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_GITEA_URL_DESCRIPTION" heading="h3" class="alert alert-success note_custom_gitea_url" showon="add_custom_gitea_url:2" />
-		<!-- Custom_gitea_url Field. Type: Url. (joomla) -->
-		<field
-			type="url"
-			name="custom_gitea_url"
-			label="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_LABEL"
-			size="70"
-			maxlength="150"
-			default="https://git.vdm.dev"
-			description="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_DESCRIPTION"
-			class="text_area"
-			filter="url"
-			validated="url"
-			scheme="http,https"
-			message="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_MESSAGE"
-			hint="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_HINT"
-			autocomplete="on"
-			showon="add_custom_gitea_url:2"
-		/>
-		<!-- Custom_gitea_token Field. Type: Password. (joomla) -->
-		<field
-			type="password"
-			name="custom_gitea_token"
-			label="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_TOKEN_LABEL"
-			size="128"
-			description="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_TOKEN_DESCRIPTION"
-			message="Error! Please add token here."
-			class="text_area"
-			readonly="false"
-			disabled="false"
-			required="false"
-			filter="STRING"
-			hint="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_TOKEN_HINT"
-			autocomplete="off"
-			showon="add_custom_gitea_url:2"
-		/>
-		<!-- Super_powers_core_organisation_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="super_powers_core_organisation_note" label="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_NOTE_LABEL" description="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_NOTE_DESCRIPTION" heading="h4" class="alert alert-success super_powers_core_organisation_note" showon="add_custom_gitea_url:2" />
-		<!-- Super_powers_core_organisation Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="super_powers_core_organisation"
-			label="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_LABEL"
-			size="70"
-			maxlength="150"
-			default="joomla"
-			description="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_DESCRIPTION"
-			class="text_area"
-			filter="WORD"
-			hint="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_HINT"
-			autocomplete="on"
-			showon="add_custom_gitea_url:2"
-		/>
-		<!-- Super_powers_core Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="super_powers_core"
-			label="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_LABEL"
-			size="70"
-			maxlength="150"
-			default="joomla/super-powers"
-			class="text_area"
-			filter="PATH"
-			hint="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_HINT"
-			autocomplete="on"
-			showon="add_custom_gitea_url:2"
-		/>
 	</fieldset>
 	<fieldset
 		name="compiler_custom_config"
@@ -913,6 +791,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_BUILDER_GIF_SIZE_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_BUILDER_GIF_SIZE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="480-272">
@@ -1038,6 +917,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_ASSETS_TABLE_FIX_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_ASSETS_TABLE_FIX_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="2">
 			<!-- Option Set. -->
@@ -1055,6 +935,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			filter="INT"
 			required="true"
 			default="2">
@@ -1126,115 +1007,6 @@
 				COM_COMPONENTBUILDER_CONFIG_NO</option>
 		</field>
 	</fieldset>
-	<fieldset
-		name="development_method_custom_config"
-		label="COM_COMPONENTBUILDER_CONFIG_DEVELOPMENT_METHOD">
-
-		<!-- Development_method Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="development_method"
-			label="COM_COMPONENTBUILDER_CONFIG_DEVELOPMENT_METHOD_LABEL"
-			description="COM_COMPONENTBUILDER_CONFIG_DEVELOPMENT_METHOD_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_CONFIG_EXPANSION</option>
-		</field>
-		<!-- Note_development_method_default Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_development_method_default" label="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_DESCRIPTION" heading="h2" class="alert alert-info note_development_method_default" showon="development_method:1" />
-		<!-- Note_development_method_expansion Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_development_method_expansion" label="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_DESCRIPTION" heading="h2" class="alert alert-info note_development_method_expansion" showon="development_method:2" />
-		<!-- Expansion Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="expansion"
-			label="COM_COMPONENTBUILDER_CONFIG_EXPANSION_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			description="COM_COMPONENTBUILDER_CONFIG_EXPANSION_DESCRIPTION"
-			icon="list"
-			max="50"
-			min="1"
-			showon="development_method:2">
-			<form hidden="true" name="list_expansion_modal" repeat="true">
-				<!-- Component_id Field. Type: Joomlacomponent. (custom) -->
-				<field
-					type="joomlacomponent"
-					name="component_id"
-					label="COM_COMPONENTBUILDER_CONFIG_COMPONENT_ID_LABEL"
-					class="list_class"
-					multiple="false"
-					default="0"
-					button="false"
-				/>
-				<!-- Install Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="install"
-					label="COM_COMPONENTBUILDER_CONFIG_INSTALL_LABEL"
-					description="COM_COMPONENTBUILDER_CONFIG_INSTALL_DESCRIPTION"
-					class="list_class"
-					multiple="false"
-					default="1">
-					<!-- Option Set. -->
-					<option value="1">
-						COM_COMPONENTBUILDER_CONFIG_TRUE</option>
-					<option value="2">
-						COM_COMPONENTBUILDER_CONFIG_FALSE</option>
-				</field>
-				<!-- Backup Field. Type: Checkbox. (joomla) -->
-				<field
-					type="checkbox"
-					name="backup"
-					label="COM_COMPONENTBUILDER_CONFIG_BACKUP_LABEL"
-					value="1"
-					description="COM_COMPONENTBUILDER_CONFIG_BACKUP_DESCRIPTION"
-					class="inputbox"
-				/>
-				<!-- Repository Field. Type: Checkbox. (joomla) -->
-				<field
-					type="checkbox"
-					name="repository"
-					label="COM_COMPONENTBUILDER_CONFIG_REPOSITORY_LABEL"
-					value="1"
-					description="COM_COMPONENTBUILDER_CONFIG_REPOSITORY_DESCRIPTION"
-					class="inputbox"
-				/>
-				<!-- Add_placeholders Field. Type: Checkbox. (joomla) -->
-				<field
-					type="checkbox"
-					name="add_placeholders"
-					label="COM_COMPONENTBUILDER_CONFIG_ADD_PLACEHOLDERS_LABEL"
-					value="1"
-					default=""
-					description="COM_COMPONENTBUILDER_CONFIG_ADD_PLACEHOLDERS_DESCRIPTION"
-					class="inputbox"
-				/>
-			</form>
-		</field>
-		<!-- Return_options_build Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="return_options_build"
-			label="COM_COMPONENTBUILDER_CONFIG_RETURN_OPTIONS_BUILD_LABEL"
-			description="COM_COMPONENTBUILDER_CONFIG_RETURN_OPTIONS_BUILD_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="2"
-			showon="development_method:2">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CONFIG_DISPLAY_MESSAGE</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_CONFIG_ONLY_BOOLEAN</option>
-		</field>
-		<!-- Expansioncronjob_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="expansioncronjob_note" label="COM_COMPONENTBUILDER_CONFIG_EXPANSIONCRONJOB_NOTE_LABEL" description="COM_COMPONENTBUILDER_CONFIG_EXPANSIONCRONJOB_NOTE_DESCRIPTION" heading="h4" class="expansioncronjob_note" showon="development_method:2" />
-	</fieldset>
 	<fieldset
 		name="auto_backup_custom_config"
 		label="COM_COMPONENTBUILDER_CONFIG_AUTO_BACKUP">
@@ -1255,13 +1027,14 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_CONFIG_REMOTE_SERVER</option>
 		</field>
-		<!-- Cronjob_backup_server Field. Type: Servers. (custom) -->
+		<!-- Cronjob_backup_server Field. Type: Cron_servers. (custom) -->
 		<field
-			type="servers"
+			type="cron_servers"
 			name="cronjob_backup_server"
 			label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			showon="cronjob_backup_type:2"
@@ -1424,6 +1197,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_LABEL"
 			size="40"
 			maxlength="150"
+			default="Vast Development Method"
 			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_DESCRIPTION"
 			class="text_area"
 			required="true"
@@ -1439,6 +1213,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_LABEL"
 			size="10"
 			maxlength="120"
+			default="Llewellyn van der Merwe"
 			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_DESCRIPTION"
 			class="text_area"
 			required="true"
@@ -1454,6 +1229,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_LABEL"
 			size="40"
 			maxlength="150"
+			default="joomla@vdm.io"
 			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_DESCRIPTION"
 			class="text_area"
 			required="true"
@@ -1470,6 +1246,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL"
 			size="60"
 			maxlength="150"
+			default="https://dev.vdm.io/"
 			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_DESCRIPTION"
 			class="text_area"
 			required="true"

admin/forms/admin_custom_tabs.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_ADMIN_VIEW_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_ADMIN_VIEW_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="true"
@@ -128,7 +129,7 @@
 					name="tab"
 					label="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_TAB_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_TAB_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					default="1"
 					button="false"

admin/forms/admin_fields.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADMIN_VIEW_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADMIN_VIEW_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="true"
@@ -128,7 +129,7 @@
 					name="field"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
-					class="list_class fieldFull"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					required="true"
 					button="false"
@@ -139,7 +140,8 @@
 					name="list"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_DESCRIPTION"
-					class="fieldMedium count-the-items1235"
+					class="count-the-items1235"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					onchange="checkAdminBehaviour(this)">
 					<!-- Option Set. -->
@@ -214,7 +216,7 @@
 					name="filter"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_DESCRIPTION"
-					class="fieldSmall"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					default=""
 					onchange="explainFilterBehaviour(this)">
@@ -242,7 +244,7 @@
 					name="tab"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					default="1"
 					button="false"
@@ -253,7 +255,7 @@
 					name="alignment"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIGNMENT_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIGNMENT_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					filter="INT"
 					default="1">
@@ -291,7 +293,7 @@
 					name="permission"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="true">
 					<!-- Option Set. -->
 					<option value="1">

admin/forms/admin_fields_conditions.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADMIN_VIEW_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADMIN_VIEW_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="true"
@@ -127,7 +128,7 @@
 					name="target_field"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_FIELD_DESCRIPTION"
-					class="fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="true"
 					default=""
 					required="true"
@@ -139,7 +140,7 @@
 					name="target_behavior"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_BEHAVIOR_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_BEHAVIOR_DESCRIPTION"
-					class="list_class fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					filter="INT"
 					required="true"
@@ -160,7 +161,7 @@
 					name="target_relation"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_RELATION_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_RELATION_DESCRIPTION"
-					class="list_class fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					filter="INT"
 					required="true"
@@ -177,7 +178,7 @@
 					name="match_field"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_DESCRIPTION"
-					class="fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					required="true"
 					button="false"
@@ -188,7 +189,7 @@
 					name="match_behavior"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_BEHAVIOR_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_BEHAVIOR_DESCRIPTION"
-					class="list_class fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					filter="INT"
 					required="true"

admin/forms/admin_fields_relations.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_ADMIN_VIEW_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_ADMIN_VIEW_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="true"
@@ -127,9 +128,8 @@
 					name="listfield"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_LISTFIELD_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_LISTFIELD_DESCRIPTION"
-					class="fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
-					default=""
 					required="true"
 					onchange="getCodeGlueOptions(this)"
 					button="false"
@@ -154,7 +154,7 @@
 					name="joinfields"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_JOINFIELDS_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_JOINFIELDS_DESCRIPTION"
-					class="fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="true"
 					onchange="getCodeGlueOptions(this)"
 					button="false"
@@ -164,7 +164,8 @@
 					type="list"
 					name="area"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_AREA_LABEL"
-					class="list_class fieldLarge"
+					class="list_class"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					validate="int"
 					default="1"
@@ -182,7 +183,7 @@
 					type="list"
 					name="join_type"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_JOIN_TYPE_LABEL"
-					class="list_class fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					validate="int"
 					default="1"

admin/forms/admin_view.xml

@@ -311,6 +311,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_CHARSET_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_CHARSET_DESCRIPTION"
 			class="list_class bestview"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="CMD"
 			required="true"
@@ -422,6 +423,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION"
 			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			filter="INT"
 			default="1">
 			<!-- Option Set. -->
@@ -689,7 +691,7 @@
 					name="adminview"
 					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					default=""
 					required="true"
@@ -852,6 +854,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ROW_FORMAT_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ROW_FORMAT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="DYNAMIC">
@@ -1359,7 +1362,8 @@
 					name="icomoon"
 					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICOMOON_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICOMOON_DESCRIPTION"
-					class="list_class fieldMedium icomoon342"
+					class="icomoon342"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->
@@ -1918,6 +1922,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_DESCRIPTION"
 			class="list_class bestview"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="CMD"
 			required="true"
@@ -1957,6 +1962,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_COLLATE_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_COLLATE_DESCRIPTION"
 			class="list_class bestview"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="CMD"
 			required="true"

admin/forms/class_extends.xml

@@ -120,6 +120,7 @@
 			label="COM_COMPONENTBUILDER_CLASS_EXTENDS_EXTENSION_TYPE_LABEL"
 			description="COM_COMPONENTBUILDER_CLASS_EXTENDS_EXTENSION_TYPE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true">
 			<!-- Option Set. -->

admin/forms/class_method.xml

@@ -120,6 +120,7 @@
 			label="COM_COMPONENTBUILDER_CLASS_METHOD_VISIBILITY_LABEL"
 			description="COM_COMPONENTBUILDER_CLASS_METHOD_VISIBILITY_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="STRING"
 			required="true">
@@ -144,6 +145,7 @@
 			label="COM_COMPONENTBUILDER_CLASS_METHOD_EXTENSION_TYPE_LABEL"
 			description="COM_COMPONENTBUILDER_CLASS_METHOD_EXTENSION_TYPE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true">
 			<!-- Option Set. -->
@@ -207,6 +209,7 @@
 			name="joomla_plugin_group"
 			label="COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"

admin/forms/class_property.xml

@@ -120,6 +120,7 @@
 			label="COM_COMPONENTBUILDER_CLASS_PROPERTY_VISIBILITY_LABEL"
 			description="COM_COMPONENTBUILDER_CLASS_PROPERTY_VISIBILITY_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="STRING"
 			required="true">
@@ -144,6 +145,7 @@
 			label="COM_COMPONENTBUILDER_CLASS_PROPERTY_EXTENSION_TYPE_LABEL"
 			description="COM_COMPONENTBUILDER_CLASS_PROPERTY_EXTENSION_TYPE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true">
 			<!-- Option Set. -->
@@ -191,6 +193,7 @@
 			name="joomla_plugin_group"
 			label="COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"

admin/forms/component_admin_views.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"
@@ -140,7 +142,7 @@
 					name="adminview"
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					default=""
 					required="true"
@@ -152,7 +154,8 @@
 					name="icomoon"
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ICOMOON_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ICOMOON_DESCRIPTION"
-					class="list_class fieldMedium icomoon342"
+					class="icomoon342"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->
@@ -677,13 +680,31 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PORT_DESCRIPTION"
 					class="inputbox"
 				/>
+				<!-- Add_api Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="add_api"
+					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADD_API_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADD_API_DESCRIPTION"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false">
+					<!-- Option Set. -->
+					<option value="0">
+						COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NONE</option>
+					<option value="1">
+						COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_LIST</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ITEM</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_BOTH</option>
+				</field>
 				<!-- Filter Field. Type: List. (joomla) -->
 				<field
 					type="list"
 					name="filter"
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_FILTER_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_FILTER_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					default="2">
 					<!-- Option Set. -->
@@ -698,7 +719,7 @@
 					name="edit_create_site_view"
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT_CREATE_SITE_VIEW_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT_CREATE_SITE_VIEW_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false">
 					<!-- Option Set. -->
 					<option value="">

admin/forms/component_config.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"
@@ -139,7 +141,7 @@
 					name="field"
 					label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION"
-					class="list_class fieldFull"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					required="true"
 					button="false"
@@ -150,7 +152,7 @@
 					name="custom_value"
 					label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CUSTOM_VALUE_LABEL"
 					rows="2"
-					cols="4"
+					cols="30"
 					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CUSTOM_VALUE_DESCRIPTION"
 					class="text_area"
 					hint="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CUSTOM_VALUE_HINT"

admin/forms/component_custom_admin_menus.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"
@@ -225,7 +227,7 @@
 					name="before"
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_BEFORE_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_BEFORE_DESCRIPTION"
-					class="list_class fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					button="false"
 				/>

admin/forms/component_custom_admin_views.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"
@@ -138,7 +140,7 @@
 					name="customadminview"
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					default=""
 					required="true"
@@ -150,7 +152,8 @@
 					name="icomoon"
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ICOMOON_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ICOMOON_DESCRIPTION"
-					class="list_class fieldMedium icomoon342"
+					class="icomoon342"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->
@@ -631,7 +634,7 @@
 					name="adminviews"
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADMINVIEWS_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADMINVIEWS_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="true"
 					button="false"
 				/>
@@ -641,7 +644,7 @@
 					name="before"
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_BEFORE_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_BEFORE_DESCRIPTION"
-					class="list_class fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					button="false"
 				/>

admin/forms/component_dashboard.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"

admin/forms/component_files_folders.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"

admin/forms/component_modules.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_MODULES_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_MODULES_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_MODULES_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"

admin/forms/component_mysql_tweaks.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"
@@ -139,7 +141,7 @@
 					name="adminview"
 					label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADMINVIEW_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADMINVIEW_DESCRIPTION"
-					class="list_class fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					required="true"
 					button="false"

admin/forms/component_placeholders.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"

admin/forms/component_plugins.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"

admin/forms/component_router.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_ROUTER_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_ROUTER_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -206,7 +207,7 @@
 					name="siteview"
 					label="COM_COMPONENTBUILDER_COMPONENT_ROUTER_SITEVIEW_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_ROUTER_SITEVIEW_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					required="true"
 					button="false"

admin/forms/component_site_views.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"
@@ -139,7 +141,7 @@
 					name="siteview"
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_DESCRIPTION"
-					class="fieldMedium"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					required="true"
 					button="false"

admin/forms/component_updates.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -115,6 +116,7 @@
 			name="clone_me"
 			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_CLONE_ME_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"
@@ -248,7 +250,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_LABEL"
 					size="10"
 					maxlength="50"
-					default="3.*"
+					default="5\.[012]"
 					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_UPDATE_TARGET_VERSION_DESCRIPTION"
 					class="text_area"
 					filter="string"

admin/forms/custom_admin_view.xml

@@ -149,6 +149,7 @@
 			name="main_get"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="true"
@@ -277,6 +278,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SNIPPET_LABEL"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SNIPPET_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="false"
 			button="true"
@@ -607,6 +609,7 @@
 			name="dynamic_get"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="false"
@@ -691,7 +694,8 @@
 					name="icomoon"
 					label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_LABEL"
 					description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_DESCRIPTION"
-					class="list_class fieldMedium icomoon342"
+					class="icomoon342"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->

admin/forms/custom_code.xml

@@ -103,6 +103,7 @@
 			name="component"
 			label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"

admin/forms/dynamic_get.xml

@@ -120,6 +120,7 @@
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="INT"
 			required="true"
@@ -141,6 +142,7 @@
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="INT"
 			required="true"
@@ -307,6 +309,7 @@
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PLUGIN_EVENTS_LABEL"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PLUGIN_EVENTS_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="true">
 			<!-- Option Set. -->
 			<option value="onContentAfterTitle">
@@ -335,6 +338,7 @@
 			name="view_table_main"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="true"

admin/forms/field.xml

@@ -119,7 +119,7 @@
 			name="fieldtype"
 			label="COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL"
 			description="COM_COMPONENTBUILDER_FIELD_FIELDTYPE_DESCRIPTION"
-			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="true"
@@ -132,6 +132,7 @@
 			label="COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL"
 			description="COM_COMPONENTBUILDER_FIELD_DATATYPE_DESCRIPTION"
 			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="">
@@ -181,6 +182,7 @@
 			name="indexes"
 			label="COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL"
 			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="INT"
 			required="true"
@@ -214,6 +216,7 @@
 			label="COM_COMPONENTBUILDER_FIELD_STORE_LABEL"
 			description="COM_COMPONENTBUILDER_FIELD_STORE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="INT"
 			required="true"
@@ -229,8 +232,6 @@
 				COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY</option>
 			<option value="5">
 				COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY</option>
-			<option value="4">
-				COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION</option>
 			<option value="6">
 				COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM</option>
 		</field>
@@ -243,6 +244,21 @@
 			description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
 			class="inputbox"
 		/>
+		<!-- 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" />
+		<!-- On_get_model_field Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="on_get_model_field"
+			label="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_HINT"
+			required="true"
+		/>
 		<!-- On_save_model_field Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -269,19 +285,6 @@
 			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_HINT"
 			required="false"
 		/>
-		<!-- Initiator_on_save_model Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="initiator_on_save_model"
-			label="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_LABEL"
-			rows="5"
-			cols="10"
-			description="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_HINT"
-			required="false"
-		/>
 		<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
 		<!-- Xml Field. Type: Hidden. (joomla) -->
@@ -298,6 +301,7 @@
 			label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL"
 			description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION"
 			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="">
@@ -327,8 +331,22 @@
 			<option value="Other">
 				COM_COMPONENTBUILDER_FIELD_OTHER</option>
 		</field>
-		<!-- Note_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_database_settings_needed" />
+		<!-- Javascript_view_footer Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="javascript_view_footer"
+			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Css_views Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -384,6 +402,7 @@
 			label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL"
 			description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_DESCRIPTION"
 			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="">
 			<!-- Option Set. -->
@@ -414,37 +433,8 @@
 			message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT"
 		/>
-		<!-- On_get_model_field Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="on_get_model_field"
-			label="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_LABEL"
-			rows="5"
-			cols="10"
-			description="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_HINT"
-			required="true"
-		/>
-		<!-- Javascript_view_footer Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="javascript_view_footer"
-			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="javascript"
-			editor="codemirror|none"
-			filter="raw"
-			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" />
+		<!-- Note_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_database_settings_needed" />
 		<!-- Javascript_views_footer Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -527,12 +517,23 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</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" />
-		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
 		<!-- Note_expert_field_save_mode Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_expert_field_save_mode" label="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_DESCRIPTION" heading="h4" class="alert alert-success note_expert_encryption note_expert_field_save_mode" />
+		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
+		<!-- Initiator_on_save_model Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="initiator_on_save_model"
+			label="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_HINT"
+			required="false"
+		/>
 		<!-- Guid Field. Type: Text. (joomla) -->
 		<field
 			type="text"

admin/forms/fieldtype.xml

@@ -120,6 +120,7 @@
 			label="COM_COMPONENTBUILDER_FIELDTYPE_STORE_LABEL"
 			description="COM_COMPONENTBUILDER_FIELDTYPE_STORE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="INT"
 			required="true"
@@ -135,8 +136,6 @@
 				COM_COMPONENTBUILDER_FIELDTYPE_BASIC_ENCRYPTION_LOCALDBKEY</option>
 			<option value="5">
 				COM_COMPONENTBUILDER_FIELDTYPE_MEDIUM_ENCRYPTION_LOCALFILEKEY</option>
-			<option value="4">
-				COM_COMPONENTBUILDER_FIELDTYPE_WHMCSKEY_ENCRYPTION</option>
 			<option value="6">
 				COM_COMPONENTBUILDER_FIELDTYPE_EXPERT_MODE_CUSTOM</option>
 		</field>
@@ -160,6 +159,7 @@
 			name="indexes"
 			label="COM_COMPONENTBUILDER_FIELDTYPE_INDEXES_LABEL"
 			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="INT"
 			required="true"
@@ -195,6 +195,7 @@
 			label="COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_LABEL"
 			description="COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_DESCRIPTION"
 			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="">
 			<!-- Option Set. -->
@@ -234,6 +235,7 @@
 			label="COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_LABEL"
 			description="COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_DESCRIPTION"
 			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="">
@@ -401,6 +403,7 @@
 			label="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_LABEL"
 			description="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_DESCRIPTION"
 			class="btn-group"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="">

admin/forms/filter_repositories.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addruleprefix="VDM\Component\Componentbuilder\Administrator\Rule"
+	addfieldprefix="VDM\Component\Componentbuilder\Administrator\Field"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_REPOSITORIES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_REPOSITORIES"
+			class="js-select-submit-on-change"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JGRID_HEADING_ACCESS"
+			hint="JOPTION_SELECT_ACCESS"
+			multiple="true"
+			class="js-select-submit-on-change"
+			layout="joomla.form.field.list-fancy-select"
+		/>
+		<field
+			type="repositoriesfilterorganisation"
+			name="organisation"
+			label="COM_COMPONENTBUILDER_REPOSITORY_ORGANISATION_LABEL"
+			multiple="false"
+			class="js-select-submit-on-change"
+		/>
+		<field
+			type="repositoriesfilterrepository"
+			name="repository"
+			label="COM_COMPONENTBUILDER_REPOSITORY_REPOSITORY_LABEL"
+			multiple="false"
+			class="js-select-submit-on-change"
+		/>
+		<field
+			type="repositoriesfiltertarget"
+			name="target"
+			label="COM_COMPONENTBUILDER_REPOSITORY_TARGET_LABEL"
+			multiple="false"
+			class="js-select-submit-on-change"
+		/>
+		<field
+			type="repositoriesfilterbase"
+			name="base"
+			label="COM_COMPONENTBUILDER_REPOSITORY_BASE_LABEL"
+			multiple="false"
+			class="js-select-submit-on-change"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			class="js-select-submit-on-change"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.organisation ASC">COM_COMPONENTBUILDER_FILTER_ORGANISATION_ASCENDING</option>
+			<option value="a.organisation DESC">COM_COMPONENTBUILDER_FILTER_ORGANISATION_DESCENDING</option>
+			<option value="a.repository ASC">COM_COMPONENTBUILDER_FILTER_REPOSITORY_ASCENDING</option>
+			<option value="a.repository DESC">COM_COMPONENTBUILDER_FILTER_REPOSITORY_DESCENDING</option>
+			<option value="a.target ASC">COM_COMPONENTBUILDER_FILTER_TARGET_CONTENT_ASCENDING</option>
+			<option value="a.target DESC">COM_COMPONENTBUILDER_FILTER_TARGET_CONTENT_DESCENDING</option>
+			<option value="a.type ASC">COM_COMPONENTBUILDER_FILTER_TYPE_ASCENDING</option>
+			<option value="a.type DESC">COM_COMPONENTBUILDER_FILTER_TYPE_DESCENDING</option>
+			<option value="a.base ASC">COM_COMPONENTBUILDER_FILTER_BASE_URL_ASCENDING</option>
+			<option value="a.base DESC">COM_COMPONENTBUILDER_FILTER_BASE_URL_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIST_LIMIT"
+			default="25"
+			class="js-select-submit-on-change"
+		/>
+	</fields>
+</form>

admin/forms/help_document.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL"
 			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="">
@@ -123,6 +124,7 @@
 			name="groups"
 			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_GROUPS_LABEL"
 			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_GROUPS_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
 			required="true"
 			multiple="true"
 		/>
@@ -172,6 +174,15 @@
 			name="not_required"
 			default="一_一"
 		/>
+		<!-- Alias Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="alias"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			filter="STRING"
+			hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_HINT"
+		/>
 		<!-- Content Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -224,15 +235,6 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_HELP_DOCUMENT_ALL</option>
 		</field>
-		<!-- Alias Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="alias"
-			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_LABEL"
-			description="JFIELD_ALIAS_DESC"
-			filter="STRING"
-			hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_HINT"
-		/>
 	</fieldset>
 
 	<!-- Access Control Fields. -->

admin/forms/joomla_module.xml

@@ -246,6 +246,7 @@
 			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SNIPPET_LABEL"
 			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SNIPPET_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="false"
 			button="true"
@@ -304,6 +305,7 @@
 			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_LABEL"
 			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			button="true"
@@ -359,6 +361,7 @@
 			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SALES_SERVER_LABEL"
 			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SALES_SERVER_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			showon="add_sales_server:1"
@@ -450,6 +453,7 @@
 			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_LABEL"
 			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="0">
@@ -737,7 +741,7 @@
 							name="field"
 							label="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_LABEL"
 							description="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_DESCRIPTION"
-							class="list_class fieldFull"
+							layout="joomla.form.field.list-fancy-select"
 							multiple="false"
 							required="true"
 							button="false"
@@ -748,7 +752,7 @@
 							name="custom_value"
 							label="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_VALUE_LABEL"
 							rows="2"
-							cols="4"
+							cols="30"
 							description="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_VALUE_DESCRIPTION"
 							class="text_area"
 							hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_VALUE_HINT"

admin/forms/joomla_module_files_folders_urls.xml

@@ -103,6 +103,7 @@
 			name="joomla_module"
 			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_JOOMLA_MODULE_LABEL"
 			class="list_class span12"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			readonly="true"

admin/forms/joomla_module_updates.xml

@@ -103,6 +103,7 @@
 			name="joomla_module"
 			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATES_JOOMLA_MODULE_LABEL"
 			class="list_class span12"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			readonly="true"

admin/forms/joomla_plugin.xml

@@ -117,6 +117,7 @@
 			name="class_extends"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"
@@ -128,6 +129,7 @@
 			name="joomla_plugin_group"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"
@@ -196,6 +198,7 @@
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SALES_SERVER_LABEL"
 			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SALES_SERVER_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			showon="add_sales_server:1"
@@ -370,6 +373,7 @@
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_LABEL"
 			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			button="true"
@@ -612,7 +616,7 @@
 							name="field"
 							label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_LABEL"
 							description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_DESCRIPTION"
-							class="list_class fieldFull"
+							layout="joomla.form.field.list-fancy-select"
 							multiple="false"
 							required="true"
 							button="false"
@@ -623,7 +627,7 @@
 							name="custom_value"
 							label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_LABEL"
 							rows="2"
-							cols="4"
+							cols="30"
 							description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_DESCRIPTION"
 							class="text_area"
 							hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_HINT"

admin/forms/joomla_plugin_files_folders_urls.xml

@@ -103,6 +103,7 @@
 			name="joomla_plugin"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_JOOMLA_PLUGIN_LABEL"
 			class="list_class span12"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			readonly="true"

admin/forms/joomla_plugin_group.xml

@@ -119,6 +119,7 @@
 			name="class_extends"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_LABEL"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"

admin/forms/joomla_plugin_updates.xml

@@ -103,6 +103,7 @@
 			name="joomla_plugin"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_JOOMLA_PLUGIN_LABEL"
 			class="list_class span12"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			readonly="true"

admin/forms/joomla_power.xml

@@ -116,7 +116,7 @@
 			type="subform"
 			name="settings"
 			label="COM_COMPONENTBUILDER_JOOMLA_POWER_SETTINGS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
+			layout="joomla.form.field.subform.repeatable"
 			multiple="true"
 			buttons="add,remove,move"
 			icon="list"

admin/forms/layout.xml

@@ -135,6 +135,7 @@
 			name="dynamic_get"
 			label="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_LABEL"
 			description="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"
@@ -147,6 +148,7 @@
 			label="COM_COMPONENTBUILDER_LAYOUT_SNIPPET_LABEL"
 			description="COM_COMPONENTBUILDER_LAYOUT_SNIPPET_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="false"
 			button="true"

admin/forms/library.xml

@@ -135,6 +135,7 @@
 			label="COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL"
 			description="COM_COMPONENTBUILDER_LIBRARY_HOW_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="1"
 			required="true"
@@ -246,7 +247,7 @@
 					name="target_behavior"
 					label="COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_LABEL"
 					description="COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_DESCRIPTION"
-					class="list_class fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					filter="INT"
 					required="true"
@@ -263,7 +264,7 @@
 					name="target_relation"
 					label="COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_LABEL"
 					description="COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_DESCRIPTION"
-					class="list_class fieldLarge"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					filter="INT"
 					required="true"

admin/forms/library_config.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_LIBRARY_LABEL"
 			description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_LIBRARY_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"
@@ -126,7 +127,7 @@
 					name="field"
 					label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_DESCRIPTION"
-					class="list_class fieldFull"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					required="true"
 					button="false"
@@ -137,7 +138,7 @@
 					name="custom_value"
 					label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CUSTOM_VALUE_LABEL"
 					rows="2"
-					cols="4"
+					cols="30"
 					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CUSTOM_VALUE_DESCRIPTION"
 					class="text_area"
 					hint="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CUSTOM_VALUE_HINT"

admin/forms/library_files_folders_urls.xml

@@ -104,6 +104,7 @@
 			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LIBRARY_LABEL"
 			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LIBRARY_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"

admin/forms/power.xml

@@ -133,6 +133,7 @@
 			label="COM_COMPONENTBUILDER_POWER_TYPE_LABEL"
 			description="COM_COMPONENTBUILDER_POWER_TYPE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="class">
@@ -163,38 +164,6 @@
 			message="COM_COMPONENTBUILDER_POWER_POWER_VERSION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_POWER_POWER_VERSION_HINT"
 		/>
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
-		<field
-			type="hidden"
-			name="not_required"
-			default="一_一"
-		/>
-		<!-- Method_selection Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="method_selection"
-			label="COM_COMPONENTBUILDER_POWER_METHOD_SELECTION_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			buttons="add,remove,move"
-			description="COM_COMPONENTBUILDER_POWER_METHOD_SELECTION_DESCRIPTION"
-			icon="list"
-			max="150"
-			min="0">
-			<form hidden="true" name="list_method_selection_modal" repeat="true">
-				<!-- Method Field. Type: Powersclassmethods. (custom) -->
-				<field
-					type="powersclassmethods"
-					name="method"
-					label="COM_COMPONENTBUILDER_POWER_METHOD_LABEL"
-					class="list_class span12 method_selection_list"
-					multiple="false"
-					default="0"
-					onchange="getClassCode(this, 'method');"
-					button="false"
-				/>
-			</form>
-		</field>
 		<!-- Load_selection Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -222,19 +191,6 @@
 		</field>
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_POWER_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_POWER_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
-		<!-- Licensing_template Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="licensing_template"
-			label="COM_COMPONENTBUILDER_POWER_LICENSING_TEMPLATE_LABEL"
-			rows="10"
-			cols="10"
-			class="text_area span12"
-			filter="RAW"
-			hint="COM_COMPONENTBUILDER_POWER_LICENSING_TEMPLATE_HINT"
-			validate="code"
-			showon="add_licensing_template:2"
-		/>
 		<!-- Description Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -247,8 +203,8 @@
 			filter="HTML"
 			hint="COM_COMPONENTBUILDER_POWER_DESCRIPTION_HINT"
 		/>
-		<!-- Note_approved_paths Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_approved_paths" label="COM_COMPONENTBUILDER_POWER_NOTE_APPROVED_PATHS_LABEL" description="COM_COMPONENTBUILDER_POWER_NOTE_APPROVED_PATHS_DESCRIPTION" heading="h4" class="alert alert-info note_approved_paths" showon="approved:1" />
+		<!-- Load_powers_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="load_powers_note" label="COM_COMPONENTBUILDER_POWER_LOAD_POWERS_NOTE_LABEL" description="COM_COMPONENTBUILDER_POWER_LOAD_POWERS_NOTE_DESCRIPTION" heading="h4" class="alert alert-info load_powers_note" />
 		<!-- Composer Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -306,18 +262,18 @@
 				</field>
 			</form>
 		</field>
-		<!-- Extends Field. Type: Classpowers. (custom) -->
+		<!-- Licensing_template Field. Type: Textarea. (joomla) -->
 		<field
-			type="classpowers"
-			name="extends"
-			label="COM_COMPONENTBUILDER_POWER_EXTENDS_LABEL"
-			description="COM_COMPONENTBUILDER_POWER_EXTENDS_DESCRIPTION"
-			class="list_class span12"
-			layout="joomla.form.field.list-fancy-select"
-			multiple="false"
-			default="0"
-			showon="type:class[OR]type:abstract class[OR]type:final class"
-			button="true"
+			type="textarea"
+			name="licensing_template"
+			label="COM_COMPONENTBUILDER_POWER_LICENSING_TEMPLATE_LABEL"
+			rows="10"
+			cols="10"
+			class="text_area span12"
+			filter="RAW"
+			hint="COM_COMPONENTBUILDER_POWER_LICENSING_TEMPLATE_HINT"
+			validate="code"
+			showon="add_licensing_template:2"
 		/>
 		<!-- Approved Field. Type: Radio. (joomla) -->
 		<field
@@ -334,32 +290,20 @@
 			<option value="1">
 				COM_COMPONENTBUILDER_POWER_APPROVED</option>
 		</field>
-		<!-- Property_selection Field. Type: Subform. (joomla) -->
+		<!-- Extendsinterfaces_custom Field. Type: Text. (joomla) -->
 		<field
-			type="subform"
-			name="property_selection"
-			label="COM_COMPONENTBUILDER_POWER_PROPERTY_SELECTION_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			buttons="add,remove,move"
-			description="COM_COMPONENTBUILDER_POWER_PROPERTY_SELECTION_DESCRIPTION"
-			icon="list"
-			max="150"
-			min="0">
-			<form hidden="true" name="list_property_selection_modal" repeat="true">
-				<!-- Property Field. Type: Powersclassproperties. (custom) -->
-				<field
-					type="powersclassproperties"
-					name="property"
-					label="COM_COMPONENTBUILDER_POWER_PROPERTY_LABEL"
-					class="list_class span12 property_selection_list"
-					multiple="false"
-					default="0"
-					onchange="getClassCode(this, 'property');"
-					button="false"
-				/>
-			</form>
-		</field>
+			type="text"
+			name="extendsinterfaces_custom"
+			label="COM_COMPONENTBUILDER_POWER_EXTENDSINTERFACES_CUSTOM_LABEL"
+			size="50"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_POWER_EXTENDSINTERFACES_CUSTOM_DESCRIPTION"
+			class="text_area span12"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_POWER_EXTENDSINTERFACES_CUSTOM_MESSAGE"
+			autocomplete="on"
+			showon="extendsinterfaces:-1[AND]type:interface"
+		/>
 		<!-- Add_head Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -374,6 +318,19 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_POWER_NO</option>
 		</field>
+		<!-- Extends Field. Type: Classpowers. (custom) -->
+		<field
+			type="classpowers"
+			name="extends"
+			label="COM_COMPONENTBUILDER_POWER_EXTENDS_LABEL"
+			description="COM_COMPONENTBUILDER_POWER_EXTENDS_DESCRIPTION"
+			class="list_class span12"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			default="0"
+			showon="type:class[OR]type:abstract class[OR]type:final class"
+			button="true"
+		/>
 		<!-- Extends_custom Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -415,8 +372,93 @@
 			showon="type!:interface[AND]type!:trait"
 			button="true"
 		/>
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="一_一"
+		/>
+		<!-- Note_approved_paths Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_approved_paths" label="COM_COMPONENTBUILDER_POWER_NOTE_APPROVED_PATHS_LABEL" description="COM_COMPONENTBUILDER_POWER_NOTE_APPROVED_PATHS_DESCRIPTION" heading="h4" class="alert alert-info note_approved_paths" showon="approved:1" />
+		<!-- Property_selection Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="property_selection"
+			label="COM_COMPONENTBUILDER_POWER_PROPERTY_SELECTION_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			buttons="add,remove,move"
+			description="COM_COMPONENTBUILDER_POWER_PROPERTY_SELECTION_DESCRIPTION"
+			icon="list"
+			max="150"
+			min="0">
+			<form hidden="true" name="list_property_selection_modal" repeat="true">
+				<!-- Property Field. Type: Powersclassproperties. (custom) -->
+				<field
+					type="powersclassproperties"
+					name="property"
+					label="COM_COMPONENTBUILDER_POWER_PROPERTY_LABEL"
+					class="list_class span12 property_selection_list"
+					multiple="false"
+					default="0"
+					onchange="getClassCode(this, 'property');"
+					button="false"
+				/>
+			</form>
+		</field>
+		<!-- Extendsinterfaces Field. Type: Interfacepowers. (custom) -->
+		<field
+			type="interfacepowers"
+			name="extendsinterfaces"
+			label="COM_COMPONENTBUILDER_POWER_EXTENDSINTERFACES_LABEL"
+			description="COM_COMPONENTBUILDER_POWER_EXTENDSINTERFACES_DESCRIPTION"
+			class="list_class span12"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="true"
+			default="0"
+			showon="type:interface"
+			button="true"
+		/>
+		<!-- Method_selection Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="method_selection"
+			label="COM_COMPONENTBUILDER_POWER_METHOD_SELECTION_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			buttons="add,remove,move"
+			description="COM_COMPONENTBUILDER_POWER_METHOD_SELECTION_DESCRIPTION"
+			icon="list"
+			max="150"
+			min="0">
+			<form hidden="true" name="list_method_selection_modal" repeat="true">
+				<!-- Method Field. Type: Powersclassmethods. (custom) -->
+				<field
+					type="powersclassmethods"
+					name="method"
+					label="COM_COMPONENTBUILDER_POWER_METHOD_LABEL"
+					class="list_class span12 method_selection_list"
+					multiple="false"
+					default="0"
+					onchange="getClassCode(this, 'method');"
+					button="false"
+				/>
+			</form>
+		</field>
 		<!-- Namespace_details Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="namespace_details" label="COM_COMPONENTBUILDER_POWER_NAMESPACE_DETAILS_LABEL" description="COM_COMPONENTBUILDER_POWER_NAMESPACE_DETAILS_DESCRIPTION" heading="h4" class="alert alert-success namespace_details" />
+		<!-- Approved_paths Field. Type: Superpowerpaths. (custom) -->
+		<field
+			type="superpowerpaths"
+			name="approved_paths"
+			label="COM_COMPONENTBUILDER_POWER_APPROVED_PATHS_LABEL"
+			description="COM_COMPONENTBUILDER_POWER_APPROVED_PATHS_DESCRIPTION"
+			required="false"
+			showon="approved:1">
+			<!-- Option Set. -->
+			<option value="joomla/super-powers">
+				COM_COMPONENTBUILDER_POWER_JOOMLASUPERPOWERS</option>
+		</field>
 		<!-- Head Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -434,18 +476,8 @@
 			required="false"
 			validate="code"
 		/>
-		<!-- Approved_paths Field. Type: Superpowerpaths. (custom) -->
-		<field
-			type="superpowerpaths"
-			name="approved_paths"
-			label="COM_COMPONENTBUILDER_POWER_APPROVED_PATHS_LABEL"
-			description="COM_COMPONENTBUILDER_POWER_APPROVED_PATHS_DESCRIPTION"
-			required="false"
-			showon="approved:1">
-			<!-- Option Set. -->
-			<option value="joomla/super-powers">
-				COM_COMPONENTBUILDER_POWER_JOOMLASUPERPOWERS</option>
-		</field>
+		<!-- Autoload_composer_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="autoload_composer_note" label="COM_COMPONENTBUILDER_POWER_AUTOLOAD_COMPOSER_NOTE_LABEL" description="COM_COMPONENTBUILDER_POWER_AUTOLOAD_COMPOSER_NOTE_DESCRIPTION" heading="h4" class="alert alert-info autoload_composer_note" />
 		<!-- Use_selection Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -483,8 +515,21 @@
 				/>
 			</form>
 		</field>
-		<!-- Autoload_composer_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="autoload_composer_note" label="COM_COMPONENTBUILDER_POWER_AUTOLOAD_COMPOSER_NOTE_LABEL" description="COM_COMPONENTBUILDER_POWER_AUTOLOAD_COMPOSER_NOTE_DESCRIPTION" heading="h4" class="alert alert-info autoload_composer_note" />
+		<!-- Add_licensing_template Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_licensing_template"
+			label="COM_COMPONENTBUILDER_POWER_ADD_LICENSING_TEMPLATE_LABEL"
+			description="COM_COMPONENTBUILDER_POWER_ADD_LICENSING_TEMPLATE_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_POWER_USE_GLOBAL</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_POWER_OVERRIDE</option>
+		</field>
 		<!-- Main_class_code Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -501,23 +546,6 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Add_licensing_template Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_licensing_template"
-			label="COM_COMPONENTBUILDER_POWER_ADD_LICENSING_TEMPLATE_LABEL"
-			description="COM_COMPONENTBUILDER_POWER_ADD_LICENSING_TEMPLATE_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_POWER_USE_GLOBAL</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_POWER_OVERRIDE</option>
-		</field>
-		<!-- Load_powers_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="load_powers_note" label="COM_COMPONENTBUILDER_POWER_LOAD_POWERS_NOTE_LABEL" description="COM_COMPONENTBUILDER_POWER_LOAD_POWERS_NOTE_DESCRIPTION" heading="h4" class="alert alert-info load_powers_note" />
 		<!-- Guid Field. Type: Text. (joomla) -->
 		<field
 			type="text"

admin/forms/repository.xml

@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addruleprefix="VDM\Component\Componentbuilder\Administrator\Rule"
+	addfieldprefix="VDM\Component\Componentbuilder\Administrator\Field"
+>
+	<config>
+		<inlinehelp button="show"/>
+	</config>
+	<fieldset name="details">
+		<!-- Default Fields. -->
+		<!-- Id Field. Type: Text (joomla) -->
+		<field
+			name="id"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
+			readonly="true"
+		/>
+		<!-- Date Created Field. Type: Calendar (joomla) -->
+		<field
+			name="created"
+			type="calendar"
+			label="COM_COMPONENTBUILDER_REPOSITORY_CREATED_DATE_LABEL"
+			description="COM_COMPONENTBUILDER_REPOSITORY_CREATED_DATE_DESC"
+			size="22"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+		/>
+		<!-- User Created Field. Type: User (joomla) -->
+		<field
+			name="created_by"
+			type="user"
+			label="COM_COMPONENTBUILDER_REPOSITORY_CREATED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_REPOSITORY_CREATED_BY_DESC"
+		/>
+		<!-- Published Field. Type: List (joomla) -->
+		<field name="published" type="list" label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+			filter="intval" size="1" default="1" >
+			<option value="1">
+				JPUBLISHED</option>
+			<option value="0">
+				JUNPUBLISHED</option>
+			<option value="2">
+				JARCHIVED</option>
+			<option value="-2">
+				JTRASHED</option>
+		</field>
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
+		<field name="modified" type="calendar" class="readonly"
+			label="COM_COMPONENTBUILDER_REPOSITORY_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_REPOSITORY_MODIFIED_DATE_DESC"
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
+		<!-- User Modified Field. Type: User (joomla) -->
+		<field name="modified_by" type="user"
+			label="COM_COMPONENTBUILDER_REPOSITORY_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_REPOSITORY_MODIFIED_BY_DESC"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+		<!-- Access Field. Type: Accesslevel (joomla) -->
+		<field name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			default="1"
+			required="false"
+		/>
+		<!-- Ordering Field. Type: Numbers (joomla) -->
+		<field
+			name="ordering"
+			type="number"
+			class="inputbox validate-ordering"
+			label="COM_COMPONENTBUILDER_REPOSITORY_ORDERING_LABEL"
+			description=""
+			default="0"
+			size="6"
+			required="false"
+		/>
+		<!-- Version Field. Type: Text (joomla) -->
+		<field
+			name="version"
+			type="text"
+			class="readonly"
+			label="COM_COMPONENTBUILDER_REPOSITORY_VERSION_LABEL"
+			description="COM_COMPONENTBUILDER_REPOSITORY_VERSION_DESC"
+			size="6"
+			default="1"
+			readonly="true"
+			filter="unset"
+		/>
+		<!-- Was added due to Permissions JS needing a Title field -->
+		<!-- Let us know at gh-629 should this change -->
+		<!-- https://github.com/vdm-io/Joomla-Component-Builder/issues/629#issuecomment-750117235 -->
+		<field
+			name="title"
+			type="hidden"
+			default="componentbuilder repository"
+		/>
+		<!-- Dynamic Fields. -->
+		<!-- System_name Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="system_name"
+			label="COM_COMPONENTBUILDER_REPOSITORY_SYSTEM_NAME_LABEL"
+			size="10"
+			maxlength="50"
+			default=""
+			description="COM_COMPONENTBUILDER_REPOSITORY_SYSTEM_NAME_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_REPOSITORY_SYSTEM_NAME_MESSAGE"
+			hint="COM_COMPONENTBUILDER_REPOSITORY_SYSTEM_NAME_HINT"
+		/>
+		<!-- Organisation Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="organisation"
+			label="COM_COMPONENTBUILDER_REPOSITORY_ORGANISATION_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_REPOSITORY_ORGANISATION_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_REPOSITORY_ORGANISATION_MESSAGE"
+			hint="COM_COMPONENTBUILDER_REPOSITORY_ORGANISATION_HINT"
+		/>
+		<!-- Repository Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="repository"
+			label="COM_COMPONENTBUILDER_REPOSITORY_REPOSITORY_LABEL"
+			size="70"
+			maxlength="150"
+			class="text_area"
+			readonly="false"
+			required="true"
+			filter="CMD"
+			hint="COM_COMPONENTBUILDER_REPOSITORY_REPOSITORY_HINT"
+			autocomplete="on"
+		/>
+		<!-- Target Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="target"
+			label="COM_COMPONENTBUILDER_REPOSITORY_TARGET_LABEL"
+			description="COM_COMPONENTBUILDER_REPOSITORY_TARGET_DESCRIPTION"
+			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			filter="INT"
+			required="true"
+			validate="int">
+			<!-- Option Set. -->
+			<option value="">
+				COM_COMPONENTBUILDER_REPOSITORY_SELECT_AN_OPTION</option>
+			<option value="1">
+				COM_COMPONENTBUILDER_REPOSITORY_SUPER_POWER</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_REPOSITORY_JOOMLA_POWER</option>
+		</field>
+		<!-- Type Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="type"
+			label="COM_COMPONENTBUILDER_REPOSITORY_TYPE_LABEL"
+			description="COM_COMPONENTBUILDER_REPOSITORY_TYPE_DESCRIPTION"
+			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			filter="INT"
+			required="true"
+			validate="int">
+			<!-- Option Set. -->
+			<option value="">
+				COM_COMPONENTBUILDER_REPOSITORY_SELECT_AN_OPTION</option>
+			<option value="1">
+				COM_COMPONENTBUILDER_REPOSITORY_GITEA</option>
+		</field>
+		<!-- Base Field. Type: Url. (joomla) -->
+		<field
+			type="url"
+			name="base"
+			label="COM_COMPONENTBUILDER_REPOSITORY_BASE_LABEL"
+			size="70"
+			maxlength="150"
+			default="https://git.vdm.dev"
+			description="COM_COMPONENTBUILDER_REPOSITORY_BASE_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="url"
+			validated="url"
+			scheme="http,https"
+			message="COM_COMPONENTBUILDER_REPOSITORY_BASE_MESSAGE"
+			hint="COM_COMPONENTBUILDER_REPOSITORY_BASE_HINT"
+			autocomplete="on"
+			showon="type:1"
+		/>
+		<!-- Guid Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_REPOSITORY_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_REPOSITORY_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_REPOSITORY_GUID_HINT"
+		/>
+		<!-- Access_repo Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="access_repo"
+			label="COM_COMPONENTBUILDER_REPOSITORY_ACCESS_REPO_LABEL"
+			description="COM_COMPONENTBUILDER_REPOSITORY_ACCESS_REPO_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="">
+			<!-- Option Set. -->
+			<option value="">
+				COM_COMPONENTBUILDER_REPOSITORY_GLOBAL</option>
+			<option value="1">
+				COM_COMPONENTBUILDER_REPOSITORY_OVERRIDE</option>
+		</field>
+		<!-- Write_branch Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="write_branch"
+			label="COM_COMPONENTBUILDER_REPOSITORY_WRITE_BRANCH_LABEL"
+			size="128"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_REPOSITORY_WRITE_BRANCH_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_REPOSITORY_WRITE_BRANCH_MESSAGE"
+			hint="COM_COMPONENTBUILDER_REPOSITORY_WRITE_BRANCH_HINT"
+		/>
+		<!-- Read_branch Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="read_branch"
+			label="COM_COMPONENTBUILDER_REPOSITORY_READ_BRANCH_LABEL"
+			size="128"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_REPOSITORY_READ_BRANCH_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_REPOSITORY_READ_BRANCH_MESSAGE"
+			hint="COM_COMPONENTBUILDER_REPOSITORY_READ_BRANCH_HINT"
+		/>
+		<!-- Token Field. Type: Password. (joomla) -->
+		<field
+			type="password"
+			name="token"
+			label="COM_COMPONENTBUILDER_REPOSITORY_TOKEN_LABEL"
+			size="128"
+			description="COM_COMPONENTBUILDER_REPOSITORY_TOKEN_DESCRIPTION"
+			message="Error! Please add token here."
+			class="text_area"
+			filter="STRING"
+			hint="COM_COMPONENTBUILDER_REPOSITORY_TOKEN_HINT"
+			autocomplete="off"
+			showon="type:1[AND]access_repo:1"
+		/>
+		<!-- Username Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="username"
+			label="COM_COMPONENTBUILDER_REPOSITORY_USERNAME_LABEL"
+			size="128"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_REPOSITORY_USERNAME_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_REPOSITORY_USERNAME_MESSAGE"
+			hint="COM_COMPONENTBUILDER_REPOSITORY_USERNAME_HINT"
+			autocomplete="on"
+			showon="type:1[AND]access_repo:1"
+		/>
+	</fieldset>
+
+	<!-- Access Control Fields. -->
+	<fieldset name="accesscontrol">
+		<!-- Asset Id Field. Type: Hidden (joomla) -->
+		<field
+			name="asset_id"
+			type="hidden"
+			filter="unset"
+		/>
+		<!-- Rules Field. Type: Rules (joomla) -->
+		<field
+			name="rules"
+			type="rules"
+			label="Permissions in relation to this repository"
+			translate_label="false"
+			filter="rules"
+			validate="rules"
+			class="inputbox"
+			component="com_componentbuilder"
+			section="repository"
+		/>
+	</fieldset>
+</form>

admin/forms/server.xml

@@ -120,6 +120,7 @@
 			label="COM_COMPONENTBUILDER_SERVER_PROTOCOL_LABEL"
 			description="COM_COMPONENTBUILDER_SERVER_PROTOCOL_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="INT"
 			required="true"
@@ -219,6 +220,7 @@
 			label="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_LABEL"
 			description="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="INT"
 			required="true"

admin/forms/site_view.xml

@@ -149,6 +149,7 @@
 			name="main_get"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="true"
@@ -292,6 +293,7 @@
 			label="COM_COMPONENTBUILDER_SITE_VIEW_SNIPPET_LABEL"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_SNIPPET_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="false"
 			button="true"
@@ -445,6 +447,7 @@
 			name="dynamic_get"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_LABEL"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="false"
@@ -642,6 +645,7 @@
 			label="COM_COMPONENTBUILDER_SITE_VIEW_BUTTON_POSITION_LABEL"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_BUTTON_POSITION_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			filter="INT"
 			required="true"
@@ -710,7 +714,8 @@
 					name="icomoon"
 					label="COM_COMPONENTBUILDER_SITE_VIEW_ICOMOON_LABEL"
 					description="COM_COMPONENTBUILDER_SITE_VIEW_ICOMOON_DESCRIPTION"
-					class="list_class fieldMedium icomoon342"
+					class="icomoon342"
+					layout="joomla.form.field.list-fancy-select"
 					multiple="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->

admin/forms/snippet.xml

@@ -136,6 +136,7 @@
 			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_LABEL"
 			description="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"
@@ -161,6 +162,7 @@
 			label="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_LABEL"
 			description="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"

admin/forms/template.xml

@@ -135,6 +135,7 @@
 			name="dynamic_get"
 			label="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_GET_LABEL"
 			description="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_GET_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="false"
@@ -203,6 +204,7 @@
 			label="COM_COMPONENTBUILDER_TEMPLATE_SNIPPET_LABEL"
 			description="COM_COMPONENTBUILDER_TEMPLATE_SNIPPET_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="false"
 			button="true"

admin/language/en-GB/en-GB.com_componentbuilder.sys.ini

@@ -103,8 +103,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU="Admin Views Submenu"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of admin view"
-COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS="Admin View Run Expansion Button Access"
-COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_CLASS_EXTENDINGS_ACCESS="Class Extendings Access"
 COM_COMPONENTBUILDER_CLASS_EXTENDINGS_ACCESS_DESC="Allows the users in this group to access access class extendings"
 COM_COMPONENTBUILDER_CLASS_EXTENDINGS_BATCH_USE="Class Extendings Batch Use"
@@ -506,8 +504,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION="Dynamic Gets Edit Version"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU="Dynamic Gets Submenu"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC="Allows the users in this group to submenu of dynamic get"
-COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS="Dynamic Get Run Expansion Button Access"
-COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC="Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
@@ -556,8 +552,6 @@ COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION="Fieldtypes Edit Version"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU="Fieldtypes Submenu"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to submenu of fieldtype"
-COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS="Field Run Expansion Button Access"
-COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS="Get Snippets Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC="Allows the users in this group to access get snippets."
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
@@ -684,8 +678,6 @@ COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_EDIT_VERSION="Joomla Modules Updates
 COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version joomla modules updates"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_GET_SNIPPETS_BUTTON_ACCESS="Joomla Module Get Snippets Button Access"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
-COM_COMPONENTBUILDER_JOOMLA_MODULE_RUN_EXPANSION_BUTTON_ACCESS="Joomla Module Run Expansion Button Access"
-COM_COMPONENTBUILDER_JOOMLA_MODULE_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_ACCESS="Joomla Plugins Access"
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_ACCESS_DESC="Allows the users in this group to access access joomla plugins"
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_BATCH_USE="Joomla Plugins Batch Use"
@@ -762,8 +754,6 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_METHODS_BUTTON_ACCESS="Joomla Plugin Methods
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_METHODS_BUTTON_ACCESS_DESC="Allows the users in this group to access the methods button."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PROPERTIES_BUTTON_ACCESS="Joomla Plugin Properties Button Access"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PROPERTIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the properties button."
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_RUN_EXPANSION_BUTTON_ACCESS="Joomla Plugin Run Expansion Button Access"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS="Joomla Powers Access"
 COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS_DESC="Allows the users in this group to access access joomla powers"
 COM_COMPONENTBUILDER_JOOMLA_POWERS_BATCH_USE="Joomla Powers Batch Use"
@@ -788,6 +778,8 @@ COM_COMPONENTBUILDER_JOOMLA_POWERS_SUBMENU="Joomla Powers Submenu"
 COM_COMPONENTBUILDER_JOOMLA_POWERS_SUBMENU_DESC="Allows the users in this group to submenu of joomla power"
 COM_COMPONENTBUILDER_JOOMLA_POWER_INIT_BUTTON_ACCESS="Joomla Power Init Button Access"
 COM_COMPONENTBUILDER_JOOMLA_POWER_INIT_BUTTON_ACCESS_DESC="Allows the users in this group to access the init button."
+COM_COMPONENTBUILDER_JOOMLA_POWER_PUSH_BUTTON_ACCESS="Joomla Power Push Button Access"
+COM_COMPONENTBUILDER_JOOMLA_POWER_PUSH_BUTTON_ACCESS_DESC="Allows the users in this group to access the push button."
 COM_COMPONENTBUILDER_JOOMLA_POWER_RESET_BUTTON_ACCESS="Joomla Power Reset Button Access"
 COM_COMPONENTBUILDER_JOOMLA_POWER_RESET_BUTTON_ACCESS_DESC="Allows the users in this group to access the reset button."
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS="Languages Access"
@@ -936,6 +928,7 @@ COM_COMPONENTBUILDER_MENU_LAYOUTS="Layouts"
 COM_COMPONENTBUILDER_MENU_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_MENU_PLACEHOLDERS="Placeholders"
 COM_COMPONENTBUILDER_MENU_POWERS="Powers"
+COM_COMPONENTBUILDER_MENU_REPOSITORIES="Repositories"
 COM_COMPONENTBUILDER_MENU_SEARCH="Search"
 COM_COMPONENTBUILDER_MENU_SERVERS="Servers"
 COM_COMPONENTBUILDER_MENU_SITE_VIEWS="Site Views"
@@ -990,8 +983,30 @@ COM_COMPONENTBUILDER_POWER_INIT_BUTTON_ACCESS="Power Init Button Access"
 COM_COMPONENTBUILDER_POWER_INIT_BUTTON_ACCESS_DESC="Allows the users in this group to access the init button."
 COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS="Power Reset Button Access"
 COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS_DESC="Allows the users in this group to access the reset button."
-COM_COMPONENTBUILDER_POWER_RUN_EXPANSION_BUTTON_ACCESS="Power Run Expansion Button Access"
-COM_COMPONENTBUILDER_POWER_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_REPOSITORIES_ACCESS="Repositories Access"
+COM_COMPONENTBUILDER_REPOSITORIES_ACCESS_DESC="Allows the users in this group to access access repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE="Repositories Batch Use"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_CREATE="Repositories Create"
+COM_COMPONENTBUILDER_REPOSITORIES_CREATE_DESC="Allows the users in this group to create create repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST="Repositories Dashboard List"
+COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of repository"
+COM_COMPONENTBUILDER_REPOSITORIES_DELETE="Repositories Delete"
+COM_COMPONENTBUILDER_REPOSITORIES_DELETE_DESC="Allows the users in this group to delete delete repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT="Repositories Edit"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY="Repositories Edit Created By"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE="Repositories Edit Created Date"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_DESC="Allows the users in this group to edit the repository"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN="Repositories Edit Own"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own repositories created by them"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE="Repositories Edit State"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the repository"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION="Repositories Edit Version"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU="Repositories Submenu"
+COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU_DESC="Allows the users in this group to submenu of repository"
 COM_COMPONENTBUILDER_SEARCH_ACCESS="Search Access"
 COM_COMPONENTBUILDER_SEARCH_ACCESS_DESC="Allows the users in this group to access search."
 COM_COMPONENTBUILDER_SEARCH_COMPILER_BUTTON_ACCESS="Search Compiler Button Access"
@@ -1131,6 +1146,4 @@ COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_STATE_DESC="Allows the users in this
 COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_VERSION="Validation Rules Edit Version"
 COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU="Validation Rules Submenu"
-COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC="Allows the users in this group to submenu of validation rule"
-COM_COMPONENTBUILDER_VALIDATION_RULE_RUN_EXPANSION_BUTTON_ACCESS="Validation Rule Run Expansion Button Access"
-COM_COMPONENTBUILDER_VALIDATION_RULE_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC="Allows the users in this group to submenu of validation rule"

admin/layouts/field/database_right.php

@@ -31,7 +31,6 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'store',
 	'medium_encryption_note',
 	'basic_encryption_note',
-	'note_whmcs_encryption',
 	'note_expert_field_save_mode',
 	'initiator_on_save_model',
 	'initiator_on_get_model',

admin/layouts/joomla_component/details_right.php

@@ -30,12 +30,6 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'author',
 	'email',
 	'website',
-	'add_license',
-	'license_type',
-	'note_whmcs_lisencing_note',
-	'whmcs_key',
-	'whmcs_url',
-	'whmcs_buy_link',
 	'license',
 	'bom',
 	'image',

admin/layouts/joomla_power/joomla_power_fullwidth.php

@@ -26,8 +26,8 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
-	'description',
-	'settings'
+	'settings',
+	'description'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: [];

admin/layouts/power/code_left.php

@@ -30,6 +30,8 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'description',
 	'extends',
 	'extends_custom',
+	'extendsinterfaces',
+	'extendsinterfaces_custom',
 	'implements',
 	'implements_custom',
 	'namespace',

admin/layouts/repeatablejcbjfive.php

@@ -70,12 +70,12 @@ $sublayout = 'sectionjcbjfive';
 		<?php endif; ?>
 	<?php
 	foreach ($forms as $k => $form) :
-		echo $this->sublayout($sublayout, ['form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons]);
+		echo LayoutHelper::render($sublayout, ['form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons]);
 	endforeach;
 	?>
 	<?php if ($multiple) : ?>
 	<template class="subform-repeatable-template-section hidden"><?php
-		echo trim($this->sublayout($sublayout, ['form' => $tmpl, 'basegroup' => $fieldname, 'group' => $fieldname . 'X', 'buttons' => $buttons]));
+		echo trim(LayoutHelper::render($sublayout, ['form' => $tmpl, 'basegroup' => $fieldname, 'group' => $fieldname . 'X', 'buttons' => $buttons]));
 	?></template>
 	<?php endif; ?>
 	</joomla-field-subform>

admin/layouts/repository/details_above.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 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('_JEXEC') or die;
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: [
+	'system_name',
+	'target',
+	'access_repo'
+];
+
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<div class="row title-alias form-vertical mb-3">
+	<?php foreach($fields as $field): ?>
+		<?php if (in_array($field, $hiddenFields)) : ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>

admin/layouts/repository/details_left.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 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('_JEXEC') or die;
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'type',
+	'base',
+	'username',
+	'token'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/repository/details_right.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 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('_JEXEC') or die;
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'organisation',
+	'repository',
+	'read_branch',
+	'write_branch'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/repository/publishing.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 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('_JEXEC') or die;
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
+	'title',
+	'created',
+	'created_by',
+	'modified',
+	'modified_by'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/repository/publlshing.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 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('_JEXEC') or die;
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'published',
+	'ordering',
+	'access',
+	'version',
+	'hits',
+	'id'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>