Release of v4.1.2-alpha2

Add native module builder for Joomla 4/5. Refactor dynamic get methods into dedicated classes. Move Joomla DB handling into compiler injector flow. Fix auto-check(in) method for Joomla 4/5 compatibility.

CHANGELOG.md

@@ -1,173 +1,13 @@
-# v5.1.1
+# v4.1.2-alpha2
 
-- Move all banners to GitHub.
-- Adds library phpspreadsheet to JCB.
-- Adds import item example to demo component.
-- Updates the Superpower class with the GetRemote class in the plugin.
-- Ensures the super power autoloader triggers the correct repositories.
-- Adds the ModalSelect fieldtype to Joomla Component Builder - J5
-- Adds the Data Import Function to the Demo Component.
-- Adds new country related tables and fields to the Demo Component.
-- Resolves the Database Updating issue in the compiler. #1212,#1209
-- Adds the Component Commands Plugin to the CLI for Import of spreadsheet data-sets.
-- Add edit and create options to the ModalSelect Field (in Joomla 5)
-- Add all needed Powers to the release package, to speed-up the build of the demo component.
-- Refactor initialization flow to accommodate future scalability and integration with all designated areas.
-- Refactor the Creator Builders class.
-- Refactor the FieldString and FieldXML classes.
-- Add JCB new package engine.
-- Enhance operator support in dynamic get system. Relates to issue #1226.
-- Fixes issue with loading the Component Builder Wiki.
-- Adds advanced version update notice to the Component Builder Dashboard.
-- Completely refactors the class that builds the Component Dashboard. #1134
-- Fix the FieldXML interface mismatch. #1228
-- Adds Initialize, Reset, and Push functionality to the Repository entities.
-- Completely refactors the SQL tweaks and SQL dump classes.
-- Fix bug in the filter of Languages by linked entities. #1230
-- Adds option to export Language Translations.
+- Add native module builder for Joomla 4/5
+- Refactor dynamic get methods into dedicated classes
+- Move Joomla DB handling into compiler injector flow
+- Fix auto-check(in) method for Joomla 4/5 compatibility
 
-# v5.1.0
+# v4.1.2-alpha
 
-- Add [AllowDynamicProperties] in the base view class for J5
-- Move the _prepareDocument  above the display call in the base view class
-- Remove all backward compatibility issues, so JCB will not need the [Backward Compatibility] plugin to run.
-- Added new import powers for custom import of spreadsheets.
-- Move the setDocument and _prepareDocument above the display in the site view and custom admin view.
-- Update the trashhelper layout to work in Joomla 5.
-- Add AllowDynamicProperties (Joomla 4+5) to view class to allow Custom Dynamic Get methods to work without issues.
-- Fix Save failed issue in dynamicGet. #1148
-- Move all [TEXT, EDITOR, TEXTAREA] fields from [NOT NULL] to [NULL]
-- Add the DateHelper class and improve the date methods.
-- Add simple SessionHelper class.
-- Add first classes for the new import engine.
-- Improve the [VDM Registry] to be Joomla Registry Compatible
-- Move all registries to the [VDM Registry] class
-- Fix Checked Out to be null and not 0. (#1194)
-- Fix created_by, modified_by, checked_out fields in the compiler of the SQL. (#1194)
-- Update all core date fields in table class. (#1188)
-- Update created_by, modified_by, checked_out fields in table class.
-- Implementation of the decentralized Super-Power CORE repository network. (#1190)
-- Fix the noticeboard to display Llewellyn's Joomla Social feed
-- Started compiling JCB5 on Joomla 5 with PHP 8.2
-- Add init_defaults option for dynamic form selection setup (to int new items with default values dynamically)
-- Update all JCB 5 tables to utf8mb4_unicode_ci collation if misaligned
-- Move all internal ID linking to GUID inside of JCB 5
-- Updated the admin-tab-fields in add-fields view. #1205
-- Remove Custom Import Tab from admin view
-- Improved the customcode and placeholder search features
-
-# v5.0.3
-
-- Add [push] option to powers area.
-- Fix error in [Save As Copy] functionality for the library. #1162
-- Fix error when no components exist. #1164
-- Fix search page error caused by File class.
-- Fix UserGroupList compiler triggers. #1100
-- Add power integration field type with [init, reset, push] options.
-- Fix default database fields to allow NULL values. #1169
-- Fix power list field to support search functionality. #1167
-- Expand Demo component in JCB v4 to include advanced features.
-- Fix missing working path in zip creation.
-- Fix dynamic retrieval for the demo site view.
-- Fix demo site view to display files.
-- Fix field type initialization message.
-- Fix type-agnostic comparisons by casting to CHAR in dynamic get joins.
-- Fix dynamic download for site area to use correct namespace.
-- Fix missing edit button on fields in related views.
-- Fix dashboard display issues.
-- Restore search option in the [use] field for related views.
-- Fix namespace issue causing linker to break.
-
-# 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
-- Fix Event triggers for Joomla 4 and 5 builds.
-- Add fix to the update script, so that upgrading JCB from Joomla 4 to 5 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 J5 #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 5. #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 the template and layout linker for packages.
 
 # v4.1.1
 
@@ -193,6 +33,149 @@
 - Refactor the FieldString and FieldXML classes.
 - Adds option to export Language Translations.
 
+# v4.1.0
+
+- Add [AllowDynamicProperties] in the base view class for J5
+- Move the _prepareDocument  above the display call in the base view class
+- Remove all backward compatibility issues, so JCB will not need the [Backward Compatibility] plugin to run.
+- Added new import powers for custom import of spreadsheets.
+- Move the setDocument and _prepareDocument above the display in the site view and custom admin view.
+- Update the trashhelper layout to work in Joomla 5.
+- Add AllowDynamicProperties (Joomla 4+5) to view class to allow Custom Dynamic Get methods to work without issues.
+- Fix Save failed issue in dynamicGet. #1148
+- Move all [TEXT, EDITOR, TEXTAREA] fields from [NOT NULL] to [NULL]
+- Add the DateHelper class and improve the date methods.
+- Add simple SessionHelper class.
+- Add first classes for the new import engine.
+- Improve the [VDM Registry] to be Joomla Registry Compatible
+- Move all registries to the [VDM Registry] class
+- Fix Checked Out to be null and not 0. (#1194)
+- Fix created_by, modified_by, checked_out fields in the compiler of the SQL. (#1194)
+- Update all core date fields in table class. (#1188)
+- Update created_by, modified_by, checked_out fields in table class.
+- Implementation of the decentralized Super-Power CORE repository network. (#1190)
+- Fix the noticeboard to display Llewellyn's Joomla Social feed
+- Started compiling JCB4 on Joomla 5 with PHP 8.2
+- Add init_defaults option for dynamic form selection setup (to int new items with default values dynamically)
+- Update all JCB 4 tables to utf8mb4_unicode_ci collation if misaligned
+- Move all internal ID linking to GUID inside of JCB 4
+- Updated the admin-tab-fields in add-fields view. #1205
+- Remove Custom Import Tab from admin view
+- Improved the customcode and placeholder search features
+
+# v4.0.3
+
+- Add [push] option to powers area.
+- Fix [Save as Copy] error in library. #1162
+- Fix error when no components exist. #1164
+- Fix search page error caused by File class.
+- Fix usergrouplist compiler triggers. #1100
+- Add power field type integration [init, reset, push].
+- Fix default database fields to allow NULL. #1169
+- Fix power list field to enable search. #1167
+- Expand the Demo component in JCB v4 to include more advanced features.
+- Fix missing working path in zip process.
+- Fix dynamic get issue in demo site view.
+- Fix demo site view to display files.
+- Fix field type init message.
+- Ensure type-agnostic comparisons by casting to CHAR in joins for dynamic get.
+- Fix dynamic download for site area with correct namespace.
+- Fix missing edit button on fields in related views.
+- Fix dashboard display.
+- Restore search option in [use] field of related views.
+- Fix namespace issue that broke the linker.
+
+# v4.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
+
+# v4.0.1
+
+- Fix auto build from SQL in Joomla 4.
+- 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
+
+# v4.0.0
+
+- 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
+
 # v3.2.5
 
 - Add [AllowDynamicProperties] in the base view class for J5

ComponentbuilderInstallerScript.php

@@ -640,11 +640,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": "default","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","target":"target","description":"description","add_php_method_uninstall":"add_php_method_uninstall","add_php_postflight_update":"add_php_postflight_update","add_php_postflight_install":"add_php_postflight_install","add_php_preflight_uninstall":"add_php_preflight_uninstall","addreadme":"addreadme","default":"default","snippet":"snippet","add_sql":"add_sql","update_server_target":"update_server_target","add_sql_uninstall":"add_sql_uninstall","update_server":"update_server","add_update_server":"add_update_server","libraries":"libraries","module_version":"module_version","sales_server":"sales_server","custom_get":"custom_get","php_preflight_update":"php_preflight_update","php_preflight_uninstall":"php_preflight_uninstall","mod_code":"mod_code","php_postflight_install":"php_postflight_install","add_class_helper":"add_class_helper","php_postflight_update":"php_postflight_update","add_class_helper_header":"add_class_helper_header","php_method_uninstall":"php_method_uninstall","class_helper_header":"class_helper_header","sql":"sql","class_helper_code":"class_helper_code","sql_uninstall":"sql_uninstall","readme":"readme","add_php_script_construct":"add_php_script_construct","update_server_url":"update_server_url","php_script_construct":"php_script_construct","add_php_preflight_install":"add_php_preflight_install","php_preflight_install":"php_preflight_install","add_sales_server":"add_sales_server","add_php_preflight_update":"add_php_preflight_update","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": "default","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","target":"target","description":"description","add_php_postflight_install":"add_php_postflight_install","add_php_preflight_uninstall":"add_php_preflight_uninstall","add_php_preflight_update":"add_php_preflight_update","update_server_target":"update_server_target","addreadme":"addreadme","add_sql":"add_sql","default":"default","default_header":"default_header","snippet":"snippet","add_default_header":"add_default_header","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql_uninstall":"add_sql_uninstall","add_update_server":"add_update_server","update_server":"update_server","libraries":"libraries","sales_server":"sales_server","module_version":"module_version","php_preflight_install":"php_preflight_install","php_preflight_update":"php_preflight_update","layout_data":"layout_data","php_preflight_uninstall":"php_preflight_uninstall","custom_get":"custom_get","php_postflight_install":"php_postflight_install","php_postflight_update":"php_postflight_update","mod_code":"mod_code","php_method_uninstall":"php_method_uninstall","add_class_helper":"add_class_helper","sql":"sql","add_class_helper_header":"add_class_helper_header","sql_uninstall":"sql_uninstall","class_helper_header":"class_helper_header","readme":"readme","class_helper_code":"class_helper_code","update_server_url":"update_server_url","add_php_script_construct":"add_php_script_construct","php_script_construct":"php_script_construct","add_sales_server":"add_sales_server","add_php_preflight_install":"add_php_preflight_install","guid":"guid","name":"name"}}',
 				// router
 				'',
 				// contentHistoryOptions
-				'{"formFile": "administrator/components/com_componentbuilder/forms/joomla_module.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","add_php_method_uninstall","add_php_postflight_update","add_php_postflight_install","add_php_preflight_uninstall","addreadme","add_sql","update_server_target","add_sql_uninstall","update_server","add_update_server","sales_server","add_class_helper","add_class_helper_header","add_php_script_construct","add_php_preflight_install","add_sales_server","add_php_preflight_update"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "guid","displayColumn": "name"}]}'
+				'{"formFile": "administrator/components/com_componentbuilder/forms/joomla_module.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","add_php_postflight_install","add_php_preflight_uninstall","add_php_preflight_update","update_server_target","addreadme","add_sql","add_default_header","add_php_postflight_update","add_php_method_uninstall","add_sql_uninstall","add_update_server","update_server","sales_server","add_class_helper","add_class_helper_header","add_php_script_construct","add_sales_server","add_php_preflight_install"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "guid","displayColumn": "name"}]}'
 			);
 			// Install Joomla plugin Content Types.
 			$this->setContentType(
@@ -1519,7 +1519,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 			$this->setDatabaseAssetsRulesFix(101440, "MEDIUMTEXT");
 			// Install the global extension params.
 			$this->setExtensionsParams(
-				'{"autorName":"Llewellyn van der Merwe","autorEmail":"joomla@vdm.io","subform_layouts":{"subform_layouts0":{"view_field":"default","layout":"repeatablejcbjfive"}},"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":"2","type_name_builder":"2","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":""}'
+				'{"autorName":"Llewellyn van der Merwe","autorEmail":"joomla@vdm.io","subform_layouts":{"subform_layouts0":{"view_field":"default","layout":"repeatablejcbjfive"}},"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":"2","type_name_builder":"2","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":""}'
 			);
 
 
@@ -2396,11 +2396,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": "default","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","target":"target","description":"description","add_php_method_uninstall":"add_php_method_uninstall","add_php_postflight_update":"add_php_postflight_update","add_php_postflight_install":"add_php_postflight_install","add_php_preflight_uninstall":"add_php_preflight_uninstall","addreadme":"addreadme","default":"default","snippet":"snippet","add_sql":"add_sql","update_server_target":"update_server_target","add_sql_uninstall":"add_sql_uninstall","update_server":"update_server","add_update_server":"add_update_server","libraries":"libraries","module_version":"module_version","sales_server":"sales_server","custom_get":"custom_get","php_preflight_update":"php_preflight_update","php_preflight_uninstall":"php_preflight_uninstall","mod_code":"mod_code","php_postflight_install":"php_postflight_install","add_class_helper":"add_class_helper","php_postflight_update":"php_postflight_update","add_class_helper_header":"add_class_helper_header","php_method_uninstall":"php_method_uninstall","class_helper_header":"class_helper_header","sql":"sql","class_helper_code":"class_helper_code","sql_uninstall":"sql_uninstall","readme":"readme","add_php_script_construct":"add_php_script_construct","update_server_url":"update_server_url","php_script_construct":"php_script_construct","add_php_preflight_install":"add_php_preflight_install","php_preflight_install":"php_preflight_install","add_sales_server":"add_sales_server","add_php_preflight_update":"add_php_preflight_update","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": "default","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","target":"target","description":"description","add_php_postflight_install":"add_php_postflight_install","add_php_preflight_uninstall":"add_php_preflight_uninstall","add_php_preflight_update":"add_php_preflight_update","update_server_target":"update_server_target","addreadme":"addreadme","add_sql":"add_sql","default":"default","default_header":"default_header","snippet":"snippet","add_default_header":"add_default_header","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql_uninstall":"add_sql_uninstall","add_update_server":"add_update_server","update_server":"update_server","libraries":"libraries","sales_server":"sales_server","module_version":"module_version","php_preflight_install":"php_preflight_install","php_preflight_update":"php_preflight_update","layout_data":"layout_data","php_preflight_uninstall":"php_preflight_uninstall","custom_get":"custom_get","php_postflight_install":"php_postflight_install","php_postflight_update":"php_postflight_update","mod_code":"mod_code","php_method_uninstall":"php_method_uninstall","add_class_helper":"add_class_helper","sql":"sql","add_class_helper_header":"add_class_helper_header","sql_uninstall":"sql_uninstall","class_helper_header":"class_helper_header","readme":"readme","class_helper_code":"class_helper_code","update_server_url":"update_server_url","add_php_script_construct":"add_php_script_construct","php_script_construct":"php_script_construct","add_sales_server":"add_sales_server","add_php_preflight_install":"add_php_preflight_install","guid":"guid","name":"name"}}',
 				// router
 				'',
 				// contentHistoryOptions
-				'{"formFile": "administrator/components/com_componentbuilder/forms/joomla_module.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","add_php_method_uninstall","add_php_postflight_update","add_php_postflight_install","add_php_preflight_uninstall","addreadme","add_sql","update_server_target","add_sql_uninstall","update_server","add_update_server","sales_server","add_class_helper","add_class_helper_header","add_php_script_construct","add_php_preflight_install","add_sales_server","add_php_preflight_update"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "guid","displayColumn": "name"}]}'
+				'{"formFile": "administrator/components/com_componentbuilder/forms/joomla_module.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","add_php_postflight_install","add_php_preflight_uninstall","add_php_preflight_update","update_server_target","addreadme","add_sql","add_default_header","add_php_postflight_update","add_php_method_uninstall","add_sql_uninstall","add_update_server","update_server","sales_server","add_class_helper","add_class_helper_header","add_php_script_construct","add_sales_server","add_php_preflight_install"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "guid","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "guid","displayColumn": "name"}]}'
 			);
 			// Update Joomla plugin Content Types.
 			$this->setContentType(
@@ -3292,7 +3292,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 			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.1.1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 4.1.2-alpha2 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();

README.md

@@ -3,13 +3,13 @@
 
 ![Component Builder Banner](https://raw.githubusercontent.com/joomengine/Joomla-Component-Builder/refs/heads/5.x/admin/assets/images/jcb-banner.jpg "Component Builder")
 
-This is a professional-grade [Joomla 5.x](https://extensions.joomla.org/extension/component-builder/) component, created with [Joomla Component Builder (JCB)](https://www.joomlacomponentbuilder.com)—a uniquely advanced development engine for building and maintaining complete Joomla extensions.
+This is a professional-grade [Joomla 4.x](https://extensions.joomla.org/extension/component-builder/) component, created with [Joomla Component Builder (JCB)](https://www.joomlacomponentbuilder.com)—a uniquely advanced development engine for building and maintaining complete Joomla extensions.
 
 > 🎥 [Original... Quick Hello World Demo](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45), yes JCB has been around for over a decade.
 
 JCB generates native Joomla components, plugins, and modules for Joomla 3.x, 4.x, and 5.x - and is already prepared for Joomla 6. Every compiled project is tailored for the specific version without needing backward compatibility plugins. With integrated version-aware compiling, smart boilerplating, and Git-powered project syncing, JCB is much more than a code generator-it's a **full-stack development pipeline for Joomla extensions**.
 
-You can install this component easily. The latest release (**5.1.1**) is available on [Releases](https://git.vdm.dev/joomla/pkg-component-builder/releases) and updated frequently with full source access.
+You can install this component easily. The latest release (**4.1.2-alpha2**) is available on [Releases](https://git.vdm.dev/joomla/pkg-component-builder/releases) and updated frequently with full source access.
 
 Upgrades are seamless through Joomla's built-in extension update mechanism.
 
@@ -229,9 +229,9 @@ JCB is developed by developers for developers. Its purpose is to democratize hig
 * **Company:** [Vast Development Method](https://dev.vdm.io)
 * **Author:** [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 * **Component:** [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
-* **Created:** 30th April, 2015 · **Last Build:** 3rd July, 2025 · **Version:** 5.1.1
+* **Created:** 30th April, 2015 · **Last Build:** 2nd September, 2025 · **Version:** 4.1.2-alpha2
 * **License:** GNU General Public License version 2 or later; see LICENSE.txt · **Copyright:** Copyright (C) 2015 Vast Development Method. All rights reserved.
-* **Lines:** 1094985 · **Fields:** 2096 · **Files:** 7515 · **Folders:** 728
+* **Lines:** 1146427 · **Fields:** 2085 · **Files:** 7667 · **Folders:** 724
 
 > Generated with [JCB](https://www.joomlacomponentbuilder.com) — The Smartest Way to Build Joomla Extensions.
 

admin/README.txt

@@ -3,13 +3,13 @@
 
 ![Component Builder Banner](https://raw.githubusercontent.com/joomengine/Joomla-Component-Builder/refs/heads/5.x/admin/assets/images/jcb-banner.jpg "Component Builder")
 
-This is a professional-grade [Joomla 5.x](https://extensions.joomla.org/extension/component-builder/) component, created with [Joomla Component Builder (JCB)](https://www.joomlacomponentbuilder.com)—a uniquely advanced development engine for building and maintaining complete Joomla extensions.
+This is a professional-grade [Joomla 4.x](https://extensions.joomla.org/extension/component-builder/) component, created with [Joomla Component Builder (JCB)](https://www.joomlacomponentbuilder.com)—a uniquely advanced development engine for building and maintaining complete Joomla extensions.
 
 > 🎥 [Original... Quick Hello World Demo](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45), yes JCB has been around for over a decade.
 
 JCB generates native Joomla components, plugins, and modules for Joomla 3.x, 4.x, and 5.x - and is already prepared for Joomla 6. Every compiled project is tailored for the specific version without needing backward compatibility plugins. With integrated version-aware compiling, smart boilerplating, and Git-powered project syncing, JCB is much more than a code generator-it's a **full-stack development pipeline for Joomla extensions**.
 
-You can install this component easily. The latest release (**5.1.1**) is available on [Releases](https://git.vdm.dev/joomla/pkg-component-builder/releases) and updated frequently with full source access.
+You can install this component easily. The latest release (**4.1.2-alpha2**) is available on [Releases](https://git.vdm.dev/joomla/pkg-component-builder/releases) and updated frequently with full source access.
 
 Upgrades are seamless through Joomla's built-in extension update mechanism.
 
@@ -229,9 +229,9 @@ JCB is developed by developers for developers. Its purpose is to democratize hig
 * **Company:** [Vast Development Method](https://dev.vdm.io)
 * **Author:** [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 * **Component:** [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
-* **Created:** 30th April, 2015 · **Last Build:** 3rd July, 2025 · **Version:** 5.1.1
+* **Created:** 30th April, 2015 · **Last Build:** 2nd September, 2025 · **Version:** 4.1.2-alpha2
 * **License:** GNU General Public License version 2 or later; see LICENSE.txt · **Copyright:** Copyright (C) 2015 Vast Development Method. All rights reserved.
-* **Lines:** 1094985 · **Fields:** 2096 · **Files:** 7515 · **Folders:** 728
+* **Lines:** 1146427 · **Fields:** 2085 · **Files:** 7667 · **Folders:** 724
 
 > Generated with [JCB](https://www.joomlacomponentbuilder.com) — The Smartest Way to Build Joomla Extensions.
 

admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php

@@ -179,7 +179,7 @@ class HtmlView extends BaseHtmlView
 		###ADDTOOLBAR###
 
 		// add the toolbar if it's not already loaded
-		$this->toolbar ??= Joomla___39403062_84fb_46e0_bac4_0023f766e827___Power::getContainer()->get(Joomla___5d2ae99b_1ea1_44f0_9b59_f1aa7eab9e2e___Power::class)->createToolbar('toolbar');
+		$this->toolbar ??= $this->getDocument()->getToolbar();
 	}
 
 	/**

admin/compiler/joomla_4/SITE_VIEWS_HTML.php

@@ -134,8 +134,8 @@ class HtmlView extends BaseHtmlView
 			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 
-		// now initiate the toolbar
-		$this->toolbar = Toolbar::getInstance();
+		// add the toolbar if it's not already loaded
+		$this->toolbar ??= $this->getDocument()->getToolbar();
 	}###SITE_GET_MODULE###
 
 	/**

admin/compiler/joomla_4/SITE_VIEW_HTML.php

@@ -118,8 +118,8 @@ class HtmlView extends BaseHtmlView
 			Joomla___0c1a176a_304f_433a_8233_37d01ff87815___Power::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 
-		// now initiate the toolbar
-		$this->toolbar ??= Toolbar::getInstance();
+		// add the toolbar if it's not already loaded
+		$this->toolbar ??= $this->getDocument()->getToolbar();
 	}###SITE_GET_MODULE###
 
 	/**

admin/config.xml

@@ -961,7 +961,7 @@
 			default="2">
 			<!-- Option Set. -->
 			<option value="1">
-				COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
+				COM_COMPONENTBUILDER_CONFIG_LEGACY_MODE</option>
 			<option value="2">
 				COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC</option>
 		</field>
@@ -975,128 +975,11 @@
 			default="2">
 			<!-- Option Set. -->
 			<option value="1">
-				COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
+				COM_COMPONENTBUILDER_CONFIG_LEGACY_MODE</option>
 			<option value="2">
 				COM_COMPONENTBUILDER_CONFIG_ALPHANUMERICDOT</option>
 		</field>
 	</fieldset>
-	<fieldset
-		name="jcb_packages_custom_config"
-		label="COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGES">
-
-		<!-- Import_guid_only Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="import_guid_only"
-			label="COM_COMPONENTBUILDER_CONFIG_IMPORT_GUID_ONLY_LABEL"
-			description="COM_COMPONENTBUILDER_CONFIG_IMPORT_GUID_ONLY_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CONFIG_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CONFIG_NO</option>
-		</field>
-		<!-- Export_language_strings Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="export_language_strings"
-			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_LANGUAGE_STRINGS_LABEL"
-			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_LANGUAGE_STRINGS_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CONFIG_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CONFIG_NO</option>
-		</field>
-	</fieldset>
-	<fieldset
-		name="auto_backup_custom_config"
-		label="COM_COMPONENTBUILDER_CONFIG_AUTO_BACKUP">
-
-		<!-- Backupcronjob_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="backupcronjob_note" label="COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_LABEL" description="COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_DESCRIPTION" heading="h4" class="backupcronjob_note" />
-		<!-- Cronjob_backup_type Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="cronjob_backup_type"
-			label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_LABEL"
-			description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CONFIG_LOCAL_FOLDER</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_CONFIG_REMOTE_SERVER</option>
-		</field>
-		<!-- Cronjob_backup_server Field. Type: Cron_servers. (custom) -->
-		<field
-			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"
-			button="true"
-		/>
-		<!-- Cronjob_backup_folder_path Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="cronjob_backup_folder_path"
-			label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_LABEL"
-			size="70"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_DESCRIPTION"
-			class="text_area"
-			readonly="false"
-			disabled="false"
-			required="false"
-			filter="PATH"
-			message="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_MESSAGE"
-			hint="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_HINT"
-			autocomplete="on"
-			showon="cronjob_backup_type:1"
-		/>
-		<!-- Backup_email Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="backup_email"
-			label="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_LABEL"
-			size="10"
-			maxlength="50"
-			description="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_DESCRIPTION"
-			class="text_area"
-			filter="STRING"
-			validate="email"
-			message="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_MESSAGE"
-			hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_HINT"
-		/>
-		<!-- Package_name_plaeholders Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="package_name_plaeholders" label="COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_LABEL" description="COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_DESCRIPTION" heading="h4" class="package_name_plaeholders" />
-		<!-- Backup_package_name Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="backup_package_name"
-			label="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_LABEL"
-			size="40"
-			maxlength="150"
-			default="JCB_Backup_[YEAR]_[MONTH]_[DAY]"
-			description="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_DESCRIPTION"
-			class="text_area"
-			readonly="false"
-			disabled="false"
-			filter="STRING"
-			message="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_MESSAGE"
-			hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_HINT"
-		/>
-	</fieldset>
 	<fieldset
 		name="folder_paths_custom_config"
 		label="COM_COMPONENTBUILDER_CONFIG_FOLDER_PATHS">

admin/forms/admin_fields.xml

@@ -122,28 +122,16 @@
 			icon="list"
 			min="1">
 			<form hidden="true" name="list_addfields_modal" repeat="true">
-				<!-- Field Field. Type: Modalselect. (custom) -->
+				<!-- Field Field. Type: Fields. (custom) -->
 				<field
-					type="ModalSelect"
+					type="fields"
 					name="field"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL"
-					sql_title_table="#__componentbuilder_field"
-					sql_title_column="name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlNew="index.php?option=com_componentbuilder&amp;task=field.add&amp;layout=modal&amp;tmpl=component"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=field.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_TITLESELECT"
-					iconSelect="icon-lamp"
-					select="true"
-					new="true"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_HINT"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false"
+					required="true"
+					button="false"
 				/>
 				<!-- List Field. Type: List. (joomla) -->
 				<field

admin/forms/admin_view.xml

@@ -702,28 +702,16 @@
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_DESCRIPTION"
 			icon="list">
 			<form hidden="true" name="list_addlinked_views_modal" repeat="true">
-				<!-- Adminview Field. Type: Modalselect. (custom) -->
+				<!-- Adminview Field. Type: Adminviews. (custom) -->
 				<field
-					type="ModalSelect"
+					type="adminviews"
 					name="adminview"
 					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL"
-					sql_title_table="#__componentbuilder_admin_view"
-					sql_title_column="system_name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=admin_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlNew="index.php?option=com_componentbuilder&amp;task=admin_view.add&amp;layout=modal&amp;tmpl=component"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=admin_view.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_TITLESELECT"
-					iconSelect="icon-stack"
-					select="true"
-					new="true"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
 					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_HINT"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false"
+					required="true"
+					button="false"
 				/>
 				<!-- Tab Field. Type: Integer. (joomla) -->
 				<field

admin/forms/class_method.xml

@@ -203,30 +203,17 @@
 			hint="COM_COMPONENTBUILDER_CLASS_METHOD_COMMENT_HINT"
 			required="false"
 		/>
-		<!-- Joomla_plugin_group Field. Type: Modalselect. (custom) -->
+		<!-- Joomla_plugin_group Field. Type: Joomlaplugingroups. (custom) -->
 		<field
-			type="ModalSelect"
+			type="joomlaplugingroups"
 			name="joomla_plugin_group"
 			label="COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_LABEL"
-			sql_title_table="#__componentbuilder_joomla_plugin_group"
-			sql_title_column="name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=joomla_plugin_groups&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			urlNew="index.php?option=com_componentbuilder&amp;task=joomla_plugin_group.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=joomla_plugin_group.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_TITLESELECT"
-			titleNew="COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_TITLENEW"
-			titleEdit="COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_TITLEEDIT"
-			iconSelect="icon-copy"
-			select="true"
-			new="true"
-			edit="true"
-			clear="true"
-			class="input-large"
-			description="COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_DESCRIPTION"
-			hint="COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_HINT"
-			showon="extension_type:plugins"
+			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			default="0"
+			required="true"
+			button="true"
 		/>
 		<!-- Arguments Field. Type: Text. (joomla) -->
 		<field

admin/forms/class_property.xml

@@ -187,30 +187,17 @@
 			hint="COM_COMPONENTBUILDER_CLASS_PROPERTY_COMMENT_HINT"
 			required="false"
 		/>
-		<!-- Joomla_plugin_group Field. Type: Modalselect. (custom) -->
+		<!-- Joomla_plugin_group Field. Type: Joomlaplugingroups. (custom) -->
 		<field
-			type="ModalSelect"
+			type="joomlaplugingroups"
 			name="joomla_plugin_group"
 			label="COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_LABEL"
-			sql_title_table="#__componentbuilder_joomla_plugin_group"
-			sql_title_column="name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=joomla_plugin_groups&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			urlNew="index.php?option=com_componentbuilder&amp;task=joomla_plugin_group.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=joomla_plugin_group.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_TITLESELECT"
-			titleNew="COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_TITLENEW"
-			titleEdit="COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_TITLEEDIT"
-			iconSelect="icon-copy"
-			select="true"
-			new="true"
-			edit="true"
-			clear="true"
-			class="input-large"
-			description="COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_DESCRIPTION"
-			hint="COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_HINT"
-			showon="extension_type:plugins"
+			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			default="0"
+			required="true"
+			button="true"
 		/>
 		<!-- Default Field. Type: Textarea. (joomla) -->
 		<field

admin/forms/component_admin_views.xml

@@ -135,28 +135,16 @@
 			icon="list"
 			min="1">
 			<form hidden="true" name="list_addadmin_views_modal" repeat="true">
-				<!-- Adminview Field. Type: Modalselect. (custom) -->
+				<!-- Adminview Field. Type: Adminviews. (custom) -->
 				<field
-					type="ModalSelect"
+					type="adminviews"
 					name="adminview"
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_LABEL"
-					sql_title_table="#__componentbuilder_admin_view"
-					sql_title_column="system_name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=admin_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlNew="index.php?option=com_componentbuilder&amp;task=admin_view.add&amp;layout=modal&amp;tmpl=component"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=admin_view.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_TITLESELECT"
-					iconSelect="icon-stack"
-					select="true"
-					new="true"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_HINT"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false"
+					required="true"
+					button="false"
 				/>
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field

admin/forms/component_config.xml

@@ -134,28 +134,16 @@
 			default=""
 			icon="list">
 			<form hidden="true" name="list_addconfig_modal" repeat="true">
-				<!-- Field Field. Type: Modalselect. (custom) -->
+				<!-- Field Field. Type: Fields. (custom) -->
 				<field
-					type="ModalSelect"
+					type="fields"
 					name="field"
 					label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_LABEL"
-					sql_title_table="#__componentbuilder_field"
-					sql_title_column="name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlNew="index.php?option=com_componentbuilder&amp;task=field.add&amp;layout=modal&amp;tmpl=component"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=field.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_TITLESELECT"
-					iconSelect="icon-lamp"
-					select="true"
-					new="true"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
 					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_HINT"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false"
+					required="true"
+					button="false"
 				/>
 				<!-- Custom_value Field. Type: Textarea. (joomla) -->
 				<field

admin/forms/component_custom_admin_views.xml

@@ -133,28 +133,16 @@
 			default=""
 			icon="list">
 			<form hidden="true" name="list_addcustom_admin_views_modal" repeat="true">
-				<!-- Customadminview Field. Type: Modalselect. (custom) -->
+				<!-- Customadminview Field. Type: Customadminviews. (custom) -->
 				<field
-					type="ModalSelect"
+					type="customadminviews"
 					name="customadminview"
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_LABEL"
-					sql_title_table="#__componentbuilder_custom_admin_view"
-					sql_title_column="system_name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=custom_admin_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlNew="index.php?option=com_componentbuilder&amp;task=custom_admin_view.add&amp;layout=modal&amp;tmpl=component"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=custom_admin_view.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_TITLESELECT"
-					iconSelect="icon-screen"
-					select="true"
-					new="true"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_HINT"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false"
+					required="true"
+					button="false"
 				/>
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field

admin/forms/component_site_views.xml

@@ -134,28 +134,16 @@
 			default=""
 			icon="list">
 			<form hidden="true" name="list_addsite_views_modal" repeat="true">
-				<!-- Siteview Field. Type: Modalselect. (custom) -->
+				<!-- Siteview Field. Type: Siteviews. (custom) -->
 				<field
-					type="ModalSelect"
+					type="siteviews"
 					name="siteview"
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_LABEL"
-					sql_title_table="#__componentbuilder_site_view"
-					sql_title_column="system_name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=site_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlNew="index.php?option=com_componentbuilder&amp;task=site_view.add&amp;layout=modal&amp;tmpl=component"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=site_view.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_TITLESELECT"
-					iconSelect="icon-palette"
-					select="true"
-					new="true"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_HINT"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false"
+					required="true"
+					button="false"
 				/>
 				<!-- Menu Field. Type: Checkbox. (joomla) -->
 				<field

admin/forms/custom_admin_view.xml

@@ -143,28 +143,16 @@
 			message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DESCRIPTION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DESCRIPTION_HINT"
 		/>
-		<!-- Main_get Field. Type: Modalselect. (custom) -->
+		<!-- Main_get Field. Type: Maingets. (custom) -->
 		<field
-			type="ModalSelect"
+			type="maingets"
 			name="main_get"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
-			sql_title_table="#__componentbuilder_dynamic_get"
-			sql_title_column="name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=dynamic_gets&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid&amp;filter[getgroup]=main"
-			urlNew="index.php?option=com_componentbuilder&amp;task=dynamic_get.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=dynamic_get.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_TITLESELECT"
-			titleEdit="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_TITLEEDIT"
-			iconSelect="icon-copy"
-			select="true"
-			new="false"
-			edit="true"
-			clear="true"
-			required="true"
-			class="input-large"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			required="true"
+			button="true"
 		/>
 		<!-- Note_add_php_language_string Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_add_php_language_string" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_PHP_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_php_language_string" />

admin/forms/dynamic_get.xml

@@ -332,29 +332,15 @@
 			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_SELECTION_HINT"
 			required="true"
 		/>
-		<!-- View_table_main Field. Type: Modalselect. (custom) -->
+		<!-- View_table_main Field. Type: Adminviews. (custom) -->
 		<field
-			type="ModalSelect"
+			type="adminviews"
 			name="view_table_main"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
-			sql_title_table="#__componentbuilder_admin_view"
-			sql_title_column="system_name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=admin_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			urlNew="index.php?option=com_componentbuilder&amp;task=admin_view.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=admin_view.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_TITLESELECT"
-			titleNew="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_TITLENEW"
-			titleEdit="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_TITLEEDIT"
-			iconSelect="icon-stack"
-			select="true"
-			new="true"
-			edit="true"
-			clear="true"
-			class="input-large"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
-			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_HINT"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			required="true"
 		/>
 		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
 		<field
@@ -903,7 +889,6 @@
 					name="empty"
 					label="COM_COMPONENTBUILDER_DYNAMIC_GET_EMPTY_LABEL"
 					value="1"
-					default="0"
 					description="COM_COMPONENTBUILDER_DYNAMIC_GET_EMPTY_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -1315,28 +1300,15 @@
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION"
 			icon="list">
 			<form hidden="true" name="list_join_view_table_modal" repeat="true">
-				<!-- View_table Field. Type: Modalselect. (custom) -->
+				<!-- View_table Field. Type: Adminviews. (custom) -->
 				<field
-					type="ModalSelect"
+					type="adminviews"
 					name="view_table"
 					label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_LABEL"
-					sql_title_table="#__componentbuilder_admin_view"
-					sql_title_column="system_name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=admin_views&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=admin_view.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_TITLESELECT"
-					titleEdit="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_TITLEEDIT"
-					iconSelect="icon-stack"
-					select="true"
-					new="false"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
 					description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_HINT"
+					multiple="false"
+					required="true"
+					button="false"
 				/>
 				<!-- Row_type Field. Type: List. (joomla) -->
 				<field

admin/forms/filter_custom_admin_views.xml

@@ -30,6 +30,15 @@
 			class="js-select-submit-on-change"
 			layout="joomla.form.field.list-fancy-select"
 		/>
+		<field
+			type="maingets"
+			name="main_get"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="true"
+			hint="COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_GET"
+			class="js-select-submit-on-change"
+		/>
 		<field
 			type="customadminviewsfilteraddphpajax"
 			name="add_php_ajax"

admin/forms/filter_dynamic_gets.xml

@@ -41,9 +41,7 @@
 			type="dynamicgetsfiltergettype"
 			name="gettype"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL"
-			layout="joomla.form.field.list-fancy-select"
-			multiple="true"
-			hint="COM_COMPONENTBUILDER_FILTER_SELECT_GETTYPE"
+			multiple="false"
 			class="js-select-submit-on-change"
 		/>
 		<input type="hidden" name="form_submited" value="1"/>

admin/forms/filter_joomla_plugin_groups.xml

@@ -31,18 +31,7 @@
 			layout="joomla.form.field.list-fancy-select"
 		/>
 		<field
-			type="ModalSelect"
-			sql_title_table="#__componentbuilder_class_extends"
-			sql_title_column="name"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=class_extendings&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid&amp;filter[extension_type]=plugins"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_HINT"
-			titleSelect="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_TITLESELECT"
-			iconSelect="icon-copy"
-			select="true"
-			edit="false"
-			clear="true"
-			onchange="form.submit()"
+			type="classextends"
 			name="class_extends"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_LABEL"
 			multiple="false"

admin/forms/filter_joomla_plugins.xml

@@ -31,36 +31,14 @@
 			layout="joomla.form.field.list-fancy-select"
 		/>
 		<field
-			type="ModalSelect"
-			sql_title_table="#__componentbuilder_class_extends"
-			sql_title_column="name"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=class_extendings&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid&amp;filter[extension_type]=plugins"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_HINT"
-			titleSelect="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_TITLESELECT"
-			iconSelect="icon-copy"
-			select="true"
-			edit="false"
-			clear="true"
-			onchange="form.submit()"
+			type="classextends"
 			name="class_extends"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_LABEL"
 			multiple="false"
 			class="js-select-submit-on-change"
 		/>
 		<field
-			type="ModalSelect"
-			sql_title_table="#__componentbuilder_joomla_plugin_group"
-			sql_title_column="name"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=joomla_plugin_groups&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_HINT"
-			titleSelect="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_TITLESELECT"
-			iconSelect="icon-copy"
-			select="true"
-			edit="false"
-			clear="true"
-			onchange="form.submit()"
+			type="joomlaplugingroups"
 			name="joomla_plugin_group"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_LABEL"
 			multiple="false"

admin/forms/filter_site_views.xml

@@ -30,6 +30,15 @@
 			class="js-select-submit-on-change"
 			layout="joomla.form.field.list-fancy-select"
 		/>
+		<field
+			type="maingets"
+			name="main_get"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="true"
+			hint="COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_GET"
+			class="js-select-submit-on-change"
+		/>
 		<field
 			type="siteviewsfilteraddphpajax"
 			name="add_php_ajax"

admin/forms/filter_snippets.xml

@@ -31,36 +31,14 @@
 			layout="joomla.form.field.list-fancy-select"
 		/>
 		<field
-			type="ModalSelect"
-			sql_title_table="#__componentbuilder_snippet_type"
-			sql_title_column="name"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=snippet_types&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			hint="COM_COMPONENTBUILDER_SNIPPET_TYPE_HINT"
-			titleSelect="COM_COMPONENTBUILDER_SNIPPET_TYPE_TITLESELECT"
-			iconSelect="icon-copy"
-			select="true"
-			edit="false"
-			clear="true"
-			onchange="form.submit()"
+			type="snippettype"
 			name="type"
 			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_LABEL"
 			multiple="false"
 			class="js-select-submit-on-change"
 		/>
 		<field
-			type="ModalSelect"
-			sql_title_table="#__componentbuilder_library"
-			sql_title_column="name"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=libraries&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			hint="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_HINT"
-			titleSelect="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_TITLESELECT"
-			iconSelect="icon-copy"
-			select="true"
-			edit="false"
-			clear="true"
-			onchange="form.submit()"
+			type="library"
 			name="library"
 			label="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_LABEL"
 			multiple="false"

admin/forms/joomla_module.xml

@@ -139,34 +139,6 @@
 			filter="HTML"
 			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_DESCRIPTION_HINT"
 		/>
-		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_method_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_METHOD_UNINSTALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
-		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_postflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
 		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -195,11 +167,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
-		<!-- Addreadme Field. Type: Radio. (joomla) -->
+		<!-- Add_php_preflight_update Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="addreadme"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDREADME_LABEL"
+			name="add_php_preflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_PREFLIGHT_UPDATE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -211,62 +183,6 @@
 		</field>
 		<!-- Note_libraries_options Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_libraries_options" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LIBRARIES_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LIBRARIES_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_libraries_options" />
-		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
-		<field
-			type="hidden"
-			name="not_required"
-			default="一_一"
-		/>
-		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
-		<!-- Default Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="default"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_DESCRIPTION"
-			width="100%"
-			height="500px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="html"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_uikit_snippet" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UIKIT_SNIPPET_LABEL" heading="h4" class="snippet-code note_uikit_snippet" />
-		<!-- Snippet Field. Type: Snippets. (custom) -->
-		<field
-			type="snippets"
-			name="snippet"
-			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"
-		/>
-		<!-- Note_add_php_language_string Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_add_php_language_string" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_PHP_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_php_language_string" />
-		<!-- Add_sql Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_sql"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SQL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
 		<!-- Update_server_target Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -284,6 +200,130 @@
 			<option value="3">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_OTHER</option>
 		</field>
+		<!-- Addreadme Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="addreadme"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDREADME_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Add_sql Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_sql"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SQL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Default Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="default"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_DESCRIPTION"
+			width="100%"
+			height="500px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="html"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Default_header Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="default_header"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_HEADER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_HEADER_DESCRIPTION"
+			width="100%"
+			height="100px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+			showon="add_default_header:1"
+		/>
+		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
+		<!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_uikit_snippet" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UIKIT_SNIPPET_LABEL" heading="h4" class="snippet-code note_uikit_snippet" />
+		<!-- Snippet Field. Type: Snippets. (custom) -->
+		<field
+			type="snippets"
+			name="snippet"
+			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"
+		/>
+		<!-- Add_default_header Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_default_header"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_DEFAULT_HEADER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_DEFAULT_HEADER_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Note_add_php_language_string Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_add_php_language_string" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_PHP_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_php_language_string" />
+		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_postflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_method_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_METHOD_UNINSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
 		<!-- Add_sql_uninstall Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -298,6 +338,26 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="一_一"
+		/>
+		<!-- Add_update_server Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_update_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_UPDATE_SERVER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
 		<!-- Update_server Field. Type: Servers. (custom) -->
 		<field
 			type="servers"
@@ -310,20 +370,8 @@
 			default="0"
 			button="true"
 		/>
-		<!-- Add_update_server Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_UPDATE_SERVER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
+		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
 		<!-- Libraries Field. Type: Libraries. (custom) -->
 		<field
 			type="libraries"
@@ -337,8 +385,19 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
+		<!-- Sales_server Field. Type: Servers. (custom) -->
+		<field
+			type="servers"
+			name="sales_server"
+			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"
+			button="true"
+		/>
 		<!-- Module_version Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -354,28 +413,25 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_HINT"
 		/>
-		<!-- Sales_server Field. Type: Servers. (custom) -->
+		<!-- Php_preflight_install Field. Type: Editor. (joomla) -->
 		<field
-			type="servers"
-			name="sales_server"
-			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"
-			button="true"
-		/>
-		<!-- Custom_get Field. Type: Customgets. (custom) -->
-		<field
-			type="customgets"
-			name="custom_get"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_GET_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_GET_DESCRIPTION"
-			layout="joomla.form.field.list-fancy-select"
-			multiple="true"
+			type="editor"
+			name="php_preflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_INSTALL_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_INSTALL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+			showon="add_php_preflight_install:1"
 		/>
+		<!-- Note_layout_data Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_layout_data" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LAYOUT_DATA_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LAYOUT_DATA_DESCRIPTION" heading="h4" class="alert alert-info note_layout_data" />
 		<!-- Php_preflight_update Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -393,8 +449,23 @@
 			validate="code"
 			showon="add_php_preflight_update:1"
 		/>
-		<!-- Note_mod_file_options Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_mod_file_options" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_MOD_FILE_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_MOD_FILE_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_mod_file_options" />
+		<!-- Layout_data Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="layout_data"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_LAYOUT_DATA_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_LAYOUT_DATA_DESCRIPTION"
+			width="100%"
+			height="500px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+		/>
 		<!-- Php_preflight_uninstall Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -412,22 +483,14 @@
 			validate="code"
 			showon="add_php_preflight_uninstall:1"
 		/>
-		<!-- Mod_code Field. Type: Editor. (joomla) -->
+		<!-- Custom_get Field. Type: Customgets. (custom) -->
 		<field
-			type="editor"
-			name="mod_code"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_DESCRIPTION"
-			width="100%"
-			height="500px"
-			cols="15"
-			rows="10"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="true"
-			validate="code"
+			type="customgets"
+			name="custom_get"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_GET_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_GET_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="true"
 		/>
 		<!-- Php_postflight_install Field. Type: Editor. (joomla) -->
 		<field
@@ -446,6 +509,59 @@
 			validate="code"
 			showon="add_php_postflight_install:1"
 		/>
+		<!-- Note_mod_file_options Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_mod_file_options" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_MOD_FILE_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_MOD_FILE_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_mod_file_options" />
+		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_postflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_UPDATE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+			showon="add_php_postflight_update:1"
+		/>
+		<!-- Mod_code Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="mod_code"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_DESCRIPTION"
+			width="100%"
+			height="500px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+		/>
+		<!-- Php_method_uninstall Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_method_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+			showon="add_php_method_uninstall:1"
+		/>
 		<!-- Add_class_helper Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -465,22 +581,18 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_ABSTRACT_CLASS</option>
 		</field>
-		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
+		<!-- Sql Field. Type: Textarea. (joomla) -->
 		<field
-			type="editor"
-			name="php_postflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_UPDATE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
+			type="textarea"
+			name="sql"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_LABEL"
 			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_DESCRIPTION"
+			class="text_area span12"
 			filter="raw"
-			validate="code"
-			showon="add_php_postflight_update:1"
+			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_HINT"
+			showon="add_sql:1"
 		/>
 		<!-- Add_class_helper_header Field. Type: Radio. (joomla) -->
 		<field
@@ -496,22 +608,18 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
-		<!-- Php_method_uninstall Field. Type: Editor. (joomla) -->
+		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
 		<field
-			type="editor"
-			name="php_method_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
+			type="textarea"
+			name="sql_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_LABEL"
 			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_DESCRIPTION"
+			class="text_area span12"
 			filter="raw"
-			validate="code"
-			showon="add_php_method_uninstall:1"
+			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_HINT"
+			showon="add_sql_uninstall:1"
 		/>
 		<!-- Class_helper_header Field. Type: Editor. (joomla) -->
 		<field
@@ -530,18 +638,18 @@
 			required="false"
 			validate="code"
 		/>
-		<!-- Sql Field. Type: Textarea. (joomla) -->
+		<!-- Readme Field. Type: Editor. (joomla) -->
 		<field
-			type="textarea"
-			name="sql"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_DESCRIPTION"
-			class="text_area span12"
+			type="editor"
+			name="readme"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_README_LABEL"
+			default="You can use all the normal markdown, including the place-holders."
+			width="100%"
+			height="1200px"
+			buttons="false"
+			editor="none"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_HINT"
-			showon="add_sql:1"
+			showon="addreadme:1"
 		/>
 		<!-- Class_helper_code Field. Type: Editor. (joomla) -->
 		<field
@@ -559,18 +667,20 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
+		<!-- Update_server_url Field. Type: Url. (joomla) -->
 		<field
-			type="textarea"
-			name="sql_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_DESCRIPTION"
+			type="url"
+			name="update_server_url"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_DESCRIPTION"
 			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_HINT"
-			showon="add_sql_uninstall:1"
+			filter="url"
+			validated="url"
+			message="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_MESSAGE"
+			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_HINT"
+			showon="add_update_server:1"
 		/>
 		<!-- Fields Field. Type: Subform. (joomla) -->
 		<field
@@ -735,28 +845,16 @@
 					max="100"
 					nested_depth="1">
 					<form hidden="true" name="list_fields_modal" repeat="true">
-						<!-- Field Field. Type: Modalselect. (custom) -->
+						<!-- Field Field. Type: Fields. (custom) -->
 						<field
-							type="ModalSelect"
+							type="fields"
 							name="field"
 							label="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_LABEL"
-							sql_title_table="#__componentbuilder_field"
-							sql_title_column="name"
-							data-key-name="guid"
-							sql_title_key="guid"
-							urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-							urlNew="index.php?option=com_componentbuilder&amp;task=field.add&amp;layout=modal&amp;tmpl=component"
-							urlEdit="index.php?option=com_componentbuilder&amp;task=field.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-							titleSelect="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_TITLESELECT"
-							iconSelect="icon-lamp"
-							select="true"
-							new="true"
-							edit="true"
-							clear="true"
-							required="true"
-							class="input-large"
 							description="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_DESCRIPTION"
-							hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_HINT"
+							layout="joomla.form.field.list-fancy-select"
+							multiple="false"
+							required="true"
+							button="false"
 						/>
 						<!-- Custom_value Field. Type: Textarea. (joomla) -->
 						<field
@@ -776,19 +874,8 @@
 				</field>
 			</form>
 		</field>
-		<!-- Readme Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="readme"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_README_LABEL"
-			default="You can use all the normal markdown, including the place-holders."
-			width="100%"
-			height="1200px"
-			buttons="false"
-			editor="none"
-			filter="raw"
-			showon="addreadme:1"
-		/>
+		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
 		<!-- Add_php_script_construct Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -803,21 +890,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
-		<!-- Update_server_url Field. Type: Url. (joomla) -->
-		<field
-			type="url"
-			name="update_server_url"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_LABEL"
-			size="60"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_DESCRIPTION"
-			class="text_area span12"
-			filter="url"
-			validated="url"
-			message="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_MESSAGE"
-			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_HINT"
-			showon="add_update_server:1"
-		/>
+		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
 		<!-- Php_script_construct Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -835,41 +909,6 @@
 			validate="code"
 			showon="add_php_script_construct:1"
 		/>
-		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
-		<!-- Add_php_preflight_install Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_preflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_PREFLIGHT_INSTALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
-		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
-		<!-- Php_preflight_install Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_preflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_INSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_INSTALL_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-			showon="add_php_preflight_install:1"
-		/>
 		<!-- Add_sales_server Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -884,11 +923,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
-		<!-- Add_php_preflight_update Field. Type: Radio. (joomla) -->
+		<!-- Add_php_preflight_install Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_preflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_PREFLIGHT_UPDATE_LABEL"
+			name="add_php_preflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_PREFLIGHT_INSTALL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">

admin/forms/joomla_plugin.xml

@@ -111,55 +111,29 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SYSTEM_NAME_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SYSTEM_NAME_HINT"
 		/>
-		<!-- Class_extends Field. Type: Modalselect. (custom) -->
+		<!-- Class_extends Field. Type: Classextends. (custom) -->
 		<field
-			type="ModalSelect"
+			type="classextends"
 			name="class_extends"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_LABEL"
-			sql_title_table="#__componentbuilder_class_extends"
-			sql_title_column="name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=class_extendings&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid&amp;filter[extension_type]=plugins"
-			urlNew="index.php?option=com_componentbuilder&amp;task=class_extends.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=class_extends.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_TITLESELECT"
-			titleNew="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_TITLENEW"
-			titleEdit="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_TITLEEDIT"
-			iconSelect="icon-copy"
-			select="true"
-			new="true"
-			edit="true"
-			clear="true"
+			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			default="0"
 			required="true"
-			class="input-large"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_DESCRIPTION"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_HINT"
+			button="true"
 		/>
-		<!-- Joomla_plugin_group Field. Type: Modalselect. (custom) -->
+		<!-- Joomla_plugin_group Field. Type: Joomlaplugingroups. (custom) -->
 		<field
-			type="ModalSelect"
+			type="joomlaplugingroups"
 			name="joomla_plugin_group"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_LABEL"
-			sql_title_table="#__componentbuilder_joomla_plugin_group"
-			sql_title_column="name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=joomla_plugin_groups&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			urlNew="index.php?option=com_componentbuilder&amp;task=joomla_plugin_group.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=joomla_plugin_group.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_TITLESELECT"
-			titleNew="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_TITLENEW"
-			titleEdit="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_TITLEEDIT"
-			iconSelect="icon-copy"
-			select="true"
-			new="true"
-			edit="true"
-			clear="true"
+			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			default="0"
 			required="true"
-			class="input-large"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_DESCRIPTION"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_HINT"
+			button="true"
 		/>
 		<!-- Add_sql Field. Type: Radio. (joomla) -->
 		<field
@@ -636,28 +610,16 @@
 					max="100"
 					nested_depth="1">
 					<form hidden="true" name="list_fields_modal" repeat="true">
-						<!-- Field Field. Type: Modalselect. (custom) -->
+						<!-- Field Field. Type: Fields. (custom) -->
 						<field
-							type="ModalSelect"
+							type="fields"
 							name="field"
 							label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_LABEL"
-							sql_title_table="#__componentbuilder_field"
-							sql_title_column="name"
-							data-key-name="guid"
-							sql_title_key="guid"
-							urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-							urlNew="index.php?option=com_componentbuilder&amp;task=field.add&amp;layout=modal&amp;tmpl=component"
-							urlEdit="index.php?option=com_componentbuilder&amp;task=field.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-							titleSelect="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_TITLESELECT"
-							iconSelect="icon-lamp"
-							select="true"
-							new="true"
-							edit="true"
-							clear="true"
-							required="true"
-							class="input-large"
 							description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_DESCRIPTION"
-							hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_HINT"
+							layout="joomla.form.field.list-fancy-select"
+							multiple="false"
+							required="true"
+							button="false"
 						/>
 						<!-- Custom_value Field. Type: Textarea. (joomla) -->
 						<field

admin/forms/joomla_plugin_group.xml

@@ -113,30 +113,17 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_NAME_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_NAME_HINT"
 		/>
-		<!-- Class_extends Field. Type: Modalselect. (custom) -->
+		<!-- Class_extends Field. Type: Classextends. (custom) -->
 		<field
-			type="ModalSelect"
+			type="classextends"
 			name="class_extends"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_LABEL"
-			sql_title_table="#__componentbuilder_class_extends"
-			sql_title_column="name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=class_extendings&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid&amp;filter[extension_type]=plugins"
-			urlNew="index.php?option=com_componentbuilder&amp;task=class_extends.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=class_extends.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_TITLESELECT"
-			titleNew="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_TITLENEW"
-			titleEdit="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_TITLEEDIT"
-			iconSelect="icon-copy"
-			select="true"
-			new="true"
-			edit="true"
-			clear="true"
+			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			default="0"
 			required="true"
-			class="input-large"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_DESCRIPTION"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_HINT"
+			button="true"
 		/>
 		<!-- Guid Field. Type: Text. (joomla) -->
 		<field

admin/forms/library_config.xml

@@ -121,28 +121,16 @@
 			default=""
 			icon="list">
 			<form hidden="true" name="list_addconfig_modal" repeat="true">
-				<!-- Field Field. Type: Modalselect. (custom) -->
+				<!-- Field Field. Type: Fields. (custom) -->
 				<field
-					type="ModalSelect"
+					type="fields"
 					name="field"
 					label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_LABEL"
-					sql_title_table="#__componentbuilder_field"
-					sql_title_column="name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlNew="index.php?option=com_componentbuilder&amp;task=field.add&amp;layout=modal&amp;tmpl=component"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=field.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_TITLESELECT"
-					iconSelect="icon-lamp"
-					select="true"
-					new="true"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
 					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_HINT"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false"
+					required="true"
+					button="false"
 				/>
 				<!-- Custom_value Field. Type: Textarea. (joomla) -->
 				<field

admin/forms/power.xml

@@ -177,28 +177,15 @@
 			max="30"
 			min="0">
 			<form hidden="true" name="list_load_selection_modal" repeat="true">
-				<!-- Load Field. Type: Modalselect. (custom) -->
+				<!-- Load Field. Type: Namespaces. (custom) -->
 				<field
-					type="ModalSelect"
+					type="namespaces"
 					name="load"
 					label="COM_COMPONENTBUILDER_POWER_LOAD_LABEL"
-					sql_title_table="#__componentbuilder_power"
-					sql_title_column="system_name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=powers&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlNew="index.php?option=com_componentbuilder&amp;task=power.add&amp;layout=modal&amp;tmpl=component"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=power.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_POWER_LOAD_TITLESELECT"
-					iconSelect="icon-flash"
-					select="true"
-					new="true"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
-					description="COM_COMPONENTBUILDER_POWER_LOAD_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_POWER_LOAD_HINT"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false"
+					default="0"
+					button="false"
 				/>
 			</form>
 		</field>
@@ -504,28 +491,16 @@
 			max="100"
 			min="0">
 			<form hidden="true" name="list_use_selection_modal" repeat="true">
-				<!-- Use Field. Type: Modalselect. (custom) -->
+				<!-- Use Field. Type: Namespaces. (custom) -->
 				<field
-					type="ModalSelect"
+					type="namespaces"
 					name="use"
 					label="COM_COMPONENTBUILDER_POWER_USE_LABEL"
-					sql_title_table="#__componentbuilder_power"
-					sql_title_column="system_name"
-					data-key-name="guid"
-					sql_title_key="guid"
-					urlSelect="index.php?option=com_componentbuilder&amp;view=powers&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					urlNew="index.php?option=com_componentbuilder&amp;task=power.add&amp;layout=modal&amp;tmpl=component"
-					urlEdit="index.php?option=com_componentbuilder&amp;task=power.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-					titleSelect="COM_COMPONENTBUILDER_POWER_USE_TITLESELECT"
-					iconSelect="icon-flash"
-					select="true"
-					new="true"
-					edit="true"
-					clear="true"
-					required="true"
-					class="input-large"
-					description="COM_COMPONENTBUILDER_POWER_USE_DESCRIPTION"
-					hint="COM_COMPONENTBUILDER_POWER_USE_HINT"
+					class="span12"
+					layout="joomla.form.field.list-fancy-select"
+					multiple="false"
+					default="0"
+					button="false"
 				/>
 				<!-- As Field. Type: Text. (joomla) -->
 				<field

admin/forms/site_view.xml

@@ -143,28 +143,16 @@
 			message="COM_COMPONENTBUILDER_SITE_VIEW_DESCRIPTION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_SITE_VIEW_DESCRIPTION_HINT"
 		/>
-		<!-- Main_get Field. Type: Modalselect. (custom) -->
+		<!-- Main_get Field. Type: Maingets. (custom) -->
 		<field
-			type="ModalSelect"
+			type="maingets"
 			name="main_get"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL"
-			sql_title_table="#__componentbuilder_dynamic_get"
-			sql_title_column="name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=dynamic_gets&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid&amp;filter[getgroup]=main"
-			urlNew="index.php?option=com_componentbuilder&amp;task=dynamic_get.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=dynamic_get.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_TITLESELECT"
-			titleEdit="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_TITLEEDIT"
-			iconSelect="icon-copy"
-			select="true"
-			new="false"
-			edit="true"
-			clear="true"
-			required="true"
-			class="input-large"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_DESCRIPTION"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			required="true"
+			button="true"
 		/>
 		<!-- Add_php_jview_display Field. Type: Radio. (joomla) -->
 		<field

admin/forms/snippet.xml

@@ -129,30 +129,16 @@
 			message="COM_COMPONENTBUILDER_SNIPPET_URL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_SNIPPET_URL_HINT"
 		/>
-		<!-- Type Field. Type: Modalselect. (custom) -->
+		<!-- Type Field. Type: Snippettype. (custom) -->
 		<field
-			type="ModalSelect"
+			type="snippettype"
 			name="type"
 			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_LABEL"
-			sql_title_table="#__componentbuilder_snippet_type"
-			sql_title_column="name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=snippet_types&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			urlNew="index.php?option=com_componentbuilder&amp;task=snippet_type.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=snippet_type.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_SNIPPET_TYPE_TITLESELECT"
-			titleNew="COM_COMPONENTBUILDER_SNIPPET_TYPE_TITLENEW"
-			titleEdit="COM_COMPONENTBUILDER_SNIPPET_TYPE_TITLEEDIT"
-			iconSelect="icon-copy"
-			select="true"
-			new="true"
-			edit="true"
-			clear="true"
-			required="true"
-			class="input-large"
 			description="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION"
-			hint="COM_COMPONENTBUILDER_SNIPPET_TYPE_HINT"
+			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			required="true"
 		/>
 		<!-- Heading Field. Type: Text. (joomla) -->
 		<field
@@ -168,30 +154,18 @@
 			message="COM_COMPONENTBUILDER_SNIPPET_HEADING_MESSAGE"
 			hint="COM_COMPONENTBUILDER_SNIPPET_HEADING_HINT"
 		/>
-		<!-- Library Field. Type: Modalselect. (custom) -->
+		<!-- Library Field. Type: Library. (custom) -->
 		<field
-			type="ModalSelect"
+			type="library"
 			name="library"
 			label="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_LABEL"
-			sql_title_table="#__componentbuilder_library"
-			sql_title_column="name"
-			data-key-name="guid"
-			sql_title_key="guid"
-			urlSelect="index.php?option=com_componentbuilder&amp;view=libraries&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			urlNew="index.php?option=com_componentbuilder&amp;task=library.add&amp;layout=modal&amp;tmpl=component"
-			urlEdit="index.php?option=com_componentbuilder&amp;task=library.edit&amp;guid={id}&amp;layout=modal&amp;tmpl=component&amp;titleKey=guid"
-			titleSelect="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_TITLESELECT"
-			titleNew="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_TITLENEW"
-			titleEdit="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_TITLEEDIT"
-			iconSelect="icon-copy"
-			select="true"
-			new="true"
-			edit="true"
-			clear="true"
-			required="true"
-			class="input-large"
 			description="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_DESCRIPTION"
-			hint="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_HINT"
+			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
+			multiple="false"
+			default="0"
+			required="true"
+			button="true"
 		/>
 		<!-- Guid Field. Type: Text. (joomla) -->
 		<field

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

@@ -318,9 +318,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_ERROR_UNIQUE_ALIAS="Another Admin Fields has t
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Admin Fields has the same alias ."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELDS="Fields"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION="Select a field"
-COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_HINT="Select a field"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL="Field"
-COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_TITLESELECT="Select a field"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_DESCRIPTION="Should this field be used as a filter in list view, if shown."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_LABEL="Filter"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_FULL_WIDTH_IN_TAB="Full Width in Tab"
@@ -516,9 +514,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL="Add PHP (postSaveHoo
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL="Add PHP (save Method - after data modeling)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL="Add MySQL - (Install)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION="Select an admin view"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_HINT="Select an admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL="View"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_TITLESELECT="Select an admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT_LABEL="Ajax Input"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_DESCRIPTION="Select the field/s you would like to use to build the alias."
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_LABEL="Alias Builder"
@@ -1485,12 +1481,7 @@ COM_COMPONENTBUILDER_CLASS_METHOD_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_CLASS_METHOD_ID="Id"
 COM_COMPONENTBUILDER_CLASS_METHOD_INIT_BUTTON_ACCESS="Class Method Init Button Access"
 COM_COMPONENTBUILDER_CLASS_METHOD_INIT_BUTTON_ACCESS_DESC="Allows the users in this group to access the init button."
-COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_DESCRIPTION="Select a plugin group"
-COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_HINT="Select an Plugin Group"
 COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_LABEL="Joomla Plugin Group"
-COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_TITLEEDIT="Edit Plugin Group"
-COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_TITLENEW="New Plugin Group"
-COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_TITLESELECT="Select Plugin Group"
 COM_COMPONENTBUILDER_CLASS_METHOD_MODIFIED_BY_DESC="The last user that modified this Class Method."
 COM_COMPONENTBUILDER_CLASS_METHOD_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_CLASS_METHOD_MODIFIED_DATE_DESC="The date this Class Method was modified."
@@ -1593,12 +1584,7 @@ COM_COMPONENTBUILDER_CLASS_PROPERTY_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_ID="Id"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_INIT_BUTTON_ACCESS="Class Property Init Button Access"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_INIT_BUTTON_ACCESS_DESC="Allows the users in this group to access the init button."
-COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_DESCRIPTION="Select a plugin group"
-COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_HINT="Select an Plugin Group"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_LABEL="Joomla Plugin Group"
-COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_TITLEEDIT="Edit Plugin Group"
-COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_TITLENEW="New Plugin Group"
-COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_TITLESELECT="Select Plugin Group"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_MODIFIED_BY_DESC="The last user that modified this Class Property."
 COM_COMPONENTBUILDER_CLASS_PROPERTY_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_MODIFIED_DATE_DESC="The date this Class Property was modified."
@@ -2253,9 +2239,7 @@ COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADDRESS="Address"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADD_API_DESCRIPTION="add API option to this admin view. (only Joomla 4+)"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADD_API_LABEL="API"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_DESCRIPTION="Select an admin view"
-COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_HINT="Select an admin view"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_LABEL="View"
-COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_TITLESELECT="Select an admin view"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ARCHIVE="Archive"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ARROW_DOWN="Arrow Down"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ARROW_DOWN_2="Arrow Down 2"
@@ -2540,9 +2524,7 @@ COM_COMPONENTBUILDER_COMPONENT_CONFIG_EDIT="Editing the Component Config"
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_ERROR_UNIQUE_ALIAS="Another Component Config has the same alias."
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Component Config has the same alias ."
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION="Select a field"
-COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_HINT="Select a field"
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_LABEL="Field"
-COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_TITLESELECT="Select a field"
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_ID="Id"
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_DESCRIPTION="Select a Joomla Component"
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_LABEL="Component"
@@ -2689,9 +2671,7 @@ COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CREDIT="Credit"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CREDIT_2="Credit 2"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUBE="Cube"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_DESCRIPTION="Select a custom admin view"
-COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_HINT="Select a custom admin view"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_LABEL="View"
-COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_TITLESELECT="Select a custom admin view"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_DASHBOARD="Dashboard"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESCRIPTION="Select if the view should show on the dashboard."
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_LABEL="Dashboard (list of records)"
@@ -3237,9 +3217,7 @@ COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_LABEL="Public Access"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Component Site Views to customise the alias."
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_DESCRIPTION="Select a site view"
-COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_HINT="Select a site view"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_LABEL="View"
-COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_TITLESELECT="Select a site view"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_STATUS="Status"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VERSION_DESC="A count of the number of times this Component Site Views has been revised."
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VERSION_LABEL="Version"
@@ -3330,22 +3308,11 @@ COM_COMPONENTBUILDER_CONFIG_AUTHOR_EMAIL_DESC="The email address of the author o
 COM_COMPONENTBUILDER_CONFIG_AUTHOR_EMAIL_LABEL="Author Email"
 COM_COMPONENTBUILDER_CONFIG_AUTHOR_NAME_DESC="The name of the author of this component."
 COM_COMPONENTBUILDER_CONFIG_AUTHOR_NAME_LABEL="Author Name"
-COM_COMPONENTBUILDER_CONFIG_AUTO_BACKUP="Auto Backup"
 COM_COMPONENTBUILDER_CONFIG_AUTO_LOAD="Auto"
-COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_DESCRIPTION="You can run a cronjob that will backup all your components as they are mapped in JCB.<br /><br /><b>USE THE FOLLOWING:</b> <span id='cronjob-backup'>loading...<span class='loading-backup-dots' ></span></span><br /><br />Please note that if your Joomla website has a Firewall installed, it will not allow cronjob via direct URL (most of the time), you will then need to adapt the cornjob request to look like a browser. For more info please read https://stackoverflow.com/a/31597823/1429677<script  type='text/javascript'>document.addEventListener('DOMContentLoaded', function() {    var inputs = document.forms[0].querySelectorAll('input');    Array.prototype.forEach.call(inputs, function(elm) {        if (elm.name.length === 32 && elm.type === 'hidden') {            var value = elm.value;            if (value === '1') {                token = elm.name;            }        }    });    let x = 0;    var intervalBackup = setInterval(function() {        let dots = '';        x++;        for (var y = 0; y < x % 11; y++) {            dots += '.';        }        let loading_dots = document.querySelector('.loading-backup-dots');        if (loading_dots) {            loading_dots.textContent = dots;        } else {            clearInterval(intervalBackup);        }    }, 500);    getCronPath('backup', token);});function getCronPath_server(getType, token) {    let getUrl = 'index.php?option=com_componentbuilder&task=ajax.getCronPath&format=json&raw=true';    if (token.length > 0 && getType.length > 0) {        var request = new URLSearchParams({ token: token, getType: getType });    }    return fetch(getUrl + '&' + request, {        method: 'GET',        headers: {            'Accept': 'application/json'        }    }).then(response => response.json());}function getCronPath(getType, token) {    getCronPath_server(getType, token).then(function(result) {        let cronJobElement = document.getElementById('cronjob-' + getType);        if (result.path) {            cronJobElement.innerHTML = result.path;        } else if (result.error) {            cronJobElement.innerHTML = result.error;        } else {            cronJobElement.innerHTML = '<span style=&quot;color: red;&quot;>Error loading path!</span>';        }    });}</script>"
-COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_LABEL="Backup JCB Mapped Components"
-COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_DESCRIPTION="Enter the email where the <b>backup key</b> should be send. It will only send an email if a key change is detected, and not on every backup."
-COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_HINT="Email Address Here"
-COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_LABEL="Email (backup key)"
-COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_MESSAGE="Error! Please add email address here."
 COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_DESCRIPTION="Here you can set the path to the backup folder."
 COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_HINT="/home/user/backup"
 COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_LABEL="Backup Folder Path"
 COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_MESSAGE="Error! Please add folder path here."
-COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_DESCRIPTION="Enter Package Name Here"
-COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_HINT="JCB_Backup_[YEAR]_[MONTH]_[DAY]"
-COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_LABEL="Package Name"
-COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_DESC="Set the basic local key here."
 COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_LABEL="Basic Key"
 COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_NOTE_DESC="When using the basic encryption please use set a 32 character passphrase.<br />Never change this passphrase once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>"
@@ -3376,14 +3343,6 @@ COM_COMPONENTBUILDER_CONFIG_COMPONENT_CUSTOM_ADMIN_VIEWS_ADDCUSTOM_ADMIN_VIEWS="
 COM_COMPONENTBUILDER_CONFIG_COMPONENT_DASHBOARD_DASHBOARD_TAB="Component Dashboard (dashboard_tab)"
 COM_COMPONENTBUILDER_CONFIG_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS="Component Site Views (addsite_views)"
 COM_COMPONENTBUILDER_CONFIG_COMPONENT_UPDATES_VERSION_UPDATE="Component Updates (version_update)"
-COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_DESCRIPTION="Here you can set the path to where all components are backed up to."
-COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_HINT="/home/user/fullbackup"
-COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_LABEL="Cronjob Backup Folder Path"
-COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_MESSAGE="Error! Please add some text here."
-COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_DESCRIPTION="Select your backup server for JCB package backups."
-COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_LABEL="Cronjob Backup Server"
-COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_DESCRIPTION="Select how you would like to backup JCB"
-COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_LABEL="Cronjob Backup type"
 COM_COMPONENTBUILDER_CONFIG_CUSTOM_ADMIN_VIEWS_AJAX_INPUT="Custom Admin Views (ajax_input)"
 COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_DESCRIPTION="Here you can set the path to the custom folder"
 COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_HINT="/home/user/custom"
@@ -3454,8 +3413,6 @@ COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_DESCRIPTION="Enter Email"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_HINT="Email Here"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_LABEL="Email"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_MESSAGE="Error! Please email address here."
-COM_COMPONENTBUILDER_CONFIG_EXPORT_LANGUAGE_STRINGS_DESCRIPTION="All the export of language strings during JCB package export."
-COM_COMPONENTBUILDER_CONFIG_EXPORT_LANGUAGE_STRINGS_LABEL="Export Language Strings"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_DESCRIPTION="Add License Here"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_HINT="Add License Here"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_LABEL="License"
@@ -3495,12 +3452,9 @@ COM_COMPONENTBUILDER_CONFIG_GLOBAL_DESC="The Global Parameters"
 COM_COMPONENTBUILDER_CONFIG_GLOBAL_LABEL="Global"
 COM_COMPONENTBUILDER_CONFIG_GRADIANT_LOAD="Gradient"
 COM_COMPONENTBUILDER_CONFIG_HIDE="Hide"
-COM_COMPONENTBUILDER_CONFIG_IMPORT_GUID_ONLY_DESCRIPTION="Force that all JCB package import (search for local items) is done with GUID value only."
-COM_COMPONENTBUILDER_CONFIG_IMPORT_GUID_ONLY_LABEL="Import by GUID only!"
 COM_COMPONENTBUILDER_CONFIG_INACTIVE="Inactive"
 COM_COMPONENTBUILDER_CONFIG_INTELLIGENT_ADDREMOVEIF="Intelligent (add&remove+if)"
 COM_COMPONENTBUILDER_CONFIG_JCB_COMMUNITY_PACKAGES="JCB Community Packages"
-COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGES="JCB Packages"
 COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION="Here you can manage what package directories show in the JCB package import area."
 COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_LABEL="Directories"
 COM_COMPONENTBUILDER_CONFIG_JCB_POWERS_PATH_DESCRIPTION="Here you can set the path to the powers folder. Recommended that you always place it inside the <b>libraries</b>. You don't need to add a full path here, so <b>libraries/jcb_powers</b> will mean <i>/home/username/public_html/libraries/jcb_powers</i> when installed. You should always use two folders here, libraries + one more for example: <br /><code>libraries/jcb_powers</code>"
@@ -3515,7 +3469,7 @@ COM_COMPONENTBUILDER_CONFIG_JQUERY_LOAD_LABEL="Load Joomla jQuery"
 COM_COMPONENTBUILDER_CONFIG_JQUERY_REMOVE="Remove jQuery"
 COM_COMPONENTBUILDER_CONFIG_LANGUAGE_LABEL="Language"
 COM_COMPONENTBUILDER_CONFIG_LAYOUT_LABEL="Layout"
-COM_COMPONENTBUILDER_CONFIG_LOCAL_FOLDER="Local Folder"
+COM_COMPONENTBUILDER_CONFIG_LEGACY_MODE="Legacy Mode"
 COM_COMPONENTBUILDER_CONFIG_LOCAL_POWERS_REPOSITORY_PATH_DESCRIPTION="Here you can set the path to the super powers local repository folder, where <b>[layer:core]</b> and all targeted <b>[layer:own]</b> sub paths will be placed with their selective <b>[switch:approved]</b> powers."
 COM_COMPONENTBUILDER_CONFIG_LOCAL_POWERS_REPOSITORY_PATH_HINT="/home/power"
 COM_COMPONENTBUILDER_CONFIG_LOCAL_POWERS_REPOSITORY_PATH_LABEL="Local Powers Repository Path"
@@ -3563,14 +3517,11 @@ COM_COMPONENTBUILDER_CONFIG_OFF="Off"
 COM_COMPONENTBUILDER_CONFIG_ON="On"
 COM_COMPONENTBUILDER_CONFIG_ONLY_EXTRA="Only Extra"
 COM_COMPONENTBUILDER_CONFIG_ORIGINAL_VDM="Original (VDM)"
-COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_DESCRIPTION="<code>[YEAR]</code> <code>[MONTH]</code> <code>[DAY]</code> <code>[HOUR]</code> <code>[MINUTE]</code>"
-COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_LABEL="Package Name Placeholders"
 COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_DESCRIPTION="Select percentage any language should be translated before the system should add the language to the component during compilation."
 COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_LABEL="Add Language if %? ready."
 COM_COMPONENTBUILDER_CONFIG_PHP_MAIL="PHP Mail"
 COM_COMPONENTBUILDER_CONFIG_POWERS_REPOSITORY_DESCRIPTION="This adds powers to a local repository folder. All <b>approved</b> powers, linked to a component, will during compiling be moved to your <b>local</b> powers repository folder into their selective target paths."
 COM_COMPONENTBUILDER_CONFIG_POWERS_REPOSITORY_LABEL="Activate Super Powers?"
-COM_COMPONENTBUILDER_CONFIG_REMOTE_SERVER="Remote Server"
 COM_COMPONENTBUILDER_CONFIG_REPEATABLETABLE_JOOMLA="Repeatable-table (joomla)"
 COM_COMPONENTBUILDER_CONFIG_REPEATABLE_JOOMLA="Repeatable (Joomla)"
 COM_COMPONENTBUILDER_CONFIG_REPEATABLE_UIKIT="Repeatable (UIkit)"
@@ -3895,8 +3846,6 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LOCK="Lock"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LOOP="Loop"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION="Select a main get"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL="Main Get"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_TITLEEDIT="Edit Main Get"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_TITLESELECT="Select Targetview"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MENU="Menu"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MENU_2="Menu 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MENU_3="Menu 3"
@@ -4202,7 +4151,6 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_DESCRIPTION="How To Add the Code to the fi
 COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL="Add Type"
 COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_DESC="A count of the number of times this Custom Code has been revised."
 COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_LABEL="Version"
-COM_COMPONENTBUILDER_CUSTOM_GET="Custom Get"
 COM_COMPONENTBUILDER_CUSTOM_PHP="Custom PHP"
 COM_COMPONENTBUILDER_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_DASH="Dashboard"
@@ -4553,16 +4501,9 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_DESCRIPTION="Fields to be select
 COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_HINT="a.field AS field"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_LABEL="Selection"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_DESCRIPTION="Select a back-end view"
-COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_HINT="Select an Admin View"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_LABEL="View Table"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION="Select a back-end view"
-COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_HINT="Select a back-end view"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL="View Table (main)"
-COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_TITLEEDIT="Edit an Admin View"
-COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_TITLENEW="New Admin View"
-COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_TITLESELECT="Select an Admin View"
-COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_TITLEEDIT="Edit an Admin View"
-COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_TITLESELECT="Select Admin View"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VV="vv"
 COM_COMPONENTBUILDER_DYNAMIC_GET_W="w"
 COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_DESCRIPTION="Here you can add where to the query."
@@ -5195,6 +5136,7 @@ COM_COMPONENTBUILDER_FILTER_SELECT_INDEXES_TYPE="Select Indexes Type"
 COM_COMPONENTBUILDER_FILTER_SELECT_JOOMLA_PLUGIN_GROUP="Select Joomla Plugin Group"
 COM_COMPONENTBUILDER_FILTER_SELECT_LIBRARY="Select Library"
 COM_COMPONENTBUILDER_FILTER_SELECT_LOCATION="Select Location"
+COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_GET="Select Main Get"
 COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_SOURCE="Select Main Source"
 COM_COMPONENTBUILDER_FILTER_SELECT_MODELLING_METHOD="Select Modelling Method"
 COM_COMPONENTBUILDER_FILTER_SELECT_NAME="Select Name"
@@ -5262,6 +5204,7 @@ COM_COMPONENTBUILDER_GET_PACKAGE="Get Package"
 COM_COMPONENTBUILDER_GIVE_TO_JCB="Give to JCB"
 COM_COMPONENTBUILDER_GLOBAL="Global"
 COM_COMPONENTBUILDER_GLUECODE="Glue/Code"
+COM_COMPONENTBUILDER_GO_BACK_TO_S_LIST_VIEW="Go back to %s list view."
 COM_COMPONENTBUILDER_GRAB_THE_LATEST_S_TESTING_RELEASE="Grab the latest %s testing release!"
 COM_COMPONENTBUILDER_GREAT_THIS_FUNCTION_NAME_WILL_WORK="Great, this function name will work!"
 COM_COMPONENTBUILDER_GREAT_THIS_PLACEHOLDER_WILL_WORK="Great, this placeholder will work!"
@@ -5451,28 +5394,28 @@ COM_COMPONENTBUILDER_INDENTATION_OPTIONS="Indentation Options"
 COM_COMPONENTBUILDER_INIT="Init"
 COM_COMPONENTBUILDER_INITIALIZATION_SELECTION="Selection"
 COM_COMPONENTBUILDER_INITIALIZATION_SELECTION_DESC="Initialization Selection"
-COM_COMPONENTBUILDER_INITIALIZE_ADMIN_VIEWS="Initialize Admin Views"
-COM_COMPONENTBUILDER_INITIALIZE_CLASS_EXTENDS="Initialize Class Extends"
-COM_COMPONENTBUILDER_INITIALIZE_CLASS_METHODS="Initialize Class Methods"
-COM_COMPONENTBUILDER_INITIALIZE_CLASS_PROPERTIES="Initialize Class Properties"
-COM_COMPONENTBUILDER_INITIALIZE_COMPONENTS="Initialize Components"
-COM_COMPONENTBUILDER_INITIALIZE_CUSTOM_ADMIN_VIEWS="Initialize Custom Admin Views"
-COM_COMPONENTBUILDER_INITIALIZE_CUSTOM_CODES="Initialize Custom Codes"
-COM_COMPONENTBUILDER_INITIALIZE_DYNAMIC_GETS="Initialize Dynamic Gets"
-COM_COMPONENTBUILDER_INITIALIZE_FIELDS="Initialize Fields"
-COM_COMPONENTBUILDER_INITIALIZE_FIELD_TYPES="Initialize Field Types"
-COM_COMPONENTBUILDER_INITIALIZE_JOOMLA_POWERS="Initialize Joomla Powers"
-COM_COMPONENTBUILDER_INITIALIZE_LAYOUTS="Initialize Layouts"
-COM_COMPONENTBUILDER_INITIALIZE_LIBRARIES="Initialize Libraries"
-COM_COMPONENTBUILDER_INITIALIZE_MODULES="Initialize Modules"
-COM_COMPONENTBUILDER_INITIALIZE_PLACEHOLDERS="Initialize Placeholders"
-COM_COMPONENTBUILDER_INITIALIZE_PLUGINS="Initialize Plugins"
-COM_COMPONENTBUILDER_INITIALIZE_POWERS="Initialize Powers"
-COM_COMPONENTBUILDER_INITIALIZE_REPOSITORIES="Initialize Repositories"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESADMIN_VIEWSA="Initialize <a href=%s title=%s>Admin Views</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESCLASS_EXTENDSA="Initialize <a href=%s title=%s>Class Extends</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESCLASS_METHODSA="Initialize <a href=%s title=%s>Class Methods</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESCLASS_PROPERTIESA="Initialize <a href=%s title=%s>Class Properties</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESCOMPONENTSA="Initialize <a href=%s title=%s>Components</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESCUSTOM_ADMIN_VIEWSA="Initialize <a href=%s title=%s>Custom Admin Views</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESCUSTOM_CODESA="Initialize <a href=%s title=%s>Custom Codes</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESDYNAMIC_GETSA="Initialize <a href=%s title=%s>Dynamic Gets</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESFIELDSA="Initialize <a href=%s title=%s>Fields</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESFIELD_TYPESA="Initialize <a href=%s title=%s>Field Types</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESJOOMLA_POWERSA="Initialize <a href=%s title=%s>Joomla Powers</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESLAYOUTSA="Initialize <a href=%s title=%s>Layouts</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESLIBRARIESA="Initialize <a href=%s title=%s>Libraries</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESMODULESA="Initialize <a href=%s title=%s>Modules</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESPLACEHOLDERSA="Initialize <a href=%s title=%s>Placeholders</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESPLUGINSA="Initialize <a href=%s title=%s>Plugins</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESPOWERSA="Initialize <a href=%s title=%s>Powers</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESREPOSITORIESA="Initialize <a href=%s title=%s>Repositories</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESSITE_VIEWSA="Initialize <a href=%s title=%s>Site Views</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESSNIPPETSA="Initialize <a href=%s title=%s>Snippets</a>"
+COM_COMPONENTBUILDER_INITIALIZE_A_HREFS_TITLESTEMPLATESA="Initialize <a href=%s title=%s>Templates</a>"
 COM_COMPONENTBUILDER_INITIALIZE_SELECTED_S_ITEMS="Initialize selected [%s] items"
-COM_COMPONENTBUILDER_INITIALIZE_SITE_VIEWS="Initialize Site Views"
-COM_COMPONENTBUILDER_INITIALIZE_SNIPPETS="Initialize Snippets"
-COM_COMPONENTBUILDER_INITIALIZE_TEMPLATES="Initialize Templates"
 COM_COMPONENTBUILDER_INVALID_AREA_SELECTED="Invalid area selected."
 COM_COMPONENTBUILDER_INVALID_COMPONENT_OBJECT_MISSING_REQUIRED_PROPERTIES="Invalid component object: Missing required properties."
 COM_COMPONENTBUILDER_INVALID_REPO_SELECTED="Invalid repo selected."
@@ -6077,6 +6020,8 @@ COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_DESCRIPTION="You can add a h
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_HEADER_DESCRIPTION="You can add your own custom helper header script."
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_HEADER_LABEL="Add Class Helper Header"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_LABEL="Add Class Helper"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_DEFAULT_HEADER_DESCRIPTION="You can add your own default header script."
+COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_DEFAULT_HEADER_LABEL="Add Default Header"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_METHOD_UNINSTALL_LABEL="Add PHP to the uninstall method"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_POSTFLIGHT_INSTALL_LABEL="Add PHP in the postflight install (event)"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_POSTFLIGHT_UPDATE_LABEL="Add PHP in the postflight update (event)"
@@ -6106,6 +6051,8 @@ COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_VALUE_DESCRIPTION="Enter custom value
 COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_VALUE_HINT="Custom Value Here"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_VALUE_LABEL="Custom Value"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_DESCRIPTION="Add the code here."
+COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_HEADER_DESCRIPTION="The default header for the Module Template."
+COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_HEADER_LABEL="Default Header"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_LABEL="Default Tmpl"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_DESCRIPTION_HINT="Add Description Here"
@@ -6123,11 +6070,9 @@ COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELDS_NAME_DESCRIPTION="Leave default if you
 COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELDS_NAME_HINT="params"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELDS_NAME_LABEL="Fields Name"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELDS_RULES_PATHS_DESCRIPTION="Where should the <b>custom</b> fields and rules be placed."
-COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELDS_RULES_PATHS_LABEL="Fields & Rules Paths"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELDS_RULES_PATHS_LABEL="Fields & Rules Location"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_DESCRIPTION="Select a field"
-COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_HINT="Select a field"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_LABEL="Field"
-COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_TITLESELECT="Select a field"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS="Joomla Module Files, Folders & URLs"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_ADDFILESFULLPATH_DESCRIPTION="Add files to this component using the full path."
 COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_ADDFILESFULLPATH_LABEL="Files (full path)"
@@ -6217,6 +6162,8 @@ COM_COMPONENTBUILDER_JOOMLA_MODULE_INIT_BUTTON_ACCESS_DESC="Allows the users in
 COM_COMPONENTBUILDER_JOOMLA_MODULE_LABEL_DESCRIPTION="Not mandatory, used to Label the Fieldset"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_LABEL_HINT="Name"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_LABEL_LABEL="Label"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_LAYOUT_DATA_DESCRIPTION="The code in getLayoutData lets you adapt/extend data before rendering, with $helper, $data, and $params extracted into template variables."
+COM_COMPONENTBUILDER_JOOMLA_MODULE_LAYOUT_DATA_LABEL="getLayoutData<br><small>(only for Joomla 4+)</small>"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_LIBRARIES_DESCRIPTION="Select the media libraries you want to use here."
 COM_COMPONENTBUILDER_JOOMLA_MODULE_LIBRARIES_LABEL="Media Libraries"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_MODIFIED_BY_DESC="The last user that modified this Joomla Module."
@@ -6230,8 +6177,8 @@ COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_DESCRIPTION="Add Version Numbe
 COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_HINT="1.0.0"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_MESSAGE="Error! Please add version here."
-COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_DESCRIPTION="The code that is added to the main mod_name.php file"
-COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_LABEL="Module Code"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_DESCRIPTION="The code that is added to the main mod_name.php file in a Joomla 3 build."
+COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_LABEL="Module Code<br><small>(only for Joomla 3)</small>"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_MYSQL="MySQL"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NAME_HINT="Name Here"
@@ -6242,6 +6189,8 @@ COM_COMPONENTBUILDER_JOOMLA_MODULE_NO="No"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NONE="None"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?php echo Text::_(&apos;Text&apos;); ?&gt;</code><br /><code>&lt;?php echo Text::sprintf(&apos;Hello %s&apos;, $this->user->name); ?&gt;</code><br /><b>Just get UPPERCASE language string:</b><br /><code>&lt;?php echo JustTEXT::_(&apos;Text&apos;); ?&gt;</code>"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_PHP_LANGUAGE_STRING_LABEL="Add PHP Language String"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LAYOUT_DATA_DESCRIPTION="<p>Code entered here is injected into the module's <code>getLayoutData</code> method in the dispatcher, after helper and data classes have been loaded. Within this method, your helper are available under <code>$data['helper']</code> and any custom gets under <code>$data['data']</code> and params are in <code>$data['params']</code>. Since the <code>$data</code> array is extracted before rendering the layout, these become direct variables in the template, (example <code>$data['helper']</code> becomes <code>$helper</code>). This allows you to adapt or extend the data passed to the module layout just before it is displayed.</p>"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LAYOUT_DATA_LABEL="Dispatcher getLayoutData Method"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LIBRARIES_OPTIONS_DESCRIPTION="<p>All libraries added to modules are added to the component media folder for now</p><p>So over here you are able to manually add HTML code to your model default tmpl.</p>"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LIBRARIES_OPTIONS_LABEL="Libraries Options"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LINKED_TO_NOTICE_DESCRIPTION="<div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>"
@@ -6509,12 +6458,7 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SALES_SERVER_LABEL="Add Sales Server"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SQL_LABEL="Add MySQL - (Install)"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SQL_UNINSTALL_LABEL="Add MySQL - (Uninstall)"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_UPDATE_SERVER_LABEL="Add Update Server"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_DESCRIPTION="Enter a class extends"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_HINT="Select a Class Extends"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_LABEL="Extends"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_TITLEEDIT="Edit Class Extends"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_TITLENEW="New Class Extends"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_TITLESELECT="Select Class Extends"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CODE="Code"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_COMPONENT="Component"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CREATED_BY_DESC="The user that created this Joomla Plugin."
@@ -6540,11 +6484,9 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_NAME_DESCRIPTION="Leave default if you
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_NAME_HINT="params"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_NAME_LABEL="Fields Name"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_RULES_PATHS_DESCRIPTION="Where should the <b>custom</b> fields and rules be placed."
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_RULES_PATHS_LABEL="Fields & Rules Paths"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_RULES_PATHS_LABEL="Fields & Rules Location"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_DESCRIPTION="Select a field"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_HINT="Select a field"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_LABEL="Field"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_TITLESELECT="Select a field"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS="Joomla Plugin Files, Folders & URLs"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_ADDFILESFULLPATH_DESCRIPTION="Add files to this component using the full path."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_ADDFILESFULLPATH_LABEL="Files (full path)"
@@ -6655,12 +6597,7 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_N_ITEMS_UNFEATURED="%s Joomla Plugin G
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_N_ITEMS_UNFEATURED_1="%s Joomla Plugin Group unfeatured."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_N_ITEMS_UNPUBLISHED="%s Joomla Plugin Groups unpublished."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_N_ITEMS_UNPUBLISHED_1="%s Joomla Plugin Group unpublished."
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_DESCRIPTION="Enter a class extends"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_HINT="Select a Class Extends"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_LABEL="Extends"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_TITLEEDIT="Edit Class Extends"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_TITLENEW="New Class Extends"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_TITLESELECT="Select Class Extends"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CREATED_BY_DESC="The user that created this Joomla Plugin Group."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CREATED_DATE_DESC="The date this Joomla Plugin Group was created."
@@ -6697,12 +6634,7 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_LABEL="Class Header"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ID="Id"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_INIT_BUTTON_ACCESS="Joomla Plugin Init Button Access"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_INIT_BUTTON_ACCESS_DESC="Allows the users in this group to access the init button."
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_DESCRIPTION="Select a plugin group"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_HINT="Select an Plugin Group"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_LABEL="Joomla Plugin Group"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_TITLEEDIT="Edit Plugin Group"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_TITLENEW="New Plugin Group"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_TITLESELECT="Select Plugin Group"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_LABEL_DESCRIPTION="Not mandatory, used to Label the Fieldset"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_LABEL_HINT="Name"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_LABEL_LABEL="Label"
@@ -7369,9 +7301,7 @@ COM_COMPONENTBUILDER_LIBRARY_CONFIG_EDIT="Editing the Library Config"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ERROR_UNIQUE_ALIAS="Another Library Config has the same alias."
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Library Config has the same alias ."
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_DESCRIPTION="Select a field"
-COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_HINT="Select a field"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_LABEL="Field"
-COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_TITLESELECT="Select a field"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ID="Id"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_LIBRARY_DESCRIPTION="Select a library."
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_LIBRARY_LABEL="Library"
@@ -7585,7 +7515,6 @@ COM_COMPONENTBUILDER_LOCAL="Local"
 COM_COMPONENTBUILDER_LOCAL_GET="Local (get)"
 COM_COMPONENTBUILDER_LOCAL_POWERS_REPOSITORY_PATH="Local Powers Repository Path"
 COM_COMPONENTBUILDER_LOGIN_FAILED="Login failed"
-COM_COMPONENTBUILDER_MAIN_GET="Main Get"
 COM_COMPONENTBUILDER_MAIN_MENU="Main Menu"
 COM_COMPONENTBUILDER_MAKE_A_DIFFERENCE_WITH_JCB="Make a Difference with JCB"
 COM_COMPONENTBUILDER_MAKE_YOUR_SELECTION="Make your selection"
@@ -7891,14 +7820,11 @@ COM_COMPONENTBUILDER_POWER_JOOMLASUPERPOWERS="joomla/super-powers"
 COM_COMPONENTBUILDER_POWER_LICENSING="Licensing"
 COM_COMPONENTBUILDER_POWER_LICENSING_TEMPLATE_HINT="/** * @package    Joomla.Component.Builder * * @created    4th September, 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 */"
 COM_COMPONENTBUILDER_POWER_LICENSING_TEMPLATE_LABEL="Licensing Template"
-COM_COMPONENTBUILDER_POWER_LOAD_DESCRIPTION="Select a power"
-COM_COMPONENTBUILDER_POWER_LOAD_HINT="Select a power to load"
 COM_COMPONENTBUILDER_POWER_LOAD_LABEL="load"
 COM_COMPONENTBUILDER_POWER_LOAD_POWERS_NOTE_DESCRIPTION="<p>When you would like to load a power to the project, but you do not want that power to be part of the <b>use namespace declarations</b> in the header of this power.</p><p>You do not need to again select any power that is already selected in the <b>Extends</b>, <b>Implements</b>, or <b>Use Selection</b> fields, since they are already being loaded.</p>"
 COM_COMPONENTBUILDER_POWER_LOAD_POWERS_NOTE_LABEL="When to Load Powers Here?"
 COM_COMPONENTBUILDER_POWER_LOAD_SELECTION_DESCRIPTION="Select powers that you want to make sure also load when this power is loaded."
 COM_COMPONENTBUILDER_POWER_LOAD_SELECTION_LABEL="Load Powers"
-COM_COMPONENTBUILDER_POWER_LOAD_TITLESELECT="Select a power"
 COM_COMPONENTBUILDER_POWER_MAIN_CLASS_CODE_DESCRIPTION="Add the properties & methods here."
 COM_COMPONENTBUILDER_POWER_MAIN_CLASS_CODE_LABEL="Properties & Methods"
 COM_COMPONENTBUILDER_POWER_METHOD_LABEL="Methods"
@@ -7951,14 +7877,12 @@ COM_COMPONENTBUILDER_POWER_SYSTEM_NAME_MESSAGE="Error! Please add some text here
 COM_COMPONENTBUILDER_POWER_TRAIT="trait"
 COM_COMPONENTBUILDER_POWER_TYPE_DESCRIPTION="The type of power being build"
 COM_COMPONENTBUILDER_POWER_TYPE_LABEL="Type of Power"
-COM_COMPONENTBUILDER_POWER_USE_DESCRIPTION="Select a power"
 COM_COMPONENTBUILDER_POWER_USE_GLOBAL="Use Global"
 COM_COMPONENTBUILDER_POWER_USE_HINT="Name\Project\ClassName"
 COM_COMPONENTBUILDER_POWER_USE_LABEL="Use"
 COM_COMPONENTBUILDER_POWER_USE_MESSAGE="Error! Please add namespace here."
 COM_COMPONENTBUILDER_POWER_USE_SELECTION_DESCRIPTION="Select namespace you want to use in your power."
 COM_COMPONENTBUILDER_POWER_USE_SELECTION_LABEL="Use Selection"
-COM_COMPONENTBUILDER_POWER_USE_TITLESELECT="Select a power"
 COM_COMPONENTBUILDER_POWER_VERSION_DESC="A count of the number of times this Power has been revised."
 COM_COMPONENTBUILDER_POWER_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_POWER_YES="Yes"
@@ -8189,7 +8113,6 @@ COM_COMPONENTBUILDER_SELECT_BRANCH_STATE="Select Branch State"
 COM_COMPONENTBUILDER_SELECT_BUILD_DATE="Select Build Date"
 COM_COMPONENTBUILDER_SELECT_COMPONENT="Select Component"
 COM_COMPONENTBUILDER_SELECT_EXTENSION="Select Extension"
-COM_COMPONENTBUILDER_SELECT_GET_GROUP="Select Get Group"
 COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE="Select the component to compile"
 COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_SEARCH="Select the component to search"
 COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_YOUR_WOULD_LIKE_TO_IMPORT="Select the component your would like to import."
@@ -8586,8 +8509,6 @@ COM_COMPONENTBUILDER_SITE_VIEW_LOCK="Lock"
 COM_COMPONENTBUILDER_SITE_VIEW_LOOP="Loop"
 COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_DESCRIPTION="Select a main get"
 COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL="Main Get"
-COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_TITLEEDIT="Edit Main Get"
-COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_TITLESELECT="Select Targetview"
 COM_COMPONENTBUILDER_SITE_VIEW_MENU="Menu"
 COM_COMPONENTBUILDER_SITE_VIEW_MENU_2="Menu 2"
 COM_COMPONENTBUILDER_SITE_VIEW_MENU_3="Menu 3"
@@ -8856,11 +8777,7 @@ COM_COMPONENTBUILDER_SNIPPET_ID="Id"
 COM_COMPONENTBUILDER_SNIPPET_INIT_BUTTON_ACCESS="Snippet Init Button Access"
 COM_COMPONENTBUILDER_SNIPPET_INIT_BUTTON_ACCESS_DESC="Allows the users in this group to access the init button."
 COM_COMPONENTBUILDER_SNIPPET_LIBRARY_DESCRIPTION="Select a library."
-COM_COMPONENTBUILDER_SNIPPET_LIBRARY_HINT="Select a Library"
 COM_COMPONENTBUILDER_SNIPPET_LIBRARY_LABEL="Library"
-COM_COMPONENTBUILDER_SNIPPET_LIBRARY_TITLEEDIT="Edit Library"
-COM_COMPONENTBUILDER_SNIPPET_LIBRARY_TITLENEW="New Library"
-COM_COMPONENTBUILDER_SNIPPET_LIBRARY_TITLESELECT="Select Library"
 COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_DESC="The last user that modified this Snippet."
 COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_DESC="The date this Snippet was modified."
@@ -8941,7 +8858,6 @@ COM_COMPONENTBUILDER_SNIPPET_TYPE_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Snippet
 COM_COMPONENTBUILDER_SNIPPET_TYPE_GUID_DESCRIPTION="Globally Unique Identifier"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_GUID_HINT="Auto Generated"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_GUID_LABEL="GUID"
-COM_COMPONENTBUILDER_SNIPPET_TYPE_HINT="Select a Snippet Type"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_ID="Id"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_MODIFIED_BY_DESC="The last user that modified this Snippet Type."
@@ -8958,9 +8874,6 @@ COM_COMPONENTBUILDER_SNIPPET_TYPE_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Snippet Type to customise the alias."
 COM_COMPONENTBUILDER_SNIPPET_TYPE_STATUS="Status"
-COM_COMPONENTBUILDER_SNIPPET_TYPE_TITLEEDIT="Edit Snippet Type"
-COM_COMPONENTBUILDER_SNIPPET_TYPE_TITLENEW="New Snippet Type"
-COM_COMPONENTBUILDER_SNIPPET_TYPE_TITLESELECT="Select Snippet Type"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_VERSION_DESC="A count of the number of times this Snippet Type has been revised."
 COM_COMPONENTBUILDER_SNIPPET_TYPE_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_SNIPPET_URL_DESCRIPTION="Enter url"
@@ -9018,6 +8931,8 @@ COM_COMPONENTBUILDER_SUCCESS="Success"
 COM_COMPONENTBUILDER_SUPER_POWER="Super Power"
 COM_COMPONENTBUILDER_SUPPORT_JCB_TODAY="Support JCB Today"
 COM_COMPONENTBUILDER_SUPPORT_JOOMLA_COMPONENT_BUILDER_JCB_WITH_A_BFINANCIAL_DONATIONB_TO_SHOW_GRATITUDE_FOR_THE_TIME_AND_EFFORT_SAVED_IN_YOUR_DEVELOPMENT_PROCESS_YOUR_CONTRIBUTION_NO_MATTER_THE_SIZE_WILL_BE_APPRECIATED_BY_THE_PROJECTS_TEAM_AND_THE_WIDER_COMMUNITY_HELP_ENSURE_THE_GROWTH_AND_RELEVANCE_OF_THIS_ESSENTIAL_TOOL="Support Joomla Component Builder (JCB) with a <b>financial donation</b> to show gratitude for the time and effort saved in your development process. Your contribution, no matter the size, will be appreciated by the project's team and the wider community. Help ensure the growth and relevance of this essential tool."
+COM_COMPONENTBUILDER_SYSTEMCOULD_NOT_RESTORE_FILE_TO_SBRBRBERROR_MESSAGEBBRS="System:Could not restore file to %s<br><br><b>Error Message</b>:<br>%s"
+COM_COMPONENTBUILDER_SYSTEMCOULD_NOT_RESTORE_FOLDER_TO_SBRBRBERROR_MESSAGEBBRS="System:Could not restore folder to %s<br><br><b>Error Message</b>:<br>%s"
 COM_COMPONENTBUILDER_SZIP_COULD_NOT_BE_INSTALLED="%s.zip could not be installed!"
 COM_COMPONENTBUILDER_SZIP_WAS_REMOVED_THE_FROM_TMP_FOLDER_DURING_INSTALLATION="%s.zip was removed the from tmp folder during installation!"
 COM_COMPONENTBUILDER_S_BEING_IMPORTED="%s Being Imported"
@@ -9261,7 +9176,9 @@ COM_COMPONENTBUILDER_THE_COMPONENT_PLUGINS="The component plugins"
 COM_COMPONENTBUILDER_THE_COMPONENT_SITE_ROUTER="The component site router"
 COM_COMPONENTBUILDER_THE_COMPONENT_SITE_VIEWS="The component site views"
 COM_COMPONENTBUILDER_THE_COMPONENT_UPDATES="The component updates"
-COM_COMPONENTBUILDER_THE_CONTINUED_SUPPORT_OF_INDIVIDUALS_LIKE_YOU_HAS_ALLOWED_JOOMLA_COMPONENT_BUILDER_JCB_TO_THRIVE_FOR_SEVEN_YEARS_SINCE_GOING_PUBLIC_YOUR_CONTRIBUTIONS_HAVE_BEEN_CRUCIAL_IN_ENSURING_THE_GROWTH_AND_RELEVANCE_OF_THIS_VITAL_TOOL_FOR_PHP_PROGRAMMERS_THANK_YOU_FOR_YOUR_SUPPORT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY="The continued support of individuals like you has allowed Joomla Component Builder (JCB) to thrive for seven years since going public. Your contributions have been crucial in ensuring the growth and relevance of this vital tool for PHP programmers. Thank you for your support and for being a part of JCB's journey."
+COM_COMPONENTBUILDER_THE_CONDITIONAL_SCRIPT_BUILDER_FOR_BSB_IS_NOT_READY_SORRY="The conditional script builder for <b>%s</b> is not ready, sorry!"
+COM_COMPONENTBUILDER_THE_CONDITIONAL_SCRIPT_BUILDER_FOR_IDBSB_IS_NOT_READY_SORRY="The conditional script builder for ID:<b>%s</b> is not ready, sorry!"
+COM_COMPONENTBUILDER_THE_CONTINUED_SUPPORT_OF_INDIVIDUALS_LIKE_YOU_HAS_ALLOWED_JOOMLA_COMPONENT_BUILDER_JCB_TO_THRIVE_FOR_TEN_YEARS_SINCE_GOING_PUBLIC_YOUR_CONTRIBUTIONS_HAVE_BEEN_CRUCIAL_IN_ENSURING_THE_GROWTH_AND_RELEVANCE_OF_THIS_VITAL_TOOL_FOR_PHP_PROGRAMMERS_THANK_YOU_FOR_YOUR_SUPPORT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY="The continued support of individuals like you has allowed Joomla Component Builder (JCB) to thrive for ten years since going public. Your contributions have been crucial in ensuring the growth and relevance of this vital tool for PHP programmers. Thank you for your support and for being a part of JCB's journey."
 COM_COMPONENTBUILDER_THE_CUSTOM_ADMIN_VIEW_HAS_SUCCESSFULLY_BEEN_PUSHED="The Custom Admin View has successfully been pushed."
 COM_COMPONENTBUILDER_THE_CUSTOM_ADMIN_VIEW_HAS_SUCCESSFULLY_BEEN_RESET="The Custom Admin View has successfully been reset."
 COM_COMPONENTBUILDER_THE_CUSTOM_CODE_HAS_SUCCESSFULLY_BEEN_PUSHED="The Custom Code has successfully been pushed."
@@ -9669,7 +9586,7 @@ COM_COMPONENTBUILDER_WARNING_UPLOAD_ERROR="Warning, upload error."
 COM_COMPONENTBUILDER_WEBSITE="Website"
 COM_COMPONENTBUILDER_WEBSITE_OF_S="Website of %s"
 COM_COMPONENTBUILDER_WE_EXTEND_OUR_GRATITUDE_TO_ALL_THOSE_WHO_SUPPORT_JOOMLA_COMPONENT_BUILDER_JCB_WHETHER_AS_A_HOBBY_OR_AS_A_PART_OF_THEIR_BUSINESS_YOUR_CONTRIBUTIONS_WHETHER_FINANCIAL_OR_IN_THE_FORM_OF_ACTIVE_INVOLVEMENT_HAVE_HAD_A_SIGNIFICANT_IMPACT_ON_ENSURING_THE_GROWTH_AND_RELEVANCE_OF_THIS_VITAL_TOOL_FOR_PHP_PROGRAMMERS_WE_HIGHLY_VALUE_THE_DEDICATION_OF_HOBBYISTS_AND_THE_COMMITMENT_OF_COMPANIES_WHO_SUPPORT_JCB_AS_THEY_HAVE_ALLOWED_THE_PROJECT_TO_CONTINUE_ITS_DEVELOPMENT_AND_MAINTENANCE_PROVIDING_VALUABLE_RESOURCES_FOR_THE_COMMUNITY_WE_ARE_GRATEFUL_FOR_YOUR_CONTRIBUTIONS_NO_MATTER_HOW_SMALL_AND_THANK_YOU_FOR_BEING_A_PART_OF_THE_POSITIVE_IMPACT_THAT_JCB_HAS_ON_THE_PHP_PROGRAMMING_COMMUNITY="We extend our gratitude to all those who support Joomla Component Builder (JCB), whether as a hobby or as a part of their business. Your contributions, whether financial or in the form of active involvement, have had a significant impact on ensuring the growth and relevance of this vital tool for PHP programmers. We highly value the dedication of hobbyists and the commitment of companies who support JCB, as they have allowed the project to continue its development and maintenance, providing valuable resources for the community. We are grateful for your contributions, no matter how small, and thank you for being a part of the positive impact that JCB has on the PHP programming community."
-COM_COMPONENTBUILDER_WE_EXTEND_OUR_HEARTFELT_APPRECIATION_TO_THOSE_WHO_HAVE_SUPPORTED_THE_JOOMLA_COMPONENT_BUILDER_JCB_PROJECT_OVER_THE_YEARS_YOUR_CONTRIBUTIONS_NO_MATTER_HOW_BIG_OR_SMALL_HAVE_BEEN_INSTRUMENTAL_IN_ENSURING_ITS_GROWTH_AND_RELEVANCE_AS_A_VITAL_TOOL_FOR_PHP_PROGRAMMERS_SEVEN_YEARS_AFTER_GOING_PUBLIC_JCB_IS_STILL_HERE_TODAY_BECAUSE_OF_THE_SUPPORT_OF_INDIVIDUALS_LIKE_YOU_WHO_BELIEVE_IN_THE_IMPORTANCE_OF_THIS_OPENSOURCE_PROJECT_YOUR_GENEROSITY_HAS_ALLOWED_THE_PROJECT_TO_CONTINUE_ITS_DEVELOPMENT_AND_MAINTENANCE_PROVIDING_VALUABLE_RESOURCES_FOR_THE_COMMUNITY_THANK_YOU_FOR_YOUR_UNWAVERING_SUPPORT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY="We extend our heartfelt appreciation to those who have supported the Joomla Component Builder (JCB) project over the years. Your contributions, no matter how big or small, have been instrumental in ensuring its growth and relevance as a vital tool for PHP programmers. Seven years after going public, JCB is still here today because of the support of individuals like you who believe in the importance of this open-source project. Your generosity has allowed the project to continue its development and maintenance, providing valuable resources for the community. Thank you for your unwavering support and for being a part of JCB's journey."
+COM_COMPONENTBUILDER_WE_EXTEND_OUR_HEARTFELT_APPRECIATION_TO_THOSE_WHO_HAVE_SUPPORTED_THE_JOOMLA_COMPONENT_BUILDER_JCB_PROJECT_OVER_THE_YEARS_YOUR_CONTRIBUTIONS_NO_MATTER_HOW_BIG_OR_SMALL_HAVE_BEEN_INSTRUMENTAL_IN_ENSURING_ITS_GROWTH_AND_RELEVANCE_AS_A_VITAL_TOOL_FOR_PHP_PROGRAMMERS_TEN_YEARS_AFTER_GOING_PUBLIC_JCB_IS_STILL_HERE_TODAY_BECAUSE_OF_THE_SUPPORT_OF_INDIVIDUALS_LIKE_YOU_WHO_BELIEVE_IN_THE_IMPORTANCE_OF_THIS_OPENSOURCE_PROJECT_YOUR_GENEROSITY_HAS_ALLOWED_THE_PROJECT_TO_CONTINUE_ITS_DEVELOPMENT_AND_MAINTENANCE_PROVIDING_VALUABLE_RESOURCES_FOR_THE_COMMUNITY_THANK_YOU_FOR_YOUR_UNWAVERING_SUPPORT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY="We extend our heartfelt appreciation to those who have supported the Joomla Component Builder (JCB) project over the years. Your contributions, no matter how big or small, have been instrumental in ensuring its growth and relevance as a vital tool for PHP programmers. Ten years after going public, JCB is still here today because of the support of individuals like you who believe in the importance of this open-source project. Your generosity has allowed the project to continue its development and maintenance, providing valuable resources for the community. Thank you for your unwavering support and for being a part of JCB's journey."
 COM_COMPONENTBUILDER_WE_EXTEND_OUR_SINCERE_APPRECIATION_TO_THE_COMPANIES_WHO_USE_JOOMLA_COMPONENT_BUILDER_JCB_AND_SUPPORT_THE_PROJECT_YOUR_CONTRIBUTIONS_WHETHER_FINANCIAL_OR_IN_THE_FORM_OF_ACTIVE_INVOLVEMENT_HAVE_BEEN_INSTRUMENTAL_IN_ENSURING_THE_GROWTH_AND_RELEVANCE_OF_THIS_VITAL_TOOL_FOR_PHP_PROGRAMMERS_YOUR_SUPPORT_HAS_ALLOWED_JCB_TO_CONTINUE_ITS_DEVELOPMENT_AND_MAINTENANCE_PROVIDING_VALUABLE_RESOURCES_FOR_THE_COMMUNITY_THANK_YOU_FOR_YOUR_UNWAVERING_COMMITMENT_TO_THE_PROJECT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY="We extend our sincere appreciation to the companies who use Joomla Component Builder (JCB) and support the project. Your contributions, whether financial or in the form of active involvement, have been instrumental in ensuring the growth and relevance of this vital tool for PHP programmers. Your support has allowed JCB to continue its development and maintenance, providing valuable resources for the community. Thank you for your unwavering commitment to the project and for being a part of JCB's journey."
 COM_COMPONENTBUILDER_WE_FAILED_TO_BUILD_THE_DETAILS_OF_THE_SEARCH_RESULTS="We failed to build the details of the search results."
 COM_COMPONENTBUILDER_WE_FAILED_TO_MOVE_BSB="We failed to move <b>%s</b>!"

admin/layouts/jcbsupportmessage.php

@@ -23,13 +23,13 @@ defined('JPATH_BASE') or die;
 // Different support requests/appreciation 
 $support = [
 	Text::_("COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_JCB_IS_A_CRUCIAL_TOOL_FOR_PHP_PROGRAMMERS_WHO_USE_JOOMLA_TO_EARN_A_LIVING_BY_MAKING_A_BFINANCIAL_DONATIONB_YOU_CAN_SUPPORT_THE_GROWTH_AND_CONTINUITY_OF_THIS_VITAL_RESOURCE_AND_ENSURE_ITS_RELEVANCE_FOR_YEARS_TO_COME_YOUR_CONTRIBUTION_NO_MATTER_HOW_BIG_OR_SMALL_WILL_BE_DEEPLY_APPRECIATED_BY_THE_PROJECTS_TEAM_AND_THE_WIDER_COMMUNITY"),
-	Text::_("COM_COMPONENTBUILDER_THE_CONTINUED_SUPPORT_OF_INDIVIDUALS_LIKE_YOU_HAS_ALLOWED_JOOMLA_COMPONENT_BUILDER_JCB_TO_THRIVE_FOR_SEVEN_YEARS_SINCE_GOING_PUBLIC_YOUR_CONTRIBUTIONS_HAVE_BEEN_CRUCIAL_IN_ENSURING_THE_GROWTH_AND_RELEVANCE_OF_THIS_VITAL_TOOL_FOR_PHP_PROGRAMMERS_THANK_YOU_FOR_YOUR_SUPPORT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY"),
+	Text::_("COM_COMPONENTBUILDER_THE_CONTINUED_SUPPORT_OF_INDIVIDUALS_LIKE_YOU_HAS_ALLOWED_JOOMLA_COMPONENT_BUILDER_JCB_TO_THRIVE_FOR_TEN_YEARS_SINCE_GOING_PUBLIC_YOUR_CONTRIBUTIONS_HAVE_BEEN_CRUCIAL_IN_ENSURING_THE_GROWTH_AND_RELEVANCE_OF_THIS_VITAL_TOOL_FOR_PHP_PROGRAMMERS_THANK_YOU_FOR_YOUR_SUPPORT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY"),
 	Text::_("COM_COMPONENTBUILDER_SUPPORT_JOOMLA_COMPONENT_BUILDER_JCB_WITH_A_BFINANCIAL_DONATIONB_TO_SHOW_GRATITUDE_FOR_THE_TIME_AND_EFFORT_SAVED_IN_YOUR_DEVELOPMENT_PROCESS_YOUR_CONTRIBUTION_NO_MATTER_THE_SIZE_WILL_BE_APPRECIATED_BY_THE_PROJECTS_TEAM_AND_THE_WIDER_COMMUNITY_HELP_ENSURE_THE_GROWTH_AND_RELEVANCE_OF_THIS_ESSENTIAL_TOOL"),
 	Text::_("COM_COMPONENTBUILDER_INVEST_IN_THE_FUTURE_OF_JOOMLA_COMPONENT_BUILDER_JCB_BY_MAKING_A_BFINANCIAL_DONATIONB_SUPPORT_THE_NECESSARY_DEVELOPMENT_AND_MAINTENANCE_OF_THIS_OPENSOURCE_PROJECT_ENSURING_ITS_CONTINUED_GROWTH_AND_RELEVANCE_FOR_THE_COMMUNITY_YOUR_CONTRIBUTION_WILL_HELP_SECURE_THE_FUTURE_OF_THIS_VITAL_TOOL_FOR_PHP_PROGRAMMERS"),
 	Text::_("COM_COMPONENTBUILDER_INVEST_IN_THE_FUTURE_OF_JOOMLA_COMPONENT_BUILDER_JCB_BY_MAKING_A_BFINANCIAL_CONTRIBUTIONB_NO_MATTER_HOW_SMALL_THE_CONTINUAL_SUPPORT_OF_ALL_THOSE_USING_THE_TOOL_WILL_BE_MORE_THAN_ENOUGH_TO_ENSURE_ITS_CONTINUED_GROWTH_AND_RELEVANCE_BY_INVESTING_IN_THIS_OPENSOURCE_PROJECT_YOU_ARE_SECURING_ITS_FUTURE_AS_A_VITAL_TOOL_FOR_PHP_PROGRAMMERS"),
 	Text::_("COM_COMPONENTBUILDER_WE_EXTEND_OUR_GRATITUDE_TO_ALL_THOSE_WHO_SUPPORT_JOOMLA_COMPONENT_BUILDER_JCB_WHETHER_AS_A_HOBBY_OR_AS_A_PART_OF_THEIR_BUSINESS_YOUR_CONTRIBUTIONS_WHETHER_FINANCIAL_OR_IN_THE_FORM_OF_ACTIVE_INVOLVEMENT_HAVE_HAD_A_SIGNIFICANT_IMPACT_ON_ENSURING_THE_GROWTH_AND_RELEVANCE_OF_THIS_VITAL_TOOL_FOR_PHP_PROGRAMMERS_WE_HIGHLY_VALUE_THE_DEDICATION_OF_HOBBYISTS_AND_THE_COMMITMENT_OF_COMPANIES_WHO_SUPPORT_JCB_AS_THEY_HAVE_ALLOWED_THE_PROJECT_TO_CONTINUE_ITS_DEVELOPMENT_AND_MAINTENANCE_PROVIDING_VALUABLE_RESOURCES_FOR_THE_COMMUNITY_WE_ARE_GRATEFUL_FOR_YOUR_CONTRIBUTIONS_NO_MATTER_HOW_SMALL_AND_THANK_YOU_FOR_BEING_A_PART_OF_THE_POSITIVE_IMPACT_THAT_JCB_HAS_ON_THE_PHP_PROGRAMMING_COMMUNITY"),
 	Text::_("COM_COMPONENTBUILDER_WITHOUT_SUFFICIENT_SUPPORT_THE_FUTURE_OF_JOOMLA_COMPONENT_BUILDER_JCB_IS_IN_JEOPARDY_AS_A_VITAL_TOOL_FOR_PHP_PROGRAMMERS_IT_IS_CRUCIAL_TO_ENSURE_ITS_CONTINUED_DEVELOPMENT_AND_MAINTENANCE_BY_MAKING_A_BFINANCIAL_CONTRIBUTIONB_NO_MATTER_HOW_SMALL_YOU_ARE_HELPING_TO_SAFEGUARD_THE_FUTURE_OF_THIS_OPENSOURCE_PROJECT_NEGLECTING_TO_SUPPORT_JCB_COULD_RESULT_IN_ITS_DECLINE_AND_LOSS_AS_A_RESOURCE_FOR_THE_COMMUNITY"),
-	Text::_("COM_COMPONENTBUILDER_WE_EXTEND_OUR_HEARTFELT_APPRECIATION_TO_THOSE_WHO_HAVE_SUPPORTED_THE_JOOMLA_COMPONENT_BUILDER_JCB_PROJECT_OVER_THE_YEARS_YOUR_CONTRIBUTIONS_NO_MATTER_HOW_BIG_OR_SMALL_HAVE_BEEN_INSTRUMENTAL_IN_ENSURING_ITS_GROWTH_AND_RELEVANCE_AS_A_VITAL_TOOL_FOR_PHP_PROGRAMMERS_SEVEN_YEARS_AFTER_GOING_PUBLIC_JCB_IS_STILL_HERE_TODAY_BECAUSE_OF_THE_SUPPORT_OF_INDIVIDUALS_LIKE_YOU_WHO_BELIEVE_IN_THE_IMPORTANCE_OF_THIS_OPENSOURCE_PROJECT_YOUR_GENEROSITY_HAS_ALLOWED_THE_PROJECT_TO_CONTINUE_ITS_DEVELOPMENT_AND_MAINTENANCE_PROVIDING_VALUABLE_RESOURCES_FOR_THE_COMMUNITY_THANK_YOU_FOR_YOUR_UNWAVERING_SUPPORT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY"),
+	Text::_("COM_COMPONENTBUILDER_WE_EXTEND_OUR_HEARTFELT_APPRECIATION_TO_THOSE_WHO_HAVE_SUPPORTED_THE_JOOMLA_COMPONENT_BUILDER_JCB_PROJECT_OVER_THE_YEARS_YOUR_CONTRIBUTIONS_NO_MATTER_HOW_BIG_OR_SMALL_HAVE_BEEN_INSTRUMENTAL_IN_ENSURING_ITS_GROWTH_AND_RELEVANCE_AS_A_VITAL_TOOL_FOR_PHP_PROGRAMMERS_TEN_YEARS_AFTER_GOING_PUBLIC_JCB_IS_STILL_HERE_TODAY_BECAUSE_OF_THE_SUPPORT_OF_INDIVIDUALS_LIKE_YOU_WHO_BELIEVE_IN_THE_IMPORTANCE_OF_THIS_OPENSOURCE_PROJECT_YOUR_GENEROSITY_HAS_ALLOWED_THE_PROJECT_TO_CONTINUE_ITS_DEVELOPMENT_AND_MAINTENANCE_PROVIDING_VALUABLE_RESOURCES_FOR_THE_COMMUNITY_THANK_YOU_FOR_YOUR_UNWAVERING_SUPPORT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY"),
 	Text::_("COM_COMPONENTBUILDER_WE_EXTEND_OUR_SINCERE_APPRECIATION_TO_THE_COMPANIES_WHO_USE_JOOMLA_COMPONENT_BUILDER_JCB_AND_SUPPORT_THE_PROJECT_YOUR_CONTRIBUTIONS_WHETHER_FINANCIAL_OR_IN_THE_FORM_OF_ACTIVE_INVOLVEMENT_HAVE_BEEN_INSTRUMENTAL_IN_ENSURING_THE_GROWTH_AND_RELEVANCE_OF_THIS_VITAL_TOOL_FOR_PHP_PROGRAMMERS_YOUR_SUPPORT_HAS_ALLOWED_JCB_TO_CONTINUE_ITS_DEVELOPMENT_AND_MAINTENANCE_PROVIDING_VALUABLE_RESOURCES_FOR_THE_COMMUNITY_THANK_YOU_FOR_YOUR_UNWAVERING_COMMITMENT_TO_THE_PROJECT_AND_FOR_BEING_A_PART_OF_JCBS_JOURNEY")
 ];
 
@@ -129,8 +129,8 @@ $support_button = $button_names[random_int(0, 32)];
     <a href="https://git.vdm.dev/joomla/Component-Builder/src/branch/5.x/LICENSE.txt" title="GPLv3 License">
         <img src="https://img.shields.io/badge/License-GPLv2-blue.svg" alt="GPLv3 License">
     </a>
-    <a href="https://github.com/vdm-io/Joomla-Component-Builder/stargazers" title="GitHub Stars">
-        <img src="https://img.shields.io/github/stars/vdm-io/Joomla-Component-Builder.svg?style=flat&label=Star" alt="GitHub Stars">
+    <a href="https://github.com/joomengine/Joomla-Component-Builder/stargazers" title="GitHub Stars">
+        <img src="https://img.shields.io/github/stars/joomengine/Joomla-Component-Builder.svg?style=flat&label=Star" alt="GitHub Stars">
     </a>
 </div>
 <br /><br />

admin/layouts/joomla_module/code_fullwidth.php

@@ -1,44 +0,0 @@
-<?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(
-	'mod_code'
-);
-
-$hiddenFields = $displayData->get('hidden_fields') ?: [];
-
-?>
-<?php if ($fields && count((array) $fields)) :?>
-<div class="form-vertical">
-	<?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; ?>
-</div>
-<?php endif; ?>

admin/layouts/joomla_module/code_left.php

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

admin/layouts/joomla_module/code_right.php

@@ -26,7 +26,9 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
-	'note_mod_file_options'
+	'custom_get',
+	'note_mod_file_options',
+	'mod_code'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: [];

admin/layouts/joomla_module/html_fullwidth.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'default_header',
 	'default',
 	'note_linked_to_notice',
 	'not_required'

admin/layouts/joomla_module/html_left.php

@@ -30,7 +30,8 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'description',
 	'libraries',
 	'note_libraries_options',
-	'note_add_php_language_string'
+	'note_add_php_language_string',
+	'add_default_header'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: [];

admin/sql/updates/mysql/4_1_2-alpha.sql

@@ -0,0 +1 @@
+

admin/src/Controller/Admin_viewController.php

@@ -24,9 +24,9 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
 use VDM\Joomla\Data\Factory as DataFactory;
+use VDM\Joomla\Utilities\GuidHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -82,50 +82,6 @@ class Admin_viewController extends FormController
 	protected int $refid;
 
 
-	/**
-	 * Method to edit an existing record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
-	 *                           (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if access level check and checkout passes, false otherwise.
-	 *
-	 * @since   1.6
-	 */
-	public function edit($key = null, $urlVar = null)
-	{
-		// for modal title key selection (unique key to do mapping)
-		$titleKey = $this->input->get('titleKey', 'id', 'word');
-		$guid = null;
-		$value = null;
-
- 		// Determine the name of the primary key for the data.
-		if (empty($key))
-		{
-			$model = $this->getModel();
-			$table = $model->getTable();
-			$key = $table->getKeyName();
-		}
-
-		if ($titleKey === 'guid')
-		{
-			$guid = $this->input->get('guid', null, 'string');
-		}
-
-		if ($guid !== null && GuidHelper::valid($guid))
-		{
-			$value = GuidHelper::item($guid, 'admin_view', 'a.' . $key, 'componentbuilder');
-		}
-
-		if ($value !== null)
-		{
-			$this->input->set($key, $value);
-		}
-
-		return parent::edit($key, $urlVar);
-	}
-
 	/**
 	 * Resets the specified Admin View.
 	 *

admin/src/Controller/AjaxController.php

@@ -76,8 +76,6 @@ class AjaxController extends BaseController
 		$this->registerTask('getEditCustomCodeButtons', 'ajax');
 		$this->registerTask('placedin', 'ajax');
 		$this->registerTask('checkPlaceholderName', 'ajax');
-		$this->registerTask('snippetDetails', 'ajax');
-		$this->registerTask('getSnippets', 'ajax');
 		$this->registerTask('getExistingValidationRuleCode', 'ajax');
 		$this->registerTask('getValidationRulesTable', 'ajax');
 		$this->registerTask('checkRuleName', 'ajax');
@@ -1459,104 +1457,6 @@ class AjaxController extends BaseController
 						}
 					}
 				break;
-				case 'snippetDetails':
-					try
-					{
-						$idValue = $jinput->get('id', NULL, 'STRING');
-						if($idValue && $user->id != 0)
-						{
-							$ajaxModule = $this->getModel('ajax', 'Administrator');
-							if ($ajaxModule)
-							{
-								$result = $ajaxModule->getSnippetDetails($idValue);
-							}
-							else
-							{
-								$result = ['error' => 'There was an error! [149]'];
-							}
-						}
-						else
-						{
-							$result = ['error' => 'There was an error! [149]'];
-						}
-						if($callback)
-						{
-							echo $callback . "(".json_encode($result).");";
-						}
-						elseif($returnRaw)
-						{
-							echo json_encode($result);
-						}
-						else
-						{
-							echo "(".json_encode($result).");";
-						}
-					}
-					catch(\Exception $e)
-					{
-						if($callback)
-						{
-							echo $callback."(".json_encode($e).");";
-						}
-						elseif($returnRaw)
-						{
-							echo json_encode($e);
-						}
-						else
-						{
-							echo "(".json_encode($e).");";
-						}
-					}
-				break;
-				case 'getSnippets':
-					try
-					{
-						$librariesValue = $jinput->get('libraries', NULL, 'STRING');
-						if($librariesValue && $user->id != 0)
-						{
-							$ajaxModule = $this->getModel('ajax', 'Administrator');
-							if ($ajaxModule)
-							{
-								$result = $ajaxModule->getSnippets($librariesValue);
-							}
-							else
-							{
-								$result = ['error' => 'There was an error! [149]'];
-							}
-						}
-						else
-						{
-							$result = ['error' => 'There was an error! [149]'];
-						}
-						if($callback)
-						{
-							echo $callback . "(".json_encode($result).");";
-						}
-						elseif($returnRaw)
-						{
-							echo json_encode($result);
-						}
-						else
-						{
-							echo "(".json_encode($result).");";
-						}
-					}
-					catch(\Exception $e)
-					{
-						if($callback)
-						{
-							echo $callback."(".json_encode($e).");";
-						}
-						elseif($returnRaw)
-						{
-							echo json_encode($e);
-						}
-						else
-						{
-							echo "(".json_encode($e).");";
-						}
-					}
-				break;
 				case 'getExistingValidationRuleCode':
 					try
 					{

admin/src/Controller/Class_extendsController.php

@@ -24,7 +24,6 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
 
 // No direct access to this file
@@ -81,50 +80,6 @@ class Class_extendsController extends FormController
 	protected int $refid;
 
 
-	/**
-	 * Method to edit an existing record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
-	 *                           (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if access level check and checkout passes, false otherwise.
-	 *
-	 * @since   1.6
-	 */
-	public function edit($key = null, $urlVar = null)
-	{
-		// for modal title key selection (unique key to do mapping)
-		$titleKey = $this->input->get('titleKey', 'id', 'word');
-		$guid = null;
-		$value = null;
-
- 		// Determine the name of the primary key for the data.
-		if (empty($key))
-		{
-			$model = $this->getModel();
-			$table = $model->getTable();
-			$key = $table->getKeyName();
-		}
-
-		if ($titleKey === 'guid')
-		{
-			$guid = $this->input->get('guid', null, 'string');
-		}
-
-		if ($guid !== null && GuidHelper::valid($guid))
-		{
-			$value = GuidHelper::item($guid, 'class_extends', 'a.' . $key, 'componentbuilder');
-		}
-
-		if ($value !== null)
-		{
-			$this->input->set($key, $value);
-		}
-
-		return parent::edit($key, $urlVar);
-	}
-
 	/**
 	 * Resets the specified Class Extends.
 	 *

admin/src/Controller/Class_methodsController.php

@@ -83,7 +83,7 @@ class Class_methodsController extends AdminController
 			$success = true;
 
 			// set redirect
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=initialization_selection&power=ClassMethod&target=Class Methods', false);
+			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=initialization_selection&power=ClassProperty&target=Class Methods', false);
 		}
 		else
 		{
@@ -144,7 +144,7 @@ class Class_methodsController extends AdminController
 		if($user->authorise('class_method.reset', 'com_componentbuilder'))
 		{
 			// get the guid field of this entity
-			$key_field = PackageFactory::_('ClassMethod.Remote.Get')->getGuidField();
+			$key_field = PackageFactory::_('ClassProperty.Remote.Get')->getGuidField();
 			$guids = PackageFactory::_('Load')->values([$key_field], ['class_method'], ['id' => ['value' => $pks, 'operator' => 'IN']]);
 
 			try {
@@ -257,7 +257,7 @@ class Class_methodsController extends AdminController
 		if($user->authorise('class_method.push', 'com_componentbuilder'))
 		{
 			// get the guid field of this entity
-			$key_field = PackageFactory::_('ClassMethod.Remote.Set')->getGuidField();
+			$key_field = PackageFactory::_('ClassProperty.Remote.Set')->getGuidField();
 			$guids = PackageFactory::_('Load')->values([$key_field], ['class_method'], ['id' => ['value' => $pks, 'operator' => 'IN']]);
 
 			try {

admin/src/Controller/Custom_admin_viewController.php

@@ -24,7 +24,6 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
 
 // No direct access to this file
@@ -81,50 +80,6 @@ class Custom_admin_viewController extends FormController
 	protected int $refid;
 
 
-	/**
-	 * Method to edit an existing record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
-	 *                           (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if access level check and checkout passes, false otherwise.
-	 *
-	 * @since   1.6
-	 */
-	public function edit($key = null, $urlVar = null)
-	{
-		// for modal title key selection (unique key to do mapping)
-		$titleKey = $this->input->get('titleKey', 'id', 'word');
-		$guid = null;
-		$value = null;
-
- 		// Determine the name of the primary key for the data.
-		if (empty($key))
-		{
-			$model = $this->getModel();
-			$table = $model->getTable();
-			$key = $table->getKeyName();
-		}
-
-		if ($titleKey === 'guid')
-		{
-			$guid = $this->input->get('guid', null, 'string');
-		}
-
-		if ($guid !== null && GuidHelper::valid($guid))
-		{
-			$value = GuidHelper::item($guid, 'custom_admin_view', 'a.' . $key, 'componentbuilder');
-		}
-
-		if ($value !== null)
-		{
-			$this->input->set($key, $value);
-		}
-
-		return parent::edit($key, $urlVar);
-	}
-
 	/**
 	 * Resets the specified Custom Admin View.
 	 *

admin/src/Controller/Dynamic_getController.php

@@ -24,7 +24,6 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
 
 // No direct access to this file
@@ -81,50 +80,6 @@ class Dynamic_getController extends FormController
 	protected int $refid;
 
 
-	/**
-	 * Method to edit an existing record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
-	 *                           (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if access level check and checkout passes, false otherwise.
-	 *
-	 * @since   1.6
-	 */
-	public function edit($key = null, $urlVar = null)
-	{
-		// for modal title key selection (unique key to do mapping)
-		$titleKey = $this->input->get('titleKey', 'id', 'word');
-		$guid = null;
-		$value = null;
-
- 		// Determine the name of the primary key for the data.
-		if (empty($key))
-		{
-			$model = $this->getModel();
-			$table = $model->getTable();
-			$key = $table->getKeyName();
-		}
-
-		if ($titleKey === 'guid')
-		{
-			$guid = $this->input->get('guid', null, 'string');
-		}
-
-		if ($guid !== null && GuidHelper::valid($guid))
-		{
-			$value = GuidHelper::item($guid, 'dynamic_get', 'a.' . $key, 'componentbuilder');
-		}
-
-		if ($value !== null)
-		{
-			$this->input->set($key, $value);
-		}
-
-		return parent::edit($key, $urlVar);
-	}
-
 	/**
 	 * Resets the specified Dynamic Get.
 	 *

admin/src/Controller/FieldController.php

@@ -24,7 +24,6 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
 
 // No direct access to this file
@@ -81,50 +80,6 @@ class FieldController extends FormController
 	protected int $refid;
 
 
-	/**
-	 * Method to edit an existing record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
-	 *                           (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if access level check and checkout passes, false otherwise.
-	 *
-	 * @since   1.6
-	 */
-	public function edit($key = null, $urlVar = null)
-	{
-		// for modal title key selection (unique key to do mapping)
-		$titleKey = $this->input->get('titleKey', 'id', 'word');
-		$guid = null;
-		$value = null;
-
- 		// Determine the name of the primary key for the data.
-		if (empty($key))
-		{
-			$model = $this->getModel();
-			$table = $model->getTable();
-			$key = $table->getKeyName();
-		}
-
-		if ($titleKey === 'guid')
-		{
-			$guid = $this->input->get('guid', null, 'string');
-		}
-
-		if ($guid !== null && GuidHelper::valid($guid))
-		{
-			$value = GuidHelper::item($guid, 'field', 'a.' . $key, 'componentbuilder');
-		}
-
-		if ($value !== null)
-		{
-			$this->input->set($key, $value);
-		}
-
-		return parent::edit($key, $urlVar);
-	}
-
 	/**
 	 * Resets the specified Field.
 	 *

admin/src/Controller/Joomla_plugin_groupController.php

@@ -24,7 +24,6 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\GuidHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -79,51 +78,6 @@ class Joomla_plugin_groupController extends FormController
 	 */
 	protected int $refid;
 
-
-	/**
-	 * Method to edit an existing record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
-	 *                           (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if access level check and checkout passes, false otherwise.
-	 *
-	 * @since   1.6
-	 */
-	public function edit($key = null, $urlVar = null)
-	{
-		// for modal title key selection (unique key to do mapping)
-		$titleKey = $this->input->get('titleKey', 'id', 'word');
-		$guid = null;
-		$value = null;
-
- 		// Determine the name of the primary key for the data.
-		if (empty($key))
-		{
-			$model = $this->getModel();
-			$table = $model->getTable();
-			$key = $table->getKeyName();
-		}
-
-		if ($titleKey === 'guid')
-		{
-			$guid = $this->input->get('guid', null, 'string');
-		}
-
-		if ($guid !== null && GuidHelper::valid($guid))
-		{
-			$value = GuidHelper::item($guid, 'joomla_plugin_group', 'a.' . $key, 'componentbuilder');
-		}
-
-		if ($value !== null)
-		{
-			$this->input->set($key, $value);
-		}
-
-		return parent::edit($key, $urlVar);
-	}
-
 	/**
 	 * Method override to check if you can add a new record.
 	 *

admin/src/Controller/PowerController.php

@@ -24,7 +24,6 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Componentbuilder\Power\Factory as PowerFactory;
 
 // No direct access to this file
@@ -81,50 +80,6 @@ class PowerController extends FormController
 	protected int $refid;
 
 
-	/**
-	 * Method to edit an existing record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
-	 *                           (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if access level check and checkout passes, false otherwise.
-	 *
-	 * @since   1.6
-	 */
-	public function edit($key = null, $urlVar = null)
-	{
-		// for modal title key selection (unique key to do mapping)
-		$titleKey = $this->input->get('titleKey', 'id', 'word');
-		$guid = null;
-		$value = null;
-
- 		// Determine the name of the primary key for the data.
-		if (empty($key))
-		{
-			$model = $this->getModel();
-			$table = $model->getTable();
-			$key = $table->getKeyName();
-		}
-
-		if ($titleKey === 'guid')
-		{
-			$guid = $this->input->get('guid', null, 'string');
-		}
-
-		if ($guid !== null && GuidHelper::valid($guid))
-		{
-			$value = GuidHelper::item($guid, 'power', 'a.' . $key, 'componentbuilder');
-		}
-
-		if ($value !== null)
-		{
-			$this->input->set($key, $value);
-		}
-
-		return parent::edit($key, $urlVar);
-	}
-
 	/**
 	 * Resets the specified power.
 	 *

admin/src/Controller/Site_viewController.php

@@ -24,7 +24,6 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
 
 // No direct access to this file
@@ -81,50 +80,6 @@ class Site_viewController extends FormController
 	protected int $refid;
 
 
-	/**
-	 * Method to edit an existing record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
-	 *                           (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if access level check and checkout passes, false otherwise.
-	 *
-	 * @since   1.6
-	 */
-	public function edit($key = null, $urlVar = null)
-	{
-		// for modal title key selection (unique key to do mapping)
-		$titleKey = $this->input->get('titleKey', 'id', 'word');
-		$guid = null;
-		$value = null;
-
- 		// Determine the name of the primary key for the data.
-		if (empty($key))
-		{
-			$model = $this->getModel();
-			$table = $model->getTable();
-			$key = $table->getKeyName();
-		}
-
-		if ($titleKey === 'guid')
-		{
-			$guid = $this->input->get('guid', null, 'string');
-		}
-
-		if ($guid !== null && GuidHelper::valid($guid))
-		{
-			$value = GuidHelper::item($guid, 'site_view', 'a.' . $key, 'componentbuilder');
-		}
-
-		if ($value !== null)
-		{
-			$this->input->set($key, $value);
-		}
-
-		return parent::edit($key, $urlVar);
-	}
-
 	/**
 	 * Resets the specified Site View.
 	 *

admin/src/Field/AdminviewsField.php

@@ -0,0 +1,68 @@
+<?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
+ */
+namespace VDM\Component\Componentbuilder\Administrator\Field;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Field\ListField;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Component\ComponentHelper;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Adminviews Form Field class for the Componentbuilder component
+ *
+ * @since  1.6
+ */
+class AdminviewsField extends ListField
+{
+	/**
+	 * The adminviews field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'Adminviews';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return  array    An array of Html options.
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		// Get the database object.
+		$db = Factory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.guid','a.system_name'),array('guid','adminview_system_name')));
+		$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->order('a.system_name ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = [];
+		if ($items)
+		{
+			if ($this->multiple === false)
+			{
+				$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
+			}
+			foreach($items as $item)
+			{
+				$options[] = Html::_('select.option', $item->guid, $item->adminview_system_name);
+			}
+		}
+		return $options;
+	}
+}

admin/src/Field/AdminviewsfilteraddcustombuttonField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class AdminviewsfilteraddcustombuttonField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/AdminviewsfilteraddfadeinField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class AdminviewsfilteraddfadeinField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/AdminviewsfilteraddphpajaxField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class AdminviewsfilteraddphpajaxField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/AdminviewsfiltertypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class AdminviewsfiltertypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/ClassextendingsfilterextensiontypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class ClassextendingsfilterextensiontypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/ClassextendsField.php

@@ -0,0 +1,186 @@
+<?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
+ */
+namespace VDM\Component\Componentbuilder\Administrator\Field;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Field\ListField;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Component\ComponentHelper;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Classextends Form Field class for the Componentbuilder component
+ *
+ * @since  1.6
+ */
+class ClassextendsField extends ListField
+{
+	/**
+	 * The classextends field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'Classextends';
+
+	/**
+	 * Override to add new button
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		// see if we should add buttons
+		$set_button = $this->getAttribute('button');
+		// get html
+		$html = parent::getInput();
+		// if true set button
+		if ($set_button === 'true')
+		{
+			$button = array();
+			$script = array();
+			$button_code_name = $this->getAttribute('name');
+			// get the input from url
+			$app = Factory::getApplication();
+			$jinput = $app->input;
+			// get the view name & id
+			$values = $jinput->getArray(array(
+				'id' => 'int',
+				'view' => 'word'
+			));
+			// check if new item
+			$ref = '';
+			$refJ = '';
+			if (!is_null($values['id']) && strlen($values['view']))
+			{
+				// only load referral if not new item.
+				$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
+				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+				// get the return value.
+				$_uri = (string) Uri::getInstance();
+				$_return = urlencode(base64_encode($_uri));
+				// load return value.
+				$ref .= '&amp;return=' . $_return;
+				$refJ .= '&return=' . $_return;
+			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
+			$user = Factory::getApplication()->getIdentity();
+			// only add if user allowed to create class_extends
+			if ($user->authorise('class_extends.create', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
+			{
+				// build Create button
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.Text::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px;"
+					href="index.php?option=com_componentbuilder&amp;view=class_extends&amp;layout=edit'.$ref.'" >
+					<span class="icon-new icon-white"></span></a>';
+			}
+			// only add if user allowed to edit class_extends
+			if ($user->authorise('class_extends.edit', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
+			{
+				// build edit button
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small btn-outline-success button-select hasTooltip" title="'.Text::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; border-radius: 0px 4px 4px 0px;" href="#" >
+					<span class="icon-edit"></span></a>';
+				// build script
+				$script[] = "
+					document.addEventListener('DOMContentLoaded', function() {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
+							e.preventDefault();
+							let ".$button_code_name."Value = this.value;
+							".$button_code_name."Button(".$button_code_name."Value);
+						});
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
+						".$button_code_name."Button(".$button_code_name."Value);
+					});
+					function ".$button_code_name."Button(value) {
+						var createButton = document.getElementById('".$button_code_name."Create');
+						var editButton = document.getElementById('".$button_code_name."Edit');
+						if (value > 0) {
+							// hide the create button
+							createButton.style.display = 'none';
+							// show edit button
+							editButton.style.display = 'block';
+							let url = 'index.php?option=com_componentbuilder&view=class_extendings&task=class_extends.edit&id='+value+'".$refJ."';
+							editButton.setAttribute('href', url);
+						} else {
+							// show the create button
+							createButton.style.display = 'block';
+							// hide edit button
+							editButton.style.display = 'none';
+						}
+					}";
+			}
+			// check if button was created for class_extends field.
+			if (is_array($button) && count($button) > 0)
+			{
+				// Load the needed script.
+				$document = Factory::getApplication()->getDocument();
+				$document->addScriptDeclaration(implode(' ',$script));
+				// return the button attached to input field.
+				return '<div class="input-group">' .$html . implode('',$button).'</div>';
+			}
+		}
+		return $html;
+	}
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return  array    An array of Html options.
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		// Get the user object.
+		$user = Factory::getApplication()->getIdentity();
+		// Get the databse object.
+		$db = Factory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.guid','a.name'),array('guid','class_extends_name')));
+		$query->from($db->quoteName('#__componentbuilder_class_extends', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->order('a.name ASC');
+		// Implement View Level Access (if set in table)
+		if (!$user->authorise('core.options', 'com_componentbuilder'))
+		{
+			$columns = $db->getTableColumns('#__componentbuilder_class_extends');
+			if(isset($columns['access']))
+			{
+				$groups = implode(',', $user->getAuthorisedViewLevels());
+				$query->where('a.access IN (' . $groups . ')');
+			}
+		}
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			$options[] = Html::_('select.option', '', 'Select a class');
+			foreach($items as $item)
+			{
+				$options[] = Html::_('select.option', $item->guid, $item->class_extends_name);
+			}
+		}
+		return $options;
+	}
+}

admin/src/Field/ClassmethodsfilterextensiontypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class ClassmethodsfilterextensiontypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/ClassmethodsfiltervisibilityField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class ClassmethodsfiltervisibilityField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/ClasspropertiesfilterextensiontypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class ClasspropertiesfilterextensiontypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/ClasspropertiesfiltervisibilityField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class ClasspropertiesfiltervisibilityField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/ComponentsroutersfiltermodeconstructorafterparentField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class ComponentsroutersfiltermodeconstructorafterparentField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/ComponentsroutersfiltermodeconstructorbeforeparentField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class ComponentsroutersfiltermodeconstructorbeforeparentField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/ComponentsroutersfiltermodemethodsField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class ComponentsroutersfiltermodemethodsField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/CustomadminviewsField.php

@@ -0,0 +1,68 @@
+<?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
+ */
+namespace VDM\Component\Componentbuilder\Administrator\Field;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Field\ListField;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Component\ComponentHelper;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Customadminviews Form Field class for the Componentbuilder component
+ *
+ * @since  1.6
+ */
+class CustomadminviewsField extends ListField
+{
+	/**
+	 * The customadminviews field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'Customadminviews';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return  array    An array of Html options.
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		// Get the databse object.
+		$db = Factory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.guid','a.system_name'),array('guid','customadminview_system_name')));
+		$query->from($db->quoteName('#__componentbuilder_custom_admin_view', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->order('a.system_name ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = [];
+		if ($items)
+		{
+			if ($this->multiple === false)
+			{
+				$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
+			}
+			foreach($items as $item)
+			{
+				$options[] = Html::_('select.option', $item->guid, $item->customadminview_system_name);
+			}
+		}
+		return $options;
+	}
+}

admin/src/Field/CustomadminviewsfilteraddcustombuttonField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class CustomadminviewsfilteraddcustombuttonField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/CustomadminviewsfilteraddphpajaxField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class CustomadminviewsfilteraddphpajaxField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/CustomcodesfiltercommenttypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class CustomcodesfiltercommenttypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/CustomcodesfiltertargetField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class CustomcodesfiltertargetField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/CustomcodesfiltertypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class CustomcodesfiltertypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/DynamicgetsfiltergettypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class DynamicgetsfiltergettypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);
@@ -58,6 +59,7 @@ class DynamicgetsfiltergettypeField extends ListField
 
 		$_results = $db->loadColumn();
 		$_filter = [];
+		$_filter[] = Html::_('select.option', '', '- ' . Text::_('COM_COMPONENTBUILDER_FILTER_SELECT_GETTYPE') . ' -');
 
 		if ($_results)
 		{

admin/src/Field/DynamicgetsfiltermainsourceField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class DynamicgetsfiltermainsourceField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/FieldsField.php

@@ -0,0 +1,77 @@
+<?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
+ */
+namespace VDM\Component\Componentbuilder\Administrator\Field;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Field\ListField;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Component\ComponentHelper;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Fields Form Field class for the Componentbuilder component
+ *
+ * @since  1.6
+ */
+class FieldsField extends ListField
+{
+	/**
+	 * The fields field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'Fields';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return  array    An array of Html options.
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		$db = Factory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(['a.guid', 'a.name', 'a.xml', 'b.name'], ['guid', 'field_name', 'xml', 'type']));
+		$query->from($db->quoteName('#__componentbuilder_field', 'a'));
+		$query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.guid = a.fieldtype');
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->order('a.name ASC');
+		$db->setQuery((string) $query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			$options[] = Html::_('select.option', '', 'Select an option');
+			foreach($items as $item)
+			{
+				// get the field name (TODO this could slow down the system so we will need to improve on this)
+				if (isset($item->xml) && ComponentbuilderHelper::checkJson($item->xml))
+				{
+					$field_xml = json_decode($item->xml);
+					$field_name = ComponentbuilderHelper::getBetween($field_xml,'name="','"');
+					$field_name = ComponentbuilderHelper::safeFieldName($field_name);
+					$options[] = Html::_('select.option', $item->guid, $item->field_name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+				}
+				else
+				{
+					$options[] = Html::_('select.option', $item->guid, $item->field_name . ' [ empty - ' . $item->type . ' ]');
+				}
+			}
+		}
+
+		return $options;
+	}
+}

admin/src/Field/FieldsfilterdatatypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class FieldsfilterdatatypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/FieldsfilterindexesField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class FieldsfilterindexesField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/FieldsfilternullswitchField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class FieldsfilternullswitchField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/FieldsfilterstoreField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class FieldsfilterstoreField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/HelpdocumentsfilterlocationField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class HelpdocumentsfilterlocationField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/HelpdocumentsfiltertypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class HelpdocumentsfiltertypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/JoomlacomponentsfilterauthorField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class JoomlacomponentsfilterauthorField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/JoomlacomponentsfiltercompanynameField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class JoomlacomponentsfiltercompanynameField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/JoomlamodulesfiltertargetField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class JoomlamodulesfiltertargetField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/JoomlaplugingroupsField.php

@@ -0,0 +1,186 @@
+<?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
+ */
+namespace VDM\Component\Componentbuilder\Administrator\Field;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Field\ListField;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Component\ComponentHelper;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Joomlaplugingroups Form Field class for the Componentbuilder component
+ *
+ * @since  1.6
+ */
+class JoomlaplugingroupsField extends ListField
+{
+	/**
+	 * The joomlaplugingroups field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'Joomlaplugingroups';
+
+	/**
+	 * Override to add new button
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		// see if we should add buttons
+		$set_button = $this->getAttribute('button');
+		// get html
+		$html = parent::getInput();
+		// if true set button
+		if ($set_button === 'true')
+		{
+			$button = array();
+			$script = array();
+			$button_code_name = $this->getAttribute('name');
+			// get the input from url
+			$app = Factory::getApplication();
+			$jinput = $app->input;
+			// get the view name & id
+			$values = $jinput->getArray(array(
+				'id' => 'int',
+				'view' => 'word'
+			));
+			// check if new item
+			$ref = '';
+			$refJ = '';
+			if (!is_null($values['id']) && strlen($values['view']))
+			{
+				// only load referral if not new item.
+				$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
+				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+				// get the return value.
+				$_uri = (string) Uri::getInstance();
+				$_return = urlencode(base64_encode($_uri));
+				// load return value.
+				$ref .= '&amp;return=' . $_return;
+				$refJ .= '&return=' . $_return;
+			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
+			$user = Factory::getApplication()->getIdentity();
+			// only add if user allowed to create joomla_plugin_group
+			if ($user->authorise('core.create', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
+			{
+				// build Create button
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.Text::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px;"
+					href="index.php?option=com_componentbuilder&amp;view=joomla_plugin_group&amp;layout=edit'.$ref.'" >
+					<span class="icon-new icon-white"></span></a>';
+			}
+			// only add if user allowed to edit joomla_plugin_group
+			if ($user->authorise('core.edit', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
+			{
+				// build edit button
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small btn-outline-success button-select hasTooltip" title="'.Text::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; border-radius: 0px 4px 4px 0px;" href="#" >
+					<span class="icon-edit"></span></a>';
+				// build script
+				$script[] = "
+					document.addEventListener('DOMContentLoaded', function() {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
+							e.preventDefault();
+							let ".$button_code_name."Value = this.value;
+							".$button_code_name."Button(".$button_code_name."Value);
+						});
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
+						".$button_code_name."Button(".$button_code_name."Value);
+					});
+					function ".$button_code_name."Button(value) {
+						var createButton = document.getElementById('".$button_code_name."Create');
+						var editButton = document.getElementById('".$button_code_name."Edit');
+						if (value > 0) {
+							// hide the create button
+							createButton.style.display = 'none';
+							// show edit button
+							editButton.style.display = 'block';
+							let url = 'index.php?option=com_componentbuilder&view=joomla_plugin_groups&task=joomla_plugin_group.edit&id='+value+'".$refJ."';
+							editButton.setAttribute('href', url);
+						} else {
+							// show the create button
+							createButton.style.display = 'block';
+							// hide edit button
+							editButton.style.display = 'none';
+						}
+					}";
+			}
+			// check if button was created for joomla_plugin_group field.
+			if (is_array($button) && count($button) > 0)
+			{
+				// Load the needed script.
+				$document = Factory::getApplication()->getDocument();
+				$document->addScriptDeclaration(implode(' ',$script));
+				// return the button attached to input field.
+				return '<div class="input-group">' .$html . implode('',$button).'</div>';
+			}
+		}
+		return $html;
+	}
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return  array    An array of Html options.
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		// Get the user object.
+		$user = Factory::getApplication()->getIdentity();
+		// Get the databse object.
+		$db = Factory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.guid','a.name'),array('guid','joomla_plugin_group_name')));
+		$query->from($db->quoteName('#__componentbuilder_joomla_plugin_group', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->order('a.name ASC');
+		// Implement View Level Access (if set in table)
+		if (!$user->authorise('core.options', 'com_componentbuilder'))
+		{
+			$columns = $db->getTableColumns('#__componentbuilder_joomla_plugin_group');
+			if(isset($columns['access']))
+			{
+				$groups = implode(',', $user->getAuthorisedViewLevels());
+				$query->where('a.access IN (' . $groups . ')');
+			}
+		}
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			$options[] = Html::_('select.option', '', 'Select a group');
+			foreach($items as $item)
+			{
+				$options[] = Html::_('select.option', $item->guid, $item->joomla_plugin_group_name);
+			}
+		}
+		return $options;
+	}
+}

admin/src/Field/LayoutsfilteraddphpviewField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class LayoutsfilteraddphpviewField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/LibrariesfiltertargetField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class LibrariesfiltertargetField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/LibrariesfiltertypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class LibrariesfiltertypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/LibraryField.php

@@ -22,18 +22,18 @@ use Joomla\CMS\Uri\Uri;
 \defined('_JEXEC') or die;
 
 /**
- * Cron_servers Form Field class for the Componentbuilder component
+ * Library Form Field class for the Componentbuilder component
  *
  * @since  1.6
  */
-class Cron_serversField extends ListField
+class LibraryField extends ListField
 {
 	/**
-	 * The cron_servers field type.
+	 * The library field type.
 	 *
 	 * @var        string
 	 */
-	public $type = 'Cron_servers';
+	public $type = 'Library';
 
 	/**
 	 * Override to add new button
@@ -85,16 +85,16 @@ class Cron_serversField extends ListField
 			$button_label = ucfirst(strtolower($button_label));
 			// get user object
 			$user = Factory::getApplication()->getIdentity();
-			// only add if user allowed to create server
-			if ($user->authorise('server.create', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
+			// only add if user allowed to create library
+			if ($user->authorise('library.create', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
 			{
 				// build Create button
 				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.Text::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px;"
-					href="index.php?option=com_componentbuilder&amp;view=server&amp;layout=edit'.$ref.'" >
+					href="index.php?option=com_componentbuilder&amp;view=library&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
-			// only add if user allowed to edit server
-			if ($user->authorise('server.edit', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
+			// only add if user allowed to edit library
+			if ($user->authorise('library.edit', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
 			{
 				// build edit button
 				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small btn-outline-success button-select hasTooltip" title="'.Text::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; border-radius: 0px 4px 4px 0px;" href="#" >
@@ -120,7 +120,7 @@ class Cron_serversField extends ListField
 							createButton.style.display = 'none';
 							// show edit button
 							editButton.style.display = 'block';
-							let url = 'index.php?option=com_componentbuilder&view=servers&task=server.edit&id='+value+'".$refJ."';
+							let url = 'index.php?option=com_componentbuilder&view=libraries&task=library.edit&id='+value+'".$refJ."';
 							editButton.setAttribute('href', url);
 						} else {
 							// show the create button
@@ -130,7 +130,7 @@ class Cron_serversField extends ListField
 						}
 					}";
 			}
-			// check if button was created for server field.
+			// check if button was created for library field.
 			if (is_array($button) && count($button) > 0)
 			{
 				// Load the needed script.
@@ -151,28 +151,25 @@ class Cron_serversField extends ListField
 	 */
 	protected function getOptions()
 	{
-		// Get the databse object.
 		$db = Factory::getDBO();
 		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name','a.protocol'),array('id','cronjob_backup_server_name', 'protocol')));
-		$query->from($db->quoteName('#__componentbuilder_server', 'a'));
+		$query->select($db->quoteName(['a.guid','a.name'], ['guid','library_name']));
+		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
 		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->where($db->quoteName('a.type') . ' = 1');
 		$query->order('a.name ASC');
 		$db->setQuery((string)$query);
 		$items = $db->loadObjectList();
 		$options = [];
 		if ($items)
 		{
-			if ($this->multiple === false)
-			{
-				$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
-			}
+			$options[] = Html::_('select.option', '', 'Select an option');
 			foreach($items as $item)
 			{
-				$item->protocol = ($item->protocol == 2) ? Text::_('SFTP') : Text::_('FTP');
-				$options[] = Html::_('select.option', $item->id, $item->cronjob_backup_server_name .' ['.$item->protocol.']');
+				$options[] = Html::_('select.option', $item->guid, $item->library_name);
 			}
 		}
+
 		return $options;
 	}
 }

admin/src/Field/MaingetsField.php

@@ -0,0 +1,180 @@
+<?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
+ */
+namespace VDM\Component\Componentbuilder\Administrator\Field;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Field\ListField;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Component\ComponentHelper;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Maingets Form Field class for the Componentbuilder component
+ *
+ * @since  1.6
+ */
+class MaingetsField extends ListField
+{
+	/**
+	 * The maingets field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'Maingets';
+
+	/**
+	 * Override to add new button
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		// see if we should add buttons
+		$set_button = $this->getAttribute('button');
+		// get html
+		$html = parent::getInput();
+		// if true set button
+		if ($set_button === 'true')
+		{
+			$button = array();
+			$script = array();
+			$button_code_name = $this->getAttribute('name');
+			// get the input from url
+			$app = Factory::getApplication();
+			$jinput = $app->input;
+			// get the view name & id
+			$values = $jinput->getArray(array(
+				'id' => 'int',
+				'view' => 'word'
+			));
+			// check if new item
+			$ref = '';
+			$refJ = '';
+			if (!is_null($values['id']) && strlen($values['view']))
+			{
+				// only load referral if not new item.
+				$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
+				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+				// get the return value.
+				$_uri = (string) Uri::getInstance();
+				$_return = urlencode(base64_encode($_uri));
+				// load return value.
+				$ref .= '&amp;return=' . $_return;
+				$refJ .= '&return=' . $_return;
+			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
+			$user = Factory::getApplication()->getIdentity();
+			// only add if user allowed to create dynamic_get
+			if ($user->authorise('dynamic_get.create', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
+			{
+				// build Create button
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.Text::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px;"
+					href="index.php?option=com_componentbuilder&amp;view=dynamic_get&amp;layout=edit'.$ref.'" >
+					<span class="icon-new icon-white"></span></a>';
+			}
+			// only add if user allowed to edit dynamic_get
+			if ($user->authorise('dynamic_get.edit', 'com_componentbuilder') && $app->isClient('administrator')) // TODO for now only in admin area.
+			{
+				// build edit button
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small btn-outline-success button-select hasTooltip" title="'.Text::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; border-radius: 0px 4px 4px 0px;" href="#" >
+					<span class="icon-edit"></span></a>';
+				// build script
+				$script[] = "
+					document.addEventListener('DOMContentLoaded', function() {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
+							e.preventDefault();
+							let ".$button_code_name."Value = this.value;
+							".$button_code_name."Button(".$button_code_name."Value);
+						});
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
+						".$button_code_name."Button(".$button_code_name."Value);
+					});
+					function ".$button_code_name."Button(value) {
+						var createButton = document.getElementById('".$button_code_name."Create');
+						var editButton = document.getElementById('".$button_code_name."Edit');
+						if (value > 0) {
+							// hide the create button
+							createButton.style.display = 'none';
+							// show edit button
+							editButton.style.display = 'block';
+							let url = 'index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id='+value+'".$refJ."';
+							editButton.setAttribute('href', url);
+						} else {
+							// show the create button
+							createButton.style.display = 'block';
+							// hide edit button
+							editButton.style.display = 'none';
+						}
+					}";
+			}
+			// check if button was created for dynamic_get field.
+			if (is_array($button) && count($button) > 0)
+			{
+				// Load the needed script.
+				$document = Factory::getApplication()->getDocument();
+				$document->addScriptDeclaration(implode(' ',$script));
+				// return the button attached to input field.
+				return '<div class="input-group">' .$html . implode('',$button).'</div>';
+			}
+		}
+		return $html;
+	}
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return  array    An array of Html options.
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		// Get the databse object.
+		$db = Factory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.guid','a.name','a.gettype'),array('guid','main_get_name','type')));
+		$query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a'));
+		$query->where($db->quoteName('a.published') . ' = 1');
+		$query->where('( '.$db->quoteName('a.gettype') . ' = 1 OR ' . $db->quoteName('a.gettype') . ' = 2 )');
+		$query->order('a.name ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = [];
+		if ($items)
+		{
+			$model = ComponentbuilderHelper::getModel('dynamic_gets');
+			if ($this->multiple === false)
+			{
+				$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
+			}
+			foreach($items as $item)
+			{
+				$type = $model->selectionTranslation($item->type, 'gettype');
+				$options[] = Html::_('select.option', $item->guid, $item->main_get_name . ' (' . Text::_($type) . ')');
+			}
+		}
+		return $options;
+	}
+}

admin/src/Field/ModalSelectField.php

@@ -1,69 +0,0 @@
-<?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
- */
-namespace VDM\Component\Componentbuilder\Administrator\Field;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Form\Field\ModalSelectField as ModalSelectFieldCore;
-use Joomla\Database\ParameterType;
-
-// No direct access to this file
-\defined('_JEXEC') or die;
-
-/**
- * A modal content selection field, now with the radical ability to handle string-based GUIDs.
- * Because, apparently, assuming everything is an integer was the hill to die on.
- *
- * This override exists solely to bypass a hardcoded constraint that shouldn't have been there in the first place.
- * But hey, at least we get another class extension to maintain!
- *
- * @since  5.0.0
- */
-class ModalSelectField extends ModalSelectFieldCore
-{
-	/**
-	 * Method to retrieve the title of selected item.
-	 *
-	 * @return string
-	 *
-	 * @since   5.0.0
-	 */
-	protected function getValueTitle()
-	{
-		// Selecting the title for the field value, when required info were given
-		if ($this->value && $this->sql_title_table && $this->sql_title_column && $this->sql_title_key) {
-			try {
-				$db	= $this->getDatabase();
-				$query = $db->getQuery(true)
-					->select($db->quoteName($this->sql_title_column))
-					->from($db->quoteName($this->sql_title_table))
-					->where($db->quoteName($this->sql_title_key) . ' = :value')
-					->bind(':value', $this->value, is_numeric($this->value) ? ParameterType::INTEGER : ParameterType::STRING);
-
-				/**
-				 *   All this—just because someone decided to hardcode [ParameterType::INTEGER] in the core.
-				 *   We could have just handle it dynamically, but no...
-				 *
-				 *   Polymorphic behavior isn't the enemy. Hardcoded constraints that force class extensions?
-				 *   Now *that's* the real problem. But sure, let's keep pretending that integers are the
-				 *   only valid identifiers in a database.
-				 */
-
-				$db->setQuery($query);
-
-				return $db->loadResult() ?: $this->value;
-			} catch (\Throwable $e) {
-				Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
-			}
-		}
-
-		return $this->value;
-	}
-}

admin/src/Field/NamespacesField.php

@@ -0,0 +1,96 @@
+<?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
+ */
+namespace VDM\Component\Componentbuilder\Administrator\Field;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Field\ListField;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Component\ComponentHelper;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Namespaces Form Field class for the Componentbuilder component
+ *
+ * @since  1.6
+ */
+class NamespacesField extends ListField
+{
+	/**
+	 * The namespaces field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'Namespaces';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return  array    An array of Html options.
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		// Get the user object.
+		$user = Factory::getApplication()->getIdentity();
+		// Get the databse object.
+		$db = Factory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.guid','a.name','a.namespace','a.type','a.power_version'),array('guid','use_name','namespace','type','version')));
+		$query->from($db->quoteName('#__componentbuilder_power', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->order('a.name ASC');
+		$query->order('a.type ASC');
+		// Implement View Level Access (if set in table)
+		if (!$user->authorise('core.options', 'com_componentbuilder'))
+		{
+			$columns = $db->getTableColumns('#__componentbuilder_power');
+			if(isset($columns['access']))
+			{
+				$groups = implode(',', $user->getAuthorisedViewLevels());
+				$query->where('a.access IN (' . $groups . ')');
+			}
+		}
+		// get the input
+		$jinput = Factory::getApplication()->input;
+		// get the id
+		$power_id = $jinput->getInt('id', 0);
+		// if we have an id we remove all classes of the same namespace and name
+		if ($power_id > 0 && ($exclude_powers = ComponentbuilderHelper::excludePowers($power_id)) !== false)
+		{
+			$query->where('a.id NOT IN (' . implode(',', $exclude_powers) . ')');
+		}
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		// if none was found, we add this to set an alternative to set custom
+		if (!$items)
+		{
+			$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_NONE_FOUND'));
+		}
+		if ($items)
+		{
+			if ($this->multiple === false)
+			{
+				$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
+			}
+			foreach($items as $item)
+			{
+				$options[] = Html::_('select.option', $item->guid, str_replace('.','\\', $item->namespace) . ' [' . $item->use_name . '] (v' . $item->version . ' - ' . $item->type . ')');
+			}
+		}
+		return $options;
+
+	}
+}

admin/src/Field/PowersfilterapprovedField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class PowersfilterapprovedField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/PowersfiltertypeField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class PowersfiltertypeField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/RepositoriesfilterbaseField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class RepositoriesfilterbaseField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/RepositoriesfilterorganisationField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class RepositoriesfilterorganisationField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);

admin/src/Field/RepositoriesfilterrepositoryField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\Database\DatabaseInterface;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -43,7 +44,7 @@ class RepositoriesfilterrepositoryField extends ListField
 	protected function getOptions()
 	{
 		// Get a db connection.
-		$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
+		$db = Factory::getContainer()->get(DatabaseInterface::class);
 
 		// Create a new query object.
 		$query = $db->getQuery(true);